From 532b9e8bfbc9514c39b142572eab844bd6f4682f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 29 Oct 2015 13:20:07 +0530 Subject: [PATCH 01/59] [fix] Edge case in variant selection in website - when variant has less number of attributes than template --- erpnext/templates/includes/product_page.js | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js index f7a2360642..cec4f2a6a6 100644 --- a/erpnext/templates/includes/product_page.js +++ b/erpnext/templates/includes/product_page.js @@ -67,16 +67,17 @@ frappe.ready(function() { $("[itemscope] .item-view-attribute .form-control").on("change", function() { try { var item_code = encodeURIComponent(get_item_code()); + } catch(e) { // unable to find variant // then chose the closest available one var attribute = $(this).attr("data-attribute"); var attribute_value = $(this).val() - var item_code = update_attribute_selectors(attribute, attribute_value); + var item_code = find_closest_match(attribute, attribute_value); if (!item_code) { - msgprint(__("Please select some other value for {0}", [attribute])) + msgprint(__("Cannot find a matching Item. Please select some other value for {0}.", [attribute])) throw e; } } @@ -99,9 +100,16 @@ var toggle_update_cart = function(qty) { function get_item_code() { if(window.variant_info) { var attributes = get_selected_attributes(); + var no_of_attributes = Object.keys(attributes).length; for(var i in variant_info) { var variant = variant_info[i]; + + if (variant.attributes.length < no_of_attributes) { + // the case when variant has less attributes than template + continue; + } + var match = true; for(var j in variant.attributes) { if(attributes[variant.attributes[j].attribute] @@ -120,13 +128,15 @@ function get_item_code() { } } -function update_attribute_selectors(selected_attribute, selected_attribute_value) { +function find_closest_match(selected_attribute, selected_attribute_value) { // find the closest match keeping the selected attribute in focus and get the item code var attributes = get_selected_attributes(); var previous_match_score = 0; + var previous_no_of_attributes = 0; var matched; + for(var i in variant_info) { var variant = variant_info[i]; var match_score = 0; @@ -142,9 +152,13 @@ function update_attribute_selectors(selected_attribute, selected_attribute_value } } - if (has_selected_attribute && (match_score > previous_match_score)) { + if (has_selected_attribute + && ((match_score > previous_match_score) || (match_score==previous_match_score && previous_no_of_attributes < variant.attributes.length))) { previous_match_score = match_score; matched = variant; + previous_no_of_attributes = variant.attributes.length; + + } } From d0b0a80be3aacf48731f391f1c7f77cd0fc7bbe0 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 28 Oct 2015 17:15:00 +0530 Subject: [PATCH 02/59] [enhacement] remove fiscal year from leave allocation --- .../leave_allocation/leave_allocation.json | 36 +++++++------- .../leave_allocation/leave_allocation.py | 48 ++++++++++--------- .../leave_application/leave_application.js | 10 ++-- .../leave_application/leave_application.json | 4 +- .../leave_application/leave_application.py | 17 ++++--- .../leave_control_panel.json | 34 ++++++++++--- .../leave_control_panel.py | 12 +++-- 7 files changed, 92 insertions(+), 69 deletions(-) diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json index 19e8001237..7108fc0873 100644 --- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json +++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json @@ -147,22 +147,20 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "default": "Today", - "fieldname": "posting_date", + "fieldname": "from_date", "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, - "in_list_view": 1, - "label": "Posting Date", - "no_copy": 1, - "oldfieldname": "date", - "oldfieldtype": "Date", + "in_list_view": 0, + "label": "From Date", + "no_copy": 0, "permlevel": 0, + "precision": "", "print_hide": 0, - "read_only": 1, + "read_only": 0, "report_hide": 0, - "reqd": 1, + "reqd": 0, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -171,23 +169,21 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "fiscal_year", - "fieldtype": "Link", + "fieldname": "to_date", + "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, - "in_filter": 1, + "in_filter": 0, "in_list_view": 0, - "label": "Fiscal Year", + "label": "To Date", "no_copy": 0, - "oldfieldname": "fiscal_year", - "oldfieldtype": "Data", - "options": "Fiscal Year", "permlevel": 0, + "precision": "", "print_hide": 0, "read_only": 0, "report_hide": 0, - "reqd": 1, - "search_index": 1, + "reqd": 0, + "search_index": 0, "set_only_once": 0, "unique": 0 }, @@ -310,7 +306,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-02 07:38:55.314632", + "modified": "2015-10-28 14:52:26.724671", "modified_by": "Administrator", "module": "HR", "name": "Leave Allocation", @@ -359,7 +355,7 @@ ], "read_only": 0, "read_only_onload": 0, - "search_fields": "employee,employee_name,leave_type,total_leaves_allocated,fiscal_year", + "search_fields": "employee,employee_name,leave_type,total_leaves_allocated", "sort_field": "modified", "sort_order": "DESC" } \ No newline at end of file diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.py b/erpnext/hr/doctype/leave_allocation/leave_allocation.py index 4e74b2846d..1b6c89913b 100755 --- a/erpnext/hr/doctype/leave_allocation/leave_allocation.py +++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.py @@ -3,13 +3,14 @@ from __future__ import unicode_literals import frappe -from frappe.utils import cint, flt +from frappe.utils import cint, flt, date_diff from frappe import _ from frappe.model.document import Document from erpnext.hr.utils import set_employee_name class LeaveAllocation(Document): def validate(self): + self.validate_period() self.validate_new_leaves_allocated_value() self.check_existing_leave_allocation() if not self.total_leaves_allocated: @@ -21,8 +22,13 @@ class LeaveAllocation(Document): self.validate_new_leaves_allocated_value() def on_update(self): + pass self.get_total_allocated_leaves() - + + def validate_period(self): + if date_diff(self.to_date, self.from_date) <= 0: + frappe.throw(_("Invalid period")) + def validate_new_leaves_allocated_value(self): """validate that leave allocation is in multiples of 0.5""" if flt(self.new_leaves_allocated) % 0.5: @@ -30,29 +36,30 @@ class LeaveAllocation(Document): def check_existing_leave_allocation(self): """check whether leave for same type is already allocated or not""" - leave_allocation = frappe.db.sql("""select name from `tabLeave Allocation` - where employee=%s and leave_type=%s and fiscal_year=%s and docstatus=1""", - (self.employee, self.leave_type, self.fiscal_year)) + leave_allocation = frappe.db.sql("""select name from `tabLeave Allocation` + where employee='%s' and leave_type='%s' and to_date >= '%s' and from_date <= '%s' and docstatus=1 + """%(self.employee, self.leave_type, self.from_date, self.to_date)) + if leave_allocation: - frappe.msgprint(_("Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0}").format(self.leave_type, - self.employee, self.fiscal_year)) + frappe.msgprint(_("Leaves for type {0} already allocated for Employee {1} for period {2} - {3}").format(self.leave_type, + self.employee, self.from_date, self.to_date)) frappe.throw('{0}'.format(leave_allocation[0][0])) - def get_leave_bal(self, prev_fyear): - return self.get_leaves_allocated(prev_fyear) - self.get_leaves_applied(prev_fyear) + def get_leave_bal(self): + return self.get_leaves_allocated() - self.get_leaves_applied() - def get_leaves_applied(self, fiscal_year): + def get_leaves_applied(self): leaves_applied = frappe.db.sql("""select SUM(ifnull(total_leave_days, 0)) from `tabLeave Application` where employee=%s and leave_type=%s - and fiscal_year=%s and docstatus=1""", - (self.employee, self.leave_type, fiscal_year)) + and to_date<=%s and docstatus=1""", + (self.employee, self.leave_type, self.from_date)) return leaves_applied and flt(leaves_applied[0][0]) or 0 - def get_leaves_allocated(self, fiscal_year): + def get_leaves_allocated(self): leaves_allocated = frappe.db.sql("""select SUM(ifnull(total_leaves_allocated, 0)) from `tabLeave Allocation` where employee=%s and leave_type=%s - and fiscal_year=%s and docstatus=1 and name!=%s""", - (self.employee, self.leave_type, fiscal_year, self.name)) + and to_date<=%s and docstatus=1 and name!=%s""", + (self.employee, self.leave_type, self.from_date, self.name)) return leaves_allocated and flt(leaves_allocated[0][0]) or 0 def allow_carry_forward(self): @@ -67,14 +74,11 @@ class LeaveAllocation(Document): def get_carry_forwarded_leaves(self): if self.carry_forward: self.allow_carry_forward() - prev_fiscal_year = frappe.db.sql("""select name from `tabFiscal Year` - where year_start_date = (select date_add(year_start_date, interval -1 year) - from `tabFiscal Year` where name=%s) - order by name desc limit 1""", self.fiscal_year) - prev_fiscal_year = prev_fiscal_year and prev_fiscal_year[0][0] or '' + prev_bal = 0 - if prev_fiscal_year and cint(self.carry_forward) == 1: - prev_bal = self.get_leave_bal(prev_fiscal_year) + if cint(self.carry_forward) == 1: + prev_bal = self.get_leave_bal() + ret = { 'carry_forwarded_leaves': prev_bal, 'total_leaves_allocated': flt(prev_bal) + flt(self.new_leaves_allocated) diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js index 5b5bf8ff43..c8bd753a18 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.js +++ b/erpnext/hr/doctype/leave_application/leave_application.js @@ -53,10 +53,6 @@ frappe.ui.form.on("Leave Application", { frm.trigger("get_leave_balance"); }, - fiscal_year: function(frm) { - frm.trigger("get_leave_balance"); - }, - leave_type: function(frm) { frm.trigger("get_leave_balance"); }, @@ -85,12 +81,13 @@ frappe.ui.form.on("Leave Application", { }, get_leave_balance: function(frm) { - if(frm.doc.docstatus==0 && frm.doc.employee && frm.doc.leave_type && frm.doc.fiscal_year) { + if(frm.doc.docstatus==0 && frm.doc.employee && frm.doc.leave_type && frm.doc.from_date && frm.doc.to_date) { return frm.call({ method: "get_leave_balance", args: { employee: frm.doc.employee, - fiscal_year: frm.doc.fiscal_year, + from_date: frm.doc.from_date, + to_date: frm.doc.to_date, leave_type: frm.doc.leave_type } }); @@ -109,6 +106,7 @@ frappe.ui.form.on("Leave Application", { callback: function(response) { if (response && response.message) { frm.set_value('total_leave_days', response.message.total_leave_days); + frm.trigger("get_leave_balance"); } } }); diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json index f51c220b6f..62e4cd8b58 100644 --- a/erpnext/hr/doctype/leave_application/leave_application.json +++ b/erpnext/hr/doctype/leave_application/leave_application.json @@ -21,7 +21,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Status", + "label": "Status", "no_copy": 1, "options": "Open\nApproved\nRejected", "permlevel": 1, @@ -559,7 +559,7 @@ "issingle": 0, "istable": 0, "max_attachments": 3, - "modified": "2015-10-02 07:38:55.471712", + "modified": "2015-10-28 16:14:25.640730", "modified_by": "Administrator", "module": "HR", "name": "Leave Application", diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 054117b55f..8c91173d36 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -100,7 +100,7 @@ class LeaveApplication(Document): if not is_lwp(self.leave_type): self.leave_balance = get_leave_balance(self.employee, - self.leave_type, self.fiscal_year)["leave_balance"] + self.leave_type, self.from_date, self.to_date)["leave_balance"] if self.status != "Rejected" \ and self.leave_balance - self.total_leave_days < 0: @@ -122,9 +122,8 @@ class LeaveApplication(Document): employee = %(employee)s and docstatus < 2 and status in ("Open", "Approved") - and (from_date between %(from_date)s and %(to_date)s - or to_date between %(from_date)s and %(to_date)s - or %(from_date)s between from_date and to_date) + and to_date >= %(from_date)s + and from_date <= %(to_date)s and name != %(name)s""", { "employee": self.employee, "from_date": self.from_date, @@ -251,18 +250,18 @@ def get_total_leave_days(leave_app): return ret @frappe.whitelist() -def get_leave_balance(employee, leave_type, fiscal_year): +def get_leave_balance(employee, leave_type, from_date, to_date): leave_all = frappe.db.sql("""select total_leaves_allocated from `tabLeave Allocation` where employee = %s and leave_type = %s - and fiscal_year = %s and docstatus = 1""", (employee, - leave_type, fiscal_year)) + and from_date<=%s and to_date>=%s and docstatus = 1""", (employee, + leave_type, from_date, to_date)) leave_all = leave_all and flt(leave_all[0][0]) or 0 leave_app = frappe.db.sql("""select SUM(total_leave_days) from `tabLeave Application` - where employee = %s and leave_type = %s and fiscal_year = %s - and status="Approved" and docstatus = 1""", (employee, leave_type, fiscal_year)) + where employee = %s and leave_type = %s and to_date>=%s and from_date<=%s + and status="Approved" and docstatus = 1""", (employee, leave_type, from_date, to_date)) leave_app = leave_app and flt(leave_app[0][0]) or 0 ret = {'leave_balance': leave_all - leave_app} diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json index 0db0410121..c92fbb8de8 100644 --- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json +++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json @@ -145,16 +145,38 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "fiscal_year", - "fieldtype": "Link", + "fieldname": "from_date", + "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, - "in_filter": 1, + "in_filter": 0, "in_list_view": 0, - "label": "Fiscal Year", + "label": "From Date", "no_copy": 0, - "options": "Fiscal Year", "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "to_date", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "To Date", + "no_copy": 0, + "permlevel": 0, + "precision": "", "print_hide": 0, "read_only": 0, "report_hide": 0, @@ -260,7 +282,7 @@ "is_submittable": 0, "issingle": 1, "istable": 0, - "modified": "2015-06-05 11:38:19.994852", + "modified": "2015-10-28 16:23:57.733900", "modified_by": "Administrator", "module": "HR", "name": "Leave Control Panel", diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py index 706f995f6f..77c7ad99ce 100644 --- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe -from frappe.utils import cint, cstr, flt, nowdate, comma_and +from frappe.utils import cint, cstr, flt, nowdate, comma_and, date_diff from frappe import msgprint, _ from frappe.model.document import Document @@ -27,9 +27,13 @@ class LeaveControlPanel(Document): return e def validate_values(self): - for f in ["fiscal_year", "leave_type", "no_of_days"]: + for f in ["from_date", "to_date", "leave_type", "no_of_days"]: if not self.get(f): frappe.throw(_("{0} is required").format(self.meta.get_label(f))) + + def to_date_validation(self): + if date_diff(self.to_date, self.from_date) <= 0: + return "Invalid period" def allocate_leave(self): self.validate_values() @@ -45,8 +49,8 @@ class LeaveControlPanel(Document): la.employee = cstr(d[0]) la.employee_name = frappe.db.get_value('Employee',cstr(d[0]),'employee_name') la.leave_type = self.leave_type - la.fiscal_year = self.fiscal_year - la.posting_date = nowdate() + la.from_date = self.from_date + la.to_date = self.to_date la.carry_forward = cint(self.carry_forward) la.new_leaves_allocated = flt(self.no_of_days) la.docstatus = 1 From a2c668cb778be0a17c3fb3b085daee1f4b4b51ba Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 29 Oct 2015 13:00:30 +0530 Subject: [PATCH 03/59] [fixes] patch, test cases and validations --- .../leave_allocation/leave_allocation.json | 6 +- .../leave_allocation/leave_allocation.py | 6 +- .../leave_allocation/test_leave_allocation.py | 67 ++++++++++++++++++- .../leave_allocation/test_records.json | 19 +----- .../employee_leave_balance.js | 15 +++-- .../employee_leave_balance.py | 49 ++++++-------- ...emove_fiscal_year_from_leave_allocation.py | 15 +++++ 7 files changed, 122 insertions(+), 55 deletions(-) create mode 100644 erpnext/patches/v6_6/remove_fiscal_year_from_leave_allocation.py diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json index 7108fc0873..070e518588 100644 --- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json +++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json @@ -160,7 +160,7 @@ "print_hide": 0, "read_only": 0, "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -182,7 +182,7 @@ "print_hide": 0, "read_only": 0, "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -306,7 +306,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-28 14:52:26.724671", + "modified": "2015-10-28 18:18:29.137427", "modified_by": "Administrator", "module": "HR", "name": "Leave Allocation", diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.py b/erpnext/hr/doctype/leave_allocation/leave_allocation.py index 1b6c89913b..146c3fa38e 100755 --- a/erpnext/hr/doctype/leave_allocation/leave_allocation.py +++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.py @@ -22,7 +22,6 @@ class LeaveAllocation(Document): self.validate_new_leaves_allocated_value() def on_update(self): - pass self.get_total_allocated_leaves() def validate_period(self): @@ -87,6 +86,11 @@ class LeaveAllocation(Document): def get_total_allocated_leaves(self): leave_det = self.get_carry_forwarded_leaves() + self.validate_total_leaves_allocated(leave_det) frappe.db.set(self,'carry_forwarded_leaves',flt(leave_det['carry_forwarded_leaves'])) frappe.db.set(self,'total_leaves_allocated',flt(leave_det['total_leaves_allocated'])) + def validate_total_leaves_allocated(self, leave_det): + if date_diff(self.to_date, self.from_date) <= leave_det['total_leaves_allocated']: + frappe.throw(_("Total allocated leaves are more than period")) + \ No newline at end of file diff --git a/erpnext/hr/doctype/leave_allocation/test_leave_allocation.py b/erpnext/hr/doctype/leave_allocation/test_leave_allocation.py index fe4f01bd47..d36fb2cb69 100644 --- a/erpnext/hr/doctype/leave_allocation/test_leave_allocation.py +++ b/erpnext/hr/doctype/leave_allocation/test_leave_allocation.py @@ -1,4 +1,69 @@ from __future__ import unicode_literals import frappe +import unittest +from frappe.utils import getdate -test_records = frappe.get_test_records('Leave Allocation') +class TestLeaveAllocation(unittest.TestCase): + def test_overlapping_allocation(self): + employee = frappe.get_doc("Employee", frappe.db.sql_list("select name from tabEmployee limit 1")[0]) + leaves = [ + { + "doctype": "Leave Allocation", + "__islocal": 1, + "employee": employee.name, + "employee_name": employee.employee_name, + "leave_type": "_Test Leave Type", + "from_date": getdate("2015-10-1"), + "to_date": getdate("2015-10-31"), + "new_leaves_allocated": 5, + "docstatus": 1 + }, + { + "doctype": "Leave Allocation", + "__islocal": 1, + "employee": employee.name, + "employee_name": employee.employee_name, + "leave_type": "_Test Leave Type", + "from_date": getdate("2015-09-1"), + "to_date": getdate("2015-11-30"), + "new_leaves_allocated": 5 + } + ] + + frappe.get_doc(leaves[0]).save() + self.assertRaises(frappe.ValidationError, frappe.get_doc(leaves[1]).save) + + def test_invalid_period(self): + employee = frappe.get_doc("Employee", frappe.db.sql_list("select name from tabEmployee limit 1")[0]) + + d = frappe.get_doc({ + "doctype": "Leave Allocation", + "__islocal": 1, + "employee": employee.name, + "employee_name": employee.employee_name, + "leave_type": "_Test Leave Type", + "from_date": getdate("2015-09-30"), + "to_date": getdate("2015-09-1"), + "new_leaves_allocated": 5 + }) + + #invalid period + self.assertRaises(frappe.ValidationError, d.save) + + def test_allocated_leave_days_over_period(self): + employee = frappe.get_doc("Employee", frappe.db.sql_list("select name from tabEmployee limit 1")[0]) + d = frappe.get_doc({ + "doctype": "Leave Allocation", + "__islocal": 1, + "employee": employee.name, + "employee_name": employee.employee_name, + "leave_type": "_Test Leave Type", + "from_date": getdate("2015-09-1"), + "to_date": getdate("2015-09-30"), + "new_leaves_allocated": 35 + }) + + #allocated leave more than period + self.assertRaises(frappe.ValidationError, d.save) + +test_dependencies = ["Employee", "Leave Type"] \ No newline at end of file diff --git a/erpnext/hr/doctype/leave_allocation/test_records.json b/erpnext/hr/doctype/leave_allocation/test_records.json index 036dc499bb..0637a088a0 100644 --- a/erpnext/hr/doctype/leave_allocation/test_records.json +++ b/erpnext/hr/doctype/leave_allocation/test_records.json @@ -1,18 +1 @@ -[ - { - "docstatus": 1, - "doctype": "Leave Allocation", - "employee": "_T-Employee-0001", - "fiscal_year": "_Test Fiscal Year 2013", - "leave_type": "_Test Leave Type", - "new_leaves_allocated": 15 - }, - { - "docstatus": 1, - "doctype": "Leave Allocation", - "employee": "_T-Employee-0002", - "fiscal_year": "_Test Fiscal Year 2013", - "leave_type": "_Test Leave Type", - "new_leaves_allocated": 15 - } -] +[] \ No newline at end of file diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js index 4f97c4378f..41b1421b71 100644 --- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js +++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js @@ -4,11 +4,16 @@ frappe.query_reports["Employee Leave Balance"] = { "filters": [ { - "fieldname":"fiscal_year", - "label": __("Fiscal Year"), - "fieldtype": "Link", - "options": "Fiscal Year", - "default": frappe.defaults.get_user_default("fiscal_year") + "fieldname":"from_date", + "label": __("From Date"), + "fieldtype": "Date", + "default": frappe.datetime.year_start() + }, + { + "fieldname":"to_date", + "label": __("To Date"), + "fieldtype": "Date", + "default": frappe.datetime.year_end() }, { "fieldname":"company", diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py index d6f865ba9f..0aa88a82b0 100644 --- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py @@ -24,52 +24,47 @@ def execute(filters=None): leave_types = frappe.db.sql_list("select name from `tabLeave Type`") - if filters.get("fiscal_year"): - fiscal_years = [filters["fiscal_year"]] - else: - fiscal_years = frappe.db.sql_list("select name from `tabFiscal Year` order by name desc") - employee_names = [d.name for d in employees] - allocations = frappe.db.sql("""select employee, fiscal_year, leave_type, total_leaves_allocated + allocations = frappe.db.sql("""select employee, leave_type, sum(new_leaves_allocated) as leaves_allocated from `tabLeave Allocation` - where docstatus=1 and employee in (%s)""" % - ','.join(['%s']*len(employee_names)), employee_names, as_dict=True) - - applications = frappe.db.sql("""select employee, fiscal_year, leave_type, + where docstatus=1 and employee in (%s) and from_date >= '%s' and to_date <= '%s'""" % + (','.join(['%s']*len(employee_names)), filters.get("from_date"), + filters.get("to_date")), employee_names, as_dict=True) + + applications = frappe.db.sql("""select employee, leave_type, SUM(total_leave_days) as leaves from `tabLeave Application` where status="Approved" and docstatus = 1 and employee in (%s) - group by employee, fiscal_year, leave_type""" % - ','.join(['%s']*len(employee_names)), employee_names, as_dict=True) + and from_date >= '%s' and to_date <= '%s' + group by employee, leave_type""" % + (','.join(['%s']*len(employee_names)), filters.get("from_date"), + filters.get("to_date")), employee_names, as_dict=True) columns = [ - _("Fiscal Year"), _("Employee") + ":Link/Employee:150", _("Employee Name") + "::200", _("Department") +"::150" + _("Employee") + ":Link/Employee:150", _("Employee Name") + "::200", _("Department") +"::150" ] for leave_type in leave_types: - columns.append(_(leave_type) + " " + _("Allocated") + ":Float") + columns.append(_(leave_type) + " " + _("Opening") + ":Float") columns.append(_(leave_type) + " " + _("Taken") + ":Float") columns.append(_(leave_type) + " " + _("Balance") + ":Float") data = {} for d in allocations: - data.setdefault((d.fiscal_year, d.employee, - d.leave_type), frappe._dict()).allocation = d.total_leaves_allocated + data.setdefault((d.employee,d.leave_type), frappe._dict()).allocation = d.leaves_allocated for d in applications: - data.setdefault((d.fiscal_year, d.employee, - d.leave_type), frappe._dict()).leaves = d.leaves + data.setdefault((d.employee, d.leave_type), frappe._dict()).leaves = d.leaves result = [] - for fiscal_year in fiscal_years: - for employee in employees: - row = [fiscal_year, employee.name, employee.employee_name, employee.department] - result.append(row) - for leave_type in leave_types: - tmp = data.get((fiscal_year, employee.name, leave_type), frappe._dict()) - row.append(tmp.allocation or 0) - row.append(tmp.leaves or 0) - row.append((tmp.allocation or 0) - (tmp.leaves or 0)) + for employee in employees: + row = [employee.name, employee.employee_name, employee.department] + result.append(row) + for leave_type in leave_types: + tmp = data.get((employee.name, leave_type), frappe._dict()) + row.append(tmp.allocation or 0) + row.append(tmp.leaves or 0) + row.append((tmp.allocation or 0) - (tmp.leaves or 0)) return columns, result diff --git a/erpnext/patches/v6_6/remove_fiscal_year_from_leave_allocation.py b/erpnext/patches/v6_6/remove_fiscal_year_from_leave_allocation.py new file mode 100644 index 0000000000..1b248415db --- /dev/null +++ b/erpnext/patches/v6_6/remove_fiscal_year_from_leave_allocation.py @@ -0,0 +1,15 @@ +from __future__ import unicode_literals +import frappe + +def execute(): + for leave_allocation in frappe.db.sql("select name, fiscal_year from `tabLeave Allocation`", as_dict=True): + year_start_date, year_end_date = frappe.db.get_value("Fiscal Year", leave_allocation["fiscal_year"], + ["year_start_date", "year_end_date"]) + + frappe.db.sql("""update `tabLeave Allocation` + set from_date=%s, to_date=%s where name=%s""", + (year_start_date, year_end_date, leave_allocation["name"])) + + frappe.db.commit() + + \ No newline at end of file From 20a653e829687959db7fe919764b26240c727b5a Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 29 Oct 2015 14:27:37 +0530 Subject: [PATCH 04/59] [fixes] Test case fixes for leave application --- .../leave_allocation/test_records.json | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/leave_allocation/test_records.json b/erpnext/hr/doctype/leave_allocation/test_records.json index 0637a088a0..106ed0e615 100644 --- a/erpnext/hr/doctype/leave_allocation/test_records.json +++ b/erpnext/hr/doctype/leave_allocation/test_records.json @@ -1 +1,20 @@ -[] \ No newline at end of file +[ + { + "docstatus": 1, + "doctype": "Leave Allocation", + "employee": "_T-Employee-0001", + "from_date": "2013-01-01", + "to_date": "2013-12-31", + "leave_type": "_Test Leave Type", + "new_leaves_allocated": 15 + }, + { + "docstatus": 1, + "doctype": "Leave Allocation", + "employee": "_T-Employee-0002", + "from_date": "2013-01-01", + "to_date": "2013-12-31", + "leave_type": "_Test Leave Type", + "new_leaves_allocated": 15 + } +] \ No newline at end of file From c39cef363c0547b8e494748fbc99b4df2b7b6326 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 29 Oct 2015 18:37:17 +0530 Subject: [PATCH 05/59] [fix] stop welcome video if user moves to another page --- .../page/welcome_to_erpnext/welcome_to_erpnext.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.js b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.js index 2af40a6a20..f072b8d8c5 100644 --- a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.js +++ b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.js @@ -4,7 +4,17 @@ frappe.pages['welcome-to-erpnext'].on_page_load = function(wrapper) { parent.html(frappe.render_template("welcome_to_erpnext", {})); parent.find(".video-placeholder").on("click", function() { + window.erpnext_welcome_video_started = true; parent.find(".video-placeholder").addClass("hidden"); - parent.find(".embed-responsive").append('') + parent.find(".embed-responsive").append('') + }); + + // pause video on page change + $(document).on("page-change", function() { + if (window.erpnext_welcome_video_started && parent) { + parent.find(".video-playlist").each(function() { + this.contentWindow.postMessage('{"event":"command","func":"' + 'pauseVideo' + '","args":""}', '*'); + }); + } }); } From c306b214150639f15683af6bf8415c69e1f94f77 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 19 Oct 2015 16:32:24 +0530 Subject: [PATCH 06/59] [merge fixes] --- .../purchase_order/purchase_order.json | 204 ++++++++++++++++++ .../doctype/purchase_order/purchase_order.py | 16 ++ .../purchase_order_item.json | 9 +- erpnext/controllers/selling_controller.py | 2 +- erpnext/public/js/utils/party.js | 2 +- .../doctype/sales_order/sales_order.js | 15 +- .../doctype/sales_order/sales_order.json | 65 +++++- .../doctype/sales_order/sales_order.py | 54 +++++ .../doctype/sales_order/sales_order_list.js | 35 ++- .../sales_order_item/sales_order_item.json | 22 ++ 10 files changed, 399 insertions(+), 25 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 904b762e1d..d0b454ef1c 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -147,6 +147,52 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "customer", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Customer", + "no_copy": 0, + "options": "Customer", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "depends_on": "eval:doc.order_type==\"Drop Shipment\"", + "fieldname": "customer_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Customer Name", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -168,6 +214,28 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "customer_address_display", + "fieldtype": "Small Text", + "hidden": 1, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Customer Address", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -189,6 +257,28 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "customer_contact_display", + "fieldtype": "Small Text", + "hidden": 1, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Customer Contact", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -210,6 +300,28 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "customer_contact_mobile", + "fieldtype": "Small Text", + "hidden": 1, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Customer Mobile No", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -231,6 +343,28 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "customer_contact_email", + "fieldtype": "Small Text", + "hidden": 1, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Customer Contact Email", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -326,6 +460,28 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "drop_ship", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Drop Ship", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -1400,6 +1556,30 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "depends_on": "eval:doc.drop_ship==1", + "fieldname": "customer_address", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Customer Address", + "no_copy": 0, + "options": "Address", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -1442,6 +1622,30 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "depends_on": "eval:doc.drop_ship==1", + "fieldname": "customer_contact_person", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Customer Contact Person", + "no_copy": 0, + "options": "Contact", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 0affd78f9b..234c643642 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -162,6 +162,14 @@ class PurchaseOrder(BuyingController): clear_doctype_notifications(self) def on_submit(self): + if self.drop_ship == 1: + self.status_updater[0].update({ + "target_parent_dt": "Sales Order", + "target_parent_field": "per_ordered", + "target_dt": "Sales Order Item", + 'target_field': 'ordered_qty' + }) + super(PurchaseOrder, self).on_submit() purchase_controller = frappe.get_doc("Purchase Common") @@ -176,6 +184,14 @@ class PurchaseOrder(BuyingController): purchase_controller.update_last_purchase_rate(self, is_submit = 1) def on_cancel(self): + if self.drop_ship == 1: + self.status_updater[0].update({ + "target_parent_dt": "Sales Order", + "target_parent_field": "per_ordered", + "target_dt": "Sales Order Item", + 'target_field': 'ordered_qty' + }) + pc_obj = frappe.get_doc('Purchase Common') self.check_for_stopped_status(pc_obj) diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json index ecc41d2059..70e08e5d26 100755 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -848,7 +848,7 @@ "bold": 0, "collapsible": 0, "fieldname": "prevdoc_doctype", - "fieldtype": "Data", + "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, "in_filter": 0, @@ -857,6 +857,7 @@ "no_copy": 1, "oldfieldname": "prevdoc_doctype", "oldfieldtype": "Data", + "options": "DocType", "permlevel": 0, "print_hide": 1, "read_only": 1, @@ -871,16 +872,16 @@ "bold": 0, "collapsible": 0, "fieldname": "prevdoc_docname", - "fieldtype": "Link", + "fieldtype": "Dynamic Link", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 1, "in_list_view": 0, - "label": "Material Request No", + "label": "Reference Name", "no_copy": 1, "oldfieldname": "prevdoc_docname", "oldfieldtype": "Link", - "options": "Material Request", + "options": "prevdoc_doctype", "permlevel": 0, "print_hide": 1, "print_width": "120px", diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index b087b8a884..d7f287be49 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -143,7 +143,7 @@ class SellingController(StockController): throw(_("Total allocated percentage for sales team should be 100")) def validate_order_type(self): - valid_types = ["Sales", "Maintenance", "Shopping Cart"] + valid_types = ["Sales", "Maintenance", "Shopping Cart", "Drop Shipment"] if not self.order_type: self.order_type = "Sales" elif self.order_type not in valid_types: diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js index 427cd89c22..510938a9d1 100644 --- a/erpnext/public/js/utils/party.js +++ b/erpnext/public/js/utils/party.js @@ -7,7 +7,7 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) { method = "erpnext.accounts.party.get_party_details"; } if(!args) { - if(frm.doc.customer) { + if(frm.doctype != "Purchase Order" && frm.doc.customer) { args = { party: frm.doc.customer, party_type: "Customer", diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 4a047e41ae..f46c16a510 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -25,7 +25,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( // doc.per_billed); // indent - if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1) + if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && doc.drop_ship!=1) cur_frm.add_custom_button(__('Material Request'), this.make_material_request); if(flt(doc.per_billed)==0) { @@ -37,19 +37,22 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( cur_frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Sales Order']) // maintenance - if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) { + if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1 && doc.drop_ship!=1) { cur_frm.add_custom_button(__('Maint. Visit'), this.make_maintenance_visit); cur_frm.add_custom_button(__('Maint. Schedule'), this.make_maintenance_schedule); } // delivery note - if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1) + if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && doc.drop_ship!=1) cur_frm.add_custom_button(__('Delivery'), this.make_delivery_note).addClass("btn-primary"); // sales invoice if(flt(doc.per_billed, 2) < 100) { cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary"); } + + if(doc.drop_ship==1 && flt(doc.per_ordered, 2) < 100) + cur_frm.add_custom_button(__('Make Shipment'), cur_frm.cscript.make_drop_shipment); } else { // un-stop @@ -145,6 +148,12 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( frappe.set_route("Form", doclist[0].doctype, doclist[0].name); } }); + }, + make_drop_shipment: function(){ + frappe.model.open_mapped_doc({ + method: "erpnext.selling.doctype.sales_order.sales_order.make_drop_shipment", + frm: cur_frm + }) } }); diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 5bc8ef4727..97f5d36989 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -86,7 +86,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Series", + "label": "Series", "no_copy": 1, "oldfieldname": "naming_series", "oldfieldtype": "Select", @@ -234,13 +234,14 @@ "bold": 0, "collapsible": 0, "default": "Sales", + "depends_on": "eval:doc.drop_ship!=1", "fieldname": "order_type", "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Order Type", + "label": "Order Type", "no_copy": 0, "oldfieldname": "order_type", "oldfieldtype": "Select", @@ -254,6 +255,28 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "drop_ship", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Drop Ship", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -381,6 +404,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "eval:doc.drop_ship!=1", "description": "", "fieldname": "po_no", "fieldtype": "Data", @@ -1134,7 +1158,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Apply Additional Discount On", + "label": "Apply Additional Discount On", "no_copy": 0, "options": "\nGrand Total\nNet Total", "permlevel": 0, @@ -1808,7 +1832,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Source", + "label": "Source", "no_copy": 0, "oldfieldname": "source", "oldfieldtype": "Select", @@ -1973,7 +1997,7 @@ "ignore_user_permissions": 0, "in_filter": 1, "in_list_view": 1, - "label": "Status", + "label": "Status", "no_copy": 1, "oldfieldname": "status", "oldfieldtype": "Select", @@ -1998,7 +2022,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Delivery Status", + "label": "Delivery Status", "no_copy": 1, "options": "Not Delivered\nFully Delivered\nPartly Delivered\nClosed\nNot Applicable", "permlevel": 0, @@ -2036,6 +2060,29 @@ "unique": 0, "width": "100px" }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "per_ordered", + "fieldtype": "Percent", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 1, + "in_list_view": 1, + "label": "% Ordered", + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0, + "width": "100px" + }, { "allow_on_submit": 0, "bold": 0, @@ -2092,7 +2139,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Billing Status", + "label": "Billing Status", "no_copy": 1, "options": "Not Billed\nFully Billed\nPartly Billed\nClosed", "permlevel": 0, @@ -2326,7 +2373,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Recurring Type", + "label": "Recurring Type", "no_copy": 1, "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly", "permlevel": 0, @@ -2553,7 +2600,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-03 07:39:10.525609", + "modified": "2015-10-15 15:27:34.592276", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 6cc12c53a9..25c8182649 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -488,3 +488,57 @@ def get_events(start, end, filters=None): "end": end }, as_dict=True, update={"allDay": 0}) return data + +@frappe.whitelist() +def make_drop_shipment(source_name, target_doc=None): + def postprocess(source, target): + set_missing_values(source, target) + + def set_missing_values(source, target): + target.address_display = "" + target.contact_display = "" + target.contact_mobile = "" + target.contact_email = "" + target.ignore_pricing_rule = 1 + target.run_method("set_missing_values") + target.run_method("calculate_taxes_and_totals") + + def update_item(source, target, source_parent): + target.base_amount = (flt(source.qty) - flt(source.ordered_qty)) * flt(source.base_rate) + target.amount = (flt(source.qty) - flt(source.ordered_qty)) * flt(source.rate) + target.qty = flt(source.qty) - flt(source.ordered_qty) + + doclist = get_mapped_doc("Sales Order", source_name, { + "Sales Order": { + "doctype": "Purchase Order", + "field_map": { + "address_display": "customer_address_display", + "contact_display": "customer_contact_display", + "contact_mobile": "customer_contact_mobile", + "contact_email": "customer_contact_email", + "contact_person": "customer_contact_person" + }, + "validation": { + "docstatus": ["=", 1] + } + }, + "Sales Order Item": { + "doctype": "Purchase Order Item", + "field_map": [ + ["name", "prevdoc_detail_docname"], + ["parent", "prevdoc_docname"], + ["parenttype", "prevdoc_doctype"], + ["uom", "stock_uom"] + ], + "postprocess": update_item, + "condition": lambda doc: doc.delivered_qty < doc.qty + }, + "Sales Taxes and Charges": { + "doctype": "Purchase Taxes and Charges", + "add_if_empty": True + } + }, target_doc, postprocess) + + + + return doclist diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index aab168eb98..312f8785e1 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -1,16 +1,16 @@ frappe.listview_settings['Sales Order'] = { add_fields: ["base_grand_total", "customer_name", "currency", "delivery_date", "per_delivered", "per_billed", - "status", "order_type"], + "status", "order_type", "per_ordered", "drop_ship"], get_indicator: function(doc) { if(doc.status==="Stopped") { return [__("Stopped"), "darkgrey", "status,=,Stopped"]; - } else if (doc.order_type !== "Maintenance" + } else if (doc.order_type !== "Maintenance" && doc.drop_ship !=1 && flt(doc.per_delivered, 2) < 100 && frappe.datetime.get_diff(doc.delivery_date) < 0) { // to bill & overdue return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Stopped"]; - } else if (doc.order_type !== "Maintenance" + } else if (doc.order_type !== "Maintenance" && doc.drop_ship !=1 && flt(doc.per_delivered, 2) < 100 && doc.status!=="Stopped") { // not delivered @@ -20,22 +20,43 @@ frappe.listview_settings['Sales Order'] = { return [__("To Deliver and Bill"), "orange", "per_delivered,<,100|per_billed,<,100|status,!=,Stopped"]; } else { - // not billed + // not delivered return [__("To Deliver"), "orange", "per_delivered,<,100|per_billed,=,100|status,!=,Stopped"]; } - } else if ((doc.order_type === "Maintenance" || flt(doc.per_delivered, 2) == 100) - && flt(doc.per_billed, 2) < 100 && doc.status!=="Stopped") { + } else if ((doc.order_type === "Maintenance" || flt(doc.per_delivered, 2) == 100 || + (doc.drop_ship == 1 && flt(doc.per_ordered, 2) == 100 ) ) && flt(doc.per_billed, 2) < 100 + && doc.status!=="Stopped") { // to bill - return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Stopped"]; + return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Stopped|per_ordered,<,100"]; } else if((doc.order_type === "Maintenance" || flt(doc.per_delivered, 2) == 100) && flt(doc.per_billed, 2) == 100 && doc.status!=="Stopped") { return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Stopped"]; + } else if ( doc.drop_ship == 1 && flt(doc.per_delivered, 2) < 100 + && frappe.datetime.get_diff(doc.delivery_date) < 0) { + // to bill & overdue + return [__("Overdue"), "red", "per_ordered,<,100|delivery_date,<,Today|status,!=,Stopped"]; + + } else if ( doc.drop_ship == 1 && flt(doc.per_ordered, 2) < 100 && doc.status!=="Stopped") { + // not ordered + + if(flt(doc.per_billed, 2) < 100) { + // not delivered & not billed + + return [__("To Order and Bill"), "orange", + "per_ordered,<,100|per_billed,<,100|status,!=,Stopped"]; + } else { + // not ordered + + return [__("To Deliver"), "orange", + "per_ordered,<,100|per_billed,=,100|status,!=,Stopped"]; + } + } }, onload: function(listview) { diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index c7e9e2f78c..4192100510 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -917,6 +917,28 @@ "unique": 0, "width": "70px" }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "ordered_qty", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Ordered Qty", + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, From 5b7e9a1c944b2d3f0c365c86f1fa2137a599ebf3 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 15 Oct 2015 17:27:46 +0530 Subject: [PATCH 07/59] [minor fixes] --- erpnext/buying/doctype/purchase_order/purchase_order.json | 3 ++- erpnext/controllers/selling_controller.py | 2 +- erpnext/selling/doctype/sales_order/sales_order.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index d0b454ef1c..98dbfbe116 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -151,6 +151,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "eval:doc.drop_ship==1", "fieldname": "customer", "fieldtype": "Link", "hidden": 0, @@ -174,7 +175,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval:doc.order_type==\"Drop Shipment\"", + "depends_on": "eval:doc.drop_ship==1", "fieldname": "customer_name", "fieldtype": "Data", "hidden": 0, diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index d7f287be49..b087b8a884 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -143,7 +143,7 @@ class SellingController(StockController): throw(_("Total allocated percentage for sales team should be 100")) def validate_order_type(self): - valid_types = ["Sales", "Maintenance", "Shopping Cart", "Drop Shipment"] + valid_types = ["Sales", "Maintenance", "Shopping Cart"] if not self.order_type: self.order_type = "Sales" elif self.order_type not in valid_types: diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 25c8182649..c9cda38756 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -499,6 +499,7 @@ def make_drop_shipment(source_name, target_doc=None): target.contact_display = "" target.contact_mobile = "" target.contact_email = "" + target.contact_person = "" target.ignore_pricing_rule = 1 target.run_method("set_missing_values") target.run_method("calculate_taxes_and_totals") From 8bd96f1c08885769ef73b4edbb7394358bef600c Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 15 Oct 2015 17:58:05 +0530 Subject: [PATCH 08/59] [Test Case] Test case to check drop shipping --- .../doctype/sales_order/test_sales_order.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 4fa88d42b0..d4819a5e09 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -295,12 +295,29 @@ class TestSalesOrder(unittest.TestCase): {"price_list": "_Test Price List", "item_code": "_Test Item for Auto Price List"}, "price_list_rate"), None) frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1) + + def test_drop_shipping(self): + from erpnext.selling.doctype.sales_order.sales_order import make_drop_shipment + from erpnext.stock.doctype.item.test_item import make_item + + item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 0, "is_sales_item": 1, + "is_purchase_item": 1}) + + so = make_sales_order(drop_ship=1, item_code=item.item_code) + po = make_drop_shipment(so.name) + + self.assertEquals(so.customer, po.customer) + self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order") + self.assertEquals(po.items[0].prevdoc_docname, so.name) def make_sales_order(**args): so = frappe.new_doc("Sales Order") args = frappe._dict(args) if args.transaction_date: so.transaction_date = args.transaction_date + + if args.drop_ship: + so.drop_ship = 1 so.company = args.company or "_Test Company" so.customer = args.customer or "_Test Customer" From 556536615e37447f7b8f2e1d9404ef5ed09cf4b0 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 15 Oct 2015 18:08:56 +0530 Subject: [PATCH 09/59] [minor fix] Status fix in listview --- erpnext/selling/doctype/sales_order/sales_order_list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index 312f8785e1..f9842a1b98 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -53,7 +53,7 @@ frappe.listview_settings['Sales Order'] = { } else { // not ordered - return [__("To Deliver"), "orange", + return [__("To Order"), "orange", "per_ordered,<,100|per_billed,=,100|status,!=,Stopped"]; } From c6dbe702562702e8bfb0889c7e5965e4781977a1 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 19 Oct 2015 14:17:52 +0530 Subject: [PATCH 10/59] [Fixes] Drop Shipping --- .../doctype/sales_invoice/sales_invoice.js | 9 +- .../doctype/sales_invoice/sales_invoice.py | 3 +- .../sales_invoice_item.json | 88 ++++++++++++++ erpnext/controllers/status_updater.py | 13 +- .../doctype/sales_order/sales_order.js | 112 ++++++++++++++---- .../doctype/sales_order/sales_order.json | 30 +---- .../doctype/sales_order/sales_order.py | 15 +-- .../doctype/sales_order/sales_order_list.js | 40 ++----- .../sales_order_item/sales_order_item.json | 89 ++++++++++++++ erpnext/stock/doctype/item/item.json | 22 ++++ erpnext/stock/get_item_details.py | 7 +- erpnext/stock/stock_balance.py | 4 +- 12 files changed, 337 insertions(+), 95 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 95e5a1c340..d89a39eb6b 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -50,6 +50,13 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte if(doc.update_stock) this.show_stock_ledger(); if(doc.docstatus==1 && !doc.is_return) { + + var flag_delivery_note = false; + + flag_delivery_note = cur_frm.doc.items.some(function(item){ + return item.is_drop_ship ? true : false; + }) + cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'), this.make_sales_return); @@ -61,7 +68,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte return item.delivery_note ? true : false; }); - if(!from_delivery_note) { + if(!from_delivery_note && flag_delivery_note) { cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Make Delivery Note']).addClass("btn-primary"); } } diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index a0b0c4eaca..dee2b7b0b8 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -667,7 +667,8 @@ def make_delivery_note(source_name, target_doc=None): "sales_order": "against_sales_order", "so_detail": "so_detail" }, - "postprocess": update_item + "postprocess": update_item, + "condition": lambda doc: doc.is_drop_ship!=1 }, "Sales Taxes and Charges": { "doctype": "Sales Taxes and Charges", diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index 32b2ccd3c6..c8a65f5995 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -680,6 +680,94 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "drop_ship", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Drop Ship", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "is_drop_ship", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Is Drop Ship Item", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "column_break_33", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "supplier", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Supplier", + "no_copy": 0, + "options": "Supplier", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 94cddeeac3..f666eedf4e 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -37,6 +37,7 @@ status_map = { ["Completed", "eval:self.order_type == 'Maintenance' and self.per_billed == 100 and self.docstatus == 1"], ["Stopped", "eval:self.status=='Stopped'"], ["Cancelled", "eval:self.docstatus==2"], + ["Closed", "eval:self.status=='Closed'"], ], "Purchase Order": [ ["Draft", None], @@ -210,6 +211,16 @@ class StatusUpdater(Document): def _update_percent_field(self, args): """Update percent field in parent transaction""" unique_transactions = set([d.get(args['percent_join_field']) for d in self.get_all_children(args['source_dt'])]) + + args["drop_ship_cond"] = '' + + if getattr(self, "drop_ship", None): + if self.drop_ship == 1: + args["drop_ship_cond"] = " and is_drop_ship=1 " + + else: + if self.doctype=="Delivery Note": + args["drop_ship_cond"] = " and is_drop_ship!=1 " for name in unique_transactions: if not name: @@ -223,7 +234,7 @@ class StatusUpdater(Document): set %(target_parent_field)s = round((select sum(if(%(target_ref_field)s > ifnull(%(target_field)s, 0), %(target_field)s, %(target_ref_field)s))/sum(%(target_ref_field)s)*100 - from `tab%(target_dt)s` where parent="%(name)s"), 2) %(set_modified)s + from `tab%(target_dt)s` where parent="%(name)s" %(drop_ship_cond)s), 2) %(set_modified)s where name='%(name)s'""" % args) # update field diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index f46c16a510..57162a1edb 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -15,9 +15,20 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( refresh: function(doc, dt, dn) { this._super(); this.frm.dashboard.reset(); - + var flag_drop_ship = false; + var flag_delivery_note = false; + if(doc.docstatus==1) { - if(doc.status != 'Stopped') { + if(doc.status != 'Stopped' && doc.status != 'Closed') { + + $.each(cur_frm.doc.items, function(i, item){ + if(item.is_drop_ship == 1){ + flag_drop_ship = true; + } + else{ + flag_delivery_note = true; + } + }) // cur_frm.dashboard.add_progress(cint(doc.per_delivered) + __("% Delivered"), // doc.per_delivered); @@ -25,7 +36,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( // doc.per_billed); // indent - if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && doc.drop_ship!=1) + if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1) cur_frm.add_custom_button(__('Material Request'), this.make_material_request); if(flt(doc.per_billed)==0) { @@ -33,30 +44,36 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } // stop - if(flt(doc.per_delivered, 2) < 100 || doc.per_billed < 100) - cur_frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Sales Order']) - - // maintenance - if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1 && doc.drop_ship!=1) { - cur_frm.add_custom_button(__('Maint. Visit'), this.make_maintenance_visit); - cur_frm.add_custom_button(__('Maint. Schedule'), this.make_maintenance_schedule); + if((flt(doc.per_delivered, 2) < 100 && flag_delivery_note) || doc.per_billed < 100 + || (flt(doc.per_ordered,2) < 100 && flag_drop_ship)){ + cur_frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Sales Order']) } + + + cur_frm.add_custom_button(__('Close'), cur_frm.cscript['Close Sales Order']) - // delivery note - if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && doc.drop_ship!=1) - cur_frm.add_custom_button(__('Delivery'), this.make_delivery_note).addClass("btn-primary"); + // maintenance + if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) { + cur_frm.add_custom_button(__('Maint. Visit'), this.make_maintenance_visit); + cur_frm.add_custom_button(__('Maint. Schedule'), this.make_maintenance_schedule); + } - // sales invoice - if(flt(doc.per_billed, 2) < 100) { - cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary"); - } - - if(doc.drop_ship==1 && flt(doc.per_ordered, 2) < 100) - cur_frm.add_custom_button(__('Make Shipment'), cur_frm.cscript.make_drop_shipment); + // delivery note + if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && flag_delivery_note) + cur_frm.add_custom_button(__('Delivery'), this.make_delivery_note).addClass("btn-primary"); + + // sales invoice + if(flt(doc.per_billed, 2) < 100) { + cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary"); + } + + if(flt(doc.per_ordered, 2) < 100 && flag_drop_ship) + cur_frm.add_custom_button(__('Make Shipment'), cur_frm.cscript.make_drop_shipment).addClass("btn-primary"); } else { // un-stop - cur_frm.add_custom_button(__('Unstop'), cur_frm.cscript['Unstop Sales Order']); + if( doc.status != 'Closed') + cur_frm.add_custom_button(__('Unstop'), cur_frm.cscript['Unstop Sales Order']); } } @@ -150,10 +167,36 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( }); }, make_drop_shipment: function(){ - frappe.model.open_mapped_doc({ - method: "erpnext.selling.doctype.sales_order.sales_order.make_drop_shipment", - frm: cur_frm - }) + var dialog = new frappe.ui.Dialog({ + title: __("For Supplier"), + fields: [ + {"fieldtype": "Link", "label": __("Supplier"), "fieldname": "supplier", "options":"Supplier", + "reqd": 1 }, + {"fieldtype": "Button", "label": __("Proceed"), "fieldname": "proceed"}, + ] + }); + + dialog.fields_dict.proceed.$input.click(function() { + args = dialog.get_values(); + if(!args) return; + dialog.hide(); + return frappe.call({ + type: "GET", + method: "erpnext.selling.doctype.sales_order.sales_order.make_drop_shipment", + args: { + "source_name": cur_frm.doc.name, + "for_supplier": args.supplier + }, + freeze: true, + callback: function(r) { + if(!r.exc) { + var doc = frappe.model.sync(r.message); + frappe.set_route("Form", r.message.doctype, r.message.name); + } + } + }) + }); + dialog.show(); } }); @@ -185,7 +228,24 @@ cur_frm.cscript['Stop Sales Order'] = function() { if (check) { return $c('runserverobj', { 'method':'stop_sales_order', - 'docs': doc + 'docs': doc, + 'arg': "Stopped" + }, function(r,rt) { + cur_frm.refresh(); + }); + } +} + +cur_frm.cscript['Close Sales Order'] = function(){ + var doc = cur_frm.doc; + + var check = confirm(__("Are you sure you want to CLOSE ") + doc.name); + + if (check) { + return $c('runserverobj', { + 'method':'stop_sales_order', + 'docs': doc, + 'arg': "Closed" }, function(r,rt) { cur_frm.refresh(); }); diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 97f5d36989..b8680b8428 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -234,7 +234,7 @@ "bold": 0, "collapsible": 0, "default": "Sales", - "depends_on": "eval:doc.drop_ship!=1", + "depends_on": "", "fieldname": "order_type", "fieldtype": "Select", "hidden": 0, @@ -255,28 +255,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "drop_ship", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Drop Ship", - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -404,7 +382,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval:doc.drop_ship!=1", + "depends_on": "", "description": "", "fieldname": "po_no", "fieldtype": "Data", @@ -2001,7 +1979,7 @@ "no_copy": 1, "oldfieldname": "status", "oldfieldtype": "Select", - "options": "\nDraft\nTo Deliver and Bill\nTo Bill\nTo Deliver\nCompleted\nStopped\nCancelled", + "options": "\nDraft\nTo Deliver and Bill\nTo Bill\nTo Deliver\nCompleted\nStopped\nCancelled\nClosed", "permlevel": 0, "print_hide": 1, "read_only": 1, @@ -2600,7 +2578,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-15 15:27:34.592276", + "modified": "2015-10-19 11:34:16.668148", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index c9cda38756..ab5ddbda60 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -214,9 +214,9 @@ class SalesOrder(SellingController): if date_diff and date_diff[0][0]: frappe.throw(_("{0} {1} has been modified. Please refresh.").format(self.doctype, self.name)) - def stop_sales_order(self): + def stop_sales_order(self, status): self.check_modified_date() - self.db_set('status', 'Stopped') + self.db_set('status', status) self.update_reserved_qty() self.notify_update() clear_doctype_notifications(self) @@ -350,7 +350,7 @@ def make_delivery_note(source_name, target_doc=None): "parent": "against_sales_order", }, "postprocess": update_item, - "condition": lambda doc: doc.delivered_qty < doc.qty + "condition": lambda doc: doc.delivered_qty < doc.qty and doc.is_drop_ship!=1 }, "Sales Taxes and Charges": { "doctype": "Sales Taxes and Charges", @@ -490,7 +490,7 @@ def get_events(start, end, filters=None): return data @frappe.whitelist() -def make_drop_shipment(source_name, target_doc=None): +def make_drop_shipment(source_name, for_supplier, target_doc=None): def postprocess(source, target): set_missing_values(source, target) @@ -500,7 +500,7 @@ def make_drop_shipment(source_name, target_doc=None): target.contact_mobile = "" target.contact_email = "" target.contact_person = "" - target.ignore_pricing_rule = 1 + target.drop_ship = 1 target.run_method("set_missing_values") target.run_method("calculate_taxes_and_totals") @@ -529,10 +529,11 @@ def make_drop_shipment(source_name, target_doc=None): ["name", "prevdoc_detail_docname"], ["parent", "prevdoc_docname"], ["parenttype", "prevdoc_doctype"], - ["uom", "stock_uom"] + ["uom", "stock_uom"], + ["delivery_date", "schedule_date"] ], "postprocess": update_item, - "condition": lambda doc: doc.delivered_qty < doc.qty + "condition": lambda doc: doc.ordered_qty < doc.qty and doc.is_drop_ship==1 and doc.supplier == for_supplier }, "Sales Taxes and Charges": { "doctype": "Purchase Taxes and Charges", diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index f9842a1b98..6c6254b3bc 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -1,16 +1,19 @@ frappe.listview_settings['Sales Order'] = { add_fields: ["base_grand_total", "customer_name", "currency", "delivery_date", "per_delivered", "per_billed", - "status", "order_type", "per_ordered", "drop_ship"], + "status", "order_type"], get_indicator: function(doc) { if(doc.status==="Stopped") { return [__("Stopped"), "darkgrey", "status,=,Stopped"]; - } else if (doc.order_type !== "Maintenance" && doc.drop_ship !=1 + } else if(doc.status==="Closed"){ + return [__("Closed"), "green", "status,=,Closed"]; + + } else if (doc.order_type !== "Maintenance" && flt(doc.per_delivered, 2) < 100 && frappe.datetime.get_diff(doc.delivery_date) < 0) { // to bill & overdue return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Stopped"]; - } else if (doc.order_type !== "Maintenance" && doc.drop_ship !=1 + } else if (doc.order_type !== "Maintenance" && flt(doc.per_delivered, 2) < 100 && doc.status!=="Stopped") { // not delivered @@ -20,43 +23,22 @@ frappe.listview_settings['Sales Order'] = { return [__("To Deliver and Bill"), "orange", "per_delivered,<,100|per_billed,<,100|status,!=,Stopped"]; } else { - // not delivered + // not billed return [__("To Deliver"), "orange", "per_delivered,<,100|per_billed,=,100|status,!=,Stopped"]; } - } else if ((doc.order_type === "Maintenance" || flt(doc.per_delivered, 2) == 100 || - (doc.drop_ship == 1 && flt(doc.per_ordered, 2) == 100 ) ) && flt(doc.per_billed, 2) < 100 - && doc.status!=="Stopped") { + } else if ((doc.order_type === "Maintenance" || flt(doc.per_delivered, 2) == 100) + && flt(doc.per_billed, 2) < 100 && doc.status!=="Stopped") { // to bill - return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Stopped|per_ordered,<,100"]; + return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Stopped"]; } else if((doc.order_type === "Maintenance" || flt(doc.per_delivered, 2) == 100) && flt(doc.per_billed, 2) == 100 && doc.status!=="Stopped") { return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Stopped"]; - } else if ( doc.drop_ship == 1 && flt(doc.per_delivered, 2) < 100 - && frappe.datetime.get_diff(doc.delivery_date) < 0) { - // to bill & overdue - return [__("Overdue"), "red", "per_ordered,<,100|delivery_date,<,Today|status,!=,Stopped"]; - - } else if ( doc.drop_ship == 1 && flt(doc.per_ordered, 2) < 100 && doc.status!=="Stopped") { - // not ordered - - if(flt(doc.per_billed, 2) < 100) { - // not delivered & not billed - - return [__("To Order and Bill"), "orange", - "per_ordered,<,100|per_billed,<,100|status,!=,Stopped"]; - } else { - // not ordered - - return [__("To Order"), "orange", - "per_ordered,<,100|per_billed,=,100|status,!=,Stopped"]; - } - } }, onload: function(listview) { @@ -71,4 +53,4 @@ frappe.listview_settings['Sales Order'] = { }); } -}; +}; \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index 4192100510..8acb16ae8e 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -683,6 +683,95 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "collapsible_depends_on": "eval:doc.is_drop_ship==1", + "fieldname": "drop_ship", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Drop Ship", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 1, + "bold": 0, + "collapsible": 0, + "fieldname": "is_drop_ship", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Is Drop Ship Item", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "column_break_32", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 1, + "bold": 0, + "collapsible": 0, + "fieldname": "supplier", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Supplier", + "no_copy": 0, + "options": "Supplier", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index bef4e25739..bd812a062a 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -246,6 +246,28 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "is_drop_ship", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Is Drop Ship", + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 1f0b63727c..8f47ebc68b 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -31,6 +31,7 @@ def get_item_details(args): "transaction_type": "selling", "ignore_pricing_rule": 0/1 "project_name": "", + "default_supplier":"" } """ args = process_args(args) @@ -69,7 +70,7 @@ def get_item_details(args): if args.get("is_subcontracted") == "Yes": out.bom = get_default_bom(args.item_code) - + return out def process_args(args): @@ -172,7 +173,9 @@ def get_basic_details(args, item): "base_amount": 0.0, "net_rate": 0.0, "net_amount": 0.0, - "discount_percentage": 0.0 + "discount_percentage": 0.0, + "supplier": item.default_supplier, + "is_drop_ship": item.is_drop_ship, }) # if default specified in item is for another company, fetch from company diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py index efc604bd91..b0654e28ae 100644 --- a/erpnext/stock/stock_balance.py +++ b/erpnext/stock/stock_balance.py @@ -90,7 +90,7 @@ def get_reserved_qty(item_code, warehouse): and parenttype="Sales Order" and item_code != parent_item and exists (select * from `tabSales Order` so - where name = dnpi_in.parent and docstatus = 1 and status != 'Stopped') + where name = dnpi_in.parent and docstatus = 1 and status not in ('Stopped','Closed')) ) dnpi) union (select qty as dnpi_qty, qty as so_item_qty, @@ -99,7 +99,7 @@ def get_reserved_qty(item_code, warehouse): where item_code = %s and warehouse = %s and exists(select * from `tabSales Order` so where so.name = so_item.parent and so.docstatus = 1 - and so.status != 'Stopped')) + and so.status not in ('Stopped','Closed'))) ) tab where so_item_qty >= so_item_delivered_qty From 98b287565a5781a1d4dfc8c7a22eb9e1b269d261 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 19 Oct 2015 15:16:17 +0530 Subject: [PATCH 11/59] [enhance] close purchase order --- .../doctype/purchase_order/purchase_order.js | 16 +++++++++- .../purchase_order/purchase_order.json | 4 +-- .../purchase_order/purchase_order_list.js | 2 ++ erpnext/controllers/status_updater.py | 1 + .../doctype/sales_order/sales_order.js | 30 +++++++++---------- erpnext/stock/stock_balance.py | 2 +- 6 files changed, 36 insertions(+), 19 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 6ae83d0f00..9a701595c5 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -19,11 +19,13 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( this._super(); // this.frm.dashboard.reset(); - if(doc.docstatus == 1 && doc.status != 'Stopped') { + if(doc.docstatus == 1 && doc.status != 'Stopped' && doc.status != 'Closed') { if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) cur_frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Purchase Order']); + cur_frm.add_custom_button(__('Close'), cur_frm.cscript['Close Purchase Order']); + if(flt(doc.per_billed)==0) { cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry); } @@ -223,6 +225,18 @@ cur_frm.cscript['Unstop Purchase Order'] = function() { } } +cur_frm.cscript['Close Purchase Order'] = function() { + var doc = cur_frm.doc; + var check = confirm(__("Do you really want to Close ") + doc.name); + + if (check) { + return $c('runserverobj', args={'method':'update_status', 'arg': 'Closed', 'docs':doc}, function(r,rt) { + cur_frm.refresh(); + }); + } +} + + cur_frm.pformat.indent_no = function(doc, cdt, cdn){ //function to make row of table diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 98dbfbe116..5f15675de7 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -1684,7 +1684,7 @@ "no_copy": 1, "oldfieldname": "status", "oldfieldtype": "Select", - "options": "\nDraft\nTo Receive and Bill\nTo Bill\nTo Receive\nCompleted\nStopped\nCancelled", + "options": "\nDraft\nTo Receive and Bill\nTo Bill\nTo Receive\nCompleted\nStopped\nCancelled\nClosed", "permlevel": 0, "print_hide": 1, "read_only": 1, @@ -2238,7 +2238,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-16 06:13:50.058318", + "modified": "2015-10-19 14:23:14.190768", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js index 7f0ab658ef..ad83fb2f27 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js @@ -4,6 +4,8 @@ frappe.listview_settings['Purchase Order'] = { get_indicator: function(doc) { if(doc.status==="Stopped") { return [__("Stopped"), "darkgrey", "status,=,Stopped"]; + } else if(doc.status==="Closed"){ + return [__("Closed"), "green", "status,=,Closed"]; } else if(flt(doc.per_received, 2) < 100 && doc.status!=="Stopped") { if(flt(doc.per_billed, 2) < 100) { return [__("To Receive and Bill"), "orange", diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index f666eedf4e..69e2d3e7b2 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -47,6 +47,7 @@ status_map = { ["Completed", "eval:self.per_received == 100 and self.per_billed == 100 and self.docstatus == 1"], ["Stopped", "eval:self.status=='Stopped'"], ["Cancelled", "eval:self.docstatus==2"], + ["Closed", "eval:self.status=='Closed'"], ], "Delivery Note": [ ["Draft", None], diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 57162a1edb..7a2bdb0fa0 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -236,6 +236,21 @@ cur_frm.cscript['Stop Sales Order'] = function() { } } +cur_frm.cscript['Unstop Sales Order'] = function() { + var doc = cur_frm.doc; + + var check = confirm(__("Are you sure you want to UNSTOP ") + doc.name); + + if (check) { + return $c('runserverobj', { + 'method':'unstop_sales_order', + 'docs': doc + }, function(r,rt) { + cur_frm.refresh(); + }); + } +} + cur_frm.cscript['Close Sales Order'] = function(){ var doc = cur_frm.doc; @@ -252,21 +267,6 @@ cur_frm.cscript['Close Sales Order'] = function(){ } } -cur_frm.cscript['Unstop Sales Order'] = function() { - var doc = cur_frm.doc; - - var check = confirm(__("Are you sure you want to UNSTOP ") + doc.name); - - if (check) { - return $c('runserverobj', { - 'method':'unstop_sales_order', - 'docs': doc - }, function(r,rt) { - cur_frm.refresh(); - }); - } -} - cur_frm.cscript.on_submit = function(doc, cdt, cdn) { if(cint(frappe.boot.notification_settings.sales_order)) { cur_frm.email_doc(frappe.boot.notification_settings.sales_order_message); diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py index b0654e28ae..b1e8b22063 100644 --- a/erpnext/stock/stock_balance.py +++ b/erpnext/stock/stock_balance.py @@ -122,7 +122,7 @@ def get_ordered_qty(item_code, warehouse): from `tabPurchase Order Item` po_item, `tabPurchase Order` po where po_item.item_code=%s and po_item.warehouse=%s and po_item.qty > ifnull(po_item.received_qty, 0) and po_item.parent=po.name - and po.status!='Stopped' and po.docstatus=1""", (item_code, warehouse)) + and po.status not in ('Stopped', 'Closed') and po.docstatus=1""", (item_code, warehouse)) return flt(ordered_qty[0][0]) if ordered_qty else 0 From bd65cb88170c599c0a0f31f1c36607b59de0195d Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 19 Oct 2015 16:29:16 +0530 Subject: [PATCH 12/59] [fixes] field rename and test case for drop ship --- .../purchase_order/purchase_order.json | 14 ++-- .../doctype/sales_order/sales_order.py | 3 + .../doctype/sales_order/test_sales_order.py | 76 +++++++++++++------ 3 files changed, 61 insertions(+), 32 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 5f15675de7..3d74f247dd 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -151,7 +151,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval:doc.drop_ship==1", + "depends_on": "eval:doc.is_drop_ship==1", "fieldname": "customer", "fieldtype": "Link", "hidden": 0, @@ -175,7 +175,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval:doc.drop_ship==1", + "depends_on": "eval:doc.is_drop_ship==1", "fieldname": "customer_name", "fieldtype": "Data", "hidden": 0, @@ -465,13 +465,13 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "drop_ship", + "fieldname": "is_drop_ship", "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Drop Ship", + "label": "Is Drop Ship", "no_copy": 0, "permlevel": 0, "precision": "", @@ -1561,7 +1561,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval:doc.drop_ship==1", + "depends_on": "eval:doc.is_drop_ship==1", "fieldname": "customer_address", "fieldtype": "Link", "hidden": 0, @@ -1627,7 +1627,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval:doc.drop_ship==1", + "depends_on": "eval:doc.is_drop_ship==1", "fieldname": "customer_contact_person", "fieldtype": "Link", "hidden": 0, @@ -2238,7 +2238,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-19 14:23:14.190768", + "modified": "2015-10-19 15:58:28.388829", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index ab5ddbda60..911f4b7f75 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -505,6 +505,9 @@ def make_drop_shipment(source_name, for_supplier, target_doc=None): target.run_method("calculate_taxes_and_totals") def update_item(source, target, source_parent): + target.schedule_date = source_parent.delivery_date + target.rate = '' + target.price_list_rate = '' target.base_amount = (flt(source.qty) - flt(source.ordered_qty)) * flt(source.base_rate) target.amount = (flt(source.qty) - flt(source.ordered_qty)) * flt(source.rate) target.qty = flt(source.qty) - flt(source.ordered_qty) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index d4819a5e09..281ba28ec8 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -296,28 +296,50 @@ class TestSalesOrder(unittest.TestCase): frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1) - def test_drop_shipping(self): - from erpnext.selling.doctype.sales_order.sales_order import make_drop_shipment - from erpnext.stock.doctype.item.test_item import make_item - - item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 0, "is_sales_item": 1, - "is_purchase_item": 1}) - - so = make_sales_order(drop_ship=1, item_code=item.item_code) - po = make_drop_shipment(so.name) - - self.assertEquals(so.customer, po.customer) - self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order") - self.assertEquals(po.items[0].prevdoc_docname, so.name) + # def test_drop_shipping(self): + # from erpnext.selling.doctype.sales_order.sales_order import make_drop_shipment, make_delivery_note + # from erpnext.stock.doctype.item.test_item import make_item + # + # po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 0, "is_sales_item": 1, + # "is_purchase_item": 1, "is_drop_ship": 1, 'default_supplier': '_Test Supplier'}) + # + # dn_item = make_item("_Test Regular Item", {"is_stock_item": 0, "is_sales_item": 1, + # "is_purchase_item": 1}) + # + # so_items = [ + # { + # "item_code": po_item.item_code, + # "warehouse": "_Test Warehouse - _TC", + # "qty": 1, + # "rate": 400, + # "conversion_factor": 1.0, + # "is_drop_ship": 1, + # "supplier": '_Test Supplier' + # }, + # { + # "item_code": dn_item.item_code, + # "warehouse": "_Test Warehouse - _TC", + # "qty": 1, + # "rate": 300, + # "conversion_factor": 1.0 + # } + # ] + # + # so = make_sales_order(items=so_items) + # po = make_drop_shipment(so.name, '_Test Supplier') + # dn = make_delivery_note(so.name) + # + # self.assertEquals(so.customer, po.customer) + # self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order") + # self.assertEquals(po.items[0].prevdoc_docname, so.name) + # self.assertEquals(po.items[0].item_code, po_item.item_code) + # self.assertEquals(dn.items[0].item_code, dn.item_code) def make_sales_order(**args): so = frappe.new_doc("Sales Order") args = frappe._dict(args) if args.transaction_date: so.transaction_date = args.transaction_date - - if args.drop_ship: - so.drop_ship = 1 so.company = args.company or "_Test Company" so.customer = args.customer or "_Test Customer" @@ -328,15 +350,19 @@ def make_sales_order(**args): if "warehouse" not in args: args.warehouse = "_Test Warehouse - _TC" - - so.append("items", { - "item_code": args.item or args.item_code or "_Test Item", - "warehouse": args.warehouse, - "qty": args.qty or 10, - "rate": args.rate or 100, - "conversion_factor": 1.0, - }) - + + if args.items: + so.items = args.items + + else: + so.append("items", { + "item_code": args.item or args.item_code or "_Test Item", + "warehouse": args.warehouse, + "qty": args.qty or 10, + "rate": args.rate or 100, + "conversion_factor": 1.0, + }) + if not args.do_not_save: so.insert() if not args.do_not_submit: From 1a9646739a97595ee13f64364f0f44e24aeb687c Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 19 Oct 2015 16:45:46 +0530 Subject: [PATCH 13/59] [fixes][rename-field-name] drop_ship to is_drop_ship --- erpnext/buying/doctype/purchase_order/purchase_order.py | 4 ++-- erpnext/controllers/status_updater.py | 4 ++-- erpnext/selling/doctype/sales_order/sales_order.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 234c643642..8f5c63d138 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -162,7 +162,7 @@ class PurchaseOrder(BuyingController): clear_doctype_notifications(self) def on_submit(self): - if self.drop_ship == 1: + if self.is_drop_ship == 1: self.status_updater[0].update({ "target_parent_dt": "Sales Order", "target_parent_field": "per_ordered", @@ -184,7 +184,7 @@ class PurchaseOrder(BuyingController): purchase_controller.update_last_purchase_rate(self, is_submit = 1) def on_cancel(self): - if self.drop_ship == 1: + if self.is_drop_ship == 1: self.status_updater[0].update({ "target_parent_dt": "Sales Order", "target_parent_field": "per_ordered", diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 69e2d3e7b2..0861f37f5b 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -215,8 +215,8 @@ class StatusUpdater(Document): args["drop_ship_cond"] = '' - if getattr(self, "drop_ship", None): - if self.drop_ship == 1: + if getattr(self, "is_drop_ship", None): + if self.is_drop_ship == 1: args["drop_ship_cond"] = " and is_drop_ship=1 " else: diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 911f4b7f75..0e7ca96335 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -500,7 +500,7 @@ def make_drop_shipment(source_name, for_supplier, target_doc=None): target.contact_mobile = "" target.contact_email = "" target.contact_person = "" - target.drop_ship = 1 + target.is_drop_ship = 1 target.run_method("set_missing_values") target.run_method("calculate_taxes_and_totals") From 99543f72d8f72eed9cf850a78c5798c7aecac89b Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 19 Oct 2015 17:12:21 +0530 Subject: [PATCH 14/59] [fixes] test case for drop shipping and minor fixes for test_reserved_qty_for_partial_delivery & test_reserved_qty_for_partial_delivery_with_packing_list --- .../doctype/sales_order/test_sales_order.py | 85 ++++++++++--------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 281ba28ec8..9d08899906 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -97,7 +97,7 @@ class TestSalesOrder(unittest.TestCase): # stop so so.load_from_db() - so.stop_sales_order() + so.stop_sales_order("Stopped") self.assertEqual(get_reserved_qty(), existing_reserved_qty) # unstop so @@ -147,7 +147,7 @@ class TestSalesOrder(unittest.TestCase): # stop so so.load_from_db() - so.stop_sales_order() + so.stop_sales_order("Stopped") self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1) self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2) @@ -296,44 +296,44 @@ class TestSalesOrder(unittest.TestCase): frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1) - # def test_drop_shipping(self): - # from erpnext.selling.doctype.sales_order.sales_order import make_drop_shipment, make_delivery_note - # from erpnext.stock.doctype.item.test_item import make_item - # - # po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 0, "is_sales_item": 1, - # "is_purchase_item": 1, "is_drop_ship": 1, 'default_supplier': '_Test Supplier'}) - # - # dn_item = make_item("_Test Regular Item", {"is_stock_item": 0, "is_sales_item": 1, - # "is_purchase_item": 1}) - # - # so_items = [ - # { - # "item_code": po_item.item_code, - # "warehouse": "_Test Warehouse - _TC", - # "qty": 1, - # "rate": 400, - # "conversion_factor": 1.0, - # "is_drop_ship": 1, - # "supplier": '_Test Supplier' - # }, - # { - # "item_code": dn_item.item_code, - # "warehouse": "_Test Warehouse - _TC", - # "qty": 1, - # "rate": 300, - # "conversion_factor": 1.0 - # } - # ] - # - # so = make_sales_order(items=so_items) - # po = make_drop_shipment(so.name, '_Test Supplier') - # dn = make_delivery_note(so.name) - # - # self.assertEquals(so.customer, po.customer) - # self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order") - # self.assertEquals(po.items[0].prevdoc_docname, so.name) - # self.assertEquals(po.items[0].item_code, po_item.item_code) - # self.assertEquals(dn.items[0].item_code, dn.item_code) + def test_drop_shipping(self): + from erpnext.selling.doctype.sales_order.sales_order import make_drop_shipment, make_delivery_note + from erpnext.stock.doctype.item.test_item import make_item + + po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 0, "is_sales_item": 1, + "is_purchase_item": 1, "is_drop_ship": 1, 'default_supplier': '_Test Supplier'}) + + dn_item = make_item("_Test Regular Item", {"is_stock_item": 0, "is_sales_item": 1, + "is_purchase_item": 1}) + + so_items = [ + { + "item_code": po_item.item_code, + "warehouse": "_Test Warehouse - _TC", + "qty": 1, + "rate": 400, + "conversion_factor": 1.0, + "is_drop_ship": 1, + "supplier": '_Test Supplier' + }, + { + "item_code": dn_item.item_code, + "warehouse": "_Test Warehouse - _TC", + "qty": 1, + "rate": 300, + "conversion_factor": 1.0 + } + ] + + so = make_sales_order(item_list=so_items) + po = make_drop_shipment(so.name, '_Test Supplier') + dn = make_delivery_note(so.name) + + self.assertEquals(so.customer, po.customer) + self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order") + self.assertEquals(po.items[0].prevdoc_docname, so.name) + self.assertEquals(po.items[0].item_code, po_item.item_code) + self.assertEquals(dn.items[0].item_code, dn_item.item_code) def make_sales_order(**args): so = frappe.new_doc("Sales Order") @@ -351,8 +351,9 @@ def make_sales_order(**args): if "warehouse" not in args: args.warehouse = "_Test Warehouse - _TC" - if args.items: - so.items = args.items + if args.item_list: + for item in args.item_list: + so.append("items", item) else: so.append("items", { From e930f0f74e8ec023e3c68be1cc59ecf98974ff4a Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 20 Oct 2015 13:34:21 +0530 Subject: [PATCH 15/59] [fixes] filter on supplier list for DropShip, checking closed status --- .../doctype/sales_invoice/sales_invoice.py | 4 +-- erpnext/controllers/selling_controller.py | 4 ++- .../doctype/sales_order/sales_order.js | 13 +++++--- .../doctype/sales_order/sales_order.py | 31 +++++++++++++++++++ .../doctype/delivery_note/delivery_note.py | 4 +-- 5 files changed, 47 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index dee2b7b0b8..60fdc1a710 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -52,7 +52,7 @@ class SalesInvoice(SellingController): self.validate_proj_cust() self.validate_with_previous_doc() self.validate_uom_is_integer("stock_uom", "qty") - self.check_stop_sales_order("sales_order") + self.check_stop_or_close_sales_order("sales_order") self.validate_debit_to_acc() self.validate_fixed_asset_account() self.clear_unallocated_advances("Sales Invoice Advance", "advances") @@ -117,7 +117,7 @@ class SalesInvoice(SellingController): if cint(self.update_stock) == 1: self.update_stock_ledger() - self.check_stop_sales_order("sales_order") + self.check_stop_or_close_sales_order("sales_order") from erpnext.accounts.utils import remove_against_link_from_jv remove_against_link_from_jv(self.doctype, self.name) diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index b087b8a884..7135baf02a 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -219,12 +219,14 @@ class SellingController(StockController): so_warehouse = so_item and so_item[0]["warehouse"] or "" return so_qty, so_warehouse - def check_stop_sales_order(self, ref_fieldname): + def check_stop_or_close_sales_order(self, ref_fieldname): for d in self.get("items"): if d.get(ref_fieldname): status = frappe.db.get_value("Sales Order", d.get(ref_fieldname), "status") if status == "Stopped": frappe.throw(_("Sales Order {0} is stopped").format(d.get(ref_fieldname))) + if status == "Closed": + frappe.throw(_("Sales Order {0} is closed").format(d.get(ref_fieldname))) def check_active_sales_items(obj): for d in obj.get("items"): diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 7a2bdb0fa0..71e52150fb 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -22,7 +22,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( if(doc.status != 'Stopped' && doc.status != 'Closed') { $.each(cur_frm.doc.items, function(i, item){ - if(item.is_drop_ship == 1){ + if(item.is_drop_ship == 1 || item.supplier){ flag_drop_ship = true; } else{ @@ -68,7 +68,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } if(flt(doc.per_ordered, 2) < 100 && flag_drop_ship) - cur_frm.add_custom_button(__('Make Shipment'), cur_frm.cscript.make_drop_shipment).addClass("btn-primary"); + cur_frm.add_custom_button(__('Make Purchase Order'), cur_frm.cscript.make_purchase_order).addClass("btn-primary"); } else { // un-stop @@ -166,12 +166,17 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } }); }, - make_drop_shipment: function(){ + make_purchase_order: function(){ var dialog = new frappe.ui.Dialog({ title: __("For Supplier"), fields: [ {"fieldtype": "Link", "label": __("Supplier"), "fieldname": "supplier", "options":"Supplier", - "reqd": 1 }, + "get_query": function () { + return { + query:"erpnext.selling.doctype.sales_order.sales_order.get_supplier", + filters: {'parent': cur_frm.doc.name} + } + }, "reqd": 1 }, {"fieldtype": "Button", "label": __("Proceed"), "fieldname": "proceed"}, ] }); diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 0e7ca96335..69ec248dd9 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -495,6 +495,8 @@ def make_drop_shipment(source_name, for_supplier, target_doc=None): set_missing_values(source, target) def set_missing_values(source, target): + target.supplier = for_supplier + target.buying_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list") or 'Standard Buying' target.address_display = "" target.contact_display = "" target.contact_mobile = "" @@ -547,3 +549,32 @@ def make_drop_shipment(source_name, for_supplier, target_doc=None): return doclist + +@frappe.whitelist() +def get_supplier(doctype, txt, searchfield, start, page_len, filters): + supp_master_name = frappe.defaults.get_user_default("supp_master_name") + if supp_master_name == "Supplier Name": + fields = ["name", "supplier_type"] + else: + fields = ["name", "supplier_name", "supplier_type"] + fields = ", ".join(fields) + + return frappe.db.sql("""select {field} from `tabSupplier` + where docstatus < 2 + and ({key} like %(txt)s + or supplier_name like %(txt)s) + and name in (select supplier from `tabSales Order Item` where parent = %(parent)s) + order by + if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999), + if(locate(%(_txt)s, supplier_name), locate(%(_txt)s, supplier_name), 99999), + name, supplier_name + limit %(start)s, %(page_len)s """.format(**{ + 'field': fields, + 'key': searchfield + }), { + 'txt': "%%%s%%" % txt, + '_txt': txt.replace("%", ""), + 'start': start, + 'page_len': page_len, + 'parent': filters.get('parent') + }) \ No newline at end of file diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 6339752634..70f28c6f64 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -106,7 +106,7 @@ class DeliveryNote(SellingController): self.set_status() self.so_required() self.validate_proj_cust() - self.check_stop_sales_order("against_sales_order") + self.check_stop_or_close_sales_order("against_sales_order") self.validate_for_items() self.validate_warehouse() self.validate_uom_is_integer("stock_uom", "qty") @@ -203,7 +203,7 @@ class DeliveryNote(SellingController): def on_cancel(self): - self.check_stop_sales_order("against_sales_order") + self.check_stop_or_close_sales_order("against_sales_order") self.check_next_docstatus() self.update_prevdoc_status() From a4efbf0db703071c5b6b31fdc7baf63d49c9f344 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 20 Oct 2015 14:24:33 +0530 Subject: [PATCH 16/59] [fixes] check for close status --- .../doctype/purchase_invoice/purchase_invoice.py | 12 +++++++----- .../doctype/purchase_common/purchase_common.py | 12 +++++++----- .../buying/doctype/purchase_order/purchase_order.py | 8 ++++---- .../doctype/material_request/material_request.py | 2 +- .../doctype/purchase_receipt/purchase_receipt.py | 8 ++++---- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index af41ef5bd4..91b01d5103 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -48,7 +48,7 @@ class PurchaseInvoice(BuyingController): self.check_conversion_rate() self.validate_credit_to_acc() self.clear_unallocated_advances("Purchase Invoice Advance", "advances") - self.check_for_stopped_status() + self.check_for_stopped_or_closed_status() self.validate_with_previous_doc() self.validate_uom_is_integer("uom", "qty") self.set_against_expense_account() @@ -103,14 +103,14 @@ class PurchaseInvoice(BuyingController): self.party_account_currency = account.account_currency - def check_for_stopped_status(self): + def check_for_stopped_or_closed_status(self): check_list = [] + pc_obj = frappe.get_doc('Purchase Common') + for d in self.get('items'): if d.purchase_order and not d.purchase_order in check_list and not d.purchase_receipt: check_list.append(d.purchase_order) - stopped = frappe.db.sql("select name from `tabPurchase Order` where status = 'Stopped' and name = %s", d.purchase_order) - if stopped: - throw(_("Purchase Order {0} is 'Stopped'").format(d.purchase_order)) + pc_obj.check_for_stopped_or_closed_status('Purchase Order', d.purchase_order) def validate_with_previous_doc(self): super(PurchaseInvoice, self).validate_with_previous_doc({ @@ -394,6 +394,8 @@ class PurchaseInvoice(BuyingController): make_gl_entries(gl_entries, cancel=(self.docstatus == 2)) def on_cancel(self): + self.check_for_stopped_or_closed_status() + if not self.is_return: from erpnext.accounts.utils import remove_against_link_from_jv remove_against_link_from_jv(self.doctype, self.name) diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py index 030d6a276e..3cdb5a064b 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.py +++ b/erpnext/buying/doctype/purchase_common/purchase_common.py @@ -80,11 +80,13 @@ class PurchaseCommon(BuyingController): frappe.msgprint(_("Warning: Same item has been entered multiple times.")) - def check_for_stopped_status(self, doctype, docname): - stopped = frappe.db.sql("""select name from `tab%s` where name = %s and - status = 'Stopped'""" % (doctype, '%s'), docname) - if stopped: - frappe.throw(_("{0} {1} status is 'Stopped'").format(doctype, docname), frappe.InvalidStatusError) + def check_for_stopped_or_closed_status(self, doctype, docname): + status = frappe.db.get_value(doctype, docname, "status") + + if status == "Stopped": + frappe.throw(_("{0} {1} status is Stopped").format(doctype, docname), frappe.InvalidStatusError) + if status == "Closed": + frappe.throw(_("{0} {1} status is Closed").format(doctype, docname), frappe.InvalidStatusError) def check_docstatus(self, check, doctype, docname, detail_doctype = ''): if check == 'Next': diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 8f5c63d138..9e0649ba34 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -39,7 +39,7 @@ class PurchaseOrder(BuyingController): self.set_status() pc_obj = frappe.get_doc('Purchase Common') pc_obj.validate_for_items(self) - self.check_for_stopped_status(pc_obj) + self.check_for_stopped_or_closed_status(pc_obj) self.validate_uom_is_integer("uom", "qty") self.validate_uom_is_integer("stock_uom", ["qty", "required_qty"]) @@ -108,12 +108,12 @@ class PurchaseOrder(BuyingController): = d.rate = item_last_purchase_rate # Check for Stopped status - def check_for_stopped_status(self, pc_obj): + def check_for_stopped_or_closed_status(self, pc_obj): check_list =[] for d in self.get('items'): if d.meta.get_field('prevdoc_docname') and d.prevdoc_docname and d.prevdoc_docname not in check_list: check_list.append(d.prevdoc_docname) - pc_obj.check_for_stopped_status( d.prevdoc_doctype, d.prevdoc_docname) + pc_obj.check_for_stopped_or_closed_status( d.prevdoc_doctype, d.prevdoc_docname) def update_requested_qty(self): material_request_map = {} @@ -193,7 +193,7 @@ class PurchaseOrder(BuyingController): }) pc_obj = frappe.get_doc('Purchase Common') - self.check_for_stopped_status(pc_obj) + self.check_for_stopped_or_closed_status(pc_obj) # Check if Purchase Receipt has been submitted against current Purchase Order pc_obj.check_docstatus(check = 'Next', doctype = 'Purchase Receipt', docname = self.name, detail_doctype = 'Purchase Receipt Item') diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 38238c7ded..9ca4758854 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -103,7 +103,7 @@ class MaterialRequest(BuyingController): def on_cancel(self): pc_obj = frappe.get_doc('Purchase Common') - pc_obj.check_for_stopped_status(self.doctype, self.name) + pc_obj.check_for_stopped_or_closed_status(self.doctype, self.name) pc_obj.check_docstatus(check = 'Next', doctype = 'Purchase Order', docname = self.name, detail_doctype = 'Purchase Order Item') self.update_requested_qty() diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 1ca81b66d9..e4d32ea9d0 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -67,7 +67,7 @@ class PurchaseReceipt(BuyingController): pc_obj = frappe.get_doc('Purchase Common') pc_obj.validate_for_items(self) - self.check_for_stopped_status(pc_obj) + self.check_for_stopped_or_closed_status(pc_obj) # sub-contracting self.validate_for_subcontracting() @@ -219,12 +219,12 @@ class PurchaseReceipt(BuyingController): raise frappe.ValidationError # Check for Stopped status - def check_for_stopped_status(self, pc_obj): + def check_for_stopped_or_closed_status(self, pc_obj): check_list =[] for d in self.get('items'): if d.meta.get_field('prevdoc_docname') and d.prevdoc_docname and d.prevdoc_docname not in check_list: check_list.append(d.prevdoc_docname) - pc_obj.check_for_stopped_status(d.prevdoc_doctype, d.prevdoc_docname) + pc_obj.check_for_stopped_or_closed_status(d.prevdoc_doctype, d.prevdoc_docname) # on submit def on_submit(self): @@ -260,7 +260,7 @@ class PurchaseReceipt(BuyingController): def on_cancel(self): pc_obj = frappe.get_doc('Purchase Common') - self.check_for_stopped_status(pc_obj) + self.check_for_stopped_or_closed_status(pc_obj) # Check if Purchase Invoice has been submitted against current Purchase Order submitted = frappe.db.sql("""select t1.name from `tabPurchase Invoice` t1,`tabPurchase Invoice Item` t2 From 5e0b0b4b971e692efd35f9fb866f0599ab404698 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 20 Oct 2015 16:27:16 +0530 Subject: [PATCH 17/59] [enhance] make PO from SO if supplier is specified --- .../doctype/sales_invoice/sales_invoice.py | 2 +- .../sales_invoice_item/sales_invoice_item.json | 7 ++++--- erpnext/controllers/status_updater.py | 2 +- erpnext/selling/doctype/sales_order/sales_order.py | 14 ++++++++++++-- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 60fdc1a710..11cd5d8073 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -668,7 +668,7 @@ def make_delivery_note(source_name, target_doc=None): "so_detail": "so_detail" }, "postprocess": update_item, - "condition": lambda doc: doc.is_drop_ship!=1 + "condition": lambda doc: (doc.is_drop_ship!=1 and not doc.supplier) }, "Sales Taxes and Charges": { "doctype": "Sales Taxes and Charges", diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index c8a65f5995..44f69cb923 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -683,7 +683,8 @@ { "allow_on_submit": 0, "bold": 0, - "collapsible": 0, + "collapsible": 1, + "collapsible_depends_on": "eval:doc.is_drop_ship==1", "fieldname": "drop_ship", "fieldtype": "Section Break", "hidden": 0, @@ -1370,8 +1371,8 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-10-19 03:04:52.093181", - "modified_by": "Administrator", + "modified": "2015-10-20 15:54:03.318846", + "modified_by": "saurabh6790@gmail.com", "module": "Accounts", "name": "Sales Invoice Item", "owner": "Administrator", diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 0861f37f5b..f7a0939444 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -221,7 +221,7 @@ class StatusUpdater(Document): else: if self.doctype=="Delivery Note": - args["drop_ship_cond"] = " and is_drop_ship!=1 " + args["drop_ship_cond"] = " and is_drop_ship!=1 and supplier = '' " for name in unique_transactions: if not name: diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 69ec248dd9..630494a6cf 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -31,6 +31,7 @@ class SalesOrder(SellingController): self.validate_uom_is_integer("stock_uom", "qty") self.validate_for_items() self.validate_warehouse() + self.validate_drop_ship() from erpnext.stock.doctype.packed_item.packed_item import make_packing_list make_packing_list(self) @@ -147,6 +148,11 @@ class SalesOrder(SellingController): doc.set_status(update=True) doc.update_opportunity() + def validate_drop_ship(self): + for d in self.get('items'): + if d.is_drop_ship and not d.supplier: + frappe.throw(_("#{0} Set Supplier for item {1}").format(d.idx, d.item_code)) + def on_submit(self): super(SalesOrder, self).on_submit() @@ -252,6 +258,9 @@ class SalesOrder(SellingController): def on_update(self): pass + + def before_update_after_submit(self): + self.validate_drop_ship() def get_list_context(context=None): from erpnext.controllers.website_list_for_contact import get_list_context @@ -350,7 +359,7 @@ def make_delivery_note(source_name, target_doc=None): "parent": "against_sales_order", }, "postprocess": update_item, - "condition": lambda doc: doc.delivered_qty < doc.qty and doc.is_drop_ship!=1 + "condition": lambda doc: doc.delivered_qty < doc.qty and (doc.is_drop_ship!=1 and not doc.supplier) }, "Sales Taxes and Charges": { "doctype": "Sales Taxes and Charges", @@ -378,6 +387,7 @@ def make_sales_invoice(source_name, target_doc=None): target.run_method("calculate_taxes_and_totals") def update_item(source, target, source_parent): + target.supplier = source.supplier target.amount = flt(source.amount) - flt(source.billed_amt) target.base_amount = target.amount * flt(source_parent.conversion_rate) target.qty = target.amount / flt(source.rate) if (source.rate and source.billed_amt) else source.qty @@ -538,7 +548,7 @@ def make_drop_shipment(source_name, for_supplier, target_doc=None): ["delivery_date", "schedule_date"] ], "postprocess": update_item, - "condition": lambda doc: doc.ordered_qty < doc.qty and doc.is_drop_ship==1 and doc.supplier == for_supplier + "condition": lambda doc: doc.ordered_qty < doc.qty and doc.supplier == for_supplier or (doc.is_drop_ship==1 and doc.supplier == for_supplier) }, "Sales Taxes and Charges": { "doctype": "Purchase Taxes and Charges", From b705798ccb1c89d0b289bedc3955fca07c4c58fb Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 20 Oct 2015 17:53:50 +0530 Subject: [PATCH 18/59] [enhance & fixes] Print Format on PO for Drop Shipping --- .../purchase_order/purchase_order.json | 20 +++++++++---------- erpnext/buying/print_format/__init__.py | 0 .../print_format/drop_shipping/__init__.py | 0 .../drop_shipping/drop_shipping.json | 17 ++++++++++++++++ 4 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 erpnext/buying/print_format/__init__.py create mode 100644 erpnext/buying/print_format/drop_shipping/__init__.py create mode 100644 erpnext/buying/print_format/drop_shipping/drop_shipping.json diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 3d74f247dd..8f6ac5c440 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -186,7 +186,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -229,7 +229,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -272,7 +272,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -315,7 +315,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -358,7 +358,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -475,7 +475,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1573,7 +1573,7 @@ "options": "Address", "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1644,7 +1644,7 @@ "report_hide": 0, "reqd": 0, "search_index": 0, - "set_only_once": 0, + "set_only_once": 1, "unique": 0 }, { @@ -2238,8 +2238,8 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-19 15:58:28.388829", - "modified_by": "Administrator", + "modified": "2015-10-20 17:52:42.822372", + "modified_by": "saurabh@erpnext.com", "module": "Buying", "name": "Purchase Order", "owner": "Administrator", diff --git a/erpnext/buying/print_format/__init__.py b/erpnext/buying/print_format/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/buying/print_format/drop_shipping/__init__.py b/erpnext/buying/print_format/drop_shipping/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/buying/print_format/drop_shipping/drop_shipping.json b/erpnext/buying/print_format/drop_shipping/drop_shipping.json new file mode 100644 index 0000000000..0af9a2425c --- /dev/null +++ b/erpnext/buying/print_format/drop_shipping/drop_shipping.json @@ -0,0 +1,17 @@ +{ + "creation": "2015-10-20 16:46:39.382799", + "custom_format": 0, + "disabled": 0, + "doc_type": "Purchase Order", + "docstatus": 0, + "doctype": "Print Format", + "font": "Default", + "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"HTML\", \"options\": \"

Purchase Order

{{doc.name}}
\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"title\"}, {\"print_hide\": 0, \"fieldname\": \"supplier\"}, {\"print_hide\": 0, \"fieldname\": \"supplier_name\"}, {\"print_hide\": 0, \"fieldname\": \"address_display\"}, {\"print_hide\": 0, \"fieldname\": \"contact_display\"}, {\"print_hide\": 0, \"fieldname\": \"contact_mobile\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"transaction_date\"}, {\"print_hide\": 0, \"fieldname\": \"customer\"}, {\"print_hide\": 0, \"fieldname\": \"customer_name\"}, {\"print_hide\": 0, \"fieldname\": \"customer_address_display\"}, {\"print_hide\": 0, \"fieldname\": \"customer_contact_display\"}, {\"print_hide\": 0, \"fieldname\": \"customer_contact_mobile\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"item_code\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"description\", \"print_width\": \"300px\"}, {\"print_hide\": 0, \"fieldname\": \"image\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"qty\", \"print_width\": \"60px\"}, {\"print_hide\": 0, \"fieldname\": \"uom\", \"print_width\": \"100px\"}, {\"print_hide\": 0, \"fieldname\": \"discount_percentage\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"pricing_rule\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"supplier_quotation\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"supplier_quotation_item\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"items\"}, {\"print_hide\": 0, \"fieldname\": \"get_last_purchase_rate\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"total\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"category\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"add_deduct_tax\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"charge_type\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"row_id\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"included_in_print_rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"account_head\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"cost_center\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"description\", \"print_width\": \"300px\"}, {\"print_hide\": 0, \"fieldname\": \"rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"tax_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"total\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"taxes\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"grand_total\"}, {\"print_hide\": 0, \"fieldname\": \"in_words\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"terms\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"customer_contact_person\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"recurring_print_format\"}]", + "modified": "2015-10-20 17:21:45.810640", + "modified_by": "saurabh@erpnext.com", + "name": "Drop Shipping", + "owner": "Administrator", + "print_format_builder": 1, + "print_format_type": "Server", + "standard": "No" +} \ No newline at end of file From edba048c1436d0f668db0a66c3c6fa58272dd2a2 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 20 Oct 2015 18:20:16 +0530 Subject: [PATCH 19/59] [fixes] set is_stock_item for test items --- erpnext/selling/doctype/sales_order/test_sales_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 9d08899906..cd669afa73 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -300,10 +300,10 @@ class TestSalesOrder(unittest.TestCase): from erpnext.selling.doctype.sales_order.sales_order import make_drop_shipment, make_delivery_note from erpnext.stock.doctype.item.test_item import make_item - po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 0, "is_sales_item": 1, + po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "is_sales_item": 1, "is_purchase_item": 1, "is_drop_ship": 1, 'default_supplier': '_Test Supplier'}) - dn_item = make_item("_Test Regular Item", {"is_stock_item": 0, "is_sales_item": 1, + dn_item = make_item("_Test Regular Item", {"is_stock_item": 1, "is_sales_item": 1, "is_purchase_item": 1}) so_items = [ From 8a8ef85174135b6888f73b907f59110592c1d1b1 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 21 Oct 2015 19:28:53 +0530 Subject: [PATCH 20/59] [fixes] reviwe fixes --- .../doctype/sales_invoice/sales_invoice.js | 6 +- .../doctype/sales_invoice/sales_invoice.py | 2 +- .../sales_invoice_item.json | 48 +------------- .../purchase_common/purchase_common.py | 8 +-- .../doctype/purchase_order/purchase_order.js | 64 ++++++++---------- .../doctype/purchase_order/purchase_order.py | 28 ++++---- erpnext/controllers/selling_controller.py | 6 +- erpnext/public/js/controllers/transaction.js | 2 +- .../doctype/sales_order/sales_order.js | 65 ++++++++----------- .../doctype/sales_order/sales_order.json | 4 +- .../doctype/sales_order/sales_order.py | 48 ++++++++------ .../sales_order_item/sales_order_item.json | 6 +- erpnext/stock/get_item_details.py | 3 +- 13 files changed, 116 insertions(+), 174 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index d89a39eb6b..8c5097466e 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -51,9 +51,9 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte if(doc.docstatus==1 && !doc.is_return) { - var flag_delivery_note = false; + var is_drop_ship = false; - flag_delivery_note = cur_frm.doc.items.some(function(item){ + is_drop_ship = cur_frm.doc.items.some(function(item){ return item.is_drop_ship ? true : false; }) @@ -68,7 +68,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte return item.delivery_note ? true : false; }); - if(!from_delivery_note && flag_delivery_note) { + if(!from_delivery_note && !is_drop_ship) { cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Make Delivery Note']).addClass("btn-primary"); } } diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 11cd5d8073..60fdc1a710 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -668,7 +668,7 @@ def make_delivery_note(source_name, target_doc=None): "so_detail": "so_detail" }, "postprocess": update_item, - "condition": lambda doc: (doc.is_drop_ship!=1 and not doc.supplier) + "condition": lambda doc: doc.is_drop_ship!=1 }, "Sales Taxes and Charges": { "doctype": "Sales Taxes and Charges", diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index 44f69cb923..37b60d1bf6 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -725,50 +725,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "column_break_33", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "supplier", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Supplier", - "no_copy": 0, - "options": "Supplier", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "read_only": 1, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -1371,8 +1327,8 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-10-20 15:54:03.318846", - "modified_by": "saurabh6790@gmail.com", + "modified": "2015-10-21 19:06:40.313900", + "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Item", "owner": "Administrator", diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py index 3cdb5a064b..a86b330630 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.py +++ b/erpnext/buying/doctype/purchase_common/purchase_common.py @@ -83,11 +83,9 @@ class PurchaseCommon(BuyingController): def check_for_stopped_or_closed_status(self, doctype, docname): status = frappe.db.get_value(doctype, docname, "status") - if status == "Stopped": - frappe.throw(_("{0} {1} status is Stopped").format(doctype, docname), frappe.InvalidStatusError) - if status == "Closed": - frappe.throw(_("{0} {1} status is Closed").format(doctype, docname), frappe.InvalidStatusError) - + if status in ("Stopped", "Closed"): + frappe.throw(_("{0} {1} status is {2}").format(doctype, docname, status), frappe.InvalidStatusError) + def check_docstatus(self, check, doctype, docname, detail_doctype = ''): if check == 'Next': submitted = frappe.db.sql("""select t1.name from `tab%s` t1,`tab%s` t2 diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 9a701595c5..94ec770b5d 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -22,9 +22,9 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( if(doc.docstatus == 1 && doc.status != 'Stopped' && doc.status != 'Closed') { if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) - cur_frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Purchase Order']); + cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order); - cur_frm.add_custom_button(__('Close'), cur_frm.cscript['Close Purchase Order']); + cur_frm.add_custom_button(__('Close'), this.close_purchase_order); if(flt(doc.per_billed)==0) { cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry); @@ -48,7 +48,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( } if(doc.docstatus == 1 && doc.status == 'Stopped') - cur_frm.add_custom_button(__('Unstop'), cur_frm.cscript['Unstop Purchase Order']); + cur_frm.add_custom_button(__('Unstop'), this.unstop_purchase_order); }, make_stock_entry: function() { @@ -157,6 +157,15 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( frappe.set_route("Form", doclist[0].doctype, doclist[0].name); } }); + }, + stop_purchase_order: function(){ + cur_frm.cscript.update_status('Stop', 'Stopped') + }, + unstop_purchase_order: function(){ + cur_frm.cscript.update_status('UNSTOP', 'Submitted') + }, + close_purchase_order: function(){ + cur_frm.cscript.update_status('Close', 'Closed') } }); @@ -164,6 +173,21 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( // for backward compatibility: combine new and previous states $.extend(cur_frm.cscript, new erpnext.buying.PurchaseOrderController({frm: cur_frm})); +cur_frm.cscript.update_status= function(label, status){ + var doc = cur_frm.doc; + var check = confirm(__("Do you really want to {0} {1}",[label, doc.name])); + + if (check) { + frappe.call({ + method: "erpnext.buying.doctype.purchase_order.purchase_order.update_status", + args:{status: status, name: doc.name}, + callback:function(r){ + cur_frm.refresh(); + } + }) + } +} + cur_frm.fields_dict['supplier_address'].get_query = function(doc, cdt, cdn) { return { filters: {'supplier': doc.supplier} @@ -203,40 +227,6 @@ cur_frm.cscript.get_last_purchase_rate = function(doc, cdt, cdn){ }); } -cur_frm.cscript['Stop Purchase Order'] = function() { - var doc = cur_frm.doc; - var check = confirm(__("Do you really want to STOP ") + doc.name); - - if (check) { - return $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs':doc}, function(r,rt) { - cur_frm.refresh(); - }); - } -} - -cur_frm.cscript['Unstop Purchase Order'] = function() { - var doc = cur_frm.doc; - var check = confirm(__("Do you really want to UNSTOP ") + doc.name); - - if (check) { - return $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted', 'docs':doc}, function(r,rt) { - cur_frm.refresh(); - }); - } -} - -cur_frm.cscript['Close Purchase Order'] = function() { - var doc = cur_frm.doc; - var check = confirm(__("Do you really want to Close ") + doc.name); - - if (check) { - return $c('runserverobj', args={'method':'update_status', 'arg': 'Closed', 'docs':doc}, function(r,rt) { - cur_frm.refresh(); - }); - } -} - - cur_frm.pformat.indent_no = function(doc, cdt, cdn){ //function to make row of table diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 9e0649ba34..d73f793c42 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -163,12 +163,7 @@ class PurchaseOrder(BuyingController): def on_submit(self): if self.is_drop_ship == 1: - self.status_updater[0].update({ - "target_parent_dt": "Sales Order", - "target_parent_field": "per_ordered", - "target_dt": "Sales Order Item", - 'target_field': 'ordered_qty' - }) + self.update_status_updater() super(PurchaseOrder, self).on_submit() @@ -185,12 +180,7 @@ class PurchaseOrder(BuyingController): def on_cancel(self): if self.is_drop_ship == 1: - self.status_updater[0].update({ - "target_parent_dt": "Sales Order", - "target_parent_field": "per_ordered", - "target_dt": "Sales Order Item", - 'target_field': 'ordered_qty' - }) + self.update_status_updater() pc_obj = frappe.get_doc('Purchase Common') self.check_for_stopped_or_closed_status(pc_obj) @@ -229,6 +219,14 @@ class PurchaseOrder(BuyingController): for field in ("received_qty", "billed_amt", "prevdoc_doctype", "prevdoc_docname", "prevdoc_detail_docname", "supplier_quotation", "supplier_quotation_item"): d.set(field, None) + + def update_status_updater(self): + self.status_updater[0].update({ + "target_parent_dt": "Sales Order", + "target_parent_field": "per_ordered", + "target_dt": "Sales Order Item", + 'target_field': 'ordered_qty' + }) @frappe.whitelist() def stop_or_unstop_purchase_orders(names, status): @@ -341,3 +339,9 @@ def make_stock_entry(purchase_order, item_code): stock_entry.bom_no = po_item.bom stock_entry.get_items() return stock_entry.as_dict() + +@frappe.whitelist() +def update_status(status, name): + po = frappe.get_doc("Purchase Order", name) + po.update_status(status) + return \ No newline at end of file diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 7135baf02a..1ed8b8abe1 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -223,10 +223,8 @@ class SellingController(StockController): for d in self.get("items"): if d.get(ref_fieldname): status = frappe.db.get_value("Sales Order", d.get(ref_fieldname), "status") - if status == "Stopped": - frappe.throw(_("Sales Order {0} is stopped").format(d.get(ref_fieldname))) - if status == "Closed": - frappe.throw(_("Sales Order {0} is closed").format(d.get(ref_fieldname))) + if status in ("Stopped", "Closed"): + frappe.throw(_("Sales Order {0} is {1}").format(d.get(ref_fieldname), status)) def check_active_sales_items(obj): for d in obj.get("items"): diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index f518e9c53d..87cc2f6591 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -735,7 +735,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ var valid = true; $.each(["company", "customer"], function(i, fieldname) { - if(frappe.meta.has_field(me.frm.doc.doctype, fieldname)) { + if(frappe.meta.has_field(me.frm.doc.doctype, fieldname && me.frm.doc.doctype != "Purchase Order")) { if (!me.frm.doc[fieldname]) { msgprint(__("Please specify") + ": " + frappe.meta.get_label(me.frm.doc.doctype, fieldname, me.frm.doc.name) + diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 71e52150fb..c354242353 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -15,18 +15,18 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( refresh: function(doc, dt, dn) { this._super(); this.frm.dashboard.reset(); - var flag_drop_ship = false; - var flag_delivery_note = false; + var is_drop_ship = false; + var is_delivery_note = false; if(doc.docstatus==1) { if(doc.status != 'Stopped' && doc.status != 'Closed') { $.each(cur_frm.doc.items, function(i, item){ if(item.is_drop_ship == 1 || item.supplier){ - flag_drop_ship = true; + is_drop_ship = true; } else{ - flag_delivery_note = true; + is_delivery_note = true; } }) @@ -44,13 +44,13 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } // stop - if((flt(doc.per_delivered, 2) < 100 && flag_delivery_note) || doc.per_billed < 100 - || (flt(doc.per_ordered,2) < 100 && flag_drop_ship)){ - cur_frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Sales Order']) + if((flt(doc.per_delivered, 2) < 100 && is_delivery_note) || doc.per_billed < 100 + || (flt(doc.per_ordered,2) < 100 && is_drop_ship)){ + cur_frm.add_custom_button(__('Stop'), this.stop_sales_order) } - cur_frm.add_custom_button(__('Close'), cur_frm.cscript['Close Sales Order']) + cur_frm.add_custom_button(__('Close'), this.close_sales_order) // maintenance if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) { @@ -59,7 +59,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } // delivery note - if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && flag_delivery_note) + if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && is_delivery_note) cur_frm.add_custom_button(__('Delivery'), this.make_delivery_note).addClass("btn-primary"); // sales invoice @@ -67,7 +67,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary"); } - if(flt(doc.per_ordered, 2) < 100 && flag_drop_ship) + if(flt(doc.per_ordered, 2) < 100 && is_drop_ship) cur_frm.add_custom_button(__('Make Purchase Order'), cur_frm.cscript.make_purchase_order).addClass("btn-primary"); } else { @@ -187,7 +187,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( dialog.hide(); return frappe.call({ type: "GET", - method: "erpnext.selling.doctype.sales_order.sales_order.make_drop_shipment", + method: "erpnext.selling.doctype.sales_order.sales_order.make_purchase_order_for_drop_shipment", args: { "source_name": cur_frm.doc.name, "for_supplier": args.supplier @@ -202,6 +202,12 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( }) }); dialog.show(); + }, + stop_sales_order: function(){ + cur_frm.cscript.update_status("Stop", "Stopped") + }, + close_sales_order: function(){ + cur_frm.cscript.update_status("Close", "Closed") } }); @@ -225,19 +231,18 @@ cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) { } } -cur_frm.cscript['Stop Sales Order'] = function() { +cur_frm.cscript.update_status = function(label, status){ var doc = cur_frm.doc; - - var check = confirm(__("Are you sure you want to STOP ") + doc.name); - + var check = confirm(__("Do you really want to {0} {1}",[label, doc.name])); + if (check) { - return $c('runserverobj', { - 'method':'stop_sales_order', - 'docs': doc, - 'arg': "Stopped" - }, function(r,rt) { - cur_frm.refresh(); - }); + frappe.call({ + method: "erpnext.selling.doctype.sales_order.sales_order.update_status", + args:{status: status, name: doc.name}, + callback:function(r){ + cur_frm.refresh(); + } + }) } } @@ -256,22 +261,6 @@ cur_frm.cscript['Unstop Sales Order'] = function() { } } -cur_frm.cscript['Close Sales Order'] = function(){ - var doc = cur_frm.doc; - - var check = confirm(__("Are you sure you want to CLOSE ") + doc.name); - - if (check) { - return $c('runserverobj', { - 'method':'stop_sales_order', - 'docs': doc, - 'arg': "Closed" - }, function(r,rt) { - cur_frm.refresh(); - }); - } -} - cur_frm.cscript.on_submit = function(doc, cdt, cdn) { if(cint(frappe.boot.notification_settings.sales_order)) { cur_frm.email_doc(frappe.boot.notification_settings.sales_order_message); diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index b8680b8428..63f60f933c 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -2048,7 +2048,7 @@ "ignore_user_permissions": 0, "in_filter": 1, "in_list_view": 1, - "label": "% Ordered", + "label": "% Ordered", "no_copy": 1, "permlevel": 0, "precision": "", @@ -2578,7 +2578,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-19 11:34:16.668148", + "modified": "2015-10-21 19:02:58.591057", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 630494a6cf..8c5cf59829 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -151,7 +151,7 @@ class SalesOrder(SellingController): def validate_drop_ship(self): for d in self.get('items'): if d.is_drop_ship and not d.supplier: - frappe.throw(_("#{0} Set Supplier for item {1}").format(d.idx, d.item_code)) + frappe.throw(_("Row #{0}: Set Supplier for item {1}").format(d.idx, d.item_code)) def on_submit(self): super(SalesOrder, self).on_submit() @@ -359,7 +359,7 @@ def make_delivery_note(source_name, target_doc=None): "parent": "against_sales_order", }, "postprocess": update_item, - "condition": lambda doc: doc.delivered_qty < doc.qty and (doc.is_drop_ship!=1 and not doc.supplier) + "condition": lambda doc: doc.delivered_qty < doc.qty and doc.is_drop_ship!=1 }, "Sales Taxes and Charges": { "doctype": "Sales Taxes and Charges", @@ -387,7 +387,6 @@ def make_sales_invoice(source_name, target_doc=None): target.run_method("calculate_taxes_and_totals") def update_item(source, target, source_parent): - target.supplier = source.supplier target.amount = flt(source.amount) - flt(source.billed_amt) target.base_amount = target.amount * flt(source_parent.conversion_rate) target.qty = target.amount / flt(source.rate) if (source.rate and source.billed_amt) else source.qty @@ -500,28 +499,20 @@ def get_events(start, end, filters=None): return data @frappe.whitelist() -def make_drop_shipment(source_name, for_supplier, target_doc=None): - def postprocess(source, target): - set_missing_values(source, target) - +def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc=None): def set_missing_values(source, target): target.supplier = for_supplier - target.buying_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list") or 'Standard Buying' - target.address_display = "" - target.contact_display = "" - target.contact_mobile = "" - target.contact_email = "" - target.contact_person = "" + + default_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list") + if default_price_list: + target.buying_price_list = default_price_list + target.is_drop_ship = 1 target.run_method("set_missing_values") target.run_method("calculate_taxes_and_totals") def update_item(source, target, source_parent): target.schedule_date = source_parent.delivery_date - target.rate = '' - target.price_list_rate = '' - target.base_amount = (flt(source.qty) - flt(source.ordered_qty)) * flt(source.base_rate) - target.amount = (flt(source.qty) - flt(source.ordered_qty)) * flt(source.rate) target.qty = flt(source.qty) - flt(source.ordered_qty) doclist = get_mapped_doc("Sales Order", source_name, { @@ -534,6 +525,13 @@ def make_drop_shipment(source_name, for_supplier, target_doc=None): "contact_email": "customer_contact_email", "contact_person": "customer_contact_person" }, + "field_no_map": [ + "address_display", + "contact_display", + "contact_mobile", + "contact_email", + "contact_person" + ], "validation": { "docstatus": ["=", 1] } @@ -547,14 +545,18 @@ def make_drop_shipment(source_name, for_supplier, target_doc=None): ["uom", "stock_uom"], ["delivery_date", "schedule_date"] ], + "field_no_map": [ + "rate", + "price_list_rate" + ], "postprocess": update_item, - "condition": lambda doc: doc.ordered_qty < doc.qty and doc.supplier == for_supplier or (doc.is_drop_ship==1 and doc.supplier == for_supplier) + "condition": lambda doc: doc.ordered_qty < doc.qty and doc.supplier == for_supplier }, "Sales Taxes and Charges": { "doctype": "Purchase Taxes and Charges", "add_if_empty": True } - }, target_doc, postprocess) + }, target_doc, set_missing_values) @@ -587,4 +589,10 @@ def get_supplier(doctype, txt, searchfield, start, page_len, filters): 'start': start, 'page_len': page_len, 'parent': filters.get('parent') - }) \ No newline at end of file + }) + +@frappe.whitelist() +def update_status(status, name): + so = frappe.get_doc("Sales Order", name) + so.stop_sales_order(status) + return \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index 8acb16ae8e..cd56cc5f87 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -720,7 +720,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -764,7 +764,7 @@ "options": "Supplier", "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1206,7 +1206,7 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-10-19 03:04:51.257808", + "modified": "2015-10-21 19:25:21.712515", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 8f47ebc68b..0c5f7c7eae 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -30,8 +30,7 @@ def get_item_details(args): "is_subcontracted": "Yes" / "No", "transaction_type": "selling", "ignore_pricing_rule": 0/1 - "project_name": "", - "default_supplier":"" + "project_name": "" } """ args = process_args(args) From d8930a776d6c40f3c23ecb8bf018aa41bc4cc6bc Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 22 Oct 2015 10:43:29 +0530 Subject: [PATCH 21/59] [fixes] test case import fix --- erpnext/selling/doctype/sales_order/test_sales_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index cd669afa73..71c78bbcb2 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -297,7 +297,7 @@ class TestSalesOrder(unittest.TestCase): frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1) def test_drop_shipping(self): - from erpnext.selling.doctype.sales_order.sales_order import make_drop_shipment, make_delivery_note + from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order_for_drop_shipment, make_delivery_note from erpnext.stock.doctype.item.test_item import make_item po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "is_sales_item": 1, @@ -326,7 +326,7 @@ class TestSalesOrder(unittest.TestCase): ] so = make_sales_order(item_list=so_items) - po = make_drop_shipment(so.name, '_Test Supplier') + po = make_purchase_order_for_drop_shipment(so.name, '_Test Supplier') dn = make_delivery_note(so.name) self.assertEquals(so.customer, po.customer) From a1f2aec918e51a72fba136b7b646bfa87a2237e4 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 22 Oct 2015 12:17:54 +0530 Subject: [PATCH 22/59] [fixes] check ordered and reserved qrt, check closed status for so and po --- .../purchase_order/test_purchase_order.py | 14 ++++++++ .../doctype/sales_order/test_sales_order.py | 35 +++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py index 66d50ba89d..0c8fba62b5 100644 --- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py @@ -70,6 +70,20 @@ class TestPurchaseOrder(unittest.TestCase): from erpnext.utilities.transaction_base import UOMMustBeIntegerError po = create_purchase_order(qty=3.4, do_not_save=True) self.assertRaises(UOMMustBeIntegerError, po.insert) + + def test_ordered_qty_for_closing_po(self): + from erpnext.stock.doctype.item.test_item import make_item + + item = make_item("_Test Close Item", {"is_stock_item": 1, "is_sales_item": 1, + "is_purchase_item": 1}) + + po = create_purchase_order(item_code=item.item_code, qty=1) + + self.assertEquals(get_ordered_qty(item_code=item.item_code, warehouse="_Test Warehouse - _TC"), 1) + + po.update_status("Closed") + + self.assertEquals(get_ordered_qty(item_code=item.item_code, warehouse="_Test Warehouse - _TC"), 0) def create_purchase_order(**args): po = frappe.new_doc("Purchase Order") diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 71c78bbcb2..459b35fb1b 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -324,17 +324,48 @@ class TestSalesOrder(unittest.TestCase): "conversion_factor": 1.0 } ] - + + existing_ordered_qty, existing_reserved_qty = frappe.db.get_value("Bin", {"item_code": po_item.item_code, + "Warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) + so = make_sales_order(item_list=so_items) po = make_purchase_order_for_drop_shipment(so.name, '_Test Supplier') + po.submit() + dn = make_delivery_note(so.name) + self.assertEquals(so.customer, po.customer) self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order") self.assertEquals(po.items[0].prevdoc_docname, so.name) self.assertEquals(po.items[0].item_code, po_item.item_code) self.assertEquals(dn.items[0].item_code, dn_item.item_code) - + + #test ordered_qty and reserved_qty + ordered_qty, reserved_qty = frappe.db.get_value("Bin", {"item_code": po_item.item_code, + "Warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) + + self.assertEquals(abs(ordered_qty), (existing_ordered_qty + so_items[0]['qty'])) + self.assertEquals(abs(reserved_qty), (existing_reserved_qty + so_items[0]['qty'])) + + #test po_item length + self.assertEquals(len(po.items), 1) + + def test_reserved_qty_for_closing_so(self): + from erpnext.stock.doctype.item.test_item import make_item + + item = make_item("_Test Close Item", {"is_stock_item": 1, "is_sales_item": 1, + "is_purchase_item": 1}) + + so = make_sales_order(item_code=item.item_code, qty=1) + + self.assertEquals(get_reserved_qty(item_code=item.item_code, warehouse="_Test Warehouse - _TC"), 1) + + so.stop_sales_order("Closed") + + self.assertEquals(get_reserved_qty(item_code=item.item_code, warehouse="_Test Warehouse - _TC"), 0) + + def make_sales_order(**args): so = frappe.new_doc("Sales Order") args = frappe._dict(args) From df1c1a573fa38c550c7985cebae2aef65cc89e13 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 22 Oct 2015 12:44:23 +0530 Subject: [PATCH 23/59] [fixes] test case for per_ordered --- erpnext/selling/doctype/sales_order/test_sales_order.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 459b35fb1b..43e08946c6 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -328,7 +328,9 @@ class TestSalesOrder(unittest.TestCase): existing_ordered_qty, existing_reserved_qty = frappe.db.get_value("Bin", {"item_code": po_item.item_code, "Warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) - so = make_sales_order(item_list=so_items) + so = make_sales_order(item_list=so_items, do_not_submit=True) + so.submit() + po = make_purchase_order_for_drop_shipment(so.name, '_Test Supplier') po.submit() @@ -351,6 +353,10 @@ class TestSalesOrder(unittest.TestCase): #test po_item length self.assertEquals(len(po.items), 1) + #test per_ordered status + per_ordered = frappe.db.get_value("Sales Order", so.name, "per_ordered") + self.assertEquals(per_ordered, 100.0) + def test_reserved_qty_for_closing_so(self): from erpnext.stock.doctype.item.test_item import make_item From b0ab93f7793d831f0d18049b007af8f461fdaad7 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 22 Oct 2015 14:41:52 +0530 Subject: [PATCH 24/59] [fixes] typo error --- erpnext/selling/doctype/sales_order/test_sales_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 43e08946c6..57954ddcb8 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -326,7 +326,7 @@ class TestSalesOrder(unittest.TestCase): ] existing_ordered_qty, existing_reserved_qty = frappe.db.get_value("Bin", {"item_code": po_item.item_code, - "Warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) + "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) so = make_sales_order(item_list=so_items, do_not_submit=True) so.submit() @@ -345,7 +345,7 @@ class TestSalesOrder(unittest.TestCase): #test ordered_qty and reserved_qty ordered_qty, reserved_qty = frappe.db.get_value("Bin", {"item_code": po_item.item_code, - "Warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) + "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) self.assertEquals(abs(ordered_qty), (existing_ordered_qty + so_items[0]['qty'])) self.assertEquals(abs(reserved_qty), (existing_reserved_qty + so_items[0]['qty'])) From 6d64fe378d95d9c81b3b1b1f85abcd225192dc9b Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 23 Oct 2015 10:40:32 +0530 Subject: [PATCH 25/59] [fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1 --- .../doctype/purchase_order/purchase_order.js | 18 ++++++++- .../purchase_order/purchase_order.json | 6 +-- .../doctype/purchase_order/purchase_order.py | 37 +++++++++++++++++-- .../purchase_order/purchase_order_list.js | 4 +- erpnext/controllers/status_updater.py | 18 +++------ .../doctype/sales_order/sales_order.json | 25 +------------ .../doctype/sales_order/test_sales_order.py | 8 ++-- 7 files changed, 67 insertions(+), 49 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 94ec770b5d..a9ca76f7bd 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -25,7 +25,11 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order); cur_frm.add_custom_button(__('Close'), this.close_purchase_order); - + + if(doc.is_drop_ship && doc.status!="Delivered"){ + cur_frm.add_custom_button(__('Delivered By Supplier'), this.delivered_by_supplier); + } + if(flt(doc.per_billed)==0) { cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry); } @@ -166,6 +170,18 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( }, close_purchase_order: function(){ cur_frm.cscript.update_status('Close', 'Closed') + }, + delivered_by_supplier: function(){ + return frappe.call({ + method: "erpnext.buying.doctype.purchase_order.purchase_order.delivered_by_supplier", + freez: true, + args:{ + purchase_order: cur_frm.doc.name + }, + callback:function(r){ + cur_frm.refresh(); + } + }) } }); diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 8f6ac5c440..318813c6d3 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -1684,7 +1684,7 @@ "no_copy": 1, "oldfieldname": "status", "oldfieldtype": "Select", - "options": "\nDraft\nTo Receive and Bill\nTo Bill\nTo Receive\nCompleted\nStopped\nCancelled\nClosed", + "options": "\nDraft\nTo Receive and Bill\nTo Bill\nTo Receive\nCompleted\nStopped\nCancelled\nClosed\nDelivered", "permlevel": 0, "print_hide": 1, "read_only": 1, @@ -2238,8 +2238,8 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-20 17:52:42.822372", - "modified_by": "saurabh@erpnext.com", + "modified": "2015-10-22 19:03:10.932738", + "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", "owner": "Administrator", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index d73f793c42..a416663e9e 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -223,11 +223,10 @@ class PurchaseOrder(BuyingController): def update_status_updater(self): self.status_updater[0].update({ "target_parent_dt": "Sales Order", - "target_parent_field": "per_ordered", "target_dt": "Sales Order Item", 'target_field': 'ordered_qty' }) - + @frappe.whitelist() def stop_or_unstop_purchase_orders(names, status): if not frappe.has_permission("Purchase Order", "write"): @@ -344,4 +343,36 @@ def make_stock_entry(purchase_order, item_code): def update_status(status, name): po = frappe.get_doc("Purchase Order", name) po.update_status(status) - return \ No newline at end of file + return + +@frappe.whitelist() +def delivered_by_supplier(purchase_order): + po = frappe.get_doc("Purchase Order", purchase_order) + update_delivered_qty(po) + po.update_status("Delivered") + return po.as_dict() + +def update_delivered_qty(purchase_order): + sales_order_list = [] + for item in purchase_order.items: + if item.prevdoc_doctype == "Sales Order": + frappe.db.sql(""" update `tabSales Order Item` + set delivered_qty = (ifnull(delivered_qty, 0) + %(qty)s) + where item_code='%(item_code)s' and parent = '%(name)s' + """%{"qty": item.qty, "item_code": item.item_code, "name": item.prevdoc_docname}) + + sales_order_list.append(item.prevdoc_docname) + + update_per_delivery(sales_order_list) + +def update_per_delivery(sales_order_list): + for so in sales_order_list: + frappe.db.sql("""update `tabSales Order` + set per_delivered = (select + sum(if(qty > ifnull(delivered_qty, 0), delivered_qty, qty))/ sum(qty)*100 + from `tabSales Order Item` where parent="%(name)s") where name = "%(name)s" """%{"name":so}) + + so = frappe.get_doc("Sales Order", so) + so.set_status(update=True) + so.notify_update() + \ No newline at end of file diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js index ad83fb2f27..82231b84a1 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js @@ -6,7 +6,9 @@ frappe.listview_settings['Purchase Order'] = { return [__("Stopped"), "darkgrey", "status,=,Stopped"]; } else if(doc.status==="Closed"){ return [__("Closed"), "green", "status,=,Closed"]; - } else if(flt(doc.per_received, 2) < 100 && doc.status!=="Stopped") { + } else if (doc.status==="Delivered") { + return [__("Delivered"), "green", "status,=,Closed"]; + }else if(flt(doc.per_received, 2) < 100 && doc.status!=="Stopped") { if(flt(doc.per_billed, 2) < 100) { return [__("To Receive and Bill"), "orange", "per_received,<,100|per_billed,<,100|status,!=,Stopped"]; diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index f7a0939444..2de6777fef 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -45,6 +45,7 @@ status_map = { ["To Bill", "eval:self.per_received == 100 and self.per_billed < 100 and self.docstatus == 1"], ["To Receive", "eval:self.per_received < 100 and self.per_billed == 100 and self.docstatus == 1"], ["Completed", "eval:self.per_received == 100 and self.per_billed == 100 and self.docstatus == 1"], + ["Delivered", "eval:self.status=='Delivered'"], ["Stopped", "eval:self.status=='Stopped'"], ["Cancelled", "eval:self.docstatus==2"], ["Closed", "eval:self.status=='Closed'"], @@ -170,11 +171,12 @@ class StatusUpdater(Document): else: args['cond'] = ' and parent!="%s"' % self.name.replace('"', '\"') - args['set_modified'] = '' if change_modified: args['set_modified'] = ', modified = now(), modified_by = "{0}"'\ .format(frappe.db.escape(frappe.session.user)) - + + args["drop_ship_cond"] = '' + self._update_children(args) if "percent_join_field" in args: @@ -212,16 +214,6 @@ class StatusUpdater(Document): def _update_percent_field(self, args): """Update percent field in parent transaction""" unique_transactions = set([d.get(args['percent_join_field']) for d in self.get_all_children(args['source_dt'])]) - - args["drop_ship_cond"] = '' - - if getattr(self, "is_drop_ship", None): - if self.is_drop_ship == 1: - args["drop_ship_cond"] = " and is_drop_ship=1 " - - else: - if self.doctype=="Delivery Note": - args["drop_ship_cond"] = " and is_drop_ship!=1 and supplier = '' " for name in unique_transactions: if not name: @@ -235,7 +227,7 @@ class StatusUpdater(Document): set %(target_parent_field)s = round((select sum(if(%(target_ref_field)s > ifnull(%(target_field)s, 0), %(target_field)s, %(target_ref_field)s))/sum(%(target_ref_field)s)*100 - from `tab%(target_dt)s` where parent="%(name)s" %(drop_ship_cond)s), 2) %(set_modified)s + from `tab%(target_dt)s` where parent="%(name)s"), 2) %(set_modified)s where name='%(name)s'""" % args) # update field diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 63f60f933c..ed661f8767 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -2038,29 +2038,6 @@ "unique": 0, "width": "100px" }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "per_ordered", - "fieldtype": "Percent", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 1, - "in_list_view": 1, - "label": "% Ordered", - "no_copy": 1, - "permlevel": 0, - "precision": "", - "print_hide": 1, - "read_only": 1, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "100px" - }, { "allow_on_submit": 0, "bold": 0, @@ -2578,7 +2555,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-21 19:02:58.591057", + "modified": "2015-10-22 16:32:34.339835", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 57954ddcb8..acccd69957 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -325,8 +325,8 @@ class TestSalesOrder(unittest.TestCase): } ] - existing_ordered_qty, existing_reserved_qty = frappe.db.get_value("Bin", {"item_code": po_item.item_code, - "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) + existing_ordered_qty, existing_reserved_qty = frappe.db.get_value("Bin", + {"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) so = make_sales_order(item_list=so_items, do_not_submit=True) so.submit() @@ -344,8 +344,8 @@ class TestSalesOrder(unittest.TestCase): self.assertEquals(dn.items[0].item_code, dn_item.item_code) #test ordered_qty and reserved_qty - ordered_qty, reserved_qty = frappe.db.get_value("Bin", {"item_code": po_item.item_code, - "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) + ordered_qty, reserved_qty = frappe.db.get_value("Bin", + {"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) self.assertEquals(abs(ordered_qty), (existing_ordered_qty + so_items[0]['qty'])) self.assertEquals(abs(reserved_qty), (existing_reserved_qty + so_items[0]['qty'])) From f857d81f353514ad9639bb3c182ac8b63cb2ac34 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 26 Oct 2015 13:59:12 +0530 Subject: [PATCH 26/59] [fixes]test case to check updated delivered qty --- .../doctype/sales_invoice/sales_invoice.json | 14 +++++++------- .../doctype/sales_order/test_sales_order.py | 13 +++++++------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 6194a6069d..a6a47d546f 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -65,7 +65,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Series", + "label": "Series", "no_copy": 1, "oldfieldname": "naming_series", "oldfieldtype": "Select", @@ -1168,7 +1168,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Apply Additional Discount On", + "label": "Apply Additional Discount On", "no_copy": 0, "options": "\nGrand Total\nNet Total", "permlevel": 0, @@ -2211,7 +2211,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Source", + "label": "Source", "no_copy": 0, "oldfieldname": "source", "oldfieldtype": "Select", @@ -2308,7 +2308,7 @@ "ignore_user_permissions": 0, "in_filter": 1, "in_list_view": 0, - "label": "Is Opening Entry", + "label": "Is Opening Entry", "no_copy": 0, "oldfieldname": "is_opening", "oldfieldtype": "Select", @@ -2332,7 +2332,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "C-Form Applicable", + "label": "C-Form Applicable", "no_copy": 1, "options": "No\nYes", "permlevel": 0, @@ -2700,7 +2700,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Recurring Type", + "label": "Recurring Type", "no_copy": 1, "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly", "permlevel": 0, @@ -2951,7 +2951,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-02 07:39:09.123982", + "modified": "2015-10-26 12:12:40.616546", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index acccd69957..367be5ef77 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -299,6 +299,7 @@ class TestSalesOrder(unittest.TestCase): def test_drop_shipping(self): from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order_for_drop_shipment, make_delivery_note from erpnext.stock.doctype.item.test_item import make_item + from erpnext.buying.doctype.purchase_order.purchase_order import delivered_by_supplier po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "is_sales_item": 1, "is_purchase_item": 1, "is_drop_ship": 1, 'default_supplier': '_Test Supplier'}) @@ -310,7 +311,7 @@ class TestSalesOrder(unittest.TestCase): { "item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC", - "qty": 1, + "qty": 2, "rate": 400, "conversion_factor": 1.0, "is_drop_ship": 1, @@ -319,7 +320,7 @@ class TestSalesOrder(unittest.TestCase): { "item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC", - "qty": 1, + "qty": 2, "rate": 300, "conversion_factor": 1.0 } @@ -334,9 +335,8 @@ class TestSalesOrder(unittest.TestCase): po = make_purchase_order_for_drop_shipment(so.name, '_Test Supplier') po.submit() - dn = make_delivery_note(so.name) + dn = create_dn_against_so(so, delivered_qty=1) - self.assertEquals(so.customer, po.customer) self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order") self.assertEquals(po.items[0].prevdoc_docname, so.name) @@ -354,8 +354,9 @@ class TestSalesOrder(unittest.TestCase): self.assertEquals(len(po.items), 1) #test per_ordered status - per_ordered = frappe.db.get_value("Sales Order", so.name, "per_ordered") - self.assertEquals(per_ordered, 100.0) + delivered_by_supplier(po.name) + per_delivered = frappe.db.get_value("Sales Order", so.name, "per_delivered") + self.assertEquals(per_delivered, ) def test_reserved_qty_for_closing_so(self): from erpnext.stock.doctype.item.test_item import make_item From 2f702dcb3225b544c757ddf0fccf3d0a948a9d62 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 26 Oct 2015 17:28:17 +0530 Subject: [PATCH 27/59] [fixes] bulk close facility, rename Drop Ship to Delivered By Supplier --- .../doctype/sales_invoice/sales_invoice.js | 8 ++++---- .../doctype/sales_invoice/sales_invoice.py | 2 +- .../sales_invoice_item/sales_invoice_item.json | 14 +++++++------- .../doctype/purchase_order/purchase_order.js | 2 +- .../doctype/purchase_order/purchase_order.py | 10 +++++----- .../purchase_order/purchase_order_list.js | 5 ++++- .../selling/doctype/sales_order/sales_order.js | 10 +++++----- .../selling/doctype/sales_order/sales_order.py | 12 ++++++------ .../doctype/sales_order/sales_order_list.js | 6 +++++- .../doctype/sales_order/test_sales_order.py | 4 ++-- .../sales_order_item/sales_order_item.json | 16 ++++++++-------- erpnext/stock/doctype/item/item.json | 8 ++++++-- erpnext/stock/get_item_details.py | 2 +- 13 files changed, 55 insertions(+), 44 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 8c5097466e..9b9ab24811 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -51,10 +51,10 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte if(doc.docstatus==1 && !doc.is_return) { - var is_drop_ship = false; + var is_delivered_by_supplier = false; - is_drop_ship = cur_frm.doc.items.some(function(item){ - return item.is_drop_ship ? true : false; + is_delivered_by_supplier = cur_frm.doc.items.some(function(item){ + return item.is_delivered_by_supplier ? true : false; }) cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'), @@ -68,7 +68,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte return item.delivery_note ? true : false; }); - if(!from_delivery_note && !is_drop_ship) { + if(!from_delivery_note && !is_delivered_by_supplier) { cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Make Delivery Note']).addClass("btn-primary"); } } diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 60fdc1a710..6abf1ba96d 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -668,7 +668,7 @@ def make_delivery_note(source_name, target_doc=None): "so_detail": "so_detail" }, "postprocess": update_item, - "condition": lambda doc: doc.is_drop_ship!=1 + "condition": lambda doc: doc.delivered_by_supplier!=1 }, "Sales Taxes and Charges": { "doctype": "Sales Taxes and Charges", diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index 37b60d1bf6..0a98d87dc7 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -684,14 +684,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, - "collapsible_depends_on": "eval:doc.is_drop_ship==1", - "fieldname": "drop_ship", + "collapsible_depends_on": "eval:doc.delivered_by_supplier==1", + "fieldname": "by_supplier", "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Drop Ship", + "label": "Delivered By Sypplier", "no_copy": 0, "permlevel": 0, "precision": "", @@ -707,18 +707,18 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "is_drop_ship", + "fieldname": "delivered_by_supplier", "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Is Drop Ship Item", + "label": "Delivered By Supplier", "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, - "read_only": 1, + "read_only": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1327,7 +1327,7 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-10-21 19:06:40.313900", + "modified": "2015-10-26 17:22:23.631195", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Item", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index a9ca76f7bd..b6a785c348 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -26,7 +26,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( cur_frm.add_custom_button(__('Close'), this.close_purchase_order); - if(doc.is_drop_ship && doc.status!="Delivered"){ + if(doc.delivered_by_supplier && doc.status!="Delivered"){ cur_frm.add_custom_button(__('Delivered By Supplier'), this.delivered_by_supplier); } diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index a416663e9e..45444b98a1 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -162,7 +162,7 @@ class PurchaseOrder(BuyingController): clear_doctype_notifications(self) def on_submit(self): - if self.is_drop_ship == 1: + if self.delivered_by_supplier == 1: self.update_status_updater() super(PurchaseOrder, self).on_submit() @@ -179,7 +179,7 @@ class PurchaseOrder(BuyingController): purchase_controller.update_last_purchase_rate(self, is_submit = 1) def on_cancel(self): - if self.is_drop_ship == 1: + if self.delivered_by_supplier == 1: self.update_status_updater() pc_obj = frappe.get_doc('Purchase Common') @@ -236,9 +236,9 @@ def stop_or_unstop_purchase_orders(names, status): for name in names: po = frappe.get_doc("Purchase Order", name) if po.docstatus == 1: - if status=="Stopped": - if po.status not in ("Stopped", "Cancelled") and (po.per_received < 100 or po.per_billed < 100): - po.update_status("Stopped") + if status in ("Stopped", "Closed"): + if po.status not in ("Stopped", "Cancelled", "Closed") and (po.per_received < 100 or po.per_billed < 100): + po.update_status(status) else: if po.status == "Stopped": po.update_status("Draft") diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js index 82231b84a1..0f1581dfb4 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js @@ -32,6 +32,9 @@ frappe.listview_settings['Purchase Order'] = { listview.page.add_menu_item(__("Set as Unstopped"), function() { listview.call_for_selected_items(method, {"status": "Submitted"}); }); - + + listview.page.add_menu_item(__("Set as Closed"), function() { + listview.call_for_selected_items(method, {"status": "Closed"}); + }); } }; diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index c354242353..2951d288a7 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -15,15 +15,15 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( refresh: function(doc, dt, dn) { this._super(); this.frm.dashboard.reset(); - var is_drop_ship = false; + var is_delivered_by_supplier = false; var is_delivery_note = false; if(doc.docstatus==1) { if(doc.status != 'Stopped' && doc.status != 'Closed') { $.each(cur_frm.doc.items, function(i, item){ - if(item.is_drop_ship == 1 || item.supplier){ - is_drop_ship = true; + if(item.is_delivered_by_supplier == 1 || item.supplier){ + is_delivered_by_supplier = true; } else{ is_delivery_note = true; @@ -45,7 +45,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( // stop if((flt(doc.per_delivered, 2) < 100 && is_delivery_note) || doc.per_billed < 100 - || (flt(doc.per_ordered,2) < 100 && is_drop_ship)){ + || (flt(doc.per_ordered,2) < 100 && is_delivered_by_supplier)){ cur_frm.add_custom_button(__('Stop'), this.stop_sales_order) } @@ -67,7 +67,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary"); } - if(flt(doc.per_ordered, 2) < 100 && is_drop_ship) + if(flt(doc.per_ordered, 2) < 100 && is_delivered_by_supplier) cur_frm.add_custom_button(__('Make Purchase Order'), cur_frm.cscript.make_purchase_order).addClass("btn-primary"); } else { diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 8c5cf59829..f452fa9841 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -150,7 +150,7 @@ class SalesOrder(SellingController): def validate_drop_ship(self): for d in self.get('items'): - if d.is_drop_ship and not d.supplier: + if d.delivered_by_supplier and not d.supplier: frappe.throw(_("Row #{0}: Set Supplier for item {1}").format(d.idx, d.item_code)) def on_submit(self): @@ -277,9 +277,9 @@ def stop_or_unstop_sales_orders(names, status): for name in names: so = frappe.get_doc("Sales Order", name) if so.docstatus == 1: - if status=="Stop": - if so.status not in ("Stopped", "Cancelled") and (so.per_delivered < 100 or so.per_billed < 100): - so.stop_sales_order() + if status in ("Stopped", "Closed"): + if so.status not in ("Stopped", "Cancelled", "Closed") and (so.per_delivered < 100 or so.per_billed < 100): + so.stop_sales_order(status) else: if so.status == "Stopped": so.unstop_sales_order() @@ -359,7 +359,7 @@ def make_delivery_note(source_name, target_doc=None): "parent": "against_sales_order", }, "postprocess": update_item, - "condition": lambda doc: doc.delivered_qty < doc.qty and doc.is_drop_ship!=1 + "condition": lambda doc: doc.delivered_qty < doc.qty and doc.delivered_by_supplier!=1 }, "Sales Taxes and Charges": { "doctype": "Sales Taxes and Charges", @@ -507,7 +507,7 @@ def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc= if default_price_list: target.buying_price_list = default_price_list - target.is_drop_ship = 1 + target.delivered_by_supplier = 1 target.run_method("set_missing_values") target.run_method("calculate_taxes_and_totals") diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index 6c6254b3bc..8030ff80e4 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -45,12 +45,16 @@ frappe.listview_settings['Sales Order'] = { var method = "erpnext.selling.doctype.sales_order.sales_order.stop_or_unstop_sales_orders"; listview.page.add_menu_item(__("Set as Stopped"), function() { - listview.call_for_selected_items(method, {"status": "Stop"}); + listview.call_for_selected_items(method, {"status": "Stoped"}); }); listview.page.add_menu_item(__("Set as Unstopped"), function() { listview.call_for_selected_items(method, {"status": "Unstop"}); }); + + listview.page.add_menu_item(__("Set as Closed"), function() { + listview.call_for_selected_items(method, {"status": "Closed"}); + }); } }; \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 367be5ef77..667f21b617 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -302,7 +302,7 @@ class TestSalesOrder(unittest.TestCase): from erpnext.buying.doctype.purchase_order.purchase_order import delivered_by_supplier po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "is_sales_item": 1, - "is_purchase_item": 1, "is_drop_ship": 1, 'default_supplier': '_Test Supplier'}) + "is_purchase_item": 1, "delivered_by_supplier": 1, 'default_supplier': '_Test Supplier'}) dn_item = make_item("_Test Regular Item", {"is_stock_item": 1, "is_sales_item": 1, "is_purchase_item": 1}) @@ -314,7 +314,7 @@ class TestSalesOrder(unittest.TestCase): "qty": 2, "rate": 400, "conversion_factor": 1.0, - "is_drop_ship": 1, + "delivered_by_supplier": 1, "supplier": '_Test Supplier' }, { diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index cd56cc5f87..11181574e1 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -687,14 +687,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, - "collapsible_depends_on": "eval:doc.is_drop_ship==1", - "fieldname": "drop_ship", + "collapsible_depends_on": "eval:doc.delivered_by_supplier==1||doc.supplier", + "fieldname": "by_supplier", "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Drop Ship", + "label": "Delivered by Supplier", "no_copy": 0, "permlevel": 0, "precision": "", @@ -707,20 +707,20 @@ "unique": 0 }, { - "allow_on_submit": 1, + "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "is_drop_ship", + "fieldname": "delivered_by_supplier", "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Is Drop Ship Item", + "label": "Delivered By Supplier", "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 1, + "print_hide": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1206,7 +1206,7 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-10-21 19:25:21.712515", + "modified": "2015-10-26 17:17:04.378067", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index bd812a062a..0f076f49f8 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -250,13 +250,13 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "is_drop_ship", + "fieldname": "delivered_by_supplier", "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Is Drop Ship", + "label": "Delivered By Supplier", "no_copy": 0, "permlevel": 0, "precision": "", @@ -2157,7 +2157,11 @@ "issingle": 0, "istable": 0, "max_attachments": 1, +<<<<<<< ac7a1da680daa876b9f107cec87150cf7a195138 "modified": "2015-10-29 02:25:26.256373", +======= + "modified": "2015-10-26 17:18:54.615802", +>>>>>>> [fixes] bulk close facility, rename Drop Ship to Delivered By Supplier "modified_by": "Administrator", "module": "Stock", "name": "Item", diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 0c5f7c7eae..6c6f84ba38 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -174,7 +174,7 @@ def get_basic_details(args, item): "net_amount": 0.0, "discount_percentage": 0.0, "supplier": item.default_supplier, - "is_drop_ship": item.is_drop_ship, + "delivered_by_supplier": item.delivered_by_supplier, }) # if default specified in item is for another company, fetch from company From cc8f1afa568514247669f54f0ef8cf483348c971 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 26 Oct 2015 19:12:05 +0530 Subject: [PATCH 28/59] [fixes] test case fixes for drop shipping --- .../purchase_order/purchase_order.json | 8 ++-- .../doctype/purchase_order/purchase_order.py | 3 +- .../doctype/sales_order/sales_order.js | 9 +++-- .../doctype/sales_order/test_sales_order.py | 38 +++++++++++++------ erpnext/stock/stock_balance.py | 2 +- 5 files changed, 38 insertions(+), 22 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 318813c6d3..a866e81a99 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -465,17 +465,17 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "is_drop_ship", + "fieldname": "delivered_by_supplier", "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Is Drop Ship", + "label": "Delivered By Supplier", "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 1, + "print_hide": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -2238,7 +2238,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-22 19:03:10.932738", + "modified": "2015-10-26 09:09:06.796558", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 45444b98a1..3fe833f36e 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -224,7 +224,8 @@ class PurchaseOrder(BuyingController): self.status_updater[0].update({ "target_parent_dt": "Sales Order", "target_dt": "Sales Order Item", - 'target_field': 'ordered_qty' + 'target_field': 'ordered_qty', + "target_parent_field": '' }) @frappe.whitelist() diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 2951d288a7..af300f662f 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -22,11 +22,12 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( if(doc.status != 'Stopped' && doc.status != 'Closed') { $.each(cur_frm.doc.items, function(i, item){ - if(item.is_delivered_by_supplier == 1 || item.supplier){ + if((item.delivered_by_supplier == 1 || item.supplier) && (item.qty > item.ordered_qty)){ is_delivered_by_supplier = true; } else{ - is_delivery_note = true; + if(item.qty > item.delivered_qty) + is_delivery_note = true; } }) @@ -177,11 +178,11 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( filters: {'parent': cur_frm.doc.name} } }, "reqd": 1 }, - {"fieldtype": "Button", "label": __("Proceed"), "fieldname": "proceed"}, + {"fieldtype": "Button", "label": __("Make Purchase Order"), "fieldname": "make_purchase_order"}, ] }); - dialog.fields_dict.proceed.$input.click(function() { + dialog.fields_dict.make_purchase_order.$input.click(function() { args = dialog.get_values(); if(!args) return; dialog.hide(); diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 667f21b617..3ef1a25bc5 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -302,10 +302,14 @@ class TestSalesOrder(unittest.TestCase): from erpnext.buying.doctype.purchase_order.purchase_order import delivered_by_supplier po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "is_sales_item": 1, - "is_purchase_item": 1, "delivered_by_supplier": 1, 'default_supplier': '_Test Supplier'}) + "is_purchase_item": 1, "delivered_by_supplier": 1, 'default_supplier': '_Test Supplier', + "expense_account": "_Test Account Cost for Goods Sold - _TC", + "cost_center": "_Test Cost Center - _TC" + }) dn_item = make_item("_Test Regular Item", {"is_stock_item": 1, "is_sales_item": 1, - "is_purchase_item": 1}) + "is_purchase_item": 1, "expense_account": "_Test Account Cost for Goods Sold - _TC", + "cost_center": "_Test Cost Center - _TC"}) so_items = [ { @@ -326,8 +330,8 @@ class TestSalesOrder(unittest.TestCase): } ] - existing_ordered_qty, existing_reserved_qty = frappe.db.get_value("Bin", - {"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) + bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, + fields=["ordered_qty", "reserved_qty"]) so = make_sales_order(item_list=so_items, do_not_submit=True) so.submit() @@ -335,7 +339,7 @@ class TestSalesOrder(unittest.TestCase): po = make_purchase_order_for_drop_shipment(so.name, '_Test Supplier') po.submit() - dn = create_dn_against_so(so, delivered_qty=1) + dn = create_dn_against_so(so.name, delivered_qty=1) self.assertEquals(so.customer, po.customer) self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order") @@ -344,19 +348,29 @@ class TestSalesOrder(unittest.TestCase): self.assertEquals(dn.items[0].item_code, dn_item.item_code) #test ordered_qty and reserved_qty - ordered_qty, reserved_qty = frappe.db.get_value("Bin", - {"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) + ordered_qty, reserved_qty = frappe.db.get_value("Bin", + {"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) + + existing_ordered_qty = bin[0].ordered_qty if bin else 0.0 + existing_reserved_qty = bin[0].reserved_qty if bin else 0.0 - self.assertEquals(abs(ordered_qty), (existing_ordered_qty + so_items[0]['qty'])) - self.assertEquals(abs(reserved_qty), (existing_reserved_qty + so_items[0]['qty'])) + self.assertEquals(abs(ordered_qty), existing_ordered_qty + so_items[0]['qty']) + self.assertEquals(abs(reserved_qty), existing_reserved_qty + so_items[0]['qty']) #test po_item length self.assertEquals(len(po.items), 1) - #test per_ordered status + #test per_delivered status delivered_by_supplier(po.name) - per_delivered = frappe.db.get_value("Sales Order", so.name, "per_delivered") - self.assertEquals(per_delivered, ) + per_delivered = frappe.db.sql("""select sum(if(qty > ifnull(delivered_qty, 0), delivered_qty, qty))/sum(qty)*100 as per_delivered + from `tabSales Order Item` where parent="{0}" """.format(so.name)) + + self.assertEquals(frappe.db.get_value("Sales Order", so.name, "per_delivered"), per_delivered[0][0]) + + dn = create_dn_against_so(so.name, delivered_qty=1) + + so.db_set('status', "Closed") + so.update_reserved_qty() def test_reserved_qty_for_closing_so(self): from erpnext.stock.doctype.item.test_item import make_item diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py index b1e8b22063..609c986c44 100644 --- a/erpnext/stock/stock_balance.py +++ b/erpnext/stock/stock_balance.py @@ -122,7 +122,7 @@ def get_ordered_qty(item_code, warehouse): from `tabPurchase Order Item` po_item, `tabPurchase Order` po where po_item.item_code=%s and po_item.warehouse=%s and po_item.qty > ifnull(po_item.received_qty, 0) and po_item.parent=po.name - and po.status not in ('Stopped', 'Closed') and po.docstatus=1""", (item_code, warehouse)) + and po.status not in ('Stopped', 'Closed', 'Delivered') and po.docstatus=1""", (item_code, warehouse)) return flt(ordered_qty[0][0]) if ordered_qty else 0 From 653cffec1ecfe4113b46122e6800ab69c879c171 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 27 Oct 2015 17:07:56 +0530 Subject: [PATCH 29/59] [change_log and fixes] set print hide, add change_log --- .../doctype/sales_invoice_item/sales_invoice_item.json | 6 +++--- erpnext/buying/doctype/purchase_order/purchase_order.json | 6 +++--- erpnext/change_log/current/drop-ship.md | 1 + .../selling/doctype/sales_order_item/sales_order_item.json | 6 +++--- erpnext/stock/doctype/item/item.json | 6 +----- 5 files changed, 11 insertions(+), 14 deletions(-) create mode 100644 erpnext/change_log/current/drop-ship.md diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index 0a98d87dc7..d4c40f2ade 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -717,7 +717,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1327,8 +1327,8 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-10-26 17:22:23.631195", - "modified_by": "Administrator", + "modified": "2015-10-27 16:59:39.595490", + "modified_by": "saurabh@erpnext.com", "module": "Accounts", "name": "Sales Invoice Item", "owner": "Administrator", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index a866e81a99..121fc93fb9 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -475,7 +475,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -2238,8 +2238,8 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-26 09:09:06.796558", - "modified_by": "Administrator", + "modified": "2015-10-27 16:58:53.362949", + "modified_by": "saurabh@erpnext.com", "module": "Buying", "name": "Purchase Order", "owner": "Administrator", diff --git a/erpnext/change_log/current/drop-ship.md b/erpnext/change_log/current/drop-ship.md new file mode 100644 index 0000000000..d6758e77e6 --- /dev/null +++ b/erpnext/change_log/current/drop-ship.md @@ -0,0 +1 @@ +- **Drop Ship** You can now implement drop shipping by creating Purchase Order from Sales Order. \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index 11181574e1..e8ad1e82f5 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -720,7 +720,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -1206,8 +1206,8 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-10-26 17:17:04.378067", - "modified_by": "Administrator", + "modified": "2015-10-27 17:00:01.005108", + "modified_by": "saurabh@erpnext.com", "module": "Selling", "name": "Sales Order Item", "owner": "Administrator", diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 0f076f49f8..8632d124d3 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -260,7 +260,7 @@ "no_copy": 0, "permlevel": 0, "precision": "", - "print_hide": 0, + "print_hide": 1, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -2157,11 +2157,7 @@ "issingle": 0, "istable": 0, "max_attachments": 1, -<<<<<<< ac7a1da680daa876b9f107cec87150cf7a195138 "modified": "2015-10-29 02:25:26.256373", -======= - "modified": "2015-10-26 17:18:54.615802", ->>>>>>> [fixes] bulk close facility, rename Drop Ship to Delivered By Supplier "modified_by": "Administrator", "module": "Stock", "name": "Item", From 2e65aadb1e36c26765e41e8df05ae6261815530a Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 28 Oct 2015 11:40:14 +0530 Subject: [PATCH 30/59] [fixes] reload doc after status update and supplier address fetching --- erpnext/buying/doctype/purchase_order/purchase_order.js | 7 +++++-- erpnext/buying/doctype/purchase_order/purchase_order.py | 2 -- erpnext/public/js/utils/party.js | 2 +- erpnext/selling/doctype/sales_order/sales_order.js | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index b6a785c348..146694e27d 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -179,7 +179,9 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( purchase_order: cur_frm.doc.name }, callback:function(r){ - cur_frm.refresh(); + if(!r.exc) { + cur_frm.reload_doc(); + } } }) } @@ -198,7 +200,8 @@ cur_frm.cscript.update_status= function(label, status){ method: "erpnext.buying.doctype.purchase_order.purchase_order.update_status", args:{status: status, name: doc.name}, callback:function(r){ - cur_frm.refresh(); + cur_frm.set_value("status", status); + cur_frm.reload_doc(); } }) } diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 3fe833f36e..26837f1a64 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -344,14 +344,12 @@ def make_stock_entry(purchase_order, item_code): def update_status(status, name): po = frappe.get_doc("Purchase Order", name) po.update_status(status) - return @frappe.whitelist() def delivered_by_supplier(purchase_order): po = frappe.get_doc("Purchase Order", purchase_order) update_delivered_qty(po) po.update_status("Delivered") - return po.as_dict() def update_delivered_qty(purchase_order): sales_order_list = [] diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js index 510938a9d1..93301fcb0b 100644 --- a/erpnext/public/js/utils/party.js +++ b/erpnext/public/js/utils/party.js @@ -53,7 +53,7 @@ erpnext.utils.get_address_display = function(frm, address_field, display_field) if(frm.updating_party_details) return; if(!address_field) { - if(frm.doc.customer) { + if(frm.doctype != "Purchase Order" && frm.doc.customer) { address_field = "customer_address"; } else if(frm.doc.supplier) { address_field = "supplier_address"; diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index af300f662f..9ad6d56301 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -37,7 +37,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( // doc.per_billed); // indent - if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1) + if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && flt(doc.per_delivered, 2) < 100) cur_frm.add_custom_button(__('Material Request'), this.make_material_request); if(flt(doc.per_billed)==0) { @@ -241,7 +241,7 @@ cur_frm.cscript.update_status = function(label, status){ method: "erpnext.selling.doctype.sales_order.sales_order.update_status", args:{status: status, name: doc.name}, callback:function(r){ - cur_frm.refresh(); + cur_frm.reload_doc(); } }) } From 6956eee790fbfd8d8b57850495ece0e33694d80f Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 29 Oct 2015 19:43:13 +0530 Subject: [PATCH 31/59] [fixes] test case and code rewrite --- .../purchase_order/purchase_order.json | 60 ++----------------- .../doctype/purchase_order/purchase_order.py | 24 ++------ .../purchase_order/test_purchase_order.py | 14 ++--- erpnext/controllers/status_updater.py | 4 +- .../doctype/sales_order/sales_order.js | 12 ++-- .../doctype/sales_order/sales_order.py | 36 ++++++++--- .../doctype/sales_order/test_sales_order.py | 57 +++++++++++++----- 7 files changed, 95 insertions(+), 112 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 121fc93fb9..cd4290134c 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -151,7 +151,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval:doc.is_drop_ship==1", + "depends_on": "eval:doc.delivered_by_supplier==1", "fieldname": "customer", "fieldtype": "Link", "hidden": 0, @@ -164,7 +164,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, - "read_only": 0, + "read_only": 1, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -175,7 +175,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval:doc.is_drop_ship==1", + "depends_on": "eval:doc.delivered_by_supplier==1", "fieldname": "customer_name", "fieldtype": "Data", "hidden": 0, @@ -476,7 +476,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, - "read_only": 0, + "read_only": 1, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1557,30 +1557,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "depends_on": "eval:doc.is_drop_ship==1", - "fieldname": "customer_address", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Customer Address", - "no_copy": 0, - "options": "Address", - "permlevel": 0, - "precision": "", - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -1623,30 +1599,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "depends_on": "eval:doc.is_drop_ship==1", - "fieldname": "customer_contact_person", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Customer Contact Person", - "no_copy": 0, - "options": "Contact", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 1, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -2238,8 +2190,8 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-27 16:58:53.362949", - "modified_by": "saurabh@erpnext.com", + "modified": "2015-10-29 16:41:30.749753", + "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", "owner": "Administrator", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 26837f1a64..4f373e0eb2 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -353,25 +353,13 @@ def delivered_by_supplier(purchase_order): def update_delivered_qty(purchase_order): sales_order_list = [] + so_name = '' for item in purchase_order.items: if item.prevdoc_doctype == "Sales Order": - frappe.db.sql(""" update `tabSales Order Item` - set delivered_qty = (ifnull(delivered_qty, 0) + %(qty)s) - where item_code='%(item_code)s' and parent = '%(name)s' - """%{"qty": item.qty, "item_code": item.item_code, "name": item.prevdoc_docname}) - - sales_order_list.append(item.prevdoc_docname) + so_name = item.prevdoc_docname - update_per_delivery(sales_order_list) - -def update_per_delivery(sales_order_list): - for so in sales_order_list: - frappe.db.sql("""update `tabSales Order` - set per_delivered = (select - sum(if(qty > ifnull(delivered_qty, 0), delivered_qty, qty))/ sum(qty)*100 - from `tabSales Order Item` where parent="%(name)s") where name = "%(name)s" """%{"name":so}) - - so = frappe.get_doc("Sales Order", so) - so.set_status(update=True) - so.notify_update() + so = frappe.get_doc("Sales Order", so_name) + so.update_delivery_status(purchase_order.name) + so.set_status(update=True) + so.notify_update() \ No newline at end of file diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py index 0c8fba62b5..1988a6d8e1 100644 --- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py @@ -71,19 +71,19 @@ class TestPurchaseOrder(unittest.TestCase): po = create_purchase_order(qty=3.4, do_not_save=True) self.assertRaises(UOMMustBeIntegerError, po.insert) - def test_ordered_qty_for_closing_po(self): - from erpnext.stock.doctype.item.test_item import make_item + def test_ordered_qty_for_closing_po(self): + bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"}, + fields=["ordered_qty"]) - item = make_item("_Test Close Item", {"is_stock_item": 1, "is_sales_item": 1, - "is_purchase_item": 1}) + existing_ordered_qty = bin[0].ordered_qty if bin else 0.0 - po = create_purchase_order(item_code=item.item_code, qty=1) + po = create_purchase_order(item_code= "_Test Item", qty=1) - self.assertEquals(get_ordered_qty(item_code=item.item_code, warehouse="_Test Warehouse - _TC"), 1) + self.assertEquals(get_ordered_qty(item_code= "_Test Item", warehouse="_Test Warehouse - _TC"), existing_ordered_qty+1) po.update_status("Closed") - self.assertEquals(get_ordered_qty(item_code=item.item_code, warehouse="_Test Warehouse - _TC"), 0) + self.assertEquals(get_ordered_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_ordered_qty) def create_purchase_order(**args): po = frappe.new_doc("Purchase Order") diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 2de6777fef..b68339c351 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -174,9 +174,7 @@ class StatusUpdater(Document): if change_modified: args['set_modified'] = ', modified = now(), modified_by = "{0}"'\ .format(frappe.db.escape(frappe.session.user)) - - args["drop_ship_cond"] = '' - + self._update_children(args) if "percent_join_field" in args: diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 9ad6d56301..2022ffd80a 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -22,8 +22,9 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( if(doc.status != 'Stopped' && doc.status != 'Closed') { $.each(cur_frm.doc.items, function(i, item){ - if((item.delivered_by_supplier == 1 || item.supplier) && (item.qty > item.ordered_qty)){ - is_delivered_by_supplier = true; + if(item.delivered_by_supplier == 1 || item.supplier){ + if(item.qty > item.ordered_qty) + is_delivered_by_supplier = true; } else{ if(item.qty > item.delivered_qty) @@ -37,7 +38,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( // doc.per_billed); // indent - if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && flt(doc.per_delivered, 2) < 100) + if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && flt(doc.per_delivered, 2) < 100 && !is_delivered_by_supplier) cur_frm.add_custom_button(__('Material Request'), this.make_material_request); if(flt(doc.per_billed)==0) { @@ -45,8 +46,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } // stop - if((flt(doc.per_delivered, 2) < 100 && is_delivery_note) || doc.per_billed < 100 - || (flt(doc.per_ordered,2) < 100 && is_delivered_by_supplier)){ + if(flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed) < 100) { cur_frm.add_custom_button(__('Stop'), this.stop_sales_order) } @@ -68,7 +68,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary"); } - if(flt(doc.per_ordered, 2) < 100 && is_delivered_by_supplier) + if(flt(doc.per_delivered, 2) < 100 && is_delivered_by_supplier) cur_frm.add_custom_button(__('Make Purchase Order'), cur_frm.cscript.make_purchase_order).addClass("btn-primary"); } else { diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index f452fa9841..7ea796cc99 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -260,8 +260,34 @@ class SalesOrder(SellingController): pass def before_update_after_submit(self): - self.validate_drop_ship() + self.validate_drop_ship() + self.validate_po() + + def validate_po(self): + exc_list = [] + + for item in self.items: + supplier = frappe.db.get_value("Sales Order Item", {"parent": self.name, "item_code": item.item_code}, + "supplier") + if item.ordered_qty > 0.0 and item.supplier != supplier: + exc_list.append("Row #{0}: Not allowed to change supplier as Purchase Order already exists".format(item.idx)) + + if exc_list: + frappe.throw('\n'.join(exc_list)) + + def update_delivery_status(self, po_name): + tot_qty, delivered_qty = 0.0, 0.0 + for item in self.items: + if item.delivered_by_supplier: + delivered_qty = frappe.db.get_value("Purchase Order Item", {"parent": po_name, "item_code": item.item_code}, "qty") + frappe.db.set_value("Sales Order Item", item.name, "delivered_qty", delivered_qty) + + delivered_qty += item.delivered_qty + tot_qty += item.qty + + frappe.db.set_value("Sales Order", self.name, "per_delivered", flt(delivered_qty/tot_qty) * 100) + def get_list_context(context=None): from erpnext.controllers.website_list_for_contact import get_list_context list_context = get_list_context(context) @@ -551,15 +577,9 @@ def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc= ], "postprocess": update_item, "condition": lambda doc: doc.ordered_qty < doc.qty and doc.supplier == for_supplier - }, - "Sales Taxes and Charges": { - "doctype": "Purchase Taxes and Charges", - "add_if_empty": True } }, target_doc, set_missing_values) - - return doclist @frappe.whitelist() @@ -595,4 +615,4 @@ def get_supplier(doctype, txt, searchfield, start, page_len, filters): def update_status(status, name): so = frappe.get_doc("Sales Order", name) so.stop_sales_order(status) - return \ No newline at end of file + \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 3ef1a25bc5..1d11a8bead 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -317,7 +317,6 @@ class TestSalesOrder(unittest.TestCase): "warehouse": "_Test Warehouse - _TC", "qty": 2, "rate": 400, - "conversion_factor": 1.0, "delivered_by_supplier": 1, "supplier": '_Test Supplier' }, @@ -330,9 +329,19 @@ class TestSalesOrder(unittest.TestCase): } ] + #setuo existing qty from bin bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, fields=["ordered_qty", "reserved_qty"]) - + + existing_ordered_qty = bin[0].ordered_qty if bin else 0.0 + existing_reserved_qty = bin[0].reserved_qty if bin else 0.0 + + bin = frappe.get_all("Bin", filters={"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, + fields=["reserved_qty"]) + + existing_reserved_qty_for_dn_item = bin[0].reserved_qty if bin else 0.0 + + #create so, po and partial dn so = make_sales_order(item_list=so_items, do_not_submit=True) so.submit() @@ -351,40 +360,56 @@ class TestSalesOrder(unittest.TestCase): ordered_qty, reserved_qty = frappe.db.get_value("Bin", {"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) - existing_ordered_qty = bin[0].ordered_qty if bin else 0.0 - existing_reserved_qty = bin[0].reserved_qty if bin else 0.0 - self.assertEquals(abs(ordered_qty), existing_ordered_qty + so_items[0]['qty']) - self.assertEquals(abs(reserved_qty), existing_reserved_qty + so_items[0]['qty']) + self.assertEquals(abs(reserved_qty), existing_reserved_qty + so_items[0]['qty']) + + reserved_qty = frappe.db.get_value("Bin", + {"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty") + + self.assertEquals(abs(reserved_qty), existing_reserved_qty_for_dn_item + 1) #test po_item length self.assertEquals(len(po.items), 1) #test per_delivered status delivered_by_supplier(po.name) - per_delivered = frappe.db.sql("""select sum(if(qty > ifnull(delivered_qty, 0), delivered_qty, qty))/sum(qty)*100 as per_delivered - from `tabSales Order Item` where parent="{0}" """.format(so.name)) - - self.assertEquals(frappe.db.get_value("Sales Order", so.name, "per_delivered"), per_delivered[0][0]) + self.assertEquals(flt(frappe.db.get_value("Sales Order", so.name, "per_delivered"), 2), 75.00) + #test reserved qty after complete delivery dn = create_dn_against_so(so.name, delivered_qty=1) + reserved_qty = frappe.db.get_value("Bin", + {"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty") + self.assertEquals(abs(reserved_qty), existing_reserved_qty_for_dn_item) + + #test after closing so so.db_set('status', "Closed") so.update_reserved_qty() + ordered_qty, reserved_qty = frappe.db.get_value("Bin", + {"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"]) + + self.assertEquals(abs(ordered_qty), existing_ordered_qty) + self.assertEquals(abs(reserved_qty), existing_reserved_qty) + + reserved_qty = frappe.db.get_value("Bin", + {"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty") + + self.assertEquals(abs(reserved_qty), existing_reserved_qty) + def test_reserved_qty_for_closing_so(self): - from erpnext.stock.doctype.item.test_item import make_item + bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"}, + fields=["reserved_qty"]) - item = make_item("_Test Close Item", {"is_stock_item": 1, "is_sales_item": 1, - "is_purchase_item": 1}) + existing_reserved_qty = bin[0].reserved_qty if bin else 0.0 - so = make_sales_order(item_code=item.item_code, qty=1) + so = make_sales_order(item_code="_Test Item", qty=1) - self.assertEquals(get_reserved_qty(item_code=item.item_code, warehouse="_Test Warehouse - _TC"), 1) + self.assertEquals(get_reserved_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_reserved_qty+1) so.stop_sales_order("Closed") - self.assertEquals(get_reserved_qty(item_code=item.item_code, warehouse="_Test Warehouse - _TC"), 0) + self.assertEquals(get_reserved_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_reserved_qty) def make_sales_order(**args): From 61c9ea938d28de288287e4bdb4e3ef5d842744f2 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 30 Oct 2015 12:02:24 +0530 Subject: [PATCH 32/59] [Change Log] change log entry for drop shipment --- erpnext/change_log/current/drop-ship.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/change_log/current/drop-ship.md b/erpnext/change_log/current/drop-ship.md index d6758e77e6..daa06c2c39 100644 --- a/erpnext/change_log/current/drop-ship.md +++ b/erpnext/change_log/current/drop-ship.md @@ -1 +1,2 @@ -- **Drop Ship** You can now implement drop shipping by creating Purchase Order from Sales Order. \ No newline at end of file +- **Drop Ship** + - Make Sales Order with mrked item as **_Delivered By Supplier_** and submit SO and then make a Purchase Order. \ No newline at end of file From b0388d971a17448a4ac86d0371e88ff06cfc74c4 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 30 Oct 2015 12:54:10 +0530 Subject: [PATCH 33/59] [minor] reduced size of video placeholder --- .../images/erpnext-video-placeholder.jpg | Bin 812686 -> 274278 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/erpnext/public/images/erpnext-video-placeholder.jpg b/erpnext/public/images/erpnext-video-placeholder.jpg index 7a0f8433c101672ca14ffbdb5443357d4c694647..9e9d1c6b1ad243b2c638dd4e66d4fcddfc22c54d 100644 GIT binary patch literal 274278 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
  • +R2HWkavKJ<^>98@m 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

    Oyxxv9Y8~TNtyg_P0*VgUlK7l-~E( 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 literal 812686 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

    >iWu&R=f(|N3L(hZ@1<(U;X*c=i`iK;p!xSU~8 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�tH1KuWgkGqOo-N(yv`YIcB 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Π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%0Ddea89!%L~r4|5fq4UU1ME5_0G!hgq| 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 z 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 z%0D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 YNq@dSIy{KaIci_Cr>j+2m&}j<*-YiyjsO4v From bacc679df54aa995eb170055949134dbccd1c2ba Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 30 Oct 2015 12:54:27 +0530 Subject: [PATCH 34/59] [language] added Slovene and updated translations --- erpnext/translations/ar.csv | 25 +- erpnext/translations/bg.csv | 19 + erpnext/translations/bn.csv | 19 + erpnext/translations/bs.csv | 19 + erpnext/translations/ca.csv | 19 + erpnext/translations/cs.csv | 19 + erpnext/translations/da-DK.csv | 17 + erpnext/translations/da.csv | 19 + erpnext/translations/de.csv | 345 +-- erpnext/translations/el.csv | 19 + erpnext/translations/es-PE.csv | 19 + erpnext/translations/es.csv | 2017 ++++++++-------- erpnext/translations/fa.csv | 19 + erpnext/translations/fi.csv | 77 +- erpnext/translations/fr.csv | 19 + erpnext/translations/he.csv | 19 + erpnext/translations/hi.csv | 19 + erpnext/translations/hr.csv | 19 + erpnext/translations/hu.csv | 19 + erpnext/translations/id.csv | 19 + erpnext/translations/it.csv | 19 + erpnext/translations/ja.csv | 25 +- erpnext/translations/km.csv | 18 + erpnext/translations/kn.csv | 19 + erpnext/translations/ko.csv | 19 + erpnext/translations/lv.csv | 19 + erpnext/translations/mk.csv | 19 + erpnext/translations/mr.csv | 19 + erpnext/translations/my.csv | 19 + erpnext/translations/nl.csv | 19 + erpnext/translations/no.csv | 19 + erpnext/translations/pl.csv | 23 +- erpnext/translations/pt-BR.csv | 57 +- erpnext/translations/pt.csv | 27 +- erpnext/translations/ro.csv | 19 + erpnext/translations/ru.csv | 19 + erpnext/translations/sk.csv | 71 +- erpnext/translations/sl.csv | 3910 ++++++++++++++++++++++++++++++++ erpnext/translations/sq.csv | 19 + erpnext/translations/sr.csv | 19 + erpnext/translations/sv.csv | 19 + erpnext/translations/ta.csv | 19 + erpnext/translations/th.csv | 19 + erpnext/translations/tr.csv | 39 +- erpnext/translations/uk.csv | 19 + erpnext/translations/vi.csv | 73 +- erpnext/translations/zh-cn.csv | 19 + erpnext/translations/zh-tw.csv | 19 + 48 files changed, 6085 insertions(+), 1285 deletions(-) create mode 100644 erpnext/translations/sl.csv diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv index 0c867d8605..40b9ba5e48 100644 --- a/erpnext/translations/ar.csv +++ b/erpnext/translations/ar.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,مشاهدة DocType: Sales Invoice Item,Quantity,كمية apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),القروض ( المطلوبات ) DocType: Employee Education,Year of Passing,اجتياز سنة +sites/assets/js/erpnext.min.js +27,In Stock,في الأوراق المالية apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,يمكن تسديد فواتير المبيعات ضد بالدفع فقط DocType: Designation,Designation,تعيين DocType: Production Plan Item,Production Plan Item,خطة إنتاج السلعة @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,إعدادات وح DocType: SMS Center,SMS Center,مركز SMS apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,استقامة DocType: BOM Replace Tool,New BOM,BOM جديدة +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,دفعة سجلات الوقت لإعداد الفواتير. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity الصب apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,وقد تم بالفعل أرسلت الرسالة الإخبارية DocType: Lead,Request Type,طلب نوع @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,ألبوم جديد UOM DocType: Period Closing Voucher,Closing Account Head,إغلاق حساب رئيس DocType: Employee,External Work History,التاريخ العمل الخارجي apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,خطأ مرجع دائري +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,هل تريد حقا أن توقف DocType: Communication,Closed,مغلق DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,وبعبارة (تصدير) أن تكون واضحة مرة واحدة قمت بحفظ ملاحظة التسليم. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,هل أنت متأكد أنك تريد أن تتوقف DocType: Lead,Industry,صناعة DocType: Employee,Job Profile,الملف ظيفة DocType: Newsletter,Newsletter,النشرة الإخبارية @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,تحمي apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,أرسل الآن ,Support Analytics,دعم تحليلات DocType: Item,Website Warehouse,مستودع الموقع +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,هل تريد حقا لوقف أمر الإنتاج: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",في يوم من الشهر الذي سيتم إنشاء فاتورة السيارات سبيل المثال 05، 28 الخ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,يجب أن تكون النتيجة أقل من أو يساوي 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,سجلات النموذج - س @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,أب DocType: SMS Center,All Lead (Open),جميع الرصاص (فتح) DocType: Purchase Invoice,Get Advances Paid,الحصول على السلف المدفوعة apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,إرفاق صورتك +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,جعل DocType: Journal Entry,Total Amount in Words,المبلغ الكلي في كلمات DocType: Workflow State,Stop,توقف apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,كان هناك خطأ . يمكن أن يكون أحد الأسباب المحتملة التي قد لا يتم حفظ النموذج. يرجى الاتصال support@erpnext.com إذا استمرت المشكلة. @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,جعل دخول الفرق DocType: Upload Attendance,Attendance From Date,الحضور من تاريخ DocType: Appraisal Template Goal,Key Performance Area,مفتاح الأداء المنطقة apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,نقل +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,والسنة: DocType: Email Digest,Annual Expense,المصاريف السنوية DocType: SMS Center,Total Characters,مجموع أحرف apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},يرجى تحديد BOM في الحقل BOM القطعة ل{0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,العطل DocType: Sales Order Item,Planned Quantity,المخطط الكمية DocType: Purchase Invoice Item,Item Tax Amount,البند ضريبة المبلغ DocType: Item,Maintain Stock,الحفاظ على الأوراق المالية +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,مقالات الأسهم التي تم إنشاؤها بالفعل لترتيب الإنتاج DocType: Leave Control Panel,Leave blank if considered for all designations,ترك فارغا إذا نظرت لجميع التسميات apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},الحد الأقصى: {0} @@ -1222,7 +1230,7 @@ DocType: Warranty Claim,Warranty / AMC Status,الضمان / AMC الحالة DocType: GL Entry,GL Entry,GL الدخول DocType: HR Settings,Employee Settings,إعدادات موظف ,Batch-Wise Balance History,دفعة الحكيم التاريخ الرصيد -apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,والقيام قائمة +apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,قائمة المهام apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,مبتدئ apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,لا يسمح السلبية الكمية DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field. @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,م apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ JV {2} الصف {0} DocType: Item,Inventory,جرد DocType: Features Setup,"To enable ""Point of Sale"" view",لتمكين "نقطة البيع" وجهة نظر +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,لا يمكن أن يتم السداد للسلة فارغة DocType: Item,Sales Details,تفاصيل المبيعات apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,تعلق DocType: Opportunity,With Items,مع الأصناف @@ -1453,10 +1462,11 @@ DocType: Item,Weightage,الوزن apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,تعدين apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,الراتنج صب apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء مع نفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية المجموعة العملاء +sites/assets/js/erpnext.min.js +37,Please select {0} first.,الرجاء اختيار {0} أولا. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},النص {0} DocType: Territory,Parent Territory,الأم الأرض DocType: Quality Inspection Reading,Reading 2,القراءة 2 -DocType: Stock Entry,Material Receipt,المادة استلام +DocType: Stock Entry,Material Receipt,أستلام مواد apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,المنتجات apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {0} DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",إذا كان هذا البند لديها بدائل، فإنه لا يمكن اختيارها في أوامر البيع الخ @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,العلامات التجارية DocType: C-Form Invoice Detail,Invoice No,الفاتورة لا apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,من أمر الشراء DocType: Activity Cost,Costing Rate,تكلف سعر +,Customer Addresses And Contacts,العناوين العملاء واتصالات DocType: Employee,Resignation Letter Date,استقالة تاريخ رسالة apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,يتم تصفية قواعد التسعير على أساس كمية إضافية. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,غير محدد @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,يجب تقديم الوقت سجل الحالة. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,المسلسل لا {0} لا تنتمي إلى أي مستودع apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,إنشاء +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,الصف # DocType: Purchase Invoice,In Words (Company Currency),في كلمات (عملة الشركة) DocType: Pricing Rule,Supplier,مزود DocType: C-Form,Quarter,ربع @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير- DocType: Project,External,خارجي DocType: Features Setup,Item Serial Nos,المسلسل ارقام البند +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,المستخدمين وأذونات DocType: Branch,Branch,فرع +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,الطباعة و العلامات التجارية +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,لا زلة المرتبات وجدت لمدة شهر: DocType: Bin,Actual Quantity,الكمية الفعلية DocType: Shipping Rule,example: Next Day Shipping,مثال: اليوم التالي شحن apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,المسلسل لا {0} لم يتم العثور @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,وحدة متميزة من عنصر DocType: Pricing Rule,Buying,شراء DocType: HR Settings,Employee Records to be created by,سجلات الموظفين المراد إنشاؤها من قبل apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,تم إلغاء هذه الدفعة دخول الوقت. +,Reqd By Date,Reqd حسب التاريخ DocType: Salary Slip Earning,Salary Slip Earning,مسير الرواتب /الكسب apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,الدائنين apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,الصف # {0}: لا المسلسل إلزامي @@ -3328,6 +3344,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,سيتم إنشاء حساب المستودع ( الجرد الدائم ) في إطار هذا الحساب. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع. DocType: Company,Distribution,التوزيع +sites/assets/js/erpnext.min.js +50,Amount Paid,المبلغ المدفوع apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,مدير المشروع apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,إيفاد apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ماكس الخصم المسموح به لمادة: {0} {1}٪ @@ -3336,7 +3353,7 @@ DocType: Account,Receivable,القبض DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,الدور الذي يسمح بتقديم المعاملات التي تتجاوز حدود الائتمان تعيين. DocType: Sales Invoice,Supplier Reference,مرجع المورد DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",إذا كانت محددة، سينظر BOM لبنود فرعية الجمعية للحصول على المواد الخام. خلاف ذلك، سيتم معاملة جميع البنود الفرعية الجمعية كمادة خام. -DocType: Material Request,Material Issue,المواد العدد +DocType: Material Request,Material Issue,صرف مواد DocType: Hub Settings,Seller Description,البائع الوصف DocType: Employee Education,Qualification,المؤهل DocType: Item Price,Item Price,البند السعر @@ -3834,6 +3851,7 @@ DocType: Account,Parent Account,الأصل حساب DocType: Quality Inspection Reading,Reading 3,قراءة 3 ,Hub,محور DocType: GL Entry,Voucher Type,نوع السند +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها DocType: Expense Claim,Approved,وافق DocType: Pricing Rule,Price,السعر apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',يجب أن يتم تعيين الموظف مرتاح على {0} ك ' اليسار ' @@ -3948,6 +3966,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,الرجاء اختيار الفئة الأولى apps/erpnext/erpnext/config/projects.py +18,Project master.,المشروع الرئيسي. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,لا تظهر أي رمز مثل $ الخ بجانب العملات. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(نصف يوم) DocType: Supplier,Credit Days,الائتمان أيام DocType: Leave Type,Is Carry Forward,والمضي قدما apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,الحصول على عناصر من BOM diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv index cff9f46318..36e553c7db 100644 --- a/erpnext/translations/bg.csv +++ b/erpnext/translations/bg.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Покажи DocType: Sales Invoice Item,Quantity,Количество apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Заеми (пасиви) DocType: Employee Education,Year of Passing,Година на Passing +sites/assets/js/erpnext.min.js +27,In Stock,В Наличност apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Мога само да направи плащане срещу нетаксувано Продажби Поръчка DocType: Designation,Designation,Предназначение DocType: Production Plan Item,Production Plan Item,Производство Plan Точка @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки DocType: SMS Center,SMS Center,SMS Center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Изправяне DocType: BOM Replace Tool,New BOM,New BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Час Logs за фактуриране. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity леене apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter вече е било изпратено DocType: Lead,Request Type,Заявка Type @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New фондова мерна DocType: Period Closing Voucher,Closing Account Head,Закриване на профила Head DocType: Employee,External Work History,Външно работа apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Референтен Error +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Наистина ли искате да спрете DocType: Communication,Closed,Затворен DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,По думите (износ) ще бъде видим след като запазите бележката за доставката. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Наистина ли искате да спрете DocType: Lead,Industry,Промишленост DocType: Employee,Job Profile,Job профил DocType: Newsletter,Newsletter,Newsletter @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Качв apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Изпрати сега ,Support Analytics,Поддръжка Analytics DocType: Item,Website Warehouse,Website Warehouse +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Наистина ли искате да спрете производствена поръчка: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Денят от месеца, на която автоматично фактура ще бъде генериран например 05, 28 и т.н." apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Резултати трябва да бъде по-малка или равна на 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-форма записи @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бя DocType: SMS Center,All Lead (Open),All Lead (Open) DocType: Purchase Invoice,Get Advances Paid,Вземи платени аванси apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепете вашата снимка +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Правя DocType: Journal Entry,Total Amount in Words,Обща сума в Думи DocType: Workflow State,Stop,Спри apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Имаше грешка. Една вероятна причина може да бъде, че не сте запаметили формата. Моля, свържете се support@erpnext.com ако проблемът не бъде отстранен." @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,Направи Разлика Вл DocType: Upload Attendance,Attendance From Date,Присъствие От дата DocType: Appraisal Template Goal,Key Performance Area,Ключова област на ефективността apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Транспорт +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и година: DocType: Email Digest,Annual Expense,Годишен Expense DocType: SMS Center,Total Characters,Общо Герои apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Моля изберете BOM BOM в полето за позиция {0} @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,Ваканция DocType: Sales Order Item,Planned Quantity,Планираното количество DocType: Purchase Invoice Item,Item Tax Amount,Елемент от данъци DocType: Item,Maintain Stock,Поддържайте Фондова +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Вписване в запасите вече създадени за производствена поръчка DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставете празно, ако считат за всички наименования" apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип "Край" в ред {0} не могат да бъдат включени в т Курсове apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,А apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на JV количество {2} DocType: Item,Inventory,Инвентаризация DocType: Features Setup,"To enable ""Point of Sale"" view",За да се даде възможност на "точка на продажба" изглед +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Плащането не може да се направи за празна количката DocType: Item,Sales Details,Продажби Детайли apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Прикова DocType: Opportunity,With Items,С артикули @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Минен apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Леене смола apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Група Клиенти съществува със същото име моля, променете името на Клиента или преименувайте Група Клиенти" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Моля изберете {0} на първо място. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},текст {0} DocType: Territory,Parent Territory,Родител Territory DocType: Quality Inspection Reading,Reading 2,Четене 2 @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,Brands DocType: C-Form Invoice Detail,Invoice No,Фактура Не apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,От поръчка DocType: Activity Cost,Costing Rate,Остойностяване Курсове +,Customer Addresses And Contacts,Адреси на клиенти и контакти DocType: Employee,Resignation Letter Date,Оставка Letter Дата apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Правилата за ценообразуване са допълнително филтрирани въз основа на количеството. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не е зададен @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Log Status трябва да бъдат изпратени. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Пореден № {0} не принадлежи на нито една Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Настройване +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),По думите (Company валути) DocType: Pricing Rule,Supplier,Доставчик DocType: C-Form,Quarter,Тримесечие @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Допълнителни разходни центрове могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи" DocType: Project,External,Външен DocType: Features Setup,Item Serial Nos,Позиция серийни номера +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Потребители и разрешения DocType: Branch,Branch,Клон +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печат и Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Не приплъзване заплата намерено за месеца: DocType: Bin,Actual Quantity,Действителното количество DocType: Shipping Rule,example: Next Day Shipping,Например: Next Day Shipping apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Пореден № {0} не е намерен @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,Обособена единица н DocType: Pricing Rule,Buying,Купуване DocType: HR Settings,Employee Records to be created by,Архивите на служителите да бъдат създадени от apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch е бил отменен. +,Reqd By Date,Reqd по дата DocType: Salary Slip Earning,Salary Slip Earning,Заплата Slip Приходи apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Кредиторите apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Пореден № е задължително @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Account for the warehouse (Perpetual Inventory) will be created under this Account. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse не може да се заличи, тъй като съществува влизане фондова книга за този склад." DocType: Company,Distribution,Разпределение +sites/assets/js/erpnext.min.js +50,Amount Paid,"Сума, платена" apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Ръководител На Проект apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Изпращане apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max отстъпка разрешено за покупка: {0} е {1}% @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,Родител Акаунт DocType: Quality Inspection Reading,Reading 3,Четене 3 ,Hub,Главина DocType: GL Entry,Voucher Type,Ваучер Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ценова листа не е намерен или инвалиди DocType: Expense Claim,Approved,Одобрен DocType: Pricing Rule,Price,Цена apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като "Ляв" @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Моля, изберете Категория първо" apps/erpnext/erpnext/config/projects.py +18,Project master.,Майстор Project. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Да не се показва всеки символ като $ и т.н. до валути. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Половин ден) DocType: Supplier,Credit Days,Кредитните Days DocType: Leave Type,Is Carry Forward,Дали Пренасяне apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Получават от BOM diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv index 24206f4bc4..5c696e2698 100644 --- a/erpnext/translations/bn.csv +++ b/erpnext/translations/bn.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,দেখা DocType: Sales Invoice Item,Quantity,পরিমাণ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ঋণ (দায়) DocType: Employee Education,Year of Passing,পাসের সন +sites/assets/js/erpnext.min.js +27,In Stock,স্টক ইন apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,শুধুমাত্র যেতে উদ্ভাবনী উপায় বিক্রয় আদেশের বিরুদ্ধে পেমেন্ট করতে পারবেন DocType: Designation,Designation,উপাধি DocType: Production Plan Item,Production Plan Item,উৎপাদন পরিকল্পনা আইটেম @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,এইচআর ম DocType: SMS Center,SMS Center,এসএমএস কেন্দ্র apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,সোজা DocType: BOM Replace Tool,New BOM,নতুন BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,ব্যাচ বিলিং জন্য সময় লগসমূহ. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity ঢালাই apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,নিউজলেটার ইতিমধ্যে পাঠানো হয়েছে DocType: Lead,Request Type,অনুরোধ টাইপ @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,নতুন শেয়ার DocType: Period Closing Voucher,Closing Account Head,অ্যাকাউন্ট হেড সমাপ্তি DocType: Employee,External Work History,বাহ্যিক কাজের ইতিহাস apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,সার্কুলার রেফারেন্স ত্রুটি +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,আপনি কি সত্যিই বন্ধ করতে চান DocType: Communication,Closed,বন্ধ DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,আপনি হুণ্ডি সংরক্ষণ একবার শব্দ (রপ্তানি) দৃশ্যমান হবে. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,আপনি বন্ধ করার ব্যাপারে নিশ্চিত DocType: Lead,Industry,শিল্প DocType: Employee,Job Profile,চাকরি বৃত্তান্ত DocType: Newsletter,Newsletter,নিউজলেটার @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSV ম apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,এখন পাঠান ,Support Analytics,সাপোর্ট অ্যানালিটিক্স DocType: Item,Website Warehouse,ওয়েবসাইট ওয়্যারহাউস +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,আপনি কি সত্যিই প্রকাশনা অর্ডার বন্ধ করতে চান না: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","অটো চালান 05, 28 ইত্যাদি যেমন তৈরি করা হবে যা মাসের দিন" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,স্কোর 5 থেকে কম বা সমান হবে apps/erpnext/erpnext/config/accounts.py +169,C-Form records,সি-ফরম রেকর্ড @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,স DocType: SMS Center,All Lead (Open),সব নেতৃত্ব (ওপেন) DocType: Purchase Invoice,Get Advances Paid,উন্নতির প্রদত্ত করুন apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,তোমার ছবি সংযুক্ত +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,করা DocType: Journal Entry,Total Amount in Words,শব্দ মধ্যে মোট পরিমাণ DocType: Workflow State,Stop,থামুন apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,সেখানে একটা ভুল ছিল. এক সম্ভাব্য কারণ আপনার ফর্ম সংরক্ষণ করেন নি যে হতে পারে. সমস্যা থেকে গেলে support@erpnext.com সাথে যোগাযোগ করুন. @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,পার্থক্য এন্ DocType: Upload Attendance,Attendance From Date,জন্ম থেকে উপস্থিতি DocType: Appraisal Template Goal,Key Performance Area,কী পারফরমেন্স ফোন apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,পরিবহন +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,এবং বছর: DocType: Email Digest,Annual Expense,বার্ষিক ব্যয় DocType: SMS Center,Total Characters,মোট অক্ষর apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},আইটেম জন্য BOM ক্ষেত্রের মধ্যে BOM নির্বাচন করুন {0} @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,ছুটির DocType: Sales Order Item,Planned Quantity,পরিকল্পনা পরিমাণ DocType: Purchase Invoice Item,Item Tax Amount,আইটেমটি ট্যাক্স পরিমাণ DocType: Item,Maintain Stock,শেয়ার বজায় +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ইতিমধ্যে উৎপাদন অর্ডার নির্মিত শেয়ার সাজপোশাকটি DocType: Leave Control Panel,Leave blank if considered for all designations,সব প্রশিক্ষণে জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ 'প্রকৃত' সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},সর্বোচ্চ: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ব apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা জেভি পরিমাণ সমান নয় {2} DocType: Item,Inventory,জায় DocType: Features Setup,"To enable ""Point of Sale"" view",দেখুন "বিক্রয় বিন্দু" সচল করুন +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,পেমেন্ট খালি ট্রলি জন্য তৈরি করা যাবে না DocType: Item,Sales Details,বিক্রয় বিবরণ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,পিন DocType: Opportunity,With Items,জানানোর সঙ্গে @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,গুরুত্ব apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,খনন apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,রজন apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন +sites/assets/js/erpnext.min.js +37,Please select {0} first.,{0} প্রথম নির্বাচন করুন. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},টেক্সট {0} DocType: Territory,Parent Territory,মূল টেরিটরি DocType: Quality Inspection Reading,Reading 2,2 পড়া @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,ব্র্যান্ড DocType: C-Form Invoice Detail,Invoice No,চালান নং apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ক্রয় অর্ডার থেকে DocType: Activity Cost,Costing Rate,খোয়াতে হার +,Customer Addresses And Contacts,গ্রাহক ঠিকানা এবং পরিচিতি DocType: Employee,Resignation Letter Date,পদত্যাগ পত্র তারিখ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,দামে আরও পরিমাণের উপর ভিত্তি করে ফিল্টার করা হয়. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,সেট না @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,টাইম ইন স্থিতি জমা িদেত হেব. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,সিরিয়াল কোন {0} কোনো গুদাম অন্তর্গত নয় apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ঠিককরা +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,সারি # DocType: Purchase Invoice,In Words (Company Currency),ভাষায় (কোম্পানি একক) DocType: Pricing Rule,Supplier,সরবরাহকারী DocType: C-Form,Quarter,সিকি @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,অতিরিক্ত খরচ সেন্টার গ্রুপ অধীন করা যেতে পারে কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে DocType: Project,External,বহিরাগত DocType: Features Setup,Item Serial Nos,আইটেম সিরিয়াল আমরা +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ব্যবহারকারী এবং অনুমতি DocType: Branch,Branch,শাখা +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ছাপানো ও ব্র্যান্ডিং +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,মাস পাওয়া যায়নি বেতন স্লিপ: DocType: Bin,Actual Quantity,প্রকৃত পরিমাণ DocType: Shipping Rule,example: Next Day Shipping,উদাহরণস্বরূপ: আগামী দিন গ্রেপ্তার apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,পাওয়া না সিরিয়াল কোন {0} @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,একটি আইটেম এর DocType: Pricing Rule,Buying,ক্রয় DocType: HR Settings,Employee Records to be created by,কর্মচারী রেকর্ড করে তৈরি করা apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,এই টাইম ইন ব্যাচ বাতিল করা হয়েছে. +,Reqd By Date,Reqd তারিখ DocType: Salary Slip Earning,Salary Slip Earning,বেতন স্লিপ রোজগার apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,ঋণদাতাদের apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,সারি # {0}: সিরিয়াল কোন বাধ্যতামূলক @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,গুদাম (চিরস্থায়ী পরিসংখ্যা) জন্য অ্যাকাউন্ট এই অ্যাকাউন্টের অধীনে তৈরি করা হবে. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না. DocType: Company,Distribution,বিতরণ +sites/assets/js/erpnext.min.js +50,Amount Paid,পরিমাণ অর্থ প্রদান করা apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,প্রকল্প ব্যবস্থাপক apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,প্রাণবধ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,আইটেম জন্য অনুমোদিত সর্বোচ্চ ছাড়: {0} {1}% হল @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,মূল অ্যাকাউন্ট DocType: Quality Inspection Reading,Reading 3,3 পড়া ,Hub,হাব DocType: GL Entry,Voucher Type,ভাউচার ধরন +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না DocType: Expense Claim,Approved,অনুমোদিত DocType: Pricing Rule,Price,মূল্য apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী 'বাম' হিসাবে @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,প্রথম শ্রেণী নির্বাচন করুন apps/erpnext/erpnext/config/projects.py +18,Project master.,প্রকল্প মাস্টার. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,মুদ্রা ইত্যাদি $ মত কোন প্রতীক পরের প্রদর্শন না. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(অর্ধদিবস) DocType: Supplier,Credit Days,ক্রেডিট দিন DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয় apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM থেকে জানানোর পান diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv index 1992bb91ef..84b66f7f19 100644 --- a/erpnext/translations/bs.csv +++ b/erpnext/translations/bs.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Show Varijante DocType: Sales Invoice Item,Quantity,Količina apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva) DocType: Employee Education,Year of Passing,Tekuća godina +sites/assets/js/erpnext.min.js +27,In Stock,U Stock apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Mogu samo napraviti uplatu protiv nenaplaćenu prodajni nalog DocType: Designation,Designation,Oznaka DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Podešavanja modula DocType: SMS Center,SMS Center,SMS centar apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ispravljanje DocType: BOM Replace Tool,New BOM,Novi BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Dnevnici za naplatu. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter je već poslana DocType: Lead,Request Type,Zahtjev Tip @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Novi kataloški UOM DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa DocType: Employee,External Work History,Vanjski History Work apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kružna Reference Error +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Da li stvarno želite zaustaviti DocType: Communication,Closed,Zatvoreno DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Jeste li sigurni da želite zaustaviti DocType: Lead,Industry,Industrija DocType: Employee,Job Profile,posao Profile DocType: Newsletter,Newsletter,Bilten @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Prenesi d apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošalji odmah ,Support Analytics,Analitike podrške DocType: Item,Website Warehouse,Web stranica galerije +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Da li stvarno želite zaustaviti proizvodnju kako bi: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Na dan u mjesecu na kojima auto faktura će biti generiran npr 05, 28 itd" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Ocjena mora biti manja od ili jednaka 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C - Form zapisi @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bije DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni) DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Priložite svoju sliku +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Napraviti DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima DocType: Workflow State,Stop,zaustaviti apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi . @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,Čine razliku Entry DocType: Upload Attendance,Attendance From Date,Gledatelja Od datuma DocType: Appraisal Template Goal,Key Performance Area,Područje djelovanja apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,promet +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i godina: DocType: Email Digest,Annual Expense,Godišnji trošak DocType: SMS Center,Total Characters,Ukupno Likovi apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Molimo odaberite BOM BOM u polje za Stavka {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,Praznici DocType: Sales Order Item,Planned Quantity,Planirana količina DocType: Purchase Invoice Item,Item Tax Amount,Iznos poreza artikla DocType: Item,Maintain Stock,Održavati Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock unosi već stvorene za proizvodnju Order DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako smatra za sve oznake apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak JV iznos {2} DocType: Item,Inventory,Inventar DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili "Point of Sale" pogled +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu DocType: Item,Sales Details,Prodajni detalji apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Prikačuju DocType: Opportunity,With Items,Sa stavkama @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Smola casting apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa kupaca sa istim nazivom već postoji. Promijenite naziv kupca ili promijenite naziv grupe kupaca. +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Odaberite {0} na prvom mjestu. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0} DocType: Territory,Parent Territory,Roditelj Regija DocType: Quality Inspection Reading,Reading 2,Čitanje 2 @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,Brendovi DocType: C-Form Invoice Detail,Invoice No,Račun br apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od narudžbenice DocType: Activity Cost,Costing Rate,Costing Rate +,Customer Addresses And Contacts,Kupac adrese i kontakti DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,ne Set @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Vrijeme Log Status moraju biti dostavljeni. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada nijednoj Skladište apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Postavljanje +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta tvrtke) DocType: Pricing Rule,Supplier,Dobavljači DocType: C-Form,Quarter,Četvrtina @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Dalje troška mogu biti pod Grupe, ali unosa može biti protiv ne-Grupe" DocType: Project,External,Vanjski DocType: Features Setup,Item Serial Nos,Serijski br artikla +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole DocType: Branch,Branch,Ogranak +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje i brendiranje +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nema plaće slip pronađena za mjesec: DocType: Bin,Actual Quantity,Stvarna količina DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} nije pronađena @@ -3098,6 +3113,7 @@ DocType: Serial No,Distinct unit of an Item,Različite jedinice strane jedinice DocType: Pricing Rule,Buying,Nabavka DocType: HR Settings,Employee Records to be created by,Zaposlenik Records bi se stvorili apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ovo Batch Vrijeme Log je otkazan. +,Reqd By Date,Reqd Po datumu DocType: Salary Slip Earning,Salary Slip Earning,Plaća proklizavanja Zarada apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditori apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Serial No je obavezno @@ -3327,6 +3343,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto za skladište (stalni inventar) stvorit će se na osnovu ovog konta . apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladište se ne može izbrisati , kao entry stock knjiga postoji za to skladište ." DocType: Company,Distribution,Distribucija +sites/assets/js/erpnext.min.js +50,Amount Paid,Plaćeni iznos apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni popust dopušteno za predmet: {0} je {1}% @@ -3833,6 +3850,7 @@ DocType: Account,Parent Account,Roditelj račun DocType: Quality Inspection Reading,Reading 3,Čitanje 3 ,Hub,Čvor DocType: GL Entry,Voucher Type,Bon Tip +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom DocType: Expense Claim,Approved,Odobreno DocType: Pricing Rule,Price,Cijena apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo ' @@ -3947,6 +3965,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Molimo odaberite kategoriju prvi apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt majstor. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol poput $ iza valute. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Pola dana) DocType: Supplier,Credit Days,Kreditne Dani DocType: Leave Type,Is Carry Forward,Je Carry Naprijed apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM) diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv index a6cdf01741..8884d29561 100644 --- a/erpnext/translations/ca.csv +++ b/erpnext/translations/ca.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostra variant DocType: Sales Invoice Item,Quantity,Quantitat apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstecs (passius) DocType: Employee Education,Year of Passing,Any de defunció +sites/assets/js/erpnext.min.js +27,In Stock,En estoc apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Només es pot fer el pagament en contra no facturada d'ordres de venda DocType: Designation,Designation,Designació DocType: Production Plan Item,Production Plan Item,Pla de Producció d'articles @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustaments per al DocType: SMS Center,SMS Center,Centre d'SMS apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Redreçar DocType: BOM Replace Tool,New BOM,Nova llista de materials +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Lot Registres de temps per a la facturació. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Colada per contra apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,El Newsletter ja s'ha enviat DocType: Lead,Request Type,Tipus de sol·licitud @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nova UDM d'existències DocType: Period Closing Voucher,Closing Account Head,Tancant el Compte principal DocType: Employee,External Work History,Historial de treball extern apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referència Circular Error +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,De debò vols a STOP DocType: Communication,Closed,Tancat DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En paraules (exportació) seran visibles quan es desi l'albarà de lliurament. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Segur que vols deixar de DocType: Lead,Industry,Indústria DocType: Employee,Job Profile,Perfil Laboral DocType: Newsletter,Newsletter,Newsletter @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Puja sald apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ara ,Support Analytics,Suport Analytics DocType: Item,Website Warehouse,Lloc Web del magatzem +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,De veritat vol deixar d'ordre de producció: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El dia del mes en què es generarà factura acte per exemple 05, 28, etc. " apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score ha de ser menor que o igual a 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registres C-Form @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blan DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert) DocType: Purchase Invoice,Get Advances Paid,Obtenir bestretes pagades apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunta la teva imatge +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Fer DocType: Journal Entry,Total Amount in Words,Suma total en Paraules DocType: Workflow State,Stop,Aturi apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"S'ha produït un error. Una raó probable podria ser que no ha guardat el formulari. Si us plau, poseu-vos en contacte amb support@erpnext.com si el problema persisteix." @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,Feu Entrada Diferència DocType: Upload Attendance,Attendance From Date,Assistència des de data DocType: Appraisal Template Goal,Key Performance Area,Àrea Clau d'Acompliment apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transports +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i l'any: DocType: Email Digest,Annual Expense,Despesa anual DocType: SMS Center,Total Characters,Personatges totals apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Seleccioneu la llista de materials en el camp de llista de materials per al punt {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,Vacances DocType: Sales Order Item,Planned Quantity,Quantitat planificada DocType: Purchase Invoice Item,Item Tax Amount,Suma d'impostos d'articles DocType: Item,Maintain Stock,Mantenir Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció DocType: Leave Control Panel,Leave blank if considered for all designations,Deixar en blanc si es considera per a totes les designacions apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2} DocType: Item,Inventory,Inventari DocType: Features Setup,"To enable ""Point of Sale"" view",Per habilitar "Punt de Venda" vista +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,El pagament no es pot fer per al carro buit DocType: Item,Sales Details,Detalls de venda apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixació DocType: Opportunity,With Items,Amb articles @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineria apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Hi ha un grup de clients amb el mateix nom, si us plau canvia el nom del client o el nom del Grup de Clients" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Seleccioneu {0} primer. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0} DocType: Territory,Parent Territory,Parent Territory DocType: Quality Inspection Reading,Reading 2,Lectura 2 @@ -1635,6 +1645,7 @@ DocType: Features Setup,Brands,Marques DocType: C-Form Invoice Detail,Invoice No,Número de Factura apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,De l'Ordre de Compra DocType: Activity Cost,Costing Rate,Pago Rate +,Customer Addresses And Contacts,Adreces de clients i contactes DocType: Employee,Resignation Letter Date,Carta de renúncia Data apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Regles de les tarifes es filtren més basat en la quantitat. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No Configurat @@ -1742,6 +1753,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Hora de registre d'estat ha de ser presentada. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Número de sèrie {0} no pertany a cap magatzem apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuració +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Fila # DocType: Purchase Invoice,In Words (Company Currency),En paraules (Divisa de la Companyia) DocType: Pricing Rule,Supplier,Proveïdor DocType: C-Form,Quarter,Trimestre @@ -1840,7 +1852,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centres de costos addicionals es poden fer en grups, però les entrades es poden fer contra els no Grups" DocType: Project,External,Extern DocType: Features Setup,Item Serial Nos,Article Nº de Sèrie +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuaris i permisos DocType: Branch,Branch,Branca +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printing and Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No nòmina trobats pel mes: DocType: Bin,Actual Quantity,Quantitat real DocType: Shipping Rule,example: Next Day Shipping,exemple: Enviament Dia següent apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no trobat @@ -3101,6 +3116,7 @@ DocType: Serial No,Distinct unit of an Item,Unitat diferent d'un article DocType: Pricing Rule,Buying,Compra DocType: HR Settings,Employee Records to be created by,Registres d'empleats a ser creats per apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Aquest registre de temps ha estat cancel·lat. +,Reqd By Date,Reqd Per Data DocType: Salary Slip Earning,Salary Slip Earning,Salary Slip Earning apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Creditors apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Fila # {0}: Nombre de sèrie és obligatori @@ -3330,6 +3346,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Es crearà un Compte per al magatzem (Inventari Permanent) en aquest Compte apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,El Magatzem no es pot eliminar perquè hi ha entrades al llibre major d'existències d'aquest magatzem. DocType: Company,Distribution,Distribució +sites/assets/js/erpnext.min.js +50,Amount Paid,Quantitat pagada apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despatx apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}% @@ -3836,6 +3853,7 @@ DocType: Account,Parent Account,Compte primària DocType: Quality Inspection Reading,Reading 3,Lectura 3 ,Hub,Cub DocType: GL Entry,Voucher Type,Tipus de Vals +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,La llista de preus no existeix o està deshabilitada DocType: Expense Claim,Approved,Aprovat DocType: Pricing Rule,Price,Preu apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra' @@ -3950,6 +3968,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Si us plau, Selecciona primer la Categoria" apps/erpnext/erpnext/config/projects.py +18,Project master.,Projecte mestre. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No mostrar qualsevol símbol com $ etc costat de monedes. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Mig dia) DocType: Supplier,Credit Days,Dies de Crèdit DocType: Leave Type,Is Carry Forward,Is Carry Forward apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obtenir elements de la llista de materials diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv index 91d6e658fd..7afd1b3688 100644 --- a/erpnext/translations/cs.csv +++ b/erpnext/translations/cs.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Zobrazit Varia DocType: Sales Invoice Item,Quantity,Množství apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Úvěry (závazky) DocType: Employee Education,Year of Passing,Rok Passing +sites/assets/js/erpnext.min.js +27,In Stock,Na skladě apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Lze provést pouze platbu proti nevyfakturované zakázky odběratele DocType: Designation,Designation,Označení DocType: Production Plan Item,Production Plan Item,Výrobní program Item @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavení pro HR m DocType: SMS Center,SMS Center,SMS centrum apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rovnací DocType: BOM Replace Tool,New BOM,New BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch čas Záznamy pro fakturaci. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity lití apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter již byla odeslána DocType: Lead,Request Type,Typ požadavku @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nových akcií UOM DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava DocType: Employee,External Work History,Vnější práce History apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kruhové Referenční Chyba +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,"Opravdu chcete, aby STOP " DocType: Communication,Closed,Zavřeno DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku." +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Jste si jisti, že chcete zastavit" DocType: Lead,Industry,Průmysl DocType: Employee,Job Profile,Job Profile DocType: Newsletter,Newsletter,Newsletter @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Nahrát n apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Odeslat nyní ,Support Analytics,Podpora Analytics DocType: Item,Website Warehouse,Sklad pro web +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Opravdu chcete zastavit výrobní zakázky: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form záznamy @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bíl DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny) DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Připojit svůj obrázek +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Dělat DocType: Journal Entry,Total Amount in Words,Celková částka slovy DocType: Workflow State,Stop,Stop apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává." @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl DocType: Upload Attendance,Attendance From Date,Účast Datum od DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Doprava +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,a rok: DocType: Email Digest,Annual Expense,Roční Expense DocType: SMS Center,Total Characters,Celkový počet znaků apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,Prázdniny DocType: Sales Order Item,Planned Quantity,Plánované Množství DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky DocType: Item,Maintain Stock,Udržovat Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení" apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate" apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}" DocType: Item,Inventory,Inventář DocType: Features Setup,"To enable ""Point of Sale"" view",Chcete-li povolit "Point of Sale" pohledu +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík DocType: Item,Sales Details,Prodejní Podrobnosti apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Připne DocType: Opportunity,With Items,S položkami @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Hornictví apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin lití apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Prosím, vyberte {0} jako první." apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Text {0} DocType: Territory,Parent Territory,Parent Territory DocType: Quality Inspection Reading,Reading 2,Čtení 2 @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,Značky DocType: C-Form Invoice Detail,Invoice No,Faktura č apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Z vydané objednávky DocType: Activity Cost,Costing Rate,Kalkulace Rate +,Customer Addresses And Contacts,Adresy zákazníků a kontakty DocType: Employee,Resignation Letter Date,Rezignace Letter Datum apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Není nastaveno @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Pořadové číslo {0} nepatří do skladu," apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavení +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Řádek č. DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti) DocType: Pricing Rule,Supplier,Dodavatel DocType: C-Form,Quarter,Čtvrtletí @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin" DocType: Project,External,Externí DocType: Features Setup,Item Serial Nos,Položka sériových čísel +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění DocType: Branch,Branch,Větev +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tisk a identita +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No plat skluzu nalezen na měsíc: DocType: Bin,Actual Quantity,Skutečné Množství DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky DocType: Pricing Rule,Buying,Nákupy DocType: HR Settings,Employee Records to be created by,"Zaměstnanec Záznamy, které vytvořil" apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,To Batch Time Log byla zrušena. +,Reqd By Date,Př p Podle data DocType: Salary Slip Earning,Salary Slip Earning,Plat Slip Zisk apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Věřitelé apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Řádek # {0}: Výrobní číslo je povinné @@ -3328,6 +3344,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu." apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad." DocType: Company,Distribution,Distribuce +sites/assets/js/erpnext.min.js +50,Amount Paid,Zaplacené částky apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}% @@ -3834,6 +3851,7 @@ DocType: Account,Parent Account,Nadřazený účet DocType: Quality Inspection Reading,Reading 3,Čtení 3 ,Hub,Hub DocType: GL Entry,Voucher Type,Voucher Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán DocType: Expense Claim,Approved,Schválený DocType: Pricing Rule,Price,Cena apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left""" @@ -3948,6 +3966,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(půlden) DocType: Supplier,Credit Days,Úvěrové dny DocType: Leave Type,Is Carry Forward,Je převádět apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Získat předměty z BOM diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv index 869faa9d3f..8597050cd4 100644 --- a/erpnext/translations/da-DK.csv +++ b/erpnext/translations/da-DK.csv @@ -56,6 +56,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter DocType: Sales Invoice Item,Quantity,Mængde apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver) DocType: Employee Education,Year of Passing,År for Passing +sites/assets/js/erpnext.min.js +27,In Stock,På lager DocType: Designation,Designation,Betegnelse DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1} @@ -168,6 +169,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for H DocType: SMS Center,SMS Center,SMS-center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Opretning DocType: BOM Replace Tool,New BOM,Ny BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs for fakturering. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity støbning apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhedsbrev er allerede blevet sendt DocType: Lead,Request Type,Anmodning Type @@ -289,8 +291,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved DocType: Employee,External Work History,Ekstern Work History apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Vil du virkelig ønsker at stoppe DocType: Communication,Closed,Lukket DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen." +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Er du sikker på du vil STOP DocType: Lead,Industry,Industri DocType: Employee,Job Profile,Job profil DocType: Newsletter,Newsletter,Nyhedsbrev @@ -682,6 +686,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload la apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu ,Support Analytics,Support Analytics DocType: Item,Website Warehouse,Website Warehouse +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Vil du virkelig ønsker at stoppe produktionen rækkefølge: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form optegnelser @@ -817,6 +822,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvid DocType: SMS Center,All Lead (Open),Alle Bly (Open) DocType: Purchase Invoice,Get Advances Paid,Få forskud apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Vedhæft dit billede +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Lave DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words DocType: Workflow State,Stop,Stands apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter." @@ -892,6 +898,7 @@ DocType: Journal Entry,Make Difference Entry,Make Difference indtastning DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år: DocType: SMS Center,Total Characters,Total tegn apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0} DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail @@ -1119,6 +1126,7 @@ DocType: Holiday List,Holidays,Helligdage DocType: Sales Order Item,Planned Quantity,Planlagt Mængde DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb DocType: Item,Maintain Stock,Vedligehold Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen 'Actual "i rækken {0} kan ikke indgå i Item Rate apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1176,6 +1184,7 @@ DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working H apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2} DocType: Item,Inventory,Inventory +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn DocType: Item,Sales Details,Salg Detaljer apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning DocType: Opportunity,With Items,Med Varer @@ -1357,6 +1366,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minedrift apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Harpiks støbning apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Vælg {0} først. DocType: Territory,Parent Territory,Parent Territory DocType: Quality Inspection Reading,Reading 2,Reading 2 DocType: Stock Entry,Material Receipt,Materiale Kvittering @@ -1632,6 +1642,7 @@ apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dyppestøbning apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes. apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opsætning +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta) DocType: Pricing Rule,Supplier,Leverandør DocType: C-Form,Quarter,Kvarter @@ -1724,7 +1735,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper DocType: Project,External,Ekstern DocType: Features Setup,Item Serial Nos,Vare Serial Nos +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser DocType: Branch,Branch,Branch +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykning og Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønseddel fundet for måned: DocType: Bin,Actual Quantity,Faktiske Mængde DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet @@ -3106,6 +3120,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager." DocType: Company,Distribution,Distribution +sites/assets/js/erpnext.min.js +50,Amount Paid,Beløb betalt apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}% @@ -3571,6 +3586,7 @@ DocType: Account,Parent Account,Parent Konto DocType: Quality Inspection Reading,Reading 3,Reading 3 ,Hub,Hub DocType: GL Entry,Voucher Type,Voucher Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Prisliste ikke fundet eller handicappede DocType: Expense Claim,Approved,Godkendt DocType: Pricing Rule,Price,Pris apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som "Left" @@ -3677,6 +3693,7 @@ DocType: Batch,Expiry Date,Udløbsdato apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halv dag) DocType: Supplier,Credit Days,Credit Dage DocType: Leave Type,Is Carry Forward,Er Carry Forward apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Få elementer fra BOM diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv index a57ab29612..da6551bd74 100644 --- a/erpnext/translations/da.csv +++ b/erpnext/translations/da.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter DocType: Sales Invoice Item,Quantity,Mængde apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver) DocType: Employee Education,Year of Passing,År for Passing +sites/assets/js/erpnext.min.js +27,In Stock,På lager apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Kan kun gøre betaling mod faktureret Sales Order DocType: Designation,Designation,Betegnelse DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for H DocType: SMS Center,SMS Center,SMS-center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Opretning DocType: BOM Replace Tool,New BOM,Ny BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs for fakturering. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity støbning apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhedsbrev er allerede blevet sendt DocType: Lead,Request Type,Anmodning Type @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved DocType: Employee,External Work History,Ekstern Work History apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Vil du virkelig ønsker at stoppe DocType: Communication,Closed,Lukket DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen." +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Er du sikker på du vil STOP DocType: Lead,Industry,Industri DocType: Employee,Job Profile,Job profil DocType: Newsletter,Newsletter,Nyhedsbrev @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload la apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu ,Support Analytics,Support Analytics DocType: Item,Website Warehouse,Website Warehouse +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Vil du virkelig ønsker at stoppe produktionen rækkefølge: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form optegnelser @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvid DocType: SMS Center,All Lead (Open),Alle Bly (Open) DocType: Purchase Invoice,Get Advances Paid,Få forskud apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Vedhæft dit billede +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Lave DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words DocType: Workflow State,Stop,Stands apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter." @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,Make Difference indtastning DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år: DocType: Email Digest,Annual Expense,Årlig Udgift DocType: SMS Center,Total Characters,Total tegn apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0} @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,Helligdage DocType: Sales Order Item,Planned Quantity,Planlagt Mængde DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb DocType: Item,Maintain Stock,Vedligehold Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen 'Actual "i rækken {0} kan ikke indgå i Item Rate apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2} DocType: Item,Inventory,Inventory DocType: Features Setup,"To enable ""Point of Sale"" view",For at aktivere "Point of Sale" view +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn DocType: Item,Sales Details,Salg Detaljer apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning DocType: Opportunity,With Items,Med Varer @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minedrift apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Harpiks støbning apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Vælg {0} først. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0} DocType: Territory,Parent Territory,Parent Territory DocType: Quality Inspection Reading,Reading 2,Reading 2 @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,Mærker DocType: C-Form Invoice Detail,Invoice No,Faktura Nej apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra indkøbsordre DocType: Activity Cost,Costing Rate,Costing Rate +,Customer Addresses And Contacts,Kunde Adresser og kontakter DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke Sæt @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Løbenummer {0} tilhører ikke nogen Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opsætning +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta) DocType: Pricing Rule,Supplier,Leverandør DocType: C-Form,Quarter,Kvarter @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper DocType: Project,External,Ekstern DocType: Features Setup,Item Serial Nos,Vare Serial Nos +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser DocType: Branch,Branch,Branch +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykning og Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønseddel fundet for måned: DocType: Bin,Actual Quantity,Faktiske Mængde DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element DocType: Pricing Rule,Buying,Køb DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch er blevet annulleret. +,Reqd By Date,Reqd Efter dato DocType: Salary Slip Earning,Salary Slip Earning,Lønseddel Earning apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorer apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Række # {0}: Løbenummer er obligatorisk @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager." DocType: Company,Distribution,Distribution +sites/assets/js/erpnext.min.js +50,Amount Paid,Beløb betalt apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}% @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,Parent Konto DocType: Quality Inspection Reading,Reading 3,Reading 3 ,Hub,Hub DocType: GL Entry,Voucher Type,Voucher Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Prisliste ikke fundet eller handicappede DocType: Expense Claim,Approved,Godkendt DocType: Pricing Rule,Price,Pris apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som "Left" @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halv dag) DocType: Supplier,Credit Days,Credit Dage DocType: Leave Type,Is Carry Forward,Er Carry Forward apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Få elementer fra BOM diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv index ce7343bc2c..172198d22a 100644 --- a/erpnext/translations/de.csv +++ b/erpnext/translations/de.csv @@ -37,7 +37,7 @@ DocType: Purchase Order,% Billed,% verrechnet apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Wechselkurs muss derselbe wie {0} {1} ({2}) sein DocType: Sales Invoice,Customer Name,Kundenname DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle mit dem Export verknüpften Felder (wie z. B. Währung, Wechselkurs, Summe Export, Gesamtsumme Export usw.) sind in Lieferschein, POS, Angebot, Ausgangsrechnung, Kundenauftrag usw. verfügbar" -DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vorgesetzte (oder Gruppen), zu denen Buchungseinträge vorgenommen und Salden geführt werden." +DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Typen (oder Gruppen), zu denen Buchungseinträge vorgenommen und Salden geführt werden." apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Ausstände für {0} können nicht kleiner als Null sein ({1}) DocType: Manufacturing Settings,Default 10 mins,Standard 10 Minuten DocType: Leave Type,Leave Type Name,Bezeichnung der Abwesenheit @@ -49,7 +49,7 @@ DocType: Item Price,Multiple Item prices.,Mehrfach-Artikelpreise. DocType: SMS Center,All Supplier Contact,Alle Lieferantenkontakte DocType: Quality Inspection Reading,Parameter,Parameter apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Voraussichtliches Enddatum kann nicht vor dem voraussichtlichen Startdatum liegen -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Wollen Sie den Fertigungsauftrag wirklich fortsetzen: +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Wollen Sie den folgenden Fertigungsauftrag wirklich fortsetzen: apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile #{0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Neuer Urlaubsantrag apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bankwechsel @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Varianten anze DocType: Sales Invoice Item,Quantity,Menge apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredite (Passiva) DocType: Employee Education,Year of Passing,Jahr des Abgangs +sites/assets/js/erpnext.min.js +27,In Stock,Auf Lager apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Eine Zahlung kann nur zu einer noch nicht abgeglichenen Kundenbestellung gemacht werden DocType: Designation,Designation,Bezeichnung DocType: Production Plan Item,Production Plan Item,Artikel auf dem Produktionsplan @@ -70,7 +71,7 @@ apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoic DocType: Maintenance Schedule Item,Periodicity,Periodizität apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-Mail-Addresse apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Verteidigung -DocType: Company,Abbr,Abk. +DocType: Company,Abbr,Kürzel DocType: Appraisal Goal,Score (0-5),Punktzahl (0-5) apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Zeile # {0}: @@ -99,7 +100,7 @@ DocType: Rename Tool,"Attach .csv file with two columns, one for the old name an DocType: Packed Item,Parent Detail docname,Übergeordnetes Detail Dokumentenname apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Stellenausschreibung. -DocType: Item Attribute,Increment,Increment +DocType: Item Attribute,Increment,Inkrement apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Werbung DocType: Employee,Married,Verheiratet apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Einstellungen für DocType: SMS Center,SMS Center,SMS-Center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Begradigung DocType: BOM Replace Tool,New BOM,Neue Stückliste +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Zeitprotokolle für die Abrechnung bündeln. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Gegengravitationsgussverfahren apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter wurde bereits gesendet DocType: Lead,Request Type,Anfragetyp @@ -281,7 +283,7 @@ DocType: Supplier,Address HTML,Adresse im HTML-Format DocType: Lead,Mobile No.,Mobilfunknr. DocType: Maintenance Schedule,Generate Schedule,Zeitplan generieren apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing -DocType: Purchase Invoice Item,Expense Head,Ausgabenkopf +DocType: Purchase Invoice Item,Expense Head,Ausgabenbezeichnung apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Bitte zuerst Chargentyp auswählen apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Neueste(r/s) apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 Zeichen @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Neue Lagermaßeinheit DocType: Period Closing Voucher,Closing Account Head,Bezeichnung des Abschlusskontos DocType: Employee,External Work History,Externe Arbeits-Historie apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Zirkelschluss-Fehler +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Wollen Sie wirklich ANHALTEN DocType: Communication,Closed,Geschlossen DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"""In Worten (Export)"" wird sichtbar, sobald Sie den Lieferschein speichern." +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Sind Sie sicher, dass Sie ANHALTEN wollen?" DocType: Lead,Industry,Industrie DocType: Employee,Job Profile,Stellenbeschreibung DocType: Newsletter,Newsletter,Newsletter @@ -318,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Lieferschein DocType: Dropbox Backup,Allow Dropbox Access,Dropbox-Zugang zulassen apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Steuern einrichten apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Zahlungsbuchung wurde geändert, nachdem sie abgerufen wurde. Bitte erneut abrufen." -apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} doppelt eingegeben in Artikelsteuer +apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Zusammenfassung für diese Woche und anstehende Aktivitäten DocType: Workstation,Rent Cost,Mietkosten apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Bitte Monat und Jahr auswählen @@ -346,7 +350,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuelle Lagermaßeinheit apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Charge (Los) eines Artikels. DocType: C-Form Invoice Detail,Invoice Date,Rechnungsdatum DocType: GL Entry,Debit Amount,Soll-Betrag -apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Es kann nur 1 Konto pro Unternehmen in {0} {1} +apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ihre E-Mail-Adresse apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Bitte Anhang beachten DocType: Purchase Order,% Received,% erhalten @@ -364,9 +368,9 @@ DocType: Packed Item,Packed Item,Verpackter Artikel apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardeinstellungen für Einkaufstransaktionen. apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Handlungskosten bestehen für Arbeitnehmer {0} zur Aktivitätsart {1} apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Bitte KEINE Konten für Kunden und Lieferanten erstellen. Diese werden direkt aus dem Kunden-/Lieferantenstamm erstellt. -DocType: Currency Exchange,Currency Exchange,Geldwechsel +DocType: Currency Exchange,Currency Exchange,Währungs-Umrechnung DocType: Purchase Invoice Item,Item Name,Artikelname -apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Guthaben +apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Guthabenüberschuss DocType: Employee,Widowed,Verwitwet DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Anzufragende Artikel basierend auf prognostizierter Menge und Mindestbestellmenge, die in keinem Lager vorrätig sind." DocType: Workstation,Working Hours,Arbeitszeit @@ -402,7 +406,7 @@ DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Aktivieren, apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoformverfahren apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Längstreffverfahren (Schlitzen) apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Bis Fall Nr."" kann nicht kleiner als ""Von Fall Nr."" sein" -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,gemeinnützig +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Gemeinnützig apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nicht begonnen DocType: Lead,Channel Partner,Vertriebspartner DocType: Account,Old Parent,Alte übergeordnetes Element @@ -461,7 +465,7 @@ DocType: Shipping Rule,Net Weight,Nettogewicht DocType: Employee,Emergency Phone,Notruf ,Serial No Warranty Expiry,Ablaufdatum der Garantie zu Seriennummer apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Wollen Sie diese Materialanfrage wirklich ANHALTEN? -DocType: Sales Order,To Deliver,Um Auszuliefern +DocType: Sales Order,To Deliver,Auszuliefern DocType: Purchase Invoice Item,Item,Artikel DocType: Journal Entry,Difference (Dr - Cr),Differenz (Soll - Haben) DocType: Account,Profit and Loss,Gewinn und Verlust @@ -485,14 +489,14 @@ apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This DocType: Purchase Receipt,Add / Edit Taxes and Charges,Hinzufügen/Bearbeiten von Steuern und Abgaben DocType: Purchase Invoice,Supplier Invoice No,Lieferantenrechnungsnr. DocType: Territory,For reference,Zu Referenzzwecken -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kann nicht gelöscht Seriennummer {0}, wie es auf Lager Transaktionen verwendet wird," +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Die Seriennummer {0} kann nicht gelöscht werden, da sie in Lagertransaktionen verwendet wird" apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Schlußstand (Haben) DocType: Serial No,Warranty Period (Days),Gewährleistungsfrist (Tage) DocType: Installation Note Item,Installation Note Item,Bestandteil des Installationshinweises ,Pending Qty,Ausstehend Menge DocType: Job Applicant,Thread HTML,Thread HTML DocType: Company,Ignore,Ignorieren -apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS an folgende Nummern: {0} versendet +apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS an folgende Nummern versendet: {0} apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Eingangslieferschein aus Unteraufträgen DocType: Pricing Rule,Valid From,Gültig ab DocType: Sales Invoice,Total Commission,Gesamtprovision @@ -526,7 +530,7 @@ apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenban apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundendatenbank DocType: Quotation,Quotation To,Angebot für DocType: Lead,Middle Income,Mittleres Einkommen -apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Anfangsbestand (Haben) +apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Anfangssstand (Haben) apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Stürzen DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag @@ -632,7 +636,7 @@ apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summa apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Von Lieferanten erhaltene Ware. DocType: Communication,Open,Öffnen DocType: Lead,Campaign Name,Kampagnenname -,Reserved,reserviert +,Reserved,Reserviert apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Wollen Sie wirklich FORTSETZEN DocType: Purchase Order,Supply Raw Materials,Rohmaterial bereitstellen DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Versand." @@ -684,7 +688,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If 6. Amount: Tax amount. 7. Total: Cumulative total to this point. 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row). -9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewendet werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten. +9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewandt werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten. #### Hinweis @@ -738,13 +742,14 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Lagerbest apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Jetzt senden ,Support Analytics,Support-Analyse DocType: Item,Website Warehouse,Webseiten-Lager +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Wollen Sie den folgenden Fertigungsauftrag wirklich anhalten: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Der Tag des Monats, an dem eine automatische Rechnung erstellt wird, z. B. 05, 28 usw." apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punktzahl muß kleiner oder gleich 5 sein apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Kontakt-Formular Datensätze apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Kunde und Lieferant DocType: Email Digest,Email Digest Settings,Einstellungen zum täglichen E-Mail-Bericht apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support-Anfragen von Kunden. -DocType: Features Setup,"To enable ""Point of Sale"" features",Zu "Point of Sale" Funktionen zu aktivieren +DocType: Features Setup,"To enable ""Point of Sale"" features","Um ""Point of Sale""-Funktionen zu aktivieren" DocType: Bin,Moving Average Rate,Wert für den Gleitenden Durchschnitt DocType: Production Planning Tool,Select Items,Artikel auswählen apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} zu Rechnung {1} ​​vom {2} @@ -773,7 +778,7 @@ DocType: Item Variant Attribute,Item Variant Attribute,Artikelvariantenattribut DocType: Appraisal,Select template from which you want to get the Goals,"Vorlage auswählen, von der Sie die Ziele abrufen möchten" apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forschung & Entwicklung ,Amount to Bill,Rechnungsbetrag -DocType: Company,Registration Details,Details zur Anmeldung +DocType: Company,Registration Details,Details zur Registrierung apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Absteckung DocType: Item,Re-Order Qty,Nachbestellmenge DocType: Leave Block List Date,Leave Block List Date,Urlaubssperrenliste Datum @@ -782,7 +787,7 @@ DocType: Pricing Rule,Price or Discount,Preis oder Rabatt DocType: Sales Team,Incentives,Anreize DocType: SMS Log,Requested Numbers,Angeforderte Nummern apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Mitarbeiterbeurteilung -DocType: Sales Invoice Item,Stock Details,Lizenzinformationen +DocType: Sales Invoice Item,Stock Details,Lagerinformationen apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projektwert apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Verkaufsstelle apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},{0} kann nicht fortgeschrieben werden @@ -854,7 +859,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For ' apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Lieferungen an Kunden. DocType: Purchase Invoice Item,Purchase Order Item,Lieferantenauftrags-Artikel apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Erträge -DocType: Payment Tool,Set Payment Amount = Outstanding Amount,"""Zahlungsbetrag = ausstehender Betrag"" setzen" +DocType: Payment Tool,Set Payment Amount = Outstanding Amount,"""Zahlungsbetrag = Ausstehender Betrag"" setzen" DocType: Contact Us Settings,Address Line 1,Adresszeile 1 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Abweichung apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmenname @@ -880,6 +885,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Wei DocType: SMS Center,All Lead (Open),Alle Interessenten (offen) DocType: Purchase Invoice,Get Advances Paid,Gezahlte Anzahlungen aufrufen apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Fügen Sie Ihr Bild hinzu +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Erstellen DocType: Journal Entry,Total Amount in Words,Gesamtsumme in Worten DocType: Workflow State,Stop,Anhalten apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Es ist ein Fehler aufgetreten. Ein möglicher Grund könnte sein, dass Sie das Formular nicht gespeichert haben. Bitte kontaktieren Sie support@erpnext.com wenn das Problem weiterhin besteht." @@ -894,7 +900,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js DocType: Leave Application,Leave Application,Abwesenheitsantrag apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Urlaubszuordnungs-Werkzeug DocType: Leave Block List,Leave Block List Dates,Urlaubssperrenliste Termine -DocType: Company,If Monthly Budget Exceeded (for expense account),Wenn Monthly Budget überschritten (für Aufwandskonto) +DocType: Company,If Monthly Budget Exceeded (for expense account),Wenn das monatliche Budget überschritten ist (für Aufwandskonto) apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Zuschnitt DocType: Workstation,Net Hour Rate,Nettostundensatz DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Einstandspreis-Eingangslieferschein @@ -923,7 +929,7 @@ apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the DocType: Serial No,Creation Document No,Belegerstellungs-Nr. DocType: Issue,Issue,Anfrage apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attribute für Artikelvarianten, z. B. Größe, Farbe usw." -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP-Lager +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Fertigungslager apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Seriennummer {0} ist mit Wartungsvertrag versehen bis {1} DocType: BOM Operation,Operation,Arbeitsgang DocType: Lead,Organization Name,Firmenname @@ -960,6 +966,7 @@ DocType: Journal Entry,Make Difference Entry,Differenzbuchung erstellen DocType: Upload Attendance,Attendance From Date,Anwesenheit von Datum DocType: Appraisal Template Goal,Key Performance Area,Wichtigster Leistungsbereich apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,und Jahr: DocType: Email Digest,Annual Expense,Jährliche Kosten DocType: SMS Center,Total Characters,Gesamtanzahl Zeichen apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Bitte aus dem Stücklistenfeld eine Stückliste für Artikel {0} auswählen @@ -1023,7 +1030,7 @@ apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row ,Purchase Order Items To Be Billed,Abzurechnende Lieferantenauftrags-Artikel DocType: Purchase Invoice Item,Net Rate,Nettopreis DocType: Purchase Invoice Item,Purchase Invoice Item,Eingangsrechnungs-Artikel -apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Buchungen auf das Lagerbuch und HB-Buchungen werden für die gewählten Eingangslieferscheine umgebucht +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Buchungen auf das Lagerbuch und Hauptbuch-Buchungen werden für die gewählten Eingangslieferscheine umgebucht apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Artikel 1 DocType: Holiday,Holiday,Urlaub DocType: Event,Saturday,Samstag @@ -1112,7 +1119,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For { apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht versendet apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Betriebsvermögen -apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Preisregel wird zunächst basierend auf dem Feld ""Anwenden auf"" ausgewählt. Dieses kann ein Artikel, eine Artikelgruppe oder eine Marke sein." +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Die Preisregel wird zunächst basierend auf dem Feld ""Anwenden auf"" ausgewählt. Dieses kann ein Artikel, eine Artikelgruppe oder eine Marke sein." DocType: Hub Settings,Seller Website,Webseite des Verkäufers apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Insgesamt verteilte Prozentmenge für Vertriebsteam sollte 100 sein apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status des Fertigungsauftrags lautet {0} @@ -1152,17 +1159,17 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege L DocType: Purchase Invoice,Supplier Invoice Date,Lieferantenrechnungsdatum apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sie müssen Ihren Einkaufswagen aktivieren. sites/assets/js/form.min.js +212,No Data,Keine Daten -DocType: Appraisal Template Goal,Appraisal Template Goal,Bewertungsvorlage Ziel +DocType: Appraisal Template Goal,Appraisal Template Goal,Bewertungsvorlage zur Zielorientierung DocType: Salary Slip,Earning,Gewinn -DocType: Payment Tool,Party Account Currency,Party Account Devisen +DocType: Payment Tool,Party Account Currency,Gruppenkonten-Währung ,BOM Browser,Stücklisten-Browser DocType: Purchase Taxes and Charges,Add or Deduct,Addieren/Subtrahieren -DocType: Company,If Yearly Budget Exceeded (for expense account),Wenn Jährlich Budget überschritten (für Aufwandskonto) +DocType: Company,If Yearly Budget Exceeded (for expense account),Wenn das jährliche Budget überschritten ist (für Aufwandskonto) apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Überlagernde Bedingungen gefunden zwischen: apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,"""Zu Journalbuchung"" {0} ist bereits mit einem anderen Beleg abgeglichen" apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Gesamtbestellwert apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Lebensmittel -apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Alterung Bereich 3 +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Alter Bereich 3 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Ein Zeitprotokoll kann nur zu einem versendeten Fertigungsauftrag erstellt werden DocType: Maintenance Schedule Item,No of Visits,Anzahl der Besuche DocType: File,old_parent,Altes übergeordnetes Element @@ -1171,7 +1178,7 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,"""Arbeitsvorbereitung"" kann nicht leer sein." ,Delivered Items To Be Billed,Gelieferte Artikel zur Abrechnung apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kann für Seriennummer nicht geändert werden -apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status aktualisiert zu {0} +apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status aktualisiert auf {0} DocType: DocField,Description,Beschreibung DocType: Authorization Rule,Average Discount,Durchschnittlicher Rabatt DocType: Letter Head,Is Default,Ist Standard @@ -1197,6 +1204,7 @@ DocType: Holiday List,Holidays,Ferien DocType: Sales Order Item,Planned Quantity,Geplante Menge DocType: Purchase Invoice Item,Item Tax Amount,Artikelsteuerbetrag DocType: Item,Maintain Stock,Lager verwalten +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Es wurden bereits Lagerbuchungen zum Fertigungsauftrag erstellt DocType: Leave Control Panel,Leave blank if considered for all designations,"Freilassen, wenn für alle Einstufungen gültig" apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden" apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1213,12 +1221,12 @@ DocType: Maintenance Visit,Unscheduled,Außerplanmäßig DocType: Employee,Owned,Im Besitz von DocType: Salary Slip Deduction,Depends on Leave Without Pay,Hängt von unbezahltem Urlaub ab DocType: Pricing Rule,"Higher the number, higher the priority","Je höher die Zahl, desto höher die Priorität" -,Purchase Invoice Trends,Entwicklung Eingangsrechnungen +,Purchase Invoice Trends,Trendanalyse Eingangsrechnungen DocType: Employee,Better Prospects,Bessere Vorhersage DocType: Appraisal,Goals,Ziele -DocType: Warranty Claim,Warranty / AMC Status,Garantie / AMC-Status +DocType: Warranty Claim,Warranty / AMC Status,Status der Garantie / des jährlichen Wartungsvertrags ,Accounts Browser,Kontenbrowser -DocType: GL Entry,GL Entry,HB-Eintrag +DocType: GL Entry,GL Entry,Buchung zum Hauptbuch DocType: HR Settings,Employee Settings,Mitarbeitereinstellungen ,Batch-Wise Balance History,Stapelweise Kontostands-Historie apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Aufgabenliste @@ -1230,11 +1238,11 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing, apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Wenn das Konto gesperrt ist, sind einem eingeschränkten Benutzerkreis Buchungen erlaubt." DocType: Email Digest,Bank Balance,Kontostand -apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Accounting Eintrag für {0}: {1} kann nur in der Währung vorgenommen werden: {2} +apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden DocType: Job Opening,"Job profile, qualifications required etc.","Stellenbeschreibung, erforderliche Qualifikationen usw." DocType: Journal Entry Account,Account Balance,Kontostand apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Steuerregel für Transaktionen. -DocType: Rename Tool,Type of document to rename.,Art des Dokuments umbenennen. +DocType: Rename Tool,Type of document to rename.,Typ des Dokuments umbenennen. apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Wir kaufen diesen Artikel DocType: Address,Billing,Abrechnung apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Bördelung @@ -1244,7 +1252,7 @@ DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Gesamte Ste DocType: Shipping Rule,Shipping Account,Versandkonto apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Geplant zum Versand an {0} Empfänger DocType: Quality Inspection,Readings,Ablesungen -DocType: Stock Entry,Total Additional Costs,Insgesamt Zusätzliche Kosten +DocType: Stock Entry,Total Additional Costs,Gesamte Zusatzkosten apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Unterbaugruppen DocType: Shipping Rule Condition,To Value,Bis-Wert DocType: Supplier,Stock Manager,Cheflagerist @@ -1258,7 +1266,8 @@ DocType: Workstation Working Hour,Workstation Working Hour,Arbeitsplatz-Arbeitss apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich zu JV Menge {2} sein DocType: Item,Inventory,Lagerbestand -DocType: Features Setup,"To enable ""Point of Sale"" view",So aktivieren Sie "Point of Sale" Ansicht +DocType: Features Setup,"To enable ""Point of Sale"" view","Um die ""Point of Sale""-Ansicht zu aktivieren" +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Für einen leeren Einkaufswagen kann keine Zahlung getätigt werden DocType: Item,Sales Details,Verkaufsdetails apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning-Verfahren DocType: Opportunity,With Items,Mit Artikeln @@ -1274,9 +1283,9 @@ apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Ge DocType: Cost Center,Parent Cost Center,Übergeordnete Kostenstelle DocType: Sales Invoice,Source,Quelle DocType: Leave Type,Is Leave Without Pay,Ist unbezahlter Urlaub -apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Keine Datensätze in der Tabelle Zahlungen gefunden +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden" apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Startdatum des Geschäftsjahres -DocType: Employee External Work History,Total Experience,Gesamterlebnis +DocType: Employee External Work History,Total Experience,Gesamterfahrung apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Senken apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Packzettel storniert apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fracht- und Versandkosten @@ -1291,7 +1300,7 @@ DocType: Maintenance Schedule,Schedules,Zeitablaufpläne DocType: Purchase Invoice Item,Net Amount,Nettobetrag DocType: Purchase Order Item Supplied,BOM Detail No,Stückliste Detailnr. DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Zusätzlicher Rabatt (Firmenwährung) -DocType: Period Closing Voucher,CoA Help,CoA (Chart of Account?)-Hilfe +DocType: Period Closing Voucher,CoA Help,Hilfe zum Kontenplan apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Fehler: {0} > {1} apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Bitte neues Konto aus dem Kontenplan erstellen. DocType: Maintenance Visit,Maintenance Visit,Wartungsbesuch @@ -1335,7 +1344,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed t " apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Erfolgreich zugewiesene Abwesenheiten für {0} apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Keine Artikel zum Verpacken -DocType: Shipping Rule Condition,From Value,Von Wert +DocType: Shipping Rule Condition,From Value,Von-Wert apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Bei der Bank nicht berücksichtigte Beträge DocType: Quality Inspection Reading,Reading 4,Ablesung 4 @@ -1347,7 +1356,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar DocType: Purchase Receipt,Supplier Warehouse,Lieferantenlager DocType: Opportunity,Contact Mobile No,Kontakt-Mobiltelefonnummer DocType: Production Planning Tool,Select Sales Orders,Kundenaufträge auswählen -,Material Requests for which Supplier Quotations are not created,Materialanfragen für die keine Lieferantenangebote erstellt werden +,Material Requests for which Supplier Quotations are not created,"Materialanfragen, für die keine Lieferantenangebote erstellt werden" DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Wird verwendet, um Artikel über den Barcode nachzuverfolgen. Durch das Scannen des Artikel-Barcodes können Artikel in einen Lieferschein und eine Ausgangsrechnung eingegeben werden." apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Angebot erstellen DocType: Dependent Task,Dependent Task,Abhängige Aufgabe @@ -1382,7 +1391,7 @@ DocType: Company,Default Payable Account,Standard-Kreditorenkonto apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Einstellungen für Online-Warenkorb, wie Versandregeln, Preisliste usw." apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Einrichtung abgeschlossen apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% berechnet -apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,reservierte Menge +apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reservierte Menge DocType: Party Account,Party Account,Gruppenkonto apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Personalwesen DocType: Lead,Upper Income,Gehobenes Einkommen @@ -1397,11 +1406,11 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press f apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1} DocType: Customer,Default Price List,Standardpreisliste DocType: Payment Reconciliation,Payments,Zahlungen -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,isostatisches Heißpressen +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Isostatisches Heißpressen DocType: ToDo,Medium,Mittel DocType: Budget Detail,Budget Allocated,Zugewiesenes Budget -DocType: Journal Entry,Entry Type,Feldtyp -,Customer Credit Balance,Kunden-Guthaben +DocType: Journal Entry,Entry Type,Buchungstyp +,Customer Credit Balance,Kunden-Kreditlinie apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Bitte E-Mail-ID überprüfen apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Kunde erforderlich für ""Kundenbezogener Rabatt""" apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Zahlungstermine anhand der Journale aktualisieren. @@ -1418,7 +1427,7 @@ DocType: Pricing Rule,Applicable For,Anwendbar für DocType: Bank Reconciliation,From Date,Von Datum DocType: Shipping Rule Country,Shipping Rule Country,Versandregel für Land DocType: Maintenance Visit,Partially Completed,Teilweise abgeschlossen -DocType: Leave Type,Include holidays within leaves as leaves,Urlaube innerhalb von Abwesenheiten als Anwesenheiten mit einbeziehen +DocType: Leave Type,Include holidays within leaves as leaves,Urlaube innerhalb von Abwesenheiten als Abwesenheiten mit einbeziehen DocType: Sales Invoice,Packed Items,Verpackte Artikel apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Garantieantrag zu Serien-Nr. DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Eine bestimmte Stückliste in allen anderen Stücklisten austauschen, in denen sie eingesetzt wird. Ersetzt die Verknüpfung zur alten Stücklisten, aktualisiert die Kosten und erstellt die Tabelle ""Stücklistenerweiterung Artikel"" nach der neuen Stückliste" @@ -1430,8 +1439,8 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advan apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Bitte Artikelnummer auswählen DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Abzug für unbezahlten Urlaub (LWP) vermindern DocType: Territory,Territory Manager,Gebietsleiter -DocType: Sales Invoice,Paid Amount (Company Currency),Gezahlten Betrag (Gesellschaft Währung) -DocType: Purchase Invoice,Additional Discount,Zusätzlichen Rabatt +DocType: Sales Invoice,Paid Amount (Company Currency),Gezahlter Betrag (Firmenwährung) +DocType: Purchase Invoice,Additional Discount,Zusätzlicher Rabatt DocType: Selling Settings,Selling Settings,Vertriebseinstellungen apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online-Auktionen apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Bitte entweder die Menge oder den Wertansatz oder beides eingeben @@ -1443,7 +1452,7 @@ DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Mater apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Einzelnes Element eines Artikels. apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Zeitprotokollstapel {0} muss ""versendet"" sein" DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Eine Buchung für jede Lagerbewegung erstellen -DocType: Leave Allocation,Total Leaves Allocated,insgesamt zugewiesene Urlaubstage +DocType: Leave Allocation,Total Leaves Allocated,Insgesamt zugewiesene Urlaubstage apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Angabe des Lagers ist in Zeile {0} erforderlich DocType: Employee,Date Of Retirement,Zeitpunkt der Pensionierung DocType: Upload Attendance,Get Template,Vorlage aufrufen @@ -1452,6 +1461,7 @@ DocType: Item,Weightage,Gewichtung apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Bergbau apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Gießharzverfahren apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Bitte zuerst {0} auswählen. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0} DocType: Territory,Parent Territory,Übergeordnete Region DocType: Quality Inspection Reading,Reading 2,Ablesung 2 @@ -1487,7 +1497,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be a DocType: Employee,Leave Encashed?,Urlaub eingelöst? apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Vertriebschancet von""-Feld ist zwingend erforderlich" DocType: Item,Variants,Varianten -apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Bestellung erstellen +apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Einkaufsbestellung erstellen DocType: SMS Center,Send To,Senden an apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0} DocType: Sales Team,Contribution to Net Total,Beitrag zum Gesamtnetto @@ -1497,7 +1507,7 @@ DocType: Territory,Territory Name,Name der Region apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Lager für unfertige Erzeugnisse wird vor dem Versand benötigt apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Bewerber für einen Job. DocType: Purchase Order Item,Warehouse and Reference,Lager und Referenz -DocType: Supplier,Statutory info and other general information about your Supplier,Gesetzliche und andere allgemeine Informationen über Ihren Lieferanten +DocType: Supplier,Statutory info and other general information about your Supplier,Rechtlich notwendige und andere allgemeine Informationen über Ihren Lieferanten DocType: Country,Country,Land apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adressen DocType: Communication,Received,Erhalten @@ -1508,8 +1518,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py DocType: DocField,Attach Image,Bild anhängen DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Das Nettogewicht dieses Pakets. (Automatisch als Summe der einzelnen Nettogewichte berechnet) DocType: Stock Reconciliation Item,Leave blank if no change,"Freilassen, wenn es keine Änderung gibt" -DocType: Sales Order,To Deliver and Bill,Um Auszuliefern und Abzurechnen -DocType: GL Entry,Credit Amount in Account Currency,Haben Betrag in Kontowährung +DocType: Sales Order,To Deliver and Bill,Auszuliefern und Abzurechnen +DocType: GL Entry,Credit Amount in Account Currency,(Gut)Haben-Betrag in Kontowährung apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Zeitprotokolle für die Fertigung. DocType: Item,Apply Warehouse-wise Reorder Level,Anwenden des lagerbezogenen Meldebestands apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,Stückliste {0} muss versendet werden @@ -1529,7 +1539,7 @@ DocType: Sales Invoice Item,References,Referenzen DocType: Quality Inspection Reading,Reading 10,Ablesung 10 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Produkte oder Dienstleistungen auflisten, die gekauft oder verkauft werden. Sicher stellen, dass beim Start die Artikelgruppe, die Standardeinheit und andere Einstellungen überprüft werden." DocType: Hub Settings,Hub Node,Hub-Knoten -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Sie haben doppelte Artikel eingetragen. Bitte korrigieren und erneut versuchen . +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Sie haben ein Duplikat eines Artikels eingetragen. Bitte korrigieren und erneut versuchen. apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Wert {0} für Attribut {1} gibt es nicht in der Liste der gültigen Artikel-Attributwerte apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Mitarbeiterin apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Artikel {0} ist kein Fortsetzungsartikel @@ -1541,10 +1551,10 @@ DocType: Warranty Claim,Issue Date,Ausstellungsdatum DocType: Activity Cost,Activity Cost,Handlungskosten DocType: Purchase Receipt Item Supplied,Consumed Qty,Verbrauchte Anzahl apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation -DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ist ein Teil dieser Lieferung ist (nur Entwurf)" +DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ein Teil dieser Lieferung ist (nur Entwurf)" DocType: Payment Tool,Make Payment Entry,Zahlungsbuchung erstellen apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Menge für Artikel {0} muss kleiner sein als {1} -,Sales Invoice Trends,Entwicklung der Ausgangsrechnungen +,Sales Invoice Trends,Trendanalyse Ausgangsrechnungen DocType: Leave Application,Apply / Approve Leaves,Urlaub eintragen/genehmigen apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kann sich nur auf eine Zeile beziehen, wenn die Berechnungsart der Kosten entweder ""auf Betrag der vorherigen Zeile"" oder ""auf Gesamtbetrag der vorherigen Zeilen"" ist" DocType: Sales Order Item,Delivery Warehouse,Auslieferungslager @@ -1571,9 +1581,9 @@ apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Verwalten von Projek DocType: Supplier,Supplier of Goods or Services.,Lieferant von Waren oder Dienstleistungen. DocType: Budget Detail,Fiscal Year,Geschäftsjahr DocType: Cost Center,Budget,Budget -apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kann nicht gegen {0} zugewiesen werden, da es nicht ein Ertrags- oder Aufwandskonto" +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kann {0} nicht zugewiesen werden, da es kein Ertrags- oder Aufwandskonto ist" apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Erreicht -apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Region / Kunden +apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Region / Kunde apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,z. B. 5 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich dem ausstehenden Betrag in Rechnung {2} sein DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"""In Worten"" wird sichtbar, sobald Sie die Ausgangsrechnung speichern." @@ -1630,10 +1640,11 @@ DocType: Appraisal,For Employee Name,Für Mitarbeiter-Name DocType: Holiday List,Clear Table,Tabelle leeren DocType: Features Setup,Brands,(Handels-)Marken DocType: C-Form Invoice Detail,Invoice No,Rechnungs-Nr. -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,von Lieferantenauftrag +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Von Lieferantenauftrag DocType: Activity Cost,Costing Rate,Kalkulationssatz +,Customer Addresses And Contacts,Kundenadressen und Ansprechpartner DocType: Employee,Resignation Letter Date,Datum des Kündigungsschreibens -apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Preisregeln werden zudem nach Menge angewendet. +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Preisregeln werden zudem nach Menge angewandt. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nicht festgelegt DocType: Communication,Date,Datum apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Kundenumsatz wiederholen @@ -1672,7 +1683,7 @@ DocType: Leave Control Panel,Leave blank if considered for all employee types,"F DocType: Landed Cost Voucher,Distribute Charges Based On,Kosten auf folgender Grundlage verteilen apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konto {0} muss vom Typ ""Aktivposten"" sein, weil der Artikel {1} ein Aktivposten ist" DocType: HR Settings,HR Settings,Personaleinstellungen -apps/frappe/frappe/config/setup.py +130,Printing,Drucken +apps/frappe/frappe/config/setup.py +130,Printing,Druck apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Spesenabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren. DocType: Purchase Invoice,Additional Discount Amount,Zusätzlicher Rabatt apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Der/Die Tag(e), für den/die Urlaub beantragt wird, sind Feiertage. Hierfür muss kein Urlaub beantragen werden." @@ -1700,7 +1711,7 @@ apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47, apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Funktionen wie Seriennummern, POS, etc. anzeigen / ausblenden" apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Währung muss {1} apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Maßeinheit-Umrechnungsfaktor ist erforderlich in der Zeile {0} -apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Löschdatum kann nicht vor dem Aktivierungsdatum in Zeile {0} liegen +apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Einlösungsdatum kann nicht vor dem Ausstellungsdatum in Zeile {0} liegen DocType: Salary Slip,Deduction,Abzug DocType: Address Template,Address Template,Adressvorlage apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Bitte die Mitarbeiter-ID dieses Verkäufer angeben @@ -1737,8 +1748,9 @@ apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Lief apps/erpnext/erpnext/hooks.py +84,Shipments,Lieferungen apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Tauchformverfahren apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,"Status des Zeitprotokolls muss ""versendet"" sein" -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seriennummer {0} gilt nicht für Warehouse gehören +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seriennummer {0} gehört zu keinem Lager apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Einrichten +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Zeile # DocType: Purchase Invoice,In Words (Company Currency),In Worten (Firmenwährung) DocType: Pricing Rule,Supplier,Lieferant DocType: C-Form,Quarter,Quartal @@ -1779,8 +1791,8 @@ DocType: Quality Inspection,In Process,In Bearbeitung DocType: Authorization Rule,Itemwise Discount,Artikelbezogener Rabatt apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} zu Kundenauftrag{1} DocType: Account,Fixed Asset,Anlagegut -apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serialisierte Bestands -DocType: Activity Type,Default Billing Rate,Standardabrechnungstarif +apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serienbestand +DocType: Activity Type,Default Billing Rate,Standard-Rechnungspreis DocType: Time Log Batch,Total Billing Amount,Gesamtrechnungsbetrag apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Verbindlichkeiten-Konto ,Stock Balance,Lagerbestand @@ -1792,7 +1804,7 @@ DocType: Employee,Blood Group,Blutgruppe DocType: Purchase Invoice Item,Page Break,Seitenumbruch DocType: Production Order Operation,Pending,Ausstehend DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Benutzer, die die Urlaubsanträge eines bestimmten Mitarbeiters genehmigen können" -apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,"Sie können die Standard-Maßeinheit der Variante nicht ändern. Um die Standard-Maßeinheit für die Variante zu ändern, ändern Sie die Standard-Maßeinheit der Vorlage" +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,"Sie können die Standard-Maßeinheit der Variante nicht direkt ändern. Um die Standard-Maßeinheit für die Variante zu ändern, ändern Sie die Standard-Maßeinheit der Vorlage" apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Büroausstattung DocType: Purchase Invoice Item,Qty,Menge DocType: Fiscal Year,Companies,Unternehmen @@ -1830,14 +1842,17 @@ DocType: Item,Customer Item Codes,Kundenartikelnummern DocType: Opportunity,Lost Reason,Verlustgrund apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Neue Zahlungsbuchungen zu Aufträgen oder Rechnungen erstellen. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Schweißen -apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Neue Lager-Maßeinheit ist erforderlich +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Neue Lagermaßeinheit ist erforderlich DocType: Quality Inspection,Sample Size,Stichprobenumfang apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Alle Artikel sind bereits abgerechnet apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Bitte eine eine gültige ""Von Fall Nr."" angeben" apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden" DocType: Project,External,Extern DocType: Features Setup,Item Serial Nos,Artikel-Seriennummern +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Benutzer und Berechtigungen DocType: Branch,Branch,Filiale +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Druck und Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Keine Gehaltsabrechnung gefunden für Monat: DocType: Bin,Actual Quantity,Tatsächlicher Bestand DocType: Shipping Rule,example: Next Day Shipping,Beispiel: Versand am nächsten Tag apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Seriennummer {0} wurde nicht gefunden @@ -1862,7 +1877,7 @@ sites/assets/js/list.min.js +104,Customize,Anpassen DocType: POS Profile,[Select],[Select ] DocType: SMS Log,Sent To,Gesendet An apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Verkaufsrechnung erstellen -DocType: Company,For Reference Only.,Nur als Referenz. +DocType: Company,For Reference Only.,Nur zu Referenzzwecken. apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ungültige(r/s) {0}: {1} DocType: Sales Invoice Advance,Advance Amount,Vorauskasse DocType: Manufacturing Settings,Capacity Planning,Kapazitätsplanung @@ -1879,7 +1894,7 @@ DocType: Item,"Allow in Sales Order of type ""Service""","Kundenbestellungen des apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Lagerräume DocType: Time Log,Projects Manager,Projektleiter DocType: Serial No,Delivery Time,Lieferzeit -apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Alterung basiert auf +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Alter basierend auf DocType: Item,End of Life,Lebensdauer apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Reise DocType: Leave Block List,Allow Users,Benutzer zulassen @@ -1929,7 +1944,7 @@ apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_st DocType: Selling Settings,Sales Order Required,Kundenauftrag erforderlich apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Neuen Kunden erstellen DocType: Purchase Invoice,Credit To,Gutschreiben an -DocType: Employee Education,Post Graduate,Graduiert +DocType: Employee Education,Post Graduate,Graduation veröffentlichen DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Wartungsplandetail DocType: Quality Inspection Reading,Reading 9,Ablesung 9 DocType: Supplier,Is Frozen,Ist gesperrt @@ -1965,7 +1980,7 @@ apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Artikelanfragen DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Für jeden zu fertigenden Artikel wird ein separater Fertigungsauftrag erstellt. DocType: Purchase Invoice,Terms and Conditions1,Allgemeine Geschäftsbedingungen1 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Einrichtung abschliessen -DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Buchung wurde bis zu diesem Zeitpunkt gesperrt, niemand außer der unten genannten Rolle kann die Buchung bearbeiten/ändern." +DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Buchung wurde bis zu folgendem Zeitpunkt gesperrt. Bearbeiten oder ändern kann nur die Person in unten stehender Rolle. apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Bitte das Dokument vor dem Erstellen eines Wartungsplans abspeichern apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus DocType: UOM,Check this to disallow fractions. (for Nos),"Hier aktivieren, um keine Bruchteile zuzulassen. (für Nr.)" @@ -2003,7 +2018,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} ag DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Statische URL-Parameter hier eingeben (z. B. Absender=ERPNext, Benutzername=ERPNext, Passwort=1234 usw.)" apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ist in keinem aktiven Geschäftsjahr. Für weitere Details, bitte {2} prüfen." apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert" -apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Alterung Bereich 1 +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Alter Bereich 1 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Photochemische Bearbeitung DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc. @@ -2025,7 +2040,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If 7. Total: Cumulative total to this point. 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row). 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both. -10. Add or Deduct: Whether you want to add or deduct the tax.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewendet werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten. +10. Add or Deduct: Whether you want to add or deduct the tax.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewandt werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten. #### Hinweis @@ -2067,7 +2082,7 @@ DocType: Stock Entry,Manufacture,Herstellung apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Bitte Lieferschein zuerst DocType: Purchase Invoice,Currency and Price List,Währungs- und Preisliste DocType: Opportunity,Customer / Lead Name,Kunden/Interessenten-Name -apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Löschdatum nicht benannt +apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Einlösungsdatum nicht benannt apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion DocType: Item,Allow Production Order,Fertigungsauftrag zulassen apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Startdatum muss vor dem Enddatum liegen @@ -2106,7 +2121,7 @@ DocType: Purchase Order,Ref SQ,Ref-SQ apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Artikel/Stückliste in allen Stücklisten ersetzen DocType: Purchase Order Item,Received Qty,Empfangene Menge DocType: Stock Entry Detail,Serial No / Batch,Seriennummer / Charge -DocType: Product Bundle,Parent Item,Übergeordnete Position +DocType: Product Bundle,Parent Item,Übergeordneter Artikel DocType: Account,Account Type,Kontentyp apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren""" ,To Produce,Zu produzieren @@ -2133,7 +2148,7 @@ DocType: Notification Control,Purchase Order Message,Lieferantenauftrags-Nachric DocType: Tax Rule,Shipping Country,Zielland der Lieferung DocType: Upload Attendance,Upload HTML,HTML hochladen apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \ - than the Grand Total ({2})",Summe der Vorauszahlungen ({0}) zu Bestellung {1} kann nicht größer sein als die Gesamtsumme ({2}) + than the Grand Total ({2})",Summe der Anzahlungen ({0}) zu Bestellung {1} kann nicht größer sein als die Gesamtsumme ({2}) DocType: Employee,Relieving Date,Entlassungsdatum apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Die Preisregel überschreibt die Preisliste. Bitte einen Rabattsatz aufgrund bestimmter Kriterien definieren. DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kann nur über Lagerbuchung / Lieferschein / Kaufrechung geändert werden @@ -2151,10 +2166,10 @@ DocType: Company,Stock Settings,Lager-Voreinstellungen DocType: User,Bio,Lebenslauf apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind: Gruppe, Root-Typ, Firma" apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten. -apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Neue Kostenstellenname +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Neuer Kostenstellenname DocType: Leave Control Panel,Leave Control Panel,Urlaubsverwaltung -apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Keine Standard-Adressvorlage gefunden. Bitte eine neue unter Setup > Druck und Branding -> Adressvorlage erstellen. -DocType: Appraisal,HR User,Mitarbeiter der Abteilung Personal +apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Keine Standard-Adressvorlage gefunden. Bitte eine neue unter Setup > Druck und Branding > Adressvorlage erstellen. +DocType: Appraisal,HR User,Personalbenutzer DocType: Purchase Invoice,Taxes and Charges Deducted,Steuern und Gebühren abgezogen apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Fragen apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status muss einer aus {0} sein @@ -2172,7 +2187,7 @@ DocType: Payment Tool Detail,Payment Tool Detail,Zahlungsabgleichs-Werkzeug-Deta DocType: Journal Entry,Total Credit,Gesamt-Haben apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1} apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokal -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Darlehen und Vorauszahlugen (Aktiva) +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Darlehen und Anzahlungen (Aktiva) apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Schuldner apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Groß apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Kein Mitarbeiter gefunden! @@ -2185,11 +2200,11 @@ apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bilanz schliessen und in die Gewinn und Verlustrechnung übernehmen. apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \ you have already made some transaction(s) with another UOM. To change default UOM, \ - use 'UOM Replace Utility' tool under Stock module.","Standard-Maßeinheit für Artikel {0} kann nicht direkt, weil \ Sie bereits einige Transaktion (en) mit einem anderen UOM gemacht haben geändert werden. Um Default ME verändern, \ Verwendung "UOM Ersetzen-Dienstprogramm 'Tool unter Lizenzmodul." + use 'UOM Replace Utility' tool under Stock module.","Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil bereits einige Transaktion(en) mit einer anderen Standard-Maßeinheit gemacht wurden. Bitte das Maßeinheit-Ersetzungswerkzeug im Lagermodul verwenden." DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Wechselkurs zum Umrechnen einer Währung in eine andere angeben apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Angebot {0} wird storniert -apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Summe offener Forderungen -apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"Mitarbeiter {0} war im Urlaub am {1}. Er kann nicht auf ""anwesend"" gesetzt werden." +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Offener Gesamtbetrag +apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"Mitarbeiter {0} war am {1} im Urlaub. Er kann nicht auf ""anwesend"" gesetzt werden." DocType: Sales Partner,Targets,Ziele DocType: Price List,Price List Master,Preislisten-Vorlage DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkaufstransaktionen können für mehrere ""Vertriebsmitarbeiter"" markiert werden, so dass Ziele festgelegt und überwacht werden können." @@ -2262,7 +2277,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,N apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Überfällig DocType: Account,Stock Received But Not Billed,"Empfangener, aber nicht berechneter Lagerbestand" DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttolohn + ausstehender Betrag +  Inkassobetrag - Summe aller Abzüge -DocType: Monthly Distribution,Distribution Name,Verteilungsnamen +DocType: Monthly Distribution,Distribution Name,Bezeichnung des Großhandels DocType: Features Setup,Sales and Purchase,Vertrieb und Einkauf DocType: Purchase Order Item,Material Request No,Materialanfragenr. apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0} @@ -2275,7 +2290,7 @@ DocType: Journal Entry Account,Sales Invoice,Ausgangsrechnung DocType: Journal Entry Account,Party Balance,Gruppen-Saldo DocType: Sales Invoice Item,Time Log Batch,Zeitprotokollstapel apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Bitte ""Rabatt anwenden auf"" auswählen" -DocType: Company,Default Receivable Account,Standard-Debitorenkonto +DocType: Company,Default Receivable Account,Standard-Sollkonto DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Bankbuchung für die Gesamtvergütung, die gemäß der oben ausgewählten Kriterien bezahlt wurde, erstellen" DocType: Stock Entry,Material Transfer for Manufacture,Materialübertrag für Herstellung apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabatt-Prozentsatz kann entweder auf eine Preisliste oder auf alle Preislisten angewandt werden. @@ -2388,7 +2403,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Ventu DocType: UOM,Must be Whole Number,Muss eine ganze Zahl sein DocType: Leave Control Panel,New Leaves Allocated (In Days),Neue Urlaubszuordnung (in Tagen) apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Seriennummer {0} existiert nicht -DocType: Pricing Rule,Discount Percentage,Rabatt Prozent +DocType: Pricing Rule,Discount Percentage,Rabatt in Prozent DocType: Payment Reconciliation Invoice,Invoice Number,Rechnungsnummer apps/erpnext/erpnext/hooks.py +70,Orders,Bestellungen DocType: Leave Control Panel,Employee Type,Mitarbeitertyp @@ -2415,7 +2430,7 @@ DocType: Customer,Address and Contact,Adresse und Kontakt DocType: Customer,Last Day of the Next Month,Letzter Tag des nächsten Monats DocType: Employee,Feedback,Rückmeldung apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e) -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Zeitplan +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Servicezeitplan apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Schleifmittelstrahlbearbeitung DocType: Stock Settings,Freeze Stock Entries,Lagerbuchungen sperren DocType: Website Settings,Website Settings,Webseiten-Einstellungen @@ -2431,13 +2446,13 @@ DocType: Quotation Item,Against Doctype,Zu DocType DocType: Delivery Note,Track this Delivery Note against any Project,Diesen Lieferschein in jedem Projekt nachverfolgen apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root-Konto kann nicht gelöscht werden apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Lagerbuchungen anzeigen -,Is Primary Address,Ist Primary Address +,Is Primary Address,Ist Hauptadresse DocType: Production Order,Work-in-Progress Warehouse,Lager für unfertige Erzeugnisse apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referenz #{0} vom {1} apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Adressen verwalten DocType: Pricing Rule,Item Code,Artikelnummer DocType: Production Planning Tool,Create Production Orders,Fertigungsaufträge erstellen -DocType: Serial No,Warranty / AMC Details,Garantie / AMC-Details +DocType: Serial No,Warranty / AMC Details,Details der Garantie / des jährlichen Wartungsvertrags DocType: Journal Entry,User Remark,Benutzerbemerkung DocType: Lead,Market Segment,Marktsegment DocType: Communication,Phone,Telefon @@ -2465,7 +2480,7 @@ DocType: Event,Groups,Gruppen apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppieren nach Konto DocType: Sales Order,Fully Delivered,Komplett geliefert DocType: Lead,Lower Income,Niedrigeres Einkommen -DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Die Bezeichnung des Kontos unter Verbindlichkeiten, in das Gewinn/Verlust verbucht werden" +DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Bezeichnung des Kontos unter Verbindlichkeiten, in das Gewinn/Verlust verbucht werden" DocType: Payment Tool,Against Vouchers,Gegenbelege apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Schnellhilfe apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Ausgangs- und Eingangslager können nicht gleich sein für die Zeile {0} @@ -2487,7 +2502,7 @@ DocType: Leave Block List,Leave Block List Allowed,Urlaubssperrenliste zugelasse apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Umrechnungsfaktor kann nicht ein Bruchteil sein apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,"Sie brauchen das, um sich anzumelden." DocType: Sales Partner,Retailer,Einzelhändler -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credits zum Konto muss ein Bestandskonto werden +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Habenbuchung zum Konto muss ein Bestandskonto sein apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Lieferantentypen apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Artikelnummer ist zwingend erforderlich, da der Artikel nicht automatisch nummeriert wird" apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1} @@ -2519,7 +2534,7 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobetrag (Firmenwährung) DocType: BOM Operation,Hour Rate,Stundensatz DocType: Stock Settings,Item Naming By,Artikelbezeichnung nach -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,von Angebot +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Von Angebot apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Eine weitere Periodenabschlussbuchung {0} wurde nach {1} erstellt DocType: Production Order,Material Transferred for Manufacturing,Material zur Herstellung übertragen apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} existiert nicht @@ -2533,7 +2548,7 @@ DocType: Item,Inspection Required,Prüfung erforderlich DocType: Purchase Invoice Item,PR Detail,PR-Detail DocType: Sales Order,Fully Billed,Voll berechnet apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Barmittel -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Auslieferungslager für Lagerware erforderlich {0} +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Auslieferungslager für Lagerartikel {0} erforderlich DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Nettogewicht + Gewicht des Verpackungsmaterials (Für den Ausdruck) DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Benutzer mit dieser Rolle sind berechtigt Konten zu sperren und Buchungen zu gesperrten Konten zu erstellen/verändern DocType: Serial No,Is Cancelled,Ist storniert @@ -2587,7 +2602,7 @@ DocType: Purchase Invoice,Return Against Purchase Invoice,Zurück zur Einkaufsre DocType: Item,Warranty Period (in days),Gewährleistungsfrist (in Tagen) apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,z. B. Mehrwertsteuer apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4 -DocType: Journal Entry Account,Journal Entry Account,Buchungsjournalkonto +DocType: Journal Entry Account,Journal Entry Account,Journalbuchungskonto DocType: Shopping Cart Settings,Quotation Series,Angebotsserie apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0} ). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Bleigasformen @@ -2605,7 +2620,7 @@ DocType: Salary Slip,Arrear Amount,Ausstehender Betrag apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Neue Kunden apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Rohgewinn % DocType: Appraisal Goal,Weightage (%),Gewichtung (%) -DocType: Bank Reconciliation Detail,Clearance Date,Löschdatum +DocType: Bank Reconciliation Detail,Clearance Date,Einlösungsdatum DocType: Newsletter,Newsletter List,Newsletter-Empfängerliste DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Aktivieren, wenn Sie die Gehaltsabrechnung per Post an jeden Mitarbeiter senden möchten." DocType: Lead,Address Desc,Adresszusatz @@ -2618,7 +2633,7 @@ DocType: Employee,Confirmation Date,Datum bestätigen DocType: C-Form,Total Invoiced Amount,Gesamtrechnungsbetrag DocType: Account,Sales User,Verkaufsmitarbeiter apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Mindestmenge kann nicht größer als Maximalmenge sein -DocType: Stock Entry,Customer or Supplier Details,Kunden oder Lieferanten-Details +DocType: Stock Entry,Customer or Supplier Details,Kunden- oder Lieferanten-Details apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Einstellen DocType: Lead,Lead Owner,Eigentümer des Interessenten (Leads) apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Angabe des Lagers wird benötigt @@ -2648,7 +2663,7 @@ apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Co DocType: Purchase Invoice,Terms,Geschäftsbedingungen apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Neuen Eintrag erstellen DocType: Buying Settings,Purchase Order Required,Lieferantenauftrag erforderlich -,Item-wise Sales History,Artikelbezogene Verkaufs-Historie +,Item-wise Sales History,Artikelbezogene Verkaufshistorie DocType: Expense Claim,Total Sanctioned Amount,Summe genehmigter Beträge ,Purchase Analytics,Einkaufsanalyse DocType: Sales Invoice Item,Delivery Note Item,Lieferschein-Artikel @@ -2671,7 +2686,7 @@ DocType: SMS Center,Send SMS,SMS senden DocType: Company,Default Letter Head,Standardbriefkopf DocType: Time Log,Billable,Abrechenbar DocType: Authorization Rule,This will be used for setting rule in HR module,Dies wird für die Festlegung der Regel im Personal-Modul verwendet -DocType: Account,Rate at which this tax is applied,"Kurs, zu dem dieser Steuersatz angewendet wird" +DocType: Account,Rate at which this tax is applied,"Kurs, zu dem dieser Steuersatz angewandt wird" apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Nachbestellmenge DocType: Company,Stock Adjustment Account,Bestandskorrektur-Konto DocType: Journal Entry,Write Off,Abschreiben @@ -2681,7 +2696,7 @@ apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: F DocType: Task,depends_on,hängt ab von apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Vertriebschance verloren DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabattfelder stehen in Lieferantenauftrag, Eingangslieferschein und in der Eingangsrechnung zur Verfügung" -apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Name des neuen Konto. Hinweis: Bitte keine Konten für Kunden und Lieferanten zu erstellen +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Name des neuen Kontos. Hinweis: Bitte keine Konten für Kunden und Lieferanten erstellen DocType: Report,Report Type,Berichtstyp apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Ladevorgang läuft DocType: BOM Replace Tool,BOM Replace Tool,Stücklisten-Austauschwerkzeug @@ -2690,9 +2705,9 @@ apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Daten-Import und -Export DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Bei eigener Beteiligung an den Fertigungshandlungen, ""Eigenfertigung"" aktivieren." DocType: Sales Invoice,Rounded Total,Gerundete Gesamtsumme -DocType: Product Bundle,List items that form the package.,"Artikel auflisten, die das Paket bilden." +DocType: Product Bundle,List items that form the package.,"Die Artikel auflisten, die das Paket bilden." apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prozentuale Aufteilung sollte gleich 100% sein -DocType: Serial No,Out of AMC,Außerhalb AMC +DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags DocType: Purchase Order Item,Material Request Detail No,Detailnr. der Materialanfrage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hartdrehen apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Wartungsbesuch erstellen @@ -2733,13 +2748,13 @@ DocType: Pricing Rule,Item Group,Artikelgruppe DocType: Task,Actual Start Date (via Time Logs),Tatsächliches Start-Datum (über Zeitprotokoll) DocType: Stock Reconciliation Item,Before reconciliation,Vor Ausgleich apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},An {0} -DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Steuern und Gebühren hinzugefügt (Firmenwährung) +DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Steuern und Gebühren hinzugerechnet (Firmenwährung) apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben" DocType: Sales Order,Partly Billed,Teilweise abgerechnet DocType: Item,Default BOM,Standardstückliste apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambern apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Bitte zum Bestätigen Firmenname erneut eingeben -apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Summe offener Forderungen +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Offener Gesamtbetrag DocType: Time Log Batch,Total Hours,Summe der Stunden DocType: Journal Entry,Printing Settings,Druckeinstellungen apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0} @@ -2747,7 +2762,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Autom apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Abwesenheiten für Typ {0} sind bereits für das Geschäftsjahr {0} dem Arbeitnehmer {1} zugeteilt apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Artikel erforderlich apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metallspritzguss -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,von Lieferschein +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Von Lieferschein DocType: Time Log,From Time,Von Zeit DocType: Notification Control,Custom Message,Benutzerdefinierte Mitteilung apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment-Banking @@ -2788,7 +2803,7 @@ DocType: Purchase Invoice,Items,Artikel DocType: Fiscal Year,Year Name,Name des Jahrs DocType: Process Payroll,Process Payroll,Gehaltsabrechnung bearbeiten apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Es gibt mehr Feiertage als Arbeitstage in diesem Monat. -DocType: Product Bundle Item,Product Bundle Item,Produkt-Bundle Artikel +DocType: Product Bundle Item,Product Bundle Item,Produkt-Bundle-Artikel DocType: Sales Partner,Sales Partner Name,Name des Vertriebspartners DocType: Purchase Invoice Item,Image View,Bildansicht apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Endbearbeitung & industrielle Veredelung @@ -2869,13 +2884,13 @@ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipien DocType: Features Setup,Item Groups in Details,Detaillierte Artikelgruppen apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein. apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Point-of-Sale (POS) starten -apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besuchsbericht für Wartungsbesuch. +apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besuchsbericht für Wartungsauftrag. DocType: Stock Entry,Update Rate and Availability,Preis und Verfügbarkeit aktualisieren DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Zur bestellten Menge zusätzlich zulässiger Prozentsatz, der angenommen oder geliefert werden kann. Beispiel: Wenn 100 Einheiten bestellt wurden, und die erlaubte Spanne 10 % beträgt, dann können 110 Einheiten angenommen werden." DocType: Pricing Rule,Customer Group,Kundengruppe apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0} DocType: Item,Website Description,Webseiten-Beschreibung -DocType: Serial No,AMC Expiry Date,AMC Verfalldatum +DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags ,Sales Register,Übersicht über den Umsatz DocType: Quotation,Quotation Lost Reason,Grund des verlorenen Angebotes DocType: Address,Plant,Fabrik @@ -2899,16 +2914,16 @@ DocType: C-Form,C-Form,Kontakt-Formular apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Arbeitsgang-ID nicht gesetzt DocType: Production Order,Planned Start Date,Geplanter Starttermin DocType: Serial No,Creation Document Type,Belegerstellungs-Typ -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Besichtigung +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Serviceeinsatz DocType: Leave Type,Is Encash,Ist Inkasso DocType: Purchase Invoice,Mobile No,Mobilfunknummer DocType: Payment Tool,Make Journal Entry,Journalbuchung erstellen DocType: Leave Allocation,New Leaves Allocated,Neue Urlaubszuordnung apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projektbezogene Daten sind für das Angebot nicht verfügbar DocType: Project,Expected End Date,Voraussichtliches Enddatum -DocType: Appraisal Template,Appraisal Template Title,Name der Bewertungsvorlage +DocType: Appraisal Template,Appraisal Template Title,Bezeichnung der Bewertungsvorlage apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Werbung -apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,"Übergeordnete Artikel {0} darf nicht eine Position sein," +apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Übergeordneter Artikel {0} darf kein Lagerartikel sein DocType: Cost Center,Distribution Id,Verteilungs-ID apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Beeindruckende Dienstleistungen apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle Produkte oder Dienstleistungen. @@ -2925,9 +2940,9 @@ DocType: Tax Rule,Sales,Vertrieb DocType: Stock Entry Detail,Basic Amount,Grundbetrag apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr -DocType: Customer,Default Receivable Accounts,Standard-Debitorenkonten +DocType: Customer,Default Receivable Accounts,Standard-Sollkonten apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sägearbeiten -DocType: Tax Rule,Billing State,Billing Staat +DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminieren DocType: Item Reorder,Transfer,Übertragung apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen) @@ -2963,10 +2978,10 @@ DocType: Salary Slip,Earning & Deduction,Einkünfte & Abzüge apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kann keine Gruppe sein apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,"Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern." -apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativer Bewertungsbetrag ist nicht erlaubt +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt DocType: Holiday List,Weekly Off,Wöchentlich frei DocType: Fiscal Year,"For e.g. 2012, 2012-13","Für z. B. 2012, 2012-13" -apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Vorläufige Gewinn / Verlust (Haben) +apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Vorläufiger Gewinn / Verlust (Haben) DocType: Sales Invoice,Return Against Sales Invoice,Zurück zur Kundenrechnung apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Artikel 5 apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Bitte Standardwert {0} in Firma {1} setzen @@ -2987,7 +3002,7 @@ DocType: Features Setup,Sales Discounts,Verkaufsrabatte DocType: Hub Settings,Seller Country,Land des Verkäufers DocType: Authorization Rule,Authorization Rule,Autorisierungsregel DocType: Sales Invoice,Terms and Conditions Details,Allgemeine Geschäftsbedingungen Details -DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Vorlage für Verkaufssteuern und Abgaben auf den Verkauf +DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Vorlage für Verkaufssteuern und -gebühren apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Kleidung & Zubehör apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Nummer der Bestellung DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML/Banner, das oben auf der Produktliste angezeigt wird." @@ -2996,7 +3011,7 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle darf Konten sperren und gesperrte Buchungen bearbeiten apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kostenstelle kann nicht in ein Kontenblatt umgewandelt werden, da sie Unterknoten hat" apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Umrechnungsfaktor wird benötigt -apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial # +apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serien # apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision auf den Umsatz DocType: Offer Letter Term,Value / Description,Wert / Beschreibung DocType: Tax Rule,Billing Country,Land laut Rechnungsadresse @@ -3009,7 +3024,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Kundenauftrags abgebrochen werden apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Alter DocType: Time Log,Billing Amount,Rechnungsbetrag -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ungültzige Anzahl für Artikel {0} angegebenen. Anzahl sollte größer als 0 sein. +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ungültzige Anzahl für Artikel {0} angegeben. Anzahl sollte größer als 0 sein. apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Urlaubsanträge apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Rechtskosten @@ -3030,7 +3045,7 @@ apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with c DocType: Bank Reconciliation Detail,Cheque Date,Scheckdatum apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Über-Konto {1} gehört nicht zur Firma: {2} apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Alle Transaktionen dieser Firma wurden erfolgreich gelöscht! -apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Wie auf Datum +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Zum apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Ziehschleifen apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probezeit apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lagerartikel zwingend notwendig. @@ -3081,7 +3096,7 @@ DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle darf gesperrten ,Territory Target Variance Item Group-Wise,Artikelgruppenbezogene regionale Zielabweichung apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Kundengruppen apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt. -apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Steuern Template ist obligatorisch. +apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich. apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Eltern-Konto {1} existiert nicht DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preisliste (Firmenwährung) apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',"{0} {1} hat den Status ""angehalten""" @@ -3093,6 +3108,7 @@ DocType: Serial No,Distinct unit of an Item,Eindeutige Einheit eines Artikels DocType: Pricing Rule,Buying,Einkauf DocType: HR Settings,Employee Records to be created by,Mitarbeiter-Datensätze zu erstellen von apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Dieser Zeitprotokollstapel wurde storniert. +,Reqd By Date,Reqd nach Datum DocType: Salary Slip Earning,Salary Slip Earning,Verdienst laut Gehaltsabrechnung apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Gläubiger apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Seriennummer ist obligatorisch @@ -3103,7 +3119,7 @@ DocType: Quotation,In Words will be visible once you save the Quotation.,"""In W apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Bügeln apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} ist beendet apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet -DocType: Lead,Add to calendar on this date,An diesem Datum zum Kalender hinzufügen +DocType: Lead,Add to calendar on this date,Zu diesem Datum in Kalender einfügen apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten. apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Kommende Veranstaltungen apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunde ist verpflichtet @@ -3151,17 +3167,17 @@ DocType: Account,Debit,Soll apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Abwesenheiten müssen ein Vielfaches von 0,5 sein" DocType: Production Order,Operation Cost,Kosten eines Arbeitsgangs apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Anwesenheiten aus einer CSV-Datei hochladen -apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Herausragendes Amt +apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Offener Betrag DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ziele artikelgruppenbezogen für diesen Vertriebsmitarbeiter festlegen. DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Um diese Anfrage zuzuweisen, bitte die Schaltfläche ""Zuweisen"" auf der Seitenleiste verwenden." DocType: Stock Settings,Freeze Stocks Older Than [Days],Bestände älter als [Tage] sperren -apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Wenn zwei oder mehrere Preisregeln basierend auf den oben genannten Bedingungen gefunden werden, wird eine Vorrangregelung angewendet. Priorität ist eine Zahl zwischen 0 und 20, wobei der Standardwert Null (leer) ist. Die höhere Zahl hat Vorrang, wenn es mehrere Preisregeln zu den gleichen Bedingungen gibt." +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Wenn zwei oder mehrere Preisregeln basierend auf den oben genannten Bedingungen gefunden werden, wird eine Vorrangregelung angewandt. Priorität ist eine Zahl zwischen 0 und 20, wobei der Standardwert Null (leer) ist. Die höhere Zahl hat Vorrang, wenn es mehrere Preisregeln zu den gleichen Bedingungen gibt." apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Zu Rechnung apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Geschäftsjahr: {0} existiert nicht DocType: Currency Exchange,To Currency,In Währung DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Zulassen, dass die folgenden Benutzer Urlaubsanträge für Blöcke von Tagen genehmigen können." apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Spesenabrechnungstypen -DocType: Item,Taxes,Steuer +DocType: Item,Taxes,Steuern DocType: Project,Default Cost Center,Standardkostenstelle DocType: Purchase Invoice,End Date,Enddatum DocType: Employee,Internal Work History,Interne Arbeits-Historie @@ -3177,7 +3193,7 @@ apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Diesen Fertigungsauftrag für die weitere Verarbeitung absenden. apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Um Preisregeln in einer bestimmten Transaktion nicht zu verwenden, sollten alle geltenden Preisregeln deaktiviert sein." DocType: Company,Domain,Domäne -,Sales Order Trends,Entwicklung der Kundenaufträge +,Sales Order Trends,Trendanalyse Kundenaufträge DocType: Employee,Held On,Festgehalten am apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktions-Artikel ,Employee Information,Mitarbeiterinformationen @@ -3189,13 +3205,13 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Mak DocType: Quality Inspection,Incoming,Eingehend DocType: BOM,Materials Required (Exploded),Benötigte Materialien (erweitert) DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Verdienst für unbezahlten Urlaub (LWP) vermindern -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",Zusätzliche Benutzer zur Firma hinzufügen +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Benutzer, außer Ihnen, zu Ihrer Firma hinzufügen" apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Seriennummer {1} nicht mit übereinstimmen {2} {3} apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Ungeplante Abwesenheit DocType: Batch,Batch ID,Chargen-ID apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Hinweis: {0} ,Delivery Note Trends,Entwicklung Lieferscheine -apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Diese Woche Zusammenfassung +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Zusammenfassung dieser Woche apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} muss ein gekaufter oder unterbeauftragter Artikel in Zeile {1} sein apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kann nur über Lagertransaktionen aktualisiert werden DocType: GL Entry,Party,Gruppe @@ -3216,7 +3232,7 @@ DocType: Department,Leave Block List,Urlaubssperrenliste DocType: Customer,Tax ID,Steuer ID apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} ist nicht für Seriennummern eingerichtet. Spalte muss leer sein DocType: Accounts Settings,Accounts Settings,Konteneinstellungen -DocType: Customer,Sales Partner and Commission,Vertriebspartner und der Kommission +DocType: Customer,Sales Partner and Commission,Vertriebspartner und Verprovisionierung apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Anlagen und Maschinen DocType: Sales Partner,Partner's Website,Webseite des Partners DocType: Opportunity,To Discuss,Zur Diskussion @@ -3228,7 +3244,7 @@ DocType: Account,Auditor,Prüfer DocType: Purchase Order,End date of current order's period,Schlußdatum der laufenden Bestellperiode apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Angebotsschreiben erstellen apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zurück -apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Standard-Maßeinheit für Variant müssen gleiche wie Template sein +apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Standard-Maßeinheit muss für eine Variante die gleiche wie für eine Vorlage sein DocType: DocField,Fold,Falz DocType: Production Order Operation,Production Order Operation,Arbeitsgang im Fertigungsauftrag DocType: Pricing Rule,Disable,Deaktivieren @@ -3278,18 +3294,18 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Lager. DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Kurs, zu dem die Währung des Lieferanten in die Basiswährung des Unternehmens umgerechnet wird" apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Zeile #{0}: Timing-Konflikte mit Zeile {1} -DocType: Opportunity,Next Contact,Nächste Kontakt +DocType: Opportunity,Next Contact,Nächster Kontakt DocType: Employee,Employment Type,Art der Beschäftigung apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlagevermögen DocType: Item Group,Default Expense Account,Standardaufwandskonto DocType: Employee,Notice (days),Meldung(s)(-Tage) DocType: Page,Yes,Ja -DocType: Tax Rule,Sales Tax Template,Umsatzsteuer-Template +DocType: Tax Rule,Sales Tax Template,Umsatzsteuer-Vorlage DocType: Employee,Encashment Date,Inkassodatum apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galvanotechnik apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","""Gegenbeleg"" muss entweder eine Bestellung, eine Einkaufsrechnung oder eine Journalbuchung sein" DocType: Account,Stock Adjustment,Bestandskorrektur -apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard-Handlungskosten bestehen für Aktivitätsart - {0} +apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Es gibt Standard-Aktivitätskosten für Aktivitätsart - {0} DocType: Production Order,Planned Operating Cost,Geplante Betriebskosten apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Neuer {0} Name apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Bitte Anhang beachten {0} #{1} @@ -3306,7 +3322,7 @@ apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44, DocType: Item Variant Attribute,Attribute,Attribut apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Bitte Von-/Bis-Bereich genau angeben sites/assets/js/desk.min.js +7652,Created By,Erstellt von -DocType: Serial No,Under AMC,Unter AMC +DocType: Serial No,Under AMC,Unter jährlichem Wartungsvertrag apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Artikelpreis wird unter Einbezug von Belegen über den Einstandspreis neu berechnet apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardeinstellungen für Vertriebstransaktionen. DocType: BOM Replace Tool,Current BOM,Aktuelle Stückliste @@ -3315,18 +3331,19 @@ DocType: Production Order,Warehouses,Lager apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Druck- und Schreibwaren apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppen-Knoten DocType: Payment Reconciliation,Minimum Amount,Mindestbetrag -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Fertigteile aktualisieren +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Fertigwaren aktualisieren DocType: Workstation,per hour,pro stunde apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serie {0} bereits verwendet in {1} DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto für das Lager (Permanente Inventur) wird unter diesem Konto erstellt. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kann nicht gelöscht werden, da es Buchungen im Lagerbuch gibt." -DocType: Company,Distribution,Verteilung +DocType: Company,Distribution,Großhandel +sites/assets/js/erpnext.min.js +50,Amount Paid,Zahlbetrag apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleiter apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Versand apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max erlaubter Rabatt für Artikel: {0} ist {1}% -DocType: Customer,Default Taxes and Charges,Standard Steuern und Abgaben +DocType: Customer,Default Taxes and Charges,Standard-Steuern und -Abgaben DocType: Account,Receivable,Forderung -DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, die Transaktionen, die das gesetzte Kreditlimit überschreiten, versenden darf." +DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, die Zahlungen, die das gesetzte Kreditlimit überschreiten, durchführen darf." DocType: Sales Invoice,Supplier Reference,Referenznummer des Lieferanten DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Wenn aktiviert, wird die Stückliste für Unterbaugruppen-Artikel berücksichtigt, um Rohmaterialien zu bekommen. Andernfalls werden alle Unterbaugruppen-Artikel als Rohmaterial behandelt." DocType: Material Request,Material Issue,Materialentnahme @@ -3404,7 +3421,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blastin DocType: Company,Warn,Warnen apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Artikelbewertung aktualisiert DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sonstige wichtige Anmerkungen, die in die Datensätze aufgenommen werden sollten." -DocType: BOM,Manufacturing User,Fertigung Mitarbeiter +DocType: BOM,Manufacturing User,Fertigungs-Benutzer DocType: Purchase Order,Raw Materials Supplied,Gelieferte Rohmaterialien DocType: Purchase Invoice,Recurring Print Format,Wiederkehrendes Druckformat DocType: Communication,Series,Serie @@ -3451,8 +3468,8 @@ DocType: Address Template,"

    Default Template

    " DocType: Salary Slip Deduction,Default Amount,Standard-Betrag apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Lager im System nicht gefunden -apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Des Monats Zusammenfassung -DocType: Quality Inspection Reading,Quality Inspection Reading,Qualitätsprüfung Ablesen +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Zusammenfassung dieses Monats +DocType: Quality Inspection Reading,Quality Inspection Reading,Ablesung zur Qualitätsprüfung apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Lagerbestände sperren, wenn älter als"" sollte kleiner sein als %d Tage." DocType: Tax Rule,Purchase Tax Template,Umsatzsteuer-Vorlage ,Project wise Stock Tracking,Projektbezogene Lagerbestandsverfolgung @@ -3468,10 +3485,10 @@ DocType: Sales Invoice,C-Form Applicable,Kontakt-Formular geeignet apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss größer als 0 für die Operation {0} DocType: Supplier,Address and Contacts,Adresse und Kontaktinformationen DocType: UOM Conversion Detail,UOM Conversion Detail,Maßeinheit-Umrechnungs-Detail -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Webfreundlich halten - 900px (breit) zu 100px (hoch) +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Webfreundlich halten: 900px (breit) zu 100px (hoch) apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ein Fertigungsauftrag kann nicht zu einer Artikel-Vorlage gemacht werden apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Kosten werden im Eingangslieferschein mit jedem Artikel abgeglichen -DocType: Payment Tool,Get Outstanding Vouchers,Ausstehende Belege aufrufen +DocType: Payment Tool,Get Outstanding Vouchers,Offene Posten aufrufen DocType: Warranty Claim,Resolved By,Gelöst von DocType: Appraisal,Start Date,Startdatum sites/assets/js/desk.min.js +7629,Value,Wert @@ -3506,7 +3523,7 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hauptberichte apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Buchungen auf Konten des Lagerbuchs wurden aktualisiert apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Bis-Datum kann nicht vor Von-Datum liegen -DocType: Purchase Receipt Item,Prevdoc DocType,DocType Prevdoc +DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Preise hinzufügen / bearbeiten apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Übersicht der Kostenstellen ,Requested Items To Be Ordered,"Angeforderte Artikel, die bestellt werden sollen" @@ -3642,7 +3659,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic Wenn ""Serie"" eingestellt ist und ""Seriennummer"" in den Transaktionen nicht aufgeführt ist, dann wird eine Seriennummer automatisch auf der Grundlage dieser Serie erstellt. Wenn immer explizit Seriennummern für diesen Artikel aufgeführt werden sollen, muss das Feld leer gelassen werden." DocType: Upload Attendance,Upload Attendance,Anwesenheit hochladen apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Stückliste und Fertigungsmenge werden benötigt -apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Alterung Bereich 2 +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Alter Bereich 2 DocType: Journal Entry Account,Amount,Betrag apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nieten apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stückliste ersetzt @@ -3652,18 +3669,18 @@ apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-Mail einrichten apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Bitte die Standardwährung in die Firmenstammdaten eingeben DocType: Stock Entry Detail,Stock Entry Detail,Lagerbuchungsdetail apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Tägliche Erinnerungen -apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Tax Regel Konflikte mit {0} +apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Steuer-Regel steht in Konflikt mit {0} apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Neuer Kontoname DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosten gelieferter Rohmaterialien DocType: Selling Settings,Settings for Selling Module,Einstellungen für das Vertriebsmodul apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundenservice -DocType: Item,Thumbnail,Daumennagel +DocType: Item,Thumbnail,Thumbnail DocType: Item Customer Detail,Item Customer Detail,kundenspezifisches Artikeldetail apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Email-Adresse bestätigen apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Einem Bewerber einen Arbeitsplatz anbieten. DocType: Notification Control,Prompt for Email on Submission of,E-Mail anregen beim Versand von apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Artikel {0} muss ein Lagerartikel sein -DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse +DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard-Fertigungslager apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardeinstellungen für Buchhaltungstransaktionen. apps/frappe/frappe/model/naming.py +40,{0} is required,{0} ist erforderlich apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuumformen @@ -3674,7 +3691,7 @@ apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Fehler: Keine apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Artikel {0} muss ein Verkaufsartikel sein DocType: Naming Series,Update Series Number,Seriennummer aktualisieren DocType: Account,Equity,Eigenkapital -DocType: Sales Order,Printing Details,Printing-Details +DocType: Sales Order,Printing Details,Druckdetails DocType: Task,Closing Date,Abschlussdatum DocType: Sales Order Item,Produced Quantity,Produzierte Menge apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur @@ -3702,7 +3719,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is man DocType: Item,Serial Number Series,Serie der Seriennummer apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Angabe des Lagers ist für Lagerartikel {0} in Zeile {1} zwingend erfoderlich apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Einzel- & Großhandel -DocType: Issue,First Responded On,Zuerst Antwort senden an +DocType: Issue,First Responded On,Zuerst geantwortet auf DocType: Website Item Group,Cross Listing of Item in multiple groups,Kreuzweise Auflistung des Artikels in mehreren Gruppen apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Der erste Benutzer: Sie selbst! apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Start- und Enddatum des Geschäftsjahres sind für das Geschäftsjahr {0} bereits gesetzt @@ -3722,14 +3739,14 @@ DocType: Purchase Order,In Words will be visible once you save the Purchase Orde DocType: Period Closing Voucher,Period Closing Voucher,Periodenabschlussbeleg apps/erpnext/erpnext/config/stock.py +125,Price List master.,Preislisten-Vorlage. DocType: Task,Review Date,Überprüfungsdatum -DocType: Purchase Invoice,Advance Payments,Vorauszahlungen +DocType: Purchase Invoice,Advance Payments,Anzahlungen DocType: DocPerm,Level,Ebene DocType: Purchase Taxes and Charges,On Net Total,Auf Nettosumme apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Eingangslager in Zeile {0} muss dem Fertigungsauftrag entsprechen apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,"Keine Berechtigung, das Zahlungsabgleichs-Werkzeug zu benutzen" apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""Benachrichtigungs-E-Mail-Adresse"" nicht angegeben für das wiederkehrende Ereignis %s" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Mahlen -apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Währung kann nicht nach der Eingabe mit einer anderen Währung ändern +apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Die Währung kann nicht geändert werden, wenn Buchungen in einer anderen Währung getätigt wurden" DocType: Company,Round Off Account,Abschlusskonto apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbeln apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Verwaltungskosten @@ -3781,15 +3798,15 @@ DocType: Maintenance Schedule Item,Half Yearly,Halbjährlich DocType: Lead,Blog Subscriber,Blog-Abonnent apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Regeln erstellen um Transaktionen auf Basis von Werten zu beschränken. DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Wenn aktiviert, beinhaltet die Gesamtanzahl der Arbeitstage auch Feiertage und dies reduziert den Wert des Gehalts pro Tag." -DocType: Purchase Invoice,Total Advance,Summe der Vorkasse-Zahlungen +DocType: Purchase Invoice,Total Advance,Summe der Anzahlungen apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Materialanforderung fortsetzen DocType: Workflow State,User,Benutzer -apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Verarbeitungs Payroll +apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Gehaltsabrechnung verarbeiten DocType: Opportunity Item,Basic Rate,Grundpreis -DocType: GL Entry,Credit Amount,Kreditbetrag +DocType: GL Entry,Credit Amount,Guthaben-Summe apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,"Als ""verloren"" markieren" -DocType: Customer,Credit Days Based On,Kredit Tage Basierend auf -DocType: Tax Rule,Tax Rule,Tax-Regel +DocType: Customer,Credit Days Based On,Zahlungsziel basierend auf +DocType: Tax Rule,Tax Rule,Steuer-Regel DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Gleiche Preise während des gesamten Verkaufszyklus beibehalten DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zeiten außerhalb der normalen Arbeitszeiten am Arbeitsplatz zulassen. apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} wurde bereits gesendet @@ -3801,7 +3818,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming, apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID der Firmen-E-Mail-Adresse wurde nicht gefunden, deshalb wird die E-Mail nicht gesendet" apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Mittelverwendung (Aktiva) DocType: Production Planning Tool,Filter based on item,Filtern nach Artikeln -DocType: Fiscal Year,Year Start Date,Geschäftsjahr Beginn +DocType: Fiscal Year,Year Start Date,Startdatum des Geschäftsjahres DocType: Attendance,Employee Name,Mitarbeitername DocType: Sales Invoice,Rounded Total (Company Currency),Gerundete Gesamtsumme (Firmenwährung) apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Kann nicht in keine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist." @@ -3822,11 +3839,12 @@ apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_st apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Forderung {1} sein. Ausstehender Betrag ist {2} apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} Empfänger hinzugefügt DocType: Maintenance Schedule,Schedule,Zeitplan -DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",Budget definieren für diese Kostenstelle. Budget Aktion finden Sie unter "Unternehmensliste" +DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Budget für diese Kostenstelle definieren. Um das Budget wirksam werden zu lassen, bitte Unternehmensliste anschauen" DocType: Account,Parent Account,Übergeordnetes Konto DocType: Quality Inspection Reading,Reading 3,Ablesung 3 ,Hub,Hub DocType: GL Entry,Voucher Type,Belegtyp +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert DocType: Expense Claim,Approved,Genehmigt DocType: Pricing Rule,Price,Preis apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden" @@ -3851,7 +3869,7 @@ DocType: Employee,Contract End Date,Vertragsende DocType: Sales Order,Track this Sales Order against any Project,Diesen Kundenauftrag in jedem Projekt nachverfolgen DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Aufträge (deren Lieferung aussteht) entsprechend der oben genannten Kriterien abrufen DocType: DocShare,Document Type,Dokumententyp -apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,von Lieferantenangebot +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Von Lieferantenangebot DocType: Deduction Type,Deduction Type,Abzugsart DocType: Attendance,Half Day,Halbtags DocType: Pricing Rule,Min Qty,Mindestmenge @@ -3866,7 +3884,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0} DocType: Notification Control,Purchase Receipt Message,Eingangslieferschein-Nachricht DocType: Production Order,Actual Start Date,Tatsächliches Startdatum DocType: Sales Order,% of materials delivered against this Sales Order,% der für diesen Kundenauftrag gelieferten Materialien -apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Verschiebung des Datensatzes. +apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Lagerbewegung aufzeichnen. DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter-Abonnentenliste apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Einstemmen DocType: Email Account,Service,Service @@ -3916,7 +3934,7 @@ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save DocType: Item Attribute,Numeric Values,Numerische Werte apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo anhängen DocType: Customer,Commission Rate,Provisionssatz -apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Machen Variant +apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Variante erstellen apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren. apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Der Warenkorb ist leer DocType: Production Order,Actual Operating Cost,Tatsächliche Betriebskosten @@ -3934,14 +3952,15 @@ apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vorlag DocType: Serial No,Delivery Details,Lieferdetails apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatisch Materialanforderung erstellen, wenn die Menge unter diesen Wert fällt" -,Item-wise Purchase Register,Artikelbezogende Übersicht der Einkäufe +,Item-wise Purchase Register,Artikelbezogene Übersicht der Einkäufe DocType: Batch,Expiry Date,Verfalldatum -apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Um Meldebestand festgelegt, muss Einzelteil einen Kauf Artikel oder Herstellungs Titel" +apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Um den Meldebestand festzulegen, muss der Artikel ein Einkaufsartikel oder ein Fertigungsartiel sein" ,Supplier Addresses and Contacts,Lieferanten-Adressen und Kontaktdaten apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Bitte zuerst Kategorie auswählen apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt-Stammdaten DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Kein Symbol wie $ usw. neben Währungen anzeigen. -DocType: Supplier,Credit Days,Tag der Gutschrift +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halbtags) +DocType: Supplier,Credit Days,Zahlungsziel DocType: Leave Type,Is Carry Forward,Ist Übertrag apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Artikel aus der Stückliste holen apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lieferzeittage diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv index a7bd42c976..fa8d997492 100644 --- a/erpnext/translations/el.csv +++ b/erpnext/translations/el.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Προβολή DocType: Sales Invoice Item,Quantity,Ποσότητα apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Δάνεια (παθητικό ) DocType: Employee Education,Year of Passing,Έτος περάσματος +sites/assets/js/erpnext.min.js +27,In Stock,Σε Απόθεμα apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Μπορούν να πληρώνουν κατά unbilled παραγγελία DocType: Designation,Designation,Ονομασία DocType: Production Plan Item,Production Plan Item,Είδος σχεδίου παραγωγής @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ρυθμίσεις DocType: SMS Center,SMS Center,Κέντρο SMS apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ίσιωμα DocType: BOM Replace Tool,New BOM,Νέα Λ.Υ. +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Ημερολόγια Παρτίδας για την τιμολόγηση. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity χύτευσης apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Το ενημερωτικό δελτίο έχει ήδη αποσταλεί DocType: Lead,Request Type,Τύπος αίτησης @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Νέα Μ.Μ.Αποθέματο DocType: Period Closing Voucher,Closing Account Head,Κλείσιμο κύριας εγγραφής λογαριασμού DocType: Employee,External Work History,Ιστορικό εξωτερικής εργασίας apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Κυκλικού λάθους Αναφορά +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Θέλετε σίγουρα να διακόψετε; DocType: Communication,Closed,Κλειστό DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Με λόγια (εξαγωγή) θα είναι ορατά αφού αποθηκεύσετε το δελτίο αποστολής. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Είστε σίγουρος πως θέλετε να σταματήσετε DocType: Lead,Industry,Βιομηχανία DocType: Employee,Job Profile,Προφίλ εργασίας DocType: Newsletter,Newsletter,Ενημερωτικό δελτίο @@ -737,6 +741,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Ανεβ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Αποστολή τώρα ,Support Analytics,Στατιστικά στοιχεία υποστήριξης DocType: Item,Website Warehouse,Αποθήκη δικτυακού τόπου +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Θέλετε σίγουρα να σταματήσετε αυτήν την Εντολή Παραγωγής; DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Η ημέρα του μήνα κατά την οποίο θα δημιουργηθεί το αυτοματοποιημένο τιμολόγιο, π.Χ. 05, 28 Κλπ" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Το αποτέλεσμα πρέπει να είναι μικρότερο από ή ίσο με 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-form εγγραφές @@ -879,6 +884,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Λε DocType: SMS Center,All Lead (Open),Όλες οι επαφές (ανοιχτές) DocType: Purchase Invoice,Get Advances Paid,Βρες προκαταβολές που καταβλήθηκαν apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Επισύναψη της εικόνα σας +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Δημιούργησε DocType: Journal Entry,Total Amount in Words,Συνολικό ποσό ολογράφως DocType: Workflow State,Stop,Διακοπή apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Υπήρξε ένα σφάλμα. Ένας πιθανός λόγος θα μπορούσε να είναι ότι δεν έχετε αποθηκεύσει τη φόρμα. Παρακαλώ επικοινωνήστε με το support@erpnext.Com εάν το πρόβλημα παραμένει. @@ -959,6 +965,7 @@ DocType: Journal Entry,Make Difference Entry,Δημιούργησε καταχώ DocType: Upload Attendance,Attendance From Date,Συμμετοχή από ημερομηνία DocType: Appraisal Template Goal,Key Performance Area,Βασικός τομέας επιδόσεων apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Μεταφορά +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,και το έτος: DocType: Email Digest,Annual Expense,Ετήσια Δαπάνη DocType: SMS Center,Total Characters,Σύνολο χαρακτήρων apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Παρακαλώ επιλέξτε Λ.Υ. στο πεδίο της Λ.Υ. για το είδος {0} @@ -1196,6 +1203,7 @@ DocType: Holiday List,Holidays,Διακοπές DocType: Sales Order Item,Planned Quantity,Προγραμματισμένη ποσότητα DocType: Purchase Invoice Item,Item Tax Amount,Ποσό φόρου είδους DocType: Item,Maintain Stock,Διατηρήστε Χρηματιστήριο +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Έχουν ήδη δημιουργηθεί καταχωρήσεις αποθέματος για την εντολή παραγωγής DocType: Leave Control Panel,Leave blank if considered for all designations,Άφησε το κενό αν ισχύει για όλες τις ονομασίες apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Μέγιστο: {0} @@ -1258,6 +1266,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Α apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το ποσό κε {2} DocType: Item,Inventory,Απογραφή DocType: Features Setup,"To enable ""Point of Sale"" view",Για να ενεργοποιήσετε το "Point of Sale" προβολή +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Η πληρωμή δεν μπορεί να γίνει για άδειο καλάθι DocType: Item,Sales Details,Λεπτομέρειες πωλήσεων apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Καρφίτσωμα DocType: Opportunity,With Items,Με Αντικείμενα @@ -1450,6 +1459,7 @@ DocType: Item,Weightage,Ζύγισμα apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Εξόρυξη apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Ρητίνη χύτευσης apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα apps/erpnext/erpnext/templates/pages/order.html +57,text {0},κειμένου {0} DocType: Territory,Parent Territory,Έδαφος μητρική DocType: Quality Inspection Reading,Reading 2,Μέτρηση 2 @@ -1630,6 +1640,7 @@ DocType: Features Setup,Brands,Εμπορικά σήματα DocType: C-Form Invoice Detail,Invoice No,Αρ. Τιμολογίου apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Από παραγγελία αγοράς DocType: Activity Cost,Costing Rate,Κοστολόγηση Τιμή +,Customer Addresses And Contacts,Διευθύνσεις πελατών και των επαφών DocType: Employee,Resignation Letter Date,Ημερομηνία επιστολής παραίτησης apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Οι κανόνες τιμολόγησης φιλτράρονται περαιτέρω με βάση την ποσότητα. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Δεν έχει οριστεί @@ -1737,6 +1748,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Η κατάσταση του αρχείου καταγραφής χρονολογίου πρέπει να υποβληθεί. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Αύξων αριθμός {0} δεν ανήκουν σε καμία αποθήκη apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Ρύθμιση... +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Γραμμή # DocType: Purchase Invoice,In Words (Company Currency),Με λόγια (νόμισμα της εταιρείας) DocType: Pricing Rule,Supplier,Προμηθευτής DocType: C-Form,Quarter,Τρίμηνο @@ -1835,7 +1847,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Περαιτέρω κέντρα κόστους μπορεί να γίνει κάτω από ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες" DocType: Project,External,Εξωτερικός DocType: Features Setup,Item Serial Nos,Σειριακοί αριθμοί είδους +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Χρήστες και δικαιώματα DocType: Branch,Branch,Υποκατάστημα +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Εκτύπωσης και Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Δεν βρέθηκαν βεβαιώσεις αποδοχών για τον μηνα: DocType: Bin,Actual Quantity,Πραγματική ποσότητα DocType: Shipping Rule,example: Next Day Shipping,Παράδειγμα: αποστολή την επόμενη μέρα apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Ο σειριακός αριθμός {0} δεν βρέθηκε @@ -3092,6 +3107,7 @@ DocType: Serial No,Distinct unit of an Item,Διακριτή μονάδα ενό DocType: Pricing Rule,Buying,Αγορά DocType: HR Settings,Employee Records to be created by,Εγγραφές των υπαλλήλων που πρόκειται να δημιουργηθούν από apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Αυτή η παρτίδα αρχείων καταγραφής χρονολογίου έχει ακυρωθεί. +,Reqd By Date,Reqd Με ημερομηνία DocType: Salary Slip Earning,Salary Slip Earning,Αποδοχές στη βεβαίωση αποδοχών apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Πιστωτές apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Σειρά # {0}: Αύξων αριθμός είναι υποχρεωτική @@ -3321,6 +3337,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Ο λογαριασμός για την αποθήκη (διαρκής απογραφή) θα δημιουργηθεί στο πλαίσιο του παρόντος λογαριασμού. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή." DocType: Company,Distribution,Διανομή +sites/assets/js/erpnext.min.js +50,Amount Paid,Πληρωμένο Ποσό apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Υπεύθυνος έργου apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Αποστολή apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Η μέγιστη έκπτωση που επιτρέπεται για το είδος: {0} είναι {1}% @@ -3826,6 +3843,7 @@ DocType: Account,Parent Account,Γονικός λογαριασμός DocType: Quality Inspection Reading,Reading 3,Μέτρηση 3 ,Hub,Hub DocType: GL Entry,Voucher Type,Τύπος αποδεικτικού +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες DocType: Expense Claim,Approved,Εγκρίθηκε DocType: Pricing Rule,Price,Τιμή apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει @@ -3940,6 +3958,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Παρακαλώ επιλέξτε πρώτα την κατηγορία apps/erpnext/erpnext/config/projects.py +18,Project master.,Κύρια εγγραφή έργου. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Να μην εμφανίζεται κανένα σύμβολο όπως $ κλπ δίπλα σε νομίσματα. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Μισή ημέρα) DocType: Supplier,Credit Days,Ημέρες πίστωσης DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Λήψη ειδών από Λ.Υ. diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv index 686998fac5..8c37c4868a 100644 --- a/erpnext/translations/es-PE.csv +++ b/erpnext/translations/es-PE.csv @@ -56,6 +56,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar varian DocType: Sales Invoice Item,Quantity,Cantidad apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos) DocType: Employee Education,Year of Passing,Año de Fallecimiento +sites/assets/js/erpnext.min.js +27,In Stock,En inventario DocType: Designation,Designation,Puesto DocType: Production Plan Item,Production Plan Item,Plan de producción de producto apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1} @@ -169,6 +170,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustes para el Mó DocType: SMS Center,SMS Center,Centro SMS apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Enderezar DocType: BOM Replace Tool,New BOM,Nueva Solicitud de Materiales +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Bitácora de Lotes para facturación. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,El boletín de noticias ya ha sido enviado DocType: Lead,Request Type,Tipo de solicitud @@ -290,8 +292,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Unidad de Medida de Nuevo Inven DocType: Period Closing Voucher,Closing Account Head,Cuenta de cierre principal DocType: Employee,External Work History,Historial de trabajos externos apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error de referencia circular +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,¿Realmente desea detener? DocType: Communication,Closed,Cerrado DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Exportar) serán visibles una vez que guarde la nota de entrega. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,¿Seguro que quieres dejar de DocType: Lead,Industry,Industria DocType: Employee,Job Profile,Perfil Laboral DocType: Newsletter,Newsletter,Boletín de Noticias @@ -703,6 +707,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Sube sald apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ahora ,Support Analytics,Analitico de Soporte DocType: Item,Website Warehouse,Almacén del Sitio Web +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,¿Realmente desea detener la orden de producción?: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El día del mes en el que se generará factura automática por ejemplo 05, 28, etc." apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Puntuación debe ser menor o igual a 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registros C -Form @@ -838,6 +843,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blan DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas) DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunte su Fotografía +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Hacer DocType: Journal Entry,Total Amount in Words,Importe total en letras DocType: Workflow State,Stop,Detenerse apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste." @@ -913,6 +919,7 @@ DocType: Journal Entry,Make Difference Entry,Hacer Entrada de Diferencia DocType: Upload Attendance,Attendance From Date,Asistencia De Fecha DocType: Appraisal Template Goal,Key Performance Area,Área Clave de Rendimiento apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transporte +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,y año: DocType: SMS Center,Total Characters,Total Caracteres apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}" DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalle C -Form Factura @@ -1140,6 +1147,7 @@ DocType: Holiday List,Holidays,Vacaciones DocType: Sales Order Item,Planned Quantity,Cantidad Planificada DocType: Purchase Invoice Item,Item Tax Amount,Total de impuestos de los artículos DocType: Item,Maintain Stock,Mantener Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Imagenes de entradas ya creadas por Orden de Producción DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerada para todas las designaciones apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la linea {0} no puede ser incluido en el precio apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1198,6 +1206,7 @@ DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estaci apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual al importe en Comprobante de Diario {2} DocType: Item,Inventory,inventario +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío DocType: Item,Sales Details,Detalles de Ventas apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fijación DocType: Opportunity,With Items,Con artículos @@ -1379,6 +1388,7 @@ DocType: Item,Weightage,Coeficiente de Ponderación apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minería apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Por favor, seleccione primero {0}" DocType: Territory,Parent Territory,Territorio Principal DocType: Quality Inspection Reading,Reading 2,Lectura 2 DocType: Stock Entry,Material Receipt,Recepción de Materiales @@ -1551,6 +1561,7 @@ DocType: Features Setup,Brands,Marcas DocType: C-Form Invoice Detail,Invoice No,Factura No apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Desde órden de compra DocType: Activity Cost,Costing Rate,Costo calculado +,Customer Addresses And Contacts,Las direcciones de clientes y contactos DocType: Employee,Resignation Letter Date,Fecha de Carta de Renuncia apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No Especificado @@ -1655,6 +1666,7 @@ apps/erpnext/erpnext/hooks.py +84,Shipments,Los envíos apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldeo por inmersión apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,El Estado del Registro de Horas tiene que ser 'Enviado'. apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuración +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Fila # DocType: Purchase Invoice,In Words (Company Currency),En palabras (Moneda Local) DocType: Pricing Rule,Supplier,Proveedores DocType: C-Form,Quarter,Trimestre @@ -1747,7 +1759,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas." DocType: Project,External,Externo DocType: Features Setup,Item Serial Nos,N º de serie de los Artículo +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y permisos DocType: Branch,Branch,Rama +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impresión y Marcas +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No existe nómina para el mes: DocType: Bin,Actual Quantity,Cantidad actual DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío Día Siguiente apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no encontrado @@ -2954,6 +2969,7 @@ DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto DocType: Pricing Rule,Buying,Compras DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este Grupo de Horas Registradas se ha facturado. +,Reqd By Date,Solicitado Por Fecha DocType: Salary Slip Earning,Salary Slip Earning,Ingreso en Planilla apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Acreedores DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalle de Impuestos @@ -3166,6 +3182,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén. DocType: Company,Distribution,Distribución +sites/assets/js/erpnext.min.js +50,Amount Paid,Total Pagado apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despacho apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}% @@ -3643,6 +3660,7 @@ DocType: Account,Parent Account,Cuenta Primaria DocType: Quality Inspection Reading,Reading 3,Lectura 3 ,Hub,Centro de actividades DocType: GL Entry,Voucher Type,Tipo de comprobante +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,La lista de precios no existe o está deshabilitada. DocType: Expense Claim,Approved,Aprobado DocType: Pricing Rule,Price,Precio apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda""" @@ -3749,6 +3767,7 @@ DocType: Batch,Expiry Date,Fecha de caducidad apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Por favor, seleccione primero la categoría" apps/erpnext/erpnext/config/projects.py +18,Project master.,Proyecto maestro DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Medio día) DocType: Supplier,Credit Days,Días de Crédito DocType: Leave Type,Is Carry Forward,Es llevar adelante apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obtener elementos de la Solicitud de Materiales diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv index 00fe0676d1..e584cd9b92 100644 --- a/erpnext/translations/es.csv +++ b/erpnext/translations/es.csv @@ -1,25 +1,25 @@ DocType: Employee,Salary Mode,Modo de pago -DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccione Distribución mensual, si desea realizar un seguimiento basado en la estacionalidad." +DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccione la distribución mensual, si usted desea monitoreo de las temporadas" DocType: Employee,Divorced,Divorciado apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces. apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productos ya sincronizados -DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir artículo a añadir varias veces en una transacción +DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir añadir el artículo varias veces en una transacción apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar visita {0} antes de cancelar este reclamo de garantía -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Productos de Consumo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Productos de consumo apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, seleccione primero el tipo de entidad" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recocido -DocType: Item,Customer Items,Artículos de clientes -apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: Cuenta Padre {1} no puede ser una cuenta Mayor +DocType: Item,Customer Items,Partidas de deudores +apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: de cuenta padre {1} no puede ser una cuenta de libro mayor DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo en hub.erpnext.com apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notificaciones por correo electrónico DocType: Item,Default Unit of Measure,Unidad de Medida (UdM) predeterminada DocType: SMS Center,All Sales Partner Contact,Listado de todos los socios de ventas DocType: Employee,Leave Approvers,Supervisores de ausencias DocType: Sales Partner,Dealer,Distribuidor -DocType: Employee,Rented,Alquilado -DocType: About Us Settings,Website,Sitio Web +DocType: Employee,Rented,Arrendado +DocType: About Us Settings,Website,Sitio web DocType: POS Profile,Applicable for User,Aplicable para el usuario -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Detenido orden de producción no se puede cancelar, unstop primero para cancelar" +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","La orden de producción detenida no puede ser cancelada, inicie de nuevo para cancelarla" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactación más sinterización apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},La divisa/moneda es requerida para lista de precios {0} DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción. @@ -28,29 +28,29 @@ apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0 DocType: Job Applicant,Job Applicant,Solicitante de empleo apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados. apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la linea {0}" +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la línea {0}" DocType: C-Form,Customer,Cliente -DocType: Purchase Receipt Item,Required By,Requerido por +DocType: Purchase Receipt Item,Required By,Solicitado por DocType: Delivery Note,Return Against Delivery Note,Devolución contra nota de entrega DocType: Department,Department,Departamento DocType: Purchase Order,% Billed,% Facturado apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),El tipo de cambio debe ser el mismo que {0} {1} ({2}) -DocType: Sales Invoice,Customer Name,Nombre del Cliente +DocType: Sales Invoice,Customer Name,Nombre del cliente DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Todos los campos relacionados tales como divisa, tasa de conversión, el total de exportaciones, total general de las exportaciones, etc están disponibles en la nota de entrega, Punto de venta, cotización, factura de venta, órdenes de venta, etc." DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) para el cual los asientos contables se crean y se mantienen los saldos apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),El pago pendiente para {0} no puede ser menor que cero ({1}) DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos DocType: Leave Type,Leave Type Name,Nombre del tipo de ausencia -apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie actualizado correctamente +apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Secuencia actualizada correctamente apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Puntadas -DocType: Pricing Rule,Apply On,Aplique En +DocType: Pricing Rule,Apply On,Aplicar en DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios para los productos -,Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos +,Purchase Order Items To Be Received,Productos por recibir desde orden de compra DocType: SMS Center,All Supplier Contact,Todos Contactos de Proveedores DocType: Quality Inspection Reading,Parameter,Parámetro apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Realmente desea reanudar la orden de producción: -apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4}) +apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Línea # {0}: El valor debe ser el mismo que {1}: {2} ({3} / {4}) apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Nueva solicitud de ausencia apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,GIRO BANCARIO DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1 . Utilice esta opción para mantener el código del producto asignado por el cliente, de esta manera podrá encontrarlo en el buscador" @@ -59,12 +59,13 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar varian DocType: Sales Invoice Item,Quantity,Cantidad apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos) DocType: Employee Education,Year of Passing,Año de graduación +sites/assets/js/erpnext.min.js +27,In Stock,En inventario apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Sólo se puede crear un pago para las ordenes de venta impagadas DocType: Designation,Designation,Puesto DocType: Production Plan Item,Production Plan Item,Plan de producción de producto apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1} apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crear un nuevo perfil de POS -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Cuidado de la Salud +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Asistencia médica DocType: Purchase Invoice,Monthly,Mensual apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Factura DocType: Maintenance Schedule Item,Periodicity,Periodo @@ -72,20 +73,20 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address, apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa DocType: Company,Abbr,Abreviatura DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5) -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Linea {0}: {1} {2} no coincide con {3} -apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}: -DocType: Delivery Note,Vehicle No,Vehículo No +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3} +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Línea # {0}: +DocType: Delivery Note,Vehicle No,Vehículo No. sites/assets/js/erpnext.min.js +55,Please select Price List,"Por favor, seleccione la lista de precios" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tratamiento de la madera DocType: Production Order Operation,Work In Progress,TRABAJOS EN PROCESO apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impresión 3D DocType: Employee,Holiday List,Lista de festividades -DocType: Time Log,Time Log,Hora de registro +DocType: Time Log,Time Log,Gestión de tiempos apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contador -DocType: Cost Center,Stock User,Foto del usuario -DocType: Company,Phone No,Teléfono No +DocType: Cost Center,Stock User,Usuario de almacén +DocType: Company,Phone No,Teléfono No. DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",Bitácora de actividades realizadas por los usuarios en las tareas que se utilizan para el seguimiento del tiempo y la facturación. -apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nuevo {0}: # {1} +apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nuevo {0}: #{1} ,Sales Partners Commission,Comisiones de socios de ventas apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \ @@ -93,12 +94,12 @@ apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribu DocType: Print Settings,Classic,Clásico apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar . DocType: BOM,Operations,Operaciones -apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},No se puede establecer la autorización sobre la base de Descuento para {0} +apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},No se puede establecer la autorización sobre la base de descuento para {0} DocType: Bin,Quantity Requested for Purchase,Cantidad solicitada para la compra DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y otro para el nombre nuevo" -DocType: Packed Item,Parent Detail docname,Detalle Principal docname +DocType: Packed Item,Parent Detail docname,Detalle principal docname apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogramo -apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura de un Trabajo . +apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura de un puesto DocType: Item Attribute,Increment,Incremento apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicidad DocType: Employee,Married,Casado @@ -106,33 +107,33 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock DocType: Payment Reconciliation,Reconcile,Conciliar apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Abarrotes DocType: Quality Inspection Reading,Reading 1,Lectura 1 -apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Hacer Entrada del Banco -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondos de Pensiones +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Crear entrada de banco +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondo de pensiones apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén DocType: SMS Center,All Sales Person,Todos Ventas de Ventas -DocType: Lead,Person Name,Nombre de la persona +DocType: Lead,Person Name,Nombre de persona DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Marque si es una orden recurrente, desmarque si quiere detenerla o marcar una fecha final" DocType: Sales Invoice Item,Sales Invoice Item,Articulo de la Factura de Venta DocType: Account,Credit,Haber apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,"Por favor, configure el sistema de Nombre de Empleados a través de: Recursos Humanos > Configuración de recursos humanos" -DocType: POS Profile,Write Off Cost Center,Centro de costos de desajuste +DocType: POS Profile,Write Off Cost Center,Desajuste de centro de costos DocType: Warehouse,Warehouse Detail,Detalle de almacenes apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2} DocType: Tax Rule,Tax Type,Tipo de Impuestos apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0} -DocType: Item,Item Image (if not slideshow),"Imagen del Artículo (si no, presentación de diapositivas)" +DocType: Item,Item Image (if not slideshow),Imagen del producto (si no utilizará diapositivas) apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por Hora / 60) * Tiempo real de la operación DocType: SMS Log,SMS Log,Registros SMS -apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo del Material que se adjunta +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo de productos entregados DocType: Blog Post,Guest,Invitado -DocType: Quality Inspection,Get Specification Details,Obtenga Especificación Detalles +DocType: Quality Inspection,Get Specification Details,Obtener especificaciones DocType: Lead,Interested,Interesado apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiales (LdM) apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1} -DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos -DocType: Journal Entry,Opening Entry,Entrada de Apertura +DocType: Item,Copy From Item Group,Copiar desde grupo +DocType: Journal Entry,Opening Entry,Asiento de apertura apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} es obligatorio DocType: Stock Entry,Additional Costs,Costes adicionales apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo. @@ -146,7 +147,7 @@ DocType: BOM,Total Cost,Coste total apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Escariado apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Actividad: apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Bienes Raíces +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Bienes raíces apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estado de cuenta apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos DocType: Expense Claim Detail,Claim Amount,Importe del reembolso @@ -162,7 +163,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Sal DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Inventario de Gastos DocType: Newsletter,Email Sent?,Enviar Email? -DocType: Journal Entry,Contra Entry,Entrada Contra +DocType: Journal Entry,Contra Entry,Entrada contra apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar gestión de tiempos DocType: Journal Entry Account,Credit in Company Currency,Divisa por defecto de la cuenta de credito DocType: Delivery Note,Installation Status,Estado de la instalación @@ -174,11 +175,12 @@ All dates and employee combination in the selected period will come in the templ Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes" apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera enviada . -apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la linea {0} los impuestos de las lineas {1} también deben ser incluidos +apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} también deben ser incluidos apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos DocType: SMS Center,SMS Center,Centro SMS -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Enderezar -DocType: BOM Replace Tool,New BOM,Nueva Solicitud de Materiales +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Enderezado +DocType: BOM Replace Tool,New BOM,Nueva solicitud de materiales +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Lotes de gestión de tiempos para facturación. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,El boletín de noticias ya ha sido enviado DocType: Lead,Request Type,Tipo de solicitud @@ -187,28 +189,28 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broad apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Ejecución apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,El primer usuario se convertirá en el administrador del sistema (puede cambiar esto más adelante). apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detalles de las operaciones realizadas. -DocType: Serial No,Maintenance Status,Estado del Mantenimiento +DocType: Serial No,Maintenance Status,Estado del mantenimiento apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Productos y precios apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0} DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccione el empleado para el que está creando la Evaluación . -apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centro de Costos {0} no pertenece a la empresa {1} +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},El centro de Costos {0} no pertenece a la compañía {1} DocType: Customer,Individual,Individual -apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan para las visitas de mantenimiento. +apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan para las visitas DocType: SMS Settings,Enter url parameter for message,Introduzca el parámetro url para el mensaje apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Reglas para la aplicación de distintos precios y descuentos sobre los productos. -apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Conflictos Conectarse esta vez con {0} de {1} {2} +apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Esta gestión de tiempos tiene conflictos con {0} de {1} {2} apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,la lista de precios debe ser aplicable para comprar o vender apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0} DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa de la lista de precios (%) sites/assets/js/form.min.js +279,Start,Iniciar DocType: User,First Name,Nombre -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Su configuración se ha completado. Actualizando. +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Su configuración se ha completado. Actualizando... apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fundición de molde completo -DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones +DocType: Offer Letter,Select Terms and Conditions,Seleccione términos y condiciones DocType: Production Planning Tool,Sales Orders,Ordenes de Venta DocType: Purchase Taxes and Charges,Valuation,Valuación apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Establecer como predeterminado -,Purchase Order Trends,Tendencias de Ordenes de Compra +,Purchase Order Trends,Tendencias de ordenes de compra apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Asignar las ausencias para el año. DocType: Earning Type,Earning Type,Tipo de ingresos DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Desactivar planificación de capacidad y seguimiento de tiempo @@ -217,34 +219,34 @@ DocType: Leave Type,Allow Negative Balance,Permitir Saldo Negativo DocType: Selling Settings,Default Territory,Territorio predeterminado apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televisión apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rechinar -DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro' +DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de la gestión de tiempos apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Cuenta {0} no pertenece a la Compañía {1} -DocType: Naming Series,Series List for this Transaction,Lista de series para esta transacción +DocType: Naming Series,Series List for this Transaction,Lista de secuencias para esta transacción DocType: Sales Invoice,Is Opening Entry,Es una entrada de apertura DocType: Customer Group,Mention if non-standard receivable account applicable,Indique si una cuenta por cobrar no estándar es aplicable apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Para el almacén es requerido antes de enviar -DocType: Sales Partner,Reseller,Reseller +DocType: Sales Partner,Reseller,Re-vendedor apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Por favor, introduzca compañia" DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venta del producto ,Production Orders in Progress,Órdenes de producción en progreso DocType: Lead,Address & Contact,Dirección y Contacto apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1} DocType: Newsletter List,Total Subscribers,Los suscriptores totales -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nombre del Contacto -DocType: Production Plan Item,SO Pending Qty,SO Pendiente Cantidad -DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados. +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nombre de contacto +DocType: Production Plan Item,SO Pending Qty,Cant. de OV pendientes +DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crear la nómina salarial con los criterios antes seleccionados. apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Vivienda Doble -apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias seleccionado puede validar esta solicitud de permiso +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año -apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, establece Naming Series para {0} a través de Configuración> Configuración> Serie Naming" +apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, las secuencias e identificadores para {0} a través de Configuración> Configuración> Secuencias e identificadores" DocType: Time Log,Will be updated when batched.,Se actualizará al agruparse. -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Linea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado." +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado." apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1} -DocType: Bulk Email,Message,Mensaje +DocType: Bulk Email,Message,Atención DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB -DocType: Dropbox Backup,Dropbox Access Key,Clave de Acceso de Dropbox +DocType: Dropbox Backup,Dropbox Access Key,Clave de acceso a Dropbox DocType: Payment Tool,Reference No,Referencia No. apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Vacaciones Bloqueadas apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1} @@ -268,59 +270,61 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire br DocType: Employee,Relation,Relación DocType: Shipping Rule,Worldwide Shipping,Envío al mundo entero apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Ordenes de clientes confirmadas. -DocType: Purchase Receipt Item,Rejected Quantity,Cantidad Rechazada +DocType: Purchase Receipt Item,Rejected Quantity,Cantidad rechazada DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Campo disponible en la Nota de Entrega, Cotización, Factura de Venta y Pedido de Venta" DocType: SMS Settings,SMS Sender Name,Nombre del remitente SMS -DocType: Contact,Is Primary Contact,Es Contacto principal -DocType: Notification Control,Notification Control,Control de Notificación +DocType: Contact,Is Primary Contact,Es el contacto principal +DocType: Notification Control,Notification Control,Control de notificaciónes DocType: Lead,Suggestions,Sugerencias -DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer presupuestos - Grupo sabio artículo en este Territorio. También puede incluir la estacionalidad mediante el establecimiento de la Distribución . -apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Por favor, ingrese el grupo de cuentas padres para el almacén {0}" +DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer grupo de presupuestos en este territorio. también puede incluir las temporadas de distribución +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Por favor, ingrese el grupo de cuentas padres / principales para el almacén {0}" apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},El pago para {0} {1} no puede ser mayor que el pago pendiente {2} DocType: Supplier,Address HTML,Dirección HTML -DocType: Lead,Mobile No.,Número Móvil -DocType: Maintenance Schedule,Generate Schedule,Generar Horario +DocType: Lead,Mobile No.,Número móvil +DocType: Maintenance Schedule,Generate Schedule,Generar planificación apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing DocType: Purchase Invoice Item,Expense Head,Cuenta de gastos apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Por favor, seleccione primero el tipo de cargo" -apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más Reciente -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Máximo 5 caracteres +apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más reciente +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Máximo 5 caractéres apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Seleccione su idioma DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer supervisor de ausencias en la lista sera definido como el administrador de ausencias/vacaciones predeterminado. DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order",Desactiva la creación de bitácoras (gestión de tiempos) para las órdenes de producción (OP). Las operaciones ya no tendrán un seguimiento. -DocType: Accounts Settings,Settings for Accounts,Ajustes de Contabilidad +DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrar las categoría de los socios de ventas DocType: Item,Synced With Hub,Sincronizado con Hub apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Contraseña Incorrecta DocType: Item,Variant Of,Variante de apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,El elemento {0} debe ser un servicio -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar. DocType: DocType,Administrator,Administrador apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perforación por láser -DocType: Stock UOM Replace Utility,New Stock UOM,Unidad de Medida de Nuevo Inventario +DocType: Stock UOM Replace Utility,New Stock UOM,Nueva unidad de medida (UdM) DocType: Period Closing Voucher,Closing Account Head,Cuenta principal de cierre DocType: Employee,External Work History,Historial de trabajos externos apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error de referencia circular +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,¿Realmente desea detener? DocType: Communication,Closed,Cerrado DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Exportar) serán visibles una vez que guarde la nota de entrega. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,¿Seguro que quieres dejar de DocType: Lead,Industry,Industria -DocType: Employee,Job Profile,Perfil Laboral -DocType: Newsletter,Newsletter,Boletín de Noticias +DocType: Employee,Job Profile,Perfil del puesto +DocType: Newsletter,Newsletter,Boletín de noticias apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Besuqueo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Tapado / Sellado DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales DocType: Journal Entry,Multi Currency,Multi moneda -apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,El Artículo está Actualizado +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Se ha actualizado el producto DocType: Async Task,System Manager,Administrador del Sistema -DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Factura -DocType: Sales Invoice Item,Delivery Note,Notas de entrega +DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de factura +DocType: Sales Invoice Item,Delivery Note,Nota de entrega DocType: Dropbox Backup,Allow Dropbox Access,Permitir Acceso a Dropbox apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuración de Impuestos apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo." apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes -DocType: Workstation,Rent Cost,Renta Costo +DocType: Workstation,Rent Cost,Costo de arrendamiento apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Por favor seleccione el mes y el año DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduzca los IDs de correo electrónico separados por comas, la factura será enviada automáticamente en una fecha determinada" DocType: Employee,Company Email,Email de la compañía @@ -331,20 +335,20 @@ DocType: Features Setup,"All import related fields like currency, conversion rat apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy' apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total del Pedido Considerado apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)" -apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca el valor en el campo 'Repetir un día al mes" +apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca el valor en el campo 'Repetir un día al mes'" DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa por la cual la divisa es convertida como moneda base del cliente DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas" -DocType: Item Tax,Tax Rate,Tasa de impuesto -apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Seleccione Producto +DocType: Item Tax,Tax Rate,Procentaje del impuesto +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Seleccione producto apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \ Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock" -apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe -apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lote No debe ser igual a {1} {2} +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,la factura de compra {0} ya existe +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Línea # {0}: El lote no puede ser igual a {1} {2} apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir a 'Sin-Grupo' -apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe presentarse +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe validarse DocType: Stock UOM Replace Utility,Current Stock UOM,Unidad de Medida de Inventario Actual apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Listados de los lotes de los productos -DocType: C-Form Invoice Detail,Invoice Date,Fecha de la factura +DocType: C-Form Invoice Detail,Invoice Date,Fecha de factura DocType: GL Entry,Debit Amount,Importe débitado apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Sólo puede haber 1 cuenta por la empresa en {0} {1} apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Su dirección de correo electrónico @@ -355,15 +359,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C ,Finished Goods,PRODUCTOS TERMINADOS DocType: Delivery Note,Instructions,Instrucciones DocType: Quality Inspection,Inspected By,Inspección realizada por -DocType: Maintenance Visit,Maintenance Type,Tipo de Mantenimiento -apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1} +DocType: Maintenance Visit,Maintenance Type,Tipo de mantenimiento +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},El número de serie {0} no pertenece a la nota de entrega {1} DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parámetro de Inspección de Calidad del producto DocType: Leave Application,Leave Approver Name,Nombre del supervisor de ausencias ,Schedule Date,Horario Fecha -DocType: Packed Item,Packed Item,Artículo Empacado +DocType: Packed Item,Packed Item,Artículo empacado apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Ajustes predeterminados para las transacciones de compra. apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe un costo de actividad para el empleado {0} en el tipo de actividad - {1} -apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Por favor, NO crear cuentas de clientes y/o proveedores. Estas se crean de los maestros de clientes/proveedores." +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Por favor, NO crear cuentas de clientes y/o proveedores. Estas son creadas en los maestros de clientes/proveedores." DocType: Currency Exchange,Currency Exchange,Cambio de divisas DocType: Purchase Invoice Item,Item Name,Nombre del producto apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo Acreedor @@ -372,25 +376,25 @@ DocType: Production Planning Tool,"Items to be requested which are ""Out of Stoc DocType: Workstation,Working Hours,Horas de Trabajo DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el número de secuencia nuevo para esta transacción apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto." -,Purchase Register,Registro de Compras +,Purchase Register,Registro de compras DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables DocType: Workstation,Consumable Cost,Coste de consumibles apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de ausencias' DocType: Purchase Receipt,Vehicle Date,Fecha de Vehículos apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Médico -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razón de Pérdida +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razón de pérdida apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Abalorios Tubo apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de festividades: {0} -DocType: Employee,Single,solo +DocType: Employee,Single,Soltero DocType: Issue,Attachment,Adjunto apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,El presupuesto no se puede establecer para un grupo del centro de costos DocType: Account,Cost of Goods Sold,COSTO SOBRE VENTAS DocType: Purchase Invoice,Yearly,Anual -apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Por favor, introduzca el Centro de Costos" -DocType: Journal Entry Account,Sales Order,Orden de Venta (OV) +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Por favor, introduzca el centro de costos" +DocType: Journal Entry Account,Sales Order,Orden de venta (OV) apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Precio de venta promedio -DocType: Purchase Order,Start date of current order's period,Fecha del periodo del actual orden de inicio -apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},La cantidad no puede ser una fracción en la linea {0} +DocType: Purchase Order,Start date of current order's period,Fecha inicial del período de ordenes +apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},La cantidad no puede ser una fracción en la línea {0} DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y precios DocType: Delivery Note,% Installed," % Instalado" @@ -401,32 +405,32 @@ DocType: Account,Is Group,Es un grupo DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automáticamente los números de serie basado en FIFO DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprobar número de factura único por proveedor apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformado -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,De corte longitudinal -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta Caso No.' no puede ser inferior a 'Desde el Caso No.' +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Corte longitudinal +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta caso No.' no puede ser inferior a 'desde el caso No.' apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Sin comenzar +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,No iniciado DocType: Lead,Channel Partner,Canal de socio DocType: Account,Old Parent,Antiguo Padre DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalizar el texto de introducción que va como una parte de este correo electrónico. Cada transacción tiene un texto introductorio separado. DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerente de Ventas -apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Configuración global para todos los procesos de fabricación. -DocType: Accounts Settings,Accounts Frozen Upto,Cuentas Congeladas Hasta +apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Configuración global para todos los procesos de producción +DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta DocType: SMS Log,Sent On,Enviado Por apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos DocType: Sales Order,Not Applicable,No aplicable apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master de vacaciones . -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moldeo Shell -DocType: Material Request Item,Required Date,Fecha Requerida +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell molding +DocType: Material Request Item,Required Date,Fecha de solicitud DocType: Delivery Note,Billing Address,Dirección de Facturación apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Por favor, introduzca el código del producto." -DocType: BOM,Costing,Costeo +DocType: BOM,Costing,Presupuesto DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el valor del impuesto se considerará como ya incluido en el Importe" apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total -DocType: Employee,Health Concerns,Preocupaciones de salud +DocType: Employee,Health Concerns,Problemas de salud apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,No pagado -DocType: Packing Slip,From Package No.,Del Paquete N º +DocType: Packing Slip,From Package No.,Desde paquete No. DocType: Item Attribute,To Range,Para variar -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,VALORES Y DEPÓSITOS +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y depósitos DocType: Features Setup,Imports,Importaciones apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Union adhesiva DocType: Job Opening,Description of a Job Opening,Descripción de la oferta de trabajo @@ -439,43 +443,43 @@ DocType: DocField,Password,Contraseña apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelado por deposición fundida DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos) DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios. -DocType: Journal Entry,Accounts Payable,CUENTAS POR PAGAR +DocType: Journal Entry,Accounts Payable,Cuentas por pagar apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Añadir Suscriptores sites/assets/js/erpnext.min.js +5,""" does not exists",""" no existe" DocType: Pricing Rule,Valid Upto,Válido hasta -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos. -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingreso Directo +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas. +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingreso directo apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta" apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administrativo -DocType: Payment Tool,Received Or Paid,Recibido o Pagado +DocType: Payment Tool,Received Or Paid,Recibido o pagado apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Por favor, seleccione la empresa" DocType: Stock Entry,Difference Account,Cuenta para la Diferencia apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada. apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada" DocType: Production Order,Additional Operating Cost,Costos adicionales de operación -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productos Cosméticos +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productos cosméticos DocType: DocField,Type,Tipo apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos" DocType: Communication,Subject,Asunto DocType: Shipping Rule,Net Weight,Peso neto DocType: Employee,Emergency Phone,Teléfono de emergencia -,Serial No Warranty Expiry,Número de orden de caducidad Garantía +,Serial No Warranty Expiry,Garantía de caducidad del numero de serie apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,¿Realmente desea detener la requisición de materiales? DocType: Sales Order,To Deliver,Para Entregar DocType: Purchase Invoice Item,Item,Productos DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred) -DocType: Account,Profit and Loss,Pérdidas y Ganancias -apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Subcontratación Gestión -apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nueva Unidad de Medida NO debe ser de tipo Numero Entero +DocType: Account,Profit and Loss,Pérdidas y ganancias +apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Gestión de sub-contrataciones +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nueva unidad de medida no debe ser un entero apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,MUEBLES Y ENSERES DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasa por la cual la lista de precios es convertida como base de la compañía apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1} DocType: Selling Settings,Default Customer Group,Categoría de cliente predeterminada DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","si es desactivado, el campo 'Total redondeado' no será visible en ninguna transacción" -DocType: BOM,Operating Cost,Costo de Funcionamiento +DocType: BOM,Operating Cost,Costo de operacion ,Gross Profit,Utilidad bruta apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Incremento no puede ser 0 -DocType: Production Planning Tool,Material Requirement,Solicitud de Material +DocType: Production Planning Tool,Material Requirement,Solicitud de material DocType: Company,Delete Company Transactions,Eliminar las transacciones de la compañía apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \ @@ -488,7 +492,7 @@ apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Se apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Cierre (Cred) DocType: Serial No,Warranty Period (Days),Período de garantía ( Días) DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos -,Pending Qty,Pendiente Cantidad +,Pending Qty,Cantidad pendiente DocType: Job Applicant,Thread HTML,Tema HTML DocType: Company,Ignore,Pasar por alto apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0} @@ -496,44 +500,44 @@ apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse ma DocType: Pricing Rule,Valid From,Válido desde DocType: Sales Invoice,Total Commission,Comisión total DocType: Pricing Rule,Sales Partner,Socio de ventas -DocType: Buying Settings,Purchase Receipt Required,Recibo de Compra Requerido +DocType: Buying Settings,Purchase Receipt Required,Recibo de compra requerido DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business. -To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribución Mensual** le ayuda a distribuir su presupuesto a través de meses si tiene periodos en su negocio. Para distribuir un presupuesto utilizando esta distribución, establecer **Distribución Mensual** en el **Centro de Costos**" +To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribución Mensual** le ayuda a distribuir su presupuesto a través de meses si tiene periodos / temporadas en su negocio. Para distribuir un presupuesto utilizando esta distribución, establecer **Distribución Mensual** en el **Centro de Costos**" apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,No se encontraron registros en la tabla de facturas apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad" apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanzas / Ejercicio contable. -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar" -apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Hacer Orden de Venta +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lamentablemente, los numeros de serie no se puede fusionar" +apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Crear orden de venta DocType: Project Task,Project Task,Tareas del proyecto -,Lead Id,Iniciativa ID +,Lead Id,ID de iniciativa DocType: C-Form Invoice Detail,Grand Total,Total DocType: About Us Settings,Website Manager,Administrador de Página Web apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La fecha de inicio no puede ser mayor que la fecha final del año fiscal DocType: Warranty Claim,Resolution,Resolución apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Entregado: {0} -apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Cuenta por Pagar +apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Cuenta por pagar DocType: Sales Order,Billing and Delivery Status,Estado de facturación y entrega apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes recurrentes DocType: Leave Control Panel,Allocate,Asignar apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Volver Ventas DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccione las órdenes de venta con las cuales desea crear la orden de producción. -apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariales. +apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariales apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de datos de clientes potenciales. apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de datos de clientes. DocType: Quotation,Quotation To,Cotización para -DocType: Lead,Middle Income,Ingresos Medio +DocType: Lead,Middle Income,Ingreso medio apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Apertura (Cred) apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Monto asignado no puede ser negativo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling -DocType: Purchase Order Item,Billed Amt,Monto Facturado +DocType: Purchase Order Item,Billed Amt,Monto facturado DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia. -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0} DocType: Event,Wednesday,Miércoles -DocType: Sales Invoice,Customer's Vendor,Vendedor del Cliente +DocType: Sales Invoice,Customer's Vendor,Agente de ventas apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,La orden de producción es obligatoria -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de Propuestas +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de propuestas apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Existe otro vendedor {0} con el mismo ID de empleado apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Error de stock negativo ( {6} ) para el producto {0} en Almacén {1} en {2} {3} en {4} {5} DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía @@ -542,17 +546,17 @@ DocType: Time Log,Billed,Facturado DocType: Batch,Batch Description,Descripción de lotes DocType: Delivery Note,Time at which items were delivered from warehouse,Momento en que los artículos fueron entregados desde el almacén DocType: Sales Invoice,Sales Taxes and Charges,Los impuestos y cargos de venta -DocType: Employee,Organization Profile,Perfil de la Organización +DocType: Employee,Organization Profile,Perfil de la organización apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,"Por favor, configure la numeración de la asistencia a través de Configuración > Numeración y Series" DocType: Employee,Reason for Resignation,Motivo de la renuncia apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Plantilla para las evaluaciones de desempeño . DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Detalles de diarios apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' no esta en el Año Fiscal {2} -DocType: Buying Settings,Settings for Buying Module,Ajustes para la compra de módulo +DocType: Buying Settings,Settings for Buying Module,Ajustes para módulo de compras apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Por favor, ingrese primero el recibo de compra" DocType: Buying Settings,Supplier Naming By,Ordenar proveedores por: DocType: Activity Type,Default Costing Rate,Precio de costo predeterminado -DocType: Maintenance Schedule,Maintenance Schedule,Calendario de Mantenimiento +DocType: Maintenance Schedule,Maintenance Schedule,Calendario de mantenimiento apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas por Cliente, Categoría de cliente, Territorio, Proveedor, Tipo de proveedor, Campaña, Socio de ventas, etc" apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale el módulo python dropbox" DocType: Employee,Passport Number,Número de pasaporte @@ -563,31 +567,31 @@ DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es) apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo" DocType: Sales Person,Sales Person Targets,Metas de Vendedor sites/assets/js/form.min.js +271,To,a -apps/frappe/frappe/templates/base.html +143,Please enter email address,"Por favor, introduzca la dirección de correo electrónico" +apps/frappe/frappe/templates/base.html +143,Please enter email address,"Por favor, introduzca la dirección de correo electrónico (Email)" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fin tubo formando DocType: Production Order Operation,In minutes,En minutos -DocType: Issue,Resolution Date,Fecha de Resolución +DocType: Issue,Resolution Date,Fecha de resolución apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}" DocType: Selling Settings,Customer Naming By,Ordenar cliente por -apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir al Grupo +apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir a grupo DocType: Activity Cost,Activity Type,Tipo de Actividad -apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Cantidad Entregada +apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Importe entregado DocType: Customer,Fixed Days,Días fijos -DocType: Sales Invoice,Packing List,Lista de Envío +DocType: Sales Invoice,Packing List,Lista de embalaje apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Órdenes de compra enviadas a los proveedores. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicación DocType: Activity Cost,Projects User,Usuario de proyectos apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura -DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeado) +DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo) apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,La visita de mantenimiento {0} debe ser cancelada antes de cancelar la orden de ventas -DocType: Material Request,Material Transfer,Transferencia de Material +DocType: Material Request,Material Transfer,Transferencia de material apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Apertura (Deb) apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0} apps/frappe/frappe/config/setup.py +59,Settings,Configuración DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Impuestos, cargos y costos de destino estimados" DocType: Production Order Operation,Actual Start Time,Hora de inicio actual -DocType: BOM Operation,Operation Time,Tiempo de funcionamiento +DocType: BOM Operation,Operation Time,Tiempo de operación sites/assets/js/list.min.js +5,More,Más DocType: Pricing Rule,Sales Manager,Gerente De Ventas sites/assets/js/desk.min.js +7673,Rename,Renombrar @@ -600,67 +604,67 @@ DocType: Selling Settings,Delivery Note Required,Nota de entrega requerida DocType: Sales Order Item,Basic Rate (Company Currency),Precio base (Divisa por defecto) DocType: Manufacturing Settings,Backflush Raw Materials Based On,Adquisición retroactiva de materia prima basada en apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Por favor, ingrese los detalles del producto" -DocType: Purchase Receipt,Other Details,Otros Datos +DocType: Purchase Receipt,Other Details,Otros detalles DocType: Account,Accounts,Contabilidad apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Esquila Heterosexual +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Troquelado DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto. -DocType: Purchase Receipt Item Supplied,Current Stock,Inventario Actual -apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Almacén Rechazado es obligatorio contra Ítem rechazado +DocType: Purchase Receipt Item Supplied,Current Stock,Inventario actual +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Almacén rechazado es obligatorio para el producto rechazado DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN -DocType: Employee,Provide email id registered in company,Proporcionar correo electrónico de identificación registrado en la compañía +DocType: Employee,Provide email id registered in company,Proporcione el correo electrónico registrado en la compañía DocType: Hub Settings,Seller City,Ciudad del vendedor -DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el: -DocType: Offer Letter Term,Offer Letter Term,Término de carta de oferta +DocType: Email Digest,Next email will be sent on:,El siguiente correo electrónico será enviado el: +DocType: Offer Letter Term,Offer Letter Term,Términos de carta de oferta apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,El producto tiene variantes. apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elemento {0} no encontrado DocType: Bin,Stock Value,Valor de Inventario apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de Árbol -DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantidad Consumida por Unidad +DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantidad consumida por unidad DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la Garantía -DocType: Material Request Item,Quantity and Warehouse,Cantidad y Almacén +DocType: Material Request Item,Quantity and Warehouse,Cantidad y almacén DocType: Sales Invoice,Commission Rate (%),Porcentaje de comisión (%) apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","El tipo de comprobante debe pertenecer a orden de venta, factura de venta o registro de diario" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,No se puede encontrar el tipo de cambio apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenido -DocType: Journal Entry,Credit Card Entry,Introducción de tarjetas de crédito +DocType: Journal Entry,Credit Card Entry,Introducción de tarjeta de crédito apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Asunto de la Tarea apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Productos recibidos de proveedores. -DocType: Communication,Open,Abrir +DocType: Communication,Open,Abierto DocType: Lead,Campaign Name,Nombre de la campaña ,Reserved,Reservado apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,¿Realmente desea reanudar? -DocType: Purchase Order,Supply Raw Materials,Suministro de Materias Primas +DocType: Purchase Order,Supply Raw Materials,Suministro de materia prima DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La Fecha en que se la próxima factura sera generada. Se genera al enviar. apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ACTIVO CIRCULANTE apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} no es un producto de stock DocType: Mode of Payment Account,Default Account,Cuenta predeterminada -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas -DocType: Contact Us Settings,Address Title,Dirección Título +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas +DocType: Contact Us Settings,Address Title,Dirección apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Por favor seleccione el día libre de la semana DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado ,Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta DocType: Dropbox Backup,Daily,Diario apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor -DocType: Delivery Note,Customer's Purchase Order No,Nº de Pedido de Compra del Cliente +DocType: Delivery Note,Customer's Purchase Order No,Pedido de compra No. DocType: Employee,Cell Number,Número de movil -apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido +apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdído apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario' apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energía DocType: Opportunity,Opportunity From,Oportunidad desde -apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina Mensual. +apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina mensual. DocType: Item Group,Website Specifications,Especificaciones del Sitio Web -apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nueva Cuenta +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nueva cuenta apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1} -apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Linea {0}: El factor de conversión es obligatorio +apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Los asientos contables se deben crear en las subcuentas. los asientos en 'grupos' de cuentas no están permitidos. DocType: ToDo,High,Alto apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras DocType: Opportunity,Maintenance,Mantenimiento DocType: User,Male,Masculino -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0} +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Se requiere el numero de recibo para el producto {0} DocType: Item Attribute Value,Item Attribute Value,Atributos del producto apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campañas de venta. DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc. @@ -714,28 +718,29 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Por favor, introduzca primero un producto" DocType: Account,Liability,Obligaciones -apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la linea {0}. +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la línea {0}. DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos (venta) por defecto apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,No ha seleccionado una lista de precios DocType: Employee,Family Background,Antecedentes familiares DocType: Process Payroll,Send Email,Enviar Correo Electronico apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Sin permiso DocType: Company,Default Bank Account,Cuenta bancaria por defecto -apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar en base a la fiesta, seleccione Partido Escriba primero" +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad" apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar Stock' no se puede marcar porque los productos no se entregan a través de {0} apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos. -DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba +DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor ponderación se mostraran arriba DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de conciliación bancaria apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mis facturas apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Empleado no encontrado DocType: Purchase Order,Stopped,Detenido DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor -apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Seleccione la lista de materiales para comenzar +apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Seleccione la lista de materiales (LdM) para comenzar DocType: SMS Center,All Customer Contact,Todos Contactos de Clientes apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Sube saldo de existencias a través csv . apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ahora ,Support Analytics,Analitico de Soporte DocType: Item,Website Warehouse,Almacén del Sitio Web +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,¿Realmente desea detener la orden de producción?: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El día del mes en el que se generará factura automática por ejemplo 05, 28, etc." apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Puntuación debe ser menor o igual a 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registros C -Form @@ -754,46 +759,46 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Del DocType: Upload Attendance,Import Attendance,Asistente de importación apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos DocType: Process Payroll,Activity Log,Registro de Actividad -apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utilidad/Pérdida Neta +apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utilidad / Pérdida neta apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones. -DocType: Production Order,Item To Manufacture,Artículo Para Fabricación +DocType: Production Order,Item To Manufacture,Producto para manufactura apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Molde para fundición -apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Orden de compra de Pago -DocType: Sales Order Item,Projected Qty,Cantidad Proyectada +apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Orden de compra a pago +DocType: Sales Order Item,Projected Qty,Cantidad proyectada DocType: Sales Invoice,Payment Due Date,Fecha de pago DocType: Newsletter,Newsletter Manager,Administrador de boletínes apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Apertura' -DocType: Notification Control,Delivery Note Message,Mensaje de la Nota de Entrega +DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega DocType: Expense Claim,Expenses,Gastos DocType: Item Variant Attribute,Item Variant Attribute,Artículo Variant Atributo -,Purchase Receipt Trends,Tendencias de Recibos de Compra +,Purchase Receipt Trends,Tendencias de recibos de compra DocType: Appraisal,Select template from which you want to get the Goals,Seleccione la plantilla de la que usted desea conseguir los Objetivos de -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y Desarrollo +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y desarrollo ,Amount to Bill,Monto a Facturar -DocType: Company,Registration Details,Detalles de Registro -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Replanteo -DocType: Item,Re-Order Qty,Reordenar cantidad +DocType: Company,Registration Details,Detalles de registro +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking +DocType: Item,Re-Order Qty,Cantidad mínima para ordenar DocType: Leave Block List Date,Leave Block List Date,Fecha de Lista de Bloqueo de Vacaciones apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar a {0} -DocType: Pricing Rule,Price or Discount,Precio o Descuento +DocType: Pricing Rule,Price or Discount,Precio o descuento DocType: Sales Team,Incentives,Incentivos DocType: SMS Log,Requested Numbers,Números solicitados -apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Evaluación del Desempeño . +apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Evaluación de desempeño. DocType: Sales Invoice Item,Stock Details,Detalles de almacén -apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del Proyecto +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del proyecto apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Punto de venta -apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},No se puede cargar {0} +apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},No se puede trasladar {0} apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'" -DocType: Account,Balance must be,Balance debe ser +DocType: Account,Balance must be,El balance debe ser DocType: Hub Settings,Publish Pricing,Publicar precios DocType: Notification Control,Expense Claim Rejected Message,Mensaje de reembolso de gastos rechazado apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Clavado ,Available Qty,Cantidad Disponible -DocType: Purchase Taxes and Charges,On Previous Row Total,Sobre la linea anterior al total +DocType: Purchase Taxes and Charges,On Previous Row Total,Sobre la línea anterior al total DocType: Salary Slip,Working Days,Días de Trabajo DocType: Serial No,Incoming Rate,Tasa entrante -DocType: Packing Slip,Gross Weight,Peso Bruto +DocType: Packing Slip,Gross Weight,Peso bruto apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,El nombre de la compañía para la que va a configurar el sistema. DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir vacaciones con el numero total de días laborables DocType: Job Applicant,Hold,Mantener @@ -802,8 +807,8 @@ DocType: Naming Series,Update Series,Definir secuencia DocType: Supplier Quotation,Is Subcontracted,Es sub-contratado DocType: Item Attribute,Item Attribute Values,Valor de los atributos del producto apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Ver Suscriptores -DocType: Purchase Invoice Item,Purchase Receipt,Recibos de Compra -,Received Items To Be Billed,Recepciones por Facturar +DocType: Purchase Invoice Item,Purchase Receipt,Recibo de Compra +,Received Items To Be Billed,Recepciones por facturar apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Chorro abrasivo sites/assets/js/desk.min.js +3938,Ms,Sra. apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Configuración principal para el cambio de divisas @@ -813,16 +818,16 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be activ apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Por favor, seleccione primero el tipo de documento" apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar visitas {0} antes de cancelar la visita de mantenimiento DocType: Salary Slip,Leave Encashment Amount,Monto de Vacaciones Descansadas -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Número de orden {0} no pertenece al elemento {1} -DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Necesaria +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Número de serie {0} no pertenece al producto {1} +DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Solicitada DocType: Bank Reconciliation,Total Amount,Importe total apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publicación por internet -DocType: Production Planning Tool,Production Orders,Órdenes de Producción +DocType: Production Planning Tool,Production Orders,Órdenes de producción apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor de balance apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de precios para la venta apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronización de artículos DocType: GL Entry,Account Currency,Divisa -apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo--" +apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo" DocType: Purchase Receipt,Range,Rango DocType: Supplier,Default Payable Accounts,Cuentas por pagar por defecto apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe @@ -832,43 +837,43 @@ DocType: Quality Inspection Reading,Reading 6,Lectura 6 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada DocType: Address,Shop,Tienda DocType: Hub Settings,Sync Now,Sincronizar ahora -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Linea {0}: La entrada de crédito no puede vincularse con {1} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Línea {0}: La entrada de crédito no puede vincularse con {1} DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,La cuenta de Banco / Efectivo por defecto se actualizará automáticamente en la factura del POS cuando seleccione este 'modelo' -DocType: Employee,Permanent Address Is,Dirección permanente es -DocType: Production Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados? +DocType: Employee,Permanent Address Is,La dirección permanente es +DocType: Production Order Operation,Operation completed for how many finished goods?,Se completo la operación para la cantidad de productos terminados? apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La marca apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}. DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida DocType: Item,Is Purchase Item,Es un producto para compra -DocType: Journal Entry Account,Purchase Invoice,Facturas de Compra +DocType: Journal Entry Account,Purchase Invoice,Factura de compra DocType: Stock Ledger Entry,Voucher Detail No,Detalle de Comprobante No DocType: Stock Entry,Total Outgoing Value,Valor total de salidas -DocType: Lead,Request for Information,Solicitud de Información +DocType: Lead,Request for Information,Solicitud de información DocType: Payment Tool,Paid,Pagado DocType: Salary Slip,Total in words,Total en palabras -DocType: Material Request Item,Lead Time Date,Fecha y Hora de la Iniciativa -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}" +DocType: Material Request Item,Lead Time Date,Hora de la Iniciativa +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Línea #{0}: Por favor, especifique el número de serie para el producto {1}" apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'" apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Envíos realizados a los clientes -DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingresos Indirectos -DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establecer importe de pago = Pago pendiente -DocType: Contact Us Settings,Address Line 1,Dirección Línea 1 +DocType: Purchase Invoice Item,Purchase Order Item,Producto de la orden de compra +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingresos indirectos +DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establecer el importe de pago = pago pendiente +DocType: Contact Us Settings,Address Line 1,Dirección línea 1 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variación -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nombre de Compañía +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nombre de compañía DocType: SMS Center,Total Message(s),Total Mensage(s) -apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Seleccionar elemento de Transferencia +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Seleccione el producto a transferir DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados. -DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista en las transacciones -DocType: Pricing Rule,Max Qty,Cantidad Máxima -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Linea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo +DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar la lista de precios en las transacciones +DocType: Pricing Rule,Max Qty,Cantidad máxima +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químico apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción. -DocType: Process Payroll,Select Payroll Year and Month,Seleccione nómina Año y Mes +DocType: Process Payroll,Select Payroll Year and Month,"Seleccione la nómina, año y mes" apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Ir al grupo apropiado, usualmente (Aplicación de Fondos> Activo Circulante> Cuentas Bancarias) y crear una nueva cuenta haciendo clic en Añadir hijo del tipo ""Banco""" DocType: Workstation,Electricity Cost,Costos de energía electrica -DocType: HR Settings,Don't send Employee Birthday Reminders,En enviar recordatorio de cumpleaños del empleado -DocType: Comment,Unsubscribed,No Suscrito +DocType: HR Settings,Don't send Employee Birthday Reminders,No enviar recordatorio de cumpleaños del empleado +DocType: Comment,Unsubscribed,No suscrito DocType: Opportunity,Walk In,Entrar DocType: Item,Inspection Criteria,Criterios de inspección apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Árbol de centros de costos financieros. @@ -878,15 +883,16 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blan DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas) DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunte su Fotografía +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Crear DocType: Journal Entry,Total Amount in Words,Importe total en letras -DocType: Workflow State,Stop,Detenerse +DocType: Workflow State,Stop,Detener apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste." apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Mi carrito apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo de orden debe ser uno de {0} DocType: Lead,Next Contact Date,Siguiente fecha de contacto -apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de Apertura +apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de apertura DocType: Holiday List,Holiday List Name,Nombre de festividad -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opciones sobre Acciones +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opciones de stock DocType: Journal Entry Account,Expense Claim,Reembolso de gastos apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Cantidad de {0} DocType: Leave Application,Leave Application,Solicitud de ausencia @@ -898,34 +904,34 @@ DocType: Workstation,Net Hour Rate,Tasa neta por hora DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo sobre costos de destino estimados DocType: Company,Default Terms,Términos / Condiciones predeterminados DocType: Packing Slip Item,Packing Slip Item,Lista de embalaje del producto -DocType: POS Profile,Cash/Bank Account,Cuenta de Caja / Banco +DocType: POS Profile,Cash/Bank Account,Cuenta de caja / banco apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor DocType: Delivery Note,Delivery To,Entregar a apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Tabla de atributos es obligatorio -DocType: Production Planning Tool,Get Sales Orders,Recibe Órdenes de Venta +DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes de venta apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Presentación apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descuento -DocType: Features Setup,Purchase Discounts,Descuentos sobre Compra +DocType: Features Setup,Purchase Discounts,Descuento sobre compras DocType: Workstation,Wages,Salario. -DocType: Time Log,Will be updated only if Time Log is 'Billable',Se actualiza sólo si Hora de registro es "facturable" +DocType: Time Log,Will be updated only if Time Log is 'Billable',Se actualizara solo si la gestión de tiempos puede facturarse DocType: Project,Internal,Interno DocType: Task,Urgent,Urgente -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la linea {0} en la tabla {1}" +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la línea {0} en la tabla {1}" DocType: Item,Manufacturer,Fabricante -DocType: Landed Cost Item,Purchase Receipt Item,Recibo de Compra del Artículo +DocType: Landed Cost Item,Purchase Receipt Item,Recibo de compra del producto DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,El almacén reservado en el Pedido de Ventas/Almacén de Productos terminados apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Cantidad de Venta apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Gestión de tiempos -apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de Gastos para este registro. Actualice el 'Estado' y Guarde +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Usted es el supervisor de gastos para este registro. Por favor, actualice el estado y guarde" DocType: Serial No,Creation Document No,Creación del documento No DocType: Issue,Issue,Asunto apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para Elementos variables. por ejemplo, tamaño, color, etc." apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Almacén -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1} +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Número de serie {0} tiene un contrato de mantenimiento hasta {1} DocType: BOM Operation,Operation,Operación -DocType: Lead,Organization Name,Nombre de la Organización -DocType: Tax Rule,Shipping State,Estado del envío +DocType: Lead,Organization Name,Nombre de la organización +DocType: Tax Rule,Shipping State,Estado de envío apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra' apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,GASTOS DE VENTA apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra estándar @@ -933,11 +939,11 @@ DocType: GL Entry,Against,Contra DocType: Item,Default Selling Cost Center,Centro de costos por defecto DocType: Sales Partner,Implementation Partner,Socio de implementación DocType: Opportunity,Contact Info,Información de contacto -apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Hacer comentarios Imagenes -DocType: Packing Slip,Net Weight UOM,Unidad de Medida Peso Neto +apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Crear asientos de stock +DocType: Packing Slip,Net Weight UOM,Unidad de medida de peso neto DocType: Item,Default Supplier,Proveedor predeterminado DocType: Manufacturing Settings,Over Production Allowance Percentage,Porcentaje permitido de sobre-producción -DocType: Shipping Rule Condition,Shipping Rule Condition,Regla Condición inicial +DocType: Shipping Rule Condition,Shipping Rule Condition,Regla de envío DocType: Features Setup,Miscelleneous,Varios DocType: Holiday List,Get Weekly Off Dates,Obtener cierre de semana apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,la fecha final no puede ser inferior a fecha de Inicio @@ -947,20 +953,21 @@ apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Co apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Para {0} | {1} {2} DocType: Time Log Batch,updated via Time Logs,actualizada a través de la gestión de tiempos apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio -DocType: Opportunity,Your sales person who will contact the customer in future,Indique la persona de ventas que se pondrá en contacto con el cliente posteriormente +DocType: Opportunity,Your sales person who will contact the customer in future,Indique la persona de ventas que se pondrá en contacto posteriormente con el cliente apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos. DocType: Company,Default Currency,Divisa / modena predeterminada DocType: Contact,Enter designation of this Contact,Introduzca el puesto de este contacto -DocType: Contact Us Settings,Address,Direcciones +DocType: Contact Us Settings,Address,Dirección DocType: Expense Claim,From Employee,Desde Empleado apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero -DocType: Journal Entry,Make Difference Entry,Hacer Entrada de Diferencia -DocType: Upload Attendance,Attendance From Date,Asistencia De Fecha +DocType: Journal Entry,Make Difference Entry,Crear una entrada con una diferencia +DocType: Upload Attendance,Attendance From Date,Asistencia desde fecha DocType: Appraisal Template Goal,Key Performance Area,Área Clave de Rendimiento apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transporte +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,y año: DocType: Email Digest,Annual Expense,Gasto anual DocType: SMS Center,Total Characters,Total Caracteres -apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}" +apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, seleccione la lista de materiales (LdM) para el producto {0}" DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalle C -Form Factura DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura para reconciliación de pago apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Margen % @@ -972,19 +979,19 @@ DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Reglas de envio apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas ,Ordered Items To Be Billed,Ordenes por facturar apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tiene que ser menor que en nuestra gama -apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Seleccione la gestión de tiempos y validar para crear una nueva factura de ventas. +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Seleccione la gestión de tiempos y valide para crear una nueva factura de ventas. DocType: Global Defaults,Global Defaults,Predeterminados globales DocType: Salary Slip,Deductions,Deducciones -DocType: Purchase Invoice,Start date of current invoice's period,Fecha del período de facturación actual Inicie -apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Este Grupo de Horas Registradas se ha facturado. -apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Crear Oportunidad -DocType: Salary Slip,Leave Without Pay,Ausencia sin salario +DocType: Purchase Invoice,Start date of current invoice's period,Fecha inicial del período de facturación +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Este lote de gestión de tiempos ha sido facturado. +apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Crear oportunidad +DocType: Salary Slip,Leave Without Pay,Licencia sin goce de salario (LSS) DocType: Supplier,Communications,Comunicaciones apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Error en la planificación de capacidad -,Trial Balance for Party,Balance de comprobación de socios +,Trial Balance for Party,Balance de terceros DocType: Lead,Consultant,Consultor DocType: Salary Slip,Earnings,Ganancias -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para la fabricación +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para el tipo de producción apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Apertura de saldos contables DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada que solicitar @@ -994,13 +1001,13 @@ apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets, apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Fundición de precisión apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Se requiere cuenta de débito o crédito para {0} DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al código del producto y la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", entonces el código de artículo de la variante será ""CAMISETA-SM""" -DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina. +DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina salarial. apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Activo apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Azul DocType: Purchase Invoice,Is Return,Es un retorno -DocType: Price List Country,Price List Country,Precio de lista País +DocType: Price List Country,Price List Country,Lista de precios del país apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Sólo se pueden crear más nodos bajo nodos de tipo ' Grupo ' -DocType: Item,UOMs,Unidades de Medida +DocType: Item,UOMs,Unidades de medida apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} No. de serie válidos para el producto {1} apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El código del producto no se puede cambiar por un número de serie apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},Perfil de POS {0} ya esta creado para el usuario: {1} en la compañía {2} @@ -1008,22 +1015,22 @@ DocType: Purchase Order Item,UOM Conversion Factor,Factor de Conversión de Unid DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabricación de objetos laminados apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de datos de proveedores. -DocType: Account,Balance Sheet,Hoja de Balance +DocType: Account,Balance Sheet,Hoja de balance apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro de costos para el producto con código ' -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Formando Stretch +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch forming DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,El vendedor recibirá un aviso con esta fecha para ponerse en contacto con el cliente apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas." apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuestos y otras deducciones salariales. -DocType: Lead,Lead,Iniciativas -DocType: Email Digest,Payables,Cuentas por Pagar +DocType: Lead,Lead,Iniciativa +DocType: Email Digest,Payables,Cuentas por pagar DocType: Account,Warehouse,Almacén -apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno -,Purchase Order Items To Be Billed,Ordenes de Compra por Facturar +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Línea # {0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras' +,Purchase Order Items To Be Billed,Ordenes de compra por facturar DocType: Purchase Invoice Item,Net Rate,Precio neto -DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo +DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de compra del producto apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Elemento 1 -DocType: Holiday,Holiday,Feriado +DocType: Holiday,Holiday,Vacaciones DocType: Event,Saturday,Sábado DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las sucursales ,Daily Time Log Summary,Resumen de registros diarios @@ -1032,23 +1039,23 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos n DocType: Global Defaults,Current Fiscal Year,Año Fiscal actual DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo DocType: Lead,Call,Llamada -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Entradas' no puede estar vacío -apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar linea {0} con igual {1} -,Trial Balance,Balanza de Comprobación -apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Configuración de Empleados +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,Las entradas no pueden estar vacías +apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar línea {0} con igual {1} +,Trial Balance,Balanza de comprobación +apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Configuración de empleados sites/assets/js/erpnext.min.js +5,"Grid ""","Matriz """ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Por favor, seleccione primero el prefijo" apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Investigación DocType: Maintenance Visit Purpose,Work Done,Trabajo Realizado -apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Por favor, especifique al menos un atributo en la tabla de atributos" +apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Por favor, especifique al menos un atributo en la tabla" DocType: Contact,User ID,ID de usuario DocType: Communication,Sent,Enviado apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Mostrar libro mayor DocType: File,Lft,Izquierda- apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos" -DocType: Communication,Delivery Status,Estado del Envío -DocType: Production Order,Manufacture against Sales Order,Fabricación para el pedido de ventas +DocType: Communication,Delivery Status,Estado del envío +DocType: Production Order,Manufacture against Sales Order,Manufacturar para pedido de ventas apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resto del mundo apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes ,Budget Variance Report,Variación de Presupuesto @@ -1056,12 +1063,12 @@ DocType: Salary Slip,Gross Pay,Pago bruto apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,DIVIDENDOS PAGADOS DocType: Stock Reconciliation,Difference Amount,Diferencia apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,UTILIDADES RETENIDAS -DocType: BOM Item,Item Description,Descripción del Artículo +DocType: BOM Item,Item Description,Descripción del producto DocType: Payment Tool,Payment Mode,Método de pago DocType: Purchase Invoice,Is Recurring,Es recurrente apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,De metal sinterizado por láser directo DocType: Purchase Order,Supplied Items,Artículos suministrados -DocType: Production Order,Qty To Manufacture,Cantidad Para Fabricación +DocType: Production Order,Qty To Manufacture,Cantidad para producción DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantener los mismos precios durante el ciclo de compras DocType: Opportunity Item,Opportunity Item,Oportunidad Artículo apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,APERTURA TEMPORAL @@ -1069,20 +1076,20 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryoroll ,Employee Leave Balance,Balance de ausencias de empleado apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1} DocType: Address,Address Type,Tipo de dirección -DocType: Purchase Receipt,Rejected Warehouse,Almacén Rechazado +DocType: Purchase Receipt,Rejected Warehouse,Almacén rechazado DocType: GL Entry,Against Voucher,Contra comprobante DocType: Item,Default Buying Cost Center,Centro de costos (compra) por defecto apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,El producto {0} debe ser un producto para la venta DocType: Item,Lead Time in days,Plazo de ejecución en días -,Accounts Payable Summary,Balance de Cuentas por Pagar +,Accounts Payable Summary,Balance de cuentas por pagar apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0} DocType: Journal Entry,Get Outstanding Invoices,Obtener facturas pendientes de pago -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de Venta {0} no es válida -apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar" +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de venta {0} no es válida +apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar" apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Pequeño -DocType: Employee,Employee Number,Número del Empleado -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0} -,Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive ) +DocType: Employee,Employee Number,Número de empleado +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},El numero de caso ya se encuentra en uso. Intente {0} +,Invoiced Amount (Exculsive Tax),Cantidad facturada (Impuesto excluido) apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Elemento 2 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Cuenta matriz {0} creada apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde @@ -1092,22 +1099,22 @@ DocType: Employee,Place of Issue,Lugar de emisión apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato DocType: Report,Disabled,Deshabilitado apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1} -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos Indirectos -apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Linea {0}: La cantidad es obligatoria +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos indirectos +apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Línea {0}: La cantidad es obligatoria apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Los productos o servicios DocType: Mode of Payment,Mode of Payment,Método de pago apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar . -DocType: Journal Entry Account,Purchase Order,Órdenes de Compra +DocType: Journal Entry Account,Purchase Order,Órden de compra DocType: Warehouse,Warehouse Contact Info,Información de contacto del almacén sites/assets/js/form.min.js +190,Name is required,El nombre es necesario DocType: Purchase Invoice,Recurring Type,Tipo de recurrencia -DocType: Address,City/Town,Ciudad/Provincia +DocType: Address,City/Town,Ciudad / Provincia DocType: Email Digest,Annual Income,Ingresos anuales -DocType: Serial No,Serial No Details,Serial No Detalles +DocType: Serial No,Serial No Details,Detalles del numero de serie DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito" -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Nota de Entrega {0} no está validada apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,BIENES DE CAPITAL apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca." @@ -1118,7 +1125,7 @@ DocType: Appraisal Goal,Goal,Meta/Objetivo DocType: Sales Invoice Item,Edit Description,Editar descripción apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio planeada. apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Por proveedor -DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones. +DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Al configurar el tipo de cuenta facilitará la seleccion de la misma en las transacciones DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Divisa por defecto) apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sólo puede haber una Condición de Regla de Envió con valor 0 o valor en blanco para ""To Value""" @@ -1128,14 +1135,14 @@ apps/erpnext/erpnext/config/projects.py +43,Tools,Herramientas DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,El número de la orden de producción es obligatoria para la entrada de productos fabricados en el stock DocType: Purchase Invoice,Total (Company Currency),Total (Divisa por defecto) -apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Número de serie {0} entraron más de una vez -DocType: Journal Entry,Journal Entry,Asientos Contables +apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Número de serie {0} ha sido ingresado mas de una vez +DocType: Journal Entry,Journal Entry,Asiento contable DocType: Workstation,Workstation Name,Nombre de la Estación de Trabajo apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín: apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1} -DocType: Sales Partner,Target Distribution,Distribución Objetivo +DocType: Sales Partner,Target Distribution,Distribución del objetivo sites/assets/js/desk.min.js +7652,Comments,Comentarios -DocType: Salary Slip,Bank Account No.,Número de Cuenta Bancaria +DocType: Salary Slip,Bank Account No.,Número de cuenta bancaria DocType: Naming Series,This is the number of the last created transaction with this prefix,Este es el número de la última transacción creada con este prefijo apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Tasa de Valoración requerido para el punto {0} DocType: Quality Inspection Reading,Reading 8,Lectura 8 @@ -1144,28 +1151,28 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +7 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impuestos y Cargos DocType: BOM Operation,Workstation,Puesto de Trabajo apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware -DocType: Attendance,HR Manager,Gerente de Recursos Humanos -apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor, seleccione una Empresa" -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Permiso con Privilegio +DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH) +apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor, seleccione la compañía" +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Vacaciones DocType: Purchase Invoice,Supplier Invoice Date,Fecha de factura de proveedor apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Necesita habilitar el carito de compras sites/assets/js/form.min.js +212,No Data,No hay datos DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo Plantilla de Evaluación DocType: Salary Slip,Earning,Ingresos -DocType: Payment Tool,Party Account Currency,Divisa de la cuenta del socio +DocType: Payment Tool,Party Account Currency,Divisa de la cuenta de tercero/s ,BOM Browser,Explorar listas de materiales (LdM) DocType: Purchase Taxes and Charges,Add or Deduct,Agregar o deducir DocType: Company,If Yearly Budget Exceeded (for expense account),Si el presupuesto anual excedido (por cuenta de gastos) -apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones coincidentes encontradas entre : +apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones traslapadas entre: apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,El asiento contable {0} ya se encuentra ajustado contra el importe de otro comprobante apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total del Pedido apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3 -apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Usted puede hacer un registro de tiempo sólo contra una orden de producción presentada +apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Usted puede crear una gestión de tiempos para una orden de producción DocType: Maintenance Schedule Item,No of Visits,No. de visitas DocType: File,old_parent,old_parent -apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Boletines para contactos y clientes potenciales. -apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puntos para todas las metas debe ser 100. Es {0} +apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Boletín de noticias para contactos y clientes potenciales. +apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},La suma de puntos para todas las metas debe ser 100. y es {0} apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco. ,Delivered Items To Be Billed,Envios por facturar apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie @@ -1182,42 +1189,43 @@ DocType: Item,Is Service Item,Es un servicio DocType: Activity Cost,Projects,Proyectos apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Por favor, seleccione el año fiscal" apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Desde {0} | {1} {2} -DocType: BOM Operation,Operation Description,Descripción de la Operación +DocType: BOM Operation,Operation Description,Descripción de la operación DocType: Item,Will also apply to variants,También se aplicará a las variantes apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado. DocType: Quotation,Shopping Cart,Carrito de compras apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Promedio diario saliente DocType: Pricing Rule,Campaign,Campaña -apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',"Estado de aprobación debe ser "" Aprobado "" o "" Rechazado """ +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',"El estado de esta solicitud debe ser ""Aprobado"" o ""Rechazado""" DocType: Purchase Invoice,Contact Person,Persona de contacto -apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Fecha prevista de inicio' no puede ser mayor que 'Fecha prevista de finalización' +apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',La fecha prevista de inicio no puede ser mayor que la fecha prevista de finalización DocType: Holiday List,Holidays,Vacaciones -DocType: Sales Order Item,Planned Quantity,Cantidad Planificada -DocType: Purchase Invoice Item,Item Tax Amount,Total de impuestos de los artículos +DocType: Sales Order Item,Planned Quantity,Cantidad planificada +DocType: Purchase Invoice Item,Item Tax Amount,Total impuestos de producto DocType: Item,Maintain Stock,Mantener stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos -apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la linea {0} no puede ser incluido en el precio -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} +apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Máximo: {0} apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de fecha y hora DocType: Email Digest,For Company,Para la empresa apps/erpnext/erpnext/config/support.py +38,Communication log.,Registro de comunicaciones apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Importe de compra -DocType: Sales Invoice,Shipping Address Name,Dirección de envío Nombre +DocType: Sales Invoice,Shipping Address Name,Nombre de dirección de envío apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan de cuentas DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,No puede ser mayor que 100 +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,No puede ser mayor de 100 apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,El producto {0} no es un producto de stock -DocType: Maintenance Visit,Unscheduled,No Programada +DocType: Maintenance Visit,Unscheduled,Sin programación DocType: Employee,Owned,Propiedad -DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de ausencia sin pago -DocType: Pricing Rule,"Higher the number, higher the priority","Mayor es el número, mayor es la prioridad" -,Purchase Invoice Trends,Tendencias de Compras +DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licencia sin goce de salario +DocType: Pricing Rule,"Higher the number, higher the priority","Cuanto mayor sea el número, mayor es la prioridad" +,Purchase Invoice Trends,Tendencias de compras DocType: Employee,Better Prospects,Mejores Prospectos DocType: Appraisal,Goals,Objetivos DocType: Warranty Claim,Warranty / AMC Status,Garantía / AMC Estado ,Accounts Browser,Navegador de Cuentas DocType: GL Entry,GL Entry,Entrada GL -DocType: HR Settings,Employee Settings,Configuración del Empleado +DocType: HR Settings,Employee Settings,Configuración de empleado ,Batch-Wise Balance History,Historial de saldo por lotes apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Tareas por hacer apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz @@ -1227,7 +1235,7 @@ Used for Taxes and Charges","Tabla de detalle de Impuesto descargada de maestro Se utiliza para las tasas y cargos" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,El empleado no puede informar a sí mismo. -DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelada , las entradas se les permite a los usuarios restringidos." +DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelado, las entradas estarán permitidas a los usuarios restringidos." DocType: Email Digest,Bank Balance,Saldo bancario apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},El asiento contable para {0}: {1} sólo puede hacerse con la divisa: {2} DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc" @@ -1240,14 +1248,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging DocType: Bulk Email,Not Sent,No enviado apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Formación explosiva DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total impuestos y cargos (Divisa por defecto) -DocType: Shipping Rule,Shipping Account,cuenta Envíos +DocType: Shipping Rule,Shipping Account,Cuenta de envíos apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar a {0} destinatarios DocType: Quality Inspection,Readings,Lecturas DocType: Stock Entry,Total Additional Costs,Total de Gastos adicionales apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub-Ensamblajes DocType: Shipping Rule Condition,To Value,Para el valor -DocType: Supplier,Stock Manager,Gerente -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Almacén de origen es obligatorio para la linea {0} +DocType: Supplier,Stock Manager,Gerente de almacén +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},El almacén de origen es obligatorio para la línea {0} apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Lista de embalaje apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ALQUILERES DE LOCAL apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configuración de pasarela SMS @@ -1255,13 +1263,14 @@ apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Impor sites/assets/js/erpnext.min.js +24,No address added yet.,No se ha añadido ninguna dirección DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista -apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Linea {0}: La cantidad asignada {1} debe ser menor o igual al importe en comprobante de diario {2} +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Línea {0}: La cantidad asignada {1} debe ser menor o igual al importe en comprobante de diario {2} DocType: Item,Inventory,inventario DocType: Features Setup,"To enable ""Point of Sale"" view",Para habilitar "Punto de Venta" vista +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío DocType: Item,Sales Details,Detalles de Ventas apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fijación DocType: Opportunity,With Items,Con productos -apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Cantidad +apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En cantidad DocType: Notification Control,Expense Claim Rejected,Reembolso de gastos rechazado DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit. ",La fecha en que se generará próxima factura. Se genera en enviar. @@ -1279,33 +1288,33 @@ DocType: Employee External Work History,Total Experience,Experiencia total apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanado apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s) apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE -DocType: Material Request Item,Sales Order No,Orden de Venta No. -DocType: Item Group,Item Group Name,Nombre del grupo de artículos +DocType: Material Request Item,Sales Order No,Orden de venta No. +DocType: Item Group,Item Group Name,Nombre del grupo de productos apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Tomado -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferir materiales para producción DocType: Pricing Rule,For Price List,Por lista de precios -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Búsqueda de Ejecutivos +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Búsqueda de ejecutivos apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra." DocType: Maintenance Schedule,Schedules,Horarios DocType: Purchase Invoice Item,Net Amount,Importe Neto DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No. DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Divisa por defecto) -DocType: Period Closing Voucher,CoA Help,CoA Ayuda +DocType: Period Closing Voucher,CoA Help,Ayuda CoA apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Error: {0} > {1} -apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el Plan General de Contabilidad." +apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el plan general de contabilidad." DocType: Maintenance Visit,Maintenance Visit,Visita de mantenimiento apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Categoría de cliente> Territorio DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Cantidad de lotes disponibles en almacén -DocType: Time Log Batch Detail,Time Log Batch Detail,Detalle de Grupo de Horas Registradas +DocType: Time Log Batch Detail,Time Log Batch Detail,Detalle de gestión de tiempos DocType: Workflow State,Tasks,Tareas DocType: Landed Cost Voucher,Landed Cost Help,Ayuda para costos de destino estimados DocType: Event,Tuesday,Martes -DocType: Leave Block List,Block Holidays on important days.,Bloqueo de vacaciones en días importantes. -,Accounts Receivable Summary,Balance de Cuentas por Cobrar -apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado" -DocType: UOM,UOM Name,Nombre Unidad de Medida +DocType: Leave Block List,Block Holidays on important days.,Bloquear vacaciones en días importantes. +,Accounts Receivable Summary,Balance de cuentas por cobrar +apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, seleccione el ID y el nombre del empleado para establecer el rol." +DocType: UOM,UOM Name,Nombre de la unidad de medida (UdM) DocType: Top Bar Item,Target,Objetivo -apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Contribución Monto +apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Importe de contribución DocType: Sales Invoice,Shipping Address,Dirección de envío DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta herramienta le ayuda a actualizar o corregir la cantidad y la valoración de los valores en el sistema. Normalmente se utiliza para sincronizar los valores del sistema y lo que realmente existe en sus almacenes. DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En palabras serán visibles una vez que se guarda la nota de entrega. @@ -1315,47 +1324,47 @@ DocType: Sales Invoice Item,Brand Name,Marca DocType: Purchase Receipt,Transporter Details,Detalles Transporter apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caja apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organización -DocType: Monthly Distribution,Monthly Distribution,Distribución Mensual -apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores" +DocType: Monthly Distribution,Monthly Distribution,Distribución mensual +apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"La lista de receptores se encuentra vacía. Por favor, cree una lista de receptores" DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de ordenes de venta -DocType: Sales Partner,Sales Partner Target,Objetivos de socio de ventas +DocType: Sales Partner,Sales Partner Target,Metas de socio de ventas apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},El asiento contable para {0} sólo puede hacerse con la divisa: {1} -DocType: Pricing Rule,Pricing Rule,Reglas de Precios +DocType: Pricing Rule,Pricing Rule,Regla de precios apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Muescas apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Requisición de materiales hacia órden de compra -apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3} +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Línea # {0}: El artículo devuelto {1} no existe en {2} {3} apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,BANCOS -,Bank Reconciliation Statement,Extractos Bancarios -DocType: Address,Lead Name,Nombre de la Iniciativa -,POS,POS +,Bank Reconciliation Statement,Estados de conciliación bancarios +DocType: Address,Lead Name,Nombre de la iniciativa +,POS,Punto de venta POS apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Saldo inicial de Stock apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} debe aparecer sólo una vez apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No se permite transferir más {0} de {1} para la órden de compra {2} apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0} apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hay productos para empacar DocType: Shipping Rule Condition,From Value,Desde Valor -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Monto no reflejado en banco DocType: Quality Inspection Reading,Reading 4,Lectura 4 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Peticiones para gastos de compañía apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Fundición centrífuga apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Acabado asistido por campo magnético DocType: Company,Default Holiday List,Lista de vacaciones / festividades predeterminadas -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,INVENTARIOS POR PAGAR +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Inventarios por pagar DocType: Purchase Receipt,Supplier Warehouse,Almacén Proveedor -DocType: Opportunity,Contact Mobile No,No Móvil del Contacto +DocType: Opportunity,Contact Mobile No,No. móvil de contacto DocType: Production Planning Tool,Select Sales Orders,Selección de órdenes de venta -,Material Requests for which Supplier Quotations are not created,La requisición de materiales para este proveedor no ha sido creada +,Material Requests for which Supplier Quotations are not created,La requisición de materiales para la cotizacion/es de proveedor/es no ha sido creada DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo. apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crear una cotización DocType: Dependent Task,Dependent Task,Tarea dependiente -apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la linea {0} debe ser 1 +apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1} DocType: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación. DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños DocType: SMS Center,Receiver List,Lista de receptores -DocType: Payment Tool Detail,Payment Amount,Pago recibido -apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida +DocType: Payment Tool Detail,Payment Amount,Importe pagado +apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Monto consumido sites/assets/js/erpnext.min.js +51,{0} View,{0} Ver DocType: Salary Structure Deduction,Salary Structure Deduction,Estructura Salarial Deducción apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterización selectiva por láser @@ -1364,32 +1373,32 @@ apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Su apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La cantidad no debe ser más de {0} apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Edad (días) -DocType: Quotation Item,Quotation Item,Cotización del artículo +DocType: Quotation Item,Quotation Item,Cotización del producto DocType: Account,Account Name,Nombre de la Cuenta apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta' -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Número de orden {0} {1} cantidad no puede ser una fracción +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,"Número de serie {0}, la cantidad {1} no puede ser una fracción" apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Configuración de las categorías de proveedores. DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Agregar apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} está cancelado o detenido -DocType: Accounts Settings,Credit Controller,Credit Controller +DocType: Accounts Settings,Credit Controller,Controlador de créditos DocType: Delivery Note,Vehicle Dispatch Date,Fecha de despacho de vehículo -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,El recibo de compra {0} no esta validado DocType: Company,Default Payable Account,Cuenta por pagar por defecto -apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc." +apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para las compras online, normas de envío, lista de precios, etc." apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuración completa apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturado apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Cant. Reservada DocType: Party Account,Party Account,Cuenta asignada -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos -DocType: Lead,Upper Income,Ingresos Superior +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos humanos +DocType: Lead,Upper Income,Ingresos superior DocType: Journal Entry Account,Debit in Company Currency,Divisa por defecto de la cuenta de débito apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mis asuntos DocType: BOM Item,BOM Item,Lista de materiales (LdM) del producto DocType: Appraisal,For Employee,Por empleados DocType: Company,Default Values,Valores predeterminados -apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Linea {0}: El importe pagado no puede ser negativo +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Línea {0}: El importe pagado no puede ser negativo DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press apropiado apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1} @@ -1399,78 +1408,79 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isos DocType: ToDo,Medium,Medio DocType: Budget Detail,Budget Allocated,Presupuesto asignado DocType: Journal Entry,Entry Type,Tipo de entrada -,Customer Credit Balance,Saldo de Clientes +,Customer Credit Balance,Saldo de clientes apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Por favor, verifique su Email de identificación" -apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento ' +apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Se requiere un cliente para el descuento apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros. DocType: Quotation,Term Details,Detalles de términos y condiciones DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de capacidad para (Días) apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias. DocType: Warranty Claim,Warranty Claim,Reclamación de garantía -,Lead Details,Iniciativas +,Lead Details,Detalle de Iniciativa DocType: Authorization Rule,Approving User,Aprobar Usuario apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjando apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Enchapado DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual DocType: Pricing Rule,Applicable For,Aplicable para DocType: Bank Reconciliation,From Date,Desde la fecha -DocType: Shipping Rule Country,Shipping Rule Country,Regla País de envío -DocType: Maintenance Visit,Partially Completed,Parcialmente Completado +DocType: Shipping Rule Country,Shipping Rule Country,Regla de envio del país +DocType: Maintenance Visit,Partially Completed,Parcialmente completado DocType: Leave Type,Include holidays within leaves as leaves,Incluir las vacaciones y ausencias únicamente como ausencias DocType: Sales Invoice,Packed Items,Productos Empacados apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Reclamación de garantía por numero de serie DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Reemplazar una Solicitud de Materiales en particular en todas las demás Solicitudes de Materiales donde se utiliza. Sustituirá el antiguo enlace a la Solicitud de Materiales, actualizara el costo y regenerar una tabla para la nueva Solicitud de Materiales" DocType: Shopping Cart Settings,Enable Shopping Cart,Habilitar carrito de compras -DocType: Employee,Permanent Address,Dirección Permanente +DocType: Employee,Permanent Address,Dirección permanente apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,El producto {0} debe ser un servicio apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \ than Grand Total {2}",El anticipo pagado para {0} {1} no puede ser mayor que el total {2} apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Por favor, seleccione el código del producto" -DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducir Deducción por Licencia sin Sueldo ( LWP ) +DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducir deducción por licencia sin goce de salario (LSS) DocType: Territory,Territory Manager,Gerente de Territorio DocType: Sales Invoice,Paid Amount (Company Currency),Monto pagado (Divisa por defecto) DocType: Purchase Invoice,Additional Discount,Descuento adicional DocType: Selling Settings,Selling Settings,Configuración de Ventas -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Subastas en Línea +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Subastas en línea apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos" apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compañía, mes y año fiscal son obligatorios" apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,GASTOS DE PUBLICIDAD -,Item Shortage Report,Reportar carencia de producto +,Item Shortage Report,Reporte de productos con stock bajo apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también" DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Requisición de materiales usados para crear este movimiento de inventario -apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Números de serie únicos para cada producto -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado ' +apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Elemento de producto +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',la gestión de tiempos {0} debe estar validada DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crear un asiento contable para cada movimiento de stock -DocType: Leave Allocation,Total Leaves Allocated,Total Vacaciones Asignadas +DocType: Leave Allocation,Total Leaves Allocated,Total de ausencias asigandas apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Almacén requerido en la fila n {0} DocType: Employee,Date Of Retirement,Fecha de jubilación -DocType: Upload Attendance,Get Template,Verificar Plantilla +DocType: Upload Attendance,Get Template,Obtener plantilla DocType: Address,Postal,Postal -DocType: Item,Weightage,Coeficiente de Ponderación +DocType: Item,Weightage,Coeficiente de ponderación apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minería apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Por favor, seleccione primero {0}." apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0} -DocType: Territory,Parent Territory,Territorio Principal +DocType: Territory,Parent Territory,Territorio principal DocType: Quality Inspection Reading,Reading 2,Lectura 2 -DocType: Stock Entry,Material Receipt,Recepción de Materiales +DocType: Stock Entry,Material Receipt,Recepción de materiales apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Productos -apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},El tipo de entidad es requerida para las cuentas de Cobrar/Pagar {0} -DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc." +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},El tipo de entidad y tercero/s son requeridos para las cuentas de cobrar/pagar {0} +DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este producto tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc." DocType: Lead,Next Contact By,Siguiente contacto por -apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la linea {1} +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la línea {1} apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1} DocType: Quotation,Order Type,Tipo de orden DocType: Purchase Invoice,Notification Email Address,Email para las notificaciones. DocType: Payment Tool,Find Invoices to Match,Facturas a conciliar -,Item-wise Sales Register,Detalle de Ventas +,Item-wise Sales Register,Detalle de ventas apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","por ejemplo ""Banco Nacional XYZ""" DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este impuesto en el precio base? -apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Totales del Objetivo +apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Total del objetivo apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Carrito de compras habilitado DocType: Job Applicant,Applicant for a Job,Solicitante de Empleo apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,No existen órdenes de producción (OP) -apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Planilla de empleado {0} ya creado para este mes +apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,la nómina salarial para el empleado {0} ya se ha creado para este mes DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo. DocType: Sales Invoice Item,Batch No,Lote No. @@ -1478,16 +1488,16 @@ DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purch apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal DocType: DocPerm,Delete,Eliminar apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante -sites/assets/js/desk.min.js +7971,New {0},Nuevo {0} -DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de sus transacciones +sites/assets/js/desk.min.js +7971,New {0},Nuevo/a: {0} +DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar. apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla DocType: Employee,Leave Encashed?,Vacaciones pagadas? -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'oportunidad desde' es obligatorio DocType: Item,Variants,Variantes apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Crear órden de Compra DocType: SMS Center,Send To,Enviar a -apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0} +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0} DocType: Sales Team,Contribution to Net Total,Contribución neta total DocType: Sales Invoice Item,Customer's Item Code,Código del producto para clientes DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de Inventario @@ -1508,11 +1518,11 @@ DocType: Packing Slip,The net weight of this package. (calculated automatically DocType: Stock Reconciliation Item,Leave blank if no change,Dejar en blanco si no hay cambio DocType: Sales Order,To Deliver and Bill,Para Entregar y Bill DocType: GL Entry,Credit Amount in Account Currency,Importe acreditado con la divisa -apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Gestión de tiempos para fabricación. +apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Gestión de tiempos para la producción. DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar nivel de reabastecimiento para el almacen apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada DocType: Authorization Control,Authorization Control,Control de Autorización -apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Registro de Tiempo para las Tareas. +apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Gestión de tiempos para las tareas. apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Pago DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo actual apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Máxima requisición de materiales {0} es posible para el producto {1} en las órdenes de venta {2} @@ -1531,41 +1541,41 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have ent apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valor {0} para el atributo {1} no existe en la lista de artículo válida Atributo Valores apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Asociado apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,El producto {0} no es un producto serializado -DocType: SMS Center,Create Receiver List,Crear Lista de Receptores +DocType: SMS Center,Create Receiver List,Crear lista de receptores apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado DocType: Packing Slip,To Package No.,Al paquete No. DocType: DocType,System,Sistema -DocType: Warranty Claim,Issue Date,Fecha de Emisión +DocType: Warranty Claim,Issue Date,Fecha de emisión DocType: Activity Cost,Activity Cost,Costo de Actividad -DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad Consumida +DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad consumida apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicaciones DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores) DocType: Payment Tool,Make Payment Entry,Registrar pago -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1} -,Sales Invoice Trends,Tendencias de Ventas +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},La cantidad del producto {0} debe ser menor que {1} +,Sales Invoice Trends,Tendencias de ventas DocType: Leave Application,Apply / Approve Leaves,Aplicar/Aprobar vacaciones -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Puede referirse a la linea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'" +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Puede referirse a la línea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'" DocType: Sales Order Item,Delivery Warehouse,Almacén de entrega -DocType: Stock Settings,Allowance Percent,Porcentaje de Asignación +DocType: Stock Settings,Allowance Percent,Porcentaje de reserva DocType: SMS Settings,Message Parameter,Parámetro del mensaje -DocType: Serial No,Delivery Document No,Entrega del documento No -DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener los elementos desde Recibos de Compra -DocType: Serial No,Creation Date,Fecha de Creación +DocType: Serial No,Delivery Document No,Documento de entrega No. +DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener elementos desde los 'recibos de compra' +DocType: Serial No,Creation Date,Fecha de creación apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},El producto {0} aparece varias veces en el Listado de Precios {1} apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Ventas debe ser seleccionado, si se selecciona Aplicable Para como {0}" -DocType: Purchase Order Item,Supplier Quotation Item,Articulo de la Cotización del Proveedor -apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Hacer Estructura Salarial -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Cizallamiento +DocType: Purchase Order Item,Supplier Quotation Item,Producto de la cotización del proveedor +apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Crear estructura salarial +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Esquilar DocType: Item,Has Variants,Posee variantes apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Clic en el botón ""Crear factura de venta"" para crearla." apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Las fechas 'Desde Periodo y Hasta Periodo' son obligatorias para porcentajes recurrentes apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Empacado y etiquetado -DocType: Monthly Distribution,Name of the Monthly Distribution,Nombre de la Distribución Mensual -DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas +DocType: Monthly Distribution,Name of the Monthly Distribution,Defina el nombre de la distribución mensual +DocType: Sales Person,Parent Sales Person,Persona encargada de ventas apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifíque la divisa por defecto en la compañía principal y los valores predeterminados globales" -DocType: Dropbox Backup,Dropbox Access Secret,Acceso Secreto de Dropbox -DocType: Purchase Invoice,Recurring Invoice,Factura Recurrente -apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Gestión de Proyectos +DocType: Dropbox Backup,Dropbox Access Secret,Acceso Secreto a Dropbox +DocType: Purchase Invoice,Recurring Invoice,Factura recurrente +apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Gestión de proyectos DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios. DocType: Budget Detail,Fiscal Year,Año fiscal DocType: Cost Center,Budget,Presupuesto @@ -1573,25 +1583,25 @@ apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget can apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Alcanzado apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localidad / Cliente apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,por ejemplo 5 -apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Linea {0}: la cantidad asignada {1} debe ser menor o igual al importe pendiente de factura {2} +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Línea {0}: la cantidad asignada {1} debe ser menor o igual al importe pendiente de factura {2} DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En palabras serán visibles una vez que guarde la factura de venta. DocType: Item,Is Sales Item,Es un producto para venta apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de productos apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro" -DocType: Maintenance Visit,Maintenance Time,Tiempo de Mantenimiento +DocType: Maintenance Visit,Maintenance Time,Tiempo del mantenimiento ,Amount to Deliver,Cantidad para envío apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un Producto o Servicio apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Hubo errores . apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping DocType: Naming Series,Current Value,Valor actual apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creado -DocType: Delivery Note Item,Against Sales Order,Contra la Orden de Venta -,Serial No Status,Número de orden Estado -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tabla de artículos no puede estar en blanco +DocType: Delivery Note Item,Against Sales Order,Contra la orden de venta +,Serial No Status,Estado del número serie +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,La tabla de productos no puede estar en blanco apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \ must be greater than or equal to {2}","Fila {0}: Para establecer periodo {1}, la diferencia de tiempo debe ser mayor o igual a {2}" -DocType: Pricing Rule,Selling,VENTAS -DocType: Employee,Salary Information,Información salarial +DocType: Pricing Rule,Selling,Ventas +DocType: Employee,Salary Information,Información salarial. DocType: Sales Person,Name and Employee ID,Nombre y ID de empleado apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web @@ -1599,66 +1609,67 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Por favor, introduzca la fecha de referencia" apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1} DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web -DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad +DocType: Purchase Order Item Supplied,Supplied Qty,Cant. Suministrada DocType: Material Request Item,Material Request Item,Requisición de materiales del producto apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árbol de las categorías de producto -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una linea mayor o igual al numero de linea actual. +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una línea mayor o igual al numero de línea actual. ,Item-wise Purchase History,Historial de Compras apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rojo apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}" -DocType: Account,Frozen,Congelado +DocType: Account,Frozen,Congelado(a) ,Open Production Orders,Ordenes de producción abiertas DocType: Installation Note,Installation Time,Tiempo de instalación DocType: Sales Invoice,Accounting Details,Detalles de contabilidad apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta compañía -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila # {0}: Operación {1} no se ha completado para {2} cantidad de productos terminados en orden de producción # {3}. Por favor, actualice el estado de funcionamiento a través de la gestión de tiempos" +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Línea # {0}: La operación {1} no se ha completado para la cantidad: {2} de productos terminados en orden de producción # {3}. Por favor, actualice el estado de la operación a través de la gestión de tiempos" apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,INVERSIONES DocType: Issue,Resolution Details,Detalles de la resolución apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Cambie la unidad de medida (UdM) para el producto. DocType: Quality Inspection Reading,Acceptance Criteria,Criterios de Aceptación DocType: Item Attribute,Attribute Name,Nombre del Atributo apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},El producto {0} debe ser un servicio o producto para la venta {1} -DocType: Item Group,Show In Website,Mostrar En Sitio Web +DocType: Item Group,Show In Website,Mostrar en el sitio Web apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo DocType: Task,Expected Time (in hours),Tiempo previsto (en horas) -,Qty to Order,Cantidad a Solicitar +,Qty to Order,Cantidad a solicitar DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Para realizar el seguimiento de marca en el siguiente documentación Nota de entrega, Oportunidad, solicitud de materiales, de artículos, de órdenes de compra, compra vale, Recibo Comprador, la cita, la factura de venta, producto Bundle, órdenes de venta, de serie" -apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Diagrama de Gantt de todas las tareas . +apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Diagrama Gantt de todas las tareas. DocType: Appraisal,For Employee Name,Por nombre de empleado DocType: Holiday List,Clear Table,Borrar tabla DocType: Features Setup,Brands,Marcas -DocType: C-Form Invoice Detail,Invoice No,Factura No +DocType: C-Form Invoice Detail,Invoice No,Factura No. apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Desde órden de compra DocType: Activity Cost,Costing Rate,Costo calculado -DocType: Employee,Resignation Letter Date,Fecha de renuncia +,Customer Addresses And Contacts,Las direcciones de clientes y contactos +DocType: Employee,Resignation Letter Date,Fecha de carta de renuncia apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad. -apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No Especificado +apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No especificado DocType: Communication,Date,Fecha apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ingresos de clientes recurrentes -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Tome asiento mientras el sistema está siendo configurado. Esto puede tomar unos minutos +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Tome asiento mientras el sistema está siendo configurado. Esto puede tomar unos minutos. apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener la función de 'Supervisor de Gastos' apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta DocType: Maintenance Schedule Detail,Actual Date,Fecha Real DocType: Item,Has Batch No,Posee No. de lote DocType: Delivery Note,Excise Page Number,Número Impuestos Especiales Página -DocType: Employee,Personal Details,Datos Personales -,Maintenance Schedules,Programas de Mantenimiento +DocType: Employee,Personal Details,Datos personales +,Maintenance Schedules,Programas de mantenimiento apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Troquelado -,Quotation Trends,Tendencias de Cotización +,Quotation Trends,Tendencias de cotizaciones apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0} -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario." -DocType: Shipping Rule Condition,Shipping Amount,Importe del envío +DocType: Shipping Rule Condition,Shipping Amount,Monto de envío apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unión DocType: Authorization Rule,Above Value,Valor Superior -,Pending Amount,Monto Pendiente +,Pending Amount,Monto pendiente DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Enviado -apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuración del servidor de correo entrante para los trabajos de identificación del email . (por ejemplo jobs@example.com ) +apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuración del servidor de correo entrante corporativo. (por ejemplo jobs@example.com ) DocType: Purchase Receipt,Vehicle Number,Número de vehículos DocType: Purchase Invoice,The date on which recurring invoice will be stop,La fecha en que se detiene la factura recurrente -DocType: Journal Entry,Accounts Receivable,CUENTAS POR COBRAR +DocType: Journal Entry,Accounts Receivable,Cuentas por cobrar ,Supplier-Wise Sales Analytics,Análisis de Ventas (Proveedores) DocType: Address Template,This format is used if country specific format is not found,Este formato se utiliza si no se encuentra un formato específico del país DocType: Custom Field,Custom,Personalizar @@ -1669,15 +1680,15 @@ apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árbol de DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados ​​en apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo -DocType: HR Settings,HR Settings,Configuración de Recursos Humanos -apps/frappe/frappe/config/setup.py +130,Printing,Impresión -apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos está pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado. +DocType: HR Settings,HR Settings,Configuración de recursos humanos +apps/frappe/frappe/config/setup.py +130,Printing,Imprimiendo +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos estará pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado. DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,El día (s) sobre el cual está solicitando la licencia son vacaciones. Usted no tiene que solicitar la licencia . sites/assets/js/desk.min.js +7805,and,y DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,deportes +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Deportes apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unidad apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Por favor, establezca las llaves de acceso de Dropbox en la configuración de su sistema" @@ -1689,89 +1700,90 @@ DocType: POS Profile,Price List,Lista de precios apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} es ahora el año fiscal predeterminado. Por favor, actualice su navegador para que el cambio surta efecto." apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Reembolsos de gastos DocType: Issue,Support,Soporte -DocType: Authorization Rule,Approving Role,Aprobar Rol +DocType: Authorization Rule,Approving Role,Rol de aprobaciones ,BOM Search,Buscar listas de materiales (LdM) apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Cierre (Apertura + Totales) apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique la divisa en la compañía" -DocType: Workstation,Wages per hour,Salarios por Hora +DocType: Workstation,Wages per hour,Salarios por hora apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Balance de Inventario en Lote {0} se convertirá en negativa {1} para la partida {2} en Almacén {3} -apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Disimular las características como de serie n , POS , etc" +apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Ocultar las características como No. de series, POS, etc" apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. la divisa debe ser {1} -apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la linea {0} -apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},"La fecha de liquidación no puede ser inferior a la fecha de verificación, linea {0}" +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la línea {0} +apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},"La fecha de liquidación no puede ser inferior a la fecha de verificación, línea {0}" DocType: Salary Slip,Deduction,Deducción DocType: Address Template,Address Template,Plantillas de direcciones apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Por favor, Introduzca ID de empleado para este vendedor" -DocType: Territory,Classification of Customers by region,Clasificación de los clientes por región +DocType: Territory,Classification of Customers by region,Clasificación de clientes por región DocType: Project,% Tasks Completed,% Tareas Completadas DocType: Project,Gross Margin,Margen bruto apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar" apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,usuario deshabilitado DocType: Opportunity,Quotation,Cotización DocType: Salary Slip,Total Deduction,Deducción Total -DocType: Quotation,Maintenance User,Mantenimiento por el Usuario -apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Costo Actualizado +DocType: Quotation,Maintenance User,Mantenimiento por usuario +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Costo actualizado apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Esta seguro que desea CONTINUAR DocType: Employee,Date of Birth,Fecha de nacimiento apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,El producto {0} ya ha sido devuelto DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran aquí. -DocType: Opportunity,Customer / Lead Address,Cliente / Dirección de Oportunidad +DocType: Opportunity,Customer / Lead Address,Dirección de cliente / oportunidad DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario) DocType: Purchase Taxes and Charges,Deduct,Deducir apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descripción del trabajo -DocType: Purchase Order Item,Qty as per Stock UOM,Cantidad de acuerdo a la Unidad de Medida del Inventario +DocType: Purchase Order Item,Qty as per Stock UOM,Cantidad de acuerdo a la unidad de medida (UdM) de stock apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Por favor, seleccione un archivo csv con datos válidos" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestimiento -apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en el nombramiento de serie" +apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",Caracteres especiales excepto '-' '.' '#' y '/' no permitido en las secuencias e identificadores DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión. " DocType: Expense Claim,Approver,Supervisor -,SO Qty,SO Cantidad +,SO Qty,Cant. OV apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén de {0}, por lo tanto, no se puede volver a asignar o modificar Almacén" -DocType: Appraisal,Calculate Total Score,Calcular Puntaje Total -DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufactura -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1} -apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de entrega en paquetes . -apps/erpnext/erpnext/hooks.py +84,Shipments,Los envíos +DocType: Appraisal,Calculate Total Score,Calcular puntaje total +DocType: Supplier Quotation,Manufacturing Manager,Gerente de producción +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1} +apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes. +apps/erpnext/erpnext/hooks.py +84,Shipments,Envíos apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldeo por inmersión -apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,El Estado del Registro de Horas tiene que ser 'Enviado'. -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Número de serie {0} no pertenece a ningún almacén +apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,La gestión de tiempos debe estar validada +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,El número de serie {0} no pertenece a ningún almacén apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuración +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Línea # DocType: Purchase Invoice,In Words (Company Currency),En palabras (Divisa por defecto) -DocType: Pricing Rule,Supplier,Proveedores +DocType: Pricing Rule,Supplier,Proveedor DocType: C-Form,Quarter,Trimestre apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,GASTOS VARIOS DocType: Global Defaults,Default Company,Compañía predeterminada apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de Gastos o Diferencia es obligatorio para el elemento {0} , ya que impacta el valor del stock" -apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la linea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock" -DocType: Employee,Bank Name,Nombre del Banco -apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Mayor +apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la línea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock" +DocType: Employee,Bank Name,Nombre del banco +apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Mas apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,El usuario {0} está deshabilitado -DocType: Leave Application,Total Leave Days,Total Vacaciones +DocType: Leave Application,Total Leave Days,Días totales de ausencia DocType: Journal Entry Account,Credit in Account Currency,Divisa de la cuenta de credito DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correo electrónico no se enviará a los usuarios deshabilitados apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Seleccione la compañía... -DocType: Leave Control Panel,Leave blank if considered for all departments,Dejar en blanco si se considera para todos los departamentos +DocType: Leave Control Panel,Leave blank if considered for all departments,Deje en blanco si se utilizará para todos los departamentos apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante, etc) ." apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1} -DocType: Currency Exchange,From Currency,Desde Moneda +DocType: Currency Exchange,From Currency,Desde moneda DocType: DocField,Name,Nombre apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila" -apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Orden de Venta requerida para el punto {0} +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Orden de venta requerida para el producto {0} apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Monto no reflejado en el sistema DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Divisa por defecto) apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Otros -apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Establecer como Stopped +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Establecer como detenido DocType: POS Profile,Taxes and Charges,Impuestos y cargos DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producto o un servicio que se compra, se vende o se mantiene en stock." -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe de linea anterior' o ' Total de linea anterior' para la primera linea +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe de línea anterior' o ' Total de línea anterior' para la primera linea apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Completado -DocType: Web Form,Select DocType,Seleccione tipo de documento +DocType: Web Form,Select DocType,Seleccione un 'DocType' apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochado apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas" -apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nuevo Centro de Costo -DocType: Bin,Ordered Quantity,Cantidad Pedida +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nuevo centro de costos +DocType: Bin,Ordered Quantity,Cantidad ordenada apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores' DocType: Quality Inspection,In Process,En proceso DocType: Authorization Rule,Itemwise Discount,Descuento de producto @@ -1780,12 +1792,12 @@ DocType: Account,Fixed Asset,Activo Fijo apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Inventario Serializado DocType: Activity Type,Default Billing Rate,Monto de facturación predeterminada DocType: Time Log Batch,Total Billing Amount,Monto total de facturación -apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Cuenta por Cobrar +apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Cuenta por cobrar ,Stock Balance,Balance de Inventarios -apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Órdenes de venta al Pago +apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Órdenes de venta a pagar DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Gestión de tiempos creados: -DocType: Item,Weight UOM,Peso unidad de medida +DocType: Item,Weight UOM,Unidad de medida (UdM) DocType: Employee,Blood Group,Grupo sanguíneo DocType: Purchase Invoice Item,Page Break,Salto de página DocType: Production Order Operation,Pending,Pendiente @@ -1797,147 +1809,150 @@ DocType: Fiscal Year,Companies,Compañías apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electrónicos DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Generar requisición de materiales cuando se alcance un nivel bajo el stock apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Desde programa de mantenimiento -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Jornada Completa -DocType: Purchase Invoice,Contact Details,Datos del Contacto -DocType: C-Form,Received Date,Fecha de Recepción +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Jornada completa +DocType: Purchase Invoice,Contact Details,Detalles de contacto +DocType: C-Form,Received Date,Fecha de recepción DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si ha creado una plantilla estándar de los impuestos y cargos de venta, seleccione uno y haga clic en el botón de abajo." -apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique un país de esta Regla del envío o del check Envío mundial" +apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique un país para esta regla de envió o verifique los precios para envíos mundiales" DocType: Stock Entry,Total Incoming Value,Valor total de entradas -apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de Precios para las compras +apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de precios para las compras DocType: Offer Letter Term,Offer Term,Términos de la oferta -DocType: Quality Inspection,Quality Manager,Gerente de Calidad +DocType: Quality Inspection,Quality Manager,Gerente de calidad DocType: Job Applicant,Job Opening,Oportunidad de empleo DocType: Payment Reconciliation,Payment Reconciliation,Conciliación de pagos apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tecnología -DocType: Offer Letter,Offer Letter,Carta De Oferta +DocType: Offer Letter,Offer Letter,Carta de oferta apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generar requisición de materiales (MRP) y órdenes de producción. -apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total Monto Facturado +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Monto total facturado DocType: Time Log,To Time,Para Tiempo apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Para agregar registros secundarios , explorar el árbol y haga clic en el registro en el que desea agregar más registros." -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,La cuenta de crédito debe pertenecer al grupo de cuentas por pagar apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2} -DocType: Production Order Operation,Completed Qty,Cant. Completada +DocType: Production Order Operation,Completed Qty,Cantidad completada apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito" apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,La lista de precios {0} está deshabilitada DocType: Manufacturing Settings,Allow Overtime,Permitir horas extraordinarias -apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Orden de Venta {0} esta detenida +apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Orden de venta {0} esta detenida apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Números de serie necesarios para el producto {1}. Usted ha proporcionado {2}. DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual DocType: Item,Customer Item Codes,Código del producto asignado por el cliente DocType: Opportunity,Lost Reason,Razón de la pérdida apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entradas de pago para las órdenes o facturas. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura -apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Se requiere Unidad de Medida para Nuevo Inventario +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Se requiere nueva unidad de medida (UdM) para el inventario DocType: Quality Inspection,Sample Size,Tamaño de la muestra apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Todos los artículos que ya se han facturado -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido" +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique un numero de caso válido" apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas." DocType: Project,External,Externo -DocType: Features Setup,Item Serial Nos,N º de serie de los Artículo +DocType: Features Setup,Item Serial Nos,Nº de serie de los productos +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y permisos DocType: Branch,Branch,Sucursal +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impresión y marcas +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No existe nómina salarial para el mes: DocType: Bin,Actual Quantity,Cantidad actual DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío express -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no encontrado +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Numero de serie {0} no encontrado apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Sus clientes apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Moldeo por compresión DocType: Leave Block List Date,Block Date,Bloquear fecha -DocType: Sales Order,Not Delivered,No Entregado -,Bank Clearance Summary,Liquidez Bancaria -apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Creación y gestión de resúmenes de correo electrónico diarias , semanales y mensuales." +DocType: Sales Order,Not Delivered,No entregado +,Bank Clearance Summary,Liquidez bancaria +apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales." apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Código del producto> Grupos> Marca DocType: Appraisal Goal,Appraisal Goal,Evaluación Meta DocType: Event,Friday,Viernes DocType: Time Log,Costing Amount,Costo acumulado -DocType: Process Payroll,Submit Salary Slip,Presentar nómina -DocType: Salary Structure,Monthly Earning & Deduction,Ingresos Mensuales y Deducción -apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el elemento {0} es {1}% +DocType: Process Payroll,Submit Salary Slip,Validar nómina salarial +DocType: Salary Structure,Monthly Earning & Deduction,Ingresos mensuales y deducciones +apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el producto {0} es {1}% apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importación en masa DocType: Sales Partner,Address & Contacts,Dirección y Contactos DocType: SMS Log,Sender Name,Nombre del Remitente DocType: Page,Title,Nombre sites/assets/js/list.min.js +104,Customize,Personalización DocType: POS Profile,[Select],[Seleccionar] -DocType: SMS Log,Sent To,Enviado A -apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Hacer Factura de Venta +DocType: SMS Log,Sent To,Enviado a +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Crear factura de venta DocType: Company,For Reference Only.,Sólo para referencia. apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},No válido {0}: {1} DocType: Sales Invoice Advance,Advance Amount,Importe Anticipado DocType: Manufacturing Settings,Capacity Planning,Planificación de capacidad apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Desde la fecha' es requerido DocType: Journal Entry,Reference Number,Número de referencia -DocType: Employee,Employment Details,Detalles de Empleo +DocType: Employee,Employment Details,Detalles del empleo DocType: Employee,New Workplace,Nuevo lugar de trabajo -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establecer como Cerrada +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establecer como cerrado/a apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ningún producto con código de barras {0} apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Nº de caso no puede ser 0 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity,Si usted tiene equipo de ventas y socios de ventas ( Socios de canal ) ellos pueden ser etiquetados y mantener su contribución en la actividad de ventas DocType: Item,Show a slideshow at the top of the page,Mostrar una presentación de diapositivas en la parte superior de la página DocType: Item,"Allow in Sales Order of type ""Service""","Permitir en órdenes de venta de tipo ""Servicio""" -apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,SUCURSALES +apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Sucursales DocType: Time Log,Projects Manager,Gerente de proyectos -DocType: Serial No,Delivery Time,Tiempo de Entrega -apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad Basada en +DocType: Serial No,Delivery Time,Tiempo de entrega +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad basada en DocType: Item,End of Life,Final de vida útil apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viajes DocType: Leave Block List,Allow Users,Permitir que los usuarios -DocType: Sales Invoice,Recurring,Periódico +DocType: Sales Invoice,Recurring,Recurrente DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguimiento de Ingresos y Gastos por separado para las verticales de productos o divisiones. DocType: Rename Tool,Rename Tool,Herramienta para renombrar apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualización de Costos DocType: Item Reorder,Item Reorder,Reabastecer producto apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transferencia de Material -DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones." +DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar las operaciones, el costo de operativo y definir un numero único de operación" DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios DocType: Naming Series,User must always select,Usuario elegirá siempre DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo -DocType: Installation Note,Installation Note,Nota de Instalación +DocType: Installation Note,Installation Note,Nota de instalación apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Agregar impuestos -,Financial Analytics,Análisis Financieros +,Financial Analytics,Análisis financiero DocType: Quality Inspection,Verified By,Verificado por DocType: Address,Subsidiary,Filial apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la divisa/moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas antes de cambiarla" -DocType: Quality Inspection,Purchase Receipt No,Recibo de Compra No +DocType: Quality Inspection,Purchase Receipt No,Recibo de compra No. apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,GANANCIAS PERCIBIDAS DocType: System Settings,In Hours,Horas -DocType: Process Payroll,Create Salary Slip,Crear Nómina +DocType: Process Payroll,Create Salary Slip,Crear nómina salarial apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Importe previsto en banco apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Pulido -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),FUENTE DE FONDOS (PASIVO) -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la linea {0} ({1}) debe ser la misma que la cantidad producida {2} +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Origen de fondos (Pasivo) +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2} DocType: Appraisal,Employee,Empleado apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar correo electrónico de: apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Invitar como usuario DocType: Features Setup,After Sale Installations,Instalaciones post venta apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} está totalmente facturado DocType: Workstation Working Hour,End Time,Hora de finalización -apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condiciones contractuales estándar para ventas y compras. +apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Contrato estándar de términos y condiciones para ventas y compras. apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupar por recibo -apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerido Por -DocType: Sales Invoice,Mass Mailing,Correo Masivo +apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Solicitado el +DocType: Sales Invoice,Mass Mailing,Correo masivo DocType: Page,Standard,Estándar DocType: Rename Tool,File to Rename,Archivo a renombrar -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0} +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Se requiere el numero de orden para el producto {0} apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1} -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamaño DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico -apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El costo de artículos comprados +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo de productos comprados DocType: Selling Settings,Sales Order Required,Orden de venta requerida apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear cliente DocType: Purchase Invoice,Credit To,Acreditar en DocType: Employee Education,Post Graduate,Postgrado -DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalle de Calendario de Mantenimiento +DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalles del calendario de mantenimiento DocType: Quality Inspection Reading,Reading 9,Lectura 9 -DocType: Supplier,Is Frozen,Se encuentra Inactivo -DocType: Buying Settings,Buying Settings,Configuración de Compras +DocType: Supplier,Is Frozen,Se encuentra congelado(a) +DocType: Buying Settings,Buying Settings,Configuración de compras apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabado en masa DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Lista de materiales (LdM) para el producto terminado DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha -apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuración del servidor de correo entrante de correo electrónico de identificación de las ventas. (por ejemplo sales@example.com ) +apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuración del servidor de correo entrante corporativo de ventas. (por ejemplo sales@example.com ) DocType: Warranty Claim,Raised By,Propuesto por -DocType: Payment Tool,Payment Account,Pago a cuenta +DocType: Payment Tool,Payment Account,Cuenta de pagos apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Por favor, especifique la compañía para continuar" sites/assets/js/list.min.js +23,Draft,Borrador apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio @@ -1946,15 +1961,15 @@ DocType: User,Female,Femenino DocType: Journal Entry Account,Debit in Account Currency,Divisa de la cuenta de débito apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegúrese que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer." DocType: Print Settings,Modern,Moderno -DocType: Communication,Replied,Respondio +DocType: Communication,Replied,Ya respondió DocType: Payment Tool,Total Payment Amount,Importe total apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que cantidad planificada ({2}) en la Orden de Producción {3} -DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío -apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco. +DocType: Shipping Rule,Shipping Rule Label,Etiqueta de regla de envío +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco. DocType: Newsletter,Test,Prueba apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \ you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Existen transacciones de stock para este producto, \ usted no puede cambiar los valores de 'Tiene No. de serie', 'Tiene No. de lote', 'Es un producto en stock' y 'Método de valoración'" -apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto DocType: Employee,Previous Work Experience,Experiencia laboral previa DocType: Stock Entry,For Quantity,Por cantidad apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}" @@ -1971,19 +1986,19 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Lista de distribu DocType: Delivery Note,Transporter Name,Nombre del Transportista DocType: Contact,Enter department to which this Contact belongs,Introduzca departamento al que pertenece este contacto apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Ausente -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la linea {0} no coincide con la requisición de materiales +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la línea {0} no coincide con la requisición de materiales apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unidad de Medida (UdM) -DocType: Fiscal Year,Year End Date,Año de Finalización +DocType: Fiscal Year,Year End Date,Año de finalización DocType: Task Depends On,Task Depends On,Tarea Depende de -DocType: Lead,Opportunity,Oportunidades +DocType: Lead,Opportunity,Oportunidad DocType: Salary Structure Earning,Salary Structure Earning,Estructura Salarial Ingreso ,Completed Production Orders,Órdenes de producción (OP) completadas DocType: Operation,Default Workstation,Estación de Trabajo por defecto DocType: Notification Control,Expense Claim Approved Message,Mensaje de reembolso de gastos -DocType: Email Digest,How frequently?,¿Con qué frecuencia ? -DocType: Purchase Receipt,Get Current Stock,Verificar Inventario Actual +DocType: Email Digest,How frequently?,¿Con qué frecuencia? +DocType: Purchase Receipt,Get Current Stock,Verificar inventario actual apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Árbol de la lista de materiales -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Mantenimiento fecha de inicio no puede ser antes de la fecha de entrega para la Serie No {0} +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},La fecha de inicio del mantenimiento no puede ser anterior de la fecha de entrega para {0} DocType: Production Order,Actual End Date,Fecha Real de Finalización DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol ) DocType: Stock Entry,Purpose,Propósito @@ -1995,10 +2010,10 @@ DocType: SMS Log,No of Requested SMS,No. de SMS solicitados DocType: Campaign,Campaign-.####,Campaña-.#### apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perforación apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La fecha de finalización de contrato debe ser mayor que la fecha de ingreso -DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión. +DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedores / comisionistas / afiliados / distribuidores que venden productos de empresas a cambio de una comisión. DocType: Customer Group,Has Child Node,Posee sub-nodo apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} contra la Orden de Compra {1} -DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL estáticas aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )" +DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )" apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en el año fiscal activo. Para más detalles verifique {2}. apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rango de antigüedad 1 @@ -2044,31 +2059,31 @@ The tax rate you define here will be the standard tax rate for all **Items**. If 8. Introduzca Row: Si se basa en ""Anterior Fila Total"" se puede seleccionar el número de la fila que será tomado como base para este cálculo (por defecto es la fila anterior). 9. Considere impuesto o cargo para: En esta sección se puede especificar si el impuesto / carga es sólo para la valoración (no una parte del total) o sólo para el total (no agrega valor al elemento) o para ambos. 10. Añadir o deducir: Si usted quiere añadir o deducir el impuesto." -DocType: Note,Note,nota +DocType: Note,Note,Nota DocType: Purchase Receipt Item,Recd Quantity,Cantidad recibida DocType: Email Account,Email Ids,IDs de Correo Electrónico apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1} -apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Establecer como destapados -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta -DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de Banco / Efectivo +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Establecer como reanudado +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada +DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de banco / efectivo DocType: Tax Rule,Billing City,Ciudad de facturación -apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Esta solicitud de ausencia está pendiente de aprobación. Sólo el supervisor de ausencias puede actualizar el estado. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Esta solicitud de ausencia estará pendiente de aprobación. Sólo el supervisor de ausencias puede actualizar el estado. DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda -apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito" -DocType: Journal Entry,Credit Note,Nota de Crédito +apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","Los métodos de pago normalmente utilizados por ejemplo: banco, efectivo, tarjeta de crédito, etc." +DocType: Journal Entry,Credit Note,Nota de crédito apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},La cantidad completada no puede ser mayor de {0} para la operación {1} DocType: Features Setup,Quality,Calidad DocType: Contact Us Settings,Introduction,Introducción -DocType: Warranty Claim,Service Address,Dirección del Servicio -apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Número máximo de 100 filas de Conciliación de Inventario. -DocType: Stock Entry,Manufacture,Manufactura -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Primero la nota de entrega +DocType: Warranty Claim,Service Address,Dirección de servicio +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Máximo 100 lineas para la conciliación de inventario. +DocType: Stock Entry,Manufacture,Manufacturar +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Entregar primero la nota DocType: Purchase Invoice,Currency and Price List,Divisa y listas de precios DocType: Opportunity,Customer / Lead Name,Cliente / Oportunidad apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Fecha de liquidación no definida apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producción DocType: Item,Allow Production Order,Permitir orden de producción -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Linea {0}: La fecha de inicio debe ser anterior fecha de finalización +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Línea {0}: La fecha de inicio debe ser anterior fecha de finalización apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad) DocType: Installation Note Item,Installed Qty,Cantidad instalada DocType: Lead,Fax,Fax @@ -2079,39 +2094,39 @@ DocType: Purchase Receipt,Time at which materials were received,Momento en que s apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mis direcciones DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Sucursal principal de la organización. -apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,o +apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ó DocType: Sales Order,Billing Status,Estado de facturación apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,SERVICIOS PUBLICOS apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Mayor DocType: Buying Settings,Default Buying Price List,Lista de precios por defecto ,Download Backups,Descargar Backups -DocType: Notification Control,Sales Order Message,Mensaje de la Orden de Venta -apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer valores predeterminados, como: Empresa, Moneda/Divisa, Año fiscal, etc." -apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipo de Pago -DocType: Process Payroll,Select Employees,Seleccione Empleados +DocType: Notification Control,Sales Order Message,Mensaje de la orden de venta +apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer los valores predeterminados como: empresa, moneda / divisa, año fiscal, etc." +apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipo de pago +DocType: Process Payroll,Select Employees,Seleccione los empleados DocType: Bank Reconciliation,To Date,Hasta la fecha DocType: Opportunity,Potential Sales Deal,Potenciales acuerdos de venta sites/assets/js/form.min.js +308,Details,Detalles DocType: Purchase Invoice,Total Taxes and Charges,Total Impuestos y Cargos DocType: Employee,Emergency Contact,Contacto de emergencia -DocType: Item,Quality Parameters,Parámetros de Calidad -DocType: Target Detail,Target Amount,Monto Objtetivo +DocType: Item,Quality Parameters,Parámetros de calidad +DocType: Target Detail,Target Amount,Monto de objtetivo DocType: Shopping Cart Settings,Shopping Cart Settings,Ajustes de carrito de compras -DocType: Journal Entry,Accounting Entries,Asientos Contables +DocType: Journal Entry,Accounting Entries,Asientos contables apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Entrada duplicada. Por favor consulte la regla de autorización {0} apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},El perfil de POS global {0} ya fue creado para la compañía {1} -DocType: Purchase Order,Ref SQ,Ref SQ +DocType: Purchase Order,Ref SQ,Ref. SQ apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Reemplazar elemento / Solicitud de Materiales en todas las Solicitudes de Materiales -DocType: Purchase Order Item,Received Qty,Cantidad Recibida +DocType: Purchase Order Item,Received Qty,Cantidad recibida DocType: Stock Entry Detail,Serial No / Batch,N º de serie / lote -DocType: Product Bundle,Parent Item,Artículo Principal +DocType: Product Bundle,Parent Item,Producto padre / principal DocType: Account,Account Type,Tipo de cuenta -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨" +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'" ,To Produce,Producir -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la linea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas" +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas" DocType: Packing Slip,Identification of the package for the delivery (for print),La identificación del paquete para la entrega (para impresión) DocType: Bin,Reserved Quantity,Cantidad Reservada -DocType: Landed Cost Voucher,Purchase Receipt Items,Artículos de Recibo de Compra +DocType: Landed Cost Voucher,Purchase Receipt Items,Productos del recibo de compra apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formularios personalizados apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Corte apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplastamiento @@ -2119,15 +2134,15 @@ DocType: Account,Income Account,Cuenta de ingresos apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Moldura apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Entrega DocType: Stock Reconciliation Item,Current Qty,Cant. Actual -DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Consulte "" Cambio de materiales a base On"" en la sección Cálculo del coste" +DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte 'tasa de materiales en base de' en la sección de costos DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave DocType: Item Reorder,Material Request Type,Tipo de requisición -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Linea {0}: El factor de conversión de (UdM) es obligatorio +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Línea {0}: El factor de conversión de (UdM) es obligatorio apps/frappe/frappe/desk/moduleview.py +61,Documents,Documentos apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referencia DocType: Cost Center,Cost Center,Centro de costos apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Comprobante # -DocType: Notification Control,Purchase Order Message,Mensaje de la Orden de Compra +DocType: Notification Control,Purchase Order Message,Mensaje en la orden de compra DocType: Tax Rule,Shipping Country,País de envío DocType: Upload Attendance,Upload HTML,Subir HTML apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \ @@ -2137,12 +2152,12 @@ DocType: Employee,Relieving Date,Fecha de relevo apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","La regla de precios está hecha para sobrescribir la lista de precios y define un porcentaje de descuento, basado en algunos criterios." DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra DocType: Employee Education,Class / Percentage,Clase / Porcentaje -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Marketing y Ventas +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de marketing y ventas apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Láser diseñado conformación neta apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si la regla de precios está hecha para 'Precio', sobrescribirá la lista de precios actual. La regla de precios sera el valor final definido, así que no podrá aplicarse algún descuento. Por lo tanto, en las transacciones como Pedidos de venta, órdenes de compra, etc. el campo sera traído en lugar de utilizar 'Lista de precios'" apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria -DocType: Item Supplier,Item Supplier,Proveedor del Artículo +DocType: Item Supplier,Item Supplier,Proveedor del producto apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote" apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to" apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todas las direcciones. @@ -2150,20 +2165,20 @@ DocType: Company,Stock Settings,Ajustes de Inventarios DocType: User,Bio,Biografía apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía " apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes -apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nombre de Nuevo Centro de Coste -DocType: Leave Control Panel,Leave Control Panel,Salir del Panel de Control +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nombre del nuevo centro de costos +DocType: Leave Control Panel,Leave Control Panel,Salir del panel de control apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,No se encontró plantilla de dirección por defecto. Favor cree una nueva desde Configuración> Prensa y Branding> Plantilla de Dirección. -DocType: Appraisal,HR User,Usuario Recursos Humanos +DocType: Appraisal,HR User,Usuario de recursos humanos DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y Gastos Deducidos apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Problemas apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estado debe ser uno de {0} -DocType: Sales Invoice,Debit To,Débitar a -DocType: Delivery Note,Required only for sample item.,Sólo es necesario para el artículo de muestra . +DocType: Sales Invoice,Debit To,Debitar a +DocType: Delivery Note,Required only for sample item.,Solicitado únicamente para muestra. DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad actual después de transacción -,Pending SO Items For Purchase Request,A la espera de la Orden de Compra (OC) para crear Solicitud de Compra (SC) +,Pending SO Items For Purchase Request,A la espera de la orden de compra (OC) para crear solicitud de compra (SC) DocType: Supplier,Billing Currency,Moneda de facturación apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande -,Profit and Loss Statement,Pérdidas y Ganancias +,Profit and Loss Statement,Cuenta de pérdidas y ganancias DocType: Bank Reconciliation Detail,Cheque Number,Número de cheque apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Prensado DocType: Payment Tool Detail,Payment Tool Detail,Detalle de herramienta de pago @@ -2186,27 +2201,27 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure fo you have already made some transaction(s) with another UOM. To change default UOM, \ use 'UOM Replace Utility' tool under Stock module.","Unidad de medida por defecto para el producto {0} no se puede cambiar directamente, porque ya se ha realizado alguna transacción(es) con otra UdM. Para cambiar la UdM por defecto, utilice la herramienta bajo el modulo de inventario" DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el tipo de cambio para convertir una moneda a otra -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Cotización {0} se cancela +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,La cotización {0} esta cancelada apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Monto total pendiente apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,El empleado {0} estaba ausente el {1}. No se puede marcar la asistencia. DocType: Sales Partner,Targets,Objetivos DocType: Price List,Price List Master,Lista de precios principal DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas las transacciones de venta se pueden etiquetar para múltiples **vendedores** de esta manera usted podrá definir y monitorear objetivos. -,S.O. No.,S.O. No. -DocType: Production Order Operation,Make Time Log,Hacer Registro de Tiempo -apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}" +,S.O. No.,OV No. +DocType: Production Order Operation,Make Time Log,Crear gestión de tiempos +apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, crear el cliente desde iniciativa {0}" DocType: Price List,Applicable for Countries,Aplicable para los Países apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,EQUIPO DE COMPUTO apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Esmerilado Electro-químico apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz y no se puede editar. -apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de empezar los registros de contabilidad" +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de comenzar los registros de contabilidad" DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar la regla precios sites/assets/js/list.min.js +24,Cancelled,Cancelado apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La fecha de la estructura salarial no puede ser menor que la fecha de contratación del empleado. DocType: Employee Education,Graduate,Graduado DocType: Leave Block List,Block Days,Bloquear días -DocType: Journal Entry,Excise Entry,Entrada Impuestos Especiales -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advertencia: orden de ventas {0} ya existe para la orden de compra {1} del cliente +DocType: Journal Entry,Excise Entry,Registro de impuestos especiales +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advertencia: orden de venta {0} ya existe para la orden de compra {1} del cliente DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases. Examples: @@ -2238,7 +2253,7 @@ DocType: Account,Accounts User,Cuentas de Usuario DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Marque si es factura periódica, desmarque para detener periodicidad o poner una fecha final" apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado DocType: Packing Slip,If more than one package of the same type (for print),Si es más de un paquete del mismo tipo (para impresión) -apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Máximo {0} filas permitidos +apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Máximo: {0} lineas permitidas DocType: C-Form Invoice Detail,Net Total,Total Neto DocType: Bin,FCFS Rate,Cambio FCFS apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturación (Facturas de venta) @@ -2250,33 +2265,33 @@ apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does no DocType: Account,Round Off,REDONDEOS ,Requested Qty,Cant. Solicitada DocType: Tax Rule,Use for Shopping Cart,Utilizar para carrito de compras -DocType: BOM Item,Scrap %,Chatarra % +DocType: BOM Item,Scrap %,Desecho % apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Los cargos se distribuirán proporcionalmente basados en la cantidad o importe, según selección" DocType: Maintenance Visit,Purposes,Propósitos apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Al menos un elemento debe introducirse con cantidad negativa en el documento de devolución apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","La operación {0} tomará mas tiempo que la capacidad de producción de la estación {1}, por favor divida la tarea en varias operaciones" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Mecanizado Electro-químico -,Requested,Requerido +,Requested,Solicitado apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,No hay observaciones apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Atrasado -DocType: Account,Stock Received But Not Billed,INVENTARIO ENTRANTE NO FACTURADO +DocType: Account,Stock Received But Not Billed,Inventario entrante no facturado DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Pago bruto + Montos atrazados + Vacaciones - Total deducciones DocType: Monthly Distribution,Distribution Name,Nombre de la distribución DocType: Features Setup,Sales and Purchase,Ventas y Compras DocType: Purchase Order Item,Material Request No,Requisición de materiales Nº -apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0} +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0} DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa por la cual la divisa es convertida como moneda base de la compañía apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista. DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Divisa por defecto) apps/frappe/frappe/templates/base.html +132,Added,Agregado apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administración de territorios -DocType: Journal Entry Account,Sales Invoice,Factura de Venta -DocType: Journal Entry Account,Party Balance,Saldo de socio -DocType: Sales Invoice Item,Time Log Batch,Grupo de Horas Registradas +DocType: Journal Entry Account,Sales Invoice,Factura de venta +DocType: Journal Entry Account,Party Balance,Saldo de tercero/s +DocType: Sales Invoice Item,Time Log Batch,Lote de gestión de tiempos apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en' DocType: Company,Default Receivable Account,Cuenta por cobrar por defecto -DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banco para el sueldo total pagado por los criterios anteriormente seleccionados -DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Manufactura +DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear asiento de banco para el sueldo total pagado según los siguientes criterios +DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de material para producción apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,El porcentaje de descuento puede ser aplicado ya sea en una lista de precios o para todas las listas de precios. DocType: Purchase Invoice,Half-yearly,Semestral apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,El año fiscal {0} no se encuentra. @@ -2288,69 +2303,69 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,El DocType: Sales Invoice,Customer Address,Dirección del cliente apps/frappe/frappe/desk/query_report.py +136,Total,Total DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en -DocType: Account,Root Type,Tipo Root -apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2} +DocType: Account,Root Type,Tipo de root +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Línea # {0}: No se puede devolver más de {1} para el producto {2} apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Cuadro DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta presentación de diapositivas en la parte superior de la página -DocType: BOM,Item UOM,Unidad de Medida del Artículo +DocType: BOM,Item UOM,Unidad de medida (UdM) del producto DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos después del descuento (Divisa por defecto) -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},El almacén de destino es obligatorio para la linea {0} -DocType: Quality Inspection,Quality Inspection,Inspección de Calidad +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},El almacén de destino es obligatorio para la línea {0} +DocType: Quality Inspection,Quality Inspection,Inspección de calidad apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Rocíe la formación +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray forming apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida -apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Cuenta {0} está congelada +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,La cuenta {0} se encuentra congelada DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización. -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco" apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivel de inventario mínimo DocType: Stock Entry,Subcontract,Subcontrato -DocType: Production Planning Tool,Get Items From Sales Orders,Obtener Elementos de Órdenes de Venta +DocType: Production Planning Tool,Get Items From Sales Orders,Obtener elementos desde las 'ordenes de compa' DocType: Production Order Operation,Actual End Time,Hora actual de finalización DocType: Production Planning Tool,Download Materials Required,Descargar materiales necesarios -DocType: Item,Manufacturer Part Number,Número de Pieza del Fabricante +DocType: Item,Manufacturer Part Number,Número de componente del fabricante DocType: Production Order Operation,Estimated Time and Cost,Tiempo estimado y costo DocType: Bin,Bin,Papelera apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Saliente DocType: SMS Log,No of Sent SMS,No. de SMS enviados -DocType: Account,Company,Compañía(s) +DocType: Account,Company,Compañía DocType: Account,Expense Account,Cuenta de costos apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Color DocType: Maintenance Visit,Scheduled,Programado apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, seleccione el ítem donde "Es de la Elemento" es "No" y "¿Es de artículos de venta" es "Sí", y no hay otro paquete de producto" -DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccione Distribución Mensual de distribuir de manera desigual a través de objetivos meses. +DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Seleccione la distribución mensual, para asignarla desigualmente en varios meses" DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,El elemento en la fila {0}: Recibo Compra {1} no existe en la tabla de 'Recibos de Compra' apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3} -apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del Proyecto +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del proyecto apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Hasta -DocType: Rename Tool,Rename Log,Cambiar el Nombre de Sesión +DocType: Rename Tool,Rename Log,Cambiar el nombre de sesión DocType: Installation Note Item,Against Document No,Contra el Documento No apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrar socios de ventas. -DocType: Quality Inspection,Inspection Type,Tipo de Inspección +DocType: Quality Inspection,Inspection Type,Tipo de inspección apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Por favor, seleccione {0}" DocType: C-Form,C-Form No,C -Form No DocType: BOM,Exploded_items,Exploded_items apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Investigador apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Actualizar apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Por favor, guarde el boletín antes de enviarlo" -apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nombre o Email es obligatorio +apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,El nombre o E-mail es obligatorio apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspección de calidad entrante -DocType: Purchase Order Item,Returned Qty,Vuelto Cantidad +DocType: Purchase Order Item,Returned Qty,Cantidad devuelta DocType: Employee,Exit,Salir -apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Tipo Root es obligatorio -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de orden {0} creado +apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,tipo de root es obligatorio +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de serie {0} creado apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Acabado vibratorio DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega" DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente DocType: Sales Invoice,Advertisement,Anuncio -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período De Prueba -DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción -DocType: Expense Claim,Expense Approver,Supervisor de Gastos -DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período de prueba +DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las sub-cuentas son permitidas en una transacción +DocType: Expense Claim,Expense Approver,Supervisor de gastos +DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra del producto suministrado sites/assets/js/erpnext.min.js +48,Pay,Pagar apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Fecha y Hora DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS @@ -2362,16 +2377,16 @@ apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirm apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveedor> Tipo de Proveedor apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, introduzca la fecha de relevo" apps/erpnext/erpnext/controllers/trends.py +137,Amt,Monto -apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Sólo las solicitudes de ausencia con estado ""Aprobado"" puede ser enviadas" +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Sólo las solicitudes de ausencia con estado ""Aprobado"" puede ser validadas" apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,La dirección principal es obligatoria -DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Introduzca el nombre de la campaña, si la solicitud viene de esta." -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de Periódicos +DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Introduzca el nombre de la campaña, si la solicitud viene desde esta." +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de periódicos apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fundición apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Usted es el supervisor de ausencias para este registro. Por favor actualice el 'Estado' y guarde apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de reabastecimiento DocType: Attendance,Attendance Date,Fecha de Asistencia -DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción. +DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de salario basado en los ingresos y deducciones apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor DocType: Address,Preferred Shipping Address,Dirección de envío preferida DocType: Purchase Receipt Item,Accepted Warehouse,Almacén Aceptado @@ -2383,25 +2398,25 @@ DocType: Serial No,Under Warranty,Bajo Garantía apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error] DocType: Sales Order,In Words will be visible once you save the Sales Order.,En palabras serán visibles una vez que guarde el pedido de ventas. ,Employee Birthday,Cumpleaños del empleado -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de Riesgo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de riesgo DocType: UOM,Must be Whole Number,Debe ser un número entero -DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas Vacaciones Asignados (en días) -apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Número de orden {0} no existe -DocType: Pricing Rule,Discount Percentage,Porcentaje de Descuento +DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas vacaciones asignadas (en días) +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,El número de serie {0} no existe +DocType: Pricing Rule,Discount Percentage,Porcentaje de descuento DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura apps/erpnext/erpnext/hooks.py +70,Orders,Órdenes -DocType: Leave Control Panel,Employee Type,Tipo de Empleado +DocType: Leave Control Panel,Employee Type,Tipo de empleado DocType: Employee Leave Approver,Leave Approver,Supervisor de ausencias apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Recalcado -DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para la Fabricación +DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para manufacturar DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuario con rol de ""Supervisor de gastos""" ,Issued Items Against Production Order,Productos entregados desde ordenes de producción -DocType: Pricing Rule,Purchase Manager,Gerente de Compras +DocType: Pricing Rule,Purchase Manager,Gerente de compras DocType: Payment Tool,Payment Tool,Herramientas de pago -DocType: Target Detail,Target Detail,Objetivo Detalle +DocType: Target Detail,Target Detail,Detalle de objetivo DocType: Sales Order,% of materials billed against this Sales Order,% de materiales facturados para esta orden de venta -apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entradas de cierre de período -apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro de Costos de las transacciones existentes no se puede convertir al grupo +apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Asiento de cierre de período +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,El centro de costos con transacciones existentes no se puede convertir a 'grupo' apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,DEPRECIACIONES apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor (s) DocType: Customer,Credit Limit,Límite de crédito @@ -2412,49 +2427,49 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Configuración de las plantillas de términos y condiciones. DocType: Customer,Address and Contact,Dirección y contacto DocType: Customer,Last Day of the Next Month,Último día del siguiente mes -DocType: Employee,Feedback,Comentarios +DocType: Employee,Feedback,Comentarios. apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)" -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Horario +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Horario de mantenimiento apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Chorreo abrasivo por maquina DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock DocType: Website Settings,Website Settings,Configuración del Sitio Web DocType: Item,Reorder level based on Warehouse,Nivel de reabastecimiento basado en almacén DocType: Activity Cost,Billing Rate,Monto de facturación -,Qty to Deliver,Cantidad para Ofrecer -DocType: Monthly Distribution Percentage,Month,Mes. +,Qty to Deliver,Cantidad a entregar +DocType: Monthly Distribution Percentage,Month,Mes ,Stock Analytics,Análisis de existencias DocType: Installation Note Item,Against Document Detail No,Contra documento No. DocType: Quality Inspection,Outgoing,Saliente -DocType: Material Request,Requested For,Solicitados para -DocType: Quotation Item,Against Doctype,Contra Doctype +DocType: Material Request,Requested For,Solicitado para +DocType: Quotation Item,Against Doctype,Contra 'DocType' DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto -apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Cuenta root no se puede borrar -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Imagenes de entradas +apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,La cuenta root no se puede borrar +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar entradas de stock ,Is Primary Address,Es Dirección Primaria DocType: Production Order,Work-in-Progress Warehouse,Almacén de Trabajos en Proceso apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referencia # {0} de fecha {1} -apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar Direcciones +apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar direcciones DocType: Pricing Rule,Item Code,Código del producto -DocType: Production Planning Tool,Create Production Orders,Crear Órdenes de Producción +DocType: Production Planning Tool,Create Production Orders,Crear órdenes de producción DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles DocType: Journal Entry,User Remark,Observaciones -DocType: Lead,Market Segment,Sector de Mercado +DocType: Lead,Market Segment,Sector de mercado DocType: Communication,Phone,Teléfono DocType: Employee Internal Work History,Employee Internal Work History,Historial de trabajo del empleado apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Cierre (Deb) DocType: Contact,Passive,Pasivo -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Número de orden {0} no está en stock +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de serie {0} no se encuentra en stock apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta. DocType: Sales Invoice,Write Off Outstanding Amount,Balance de pagos pendientes DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Marque si necesita facturas recurrentes automáticas. Después del envío de cualquier factura de venta, la sección ""Recurrente"" será visible." DocType: Account,Accounts Manager,Gerente de Cuentas -apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Registro de Tiempo {0} debe ser ' Enviado ' +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',La gestión de tiempos {0} debe estar validada DocType: Stock Settings,Default Stock UOM,Unidad de Medida (UdM) predeterminada para Inventario DocType: Time Log,Costing Rate based on Activity Type (per hour),Costos basados en tipo de actividad (por hora) DocType: Production Planning Tool,Create Material Requests,Crear requisición de materiales DocType: Employee Education,School/University,Escuela / Universidad DocType: Sales Invoice Item,Available Qty at Warehouse,Cantidad Disponible en Almacén -,Billed Amount,Importe Facturado +,Billed Amount,Importe facturado DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida @@ -2463,40 +2478,40 @@ apps/erpnext/erpnext/config/learn.py +208,Leave Management,Gestión de ausencias DocType: Event,Groups,Grupos apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupar por cuenta DocType: Sales Order,Fully Delivered,Entregado completamente -DocType: Lead,Lower Income,Ingreso Bajo +DocType: Lead,Lower Income,Ingreso menor DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","La cuenta de patrimonio, en la cual serán registradas las perdidas y/o ganancias " DocType: Payment Tool,Against Vouchers,Contra comprobantes apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ayuda Rápida -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},"Almacenes de origen y destino no pueden ser los mismos, linea {0}" +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},"Almacenes de origen y destino no pueden ser los mismos, línea {0}" DocType: Features Setup,Sales Extras,Extras Ventas apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} en el centro de costos {2} es mayor por {3} apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura" -apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0} -DocType: Leave Allocation,Carry Forwarded Leaves,Mover ausencias reenviadas +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0} +DocType: Leave Allocation,Carry Forwarded Leaves,Trasladar ausencias apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha' ,Stock Projected Qty,Cantidad de Inventario Proyectada -apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1} +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1} DocType: Sales Order,Customer's Purchase Order,Ordenes de compra de clientes DocType: Warranty Claim,From Company,Desde Compañía apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cantidad apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto -DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos de Compra y Cargos -,Qty to Receive,Cantidad a Recibir -DocType: Leave Block List,Leave Block List Allowed,Lista de Bloqueo de Vacaciones Permitida -apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Factor de conversión no puede estar en fracciones +DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos y cargos sobre compras +,Qty to Receive,Cantidad a recibir +DocType: Leave Block List,Leave Block List Allowed,Lista de 'bloqueo de vacaciones / permisos' permitida +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,No se pueden utilizar fracciones en el factor de conversión apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Lo utilizará para iniciar sesión DocType: Sales Partner,Retailer,Detallista apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,La cuenta de crédito debe pertenecer a las cuentas de balance apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los proveedores apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,El código del producto es obligatorio porque no es enumerado automáticamente -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Cotización {0} no es de tipo {1} +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},la cotización {0} no es del tipo {1} DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos DocType: Sales Order,% Delivered,% Entregado apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,CUENTA DE SOBRE-GIROS -apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Hacer Nómina +apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Crear nómina salarial apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Continuar apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Explorar la lista de materiales -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,PRESTAMOS EN GARANTÍA +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Prestamos en garantía apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,APERTURA DE CAPITAL apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"No se puede permitir la ausencia, ya que no está autorizado para aprobar sobre fechas bloqueadas" @@ -2516,36 +2531,36 @@ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent DocType: Production Plan Sales Order,SO Date,Fecha de OV DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Tasa por la cual la lista de precios es convertida como base del cliente. DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (Divisa por defecto) -DocType: BOM Operation,Hour Rate,Hora de Cambio +DocType: BOM Operation,Hour Rate,Salario por hora DocType: Stock Settings,Item Naming By,Ordenar productos por apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Desde cotización apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1} -DocType: Production Order,Material Transferred for Manufacturing,Material transferido para fabricación +DocType: Production Order,Material Transferred for Manufacturing,Material transferido para la producción apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,La cuenta {0} no existe -DocType: Purchase Receipt Item,Purchase Order Item No,Orden de Compra del Artículo No -DocType: System Settings,System Settings,Configuración del Sistema -DocType: Project,Project Type,Tipo de Proyecto +DocType: Purchase Receipt Item,Purchase Order Item No,Numero de producto de la orden de compra +DocType: System Settings,System Settings,Configuración del sistema +DocType: Project,Project Type,Tipo de proyecto apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Es obligatoria la meta fe facturación. apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Costo de diversas actividades apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},No tiene permisos para actualizar las transacciones de stock mayores al {0} DocType: Item,Inspection Required,Inspección requerida DocType: Purchase Invoice Item,PR Detail,Detalle PR -DocType: Sales Order,Fully Billed,Totalmente Facturado +DocType: Sales Order,Fully Billed,Totalmente facturado apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,EFECTIVO EN CAJA apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Almacén de entrega requerido para el inventrio del producto {0} DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión) -DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con esta función pueden establecer cuentas congeladas y crear / modificar los asientos contables contra las cuentas congeladas +DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con este rol pueden establecer cuentas congeladas y crear / modificar los asientos contables para las mismas DocType: Serial No,Is Cancelled,CANCELADO apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Mis envíos DocType: Journal Entry,Bill Date,Fecha de factura apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:" DocType: Supplier,Supplier Details,Detalles del proveedor DocType: Communication,Recipients,Destinatarios -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Atornillar +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Atornillado apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Moleteado DocType: Expense Claim,Approval Status,Estado de Aprobación DocType: Hub Settings,Publish Items to Hub,Publicar artículos al Hub -apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},El valor debe ser menor que el valor de la linea {0} +apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},El valor debe ser menor que el valor de la línea {0} apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,TRANSFERENCIA BANCARIA apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Por favor, seleccione la cuenta bancaria" DocType: Newsletter,Create and Send Newsletters,Crear y enviar boletines de noticias @@ -2560,18 +2575,18 @@ apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Iniciativa a cotizaci DocType: Lead,From Customer,Desde cliente apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Llamadas DocType: Project,Total Costing Amount (via Time Logs),Importe total calculado (a través de la gestión de tiempos) -DocType: Purchase Order Item Supplied,Stock UOM,Unidad de Media del Inventario -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,La órden de compra {0} no existe +DocType: Purchase Order Item Supplied,Stock UOM,Unidad de media utilizada en el almacen +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada ,Projected,Proyectado -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de orden {0} no pertenece al Almacén {1} +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de serie {0} no pertenece al Almacén {1} apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0 -DocType: Notification Control,Quotation Message,Cotización Mensaje -DocType: Issue,Opening Date,Fecha de Apertura +DocType: Notification Control,Quotation Message,Mensaje de cotización +DocType: Issue,Opening Date,Fecha de apertura DocType: Journal Entry,Remark,Observación -DocType: Purchase Receipt Item,Rate and Amount,Tasa y Cantidad +DocType: Purchase Receipt Item,Rate and Amount,Tasa y cantidad apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Aburrido apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Desde órden de venta (OV) -DocType: Blog Category,Parent Website Route,Ruta del Website Principal +DocType: Blog Category,Parent Website Route,Ruta de website principal DocType: Sales Order,Not Billed,No facturado apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a la misma compañía sites/assets/js/erpnext.min.js +25,No contacts added yet.,No se han añadido contactos @@ -2583,56 +2598,56 @@ apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Listado d DocType: POS Profile,Write Off Account,Cuenta de desajuste sites/assets/js/erpnext.min.js +26,Discount Amount,Descuento DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra -DocType: Item,Warranty Period (in days),Período de garantía ( en días) +DocType: Item,Warranty Period (in days),Período de garantía (en días) apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por ejemplo IVA apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable -DocType: Shopping Cart Settings,Quotation Series,Serie Cotización +DocType: Shopping Cart Settings,Quotation Series,Series de cotizaciones apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formando gas de metal caliente DocType: Sales Order Item,Sales Order Date,Fecha de las órdenes de venta -DocType: Sales Invoice Item,Delivered Qty,Cantidad Entregada -apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Almacén {0}: Empresa es obligatoria +DocType: Sales Invoice Item,Delivered Qty,Cantidad entregada +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Almacén {0}: El nombre de la compañia es obligatoria apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Ir al grupo apropiado, usualmente (Fuente de los fondos> Pasivos Corrientes> Impuestos y derechos) y crear una nueva cuenta, haciendo clic en Añadir hijo de tipo ""Impuestos"" y referir a la tasa de impuestos." ,Payment Period Based On Invoice Date,Periodos de pago según facturas apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Se requiere la tasa de cambio para {0} apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Corte por láser DocType: Event,Monday,Lunes -DocType: Journal Entry,Stock Entry,Entradas de Inventario +DocType: Journal Entry,Stock Entry,Entradas de inventario DocType: Account,Payable,Pagadero DocType: Salary Slip,Arrear Amount,Monto Mora -apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes Nuevos +apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes nuevos apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Beneficio Bruto% DocType: Appraisal Goal,Weightage (%),Coeficiente de ponderación (% ) DocType: Bank Reconciliation Detail,Clearance Date,Fecha de liquidación -DocType: Newsletter,Newsletter List,Listado de Boletínes -DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Marque si desea enviar la nómina por correo a cada empleado, cuando valide la planilla de pagos" +DocType: Newsletter,Newsletter List,Listado de boletínes +DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Marque si desea enviar la nómina salarial por correo a cada empleado, cuando valide la planilla de pagos" DocType: Lead,Address Desc,Dirección apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Al menos uno de la venta o compra debe seleccionar -apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,¿Dónde se realizan las operaciones de fabricación. +apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Dónde se realizan las operaciones de producción DocType: Page,All,Todos -DocType: Stock Entry Detail,Source Warehouse,fuente de depósito -DocType: Installation Note,Installation Date,Fecha de Instalación +DocType: Stock Entry Detail,Source Warehouse,Almacén de origen +DocType: Installation Note,Installation Date,Fecha de instalación DocType: Employee,Confirmation Date,Fecha de confirmación DocType: C-Form,Total Invoiced Amount,Total Facturado DocType: Account,Sales User,Usuario de Ventas apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,La cantidad mínima no puede ser mayor que la cantidad maxima DocType: Stock Entry,Customer or Supplier Details, Detalle de cliente o proveedor -apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,conjunto -DocType: Lead,Lead Owner,Propietario de la Iniciativa +apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Establecer +DocType: Lead,Lead Owner,Propietario de la iniciativa apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Se requiere Almacén DocType: Employee,Marital Status,Estado civil DocType: Stock Settings,Auto Material Request,Requisición de materiales automática DocType: Time Log,Will be updated when billed.,Se actualizará cuando se facture. -apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Solicitud de Materiales actual y Nueva Solicitud de Materiales no pueden ser iguales +apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,La lista de materiales (LdM) actual y la nueva no pueden ser las mismas apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,La fecha de jubilación debe ser mayor que la fecha de ingreso DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregado -apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto). -DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución Mensual Porcentual +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto). +DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución mensual porcentual DocType: Territory,Territory Targets,Territorios Objetivos DocType: Delivery Note,Transporter Info,Información de Transportista -DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Orden de Compra del Artículo Suministrado +DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Producto suministrado desde orden de compra apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Membretes para las plantillas de impresión. apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para plantillas de impresión, por ejemplo, Factura Proforma." apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido @@ -2640,25 +2655,25 @@ DocType: POS Profile,Update Stock,Actualizar el Inventario apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida. apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM) -apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--" +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Por favor, extraiga los productos de la nota de entrega" apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados -apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registro de todas las comunicaciones de tipo de correo electrónico, teléfono, chat, visita, etc." -apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos para el redondeo--" +apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registrar todas las comunicaciones: correo electrónico, teléfono, chat, visita, etc." +apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos de redondeo" DocType: Purchase Invoice,Terms,Términos apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Crear DocType: Buying Settings,Purchase Order Required,Órden de compra requerida ,Item-wise Sales History,Detalle de las ventas DocType: Expense Claim,Total Sanctioned Amount,Total Sancionada -,Purchase Analytics,Analítico de Compras +,Purchase Analytics,Analítico de compras DocType: Sales Invoice Item,Delivery Note Item,Nota de entrega del producto DocType: Expense Claim,Task,Tarea -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Afeitado -DocType: Purchase Taxes and Charges,Reference Row #,Referencia Fila # +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Viruta +DocType: Purchase Taxes and Charges,Reference Row #,Línea de referencia # apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número de lote es obligatorio para el producto {0} apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Se trata de una persona de las ventas raíz y no se puede editar . ,Stock Ledger,Mayor de Inventarios apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Calificación: {0} -DocType: Salary Slip Deduction,Salary Slip Deduction,Deducción En Planilla +DocType: Salary Slip Deduction,Salary Slip Deduction,Deducciones en nómina apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notas apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Seleccione un nodo de grupo primero. apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propósito debe ser uno de {0} @@ -2670,32 +2685,32 @@ DocType: SMS Center,Send SMS,Enviar mensaje SMS DocType: Company,Default Letter Head,Encabezado predeterminado DocType: Time Log,Billable,Facturable DocType: Authorization Rule,This will be used for setting rule in HR module,Esto se utiliza para ajustar la regla en el módulo de Recursos Humanos -DocType: Account,Rate at which this tax is applied,Velocidad a la que se aplica este impuesto +DocType: Account,Rate at which this tax is applied,Valor por el cual el impuesto es aplicado apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Cantidad a reabastecer DocType: Company,Stock Adjustment Account,Cuenta de ajuste de existencias DocType: Journal Entry,Write Off,Desajuste DocType: Time Log,Operation ID,ID de Operación DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos." apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Desde {1} -DocType: Task,depends_on,depende de -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Oportunidad Perdida +DocType: Task,depends_on,depends_on +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Oportunidad perdida DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Los campos 'descuento' estarán disponibles en la orden de compra, recibo de compra y factura de compra" apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nombre de la nueva cuenta. Nota: Por favor no crear cuentas de clientes y proveedores -DocType: Report,Report Type,Tipo de informe +DocType: Report,Report Type,Tipo de reporte apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Cargando DocType: BOM Replace Tool,BOM Replace Tool,Herramienta de reemplazo de lista de materiales (LdM) apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Plantillas predeterminadas para un país en especial apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0} apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importación y exportación de datos -DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Si usted esta involucrado en la actividad de manufactura, habilite el elemento 'Es Manufacturado'" +DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Si usted esta involucrado en la actividad de manufactura, habilite la opción 'Es manufacturado'" DocType: Sales Invoice,Rounded Total,Total redondeado DocType: Product Bundle,List items that form the package.,Lista de tareas que forman el paquete . -apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Porcentaje de asignación debe ser igual al 100 % +apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,El porcentaje de asignación debe ser igual al 100% DocType: Serial No,Out of AMC,Fuera de AMC DocType: Purchase Order Item,Material Request Detail No,Detalle de requisición de materiales apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Torneado duro apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Crear visita de mantenimiento -apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}" +apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}" DocType: Company,Default Cash Account,Cuenta de efectivo por defecto apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuración general del sistema. apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'" @@ -2706,8 +2721,8 @@ apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Si el pago no se hace en con una referencia, deberá hacer entrada al diario manualmente." DocType: Item,Supplier Items,Artículos del Proveedor DocType: Opportunity,Opportunity Type,Tipo de oportunidad -apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Nueva Empresa -apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},"Se requiere de Centros de Costos para la cuenta "" Pérdidas y Ganancias "" {0}" +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Nueva compañía +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},El centro de costos es requerido para la cuenta de 'perdidas y ganancias' {0} apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borrados por el creador de la Compañía apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Se encontró un número incorrecto de entradas del libro mayor. Es posible que haya seleccionado una cuenta equivocada en la transacción. apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Para crear una Cuenta Bancaria @@ -2715,10 +2730,10 @@ DocType: Hub Settings,Publish Availability,Publicar disponibilidad apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,La fecha de nacimiento no puede ser mayor a la fecha de hoy. ,Stock Ageing,Antigüedad de existencias apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' está deshabilitado -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto -DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a Contactos en transacciones SOMETER. +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto/a +DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a contactos al momento de registrase una transacción apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}. - Available Qty: {4}, Transfer Qty: {5}","Linea {0}: La cantidad no esta disponible en el almacén {1} del {2} {3}. Cantidad disponible: {4}, Transferir Cantidad: {5}" + Available Qty: {4}, Transfer Qty: {5}","Línea {0}: La cantidad no esta disponible en el almacén {1} del {2} {3}. Cantidad disponible: {4}, Transferir Cantidad: {5}" apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Elemento 3 DocType: Event,Sunday,Domingo DocType: Sales Team,Contribution (%),Margen (%) @@ -2728,13 +2743,13 @@ apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Plantilla DocType: Sales Person,Sales Person Name,Nombre del Vendedor apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, introduzca al menos 1 factura en la tabla" apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Agregar usuarios -DocType: Pricing Rule,Item Group,Grupo de artículos +DocType: Pricing Rule,Item Group,Grupo de productos DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio actual (gestión de tiempos) DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0} DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y cargos adicionales (Divisa por defecto) apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos" -DocType: Sales Order,Partly Billed,Parcialmente Facturado +DocType: Sales Order,Partly Billed,Parcialmente facturado DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar" @@ -2742,14 +2757,14 @@ apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.htm DocType: Time Log Batch,Total Hours,Total de Horas DocType: Journal Entry,Printing Settings,Ajustes de impresión apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0} -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotor +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotores apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Vacaciones para el tipo {0} ya asignado para Empleado {1} para el Año Fiscal {0} apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Un producto es requerido apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldeo por inyección de metal apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Desde nota de entrega DocType: Time Log,From Time,Desde fecha DocType: Notification Control,Custom Message,Mensaje personalizado -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca de Inversión +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Inversión en la banca apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleccione su país, zona horaria y moneda" apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios @@ -2758,72 +2773,72 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand cas apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplastia DocType: Purchase Invoice Item,Rate,Precio apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Interno -DocType: Newsletter,A Lead with this email id should exist,Una Iniciativa con este correo electrónico debería existir +DocType: Newsletter,A Lead with this email id should exist,Debe existir un correo relacionado a esta Iniciativa. DocType: Stock Entry,From BOM,Desde lista de materiales (LdM) apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Base -apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Las operaciones de inventario antes de {0} se encuentran congeladas apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'" -apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Hasta la fecha debe ser igual a Partir de la fecha para la licencia de medio día -apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","por ejemplo Kg , Unidad , Nos, m" -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,'Hasta la fecha' debe ser igual a 'desde fecha' para una ausencia de medio día +apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","por ejemplo Kg, Unidades, Metros" +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,El No. de referencia es obligatoria si usted introdujo la fecha apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,La fecha de ingreso debe ser mayor a la fecha de nacimiento DocType: Salary Structure,Salary Structure,Estructura Salarial apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \ conflict by assigning priority. Price Rules: {0}","Existe Regla de Múltiple Precio con los mismos criterios, por favor resolver \ conflicto mediante la asignación de prioridad. Reglas de Precio: {0}" DocType: Account,Bank,Banco -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Línea Aérea +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Línea aérea apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Distribuir materiales -DocType: Material Request Item,For Warehouse,Por almacén +DocType: Material Request Item,For Warehouse,Para el almacén DocType: Employee,Offer Date,Fecha de oferta DocType: Hub Settings,Access Token,Token de acceso -DocType: Sales Invoice Item,Serial No,Números de Serie +DocType: Sales Invoice Item,Serial No,Número de serie apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Por favor ingrese primero los detalles del mantenimiento -DocType: Item,Is Fixed Asset Item,Son partidas de activo fijo +DocType: Item,Is Fixed Asset Item,Es un activo fijo DocType: Stock Entry,Including items for sub assemblies,Incluir productos para subconjuntos DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Si usted tiene formatos de impresión largos , esta característica puede ser utilizada para dividir la página que se imprimirá en varias hojas con todos los encabezados y pies de página en cada una" apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios DocType: Purchase Invoice,Items,Productos -DocType: Fiscal Year,Year Name,Nombre del Año -DocType: Process Payroll,Process Payroll,Nómina de Procesos +DocType: Fiscal Year,Year Name,Nombre del año +DocType: Process Payroll,Process Payroll,Procesar nómina apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes. DocType: Product Bundle Item,Product Bundle Item,Artículo del conjunto de productos DocType: Sales Partner,Sales Partner Name,Nombre de socio de ventas DocType: Purchase Invoice Item,Image View,Vista de imagen apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Terminado y acabado industrial -DocType: Issue,Opening Time,Tiempo de Apertura +DocType: Issue,Opening Time,Hora de apertura apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos -DocType: Shipping Rule,Calculate Based On,Calcular basado en +DocType: Shipping Rule,Calculate Based On,Calculo basado en apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforación apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,El moldeo por soplado DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y total -DocType: Tax Rule,Shipping City,Envios City +DocType: Tax Rule,Shipping City,Ciudad de envió apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este Artículo es una Variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que 'No Copiar' esté seleccionado -DocType: Account,Purchase User,Usuario de Compras -DocType: Notification Control,Customize the Notification,Personalice la Notificación +DocType: Account,Purchase User,Usuario de compras +DocType: Notification Control,Customize the Notification,Personalizar notificación apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martilleo DocType: Web Page,Slideshow,Presentación apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La plantilla de direcciones por defecto no puede ser eliminada DocType: Sales Invoice,Shipping Rule,Regla de envío -DocType: Journal Entry,Print Heading,Título de impresión -DocType: Quotation,Maintenance Manager,Gerente de Mantenimiento +DocType: Journal Entry,Print Heading,Imprimir encabezado +DocType: Quotation,Maintenance Manager,Gerente de mantenimiento DocType: Workflow State,Search,Búsqueda apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero -apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Días desde el último pedido' debe ser mayor o igual a cero +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,Los días desde el último pedido debe ser mayor o igual a cero apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura DocType: C-Form,Amended From,Modificado Desde -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia Prima +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia prima DocType: Leave Application,Follow via Email,Seguir a través de correo electronico DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total impuestos después del descuento -apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta. +apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,"No es posible eliminar esta cuenta, ya que existe una sub-cuenta" apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Es obligatoria la meta de facturacion apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},No existe una lista de materiales por defecto para el elemento {0} apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Por favor, seleccione Fecha de contabilización primero" -DocType: Leave Allocation,Carry Forward,Cargar -apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centro de Costos de las transacciones existentes no se puede convertir en el libro mayor -DocType: Department,Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento . +DocType: Leave Allocation,Carry Forward,Trasladar +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,El centro de costos con transacciones existentes no se puede convertir a libro mayor +DocType: Department,Days for which Holidays are blocked for this department.,Días en que las vacaciones / permisos se bloquearan para este departamento. ,Produced,Producido DocType: Item,Item Code for Suppliers,Código del producto para proveedores DocType: Issue,Raised By (Email),Propuesto por (Email) @@ -2831,14 +2846,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Gene apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Adjuntar membrete apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total ' apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumere sus obligaciones fiscales (Ejemplo; Impuestos, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde." -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0} +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Número de serie requerido para el producto serializado {0} DocType: Journal Entry,Bank Entry,Registro de banco DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Puesto) DocType: Blog Post,Blog Post,Entrada en el Blog apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Habilitar / Deshabilitar divisas apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,GASTOS POSTALES -apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt) +apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Monto total apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio DocType: Purchase Order,The date on which recurring order will be stop,La fecha en que se detiene el pedido recurrente DocType: Quality Inspection,Item Serial No,Nº de Serie del producto @@ -2846,29 +2861,28 @@ apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by { apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Presente apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \ - using Stock Reconciliation","Serializado artículo {0} no se puede actualizar utilizando \ - Stock Reconciliación" + using Stock Reconciliation",El producto serializado {0} no se puede actualizar / reconciliar stock apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transferencia de material a proveedor apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra -DocType: Lead,Lead Type,Tipo de Iniciativa -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotización +DocType: Lead,Lead Type,Tipo de iniciativa +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear cotización apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Todos estos elementos ya fueron facturados apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0} -DocType: Shipping Rule,Shipping Rule Conditions,Regla envío Condiciones +DocType: Shipping Rule,Shipping Rule Conditions,Condiciones de regla envío DocType: BOM Replace Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución DocType: Features Setup,Point of Sale,Punto de Venta apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling DocType: Account,Tax,Impuesto -apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Linea {0}: {1} no es un {2} válido +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Línea {0}: {1} no es un {2} válido apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refinación DocType: Production Planning Tool,Production Planning Tool,Planificar producción -DocType: Quality Inspection,Report Date,Fecha del Informe +DocType: Quality Inspection,Report Date,Fecha del reporte apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Enrutamiento DocType: C-Form,Invoices,Facturas DocType: Job Opening,Job Title,Título del trabajo apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatarios DocType: Features Setup,Item Groups in Details,Detalles de grupos del producto -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Cantidad de Fabricación debe ser mayor que 0. +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0. apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Iniciar terminal de punto de venta (POS) apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Reporte de visitas para mantenimiento DocType: Stock Entry,Update Rate and Availability,Actualización de tarifas y disponibilidad @@ -2877,8 +2891,8 @@ DocType: Pricing Rule,Customer Group,Categoría de cliente apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0} DocType: Item,Website Description,Descripción del Sitio Web DocType: Serial No,AMC Expiry Date,AMC Fecha de caducidad -,Sales Register,Registros de Ventas -DocType: Quotation,Quotation Lost Reason,Cotización Pérdida Razón +,Sales Register,Registro de ventas +DocType: Quotation,Quotation Lost Reason,Razón de la pérdida DocType: Address,Plant,Planta DocType: DocType,Setup,Configuración apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar. @@ -2886,41 +2900,41 @@ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminación en frío DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}" -DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Por favor seleccione trasladar, si usted desea incluir los saldos del año fiscal anterior a este año" +DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor seleccione 'trasladar' si usted desea incluir los saldos del año fiscal anterior a este año DocType: GL Entry,Against Voucher Type,Tipo de comprobante DocType: Item,Attributes,Atributos -DocType: Packing Slip,Get Items,Obtener Artículos +DocType: Packing Slip,Get Items,Obtener artículos apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste" apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Fecha del último pedido DocType: DocField,Image,Imagen -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Hacer Impuestos Especiales de la Factura +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Crear una factura de 'impuestos especiales' apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1} DocType: Communication,Other,Otro DocType: C-Form,C-Form,C - Forma apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID de Operación no definido DocType: Production Order,Planned Start Date,Fecha prevista de inicio -DocType: Serial No,Creation Document Type,Tipo de creación de documentos -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Visita de mant +DocType: Serial No,Creation Document Type,Creación de documento +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Visita de mantenimiento DocType: Leave Type,Is Encash,Se convertirá en efectivo DocType: Purchase Invoice,Mobile No,Nº Móvil DocType: Payment Tool,Make Journal Entry,Crear asiento contable -DocType: Leave Allocation,New Leaves Allocated,Nuevas Vacaciones Asignadas -apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización-- +DocType: Leave Allocation,New Leaves Allocated,Nuevas vacaciones asignadas +apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Los datos del proyecto no están disponibles para la cotización DocType: Project,Expected End Date,Fecha prevista de finalización DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Comercial -apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Artículo Padre {0} no debe ser un archivo de artículos +apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,El producto principal {0} no debe ser un artículo de stock DocType: Cost Center,Distribution Id,Id de Distribución apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos los productos o servicios. DocType: Purchase Invoice,Supplier Address,Dirección del proveedor -DocType: Contact Us Settings,Address Line 2,Dirección Línea 2 +DocType: Contact Us Settings,Address Line 2,Dirección línea 2 DocType: ToDo,Reference,Referencia apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforado -apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Salir Cant. +apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Cant. enviada apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta -apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serie es obligatorio -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servicios Financieros +apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,La secuencia es obligatoria +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servicios financieros apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor del atributo {0} debe estar dentro del rango de {1} a {2} en los incrementos de {3} DocType: Tax Rule,Sales,Ventas DocType: Stock Entry Detail,Basic Amount,Importe base @@ -2935,29 +2949,28 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fet DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado ) apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,La fecha de vencimiento es obligatoria apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0 -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,La sinterización +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterización DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de -DocType: Naming Series,Setup Series,Serie de configuración -DocType: Supplier,Contact HTML,"HTML del Contacto -" -DocType: Landed Cost Voucher,Purchase Receipts,Recibos de Compra +DocType: Naming Series,Setup Series,Configurar secuencias +DocType: Supplier,Contact HTML,HTML de Contacto +DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra DocType: Payment Reconciliation,Maximum Amount,Importe máximo -apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,¿Cómo se aplica la Regla Precios? +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,¿Cómo se aplica la regla precios? DocType: Quality Inspection,Delivery Note No,Nota de entrega No. DocType: Company,Retail,Ventas al por menor -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,{0} no existe Cliente +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,El cliente {0} no existe DocType: Attendance,Absent,Ausente -DocType: Product Bundle,Product Bundle,Conjunto/Paquete de productos +DocType: Product Bundle,Product Bundle,Conjunto / paquete de productos apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Aplastante -DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de cargos e impuestos -DocType: Upload Attendance,Download Template,Descargar Plantilla +DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantilla de impuestos (compras) +DocType: Upload Attendance,Download Template,Descargar plantilla DocType: GL Entry,Remarks,Observaciones DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima DocType: Journal Entry,Write Off Based On,Desajuste basado en DocType: Features Setup,POS View,Vista POS apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,El registro de la instalación para un número de serie apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Colada continua -sites/assets/js/erpnext.min.js +10,Please specify a,"Por favor, especifique un" +sites/assets/js/erpnext.min.js +10,Please specify a,"Por favor, especifique un/a" DocType: Offer Letter,Awaiting Response,Esperando Respuesta apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Arriba apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamiento en frío @@ -2968,20 +2981,20 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Opt apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,La valoración negativa no está permitida DocType: Holiday List,Weekly Off,Semanal Desactivado DocType: Fiscal Year,"For e.g. 2012, 2012-13","Por ejemplo, 2012 , 2012-13" -apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional +apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Beneficio provisional / pérdida (Crédito) DocType: Sales Invoice,Return Against Sales Invoice,Devolución Contra Factura de venta apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Elemento 5 apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Por favor, establezca el valor predeterminado {0} en la compañía {1}" -DocType: Serial No,Creation Time,Momento de la creación +DocType: Serial No,Creation Time,Hora de creación apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Ingresos Totales -DocType: Sales Invoice,Product Bundle Help,Ayuda del conjunto/paquete de productos -,Monthly Attendance Sheet,Hoja de Asistencia Mensual +DocType: Sales Invoice,Product Bundle Help,Ayuda de 'conjunto / paquete de productos' +,Monthly Attendance Sheet,Hoja de ssistencia mensual apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No se han encontraron registros apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 'Centro de Costos' es obligatorio para el producto {2} apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Cuenta {0} está inactiva DocType: GL Entry,Is Advance,Es un anticipo -apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia Desde Fecha y Hasta Fecha de Asistencia es obligatoria -apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no" +apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia 'Desde fecha' y 'Hasta fecha' son obligatorias +apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es sub-contratado' o no" DocType: Sales Team,Contact No.,Contacto No. apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,El tipo de cuenta 'Pérdidas y ganancias' {0} no esta permitida para el asiento de apertura DocType: Workflow State,Time,Tiempo @@ -2989,15 +3002,15 @@ DocType: Features Setup,Sales Discounts,Descuentos sobre Ventas DocType: Hub Settings,Seller Country,País del Vendedor DocType: Authorization Rule,Authorization Rule,Regla de Autorización DocType: Sales Invoice,Terms and Conditions Details,Detalle de Términos y Condiciones -DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de cargos e impuestos sobre ventas +DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de impuestos (ventas) apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios -apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Orden +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de orden DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que aparecerá en la parte superior de la lista de productos. -DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones de calcular el importe de envío +DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones para calcular el monto del envío apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Agregar subcuenta -DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Función Permitida para Establecer Cuentas Congeladas y Editar Entradas Congeladas +DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol que permite definir cuentas congeladas y editar asientos congelados apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene cuentas secundarias" -apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Se requiere el factor de conversión +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Se requiere un factor de conversión apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial # apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,COMISIÓN EN VENTAS DocType: Offer Letter Term,Value / Description,Valor / Descripción @@ -3017,44 +3030,44 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with exist apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,GASTOS LEGALES DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El día del mes en el cual se generará la orden automática por ejemplo 05, 28, etc." DocType: Sales Invoice,Posting Time,Hora de contabilización -DocType: Sales Order,% Amount Billed,% Monto Facturado +DocType: Sales Order,% Amount Billed,% Monto facturado apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,CUENTA TELEFÓNICA DocType: Sales Partner,Logo,Logo DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccione esta opción si desea obligar al usuario a seleccionar una serie antes de guardar. No habrá ninguna por defecto si marca ésta casilla. apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ningún producto con numero de serie {0} -apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Abrir Notificaciones -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Gastos Directos +apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Abrir notificaciones +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Gastos directos apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,¿Realmente desea reanudar esta requisición de materiales? apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos de nuevo cliente apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,GASTOS DE VIAJE DocType: Maintenance Visit,Breakdown,Desglose apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,La cuenta: {0} con la divisa: {1} no se puede seleccionar -DocType: Bank Reconciliation Detail,Cheque Date,Fecha del Cheque -apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2} -apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa! -apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como en la fecha +DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque +apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: desde cuenta padre {1} no pertenece a la compañía: {2} +apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Todas las transacciones relacionadas con esta compañía han sido eliminadas correctamente. +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,A la fecha apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afilando apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Período de prueba apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock. DocType: Feed,Full Name,Nombre completo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Remachado -apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años +apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1} DocType: Stock Settings,Auto insert Price List rate if missing,Auto inserto tasa Lista de Precios si falta apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado ,Transferred Qty,Cantidad Transferida apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegación apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificación -apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Haga Registro de Tiempo de Lotes +apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Crear lotes de gestión de tiempos apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido DocType: Project,Total Billing Amount (via Time Logs),Importe total de facturación (a través de la gestión de tiempos) apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vendemos este artículo -apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Proveedor Id -DocType: Journal Entry,Cash Entry,Entrada de Efectivo +apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID de Proveedor +DocType: Journal Entry,Cash Entry,Entrada de caja DocType: Sales Partner,Contact Desc,Desc. de Contacto apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Tipo de vacaciones como, enfermo, casual, etc." -DocType: Email Digest,Send regular summary reports via Email.,Enviar informes periódicos resumidos por correo electrónico. +DocType: Email Digest,Send regular summary reports via Email.,Enviar informes resumidos periódicamente por correo electrónico. DocType: Brand,Item Manager,Administración de elementos -DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar lineas para establecer los presupuestos anuales de las cuentas. +DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar las lineas para establecer los presupuestos anuales. DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracción DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento @@ -3064,62 +3077,63 @@ DocType: Newsletter,Test Email Id,Prueba de Identificación del email apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de la compañia DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si usted sigue la inspección de calidad. Habilitará el QA del artículo y el número de QA en el recibo de compra DocType: GL Entry,Party Type,Tipo de entidad -apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el artículo principal +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el producto principal DocType: Item Attribute Value,Abbreviation,Abreviación apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No autorizado desde {0} excede los límites -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,El moldeo rotacional +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Moldeo rotacional apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plantilla Maestra para Salario . -DocType: Leave Type,Max Days Leave Allowed,Número Máximo de Días de Baja Permitidos -apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Establezca la regla fiscal de carrito de compra +DocType: Leave Type,Max Days Leave Allowed,Máximo de días de ausencia permitidos +apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Establezca la regla fiscal (Impuestos) del carrito de compras DocType: Payment Tool,Set Matching Amounts,Coincidir pagos DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y Cargos Adicionales ,Sales Funnel,"""Embudo"" de Ventas" apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,La abreviatura es obligatoria apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Carrito apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Gracias por su interés en suscribirse a nuestras actualizaciones -,Qty to Transfer,Cantidad a Transferir +,Qty to Transfer,Cantidad a transferir apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotizaciones para clientes y oportunidades -DocType: Stock Settings,Role Allowed to edit frozen stock,Función Permitida para editar Inventario Congelado +DocType: Stock Settings,Role Allowed to edit frozen stock,Rol que permite editar inventario congelado ,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. posiblemente el tipo de cambio no se ha creado para {1} en {2}. apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Plantilla de impuestos es obligatorio. -apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe +apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Cuenta {0}: desde cuenta padre {1} no existe DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Divisa por defecto) apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} estado es 'Detenido' DocType: Account,Temporary,Temporal DocType: Address,Preferred Billing Address,Dirección de facturación preferida -DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de +DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretario DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto DocType: Pricing Rule,Buying,Compras -DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por -apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este Grupo de Horas Registradas se ha facturado. -DocType: Salary Slip Earning,Salary Slip Earning,Ingreso en Planilla +DocType: HR Settings,Employee Records to be created by,Los registros de empleados se crearán por +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este lote de gestión de tiempos ha sido cancelado. +,Reqd By Date,Solicitado Por Fecha +DocType: Salary Slip Earning,Salary Slip Earning,Ingresos en nómina apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,ACREEDORES -apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Fila # {0}: Número de serie es obligatorio +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Línea # {0}: El número de serie es obligatorio DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalle de Impuestos ,Item-wise Price List Rate,Detalle del listado de precios -DocType: Purchase Order Item,Supplier Quotation,Cotizaciónes a proveedores -DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización. +DocType: Purchase Order Item,Supplier Quotation,Cotización de proveedor +DocType: Quotation,In Words will be visible once you save the Quotation.,'En palabras' serán visibles una vez que guarde la cotización. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planchado apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} esta detenido apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1} DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha -apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío . +apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para añadir los gastos de envío. apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Próximos Eventos -apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere Cliente -DocType: Letter Head,Letter Head,Membretes +apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere cliente +DocType: Letter Head,Letter Head,Membrete apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para su devolución DocType: Purchase Order,To Receive,Recibir -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink apropiado +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Retractilar apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com DocType: Email Digest,Income / Expense,Ingresos / gastos DocType: Employee,Personal Email,Correo electrónico personal apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variacion DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si está habilitado, el sistema contabiliza los asientos contables para el inventario de forma automática." -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage -DocType: Address,Postal Code,codigo postal +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Bolsa de valores +DocType: Address,Postal Code,Codigo postal DocType: Production Order Operation,"in Minutes Updated via 'Time Log'",en minutos actualizado a través de bitácora (gestión de tiempo) DocType: Customer,From Lead,Desde iniciativa @@ -3130,14 +3144,14 @@ DocType: Hub Settings,Name Token,Nombre de Token apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planificar apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Venta estándar apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio -DocType: Serial No,Out of Warranty,Fuera de Garantía +DocType: Serial No,Out of Warranty,Fuera de garantía DocType: BOM Replace Tool,Replace,Reemplazar apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1} apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida (UdM) predeterminada" -DocType: Purchase Invoice Item,Project Name,Nombre del proyecto +DocType: Purchase Invoice Item,Project Name,Nombre de proyecto DocType: Supplier,Mention if non-standard receivable account,Indique si utiliza una cuenta por cobrar distinta a la predeterminada DocType: Workflow State,Edit,Editar -DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso +DocType: Journal Entry Account,If Income or Expense,Indique si es un ingreso o egreso DocType: Features Setup,Item Batch Nos,Números de lote del producto DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario apps/erpnext/erpnext/config/learn.py +199,Human Resource,Recursos Humanos @@ -3148,30 +3162,30 @@ DocType: Contact Us Settings,Pincode,Código PIN apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante DocType: Item,Moving Average,Precio medio variable DocType: BOM Replace Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida -apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nueva Unidad de Medida del Inventario debe ser diferente de la Unidad de Medida actual +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,La nueva unidad de medida (UdM) del Inventario debe ser diferente a la actual DocType: Account,Debit,Debe apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5 DocType: Production Order,Operation Cost,Costo de operación -apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Sube la asistencia de un archivo .csv -apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Monto pendiente -DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos artículo grupo que tienen para este vendedor. +apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Subir la asistencia de un archivo .csv +apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Saldo pendiente +DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos en los grupos de productos para este vendedor DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Para asignar este problema, utilice el botón ""Asignar"" en la barra lateral." DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelar stock mayores a [Days] apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados ​​en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones." -apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Contra Factura +apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Contra factura apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,El año fiscal: {0} no existe -DocType: Currency Exchange,To Currency,Para la moneda +DocType: Currency Exchange,To Currency,A moneda DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar solicitudes de ausencia en días bloqueados. apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Tipos de reembolsos DocType: Item,Taxes,Impuestos -DocType: Project,Default Cost Center,Centro de coste por defecto -DocType: Purchase Invoice,End Date,Fecha Final +DocType: Project,Default Cost Center,Centro de costos por defecto +DocType: Purchase Invoice,End Date,Fecha final DocType: Employee,Internal Work History,Historial de trabajo interno DocType: DocField,Column Break,Salto de columna DocType: Event,Thursday,Jueves apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Capital de riesgo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Torneado -DocType: Maintenance Visit,Customer Feedback,Comentarios del cliente +DocType: Maintenance Visit,Customer Feedback,Comentarios de cliente DocType: Account,Expense,Gastos DocType: Sales Invoice,Exhibition,Exposición DocType: Item Attribute,From Range,De Gama @@ -3179,7 +3193,7 @@ apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Enviar esta Orden de Producción para su posterior procesamiento . apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no aplicar la Regla de Precios en una transacción en particular, todas las Reglas de Precios aplicables deben ser desactivadas." DocType: Company,Domain,Rubro -,Sales Order Trends,Tendencias de Ordenes de Ventas +,Sales Order Trends,Tendencias de ordenes de ventas DocType: Employee,Held On,Retenida en apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Elemento de producción ,Employee Information,Información del empleado @@ -3189,29 +3203,29 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre" apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Crear cotización de proveedor DocType: Quality Inspection,Incoming,Entrante -DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece ) -DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por Licencia sin Sueldo ( LWP ) +DocType: BOM,Materials Required (Exploded),Materiales necesarios (despiece) +DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por licencia sin goce de salario (LSS) apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización -apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: Número de serie {1} no coincide con {2} {3} +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Línea # {0}: Número de serie {1} no coincide con {2} {3} apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional DocType: Batch,Batch ID,ID de lote apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Nota: {0} ,Delivery Note Trends,Evolución de las notas de entrega apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumen de la semana -apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser un producto para compra o sub-contratado en la linea {1} +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser un producto para compra o sub-contratado en la línea {1} apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario -DocType: GL Entry,Party,Socio -DocType: Sales Order,Delivery Date,Fecha de Entrega -DocType: DocField,Currency,Divisa +DocType: GL Entry,Party,Tercero +DocType: Sales Order,Delivery Date,Fecha de entrega +DocType: DocField,Currency,Divisa / Moneda DocType: Opportunity,Opportunity Date,Fecha de oportunidad DocType: Purchase Receipt,Return Against Purchase Receipt,Devolución contra recibo compra DocType: Purchase Order,To Bill,A Facturar -DocType: Material Request,% Ordered,% Ordenados +DocType: Material Request,% Ordered,% Ordenado/a apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Pieza de trabajo -apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Promedio de Compra +apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Precio promedio de compra DocType: Task,Actual Time (in Hours),Tiempo actual (En horas) DocType: Employee,History In Company,Historia en la Compañia -apps/erpnext/erpnext/config/learn.py +92,Newsletters,Boletines +apps/erpnext/erpnext/config/learn.py +92,Newsletters,Boletín de noticias DocType: Address,Shipping,Envío DocType: Stock Ledger Entry,Stock Ledger Entry,Entradas en el mayor de inventarios DocType: Department,Leave Block List,Lista de días bloqueados @@ -3220,7 +3234,7 @@ apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not s DocType: Accounts Settings,Accounts Settings,Configuración de cuentas DocType: Customer,Sales Partner and Commission,Comisiones y socios de ventas apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,PLANTEL Y MAQUINARIA -DocType: Sales Partner,Partner's Website,Sitio Web del Socio +DocType: Sales Partner,Partner's Website,Sitio web de socio DocType: Opportunity,To Discuss,Para discusión DocType: SMS Settings,SMS Settings,Ajustes de SMS apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,CUENTAS TEMPORALES @@ -3233,70 +3247,70 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,La unidad de medida (UdM) predeterminada para la variante debe ser la misma que la plantilla DocType: DocField,Fold,Plegar DocType: Production Order Operation,Production Order Operation,Operación en la orden de producción -DocType: Pricing Rule,Disable,Inhabilitar +DocType: Pricing Rule,Disable,Desactivar DocType: Project Task,Pending Review,Pendiente de revisar apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Por favor, especifique" DocType: Task,Total Expense Claim (via Expense Claim),Total reembolso (Vía reembolso de gastos) apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID del cliente -DocType: Page,Page Name,Nombre de la Página +DocType: Page,Page Name,Nombre de la página apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tiempo debe ser mayor que From Time -DocType: Journal Entry Account,Exchange Rate,Tipo de Cambio -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Órden de Venta {0} no esta validada -apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: Cuenta Padre{1} no pertenece a la empresa {2} -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Acabado husillo -DocType: BOM,Last Purchase Rate,Tasa de Cambio de la Última Compra +DocType: Journal Entry Account,Exchange Rate,Tipo de cambio +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Órden de venta {0} no esta validada +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: La cuenta padre {1} no pertenece a la empresa {2} +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindle finishing +DocType: BOM,Last Purchase Rate,Tasa de cambio de última compra DocType: Account,Asset,Activo DocType: Project Task,Task ID,Tarea ID -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","por ejemplo ""MC """ +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","por ejemplo ""MC""" apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes ,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor DocType: System Settings,Time Zone,Zona Horaria apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Almacén {0} no existe apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrarse en el Hub de ERPNext -DocType: Monthly Distribution,Monthly Distribution Percentages,Los porcentajes de distribución mensuales +DocType: Monthly Distribution,Monthly Distribution Percentages,Porcentajes de distribución mensuales apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiales entregados para esta nota de entrega apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Grapado DocType: Customer,Customer Details,Datos de cliente -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formación DocType: Employee,Reports to,Informes al DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para el receptor no DocType: Sales Invoice,Paid Amount,Cantidad pagada apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Cuenta de cierre {0} debe ser de tipo 'Patrimonio' ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje DocType: Item Variant,Item Variant,Variante del producto -apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Al establecer esta plantilla de dirección por defecto ya que no hay otra manera predeterminada +apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Establecer esta plantilla de dirección por defecto ya que no existe una predeterminada apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito""" -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de la Calidad +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de calidad DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente DocType: Payment Tool Detail,Against Voucher No,Comprobante No. apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}" DocType: Employee External Work History,Employee External Work History,Historial de de trabajos anteriores DocType: Tax Rule,Purchase,Compra apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance -DocType: Item Group,Parent Item Group,Grupo Principal de Artículos +DocType: Item Group,Parent Item Group,Grupo principal de productos apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1} -apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centros de Costos +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centros de costos apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Almacenes. DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tasa por la cual la divisa del proveedor es convertida como moneda base de la compañía -apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictos con fila {1} +apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Línea #{0}: tiene conflictos de tiempo con la linea {1} DocType: Opportunity,Next Contact,Siguiente contacto -DocType: Employee,Employment Type,Tipo de Empleo +DocType: Employee,Employment Type,Tipo de empleo apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ACTIVOS FIJOS DocType: Item Group,Default Expense Account,Cuenta de gastos por defecto DocType: Employee,Notice (days),Aviso (días) DocType: Page,Yes,Sí -DocType: Tax Rule,Sales Tax Template,Plantilla de Impuesto a las Ventas +DocType: Tax Rule,Sales Tax Template,Plantilla de impuesto sobre ventas DocType: Employee,Encashment Date,Fecha de cobro apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroformado apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","El tipo de comprobante debe pertenecer a orden de compra, factura de compra o registro de diario" -DocType: Account,Stock Adjustment,AJUSTE DE EXISTENCIAS +DocType: Account,Stock Adjustment,Ajuste de existencias apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe una actividad de costo por defecto para la actividad del tipo - {0} DocType: Production Order,Planned Operating Cost,Costos operativos planeados apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nuevo {0} Nombre apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}" DocType: Job Applicant,Applicant Name,Nombre del Solicitante -DocType: Authorization Rule,Customer / Item Name,Cliente / Nombre de Artículo +DocType: Authorization Rule,Customer / Item Name,Cliente / Nombre de artículo DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"". @@ -3306,7 +3320,7 @@ For Example: If you are selling Laptops and Backpacks separately and have a spec Note: BOM = Bill of Materials","Grupo Global de la ** ** Los productos que en otro artículo ** **. Esto es útil si usted está empaquetando unas determinadas Artículos ** ** en un paquete y mantener un balance de los ** Los productos envasados ​​** y no el agregado ** ** Artículo. El paquete ** ** Artículo tendrá "Es el archivo de artículos" como "No" y "¿Es artículo de ventas" como "Sí". Por ejemplo: Si usted está vendiendo ordenadores portátiles y Mochilas por separado y tienen un precio especial si el cliente compra a la vez, entonces el ordenador portátil + Mochila será un nuevo paquete de productos de artículos. Nota: BOM = Lista de materiales" apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0} DocType: Item Variant Attribute,Attribute,Atributo -apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique desde / hasta oscilar" +apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique el rango (desde / hasta)" sites/assets/js/desk.min.js +7652,Created By,Creado por DocType: Serial No,Under AMC,Bajo AMC apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,La tasa de valorización del producto se vuelve a calcular considerando los costos adicionales del voucher @@ -3317,34 +3331,35 @@ DocType: Production Order,Warehouses,Almacenes apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,IMPRESIONES Y PAPELERÍA apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Agrupar por nota DocType: Payment Reconciliation,Minimum Amount,Importe mínimo -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualización de las Mercancías Terminadas -DocType: Workstation,per hour,por horas -apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serie {0} ya se utiliza en {1} +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualizar mercancía terminada +DocType: Workstation,per hour,por hora +apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Secuencia {0} ya utilizada en {1} DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén. DocType: Company,Distribution,Distribución -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos +sites/assets/js/erpnext.min.js +50,Amount Paid,Total Pagado +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de proyectos apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despacho -apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}% +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para el producto: {0} es {1}% DocType: Customer,Default Taxes and Charges,Impuestos y cargos por defecto -DocType: Account,Receivable,Cuenta por Cobrar +DocType: Account,Receivable,A cobrar DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol autorizado para validar las transacciones que excedan los límites de crédito establecidos. DocType: Sales Invoice,Supplier Reference,Referencia del Proveedor DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Si se selecciona, la Solicitud de Materiales para los elementos de sub-ensamble será considerado para conseguir materias primas. De lo contrario , todos los elementos de sub-ensamble serán tratados como materia prima ." -DocType: Material Request,Material Issue,Incidencia de Material +DocType: Material Request,Material Issue,Incidencia de material DocType: Hub Settings,Seller Description, Descripción del Vendedor DocType: Employee Education,Qualification,Calificación -DocType: Item Price,Item Price,Precios de Productos +DocType: Item Price,Item Price,Precio de productos apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Jabón y Detergente -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Imagén en Movimiento y Vídeo -apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo +apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a DocType: Warehouse,Warehouse Name,Nombre del Almacén DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---" DocType: Journal Entry,Write Off Entry,Diferencia de desajuste -DocType: BOM,Rate Of Materials Based On,Cambio de materiales basados ​​en +DocType: BOM,Rate Of Materials Based On,Valor de materiales basado ​​en apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitico de Soporte -apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Compañía no se encuentra en los almacenes {0} +apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Defina la compañía en los almacenes {0} DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Herramienta para cambiar Unidad de Medida DocType: POS Profile,Terms and Conditions,Términos y condiciones apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0} @@ -3364,15 +3379,15 @@ DocType: Email Digest,Add/Remove Recipients,Añadir / Quitar Destinatarios apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0} apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este Año Fiscal como Predeterminado , haga clic en "" Establecer como Predeterminado """ apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante para el apoyo de id de correo electrónico. (ej. support@example.com ) -apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Escasez Cantidad +apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Cantidad faltante apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos -DocType: Salary Slip,Salary Slip,Planilla +DocType: Salary Slip,Salary Slip,Nómina salarial apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruñido apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Hasta la fecha' es requerido DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar etiquetas de embalaje, para los paquetes que serán entregados, usados para notificar el numero, contenido y peso del paquete, " DocType: Sales Invoice Item,Sales Order Item,Articulo de la Solicitud de Venta -DocType: Salary Slip,Payment Days,Días de Pago -DocType: BOM,Manage cost of operations,Administrar el costo de las operaciones +DocType: Salary Slip,Payment Days,Días de pago +DocType: BOM,Manage cost of operations,Administrar costo de las operaciones DocType: Features Setup,Item Advanced,Producto anticipado apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminación en caliente DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Cuando alguna de las operaciones comprobadas está en "" Enviado "" , una ventana emergente automáticamente se abre para enviar un correo electrónico al ""Contacto"" asociado en esa transacción , con la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico." @@ -3380,18 +3395,18 @@ apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuración global DocType: Employee Education,Employee Education,Educación del empleado DocType: Salary Slip,Net Pay,Pago Neto DocType: Account,Account,Cuenta -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Número de orden {0} ya se ha recibido -,Requested Items To Be Transferred,Artículos solicitados para ser transferido -DocType: Purchase Invoice,Recurring Id,ID Recurrente +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,El número de serie {0} ya ha sido recibido +,Requested Items To Be Transferred,Artículos solicitados para ser transferidos +DocType: Purchase Invoice,Recurring Id,ID recurrente DocType: Customer,Sales Team Details,Detalles del equipo de ventas DocType: Expense Claim,Total Claimed Amount,Total reembolso apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades de venta -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por Enfermedad +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por enfermedad DocType: Email Digest,Email Digest,Boletín por correo electrónico DocType: Delivery Note,Billing Address Name,Nombre de la dirección de facturación -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Tiendas por Departamento +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Tiendas por departamento apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Balance del Sistema -DocType: Workflow,Is Active,Está Activo +DocType: Workflow,Is Active,Está activo apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Guarde el documento primero. DocType: Account,Chargeable,Devengable @@ -3399,14 +3414,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishi DocType: Company,Change Abbreviation,Cambiar abreviación DocType: Workflow State,Primary,Primario DocType: Expense Claim Detail,Expense Date,Fecha de gasto -DocType: Item,Max Discount (%),Descuento Máximo (%) -DocType: Communication,More Information,Mas informacion +DocType: Item,Max Discount (%),Descuento máximo (%) +DocType: Communication,More Information,Mas información apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Monto de la última orden apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Voladura DocType: Company,Warn,Advertir apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valoración del producto actualizado DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros." -DocType: BOM,Manufacturing User,Usuario de Manufactura +DocType: BOM,Manufacturing User,Usuario de producción DocType: Purchase Order,Raw Materials Supplied,Materias primas suministradas DocType: Purchase Invoice,Recurring Print Format,Formato de impresión recurrente DocType: Communication,Series,Secuencia @@ -3414,10 +3429,10 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Del DocType: Appraisal,Appraisal Template,Plantilla de Evaluación DocType: Communication,Email,Correo electrónico (Email) DocType: Item Group,Item Classification,Clasificación de producto -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desarrollo de Negocios -DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la visita de mantenimiento +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de desarrollo de negocios +DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de visita apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Período -,General Ledger,Balance General +,General Ledger,Balance general apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver ofertas DocType: Item Attribute Value,Attribute Value,Valor del Atributo apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","El Email debe ser único, {0} ya existe" @@ -3454,23 +3469,23 @@ DocType: Address Template,"

    Default Template

    DocType: Salary Slip Deduction,Default Amount,Importe por defecto apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Almacén no se encuentra en el sistema apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Resumen de este Mes -DocType: Quality Inspection Reading,Quality Inspection Reading,Lectura de Inspección de Calidad +DocType: Quality Inspection Reading,Quality Inspection Reading,Lecturas de inspección de calidad apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días . -DocType: Tax Rule,Purchase Tax Template,Compra Plantilla Tributaria +DocType: Tax Rule,Purchase Tax Template,Plantilla de Impuestos sobre compras ,Project wise Stock Tracking,Seguimiento preciso del stock-- apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} ya existe para {0} DocType: Stock Entry Detail,Actual Qty (at source/target),Cantidad Actual (en origen/destino) -DocType: Item Customer Detail,Ref Code,Código Referencia +DocType: Item Customer Detail,Ref Code,Código de referencia apps/erpnext/erpnext/config/hr.py +13,Employee records.,Registros de los empleados. -DocType: HR Settings,Payroll Settings,Configuración de Nómina +DocType: HR Settings,Payroll Settings,Configuración de nómina apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados. apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Realizar pedido -apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Raíz no puede tener un centro de costes de los padres +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,la tabla raíz no puede tener un centro de costes padre / principal DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tiempo de funcionamiento debe ser mayor que 0 para la operación {0} +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0} DocType: Supplier,Address and Contacts,Dirección y contactos DocType: UOM Conversion Detail,UOM Conversion Detail,Detalle de Conversión de Unidad de Medida -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Manténgalo adecuado para la web 900px ( w ) por 100px ( h ) +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Mantenerlo adecuado para la web 900px (H) por 100px (V) apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra por cada producto DocType: Payment Tool,Get Outstanding Vouchers,Obtener comprobantes pendientes de pago @@ -3479,14 +3494,14 @@ DocType: Appraisal,Start Date,Fecha de inicio sites/assets/js/desk.min.js +7629,Value,Valor apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Asignar las ausencias para un período. apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Haga clic aquí para verificar -apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre. +apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como padre / principal. DocType: Purchase Invoice Item,Price List Rate,Tarifa de la lista de precios -DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén." +DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Mostrar 'En stock' o 'No disponible' basado en el stock disponible del almacén. apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Lista de Materiales (LdM) -DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para la recepción +DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para el envío DocType: Time Log,Hours,Horas DocType: Project,Expected Start Date,Fecha prevista de inicio -apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rodando +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rodado DocType: ToDo,Priority,Prioridad apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Eliminar el elemento si los cargos no son aplicables al mismo DocType: Dropbox Backup,Dropbox Access Allowed,Acceso a Dropbox permitido @@ -3496,31 +3511,31 @@ apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receiv DocType: Maintenance Visit,Fully Completed,Terminado completamente apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completado DocType: Employee,Educational Qualification,Formación académica -DocType: Workstation,Operating Costs,Costos Operativos +DocType: Workstation,Operating Costs,Costos operativos DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de ausencias de empleados -apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestra lista de Newsletter. -apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Linea {0}: Una entrada de abastecimiento ya existe para el almacén {1} -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha." +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestro boletín de noticias +apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1} +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque la cotización ha sido hecha." apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanizado por haz de electrones DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,La orden de producción {0} debe ser enviada +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,La orden de producción {0} debe ser validada apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}" apps/erpnext/erpnext/config/stock.py +141,Main Reports,Informes Generales apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Saldo de Apertura de Libro Mayor de Inventarios han sido actualizados apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual -DocType: Purchase Receipt Item,Prevdoc DocType,DocType Prevdoc +DocType: Purchase Receipt Item,Prevdoc DocType,DocType Previo apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Añadir / Editar Precios apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Centros de costos -,Requested Items To Be Ordered,Solicitud de Productos Aprobados +,Requested Items To Be Ordered,Requisiciones pendientes para ser ordenadas apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Mis pedidos DocType: Price List,Price List Name,Nombre de la lista de precios -DocType: Time Log,For Manufacturing,Por fabricación +DocType: Time Log,For Manufacturing,Para producción apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totales -DocType: BOM,Manufacturing,Producción -,Ordered Items To Be Delivered,Artículos pedidos para ser entregados +DocType: BOM,Manufacturing,Manufactura +,Ordered Items To Be Delivered,Ordenes pendientes de entrega DocType: Account,Income,Ingresos ,Setup Wizard,Asistente de configuración -DocType: Industry Type,Industry Type,Tipo de Industria +DocType: Industry Type,Industry Type,Tipo de industria apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo salió mal! apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las fechas bloqueadas apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado @@ -3528,7 +3543,7 @@ apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_st DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Divisa por defecto) apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundición a presión DocType: Email Alert,Reference Date,Fecha de referencia -apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unidad de Organización ( departamento) maestro. +apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unidad de la organización (departamento) maestro. apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, ingrese un numero de móvil válido" DocType: Budget Detail,Budget Detail,Detalle del presupuesto apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, ingrese el mensaje antes de enviarlo" @@ -3537,19 +3552,19 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u DocType: Company History,Year,Año apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Perfiles de punto de venta POS apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Por favor, actualizar la configuración SMS" -apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Hora de registro {0} ya facturado +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,La gestión de tiempos {0} ya se encuentra facturada apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,PRESTAMOS SIN GARANTÍA -DocType: Cost Center,Cost Center Name,Nombre Centro de Costo +DocType: Cost Center,Cost Center Name,Nombre del centro de costos apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,El elemento {0} con No. de serie {1} ya está instalado DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista -apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Pagado Amt -DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes de más de 160 caracteres se dividirá en varios mensajes -DocType: Purchase Receipt Item,Received and Accepted,Recibidos y Aceptados -,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Monto total pagado +DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes con más de 160 caracteres se dividirá en varios envios +DocType: Purchase Receipt Item,Received and Accepted,Recibidos y aceptados +,Serial No Service Contract Expiry,Número de serie de expiracion del contrato de servicios DocType: Item,Unit of Measure Conversion,Conversión unidad de medida -apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleado no se puede cambiar +apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,El empleado no se puede cambiar apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo -DocType: Naming Series,Help HTML,Ayuda HTML +DocType: Naming Series,Help HTML,Ayuda 'HTML' apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0} apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1} DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece. @@ -3562,12 +3577,12 @@ DocType: Lead,Converted,Convertido DocType: Item,Has Serial No,Posee No. de serie DocType: Employee,Date of Issue,Fecha de emisión apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Desde {0} hasta {1} -DocType: Issue,Content Type,Tipo de Contenido +DocType: Issue,Content Type,Tipo de contenido apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computadora DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web. apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa" apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema -apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado +apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado' DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas DocType: Cost Center,Budgets,Presupuestos apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualizado @@ -3575,10 +3590,10 @@ DocType: Employee,Emergency Contact Details,Detalles de contacto de emergencia apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,¿Qué hace? DocType: Delivery Note,To Warehouse,Para Almacén apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1} -,Average Commission Rate,Tasa de Comisión Promedio +,Average Commission Rate,Tasa de comisión promedio apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario" apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras -DocType: Pricing Rule,Pricing Rule Help,Ayuda de Regla de Precios +DocType: Pricing Rule,Pricing Rule Help,Ayuda de regla de precios DocType: Purchase Taxes and Charges,Account Head,Cuenta matriz apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualización de los costes adicionales para el cálculo del precio al desembarque de artículos apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico @@ -3588,26 +3603,26 @@ apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Pendiente apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Desde reclamo de garantía DocType: Stock Entry,Default Source Warehouse,Almacén de origen -DocType: Item,Customer Code,Código de Cliente +DocType: Item,Customer Code,Código de cliente apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Recordatorio de cumpleaños para {0} apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Pulido -apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Días desde el último pedido +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Días desde la última orden apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance DocType: Buying Settings,Naming Series,Secuencias e identificadores DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones DocType: User,Enabled,Habilitado -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,INVENTARIOS -apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},¿Realmente desea enviar toda la nómina para el mes {0} y año {1} +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios +apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},¿Realmente desea validar toda la nómina salarial para el mes {0} y año {1} apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importar suscriptores DocType: Target Detail,Target Qty,Cantidad Objetivo DocType: Attendance,Present,Presente -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La nota de entrega {0} no debe estar presentada DocType: Notification Control,Sales Invoice Message,Mensaje de la Factura DocType: Authorization Rule,Based On,Basado en -,Ordered Qty,Cantidad Pedida -DocType: Stock Settings,Stock Frozen Upto,Inventario Congelado hasta -apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Actividad del Proyecto / Tarea. -apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generar etiquetas salariales +,Ordered Qty,Cantidad ordenada +DocType: Stock Settings,Stock Frozen Upto,Inventario congelado hasta +apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Actividad del proyecto / tarea. +apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generar nóminas salariales apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} no es un ID de correo electrónico (Email) válido apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra debe comprobarse, si se selecciona Aplicable Para como {0}" apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,El descuento debe ser inferior a 100 @@ -3622,43 +3637,43 @@ DocType: Offer Letter,Offer Letter Terms,Términos y condiciones de carta de ofe DocType: Features Setup,To track any installation or commissioning related work after sales,Para el seguimiento de cualquier instalación o puesta en obra relacionada postventa DocType: Project,Estimated Costing,Cálculo del costo estimado DocType: Purchase Invoice Advance,Journal Entry Detail No,Detalle de comprobante No. -DocType: Employee External Work History,Salary,Salario +DocType: Employee External Work History,Salary,Salario. DocType: Serial No,Delivery Document Type,Tipo de documento de entrega -DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presentar todas las nóminas para los criterios seleccionados anteriormente +DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presentar todas las nóminas salariales según los criterios seleccionados anteriormente apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} productos sincronizados -DocType: Sales Order,Partly Delivered,Parcialmente Entregado +DocType: Sales Order,Partly Delivered,Parcialmente entregado DocType: Sales Invoice,Existing Customer,Cliente existente -DocType: Email Digest,Receivables,Cuentas por Cobrar +DocType: Email Digest,Receivables,Cuentas por cobrar DocType: Customer,Additional information regarding the customer.,Información adicional referente al cliente. DocType: Quality Inspection Reading,Reading 5,Lectura 5 DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Ingrese el ID de correo electrónico separados por comas, la orden será enviada automáticamente en una fecha particular" apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Es necesario ingresar el nombre de la campaña -DocType: Maintenance Visit,Maintenance Date,Fecha de Mantenimiento -DocType: Purchase Receipt Item,Rejected Serial No,Rechazado Serie No +DocType: Maintenance Visit,Maintenance Date,Fecha de mantenimiento +DocType: Purchase Receipt Item,Rejected Serial No,No. de serie rechazado apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Embutición profunda -apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nuevo Boletín -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el punto {0} -apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostrar Balance +apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nuevo boletín +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el producto {0} +apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostrar balance DocType: Item,"Example: ABCD.##### If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Ejemplo:. ABCD ##### - Si la serie se establece y Número de Serie no se menciona en las transacciones, entonces se creara un número de serie automático sobre la base de esta serie. Si siempre quiere mencionar explícitamente los números de serie para este artículo, déjelo en blanco." -DocType: Upload Attendance,Upload Attendance,Subir Asistencia -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar. + Si la serie se establece y el número de serie no se menciona en las transacciones, entonces se creara un número de serie automático sobre la base de esta serie. Si siempre quiere mencionar explícitamente los números de serie para este artículo, déjelo en blanco." +DocType: Upload Attendance,Upload Attendance,Subir asistencia +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a manufacturar. apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2 DocType: Journal Entry Account,Amount,Importe apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Remachado apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada ,Sales Analytics,Análisis de Ventas -DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Manufacturación -apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuración de Correo +DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de producción +apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuración de correo apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Por favor, ingrese la divisa por defecto en la compañía principal" DocType: Stock Entry Detail,Stock Entry Detail,Detalle de la Entrada de Inventario apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Recordatorios diarios apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflictos norma fiscal con {0} apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nombre de nueva cuenta -DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coste materias primas suministradas -DocType: Selling Settings,Settings for Selling Module,Ajustes para vender Módulo -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al Cliente +DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo materias primas suministradas +DocType: Selling Settings,Settings for Selling Module,Ajustes para módulo de ventas +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al cliente DocType: Item,Thumbnail,Miniatura DocType: Item Customer Detail,Item Customer Detail,Detalle del producto para el cliente apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme su Email @@ -3676,33 +3691,33 @@ apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Error: No es apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,El producto {0} debe ser un producto para la venta DocType: Naming Series,Update Series Number,Actualizar número de serie DocType: Account,Equity,Patrimonio -DocType: Sales Order,Printing Details,Detalles de Impresión -DocType: Task,Closing Date,Fecha de Cierre +DocType: Sales Order,Printing Details,Detalles de impresión +DocType: Task,Closing Date,Fecha de cierre DocType: Sales Order Item,Produced Quantity,Cantidad producida apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero -apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Asambleas Buscar Sub -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Código del producto requerido en la linea: {0} -DocType: Sales Partner,Partner Type,Tipo de Socio +apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Buscar Sub-ensamblajes +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Código del producto requerido en la línea: {0} +DocType: Sales Partner,Partner Type,Tipo de socio DocType: Purchase Taxes and Charges,Actual,Actual -DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento +DocType: Authorization Rule,Customerwise Discount,Descuento de cliente DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos -DocType: Production Order,Production Order,Orden de Producción +DocType: Production Order,Production Order,Orden de producción apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado DocType: Quotation Item,Against Docname,Contra Docname DocType: SMS Center,All Employee (Active),Todos los Empleados (Activos) apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccione el período en que la factura se generará de forma automática -DocType: BOM,Raw Material Cost,Costo de la Materia Prima -DocType: Item,Re-Order Level,Nivel mínimo de stock +DocType: BOM,Raw Material Cost,Costo de materia prima +DocType: Item,Re-Order Level,Nivel mínimo de stock. DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis. -sites/assets/js/list.min.js +174,Gantt Chart,Diagrama de Gantt -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Tiempo Parcial +sites/assets/js/list.min.js +174,Gantt Chart,Diagrama Gantt +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Tiempo parcial DocType: Employee,Applicable Holiday List,Lista de días festivos DocType: Employee,Cheque,CHEQUE -apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Actualizado -apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo de informe es obligatorio -DocType: Item,Serial Number Series,Número de Serie Serie -apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la linea {1} +apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Secuencia actualizada +apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,El tipo de reporte es obligatorio +DocType: Item,Serial Number Series,Secuencia del número de serie +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la línea {1} apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Ventas al por menor y por mayor DocType: Issue,First Responded On,Primera respuesta el DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos @@ -3719,15 +3734,15 @@ DocType: BOM,Materials,Materiales DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no está marcada, la lista tendrá que ser añadida a cada departamento donde será aplicada." apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra. -,Item Prices,Precios de los Artículos +,Item Prices,Precios de los productos DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,La cantidad en palabras será visible una vez que guarde la orden de compra. DocType: Period Closing Voucher,Period Closing Voucher,Cierre de período apps/erpnext/erpnext/config/stock.py +125,Price List master.,Configuracion de las listas de precios -DocType: Task,Review Date,Fecha de Revisión +DocType: Task,Review Date,Fecha de revisión DocType: Purchase Invoice,Advance Payments,Pagos adelantados DocType: DocPerm,Level,Nivel DocType: Purchase Taxes and Charges,On Net Total,Sobre el total neto -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la linea {0} deben ser los mismos para la orden de producción +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la línea {0} deben ser los mismos para la orden de producción apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Email de notificación' no especificado para %s recurrentes apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Molienda @@ -3736,30 +3751,30 @@ DocType: Company,Round Off Account,Cuenta de redondeo por defecto apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Mordisqueando apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,GASTOS DE ADMINISTRACIÓN apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consuloría -DocType: Customer Group,Parent Customer Group,Categoría de cliente principal +DocType: Customer Group,Parent Customer Group,Categoría principal de cliente sites/assets/js/erpnext.min.js +50,Change,Cambio DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',La órden de compra {0} esta 'Detenida' DocType: Appraisal Goal,Score Earned,Puntuación Obtenida -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """ -apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de Notificación +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por ejemplo ""Mi Compañia LLC""" +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de notificación DocType: Bank Reconciliation Detail,Voucher ID,Comprobante ID apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Este es un territorio raíz y no se puede editar . -DocType: Packing Slip,Gross Weight UOM,Peso Bruto de la Unidad de Medida -DocType: Email Digest,Receivables / Payables,Cobrables/ Pagables +DocType: Packing Slip,Gross Weight UOM,Peso bruto de la unidad de medida (UdM) +DocType: Email Digest,Receivables / Payables,Por cobrar / Por pagar DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venta apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampado DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores en cero -DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del punto obtenido después de la fabricación / reempaque de cantidades determinadas de materias primas +DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del producto obtenido después de la fabricación / empaquetado desde las cantidades determinadas de materia prima DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Pagar DocType: Delivery Note Item,Against Sales Order Item,Contra la orden de venta del producto -apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor del atributo {0}" +apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}" DocType: Item,Default Warehouse,Almacén por defecto DocType: Task,Actual End Date (via Time Logs),Fecha de finalización (gestión de tiempos) apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0} -apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Por favor, ingrese el centro de costos maestro" -DocType: Delivery Note,Print Without Amount,Imprimir sin Importe +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Por favor, ingrese el centro de costos principal" +DocType: Delivery Note,Print Without Amount,Imprimir sin importe apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario" DocType: User,Last Name,Apellido DocType: Web Page,Left,Inactivo/Fuera @@ -3771,7 +3786,7 @@ DocType: Batch,Batch,Lotes de Producto apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos) DocType: User,Gender,Género -DocType: Journal Entry,Debit Note,Nota de Débito +DocType: Journal Entry,Debit Note,Nota de débito DocType: Stock Entry,As per Stock UOM,Unidad de Medida Según Inventario apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,No ha expirado DocType: Journal Entry,Total Debit,Débito Total @@ -3781,116 +3796,117 @@ DocType: Sales Invoice,Cold Calling,Llamadas en frío DocType: SMS Parameter,SMS Parameter,Parámetros SMS DocType: Maintenance Schedule Item,Half Yearly,Semestral DocType: Lead,Blog Subscriber,Suscriptor del Blog -apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores . +apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores. DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día." DocType: Purchase Invoice,Total Advance,Total Anticipo apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Continuar requisición de materiales DocType: Workflow State,User,Usuario -apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Procesamiento de Nómina +apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Procesando nómina DocType: Opportunity Item,Basic Rate,Precio base DocType: GL Entry,Credit Amount,Importe acreditado -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Establecer como Perdidos +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Establecer como perdido DocType: Customer,Credit Days Based On,Días de crédito basados en DocType: Tax Rule,Tax Rule,Regla fiscal DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantener mismo precio durante todo el ciclo de ventas DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear las horas adicionales en la estación de trabajo. apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} ya ha sido presentado ,Items To Be Requested,Solicitud de Productos -DocType: Purchase Order,Get Last Purchase Rate,Obtenga último precio de compra +DocType: Purchase Order,Get Last Purchase Rate,Obtener último precio de compra DocType: Time Log,Billing Rate based on Activity Type (per hour),Monto de facturación basado en el tipo de actividad (por hora) DocType: Company,Company Info,Información de la compañía apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Email de la compañía no encontrado, por lo que el correo no ha sido enviado" apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),UTILIZACIÓN DE FONDOS (ACTIVOS) DocType: Production Planning Tool,Filter based on item,Filtro basado en producto -DocType: Fiscal Year,Year Start Date,Fecha de Inicio -DocType: Attendance,Employee Name,Nombre del Empleado +DocType: Fiscal Year,Year Start Date,Fecha de inicio +DocType: Attendance,Employee Name,Nombre de empleado DocType: Sales Invoice,Rounded Total (Company Currency),Total redondeado (Divisa por defecto) apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'. -DocType: Purchase Common,Purchase Common,Compra Común +DocType: Purchase Common,Purchase Common,Compra común apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar. -DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permitir a los usuarios crear solicitudes de ausencia los siguientes días. +DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permitir a los usuarios crear solicitudes de ausencia en los siguientes días. apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Desde oportunidades apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supresión apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de empleados DocType: Sales Invoice,Is POS,Es POS -apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la linea {1} -DocType: Production Order,Manufactured Qty,Cantidad Fabricada +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1} +DocType: Production Order,Manufactured Qty,Cantidad producida DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Listado de facturas emitidas a los clientes. -DocType: DocField,Default,Defecto +DocType: DocField,Default,Predeterminado apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2} apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} suscriptores añadidos DocType: Maintenance Schedule,Schedule,Horario DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Defina el presupuesto para este centro de costos, puede configurarlo en 'Listado de compañía'" -DocType: Account,Parent Account,Cuenta Primaria +DocType: Account,Parent Account,Cuenta principal DocType: Quality Inspection Reading,Reading 3,Lectura 3 ,Hub,Centro de actividades DocType: GL Entry,Voucher Type,Tipo de comprobante +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,La lista de precios no existe o está deshabilitada. DocType: Expense Claim,Approved,Aprobado DocType: Pricing Rule,Price,Precio apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda""" -DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este artículo que se puede ver en la máster de No de Serie." +DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este producto que se podrá ver en el numero de serie principal" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Evaluación {0} creado por Empleado {1} en el rango de fechas determinado DocType: Employee,Education,Educación DocType: Selling Settings,Campaign Naming By,Ordenar campañas por -DocType: Employee,Current Address Is,La Dirección Actual es +DocType: Employee,Current Address Is,La dirección actual es DocType: Address,Office,Oficina apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes Estándares apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entradas en el diario de contabilidad. apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado." -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Linea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4} apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para crear una Cuenta de impuestos apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos" DocType: Account,Stock,Existencias -DocType: Employee,Current Address,Dirección Actual +DocType: Employee,Current Address,Dirección actual DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si el artículo es una variante de otro artículo entonces la descripción, imágenes, precios, impuestos, etc. se establecerán a partir de la plantilla a menos que se especifique explícitamente" -DocType: Serial No,Purchase / Manufacture Details,Detalles de compra / fabricación +DocType: Serial No,Purchase / Manufacture Details,Detalles de compra / producción apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Inventario de lotes DocType: Employee,Contract End Date,Fecha de finalización de contrato DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener ordenes de venta (pendientes de entrega) basadas en los criterios anteriores DocType: DocShare,Document Type,Tipo de Documento -apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Desde cotización del proveedor -DocType: Deduction Type,Deduction Type,Tipo de Deducción +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Desde cotización de proveedor +DocType: Deduction Type,Deduction Type,Tipo de deducción DocType: Attendance,Half Day,Medio Día -DocType: Pricing Rule,Min Qty,Cantidad Mínima +DocType: Pricing Rule,Min Qty,Cantidad mínima DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Para realizar un seguimiento de artículos en ventas y documentos de compra con los números de lote. "Industria Preferida: Químicos" -DocType: GL Entry,Transaction Date,Fecha de Transacción -DocType: Production Plan Item,Planned Qty,Cantidad Planificada +DocType: GL Entry,Transaction Date,Fecha de transacción +DocType: Production Plan Item,Planned Qty,Cantidad planificada apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Impuesto Total -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Por cantidad (cantidad fabricada) es obligatoria DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Divisa por defecto) -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Linea {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar -DocType: Notification Control,Purchase Receipt Message,Mensaje de Recibo de Compra +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Línea {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar +DocType: Notification Control,Purchase Receipt Message,Mensaje de recibo de compra DocType: Production Order,Actual Start Date,Fecha de inicio actual DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados para esta orden de venta apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Movimientos de inventario DocType: Newsletter List Subscriber,Newsletter List Subscriber,Lista de suscriptores al boletín apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar -DocType: Email Account,Service,SERVICIOS +DocType: Email Account,Service,Servicios DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades -DocType: Project,Gross Margin %,Margen Bruto % +DocType: Project,Gross Margin %,Margen bruto % DocType: BOM,With Operations,Con operaciones apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Asientos contables ya se han hecho en moneda {0} para la compañía de {1}. Por favor, seleccione una cuenta por cobrar o por pagar con la moneda {0}." -,Monthly Salary Register,Registar Salario Mensual +,Monthly Salary Register,Registar salario mensual apps/frappe/frappe/website/template.py +123,Next,Siguiente DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente DocType: BOM Operation,BOM Operation,Operación de la lista de materiales (LdM) apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropulido -DocType: Purchase Taxes and Charges,On Previous Row Amount,Sobre la linea anterior -apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Por favor, ingrese el importe pagado en una linea" -DocType: POS Profile,POS Profile,Perfiles POS +DocType: Purchase Taxes and Charges,On Previous Row Amount,Sobre la línea anterior +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Por favor, ingrese el importe pagado en una línea" +DocType: POS Profile,POS Profile,Perfil de POS apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc." -apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Linea {0}: El importe de pago no puede ser superior al monto pendiente de pago +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Línea {0}: El importe de pago no puede ser superior al monto pendiente de pago apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total no pagado -apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Registro de Horas no es Facturable +apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,La gestión de tiempos no se puede facturar apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes" apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador -apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salario neto no puede ser negativo +apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,El salario neto no puede ser negativo apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Por favor, ingrese los recibos correspondientes manualmente" DocType: SMS Settings,Static Parameters,Parámetros estáticos DocType: Purchase Order,Advance Paid,Pago Anticipado @@ -3902,7 +3918,7 @@ DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar impues apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantidad actual es obligatoria apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-balanceo apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,TARJETA DE CRÉDITO -DocType: BOM,Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo +DocType: BOM,Item to be manufactured or repacked,Producto a manufacturar o re-empacar apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario. DocType: Purchase Invoice,Next Date,Siguiente fecha DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas @@ -3911,50 +3927,51 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machinin DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede ingresar los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos" DocType: Hub Settings,Seller Name,Nombre del Vendedor DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y gastos deducibles (Divisa por defecto) -DocType: Item Group,General Settings,Configuración General -apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,'Desde Divisa' y 'A Divisa' no pueden ser las mismas -DocType: Stock Entry,Repack,Vuelva a embalar +DocType: Item Group,General Settings,Configuración general +apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,'Desde moneda - a moneda' no pueden ser las mismas +DocType: Stock Entry,Repack,Re-empacar apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Debe guardar el formulario antes de proceder -DocType: Item Attribute,Numeric Values,Los valores numéricos +DocType: Item Attribute,Numeric Values,Valores numéricos apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Adjuntar logo DocType: Customer,Commission Rate,Comisión de ventas -apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Hacer Variant +apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Crear variante apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquear solicitudes de ausencias por departamento. apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,El carrito esta vacío. DocType: Production Order,Actual Operating Cost,Costo de operación actual -apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root no se puede editar . +apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Usuario root no se puede editar. apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe no ajustado DocType: Manufacturing Settings,Allow Production on Holidays,Permitir producción en días festivos -DocType: Sales Order,Customer's Purchase Order Date,Fecha de Pedido de Compra del Cliente +DocType: Sales Order,Customer's Purchase Order Date,Fecha de pedido de compra del cliente apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,CAPITAL SOCIAL -DocType: Packing Slip,Package Weight Details,Peso Detallado del Paquete +DocType: Packing Slip,Package Weight Details,Detalles del peso del paquete apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, seleccione un archivo csv" -DocType: Dropbox Backup,Send Backups to Dropbox,Enviar copias de seguridad de Dropbox +DocType: Dropbox Backup,Send Backups to Dropbox,Enviar copias de seguridad hacia Dropbox DocType: Purchase Order,To Receive and Bill,Para Recibir y pagar apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Diseñador -apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantillas de Términos y Condiciones +apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantillas de términos y condiciones DocType: Serial No,Delivery Details,Detalles de la entrega -apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la linea {0} en la tabla Impuestos para el tipo {1} +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1} DocType: Item,Automatically create Material Request if quantity falls below this level,Crear automáticamente una 'requisición de materiales' si la cantidad es inferior a este nivel -,Item-wise Purchase Register,Detalle de Compras +,Item-wise Purchase Register,Detalle de compras DocType: Batch,Expiry Date,Fecha de caducidad apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para establecer el nivel de pedido, artículo debe ser un artículo de compra o fabricación de artículos" -,Supplier Addresses and Contacts,Libreta de Direcciones de Proveedores +,Supplier Addresses and Contacts,Libreta de direcciones de proveedores apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Por favor, seleccione primero la categoría" apps/erpnext/erpnext/config/projects.py +18,Project master.,Proyecto maestro DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Medio día) DocType: Supplier,Credit Days,Días de crédito -DocType: Leave Type,Is Carry Forward,Es llevar adelante -apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obtener elementos de la Solicitud de Materiales -apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de Entrega en Días +DocType: Leave Type,Is Carry Forward,Es un traslado +apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obtener elementos desde la 'lista de materiales' +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Días de iniciativa apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de materiales (LdM) -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Linea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1} DocType: Dropbox Backup,Send Notifications To,Enviar notificaciones a -apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Fecha Ref -DocType: Employee,Reason for Leaving,Razones de Renuncia +apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Fecha Ref. +DocType: Employee,Reason for Leaving,Razones de renuncia DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado DocType: GL Entry,Is Opening,De apertura -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Linea {0}: La entrada de débito no puede vincularse con {1} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1} apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Cuenta {0} no existe DocType: Account,Cash,EFECTIVO DocType: Employee,Short biography for website and other publications.,Breve biografía para la página web y otras publicaciones. diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv index 33246befc1..f36f1530b3 100644 --- a/erpnext/translations/fa.csv +++ b/erpnext/translations/fa.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,نمایش ا DocType: Sales Invoice Item,Quantity,مقدار apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),وام (بدهی) DocType: Employee Education,Year of Passing,سال عبور +sites/assets/js/erpnext.min.js +27,In Stock,در انبار apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,می توانید تنها پرداخت در مقابل unbilled را سفارش فروش را DocType: Designation,Designation,تعیین DocType: Production Plan Item,Production Plan Item,تولید مورد طرح @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,تنظیمات بر DocType: SMS Center,SMS Center,مرکز SMS apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,صاف DocType: BOM Replace Tool,New BOM,BOM جدید +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,دسته سیاههها زمان برای صدور صورت حساب. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,ریخته گری Countergravity apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,عضویت در خبرنامه قبلا ارسال شده است DocType: Lead,Request Type,درخواست نوع @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,جدید بورس UOM DocType: Period Closing Voucher,Closing Account Head,بستن سر حساب DocType: Employee,External Work History,سابقه کار خارجی apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,خطا مرجع مدور +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,آیا شما واقعا می خواهید برای جلوگیری DocType: Communication,Closed,بسته DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,به عبارت (صادرات) قابل مشاهده خواهد بود یک بار شما را تحویل توجه را نجات دهد. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,آیا مطمئن هستید که می خواهید برای جلوگیری DocType: Lead,Industry,صنعت DocType: Employee,Job Profile,نمایش شغلی DocType: Newsletter,Newsletter,عضویت در خبرنامه @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,تعاد apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,در حال حاضر ارسال ,Support Analytics,تجزیه و تحلیل ترافیک پشتیبانی DocType: Item,Website Warehouse,انبار وب سایت +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,آیا شما واقعا می خواهید برای جلوگیری سفارش تولید: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",روز از ماه که در آن خودکار صورتحساب خواهد شد به عنوان مثال 05، 28 و غیره تولید apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,امتیاز باید کمتر از یا برابر با 5 است apps/erpnext/erpnext/config/accounts.py +169,C-Form records,سوابق C-فرم @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,سف DocType: SMS Center,All Lead (Open),همه سرب (باز) DocType: Purchase Invoice,Get Advances Paid,دریافت پیشرفت پرداخت apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ضمیمه تصویر شما +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,ساخت DocType: Journal Entry,Total Amount in Words,مقدار کل به عبارت DocType: Workflow State,Stop,توقف apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,یک خطای وجود دارد. یکی از دلایل احتمالی میتواند این باشد که شما به صورت ذخیره نیست. لطفا support@erpnext.com تماس بگیرید اگر مشکل همچنان ادامه دارد. @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,ورود را تفاوت DocType: Upload Attendance,Attendance From Date,حضور و غیاب از تاریخ DocType: Appraisal Template Goal,Key Performance Area,منطقه کلیدی کارایی apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,حمل و نقل +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,و سال: DocType: Email Digest,Annual Expense,هزینه سالانه DocType: SMS Center,Total Characters,مجموع شخصیت apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0} @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,تعطیلات DocType: Sales Order Item,Planned Quantity,تعداد برنامه ریزی شده DocType: Purchase Invoice Item,Item Tax Amount,مبلغ مالیات مورد DocType: Item,Maintain Stock,حفظ سهام +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,مطالب سهام در حال حاضر برای سفارش تولید ایجاد DocType: Leave Control Panel,Leave blank if considered for all designations,خالی بگذارید اگر برای همه در نظر گرفته نامگذاریهای apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع 'واقعی' در ردیف {0} نمی تواند در مورد نرخ شامل apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},حداکثر: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ر apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به مقدار JV {2} DocType: Item,Inventory,فهرست DocType: Features Setup,"To enable ""Point of Sale"" view",برای فعال کردن "نقطه ای از فروش" مشاهده +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,پرداخت می توانید برای سبد خرید خالی نمی شود ساخته شده DocType: Item,Sales Details,جزییات فروش apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,پین کردن DocType: Opportunity,With Items,با اقلام @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,بین وزنها apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,استخراج معدن apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ریخته گری رزین apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید. +sites/assets/js/erpnext.min.js +37,Please select {0} first.,لطفا {0} انتخاب کنید. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},متن {0} DocType: Territory,Parent Territory,سرزمین پدر و مادر DocType: Quality Inspection Reading,Reading 2,خواندن 2 @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,علامت های تجاری DocType: C-Form Invoice Detail,Invoice No,شماره فاکتور apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,از سفارش خرید DocType: Activity Cost,Costing Rate,هزینه یابی نرخ +,Customer Addresses And Contacts,آدرس و اطلاعات تماس و ضوابط DocType: Employee,Resignation Letter Date,استعفای نامه تاریخ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,مشاهده قوانین قیمت گذاری بیشتر بر اساس مقدار فیلتر شده است. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,تنظیم نشده @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,زمان ورود وضعیت باید ارائه شود. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,سریال نه {0} به هیچ انبار تعلق ندارد apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,راه اندازی +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ردیف # DocType: Purchase Invoice,In Words (Company Currency),به عبارت (شرکت ارز) DocType: Pricing Rule,Supplier,تامین کننده DocType: C-Form,Quarter,ربع @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,مراکز هزینه به علاوه می تواند در زیر گروه ساخته شده اما مطالب را می توان در برابر غیر گروه ساخته شده DocType: Project,External,خارجی DocType: Features Setup,Item Serial Nos,مورد سریال شماره +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,کاربران و ویرایش DocType: Branch,Branch,شاخه +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,چاپ و علامت گذاری +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,بدون لغزش حقوق و دستمزد در بر داشت برای ماه: DocType: Bin,Actual Quantity,تعداد واقعی DocType: Shipping Rule,example: Next Day Shipping,به عنوان مثال: حمل و نقل روز بعد apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,سریال بدون {0} یافت نشد @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,واحد مجزا از یک آیتم DocType: Pricing Rule,Buying,خرید DocType: HR Settings,Employee Records to be created by,سوابق کارمند به ایجاد شود apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,این زمان ورود دسته لغو شده است. +,Reqd By Date,Reqd بر اساس تاریخ DocType: Salary Slip Earning,Salary Slip Earning,سود لغزش حقوق و دستمزد apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,طلبکاران apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,ردیف # {0}: سریال نه اجباری است @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,حساب برای انبار (موجودی ابدی) خواهد شد تحت این حساب ایجاد شده است. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,انبار نمی تواند حذف شود به عنوان ورودی سهام دفتر برای این انبار وجود دارد. DocType: Company,Distribution,توزیع +sites/assets/js/erpnext.min.js +50,Amount Paid,مبلغ پرداخت شده apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,مدیر پروژه apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,اعزام apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,حداکثر تخفیف را برای آیتم: {0} {1}٪ است @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,پدر و مادر حساب DocType: Quality Inspection Reading,Reading 3,خواندن 3 ,Hub,قطب DocType: GL Entry,Voucher Type,کوپن نوع +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده DocType: Expense Claim,Approved,تایید DocType: Pricing Rule,Price,قیمت apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,لطفا ابتدا دسته را انتخاب کنید apps/erpnext/erpnext/config/projects.py +18,Project master.,کارشناسی ارشد پروژه. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,را نشان نمی مانند هر نماد $ و غیره در کنار ارزهای. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(نیم روز) DocType: Supplier,Credit Days,روز اعتباری DocType: Leave Type,Is Carry Forward,آیا حمل به جلو apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,گرفتن اقلام از BOM diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv index e5b7d90b3d..4c7bd32f02 100644 --- a/erpnext/translations/fi.csv +++ b/erpnext/translations/fi.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,näytä malliv DocType: Sales Invoice Item,Quantity,Määrä apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),lainat (vastattavat) DocType: Employee Education,Year of Passing,vuoden syöttö +sites/assets/js/erpnext.min.js +27,In Stock,varastossa apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Voi vain maksun vastaan ​​laskuttamattomia Myyntitilaus DocType: Designation,Designation,nimeäminen DocType: Production Plan Item,Production Plan Item,Tuotanto Plan Item @@ -116,7 +117,7 @@ DocType: Sales Invoice Item,Sales Invoice Item,"myyntilasku, tuote" DocType: Account,Credit,kredit apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,aseta työntekijöiden nimet järjestelmään kohdassa henkilöstöresurssit > henkilöstön asetukset DocType: POS Profile,Write Off Cost Center,poiston kustannuspaikka -DocType: Warehouse,Warehouse Detail,varaston lisätiedot +DocType: Warehouse,Warehouse Detail,Varaston lisätiedot apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan luottoraja on ylitetty {0} {1} / {2} DocType: Tax Rule,Tax Type,Tax Tyyppi apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0} @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,henkilöstömoduuli DocType: SMS Center,SMS Center,tekstiviesti keskus apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,suoristus DocType: BOM Replace Tool,New BOM,uusi BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,erän aikaloki laskutukseen apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,vastagravitaatio valu apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Uutiskirje on jo lähetetty DocType: Lead,Request Type,pyydä tyyppi @@ -201,7 +203,7 @@ apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90, DocType: Pricing Rule,Discount on Price List Rate (%),hinnaston alennus taso (%) sites/assets/js/form.min.js +279,Start,alku DocType: User,First Name,etunimi -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,määritys on nyt valmis +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Määritys on nyt valmis. Päivitetään. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,täysimuovaus valu DocType: Offer Letter,Select Terms and Conditions,valitse ehdot ja säännöt DocType: Production Planning Tool,Sales Orders,myyntitilaukset @@ -240,7 +242,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,nimeä sarjat {0} määritykset> asetukset> nimeä sarjat DocType: Time Log,Will be updated when batched.,päivitetään keräilyssä apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"rivi {0}: täppää 'ennakko' kohdistettu tilille {1}, mikäli tämä on ennakkokirjaus" -apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},varasto {0} ei kuulu yritykselle {1} +apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1} DocType: Bulk Email,Message,Viesti DocType: Item Website Specification,Item Website Specification,tuote verkkosivujen asetukset DocType: Dropbox Backup,Dropbox Access Key,Dropbox pääsy tunnus @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,uusi varasto UOM DocType: Period Closing Voucher,Closing Account Head,tilin otsikon sulkeminen DocType: Employee,External Work History,ulkoinen työhistoria apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,kiertoviite vihke +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,haluatko todella lopettaa DocType: Communication,Closed,suljettu DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"sanat näkyvät, (vienti) kun tallennat lähetteen" +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Oletko varma, että haluat lopettaa" DocType: Lead,Industry,teollisuus DocType: Employee,Job Profile,Job Profile DocType: Newsletter,Newsletter,Tiedote @@ -346,7 +350,7 @@ apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,erä (erä-tuot DocType: C-Form Invoice Detail,Invoice Date,laskun päiväys DocType: GL Entry,Debit Amount,Debit Määrä apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Ei voi olla vain 1 tilini kohden Yhtiö {0} {1} -apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,oma sähköpostiosoite +apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Sähköpostiosoitteesi apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,katso liitetiedosto DocType: Purchase Order,% Received,% vastaanotettu apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,vesisuihku leikkaus @@ -384,7 +388,7 @@ DocType: Employee,Single,yksittäinen DocType: Issue,Attachment,Liite apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,budjettia ei voi määrittää kustannuspaikkaryhmälle DocType: Account,Cost of Goods Sold,myydyn tavaran kustannuskset -DocType: Purchase Invoice,Yearly,vuosittain +DocType: Purchase Invoice,Yearly,Vuosittain apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,syötä kustannuspaikka DocType: Journal Entry Account,Sales Order,myyntitilaus apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,keskimääräinen myynnin taso @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,lataa var apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,lähetä nyt ,Support Analytics,tuki Analytics DocType: Item,Website Warehouse,verkkosivujen varasto +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,haluatko keskeyttää tuotannon tilauksen: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","kuukauden päivä jolloin automaattinen lasku muodostetaan, esim 05, 28 jne" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,pisteet on oltava pienempi tai yhtä suuri kuin 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-muoto tietue @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,valk DocType: SMS Center,All Lead (Open),kaikki vihjeet (avoimet) DocType: Purchase Invoice,Get Advances Paid,hae maksetut ennakot apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Liitä Picture +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Tehdä DocType: Journal Entry,Total Amount in Words,sanat kokonaisarvomäärä DocType: Workflow State,Stop,pysäytä apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"tapahui virhe: todennäköinen syy on ettet ole tallentanut lomakketta, mikäli ongelma jatkuu ota yhteyttä sähköpostiin support@erpnext.com" @@ -886,7 +892,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can n apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,arkistointi apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,alennus DocType: Features Setup,Purchase Discounts,Osto Alennukset -DocType: Workstation,Wages,palkat +DocType: Workstation,Wages,Palkat DocType: Time Log,Will be updated only if Time Log is 'Billable',"päivitetään, jos aikaloki on 'laskutettavaa'" DocType: Project,Internal,sisäinen DocType: Task,Urgent,kiireellinen @@ -926,7 +932,7 @@ apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,to apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},(lle) {0} | {1} {2} DocType: Time Log Batch,updated via Time Logs,päivitetty aikalokin kautta apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskimääräinen ikä -DocType: Opportunity,Your sales person who will contact the customer in future,"myyjä, joka ottaa yhteyttä asiakkaaseen tulevaisuudessa" +DocType: Opportunity,Your sales person who will contact the customer in future,"Myyjä, joka ottaa yhteyttä asiakkaaseen tulevaisuudessa" apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Luetella muutaman oman toimittajia. Ne voivat olla organisaatioita tai yksilöitä. DocType: Company,Default Currency,oletusvaluutta DocType: Contact,Enter designation of this Contact,syötä yhteystiedon nimike @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,tee erokirjaus DocType: Upload Attendance,Attendance From Date,osallistuminen päivästä DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,kuljetus +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ja vuosi: DocType: Email Digest,Annual Expense,Vuosikuluna DocType: SMS Center,Total Characters,henkilöt yhteensä apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},valitse BOM tuotteelle BOM kentästä {0} @@ -995,7 +1002,7 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Fu apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,verot- ja muut palkan vähennykset DocType: Lead,Lead,vihje DocType: Email Digest,Payables,maksettavat -DocType: Account,Warehouse,varasto +DocType: Account,Warehouse,Varasto apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi ,Purchase Order Items To Be Billed,Ostotilaus Items laskuttamat DocType: Purchase Invoice Item,Net Rate,nettotaso @@ -1074,11 +1081,11 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,välilliset kulut apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,rivi {0}: yksikkömäärä vaaditaan apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Maatalous -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,omat tavarat tai palvelut +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Omat tavarat tai palvelut DocType: Mode of Payment,Mode of Payment,maksutapa apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,tämä on kantatuoteryhmä eikä sitä voi muokata DocType: Journal Entry Account,Purchase Order,Ostotilaus -DocType: Warehouse,Warehouse Contact Info,varaston yhteystiedot +DocType: Warehouse,Warehouse Contact Info,Varaston yhteystiedot sites/assets/js/form.min.js +190,Name is required,nimi vaaditaan DocType: Purchase Invoice,Recurring Type,toistuva tyyppi DocType: Address,City/Town,kaupunki/kunta @@ -1127,7 +1134,7 @@ DocType: Attendance,HR Manager,henkilöstön hallinta apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Valitse Yritys apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,poistumisoikeus DocType: Purchase Invoice,Supplier Invoice Date,toimittajan laskun päiväys -apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,sinun tulee aktivoida ostoskori +apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sinun tulee aktivoida ostoskori sites/assets/js/form.min.js +212,No Data,No Data DocType: Appraisal Template Goal,Appraisal Template Goal,"arviointi, mallipohja tavoite" DocType: Salary Slip,Earning,ansio @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,lomat DocType: Sales Order Item,Planned Quantity,Suunnitellut Määrä DocType: Purchase Invoice Item,Item Tax Amount,tuotteen veroarvomäärä DocType: Item,Maintain Stock,huolla varastoa +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta DocType: Leave Control Panel,Leave blank if considered for all designations,tyhjä mikäli se pidetään vihtoehtona kaikille nimityksille apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},rivi {0}: kohdennettavan arvomäärä {1} on oltava suurempi tai yhtä suuri kuin tosite arvomäärä {2} DocType: Item,Inventory,inventaario DocType: Features Setup,"To enable ""Point of Sale"" view",Jotta "Point of Sale" näkymä +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,maksua ei voi tehdä tyhjällä ostoskorilla DocType: Item,Sales Details,myynnin lisätiedot apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning DocType: Opportunity,With Items,tuotteilla @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,painoarvo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Kaivostoiminta apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin valu apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"saman niminen asiakasryhmä on jo olemassa, vaihda asiakkaan nimi tai nimeä asiakasryhmä uudelleen" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Ole hyvä ja valitse {0} ensin. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},teksti {0} DocType: Territory,Parent Territory,Parent Territory DocType: Quality Inspection Reading,Reading 2,Reading 2 @@ -1472,7 +1482,7 @@ DocType: Stock Reconciliation,Stock Reconciliation,varaston täsmäytys DocType: Territory,Territory Name,alue nimi apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,"työnallaoleva työ, varasto vaaditaan ennen lähetystä" apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,työn hakija. -DocType: Purchase Order Item,Warehouse and Reference,varasto ja viite +DocType: Purchase Order Item,Warehouse and Reference,Varasto ja viite DocType: Supplier,Statutory info and other general information about your Supplier,toimittajan lakisääteiset- ja muut päätiedot DocType: Country,Country,maa apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,osoitteet @@ -1505,7 +1515,7 @@ DocType: Sales Invoice Item,References,Viitteet DocType: Quality Inspection Reading,Reading 10,Reading 10 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","luetteloi tavarat tai palvelut, joita ostat tai myyt, tarkista ensin tuoteryhmä, yksikkö ja muut ominaisuudet kun aloitat" DocType: Hub Settings,Hub Node,hubi sidos -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"päällekkäisiä tuotteita on syötetty, korjaa ja yritä uudelleen" +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Päällekkäisiä tuotteita on syötetty. Korjaa ja yritä uudelleen. apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Arvo {0} varten Taito {1} ei ole luettelossa voimassa Tuote attribuuttiarvojen apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,kolleega apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,tuote {0} ei ole sarjoitettu tuote @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,brändit DocType: C-Form Invoice Detail,Invoice No,laskun nro apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ostotilauksesta DocType: Activity Cost,Costing Rate,"kustannuslaskenta, taso" +,Customer Addresses And Contacts,Asiakas osoitteet ja Yhteydet DocType: Employee,Resignation Letter Date,Eroaminen Letter Date apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,hinnoittelusäännöt on suodatettu määrän mukaan apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ei asetettu @@ -1662,7 +1673,7 @@ apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Pl apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Ilmoitathan Company ,Customer Acquisition and Loyalty,asiakashankinta ja suhteet DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"varasto, jossä säilytetään hylätyt tuotteet" -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,tilikautesi päättyy +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Tilikautesi päättyy DocType: POS Profile,Price List,Hinnasto apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} nyt on oletustilikausi. päivitä selain, jotta muutos tulee voimaan." apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,kuluvaatimukset @@ -1671,7 +1682,7 @@ DocType: Authorization Rule,Approving Role,"hyväksyntä, rooli" ,BOM Search,BOM haku apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),sulku (avaus + summat) apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,määritä yrityksen valuutta -DocType: Workstation,Wages per hour,tuntipalkat +DocType: Workstation,Wages per hour,Tuntipalkat apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},erän varastotase {0} muuttuu negatiiviseksi {1} tuotteelle {2} varastossa {3} apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","näytä / piilota ominaisuuksia kuten sarjanumero, POS jne" apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1} @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,aikalokin tila pitää lähettää apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sarjanumero {0} ei kuulu mihinkään Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,perusmääritykset +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Rivi # DocType: Purchase Invoice,In Words (Company Currency),sanat (yrityksen valuutta) DocType: Pricing Rule,Supplier,toimittaja DocType: C-Form,Quarter,Neljännes @@ -1813,11 +1825,14 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"lisää kustannuspaikkoja voidaan tehdä kohdassa ryhmät, mutta pelkät merkinnät voi kohdistaa ilman ryhmiä" DocType: Project,External,ulkoinen DocType: Features Setup,Item Serial Nos,tuote sarjanumerot +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,käyttäjät ja käyttöoikeudet DocType: Branch,Branch,toimiala +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,tulostus ja brändäys +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,palkkalaskelmaa ei löydy kuukaudelle: DocType: Bin,Actual Quantity,todellinen määrä DocType: Shipping Rule,example: Next Day Shipping,esimerkiksi: seuraavan päivän toimitus apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,sarjanumeroa {0} ei löydy -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,omat asiakkaat +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Omat asiakkaat apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,prässimuovaus DocType: Leave Block List Date,Block Date,estopäivä DocType: Sales Order,Not Delivered,toimittamatta @@ -1951,7 +1966,7 @@ DocType: Contact,Enter department to which this Contact belongs,"syötä osasto, apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,"yhteensä, puuttua" apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,tuote tai varastorivi {0} ei täsmää materiaalipyynnön kanssa apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,mittayksikkö -DocType: Fiscal Year,Year End Date,vuoden lopetuspäivä +DocType: Fiscal Year,Year End Date,Vuoden lopetuspäivä DocType: Task Depends On,Task Depends On,tehtävä riippuu DocType: Lead,Opportunity,tilaisuus DocType: Salary Structure Earning,Salary Structure Earning,"palkkarakenne, ansiot" @@ -2092,7 +2107,7 @@ apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0} than the Grand Total ({2})",ennakot yhteensä ({0}) kohdistettuna tilauksiin {1} ei voi olla suurempi \ kuin kokonaissumma ({2}) DocType: Employee,Relieving Date,Lievittää Date apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","hinnoittelu sääntö on tehty tämä korvaa hinnaston / määritä alennus, joka perustuu kriteereihin" -DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,varastoa voi muuttaa ainoastaan varaston kirjauksella / lähetteellä / ostokuitilla +DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Varastoa voi muuttaa ainoastaan varaston Kirjauksella / Lähetteellä / Ostokuitilla DocType: Employee Education,Class / Percentage,luokka / prosenttia apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,markkinoinnin ja myynnin pää apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,tulovero @@ -2429,7 +2444,7 @@ DocType: Purchase Invoice,Purchase Taxes and Charges,oston verot ja maksut ,Qty to Receive,vastaanotettava yksikkömäärä DocType: Leave Block List,Leave Block List Allowed,"poistu estoluettelo, sallittu" apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,muuntokertoimella ei voi olla osia -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,tulet käyttämään sitä sisäänkirjautumiseen +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Tulet käyttämään sitä sisäänkirjautumiseen DocType: Sales Partner,Retailer,Jälleenmyyjä apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kiitos tilin on oltava Tase tili apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,kaikki toimittajatyypit @@ -2537,7 +2552,7 @@ apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,kuuma metallikaasu muovaus DocType: Sales Order Item,Sales Order Date,"myyntitilaus, päivä" DocType: Sales Invoice Item,Delivered Qty,toimitettu yksikkömäärä -apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,varasto {0}: yritykselle vaaditaan +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Varasto {0}: Yritys on pakollinen apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","siirry kyseiseen ryhmään (yleensä rahoituksen lähde> lyhytaikaiset vastattavat> verot ja tullit ja tee uusi tili (valitsemalla lisää alasidos) ""vero"" muista mainita veroaste" ,Payment Period Based On Invoice Date,maksuaikaa perustuu laskun päiväykseen apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},valuuttakurssi puuttuu {0} @@ -2729,7 +2744,7 @@ DocType: Features Setup,"If you have long print formats, this feature can be use apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,vierintä apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Kaikki alueet DocType: Purchase Invoice,Items,tuotteet -DocType: Fiscal Year,Year Name,vuoden nimi +DocType: Fiscal Year,Year Name,Vuoden nimi DocType: Process Payroll,Process Payroll,Process Palkanlaskenta apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,tässä kuussa ei ole lomapäiviä työpäivinä DocType: Product Bundle Item,Product Bundle Item,tavarakokonaisuus tuote @@ -3038,6 +3053,7 @@ DocType: Serial No,Distinct unit of an Item,tuotteen erillisyksikkö DocType: Pricing Rule,Buying,ostaminen DocType: HR Settings,Employee Records to be created by,työntekijä tietue on tehtävä apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,tämä aikaloki erä on peruutettu +,Reqd By Date,Reqd Päivämäärä DocType: Salary Slip Earning,Salary Slip Earning,"palkkalaskelma, ansio" apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,luotonantajat apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Rivi # {0}: Sarjanumero on pakollinen @@ -3185,7 +3201,7 @@ DocType: Page,Page Name,Sivun nimi apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,aikaan on oltava suurempi kuin aloitusaika DocType: Journal Entry Account,Exchange Rate,valuutta taso apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty -apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},varaston {0}: emotili {1} ei kuulu yritykselle {2} +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Varasto {0}: Emotili {1} ei kuulu yritykselle {2} apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,karan viimeistely DocType: BOM,Last Purchase Rate,viimeisin ostotaso DocType: Account,Asset,vastaavat @@ -3194,7 +3210,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""", apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,tälle tuotteelle ei ole varastopaikkaa {0} koska siitä on useita malleja ,Sales Person-wise Transaction Summary,"myyjän työkalu, tapahtuma yhteenveto" DocType: System Settings,Time Zone,aikavyöhyke -apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,varastoa {0} ei ole olemassa +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Varastoa {0} ei ole olemassa apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Ilmoittaudu ERPNext Hub DocType: Monthly Distribution,Monthly Distribution Percentages,"toimitus kuukaudessa, prosenttiosuudet" apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,valittu tuote voi olla erä @@ -3228,7 +3244,7 @@ DocType: Employee,Employment Type,työsopimus tyyppi apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,pitkaikaiset vastaavat DocType: Item Group,Default Expense Account,oletus kulutili DocType: Employee,Notice (days),Ilmoitus (päivää) -DocType: Page,Yes,kyllä +DocType: Page,Yes,Kyllä DocType: Tax Rule,Sales Tax Template,Sales Tax Malline DocType: Employee,Encashment Date,perintä päivä apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,sähköinen muovaus @@ -3265,8 +3281,9 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js DocType: Workstation,per hour,tunnissa apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},sarjat {0} on käytetty {1} DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,varaston (jatkuva inventaario) tehdään tälle tilille. -apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"varastoa ei voi poistaa, sillä kohdistettuja varaston tilikirjan kirjauksia on olemassa" +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Varastoa ei voi poistaa, sillä kohdistettuja varaston tilikirjan kirjauksia on olemassa." DocType: Company,Distribution,toimitus +sites/assets/js/erpnext.min.js +50,Amount Paid,maksettu arvomäärä apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,projektihallinta apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,lähetys apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max alennus sallittua item: {0} on {1}% @@ -3301,7 +3318,7 @@ DocType: Production Planning Tool,Material Request For Warehouse,varaston materi DocType: Sales Order Item,For Production,tuotantoon apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,syötä myyntitilaus taulukon yläpuolelle DocType: Project Task,View Task,näytä tehtävä -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,tilikautesi alkaa +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Tilikautesi alkaa apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Anna Osto Kuitit DocType: Sales Invoice,Get Advances Received,hae saadut ennakot DocType: Email Digest,Add/Remove Recipients,lisää / poista vastaanottajia @@ -3467,7 +3484,7 @@ DocType: Budget Detail,Budget Detail,budjetti yksityiskohdat apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Anna viestin ennen lähettämistä DocType: Async Task,Status,tila apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},varaston UOM päivitetty tuotteelle {0} -DocType: Company History,Year,vuosi +DocType: Company History,Year,Vuosi apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,päivitä teksiviestiasetukset apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,aikaloki {0} on jo laskutettu @@ -3735,7 +3752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming, apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",sähköpostia ei lähetetty sillä yrityksen sähköpostitunnusta ei löytyny apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),sovellus varat (vastaavat) DocType: Production Planning Tool,Filter based on item,suodata tuotteeseen perustuen -DocType: Fiscal Year,Year Start Date,vuoden aloituspäivä +DocType: Fiscal Year,Year Start Date,Vuoden aloituspäivä DocType: Attendance,Employee Name,työntekijän nimi DocType: Sales Invoice,Rounded Total (Company Currency),pyöristys yhteensä (yrityksen valuutta) apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,ei voi kääntää ryhmiin sillä tilin tyyppi on valittu @@ -3761,6 +3778,7 @@ DocType: Account,Parent Account,emotili DocType: Quality Inspection Reading,Reading 3,Reading 3 ,Hub,hubi DocType: GL Entry,Voucher Type,tosite tyyppi +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä DocType: Expense Claim,Approved,hyväksytty DocType: Pricing Rule,Price,Hinta apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla""" @@ -3846,7 +3864,7 @@ DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),verot ja DocType: Item Group,General Settings,pääasetukset apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,valuutasta ja valuuttaan eivät voi olla samoja DocType: Stock Entry,Repack,pakkaa uudelleen -apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,sinun tulee tallentaa lomake ennen kuin jatkat +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sinun tulee tallentaa lomake ennen kuin jatkat DocType: Item Attribute,Numeric Values,Numeroarvot apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Kiinnitä Logo DocType: Customer,Commission Rate,provisio taso @@ -3875,6 +3893,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ole hyvä ja valitse Luokka ensin apps/erpnext/erpnext/config/projects.py +18,Project master.,projekti valvonta DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"älä käytä symbooleita, $ jne valuuttojen vieressä" +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(1/2 päivä) DocType: Supplier,Credit Days,kredit päivää DocType: Leave Type,Is Carry Forward,siirretääkö apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,hae tuotteita BOM:sta diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv index d18fc28e18..7d437405b5 100644 --- a/erpnext/translations/fr.csv +++ b/erpnext/translations/fr.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Voir les varia DocType: Sales Invoice Item,Quantity,Quantité apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Prêts ( passif) DocType: Employee Education,Year of Passing,Année de passage +sites/assets/js/erpnext.min.js +27,In Stock,En Stock apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Ne peut effectuer le paiement contre les ventes non facturés Ordre DocType: Designation,Designation,Désignation DocType: Production Plan Item,Production Plan Item,Élément du plan de production @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Utilisateur {0} est DocType: SMS Center,SMS Center,Centre SMS apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Redressement DocType: BOM Replace Tool,New BOM,Nouvelle nomenclature +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs pour la facturation. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,", À contre coulée" apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Entrepôt requis pour stock Article {0} DocType: Lead,Request Type,Type de demande @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nouveau stock UDM DocType: Period Closing Voucher,Closing Account Head,Fermeture chef Compte DocType: Employee,External Work History,Histoire de travail externe apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Référence circulaire erreur +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Voulez-vous vraiment arrêter DocType: Communication,Closed,Fermé DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dans Words (Exportation) sera visible une fois que vous enregistrez le bon de livraison. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Etes-vous sûr que vous voulez arrêter DocType: Lead,Industry,Industrie DocType: Employee,Job Profile,Profil d'emploi DocType: Newsletter,Newsletter,Bulletin @@ -738,6 +742,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Télécha apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Envoyer maintenant ,Support Analytics,Analyse du support DocType: Item,Website Warehouse,Entrepôt site web +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Voulez-vous vraiment à l'ordre d'arrêt de production: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Le jour du mois où la facture automatique sera généré par exemple 05, 28 etc" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score doit être inférieur ou égal à 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Enregistrements C -Form @@ -880,6 +885,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blan DocType: SMS Center,All Lead (Open),Toutes les pistes (Ouvertes) DocType: Purchase Invoice,Get Advances Paid,Obtenez Avances et acomptes versés apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Joindre votre photo +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Faire DocType: Journal Entry,Total Amount in Words,Montant total en mots DocType: Workflow State,Stop,arrêtez apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Il y avait une erreur . Une raison probable pourrait être que vous n'avez pas enregistré le formulaire. S'il vous plaît contacter support@erpnext.com si le problème persiste . @@ -960,6 +966,7 @@ DocType: Journal Entry,Make Difference Entry,Assurez Entrée Différence DocType: Upload Attendance,Attendance From Date,Participation De Date DocType: Appraisal Template Goal,Key Performance Area,Section de performance clé apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,transport +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,et l'année: DocType: Email Digest,Annual Expense,Dépense annuelle DocType: SMS Center,Total Characters,Nombre de caractères apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Se il vous plaît sélectionner dans le champ BOM BOM pour objet {0} @@ -1197,6 +1204,7 @@ DocType: Holiday List,Holidays,Fêtes DocType: Sales Order Item,Planned Quantity,Quantité planifiée DocType: Purchase Invoice Item,Item Tax Amount,Montant de la Taxe sur l'Article DocType: Item,Maintain Stock,Maintenir Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock entrées déjà créés pour ordre de fabrication DocType: Leave Control Panel,Leave blank if considered for all designations,Laisser vide si cela est jugé pour toutes les désignations apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans l'article Noter apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1260,6 +1268,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant JV {2} DocType: Item,Inventory,Inventaire DocType: Features Setup,"To enable ""Point of Sale"" view",Pour activer "Point de vente" vue +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Le paiement ne peut être fait pour le chariot vide DocType: Item,Sales Details,Détails ventes apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Épinglant DocType: Opportunity,With Items,Avec Articles @@ -1452,6 +1461,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Exploitation minière apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Résine de coulée apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,BOM récursivité : {0} ne peut pas être le parent ou l'enfant de {2} +sites/assets/js/erpnext.min.js +37,Please select {0} first.,S'il vous plaît sélectionnez {0} en premier. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texte {0} DocType: Territory,Parent Territory,Territoire Parent DocType: Quality Inspection Reading,Reading 2,Lecture 2 @@ -1633,6 +1643,7 @@ DocType: Features Setup,Brands,Marques DocType: C-Form Invoice Detail,Invoice No,Aucune facture apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,De bon de commande DocType: Activity Cost,Costing Rate,Taux Costing +,Customer Addresses And Contacts,Adresses et contacts clients DocType: Employee,Resignation Letter Date,Date de lettre de démission apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Les règles de tarification sont encore filtrés en fonction de la quantité. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,non définie @@ -1740,6 +1751,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Log Time Etat doit être soumis. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N ° de série {0} ne fait pas partie de tout entrepôt apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuration +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ligne # DocType: Purchase Invoice,In Words (Company Currency),En Words (Société Monnaie) DocType: Pricing Rule,Supplier,Fournisseur DocType: C-Form,Quarter,Trimestre @@ -1838,7 +1850,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"D'autres centres de coûts peuvent être réalisées dans les groupes, mais les entrées peuvent être faites contre les non-Groupes" DocType: Project,External,Externe DocType: Features Setup,Item Serial Nos,N° de série +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilisateurs et autorisations DocType: Branch,Branch,Branche +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,équité +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Pas de fiche de salaire trouvé pour le mois: DocType: Bin,Actual Quantity,Quantité réelle DocType: Shipping Rule,example: Next Day Shipping,Exemple: Jour suivant Livraison apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,N ° de série {0} introuvable @@ -3098,6 +3113,7 @@ DocType: Serial No,Distinct unit of an Item,Unité distincte d'un élément DocType: Pricing Rule,Buying,Achat DocType: HR Settings,Employee Records to be created by,Dossiers sur les employés à être créées par apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Connexion lot a été annulé. +,Reqd By Date,Reqd par date DocType: Salary Slip Earning,Salary Slip Earning,Slip Salaire Gagner apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Créanciers apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Numéro de série est obligatoire @@ -3327,6 +3343,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Compte de l'entrepôt ( de l'inventaire permanent ) sera créé sous ce compte . apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Descendre : {0} DocType: Company,Distribution,Répartition +sites/assets/js/erpnext.min.js +50,Amount Paid,Montant payé apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Chef de projet apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,envoi apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Réduction de Max permis pour l'article: {0} {1} est% @@ -3833,6 +3850,7 @@ DocType: Account,Parent Account,Compte Parent DocType: Quality Inspection Reading,Reading 3,Reading 3 ,Hub,Moyeu DocType: GL Entry,Voucher Type,Type de Bon +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Liste de prix introuvable ou desactivé DocType: Expense Claim,Approved,Approuvé DocType: Pricing Rule,Price,Profil de l'organisation apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',S'il vous plaît entrer unité de mesure par défaut @@ -3947,6 +3965,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,S'il vous plaît sélectionnez d'abord Catégorie apps/erpnext/erpnext/config/projects.py +18,Project master.,Projet de master. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne plus afficher n'importe quel symbole comme $ etc à côté de devises. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Demi-journée) DocType: Supplier,Credit Days,Jours de crédit DocType: Leave Type,Is Carry Forward,Est-Report apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obtenir des éléments de nomenclature diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv index be225c36ee..943dd0bd38 100644 --- a/erpnext/translations/he.csv +++ b/erpnext/translations/he.csv @@ -58,6 +58,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,גרסאות DocType: Sales Invoice Item,Quantity,כמות apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),הלוואות (התחייבויות) DocType: Employee Education,Year of Passing,שנה של פטירה +sites/assets/js/erpnext.min.js +27,In Stock,במלאי apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,יכול רק לבצע את התשלום נגד להזמין מכירות סרק." DocType: Designation,Designation,ייעוד DocType: Production Plan Item,Production Plan Item,פריט תכנית ייצור @@ -174,6 +175,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,הגדרות עבו DocType: SMS Center,SMS Center,SMS מרכז apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,מיישר DocType: BOM Replace Tool,New BOM,BOM החדש +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,אצווה יומני זמן לחיוב. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,ליהוק Countergravity apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,עלון כבר נשלח DocType: Lead,Request Type,סוג הבקשה @@ -296,8 +298,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,החדש במלאי של אונ DocType: Period Closing Voucher,Closing Account Head,סגירת חשבון ראש DocType: Employee,External Work History,חיצוני היסטוריה עבודה apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,שגיאת הפניה מעגלית +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,האם אתה באמת רוצה להפסיק DocType: Communication,Closed,סגור DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,במילים (יצוא) יהיה גלוי לאחר שתשמרו את תעודת המשלוח. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,האם אתה בטוח שאתה רוצה להפסיק DocType: Lead,Industry,תעשייה DocType: Employee,Job Profile,פרופיל עבודה DocType: Newsletter,Newsletter,עלון @@ -707,6 +711,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,העלה apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,שלח עכשיו ,Support Analytics,Analytics תמיכה DocType: Item,Website Warehouse,מחסן אתר +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,האם אתה באמת רוצה להפסיק הזמנת ייצור: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","היום בחודש שבו חשבונית אוטומטית תיווצר למשל 05, 28 וכו '" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ציון חייב להיות קטן או שווה ל 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,רשומות C-טופס @@ -847,6 +852,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,לב DocType: SMS Center,All Lead (Open),כל עופרת (הפתוח) DocType: Purchase Invoice,Get Advances Paid,קבלו תשלום מקדמות apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,צרף התמונה שלך +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,הפוך DocType: Journal Entry,Total Amount in Words,סכתי-הכל סכום מילים DocType: Workflow State,Stop,להפסיק apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,הייתה שגיאה. סיבה סבירה אחת יכולה להיות שלא שמרת את הטופס. אנא צור קשר עם support@erpnext.com אם הבעיה נמשכת. @@ -924,6 +930,7 @@ DocType: Journal Entry,Make Difference Entry,הפוך כניסת הבדל DocType: Upload Attendance,Attendance From Date,נוכחות מתאריך DocType: Appraisal Template Goal,Key Performance Area,פינת של ביצועים מרכזיים apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,תחבורה +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ושנה: DocType: Email Digest,Annual Expense,הוצאה שנתית DocType: SMS Center,Total Characters,"סה""כ תווים" apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0} @@ -1159,6 +1166,7 @@ DocType: Holiday List,Holidays,חגים DocType: Sales Order Item,Planned Quantity,כמות מתוכננת DocType: Purchase Invoice Item,Item Tax Amount,סכום מס פריט DocType: Item,Maintain Stock,לשמור על המלאי +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ערכי מניות כבר יצרו להפקה להזמין DocType: Leave Control Panel,Leave blank if considered for all designations,שאר ריק אם תיחשב לכל הכינויים apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},מקס: {0} @@ -1219,6 +1227,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,א apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום JV {2} DocType: Item,Inventory,מלאי DocType: Features Setup,"To enable ""Point of Sale"" view",כדי לאפשר "נקודת מכירה" תצוגה +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,תשלום לא יכול להתבצע על עגלה ריקה DocType: Item,Sales Details,פרטי מכירות apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,תולה DocType: Opportunity,With Items,עם פריטים @@ -1408,6 +1417,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,כרייה apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ליהוק שרף apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,אנא בחר {0} הראשון. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},טקסט {0} DocType: Territory,Parent Territory,טריטורית הורה DocType: Quality Inspection Reading,Reading 2,קריאת 2 @@ -1584,6 +1594,7 @@ DocType: Features Setup,Brands,מותגים DocType: C-Form Invoice Detail,Invoice No,חשבונית לא apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,מהזמנת הרכש DocType: Activity Cost,Costing Rate,דרג תמחיר +,Customer Addresses And Contacts,כתובות של לקוחות ואנשי קשר DocType: Employee,Resignation Letter Date,תאריך מכתב התפטרות apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,כללי תמחור מסוננים נוסף המבוססים על כמות. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,לא הוגדר @@ -1691,6 +1702,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,סטטוס זמן יומן יש להגיש. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,מספר סידורי {0} אינו שייך לכל מחסן apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,הגדרה +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,# שורה DocType: Purchase Invoice,In Words (Company Currency),במילים (חברת מטבע) DocType: Pricing Rule,Supplier,ספק DocType: C-Form,Quarter,רבעון @@ -1789,7 +1801,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות DocType: Project,External,חיצוני DocType: Features Setup,Item Serial Nos,מס 'סידורי פריט +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,משתמשים והרשאות DocType: Branch,Branch,סניף +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,הדפסה ומיתוג +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,אין תלוש משכורת נמצא עבור חודש: DocType: Bin,Actual Quantity,כמות בפועל DocType: Shipping Rule,example: Next Day Shipping,דוגמא: משלוח היום הבא apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,מספר סידורי {0} לא נמצאו @@ -3004,6 +3019,7 @@ DocType: Serial No,Distinct unit of an Item,יחידה נפרדת של פריט DocType: Pricing Rule,Buying,קנייה DocType: HR Settings,Employee Records to be created by,רשומות עובדים שנוצרו על ידי apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,אצווה זמן יומן זה בוטל. +,Reqd By Date,Reqd לפי תאריך DocType: Salary Slip Earning,Salary Slip Earning,צבירת השכר Slip apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,נושים apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,# השורה {0}: מספר סידורי הוא חובה @@ -3230,6 +3246,7 @@ DocType: Workstation,per hour,לשעה DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,חשבון למחסן (מלאי תמידי) ייווצר תחת חשבון זה. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה. DocType: Company,Distribution,הפצה +sites/assets/js/erpnext.min.js +50,Amount Paid,הסכום ששולם apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,מנהל פרויקט apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,שדר apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,הנחה מרבית המוותרת עבור פריט: {0} היא% {1} @@ -3722,6 +3739,7 @@ DocType: Account,Parent Account,חשבון הורה DocType: Quality Inspection Reading,Reading 3,רידינג 3 ,Hub,רכזת DocType: GL Entry,Voucher Type,סוג שובר +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,מחיר המחירון לא נמצא או נכים DocType: Expense Claim,Approved,אושר DocType: Pricing Rule,Price,מחיר apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל ' @@ -3835,6 +3853,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,אנא בחר תחילה קטגוריה apps/erpnext/erpnext/config/projects.py +18,Project master.,אדון פרויקט. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,לא מראה שום סימן כמו $$ וכו 'הבא למטבעות. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(חצי יום) DocType: Supplier,Credit Days,ימי אשראי DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,קבל פריטים מBOM diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv index ad7e4eb5eb..0f4d4cbb19 100644 --- a/erpnext/translations/hi.csv +++ b/erpnext/translations/hi.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,दिखा DocType: Sales Invoice Item,Quantity,मात्रा apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ऋण (देनदारियों) DocType: Employee Education,Year of Passing,पासिंग का वर्ष +sites/assets/js/erpnext.min.js +27,In Stock,स्टॉक में apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,केवल unbilled बिक्री आदेश के खिलाफ भुगतान कर सकते हैं DocType: Designation,Designation,पदनाम DocType: Production Plan Item,Production Plan Item,उत्पादन योजना मद @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,मानव सं DocType: SMS Center,SMS Center,एसएमएस केंद्र apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,सीधे DocType: BOM Replace Tool,New BOM,नई बीओएम +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,बैच बिलिंग के लिए टाइम लॉग करता है। apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity कास्टिंग apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,समाचार पत्र के पहले ही भेज दिया गया है DocType: Lead,Request Type,अनुरोध प्रकार @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,नई स्टॉक UOM DocType: Period Closing Voucher,Closing Account Head,बंद लेखाशीर्ष DocType: Employee,External Work History,बाहरी काम इतिहास apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,परिपत्र संदर्भ त्रुटि +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,आप वास्तव में बंद करना चाहते हैं DocType: Communication,Closed,बंद DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,शब्दों में (निर्यात) दिखाई हो सकता है एक बार आप डिलिवरी नोट बचाने के लिए होगा. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,आप आप बंद करना चाहते हैं DocType: Lead,Industry,उद्योग DocType: Employee,Job Profile,नौकरी प्रोफाइल DocType: Newsletter,Newsletter,न्यूज़लैटर @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Csv क apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,अब भेजें ,Support Analytics,समर्थन विश्लेषिकी DocType: Item,Website Warehouse,वेबसाइट वेअरहाउस +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,क्या तुम सच में उत्पादन क्रम को रोकने के लिए चाहते हैं: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो चालान 05, 28 आदि जैसे उत्पन्न हो जाएगा, जिस पर इस महीने के दिन" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,स्कोर से कम या 5 के बराबर होना चाहिए apps/erpnext/erpnext/config/accounts.py +169,C-Form records,सी फार्म रिकॉर्ड @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,स DocType: SMS Center,All Lead (Open),सभी लीड (ओपन) DocType: Purchase Invoice,Get Advances Paid,भुगतान किए गए अग्रिम जाओ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,आपका चित्र संलग्न +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,मेक DocType: Journal Entry,Total Amount in Words,शब्दों में कुल राशि DocType: Workflow State,Stop,रोक apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,कोई त्रुटि हुई थी . एक संभावित कारण यह है कि आप प्रपत्र को बचाया नहीं किया है कि हो सकता है. यदि समस्या बनी रहती support@erpnext.com से संपर्क करें. @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,अंतर एंट्री DocType: Upload Attendance,Attendance From Date,दिनांक से उपस्थिति DocType: Appraisal Template Goal,Key Performance Area,परफ़ॉर्मेंस क्षेत्र apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,परिवहन +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,और वर्ष: DocType: Email Digest,Annual Expense,वार्षिक खर्च DocType: SMS Center,Total Characters,कुल वर्ण apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},आइटम के लिए बीओएम क्षेत्र में बीओएम चयन करें {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,छुट्टियां DocType: Sales Order Item,Planned Quantity,नियोजित मात्रा DocType: Purchase Invoice Item,Item Tax Amount,आइटम कर राशि DocType: Item,Maintain Stock,स्टॉक बनाए रखें +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,पहले से ही उत्पादन आदेश के लिए बनाया स्टॉक प्रविष्टियां DocType: Leave Control Panel,Leave blank if considered for all designations,रिक्त छोड़ अगर सभी पदनाम के लिए विचार apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},मैक्स: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,व apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या जेवी राशि के बराबर होना चाहिए {2} DocType: Item,Inventory,इनवेंटरी DocType: Features Setup,"To enable ""Point of Sale"" view",दृश्य "बिक्री के प्वाइंट" सक्षम करने के लिए +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,भुगतान खाली गाड़ी के लिए नहीं बनाया जा सकता DocType: Item,Sales Details,बिक्री विवरण apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,लगाए DocType: Opportunity,With Items,आइटम के साथ @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,महत्व apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,खनन apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,राल कास्टिंग apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,पहला {0} का चयन करें. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},पाठ {0} DocType: Territory,Parent Territory,माता - पिता टेरिटरी DocType: Quality Inspection Reading,Reading 2,2 पढ़ना @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,ब्रांड DocType: C-Form Invoice Detail,Invoice No,कोई चालान apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,खरीद आदेश से DocType: Activity Cost,Costing Rate,लागत दर +,Customer Addresses And Contacts,ग्राहक के पते और संपर्क DocType: Employee,Resignation Letter Date,इस्तीफा पत्र दिनांक apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,मूल्य निर्धारण नियमों आगे मात्रा के आधार पर छान रहे हैं. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,सेट नहीं @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,समय लॉग स्थिति प्रस्तुत किया जाना चाहिए. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सीरियल नहीं {0} किसी भी गोदाम से संबंधित नहीं है apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,की स्थापना +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,पंक्ति # DocType: Purchase Invoice,In Words (Company Currency),शब्दों में (कंपनी मुद्रा) DocType: Pricing Rule,Supplier,प्रदायक DocType: C-Form,Quarter,तिमाही @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,इसके अलावा लागत केन्द्रों समूह के तहत बनाया जा सकता है लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है DocType: Project,External,बाहरी DocType: Features Setup,Item Serial Nos,आइटम सीरियल नं +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,उपयोगकर्ता और अनुमतियाँ DocType: Branch,Branch,शाखा +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,मुद्रण और ब्रांडिंग +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,महीने के लिए नहीं मिला वेतन पर्ची: DocType: Bin,Actual Quantity,वास्तविक मात्रा DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: अगले दिन शिपिंग apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,नहीं मिला सीरियल नहीं {0} @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,एक आइटम की अलग DocType: Pricing Rule,Buying,क्रय DocType: HR Settings,Employee Records to be created by,कर्मचारी रिकॉर्ड्स द्वारा पैदा किए जाने की apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,इस बार प्रवेश बैच रद्द कर दिया गया. +,Reqd By Date,तिथि reqd DocType: Salary Slip Earning,Salary Slip Earning,कमाई वेतनपर्ची apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,लेनदारों apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,पंक्ति # {0}: सीरियल नहीं अनिवार्य है @@ -3328,6 +3344,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,गोदाम ( सदा सूची ) के लिए खाते में इस खाते के तहत बनाया जाएगा . apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,शेयर खाता प्रविष्टि इस गोदाम के लिए मौजूद वेयरहाउस हटाया नहीं जा सकता . DocType: Company,Distribution,वितरण +sites/assets/js/erpnext.min.js +50,Amount Paid,राशि का भुगतान apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,परियोजना प्रबंधक apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,प्रेषण apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,अधिकतम छूट मद के लिए अनुमति दी: {0} {1}% है @@ -3834,6 +3851,7 @@ DocType: Account,Parent Account,खाते के जनक DocType: Quality Inspection Reading,Reading 3,3 पढ़ना ,Hub,हब DocType: GL Entry,Voucher Type,वाउचर प्रकार +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं DocType: Expense Claim,Approved,अनुमोदित DocType: Pricing Rule,Price,कीमत apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए @@ -3948,6 +3966,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,प्रथम श्रेणी का चयन करें apps/erpnext/erpnext/config/projects.py +18,Project master.,मास्टर परियोजना. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,$ मुद्राओं की बगल आदि की तरह किसी भी प्रतीक नहीं दिखा. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(आधा दिन) DocType: Supplier,Credit Days,क्रेडिट दिन DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,बीओएम से आइटम प्राप्त diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv index ea65acf51c..6011413dea 100644 --- a/erpnext/translations/hr.csv +++ b/erpnext/translations/hr.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Pokaži varija DocType: Sales Invoice Item,Quantity,Količina apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva) DocType: Employee Education,Year of Passing,Godina Prolazeći +sites/assets/js/erpnext.min.js +27,In Stock,Na lageru apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Može napraviti samo plaćanje protiv još nije izdana dostavnica prodajni nalog DocType: Designation,Designation,Oznaka DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Postavke za HR modu DocType: SMS Center,SMS Center,SMS centar apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ravnanje DocType: BOM Replace Tool,New BOM,Novi BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Vrijeme Trupci za naplatu. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity lijevanje apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Bilten je već poslan DocType: Lead,Request Type,Zahtjev Tip @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Novi skladišni UOM DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa DocType: Employee,External Work History,Vanjski Povijest Posao apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kružni Referentna Greška +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Da li stvarno želite prestati DocType: Communication,Closed,Zatvoreno DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Jeste li sigurni da želite prestati DocType: Lead,Industry,Industrija DocType: Employee,Job Profile,Profil posla DocType: Newsletter,Newsletter,Bilten @@ -737,6 +741,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Prenesi d apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošalji odmah ,Support Analytics,Analitike podrške DocType: Item,Website Warehouse,Skladište web stranice +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Da li stvarno želite da se zaustavi proizvodnja red: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dan u mjesecu na koji auto faktura će biti generiran npr 05, 28 itd" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultat mora biti manja od ili jednaka 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-obrazac zapisi @@ -879,6 +884,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bije DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni) DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Učvrstite svoju sliku +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Napraviti DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima DocType: Workflow State,Stop,zaustaviti apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi . @@ -959,6 +965,7 @@ DocType: Journal Entry,Make Difference Entry,Čine razliku Entry DocType: Upload Attendance,Attendance From Date,Gledanost od datuma DocType: Appraisal Template Goal,Key Performance Area,Zona ključnih performansi apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,promet +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i godina: DocType: Email Digest,Annual Expense,Godišnji rashodi DocType: SMS Center,Total Characters,Ukupno Likovi apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Odaberite BOM u BOM polje za točku {0} @@ -1196,6 +1203,7 @@ DocType: Holiday List,Holidays,Praznici DocType: Sales Order Item,Planned Quantity,Planirana količina DocType: Purchase Invoice Item,Item Tax Amount,Iznos poreza proizvoda DocType: Item,Maintain Stock,Upravljanje zalihama +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Prijave su već stvorene za proizvodnju reda DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako se odnosi na sve oznake apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Maksimalno: {0} @@ -1259,6 +1267,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak iznosu JV {2} DocType: Item,Inventory,Inventar DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili "Point of Sale" pogled +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu DocType: Item,Sales Details,Prodajni detalji apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Zapinjanje DocType: Opportunity,With Items,S Stavke @@ -1451,6 +1460,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Smola lijevanje apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Postoji grupa kupaca sa istim imenom. Promijenite naziv kupca ili naziv grupe kupaca. +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Odaberite {0} na prvom mjestu. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Tekst {0} DocType: Territory,Parent Territory,Nadređena teritorija DocType: Quality Inspection Reading,Reading 2,Čitanje 2 @@ -1632,6 +1642,7 @@ DocType: Features Setup,Brands,Brendovi DocType: C-Form Invoice Detail,Invoice No,Račun br apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od narudžbenice DocType: Activity Cost,Costing Rate,Obračun troškova stopa +,Customer Addresses And Contacts,Kupčeve adrese i kontakti DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nije postavljeno @@ -1739,6 +1750,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Vrijeme Log Status moraju biti dostavljeni. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada bilo Skladište apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Postavljanje +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Red # DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta tvrtke) DocType: Pricing Rule,Supplier,Dobavljač DocType: C-Form,Quarter,Četvrtina @@ -1837,7 +1849,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daljnje troška mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups" DocType: Project,External,Vanjski DocType: Features Setup,Item Serial Nos,Serijski br proizvoda +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole DocType: Branch,Branch,Grana +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje i brendiranje +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ne plaća slip naći za mjesec dana: DocType: Bin,Actual Quantity,Stvarna količina DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijski broj {0} nije pronađen @@ -3097,6 +3112,7 @@ DocType: Serial No,Distinct unit of an Item,Razlikuje jedinica stavku DocType: Pricing Rule,Buying,Kupnja DocType: HR Settings,Employee Records to be created by,Zaposlenik Records bi se stvorili apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ovo Batch Vrijeme Log je otkazan. +,Reqd By Date,Reqd Po datumu DocType: Salary Slip Earning,Salary Slip Earning,Plaća proklizavanja Zarada apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Vjerovnici apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Red # {0}: Serijski br obvezno @@ -3326,6 +3342,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladište ( neprestani inventar) stvorit će se na temelju ovog računa . apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Skladište se ne može izbrisati dok postoje upisi u glavnu knjigu za ovo skladište. DocType: Company,Distribution,Distribucija +sites/assets/js/erpnext.min.js +50,Amount Paid,Plaćeni iznos apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni dopušteni popust za proizvod: {0} je {1}% @@ -3832,6 +3849,7 @@ DocType: Account,Parent Account,Nadređeni račun DocType: Quality Inspection Reading,Reading 3,Čitanje 3 ,Hub,Središte DocType: GL Entry,Voucher Type,Bon Tip +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Cjenik nije pronađena ili onemogućena DocType: Expense Claim,Approved,Odobren DocType: Pricing Rule,Price,Cijena apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo ' @@ -3946,6 +3964,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Molimo odaberite kategoriju prvi apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt majstor. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol kao $ iza valute. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Pola dana) DocType: Supplier,Credit Days,Kreditne Dani DocType: Leave Type,Is Carry Forward,Je Carry Naprijed apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM) diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv index f971ce29ff..3f6e092144 100644 --- a/erpnext/translations/hu.csv +++ b/erpnext/translations/hu.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mutasd változ DocType: Sales Invoice Item,Quantity,Mennyiség apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Hitelekkel (kötelezettségek) DocType: Employee Education,Year of Passing,Év Passing +sites/assets/js/erpnext.min.js +27,In Stock,Raktáron apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Egyszerre csak fizetés ellenében nem számlázott vevői rendelés DocType: Designation,Designation,Titulus DocType: Production Plan Item,Production Plan Item,Gyártási terv tétele @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Beállításait HR DocType: SMS Center,SMS Center,SMS Központ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Egyengető DocType: BOM Replace Tool,New BOM,Új anyagjegyzék +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Naplók számlázás. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Ellennyomásos öntés apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Hírlevél még nem küldték DocType: Lead,Request Type,Kérés típusa @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Új készlet mértékegysége DocType: Period Closing Voucher,Closing Account Head,Záró fiók vezetője DocType: Employee,External Work History,Külső munka története apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Körkörös hivatkozás Error +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Tényleg azt akarja állítani DocType: Communication,Closed,Lezárva DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Szavakban (Export) lesz látható, ha menteni a szállítólevélen." +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Biztosan le szeretné állítani DocType: Lead,Industry,Ipar DocType: Employee,Job Profile,Job Profile DocType: Newsletter,Newsletter,Hírlevél @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Töltsd f apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Küldés most ,Support Analytics,Támogatási analitika DocType: Item,Website Warehouse,Weboldal Warehouse +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,"Tényleg azt szeretnénk, hogy leállítják a termelést érdekében:" DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","A hónap napja, amelyen auto számla jön létre pl 05, 28 stb" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,"Pontszám kell lennie, kisebb vagy egyenlő, mint 5" apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form bejegyzések @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Feh DocType: SMS Center,All Lead (Open),Minden Lead (Open) DocType: Purchase Invoice,Get Advances Paid,Kifizetett előlegek átmásolása apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Arcképed csatolása +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Csinál DocType: Journal Entry,Total Amount in Words,Teljes összeg kiírva DocType: Workflow State,Stop,Megáll apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Hiba történt. Az egyik valószínű oka az lehet, hogy nem mentette formájában. Kérjük, forduljon support@erpnext.com ha a probléma továbbra is fennáll." @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,Különbözeti bejegyzés generál DocType: Upload Attendance,Attendance From Date,Jelenléti Dátum DocType: Appraisal Template Goal,Key Performance Area,Teljesítménymutató terület apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Szállítás +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,év: DocType: Email Digest,Annual Expense,Éves költség DocType: SMS Center,Total Characters,Összesen karakterek apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Kérjük, válasszon BOM BOM területen jogcím {0}" @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,Szabadnapok DocType: Sales Order Item,Planned Quantity,Tervezett mennyiség DocType: Purchase Invoice Item,Item Tax Amount,Az anyag adójának értéke DocType: Item,Maintain Stock,Fenntartani Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock bejegyzés már létrehozott termelési rendelés DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe valamennyi megjelölés" apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza Rate" apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ele apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő JV összeget {2}" DocType: Item,Inventory,Leltár DocType: Features Setup,"To enable ""Point of Sale"" view","Annak érdekében, hogy "Point of Sale" nézet" +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Fizetés nem lehet üres Kosár DocType: Item,Sales Details,Értékesítés részletei apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning DocType: Opportunity,With Items,A tételek @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,Súlyozás apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Bányászati apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Gyanta casting apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Az ügyfélszolgálati csoport létezik azonos nevű kérjük, változtassa meg az Ügyfél nevét vagy nevezze át a Vásárlói csoport" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Kérjük, válassza ki a {0} először." apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0} DocType: Territory,Parent Territory,Szülő Terület DocType: Quality Inspection Reading,Reading 2,Reading 2 @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,Márkák DocType: C-Form Invoice Detail,Invoice No,Számlát nem apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Tól Megrendelés DocType: Activity Cost,Costing Rate,Költségszámítás Rate +,Customer Addresses And Contacts,Vevő címek és kapcsolatok DocType: Employee,Resignation Letter Date,Lemondását levélben dátuma apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Árazási szabályok tovább leszűrjük alapján mennyiséget. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nincs megadva @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Idő Log Status kell benyújtani. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Soros {0} nem tartozik semmilyen Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Beállítása +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Sor # DocType: Purchase Invoice,In Words (Company Currency),Szavakkal (a cég valutanemében) DocType: Pricing Rule,Supplier,Beszállító DocType: C-Form,Quarter,Negyed @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,További költség központok tehető alatt Csoportok de bejegyzéseket lehet tenni ellene nem Csoportok DocType: Project,External,Külső DocType: Features Setup,Item Serial Nos,Anyag-sorozatszámok +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Felhasználók és engedélyek DocType: Branch,Branch,Ágazat +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Nyomtatás és Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nem fizetése csúszik talált hónapban: DocType: Bin,Actual Quantity,Tényleges Mennyiség DocType: Shipping Rule,example: Next Day Shipping,például: Következő napi szállítás apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} nem található @@ -3038,6 +3053,7 @@ DocType: Serial No,Distinct unit of an Item,Különálló egység Egy tétel DocType: Pricing Rule,Buying,Beszerzés DocType: HR Settings,Employee Records to be created by,Munkavállalói Records által létrehozandó apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ez az Időnapló gyűjtő törölve lett. +,Reqd By Date,Reqd Dátum szerint DocType: Salary Slip Earning,Salary Slip Earning,Fizetés Slip Earning apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,A hitelezők apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Sor # {0}: Sorszám kötelező @@ -3266,6 +3282,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Véve a raktárban (Perpetual Inventory) jön létre e számla. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Raktár nem lehet törölni a készletek főkönyvi bejegyzés létezik erre a raktárban. DocType: Company,Distribution,Nagykereskedelem +sites/assets/js/erpnext.min.js +50,Amount Paid,Kifizetett Összeg apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projekt menedzser apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,A(z) {0} tételre max. {1}% engedmény adható @@ -3760,6 +3777,7 @@ DocType: Account,Parent Account,Szülő Account DocType: Quality Inspection Reading,Reading 3,Reading 3 ,Hub,Kerékagy DocType: GL Entry,Voucher Type,Bizonylat típusa +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,"Árlista nem található, vagy a fogyatékkal" DocType: Expense Claim,Approved,Jóváhagyott DocType: Pricing Rule,Price,Árazás apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Munkavállalói megkönnyebbült {0} kell beállítani -Bal- @@ -3874,6 +3892,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Kérjük, válasszon Kategória első" apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektek. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nem mutatnak szimbólum, mint $$ etc mellett valuták." +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Fél Nap) DocType: Supplier,Credit Days,Credit Napok DocType: Leave Type,Is Carry Forward,Van átviszi apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Elemek áthozása Anyagjegyzékből diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv index 15c7c0699e..75a484d5d4 100644 --- a/erpnext/translations/id.csv +++ b/erpnext/translations/id.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Tampilkan Vari DocType: Sales Invoice Item,Quantity,Kuantitas apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredit (Kewajiban) DocType: Employee Education,Year of Passing,Tahun Passing +sites/assets/js/erpnext.min.js +27,In Stock,Dalam Persediaan apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan Orde Penjualan DocType: Designation,Designation,Penunjukan DocType: Production Plan Item,Production Plan Item,Rencana Produksi Barang @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Pengaturan untuk mo DocType: SMS Center,SMS Center,SMS Center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Meluruskan DocType: BOM Replace Tool,New BOM,New BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Waktu Log untuk Penagihan. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Pengecoran Countergravity apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter telah terkirim DocType: Lead,Request Type,Permintaan Type @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM DocType: Period Closing Voucher,Closing Account Head,Menutup Akun Kepala DocType: Employee,External Work History,Eksternal Sejarah Kerja apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referensi Kesalahan melingkar +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Apakah Anda benar-benar ingin BERHENTI DocType: Communication,Closed,Tertutup DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dalam Kata-kata (Ekspor) akan terlihat sekali Anda menyimpan Delivery Note. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Apakah Anda yakin ingin BERHENTI DocType: Lead,Industry,Industri DocType: Employee,Job Profile,Profil Job DocType: Newsletter,Newsletter,Laporan berkala @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload ke apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Kirim sekarang ,Support Analytics,Dukungan Analytics DocType: Item,Website Warehouse,Situs Gudang +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Apakah Anda benar-benar ingin berhenti produksi pesanan: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Hari bulan yang otomatis faktur akan dihasilkan misalnya 05, 28 dll" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor harus kurang dari atau sama dengan 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form catatan @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Puti DocType: SMS Center,All Lead (Open),Semua Prospektus (Open) DocType: Purchase Invoice,Get Advances Paid,Dapatkan Uang Muka Dibayar apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pasang Gambar Anda +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Membuat DocType: Journal Entry,Total Amount in Words,Jumlah Total Kata DocType: Workflow State,Stop,berhenti apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Ada kesalahan. Salah satu alasan yang mungkin bisa jadi Anda belum menyimpan formulir. Silahkan hubungi support@erpnext.com jika masalah terus berlanjut. @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,Membuat Perbedaan Entri DocType: Upload Attendance,Attendance From Date,Kehadiran Dari Tanggal DocType: Appraisal Template Goal,Key Performance Area,Key Bidang Kinerja apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transportasi +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dan tahun: DocType: Email Digest,Annual Expense,Beban tahunan DocType: SMS Center,Total Characters,Jumlah Karakter apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Silakan pilih BOM BOM di lapangan untuk Item {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,Liburan DocType: Sales Order Item,Planned Quantity,Direncanakan Kuantitas DocType: Purchase Invoice Item,Item Tax Amount,Jumlah Pajak Barang DocType: Item,Maintain Stock,Menjaga Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Saham Entries sudah dibuat untuk Pesanan Produksi DocType: Leave Control Panel,Leave blank if considered for all designations,Biarkan kosong jika dipertimbangkan untuk semua sebutan apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan jumlah JV {2} DocType: Item,Inventory,Inventarisasi DocType: Features Setup,"To enable ""Point of Sale"" view",Untuk mengaktifkan "Point of Sale" tampilan +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Pembayaran tidak dapat dibuat untuk keranjang kosong DocType: Item,Sales Details,Detail Penjualan apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Menjepit DocType: Opportunity,With Items,Dengan Produk @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Pertambangan apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Pengecoran resin apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Pelanggan sudah ada dengan nama yang sama, silakan mengubah nama Pelanggan atau mengubah nama Grup Pelanggan" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Silahkan pilih {0} pertama. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},teks {0} DocType: Territory,Parent Territory,Wilayah Induk DocType: Quality Inspection Reading,Reading 2,Membaca 2 @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,Merek DocType: C-Form Invoice Detail,Invoice No,Faktur ada apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Dari Purchase Order DocType: Activity Cost,Costing Rate,Biaya Tingkat +,Customer Addresses And Contacts,Alamat Pelanggan Dan Kontak DocType: Employee,Resignation Letter Date,Surat Pengunduran Diri Tanggal apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Aturan harga selanjutnya disaring berdasarkan kuantitas. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Tidak Diatur @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Waktu Log Status harus Dikirim. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial ada {0} bukan milik Gudang setiap apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Pengaturan +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),Dalam Kata-kata (Perusahaan Mata Uang) DocType: Pricing Rule,Supplier,Pemasok DocType: C-Form,Quarter,Perempat @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat biaya lebih lanjut dapat dibuat di bawah Grup tetapi entri dapat dilakukan terhadap non-Grup DocType: Project,External,Eksternal DocType: Features Setup,Item Serial Nos,Item Serial Nos +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Perizinan DocType: Branch,Branch,Cabang +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Percetakan dan Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ada slip gaji yang ditemukan selama satu bulan: DocType: Bin,Actual Quantity,Kuantitas Aktual DocType: Shipping Rule,example: Next Day Shipping,Contoh: Hari Berikutnya Pengiriman apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} tidak ditemukan @@ -3100,6 +3115,7 @@ DocType: Serial No,Distinct unit of an Item,Unit berbeda Item DocType: Pricing Rule,Buying,Pembelian DocType: HR Settings,Employee Records to be created by,Rekaman Karyawan yang akan dibuat oleh apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Batch Waktu Log ini telah dibatalkan. +,Reqd By Date,Reqd By Date DocType: Salary Slip Earning,Salary Slip Earning,Slip Gaji Produktif apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditor apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Serial ada adalah wajib @@ -3329,6 +3345,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Akun untuk gudang (Inventaris Perpetual) akan dibuat di bawah Rekening ini. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak dapat dihapus sebagai entri stok buku ada untuk gudang ini. DocType: Company,Distribution,Distribusi +sites/assets/js/erpnext.min.js +50,Amount Paid,Jumlah Dibayar apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Manager Project apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Pengiriman apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Diskon Max diperbolehkan untuk item: {0} {1}% @@ -3835,6 +3852,7 @@ DocType: Account,Parent Account,Rekening Induk DocType: Quality Inspection Reading,Reading 3,Membaca 3 ,Hub,Pusat DocType: GL Entry,Voucher Type,Voucher Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan DocType: Expense Claim,Approved,Disetujui DocType: Pricing Rule,Price,Harga apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri' @@ -3949,6 +3967,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Silahkan pilih Kategori pertama apps/erpnext/erpnext/config/projects.py +18,Project master.,Menguasai proyek. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Jangan menunjukkan simbol seperti $ etc sebelah mata uang. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Setengah Hari) DocType: Supplier,Credit Days,Hari Kredit DocType: Leave Type,Is Carry Forward,Apakah Carry Teruskan apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Dapatkan item dari BOM diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv index 3ab29eb488..046df3f25c 100644 --- a/erpnext/translations/it.csv +++ b/erpnext/translations/it.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostra Variant DocType: Sales Invoice Item,Quantity,Quantità apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Prestiti (passività ) DocType: Employee Education,Year of Passing,Anni dal superamento +sites/assets/js/erpnext.min.js +27,In Stock,In Giacenza apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Posso solo effettuare il pagamento non fatturato contro vendite Order DocType: Designation,Designation,Designazione DocType: Production Plan Item,Production Plan Item,Produzione Piano Voce @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Impostazioni per il DocType: SMS Center,SMS Center,Centro SMS apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Raddrizzare DocType: BOM Replace Tool,New BOM,Nuova Distinta Base +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch registri di tempo per la fatturazione. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity colata apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter già inviata DocType: Lead,Request Type,Tipo di richiesta @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nuovo UOM Archivio DocType: Period Closing Voucher,Closing Account Head,Chiudere Conto Primario DocType: Employee,External Work History,Storia del lavoro esterno apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Error Reference +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Vuoi davvero STOP DocType: Communication,Closed,Chiuso DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In Parole (Export) sarà visibile una volta che si salva il DDT. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Sei sicuro di voler STOP DocType: Lead,Industry,Industria DocType: Employee,Job Profile,Profilo di lavoro DocType: Newsletter,Newsletter,Newsletter @@ -737,6 +741,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Carica Sa apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Invia Ora ,Support Analytics,Analytics Support DocType: Item,Website Warehouse,Magazzino sito web +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Sei sicuro di voler smettere di ordine di produzione: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Il giorno del mese su cui viene generata fattura automatica es 05, 28 ecc" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punteggio deve essere minore o uguale a 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Record C -Form @@ -879,6 +884,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bian DocType: SMS Center,All Lead (Open),Tutti LEAD (Aperto) DocType: Purchase Invoice,Get Advances Paid,Ottenere anticipo pagamento apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Allega la tua foto +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Fare DocType: Journal Entry,Total Amount in Words,Importo totale in parole DocType: Workflow State,Stop,stop apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Si è verificato un errore . Una ragione probabile potrebbe essere che non si è salvato il modulo. Si prega di contattare support@erpnext.com se il problema persiste . @@ -959,6 +965,7 @@ DocType: Journal Entry,Make Difference Entry,Crea Voce Differenza DocType: Upload Attendance,Attendance From Date,Partecipazione Da Data DocType: Appraisal Template Goal,Key Performance Area,Area Chiave Prestazioni apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Trasporto +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e anno: DocType: Email Digest,Annual Expense,Spesa annua DocType: SMS Center,Total Characters,Totale Personaggi apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Seleziona BOM BOM in campo per la voce {0} @@ -1196,6 +1203,7 @@ DocType: Holiday List,Holidays,Vacanze DocType: Sales Order Item,Planned Quantity,Prevista Quantità DocType: Purchase Invoice Item,Item Tax Amount,Articolo fiscale Ammontare DocType: Item,Maintain Stock,Mantenere Scorta +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Le voci di archivio già creati per ordine di produzione DocType: Leave Control Panel,Leave blank if considered for all designations,Lasciare vuoto se considerato per tutte le designazioni apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1259,6 +1267,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a JV importo {2} DocType: Item,Inventory,Inventario DocType: Features Setup,"To enable ""Point of Sale"" view",Per attivare la "Point of Sale" vista +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Il pagamento non può essere effettuato per carrello vuoto DocType: Item,Sales Details,Dettagli di vendita apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning DocType: Opportunity,With Items,Con gli articoli @@ -1451,6 +1460,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minerario apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Colata di resina apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Esiste un Gruppo Clienti con lo stesso nome, per favore cambiare il nome del Cliente o rinominare il Gruppo Clienti" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Si prega di selezionare {0} prima. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0} DocType: Territory,Parent Territory,Territorio genitore DocType: Quality Inspection Reading,Reading 2,Lettura 2 @@ -1632,6 +1642,7 @@ DocType: Features Setup,Brands,Marche DocType: C-Form Invoice Detail,Invoice No,Fattura n apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Da Ordine di Acquisto DocType: Activity Cost,Costing Rate,Costing Tasso +,Customer Addresses And Contacts,Indirizzi e Contatti Cliente DocType: Employee,Resignation Letter Date,Lettera di dimissioni Data apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Regole dei prezzi sono ulteriormente filtrati in base alla quantità. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Non Impostato @@ -1739,6 +1750,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Stato deve essere presentata. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N. di serie {0} non appartiene ad alcun magazzino apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Impostazione +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),In Parole (Azienda valuta) DocType: Pricing Rule,Supplier,Fornitore DocType: C-Form,Quarter,Trimestrale @@ -1837,7 +1849,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Ulteriori centri di costo possono essere fatte in Gruppi ma le voci possono essere fatte contro i non-Gruppi DocType: Project,External,Esterno DocType: Features Setup,Item Serial Nos,Voce n ° di serie +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utenti e autorizzazioni DocType: Branch,Branch,Ramo +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Stampa e Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nessuna busta paga trovata per il mese: DocType: Bin,Actual Quantity,Quantità Reale DocType: Shipping Rule,example: Next Day Shipping,esempio: Next Day spedizione apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} non trovato @@ -3097,6 +3112,7 @@ DocType: Serial No,Distinct unit of an Item,Un'unità distinta di un elemento DocType: Pricing Rule,Buying,Acquisti DocType: HR Settings,Employee Records to be created by,Informazioni del dipendenti da creare a cura di apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Questo Log Batch Ora è stato annullato. +,Reqd By Date,Reqd Per Data DocType: Salary Slip Earning,Salary Slip Earning,Stipendio slittamento Guadagnare apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Creditori apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Fila # {0}: N. di serie è obbligatoria @@ -3325,6 +3341,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Conto per il magazzino ( Perpetual Inventory) verrà creato con questo account . apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazzino non può essere eliminato siccome esiste articolo ad inventario per questo Magazzino . DocType: Company,Distribution,Distribuzione +sites/assets/js/erpnext.min.js +50,Amount Paid,Importo pagato apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Spedizione apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Sconto massimo consentito per la voce: {0} {1}% @@ -3830,6 +3847,7 @@ DocType: Account,Parent Account,Account principale DocType: Quality Inspection Reading,Reading 3,Lettura 3 ,Hub,Mozzo DocType: GL Entry,Voucher Type,Voucher Tipo +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Listino Prezzi non trovato o disattivato DocType: Expense Claim,Approved,Approvato DocType: Pricing Rule,Price,prezzo apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato' @@ -3944,6 +3962,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Si prega di selezionare Categoria prima apps/erpnext/erpnext/config/projects.py +18,Project master.,Progetto Master. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Non visualizzare nessun simbolo tipo € dopo le Valute. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Mezza giornata) DocType: Supplier,Credit Days,Giorni Credito DocType: Leave Type,Is Carry Forward,È Portare Avanti apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Recupera elementi da Distinta Base diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv index 6d0618eb39..085ccbab46 100644 --- a/erpnext/translations/ja.csv +++ b/erpnext/translations/ja.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,バリエー DocType: Sales Invoice Item,Quantity,数量 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ローン（負債） DocType: Employee Education,Year of Passing,経過年 +sites/assets/js/erpnext.min.js +27,In Stock,在庫中 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,未請求の受注に対してのみ支払を行うことができます DocType: Designation,Designation,肩書 DocType: Production Plan Item,Production Plan Item,生産計画アイテム @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,人事モジュー DocType: SMS Center,SMS Center,SMSセンター apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,曲り矯正 DocType: BOM Replace Tool,New BOM,新しい部品表 +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,請求用時間ログバッチ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,反重力鋳造 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,ニュースレターはすでに送信されています DocType: Lead,Request Type,要求タイプ @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,新しい在庫単位 DocType: Period Closing Voucher,Closing Account Head,決算科目 DocType: Employee,External Work History,職歴（他社） apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環参照エラー +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,本当に停止しますか DocType: Communication,Closed,クローズ DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,納品書を保存すると「表記（エクスポート）」が表示されます。 +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,停止してよろしいですか DocType: Lead,Industry,業種 DocType: Employee,Job Profile,職務内容 DocType: Newsletter,Newsletter,ニュースレター @@ -519,7 +523,7 @@ DocType: Sales Order,Billing and Delivery Status,請求と配達の状況 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,リピート顧客 DocType: Leave Control Panel,Allocate,割当 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,前 -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,販売に戻る +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,販売返品 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,作成した製造指示から受注を選択します。 apps/erpnext/erpnext/config/hr.py +120,Salary components.,給与コンポーネント apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在顧客データベース @@ -745,6 +749,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSVから apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,今すぐ送信 ,Support Analytics,サポート分析 DocType: Item,Website Warehouse,ウェブサイトの倉庫 +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,本当に次の製造指示を停止しますか： DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",自動請求を生成する日付（例：05、28など） apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,スコアは5以下でなければなりません apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Cフォームの記録 @@ -887,6 +892,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ホ DocType: SMS Center,All Lead (Open),全リード（オープン） DocType: Purchase Invoice,Get Advances Paid,立替金を取得 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,あなたの写真を添付 +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,作成 DocType: Journal Entry,Total Amount in Words,合計の文字表記 DocType: Workflow State,Stop,停止 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"エラーが発生しました。 @@ -969,6 +975,7 @@ DocType: Journal Entry,Make Difference Entry,差違エントリを作成 DocType: Upload Attendance,Attendance From Date,出勤開始日 DocType: Appraisal Template Goal,Key Performance Area,重要実行分野 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,輸送 +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,＆年： DocType: Email Digest,Annual Expense,年間経費 DocType: SMS Center,Total Characters,文字数合計 apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},アイテム{0}の部品表フィールドで部品表を選択してください @@ -1008,7 +1015,7 @@ DocType: Item Attribute Value,"This will be appended to the Item Code of the var DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,給与伝票を保存すると給与が表示されます。 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,アクティブ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,青 -DocType: Purchase Invoice,Is Return,戻り値 +DocType: Purchase Invoice,Is Return,返品 DocType: Price List Country,Price List Country,価格表内の国 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,これ以上のノードは「グループ」タイプのノードの下にのみ作成することができます DocType: Item,UOMs,数量単位 @@ -1207,6 +1214,7 @@ DocType: Holiday List,Holidays,休日 DocType: Sales Order Item,Planned Quantity,計画数 DocType: Purchase Invoice Item,Item Tax Amount,アイテムごとの税額 DocType: Item,Maintain Stock,在庫維持 +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,製造指示が作成済の在庫エントリー DocType: Leave Control Panel,Leave blank if considered for all designations,全ての肩書を対象にする場合は空白のままにします apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大：{0} @@ -1270,6 +1278,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ア apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：割り当て額{1}は仕訳伝票額{2}以下でなければなりません DocType: Item,Inventory,在庫 DocType: Features Setup,"To enable ""Point of Sale"" view",POS画面を有効にする +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,空のカートに支払はできません DocType: Item,Sales Details,販売明細 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ピンニング DocType: Opportunity,With Items,関連アイテム @@ -1466,6 +1475,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining, apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,レジンキャスト apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します 顧客名か顧客グループのどちらかの名前を変更してください" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,最初の{0}を選択してください apps/erpnext/erpnext/templates/pages/order.html +57,text {0},テキスト{0} DocType: Territory,Parent Territory,上位地域 DocType: Quality Inspection Reading,Reading 2,報告要素2 @@ -1647,6 +1657,7 @@ DocType: Features Setup,Brands,ブランド DocType: C-Form Invoice Detail,Invoice No,請求番号 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,参照元発注 DocType: Activity Cost,Costing Rate,原価計算単価 +,Customer Addresses And Contacts,顧客の住所と連絡先 DocType: Employee,Resignation Letter Date,辞表提出日 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,価格設定ルールは量に基づいてさらにフィルタリングされます apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,設定されていません @@ -1754,6 +1765,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間ログのステータスが提出されなければなりません apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,シリアル番号は{0}任意の倉庫にも属していません apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,セットアップ +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,行＃ DocType: Purchase Invoice,In Words (Company Currency),文字表記（会社通貨） DocType: Pricing Rule,Supplier,サプライヤー DocType: C-Form,Quarter,四半期 @@ -1852,7 +1864,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます DocType: Project,External,外部 DocType: Features Setup,Item Serial Nos,アイテムシリアル番号 +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ユーザーと権限 DocType: Branch,Branch,支社・支店 +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷とブランディング +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,次の月の給与明細がありません： DocType: Bin,Actual Quantity,実際の数量 DocType: Shipping Rule,example: Next Day Shipping,例：翌日発送 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,シリアル番号 {0} は見つかりません @@ -3117,6 +3132,7 @@ DocType: Serial No,Distinct unit of an Item,アイテムの明確な単位 DocType: Pricing Rule,Buying,購入 DocType: HR Settings,Employee Records to be created by,従業員レコード作成元 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,この時間ログバッチはキャンセルされました +,Reqd By Date,要求済日付 DocType: Salary Slip Earning,Salary Slip Earning,給与支給明細 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,債権者 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,行＃{0}：シリアル番号は必須です @@ -3132,7 +3148,7 @@ apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,送 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,今後のイベント apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,顧客が必要です DocType: Letter Head,Letter Head,レターヘッド -apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}戻りのために必須です +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,返品には {0} が必須です DocType: Purchase Order,To Receive,受領する apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,焼き嵌め apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com @@ -3346,6 +3362,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,倉庫（継続記録）のアカウントは、このアカウントの下に作成されます。 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,在庫元帳にエントリーが存在する倉庫を削除することはできません。 DocType: Company,Distribution,配布 +sites/assets/js/erpnext.min.js +50,Amount Paid,支払額 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,プロジェクトマネージャー apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,発送 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,アイテムの許可最大割引：{0}が{1}％ @@ -3854,6 +3871,7 @@ DocType: Account,Parent Account,親勘定 DocType: Quality Inspection Reading,Reading 3,報告要素3 ,Hub,ハブ DocType: GL Entry,Voucher Type,伝票タイプ +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,価格表が見つからないか無効になっています DocType: Expense Claim,Approved,承認済 DocType: Pricing Rule,Price,価格 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません @@ -3968,6 +3986,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,カテゴリを選択してください apps/erpnext/erpnext/config/projects.py +18,Project master.,プロジェクトマスター DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,次の通貨に$などのような任意のシンボルを表示しません。 +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),（半日） DocType: Supplier,Credit Days,信用日数 DocType: Leave Type,Is Carry Forward,繰越済 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,部品表からアイテムを取得 diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv index 3e53b6c851..6701d7280e 100644 --- a/erpnext/translations/km.csv +++ b/erpnext/translations/km.csv @@ -51,6 +51,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,បង្ហ DocType: Sales Invoice Item,Quantity,បរិមាណ​ដែល​ត្រូវ​ទទួលទាន apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ការ​ផ្តល់​ប្រាក់​កម្ចី (បំណុល​) DocType: Employee Education,Year of Passing,ឆ្នាំ Pass +sites/assets/js/erpnext.min.js +27,In Stock,នៅ​ក្នុង​ផ្សារ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,ត្រឹម​តែ​អាច​ធ្វើ​ឱ្យ​ការ​ទូទាត់​នឹង​ដីកា​សម្រេច​លក់ unbilled DocType: Designation,Designation,ការ​រចនា DocType: Production Plan Item,Production Plan Item,ផលិតកម្ម​ធាតុ​ផែនការ @@ -153,6 +154,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,ការ​កំ DocType: SMS Center,SMS Center,ផ្ញើ​សារ​ជា​អក្សរ​មជ្ឈមណ្ឌល apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,straightening DocType: BOM Replace Tool,New BOM,Bom ដែល​ថ្មី +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,កំណត់ហេតុ​ជា​បាច់​សម្រាប់​វិ​ក័​យ​ប័ត្រ​វេលា​ម៉ោង​។ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity សម្ដែង apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,ព្រឹត្តិ​ប័ត្រ​ព័ត៌មាន​ត្រូវ​បាន​ផ្ញើ​ទៅ DocType: Lead,Request Type,ប្រភេទ​នៃ​សំណើ​សុំ @@ -261,8 +263,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,ញូ​ហ៊ុន UOM DocType: Period Closing Voucher,Closing Account Head,បិទ​នាយក​គណនី DocType: Employee,External Work History,ការងារ​ខាងក្រៅ​ប្រវត្តិ apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,កំហុស​ក្នុង​ការ​យោង​សារាចរ +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,តើ​អ្នក​ពិត​ជា​ចង់​បញ្ឈប់ DocType: Communication,Closed,បាន​បិទ DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,នៅ​ក្នុង​ពាក្យ (នាំ​ចេញ​) នឹង​មើល​ឃើញ​នៅ​ពេល​ដែល​អ្នក​រក្សា​ទុក​ចំណាំ​ដឹកជញ្ជូន​ផង​ដែរ​។ +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,តើ​អ្នក​ពិត​ជា​ចង់​បញ្ឈប់ DocType: Lead,Industry,វិស័យ​ឧស្សាហកម្ម DocType: Employee,Job Profile,ទម្រង់​ការងារ DocType: Newsletter,Newsletter,ព្រឹត្តិ​ប័ត្រ​ព័ត៌មាន @@ -639,6 +643,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,ផ្ទ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ផ្ញើ​ឥឡូវ ,Support Analytics,ការ​គាំទ្រ​វិភាគ DocType: Item,Website Warehouse,វេ​ប​សាយ​ឃ្លាំង +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,តើ​អ្នក​ពិត​ជា​ចង់​បញ្ឈប់​ការ​បញ្ជាទិញ​ផលិត​: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ថ្ងៃ​នៃ​ខែ​ដែល​វិ​ក័​យ​ប័ត្រ​ដោយ​ស្វ័យ​ប្រវត្តិ​នឹង​ត្រូវ​បាន​បង្កើត​ឧ 05​, 28 ល" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ពិន្ទុ​ត្រូវ​តែ​តិច​ជាង​ឬ​ស្មើ​នឹង 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,កំណត់ត្រា C​-សំណុំ​បែបបទ @@ -767,6 +772,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ស DocType: SMS Center,All Lead (Open),អ្នក​ដឹក​នាំ​ការ​ទាំងអស់ (ការ​បើក​ចំហ​) DocType: Purchase Invoice,Get Advances Paid,ទទួល​បាន​ការ​វិវត្ត​បង់ប្រាក់ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ភ្ជាប់​រូបភាព​របស់​អ្នក +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,ធ្វើ​ឱ្យ DocType: Journal Entry,Total Amount in Words,ចំនួន​សរុប​នៅ​ក្នុង​ពាក្យ DocType: Workflow State,Stop,បញ្ឈប់ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,មាន​កំហុស​។ ហេតុ​ផល​មួយ​ដែល​អាច​នឹង​ត្រូវ​បាន​ប្រហែលជា​ដែល​អ្នក​មិន​បាន​រក្សា​ទុក​សំណុំ​បែប​បទ​។ សូម​ទាក់ទង support@erpnext.com ប្រសិន​បើ​បញ្ហា​នៅតែ​បន្ត​កើតមាន​។ @@ -840,6 +846,7 @@ DocType: Journal Entry,Make Difference Entry,ធ្វើ​ឱ្យ​ធា DocType: Upload Attendance,Attendance From Date,ការ​ចូលរួម​ពី​កាល​បរិច្ឆេទ DocType: Appraisal Template Goal,Key Performance Area,គន្លឹះ​ការ​ស​ម្តែ​ង​តំបន់ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,ការ​ដឹក​ជញ្ជូន +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,និង​ឆ្នាំ​: DocType: Email Digest,Annual Expense,ចំណាយ​ប្រចាំ​ឆ្នាំ DocType: SMS Center,Total Characters,តួអក្សរ​សរុប DocType: C-Form Invoice Detail,C-Form Invoice Detail,ព​ត៌​មាន​វិ​ក័​យ​ប័ត្រ​របស់ C​-សំណុំ​បែបបទ @@ -1048,6 +1055,7 @@ DocType: Holiday List,Holidays,ថ្ងៃ​ឈប់​សម្រាក DocType: Sales Order Item,Planned Quantity,បរិមាណ​ដែល​បាន​គ្រោង​ទុក DocType: Purchase Invoice Item,Item Tax Amount,ចំនួន​ទឹកប្រាក់​ពន្ធ​លើ​ធាតុ DocType: Item,Maintain Stock,ការ​រក្សា​ហ៊ុន +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ធាតុ​ភាគ​ហ៊ុន​ដែល​បាន​បង្កើត​រួច​ផលិតកម្ម​លំដាប់ DocType: Leave Control Panel,Leave blank if considered for all designations,ប្រសិន​បើ​អ្នក​ទុក​វា​ឱ្យ​ទទេ​សម្រាប់​ការ​រចនា​ទាំង​អស់​បាន​ពិចារណា​ថា apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,ចាប់​ពី Datetime DocType: Email Digest,For Company,សម្រាប់​ក្រុមហ៊ុន @@ -1103,6 +1111,7 @@ DocType: Workstation Working Hour,Workstation Working Hour,ស្ថានីយ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,អ្នក​វិភាគ DocType: Item,Inventory,សារពើ​ភ័​ណ្ឌ DocType: Features Setup,"To enable ""Point of Sale"" view",ដើម្បី​បើក​ការ​«​ចំណុច​នៃ​ការ​លក់​«​ទស្សនៈ +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,ការ​ទូទាត់​មិន​អាច​ត្រូវ​បាន​ធ្វើ​ឡើង​សម្រាប់​រទេះ​ទទេ DocType: Item,Sales Details,ព​ត៌​មាន​លំអិត​ការ​លក់ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,pinning DocType: Opportunity,With Items,ជា​មួយ​នឹង​ការ​ធាតុ @@ -1424,6 +1433,7 @@ DocType: Features Setup,Brands,ផលិតផល​ម៉ាក DocType: C-Form Invoice Detail,Invoice No,គ្មាន​វិ​ក័​យ​ប័ត្រ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,បាន​មក​ពី​ការ​ទិញ​ស​ណ្តា​ប់​ធ្នាប់ DocType: Activity Cost,Costing Rate,អត្រា​ការ​ប្រាក់​មាន​តម្លៃ +,Customer Addresses And Contacts,អាសយដ្ឋាន​អតិថិជន​និង​ទំនាក់ទំនង DocType: Employee,Resignation Letter Date,កាលបរិច្ឆេទ​លិខិត​លា​លែង​ពី​តំណែង apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,ក្បួន​កំណត់​តម្លៃ​ត្រូវ​បាន​ត្រង​បន្ថែម​ទៀត​ដោយ​ផ្អែក​លើ​បរិមាណ​។ apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,មិន​បាន​កំណត់ @@ -1519,6 +1529,7 @@ apps/erpnext/erpnext/hooks.py +84,Shipments,ការ​នាំ​ចេញ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,ផ្សិត​ដង apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ស្ថានភាព​កំណត់ហេតុ​ម៉ោង​ត្រូវ​ជូន​។ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ការ​ដំឡើង +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ជួរ​ដេក # DocType: Purchase Invoice,In Words (Company Currency),នៅ​ក្នុង​ពាក្យ (ក្រុមហ៊ុន​រូបិយវត្ថុ​) DocType: Pricing Rule,Supplier,ក្រុមហ៊ុន​ផ្គត់ផ្គង់ DocType: C-Form,Quarter,ត្រី​មាស @@ -1606,7 +1617,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,មជ្ឈ​មណ្ឌល​ការ​ចំណាយ​បន្ថែម​ទៀត​អាច​ត្រូវ​បាន​ធ្វើ​ឡើង​នៅ​ក្រោម​ការ​ក្រុម​នោះ​ទេ​ប៉ុន្តែ​ធាតុ​ដែល​អាច​ត្រូវ​បាន​ធ្វើ​ប្រឆាំង​នឹង​ការ​ដែល​មិន​មែន​ជា​ក្រុម DocType: Project,External,ខាងក្រៅ DocType: Features Setup,Item Serial Nos,ធាតុ​សៀរៀល Nos +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,អ្នក​ប្រើ​និង​សិទ្ធិ DocType: Branch,Branch,សាខា +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ការ​បោះពុម្ព​និង​ម៉ាក +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,គ្មាន​ប័ណ្ណ​ប្រាក់​បៀវត្ស​ដែល​បាន​រក​ឃើញ​ក្នុង​ខែ​: DocType: Bin,Actual Quantity,បរិមាណ​ដែល​ត្រូវ​ទទួលទាន​ពិត​ប្រាកដ DocType: Shipping Rule,example: Next Day Shipping,ឧទាហរណ៍​: ថ្ងៃ​បន្ទាប់​ការ​ដឹក​ជញ្ជូន apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,អតិថិជន​របស់​អ្នក @@ -2697,6 +2711,7 @@ DocType: Serial No,Distinct unit of an Item,អង្គភាព​ផ្សេ DocType: Pricing Rule,Buying,ការ​ទិញ DocType: HR Settings,Employee Records to be created by,កំណត់ត្រា​បុគ្គលិក​ដែល​នឹង​ត្រូវ​បាន​បង្កើត​ឡើង​ដោយ apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,នេះ​បាច់​កំណត់ហេតុ​ម៉ោង​ត្រូវ​បាន​លុបចោល​។ +,Reqd By Date,Reqd តាម​កាល​បរិច្ឆេទ DocType: Salary Slip Earning,Salary Slip Earning,ទទួល​បាន​ប្រាក់ខែ​គ្រូពេទ្យ​ប្រហែលជា apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,ម្ចាស់​បំណុល DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ព​ត៌​មាន​លំអិត​ពន្ធ​លើ​ដែល​មាន​ប្រាជ្ញា​ធាតុ @@ -2899,6 +2914,7 @@ DocType: Workstation,per hour,ក្នុង​មួយ​ម៉ោង DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,គណនី​សម្រាប់​ឃ្លាំង (សារពើ​ភ័​ណ្ឌ​ងូត​) នឹង​ត្រូវ​បាន​បង្កើត​ឡើង​ក្រោម​គណនី​នេះ​។ apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ឃ្លាំង​មិន​អាច​លុប​ធាតុ​ដែល​បាន​ចុះ​ក្នុង​សៀវភៅ​ភាគ​ហ៊ុន​មាន​សម្រាប់​ឃ្លាំង​នេះ​។ DocType: Company,Distribution,ចែកចាយ +sites/assets/js/erpnext.min.js +50,Amount Paid,ចំនួន​ទឹកប្រាក់​ដែល​បង់ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ប្រធាន​គ្រប់គ្រង​គម្រោង apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,បញ្ជូន DocType: Customer,Default Taxes and Charges,ពន្ធ​លំនាំដើម​និង​ការ​ចោទ​ប្រកាន់ @@ -3336,6 +3352,7 @@ DocType: Account,Parent Account,គណនី​មាតា​ឬ​បិតា DocType: Quality Inspection Reading,Reading 3,ការ​អាន​ទី 3 ,Hub,ហាប់ DocType: GL Entry,Voucher Type,ប្រភេទ​កាត​មាន​ទឹក​ប្រាក់ +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,រក​មិន​ឃើញ​បញ្ជី​ថ្លៃ​ឬ​ជន​ពិការ DocType: Expense Claim,Approved,បាន​អនុម័ត DocType: Pricing Rule,Price,តំលៃ​លក់ DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",ជ្រើស "បាទ​" នឹង​ផ្តល់​ឱ្យ​អត្ត​សញ្ញាណ​តែ​មួយ​គត់​ដើម្បី​ឱ្យ​អង្គភាព​គ្នា​នៃ​ធាតុ​ដែល​អាច​ត្រូវ​បាន​មើល​នៅ​ក្នុង​ស៊េរី​ចៅហ្វាយ​គ្មាន​នេះ​។ @@ -3442,6 +3459,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,សូម​ជ្រើស​ប្រភេទ​ជា​លើក​ដំបូង apps/erpnext/erpnext/config/projects.py +18,Project master.,ចៅហ្វាយ​គម្រោង​។ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,កុំ​បង្ហាញ​និមិត្ត​រូប​ដូចជា $ ល​ណាមួយ​ដែល​ជាប់​នឹង​រូបិយ​ប័ណ្ណ​។ +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(ពាក់​ក​ណ្តា​ល​ថ្ងៃ​) DocType: Supplier,Credit Days,ថ្ងៃ​ឥណទាន DocType: Leave Type,Is Carry Forward,គឺ​ត្រូវ​បាន​អនុវត្ត​ទៅ​មុខ apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,ទទួល​បាន​ធាតុ​ពី Bom diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv index 55a4376b90..ffeeaeed9a 100644 --- a/erpnext/translations/kn.csv +++ b/erpnext/translations/kn.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,ತೋ DocType: Sales Invoice Item,Quantity,ಪ್ರಮಾಣ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು ) DocType: Employee Education,Year of Passing,ಸಾಗುವುದು ವರ್ಷ +sites/assets/js/erpnext.min.js +27,In Stock,ಸಂಗ್ರಹಣೆಯಲ್ಲಿ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,ಮಾತ್ರ unbilled ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು DocType: Designation,Designation,ಹುದ್ದೆ DocType: Production Plan Item,Production Plan Item,ನಿರ್ಮಾಣ ವೇಳಾಪಟ್ಟಿಯು ಐಟಂ @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,ಮಾನವ ಸಂ DocType: SMS Center,SMS Center,ಸಂಚಿಕೆ ಸೆಂಟರ್ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ನೇರವಾಗಿ DocType: BOM Replace Tool,New BOM,ಹೊಸ BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,ಬ್ಯಾಚ್ ಬಿಲ್ಲಿಂಗ್ ಟೈಮ್ ದಾಖಲೆಗಳು. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity ಎರಕದ apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,ಸುದ್ದಿಪತ್ರ ಈಗಾಗಲೇ ಕಳುಹಿಸಲಾಗಿದೆ DocType: Lead,Request Type,ವಿನಂತಿ ಪ್ರಕಾರ @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,ಹೊಸ ಸ್ಟಾಕ್ DocType: Period Closing Voucher,Closing Account Head,ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಹೆಡ್ DocType: Employee,External Work History,ಬಾಹ್ಯ ಕೆಲಸ ಇತಿಹಾಸ apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,ನೀವು ನಿಜವಾಗಿಯೂ ನಿಲ್ಲಿಸಲು ಬಯಸುತ್ತೀರಾ DocType: Communication,Closed,ಮುಚ್ಚಲಾಗಿದೆ DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ನೀವು ವಿತರಣಾ ಸೂಚನೆ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ( ರಫ್ತು ) ಗೋಚರಿಸುತ್ತದೆ. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,ನೀವು ನಿಲ್ಲಿಸಲು ಖಚಿತವೇ DocType: Lead,Industry,ಇಂಡಸ್ಟ್ರಿ DocType: Employee,Job Profile,ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು DocType: Newsletter,Newsletter,ಸುದ್ದಿಪತ್ರ @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSV ಮ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ಈಗ ಕಳುಹಿಸಿ ,Support Analytics,ಬೆಂಬಲ ಅನಾಲಿಟಿಕ್ಸ್ DocType: Item,Website Warehouse,ವೆಬ್ಸೈಟ್ ವೇರ್ಹೌಸ್ +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,ನೀವು ನಿಜವಾಗಿಯೂ ಉತ್ಪಾದನೆ ಸಲುವಾಗಿ ನಿಲ್ಲಿಸಲು ಬಯಸುವಿರಾ: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ಸ್ವಯಂ ಸರಕುಪಟ್ಟಿ 05, 28 ಇತ್ಯಾದಿ ಉದಾ ರಚಿಸಲಾಗಿದೆ ಮೇಲೆ ತಿಂಗಳ ದಿನ" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ಸ್ಕೋರ್ ಕಡಿಮೆ ಅಥವಾ 5 ಸಮಾನವಾಗಿರಬೇಕು apps/erpnext/erpnext/config/accounts.py +169,C-Form records,ಸಿ ಆಕಾರ ರೆಕಾರ್ಡ್ಸ್ @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ಬ DocType: SMS Center,All Lead (Open),ಎಲ್ಲಾ ಪ್ರಮುಖ ( ಓಪನ್ ) DocType: Purchase Invoice,Get Advances Paid,ಪಾವತಿಸಿದ ಅಡ್ವಾನ್ಸಸ್ ಪಡೆಯಿರಿ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ನಿಮ್ಮ ಚಿತ್ರ ಲಗತ್ತಿಸಿ +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,ಮಾಡಿ DocType: Journal Entry,Total Amount in Words,ವರ್ಡ್ಸ್ ಒಟ್ಟು ಪ್ರಮಾಣ DocType: Workflow State,Stop,ನಿಲ್ಲಿಸಲು apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ಒಂದು ದೋಷ ಉಂಟಾಗಿದೆ . ನೀವು ಉಳಿಸಿಲ್ಲ ಮಾಡಲಿಲ್ಲ ಒಂದು ಸಂಭಾವ್ಯ ಕಾರಣ ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ support@erpnext.com ಸಂಪರ್ಕಿಸಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಾಧ್ಯವಾಗಿಲ್ಲ . @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,ವ್ಯತ್ಯಾಸ ಎಂಟ DocType: Upload Attendance,Attendance From Date,ಅಟೆಂಡೆನ್ಸ್ Fromdate DocType: Appraisal Template Goal,Key Performance Area,ಪ್ರಮುಖ ಸಾಧನೆ ಪ್ರದೇಶ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,ಸಾರಿಗೆ +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: , DocType: Email Digest,Annual Expense,ವಾರ್ಷಿಕ ಖರ್ಚು DocType: SMS Center,Total Characters,ಒಟ್ಟು ಪಾತ್ರಗಳು apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},ಐಟಂ ಬಿಒಎಮ್ ಕ್ಷೇತ್ರದಲ್ಲಿ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,ರಜಾದಿನಗಳು DocType: Sales Order Item,Planned Quantity,ಯೋಜಿತ ಪ್ರಮಾಣ DocType: Purchase Invoice Item,Item Tax Amount,ಐಟಂ ತೆರಿಗೆ ಪ್ರಮಾಣ DocType: Item,Maintain Stock,ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ಈಗಾಗಲೇ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ದಾಖಲಿಸಿದವರು ಸ್ಟಾಕ್ ನಮೂದುಗಳು DocType: Leave Control Panel,Leave blank if considered for all designations,ಎಲ್ಲಾ ಅಂಕಿತಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},ಮ್ಯಾಕ್ಸ್: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ವ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಜಂಟಿ ಉದ್ಯಮ ಪ್ರಮಾಣದ ಸಮ ಮಾಡಬೇಕು {2} DocType: Item,Inventory,ತಪಶೀಲು ಪಟ್ಟಿ DocType: Features Setup,"To enable ""Point of Sale"" view",ವೀಕ್ಷಿಸಿ "ಮಾರಾಟದ" ಶಕ್ತಗೊಳಿಸಲು +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,ಪಾವತಿ ಖಾಲಿ ಕಾರ್ಟ್ ಸಾಧ್ಯವಿಲ್ಲ DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ಪಿನ್ನಿಂಗ್ DocType: Opportunity,With Items,ವಸ್ತುಗಳು @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,ಮೈನಿಂಗ್ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ರಾಳದ ಎರಕದ apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು +sites/assets/js/erpnext.min.js +37,Please select {0} first.,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},ಪಠ್ಯ {0} DocType: Territory,Parent Territory,ಪೋಷಕ ಪ್ರದೇಶ DocType: Quality Inspection Reading,Reading 2,2 ಓದುವಿಕೆ @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,ಬ್ರಾಂಡ್ಸ್ DocType: C-Form Invoice Detail,Invoice No,ಸರಕುಪಟ್ಟಿ ನಂ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಗೆ DocType: Activity Cost,Costing Rate,ಕಾಸ್ಟಿಂಗ್ ದರ +,Customer Addresses And Contacts,ಗ್ರಾಹಕ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು DocType: Employee,Resignation Letter Date,ರಾಜೀನಾಮೆ ಪತ್ರ ದಿನಾಂಕ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಮತ್ತಷ್ಟು ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಫಿಲ್ಟರ್. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,ಹೊಂದಿಸಿ @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ಟೈಮ್ ಲಾಗ್ ಸ್ಥಿತಿ ಸಲ್ಲಿಸಬೇಕು. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ಸೀರಿಯಲ್ ಯಾವುದೇ {0} ಯಾವುದೇ ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ರೋ # DocType: Purchase Invoice,In Words (Company Currency),ವರ್ಡ್ಸ್ ( ಕಂಪನಿ ಕರೆನ್ಸಿ ) ರಲ್ಲಿ DocType: Pricing Rule,Supplier,ಸರಬರಾಜುದಾರ DocType: C-Form,Quarter,ಕಾಲು ಭಾಗ @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,ಮತ್ತಷ್ಟು ವೆಚ್ಚ ಕೇಂದ್ರಗಳು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು DocType: Project,External,ಬಾಹ್ಯ DocType: Features Setup,Item Serial Nos,ಐಟಂ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ಬಳಕೆದಾರರು ಮತ್ತು ಅನುಮತಿಗಳು DocType: Branch,Branch,ಶಾಖೆ +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್ +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,ತಿಂಗಳು ಯಾವುದೇ ಸಂಬಳ ಸ್ಲಿಪ್: DocType: Bin,Actual Quantity,ನಿಜವಾದ ಪ್ರಮಾಣ DocType: Shipping Rule,example: Next Day Shipping,ಉದಾಹರಣೆಗೆ : ಮುಂದೆ ದಿನ ಶಿಪ್ಪಿಂಗ್ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,ಕಂಡುಬಂದಿಲ್ಲ ಸರಣಿ ಯಾವುದೇ {0} @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,ಐಟಂ ವಿಶಿಷ್ಟ ಘ DocType: Pricing Rule,Buying,ಖರೀದಿ DocType: HR Settings,Employee Records to be created by,ನೌಕರರ ದಾಖಲೆಗಳು ದಾಖಲಿಸಿದವರು apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,ಈ ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ. +,Reqd By Date,ಬೇಕಾಗಿದೆ ದಿನಾಂಕ ಮೂಲಕ DocType: Salary Slip Earning,Salary Slip Earning,ಸಂಬಳದ ಸ್ಲಿಪ್ ದುಡಿಯುತ್ತಿದ್ದ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,ಸಾಲ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ ಕಡ್ಡಾಯ @@ -3328,6 +3344,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,ಗೋದಾಮಿನ ( ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ) ಖಾತೆ ಈ ಖಾತೆಯ ಅಡಿಯಲ್ಲಿ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಪ್ರವೇಶ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ . DocType: Company,Distribution,ಹಂಚುವುದು +sites/assets/js/erpnext.min.js +50,Amount Paid,ಮೊತ್ತವನ್ನು apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,ರವಾನಿಸು apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ಮ್ಯಾಕ್ಸ್ ರಿಯಾಯಿತಿ ಐಟಂ ಅವಕಾಶ: {0} {1}% ಆಗಿದೆ @@ -3834,6 +3851,7 @@ DocType: Account,Parent Account,ಪೋಷಕರ ಖಾತೆಯ DocType: Quality Inspection Reading,Reading 3,3 ಓದುವಿಕೆ ,Hub,ಹಬ್ DocType: GL Entry,Voucher Type,ಚೀಟಿ ಪ್ರಕಾರ +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ DocType: Expense Claim,Approved,Approved DocType: Pricing Rule,Price,ಬೆಲೆ apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ @@ -3948,6 +3966,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,ಮೊದಲ ವರ್ಗ ಆಯ್ಕೆ ಮಾಡಿ apps/erpnext/erpnext/config/projects.py +18,Project master.,ಪ್ರಾಜೆಕ್ಟ್ ಮಾಸ್ಟರ್ . DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ಮುಂದಿನ ಕರೆನ್ಸಿಗಳ $ ಇತ್ಯಾದಿ ಯಾವುದೇ ಸಂಕೇತ ತೋರಿಸುವುದಿಲ್ಲ. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(ಅರ್ಧ ದಿನ) DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್ DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv index 77f7bbe47c..fe067266fb 100644 --- a/erpnext/translations/ko.csv +++ b/erpnext/translations/ko.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,쇼 변형 DocType: Sales Invoice Item,Quantity,수량 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),대출 (부채) DocType: Employee Education,Year of Passing,전달의 해 +sites/assets/js/erpnext.min.js +27,In Stock,재고 있음 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,만 미 청구 판매 주문에 대한 결제를 할 수 DocType: Designation,Designation,Designation DocType: Production Plan Item,Production Plan Item,생산 계획 항목 @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,HR 모듈에 대한 DocType: SMS Center,SMS Center,SMS 센터 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,스트레이트 DocType: BOM Replace Tool,New BOM,새로운 BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,일괄 결제를위한 시간 로그. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,중력식 주조 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,뉴스 레터는 이미 전송 된 DocType: Lead,Request Type,요청 유형 @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,새로운 재고 UOM DocType: Period Closing Voucher,Closing Account Head,마감 계정 헤드 DocType: Employee,External Work History,외부 작업의 역사 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,순환 참조 오류 +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,당신이 정말로 중지하고 싶지 않음 DocType: Communication,Closed,닫힘 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,당신은 배달 주를 저장 한 단어에서 (수출) 표시됩니다. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,당신은 당신이 중지 하시겠습니까 DocType: Lead,Industry,산업 DocType: Employee,Job Profile,작업 프로필 DocType: Newsletter,Newsletter,뉴스레터 @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSV를 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,지금 보내기 ,Support Analytics,지원 분석 DocType: Item,Website Warehouse,웹 사이트 창고 +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,당신이 정말로 생산 순서를 중지 하시겠습니까? DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","자동 청구서는 05, 28 등의 예를 들어 생성되는 달의 날" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,점수보다 작거나 5 같아야 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C 형태의 기록 @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,화 DocType: SMS Center,All Lead (Open),모든 납 (열기) DocType: Purchase Invoice,Get Advances Paid,선불지급 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,사진 첨부 +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,확인 DocType: Journal Entry,Total Amount in Words,단어의 합계 금액 DocType: Workflow State,Stop,중지 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,오류가 발생했습니다.한 가지 가능한 이유는 양식을 저장하지 않은 경우입니다.문제가 계속되면 support@erpnext.com에 문의하시기 바랍니다. @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,차액 항목을 만듭니다 DocType: Upload Attendance,Attendance From Date,날짜부터 출석 DocType: Appraisal Template Goal,Key Performance Area,핵심 성과 지역 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,교통비 +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,그리고 일년 DocType: Email Digest,Annual Expense,연간 비용 DocType: SMS Center,Total Characters,전체 문자 apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},상품에 대한 BOM 필드에서 BOM을 선택하세요 {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,휴가 DocType: Sales Order Item,Planned Quantity,계획 수량 DocType: Purchase Invoice Item,Item Tax Amount,항목 세액 DocType: Item,Maintain Stock,재고 유지 +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,이미 생산 오더에 대 한 만든 항목 DocType: Leave Control Panel,Leave blank if considered for all designations,모든 지정을 고려하는 경우 비워 둡니다 apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},최대 : {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,분 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},행 {0} : 할당 된 양 {1} 미만 또는 JV의 양에 해당한다 {2} DocType: Item,Inventory,재고 DocType: Features Setup,"To enable ""Point of Sale"" view",보기 "판매 시점"을 사용하려면 +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,결제는 빈 카트에 할 수 없다 DocType: Item,Sales Details,판매 세부 사항 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,피닝 DocType: Opportunity,With Items,항목 @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,채광 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,수지 주조 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오 +sites/assets/js/erpnext.min.js +37,Please select {0} first.,먼저 {0}을 선택하십시오. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},텍스트 {0} DocType: Territory,Parent Territory,상위 지역 DocType: Quality Inspection Reading,Reading 2,2 읽기 @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,상표 DocType: C-Form Invoice Detail,Invoice No,아니 송장 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,구매 발주 DocType: Activity Cost,Costing Rate,원가 계산 속도 +,Customer Addresses And Contacts,고객 주소 및 연락처 DocType: Employee,Resignation Letter Date,사직서 날짜 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,가격 규칙은 또한 수량에 따라 필터링됩니다. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,설정 아님 @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,소요시간 로그 상태는 제출해야합니다. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,일련 번호 {0} 어떤 창고에 속하지 않는 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,설정 +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,행 # DocType: Purchase Invoice,In Words (Company Currency),단어 (회사 통화)에서 DocType: Pricing Rule,Supplier,공급 업체 DocType: C-Form,Quarter,지구 @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,또한 비용 센터 그룹에서 할 수 있지만 항목이 아닌 그룹에 대해 할 수있다 DocType: Project,External,외부 DocType: Features Setup,Item Serial Nos,상품 직렬 NOS +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,사용자 및 권한 DocType: Branch,Branch,Branch +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,인쇄 및 브랜딩 +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,달에 대한 검색 급여 슬립 없음 DocType: Bin,Actual Quantity,실제 수량 DocType: Shipping Rule,example: Next Day Shipping,예 : 익일 배송 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,발견되지 일련 번호 {0} @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,항목의 고유 단위 DocType: Pricing Rule,Buying,구매 DocType: HR Settings,Employee Records to be created by,직원 기록에 의해 생성되는 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,이 시간 로그 일괄 취소되었습니다. +,Reqd By Date,Reqd 날짜 DocType: Salary Slip Earning,Salary Slip Earning,급여 적립 전표 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,채권자 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,행 번호 {0} : 일련 번호는 필수입니다 @@ -3327,6 +3343,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,웨어 하우스 (영구 재고)에 대한 계정은이 계정이 생성됩니다. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,재고 원장 항목이 창고에 존재하는웨어 하우스는 삭제할 수 없습니다. DocType: Company,Distribution,유통 +sites/assets/js/erpnext.min.js +50,Amount Paid,지불 금액 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,프로젝트 매니저 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,파견 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,최대 할인 품목을 허용 : {0} {1} %이 @@ -3833,6 +3850,7 @@ DocType: Account,Parent Account,부모 계정 DocType: Quality Inspection Reading,Reading 3,3 읽기 ,Hub,허브 DocType: GL Entry,Voucher Type,바우처 유형 +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화 DocType: Expense Claim,Approved,인가 된 DocType: Pricing Rule,Price,가격 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다 @@ -3947,6 +3965,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,첫 번째 범주를 선택하십시오 apps/erpnext/erpnext/config/projects.py +18,Project master.,프로젝트 마스터. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,다음 통화 $ 등과 같은 모든 기호를 표시하지 마십시오. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(반나절) DocType: Supplier,Credit Days,신용 일 DocType: Leave Type,Is Carry Forward,이월된다 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM에서 항목 가져 오기 diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv index 9d75b8283f..2534135f4a 100644 --- a/erpnext/translations/lv.csv +++ b/erpnext/translations/lv.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Rādīt Varian DocType: Sales Invoice Item,Quantity,Daudzums apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredītiem (pasīvi) DocType: Employee Education,Year of Passing,Gads Passing +sites/assets/js/erpnext.min.js +27,In Stock,In noliktavā apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Var tikai veikt maksājumus pret unbilled pārdošanas rīkojumu DocType: Designation,Designation,Apzīmējums DocType: Production Plan Item,Production Plan Item,Ražošanas plāna punktu @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Iestatījumi HR mod DocType: SMS Center,SMS Center,SMS Center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Iztaisnošana DocType: BOM Replace Tool,New BOM,Jaunais BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Partijas Time Baļķi uz rēķinu. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity liešana apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Biļetens jau ir nosūtīts DocType: Lead,Request Type,Pieprasījums Type @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Inventāra UOM DocType: Period Closing Voucher,Closing Account Head,Noslēguma konta vadītājs DocType: Employee,External Work History,Ārējā Work Vēsture apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Apļveida Reference kļūda +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Vai jūs tiešām vēlaties pārtraukt DocType: Communication,Closed,Slēgts DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Vārdos (eksportam) būs redzams pēc tam, kad jums ietaupīt pavadzīmi." +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Vai esat pārliecināts, ka jūs vēlaties pārtraukt" DocType: Lead,Industry,Rūpniecība DocType: Employee,Job Profile,Darba Profile DocType: Newsletter,Newsletter,Biļetens @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Augšupie apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nosūtīt tagad ,Support Analytics,Atbalsta Analytics DocType: Item,Website Warehouse,Mājas lapa Noliktava +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Vai jūs tiešām vēlaties pārtraukt pasūtījums: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Mēneša diena, kurā auto rēķins tiks radīts, piemēram 05, 28 utt" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultāts ir mazāks par vai vienāds ar 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form ieraksti @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Balt DocType: SMS Center,All Lead (Open),Visi Svins (Open) DocType: Purchase Invoice,Get Advances Paid,Get Avansa Paid apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pievienojiet savu attēlu +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Padarīt DocType: Journal Entry,Total Amount in Words,Kopā summa vārdiem DocType: Workflow State,Stop,Apstāties apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Tur bija kļūda. Viens iespējamais iemesls varētu būt, ka jūs neesat saglabājis formu. Lūdzu, sazinieties ar support@erpnext.com ja problēma joprojām pastāv." @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,Padarīt atšķirība Entry DocType: Upload Attendance,Attendance From Date,Apmeklējumu No Datums DocType: Appraisal Template Goal,Key Performance Area,Key Performance Platība apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transportēšana +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,un gads: DocType: Email Digest,Annual Expense,Gada Izdevumu DocType: SMS Center,Total Characters,Kopā rakstzīmes apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Lūdzu, izvēlieties BOM BOM jomā postenim {0}" @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,Brīvdienas DocType: Sales Order Item,Planned Quantity,Plānotais daudzums DocType: Purchase Invoice Item,Item Tax Amount,Vienība Nodokļa summa DocType: Item,Maintain Stock,Uzturēt Noliktava +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Krājumu jau radīti Ražošanas Pasūtīt DocType: Leave Control Panel,Leave blank if considered for all designations,"Atstāt tukšu, ja to uzskata par visiem apzīmējumiem" apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate" apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar JV summai {2} DocType: Item,Inventory,Inventārs DocType: Features Setup,"To enable ""Point of Sale"" view",Lai aktivizētu "tirdzniecības vieta" Ņemot +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Maksājumu nevar būt par tukšu grozā DocType: Item,Sales Details,Pārdošanas Details apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning DocType: Opportunity,With Items,Ar preces @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Kalnrūpniecība apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Sveķu liešana apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Klientu grupa pastāv ar tādu pašu nosaukumu, lūdzu mainīt Klienta nosaukumu vai pārdēvēt klientu grupai" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Lūdzu, izvēlieties {0} pirmās." apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Teksta {0} DocType: Territory,Parent Territory,Parent Teritorija DocType: Quality Inspection Reading,Reading 2,Lasīšana 2 @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,Brands DocType: C-Form Invoice Detail,Invoice No,Rēķins Nr apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,No Pirkuma pasūtījums DocType: Activity Cost,Costing Rate,Izmaksu Rate +,Customer Addresses And Contacts,Klientu Adreses un kontakti DocType: Employee,Resignation Letter Date,Atkāpšanās no amata vēstule Datums apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,"Cenu Noteikumi tālāk filtrē, pamatojoties uz daudzumu." apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Not Set @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Laiks Log Status jāiesniedz. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sērijas Nr {0} nepieder nevienai noliktavā apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Iestatīšana +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),Vārdos (Company valūta) DocType: Pricing Rule,Supplier,Piegādātājs DocType: C-Form,Quarter,Ceturksnis @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Turpmākie izmaksu centrus var izdarīt ar grupu, bet ierakstus var izdarīt pret nepilsoņu grupām" DocType: Project,External,Ārējs DocType: Features Setup,Item Serial Nos,Postenis Serial Nr +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Lietotāji un atļaujas DocType: Branch,Branch,Filiāle +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Drukāšana un zīmols +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nē alga slip atrasts mēnesi: DocType: Bin,Actual Quantity,Faktiskais daudzums DocType: Shipping Rule,example: Next Day Shipping,Piemērs: Nākošā diena Piegāde apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Sērijas Nr {0} nav atrasts @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,Atsevišķu vienību posteņa DocType: Pricing Rule,Buying,Pirkšana DocType: HR Settings,Employee Records to be created by,"Darbinieku Records, kas rada" apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Šoreiz Log Partijas ir atcelts. +,Reqd By Date,Reqd pēc datuma DocType: Salary Slip Earning,Salary Slip Earning,Alga Slip krāšana apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditori apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Sērijas numurs ir obligāta @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Pārskats par noliktavas (nepārtrauktās inventarizācijas), tiks izveidots saskaņā ar šo kontu." apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Noliktava nevar izdzēst, jo pastāv šī noliktava akciju grāmata ierakstu." DocType: Company,Distribution,Sadale +sites/assets/js/erpnext.min.js +50,Amount Paid,Samaksātā summa apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projekta vadītājs apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Nosūtīšana apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max atlaide atļauta posteni: {0}{1}% @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,Mātes vērā DocType: Quality Inspection Reading,Reading 3,Lasīšana 3 ,Hub,Rumba DocType: GL Entry,Voucher Type,Kuponu Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Cenrādis nav atrasts vai invalīds DocType: Expense Claim,Approved,Apstiprināts DocType: Pricing Rule,Price,Cena apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais""" @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Lūdzu, izvēlieties Kategorija pirmais" apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekts meistars. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nerādīt kādu simbolu, piemēram, $$ utt blakus valūtām." +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(puse dienas) DocType: Supplier,Credit Days,Kredīta dienas DocType: Leave Type,Is Carry Forward,Vai Carry Forward apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Dabūtu preces no BOM diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv index 960a18b82a..997046e3b8 100644 --- a/erpnext/translations/mk.csv +++ b/erpnext/translations/mk.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Прикажи DocType: Sales Invoice Item,Quantity,Кол apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредити (Пасива) DocType: Employee Education,Year of Passing,Година на полагање +sites/assets/js/erpnext.min.js +27,In Stock,Залиха apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Може само да се направи исплата против нефактурираното Продај Побарувања DocType: Designation,Designation,Ознака DocType: Production Plan Item,Production Plan Item,Производство план Точка @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Прилагоду DocType: SMS Center,SMS Center,SMS центарот apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Зацрвстувањето DocType: BOM Replace Tool,New BOM,Нов Бум +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Серија Време на дневници за исплата. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity кастинг apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Билтен веќе е испратен DocType: Lead,Request Type,Тип на Барањето @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Нова берза UOM DocType: Period Closing Voucher,Closing Account Head,Завршната сметка на главата DocType: Employee,External Work History,Надворешни Историја работа apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Кружни Суд Грешка +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Дали навистина сакате да го прекинете DocType: Communication,Closed,Затвори DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Во зборови (извоз) ќе биде видлив откако ќе ја зачувате за испорака. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Дали сте сигурни дека сакате да го прекинете DocType: Lead,Industry,Индустрија DocType: Employee,Job Profile,Профил работа DocType: Newsletter,Newsletter,Билтен @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Внес apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Испрати Сега ,Support Analytics,Поддршка анализи DocType: Item,Website Warehouse,Веб-страница Магацински +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Дали навистина сакате да го стопира производството цел: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","На ден од месецот на кој авто фактура ќе биде генериранa на пример 05, 28 итн" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Поени мора да е помала или еднаква на 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Форма записи @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бе DocType: SMS Center,All Lead (Open),Сите Олово (Отвори) DocType: Purchase Invoice,Get Advances Paid,Се Напредокот Платени apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Закачите вашата слика +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Направете DocType: Journal Entry,Total Amount in Words,Вкупниот износ со зборови DocType: Workflow State,Stop,Стоп apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Имаше грешка. Една можна причина може да биде дека не сте го зачувале форма. Ве молиме контактирајте support@erpnext.com ако проблемот продолжи. @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,Направи разликата DocType: Upload Attendance,Attendance From Date,Публика од денот DocType: Appraisal Template Goal,Key Performance Area,Основна област на ефикасноста apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Превоз +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и годината: DocType: Email Digest,Annual Expense,Годишната сметка DocType: SMS Center,Total Characters,Вкупно Ликови apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Ве молиме изберете Бум Бум во полето за предмет {0} @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,Празници DocType: Sales Order Item,Planned Quantity,Планирана количина DocType: Purchase Invoice Item,Item Tax Amount,Точка износ на данокот DocType: Item,Maintain Stock,Одржување на берза +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Акции записи веќе создадена за цел производство DocType: Leave Control Panel,Leave blank if considered for all designations,Оставете го празно ако се земе предвид за сите ознаки apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот "Крај" во ред {0} не може да бидат вклучени во точка Оцени apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Макс: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,А apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: распределени износ {1} мора да е помала или еднаква на JV износ {2} DocType: Item,Inventory,Инвентар DocType: Features Setup,"To enable ""Point of Sale"" view",Да им овозможи на "Точка на продажба" поглед +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Плаќање не може да се направи за празни кошничка DocType: Item,Sales Details,Детали за продажба apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Прикачување DocType: Opportunity,With Items,Со предмети @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Рударски apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Кастинг смола apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"А група на клиентите постои со истото име, ве молиме промена на името на клиентите или преименување на група на купувачи" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Ве молиме изберете {0} прво. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},текст {0} DocType: Territory,Parent Territory,Родител Територија DocType: Quality Inspection Reading,Reading 2,Читање 2 @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,Брендови DocType: C-Form Invoice Detail,Invoice No,Фактура бр apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Од нарачка DocType: Activity Cost,Costing Rate,Чини стапка +,Customer Addresses And Contacts,Адресите на клиентите и контакти DocType: Employee,Resignation Letter Date,Оставка писмо Датум apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Правила цените се уште се филтрирани врз основа на квантитетот. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не е поставена @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Вклучи Статус мора да се поднесе. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Сериски Не {0} не припаѓа на ниту еден Магацински apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Поставување на +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ред # DocType: Purchase Invoice,In Words (Company Currency),Во зборови (компанија валута) DocType: Pricing Rule,Supplier,Добавувачот DocType: C-Form,Quarter,Четвртина @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Понатаму центри цена може да се направи под Групи но записи може да се направи врз несрпското групи DocType: Project,External,Надворешни DocType: Features Setup,Item Serial Nos,Точка Сериски броеви +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволи DocType: Branch,Branch,Филијали +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печатење и Брендирање +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Не се лизга плата и за месец: DocType: Bin,Actual Quantity,Крај на Кол DocType: Shipping Rule,example: Next Day Shipping,пример: Следен ден на испорака apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Сериски № {0} не е пронајдена @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,Посебна единица на DocType: Pricing Rule,Buying,Купување DocType: HR Settings,Employee Records to be created by,Вработен евиденција да бидат создадени од страна apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Овој пат се Влез Batch е откажан. +,Reqd By Date,Reqd Спореддатумот DocType: Salary Slip Earning,Salary Slip Earning,Плата се лизга Заработувајќи apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Доверителите apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Ред # {0}: Сериски Не е задолжително @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Сметка за складиште (Вечен Инвентар) ќе бидат создадени во рамките на оваа сметка. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не може да биде избришан како што постои влез акции Леџер за оваа склад. DocType: Company,Distribution,Дистрибуција +sites/assets/js/erpnext.min.js +50,Amount Paid,Уплатениот износ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Проект менаџер apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Испраќање apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс попуст дозволено за ставка: {0} е {1}% @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,Родител профил DocType: Quality Inspection Reading,Reading 3,Читање 3 ,Hub,Центар DocType: GL Entry,Voucher Type,Ваучер Тип +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби DocType: Expense Claim,Approved,Одобрени DocType: Pricing Rule,Price,Цена apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како "Лево" @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ве молиме изберете категорија во првата apps/erpnext/erpnext/config/projects.py +18,Project master.,Господар на проектот. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не покажува никакви симбол како $ итн до валути. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Полудневен) DocType: Supplier,Credit Days,Кредитна дена DocType: Leave Type,Is Carry Forward,Е пренесување apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Се предмети од бирото diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv index 4e1c63ecee..2aa0a24f96 100644 --- a/erpnext/translations/mr.csv +++ b/erpnext/translations/mr.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,दर्श DocType: Sales Invoice Item,Quantity,प्रमाण apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),कर्ज (दायित्व) DocType: Employee Education,Year of Passing,उत्तीर्ण वर्ष +sites/assets/js/erpnext.min.js +27,In Stock,स्टॉक apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,फक्त बिल न केलेली विक्री ऑर्डर रक्कम करू शकता DocType: Designation,Designation,पदनाम DocType: Production Plan Item,Production Plan Item,उत्पादन योजना आयटम @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,एचआर वि DocType: SMS Center,SMS Center,एसएमएस केंद्र apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,सरळ DocType: BOM Replace Tool,New BOM,नवी BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,बॅच बिलिंग वेळ नोंदी. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity निर्णायक apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,वृत्तपत्र यापूर्वीच पाठविला गेला आहे DocType: Lead,Request Type,विनंती प्रकार @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,नवीन स्टॉक UO DocType: Period Closing Voucher,Closing Account Head,खाते प्रमुख बंद DocType: Employee,External Work History,बाह्य कार्य इतिहास apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,परिपत्रक संदर्भ त्रुटी +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,आपण खरोखर थांबवू इच्छिता DocType: Communication,Closed,बंद DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,आपण डिलिव्हरी टीप जतन एकदा शब्द (निर्यात) मध्ये दृश्यमान होईल. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,आपण थांबवू इच्छिता आपली खात्री आहे की DocType: Lead,Industry,उद्योग DocType: Employee,Job Profile,कामाचे DocType: Newsletter,Newsletter,वृत्तपत्र @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,सी apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,आता पाठवा ,Support Analytics,समर्थन Analytics DocType: Item,Website Warehouse,वेबसाइट कोठार +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,आपण खरोखर उत्पादन करण्यासाठी थांबवू इच्छिता नका: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो अशी यादी तयार करणे 05, 28 इत्यादी उदा निर्माण होणार महिन्याचा दिवस" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,धावसंख्या 5 या पेक्षा कमी किंवा या समान असणे आवश्यक आहे apps/erpnext/erpnext/config/accounts.py +169,C-Form records,सी-फॉर्म रेकॉर्ड @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,व DocType: SMS Center,All Lead (Open),सर्व लीड (उघडा) DocType: Purchase Invoice,Get Advances Paid,अग्रिम पेड करा apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,आपले चित्र संलग्न +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,करा DocType: Journal Entry,Total Amount in Words,शब्द एकूण रक्कम DocType: Workflow State,Stop,थांबवा apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,एक त्रुटी आली. एक संभाव्य कारण तुम्हाला फॉर्म जतन केले नाहीत हे असू शकते. समस्या कायम राहिल्यास support@erpnext.com संपर्क साधा. @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,फरक प्रवेश कर DocType: Upload Attendance,Attendance From Date,तारीख पासून उपस्थिती DocType: Appraisal Template Goal,Key Performance Area,की कामगिरी क्षेत्र apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,वाहतूक +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,आणि वर्ष: DocType: Email Digest,Annual Expense,वार्षिक खर्च DocType: SMS Center,Total Characters,एकूण वर्ण apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},आयटम साठी BOM क्षेत्रात BOM निवडा कृपया {0} @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,सुट्ट्या DocType: Sales Order Item,Planned Quantity,नियोजनबद्ध प्रमाण DocType: Purchase Invoice Item,Item Tax Amount,आयटम कर रक्कम DocType: Item,Maintain Stock,शेअर ठेवा +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,आधीच उत्पादन ऑर्डर तयार स्टॉक नोंदी DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदे विचार तर रिक्त सोडा apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार वास्तविक 'सलग प्रभारी {0} आयटम रेट समाविष्ट केले जाऊ शकत नाही apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},कमाल: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,व apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा संयुक्त रक्कम बरोबरी करणे आवश्यक आहे {2} DocType: Item,Inventory,सूची DocType: Features Setup,"To enable ""Point of Sale"" view",दृश्य "विक्री पॉइंट" सक्षम करण्यासाठी +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,भरणा रिक्त कार्ट केले जाऊ शकत नाही DocType: Item,Sales Details,विक्री तपशील apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,पिन DocType: Opportunity,With Items,आयटम @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,वजन apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,खनन apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,राळ निर्णायक apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट तत्सम नावाने विद्यमान ग्राहक नाव बदलू किंवा ग्राहक गट नाव बदला करा +sites/assets/js/erpnext.min.js +37,Please select {0} first.,{0} पहिल्या निवडा. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},मजकूर {0} DocType: Territory,Parent Territory,पालक प्रदेश DocType: Quality Inspection Reading,Reading 2,2 वाचन @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,ब्रांड DocType: C-Form Invoice Detail,Invoice No,चलन नाही apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,खरेदी ऑर्डर पासून DocType: Activity Cost,Costing Rate,भांडवलाच्या दर +,Customer Addresses And Contacts,ग्राहक पत्ते आणि संपर्क DocType: Employee,Resignation Letter Date,राजीनामा तारीख apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,किंमत नियम पुढील प्रमाणावर आधारित फिल्टर आहेत. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,सेट नाही @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,वेळ लॉग स्थिती सादर करणे आवश्यक आहे. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सिरियल नाही {0} कोणत्याही वखार संबंधित नाही apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,सेटअप +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,रो # DocType: Purchase Invoice,In Words (Company Currency),शब्द मध्ये (कंपनी चलन) DocType: Pricing Rule,Supplier,पुरवठादार DocType: C-Form,Quarter,तिमाहीत @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,पुढील खर्च केंद्रे गट अंतर्गत केले जाऊ शकते पण नोंदी नॉन-गट सुरू केले DocType: Project,External,बाह्य DocType: Features Setup,Item Serial Nos,आयटम सिरियल क्र +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,वापरकर्ते आणि परवानग्या DocType: Branch,Branch,शाखा +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,मुद्रण आणि ब्रांडिंग +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,महिन्यात आढळले नाही पगारपत्रक: DocType: Bin,Actual Quantity,वास्तविक प्रमाण DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: पुढील दिवस शिपिंग apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,आढळले नाही सिरियल नाही {0} @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,एक आयटम वेगळा DocType: Pricing Rule,Buying,खरेदी DocType: HR Settings,Employee Records to be created by,कर्मचारी रेकॉर्ड करून तयार करणे apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,या वेळ लॉग बॅच रद्द करण्यात आली आहे. +,Reqd By Date,Reqd तारीख करून DocType: Salary Slip Earning,Salary Slip Earning,पगाराच्या स्लिप्स कमाई apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,कर्ज apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,रो # {0}: सिरियल नाही बंधनकारक आहे @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,कोठार (शा्वत सूची) खाते या खाते अंतर्गत तयार करण्यात येणार आहे. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,स्टॉक खतावणीत नोंद या कोठार विद्यमान म्हणून कोठार हटविला जाऊ शकत नाही. DocType: Company,Distribution,वितरण +sites/assets/js/erpnext.min.js +50,Amount Paid,अदा केलेली रक्कम apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,प्रकल्प व्यवस्थापक apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,पाठवणे apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,आयटम परवानगी कमाल सवलतीच्या: {0} {1}% आहे @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,पालक खाते DocType: Quality Inspection Reading,Reading 3,3 वाचन ,Hub,हब DocType: GL Entry,Voucher Type,प्रमाणक प्रकार +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केले नाही DocType: Expense Claim,Approved,मंजूर DocType: Pricing Rule,Price,किंमत apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} असे सेट करणे आवश्यक वर मुक्त कर्मचारी लेफ्ट 'म्हणून @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,पहिल्या श्रेणी निवडा apps/erpnext/erpnext/config/projects.py +18,Project master.,प्रकल्प मास्टर. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,चलने इ $ असे कोणत्याही प्रतीक पुढील दर्शवू नका. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(अर्धा दिवस) DocType: Supplier,Credit Days,क्रेडिट दिवस DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM आयटम मिळवा diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv index 15c974bea2..f0cc6ffe5e 100644 --- a/erpnext/translations/my.csv +++ b/erpnext/translations/my.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Show ကို DocType: Sales Invoice Item,Quantity,အရေအတွက် apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ချေးငွေများ (စိစစ်) DocType: Employee Education,Year of Passing,Pass ၏တစ်နှစ်တာ +sites/assets/js/erpnext.min.js +27,In Stock,ကုန်ပစ္စည်းလက်ဝယ်ရှိ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,သာ unbilled အရောင်းအမိန့်ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ် DocType: Designation,Designation,သတ်မှတ်ပေးထားခြင်း DocType: Production Plan Item,Production Plan Item,ထုတ်လုပ်မှုစီမံကိန်း Item @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,HR Module သည် DocType: SMS Center,SMS Center,SMS ကို Center က apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ဖွောငျ့စေ DocType: BOM Replace Tool,New BOM,နယူး BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,ငွေတောင်းခံသည် batch အချိန် Logs ။ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity သွန်း apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,သတင်းလွှာပြီးသားကိုစလှေတျခဲ့ DocType: Lead,Request Type,တောင်းဆိုမှုကအမျိုးအစား @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,နယူးစတော့အ DocType: Period Closing Voucher,Closing Account Head,နိဂုံးချုပ်အကောင့်ဌာနမှူး DocType: Employee,External Work History,ပြင်ပလုပ်ငန်းခွင်သမိုင်း apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,မြို့ပတ်ရထားကိုးကားစရာအမှား +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,သင်အမှန်တကယ်ရပ်တန့်ချင်ပါနဲ့ DocType: Communication,Closed,ပိတ်ထားသော DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,သင် Delivery Note ကိုကယျတငျတျောမူပါတစ်ချိန်ကစကား (ပို့ကုန်) ခုနှစ်တွင်မြင်နိုင်ပါလိမ့်မည်။ +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,သင်ရပ်တန့်ဖို့လိုသည်မှာသေချာဖြစ်ကြသည် DocType: Lead,Industry,စက်မှုလုပ်ငန်း DocType: Employee,Job Profile,ယောဘ၏ကိုယ်ရေးအချက်အလက်များ profile DocType: Newsletter,Newsletter,သတင်းလွှာ @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSV က apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,အခုတော့ Send ,Support Analytics,ပံ့ပိုးမှု Analytics DocType: Item,Website Warehouse,website ဂိုဒေါင် +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,သင်အမှန်တကယ်ထုတ်လုပ်မှုကိုအမိန့်ကိုရပ်တန့်ချင်ပါနဲ့: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","အော်တိုကုန်ပို့လွှာ 05, 28 စသည်တို့ကိုဥပမာ generated လိမ့်မည်ဟူသောရက်နေ့တွင်လ၏နေ့" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ရမှတ်ထက်လျော့နည်းသို့မဟုတ် 5 မှတန်းတူဖြစ်ရမည် apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form တွင်မှတ်တမ်းများ @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,အ DocType: SMS Center,All Lead (Open),အားလုံးသည်ခဲ (ပွင့်လင်း) DocType: Purchase Invoice,Get Advances Paid,ကြိုတင်ငွေ Paid Get apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,သင်၏ရုပ်ပုံ Attach +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,လုပ်ပါ DocType: Journal Entry,Total Amount in Words,စကားအတွက်စုစုပေါင်းပမာဏ DocType: Workflow State,Stop,ရပ် apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ဆိုတဲ့ error ရှိခဲ့သည်။ တစျခုဖြစ်နိုင်သည်ဟုအကြောင်းပြချက်ကိုသင်ပုံစံကယ်တင်ခြင်းသို့မရောက်ကြပြီဖြစ်နိုင်ပါတယ်။ ပြဿနာရှိနေသေးလျှင် support@erpnext.com ကိုဆက်သွယ်ပါ။ @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,Difference Entry 'ပါစေ DocType: Upload Attendance,Attendance From Date,နေ့စွဲ မှစ. တက်ရောက် DocType: Appraisal Template Goal,Key Performance Area,Key ကိုစွမ်းဆောင်ရည်ဧရိယာ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,သယ်ယူပို့ဆောင်ရေး +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,နှင့်တစ်နှစ်: DocType: Email Digest,Annual Expense,နှစ်ပတ်လည်သုံးစွဲမှု DocType: SMS Center,Total Characters,စုစုပေါင်းဇာတ်ကောင် apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Item သည် BOM လယ်ပြင်၌ {0} BOM ကို select ကျေးဇူးပြု. @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,အားလပ်ရက် DocType: Sales Order Item,Planned Quantity,စီစဉ်ထားတဲ့ပမာဏ DocType: Purchase Invoice Item,Item Tax Amount,item အခွန်ပမာဏ DocType: Item,Maintain Stock,စတော့အိတ်ထိန်းသိမ်းနည်း +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries DocType: Leave Control Panel,Leave blank if considered for all designations,အားလုံးပုံစံတခုစဉ်းစားလျှင်အလွတ် Leave apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,'' အမှန်တကယ် '' အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,လ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} JV ငွေပမာဏ {2} ထက်လျော့နည်းသို့မဟုတ်နှင့်ထပ်တူဖြစ်ရပါမည် DocType: Item,Inventory,စာရင်း DocType: Features Setup,"To enable ""Point of Sale"" view","Point သို့ရောင်းရငွေ၏" အမြင် enable လုပ်ဖို့ +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,ငွေပေးချေမှုရမည့်အချည်းနှီးလှည်းတို့ကိုလုပ်မပြနိုင် DocType: Item,Sales Details,အရောင်းအသေးစိတ်ကို apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning DocType: Opportunity,With Items,ပစ္စည်းများနှင့်အတူ @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,သတ္တုတူးဖော်ရေး apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ဗဓေလသစ်သွန်း apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ +sites/assets/js/erpnext.min.js +37,Please select {0} first.,ပထမဦးဆုံး {0} ကို select ပေးပါ။ apps/erpnext/erpnext/templates/pages/order.html +57,text {0},စာသားအ {0} DocType: Territory,Parent Territory,မိဘနယ်မြေတွေကို DocType: Quality Inspection Reading,Reading 2,2 Reading @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,ကုန်အမှတ်တံဆိပ် DocType: C-Form Invoice Detail,Invoice No,ကုန်ပို့လွှာမရှိပါ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ဝယ်ယူခြင်းအမိန့်ကနေ DocType: Activity Cost,Costing Rate,ကုန်ကျ Rate +,Customer Addresses And Contacts,customer လိပ်စာနှင့်ဆက်သွယ်ရန် DocType: Employee,Resignation Letter Date,နုတ်ထွက်ပေးစာနေ့စွဲ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,စျေးနှုန်းနည်းဥပဒေများနောက်ထပ်အရေအတွက်ပေါ် အခြေခံ. filtered နေကြပါတယ်။ apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Set မဟုတ် @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,အချိန်အထဲနဲ့ Status Submitted ရမည်။ apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,serial မရှိပါ {0} ဆိုဂိုဒေါင်ပိုင်ပါဘူး apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Up ကိုပြင်ဆင်ခြင်း +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,row # DocType: Purchase Invoice,In Words (Company Currency),စကား (ကုမ္ပဏီငွေကြေးစနစ်) တွင် DocType: Pricing Rule,Supplier,ကုန်သွင်းသူ DocType: C-Form,Quarter,လေးပုံတစ်ပုံ @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ် DocType: Project,External,external DocType: Features Setup,Item Serial Nos,item Serial အမှတ် +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,အသုံးပြုသူများနှင့်ခွင့်ပြုချက် DocType: Branch,Branch,အညွန့ +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ပုံနှိပ်နှင့် Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,တစ်လမျှမတွေ့လစာစလစ်: DocType: Bin,Actual Quantity,အမှန်တကယ်ပမာဏ DocType: Shipping Rule,example: Next Day Shipping,ဥပမာအား: Next ကိုနေ့ Shipping apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,{0} မတွေ့ရှိ serial No @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,တစ်ဦး Item ၏ထူး DocType: Pricing Rule,Buying,ဝယ် DocType: HR Settings,Employee Records to be created by,အသုံးပြုနေသူများကဖန်တီးခံရဖို့ဝန်ထမ်းမှတ်တမ်း apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,ဒါဟာအချိန်အထဲ Batch ဖျက်သိမ်းခဲ့ကြောင်းသိရသည်။ +,Reqd By Date,နေ့စွဲအားဖြင့် Reqd DocType: Salary Slip Earning,Salary Slip Earning,လစာစလစ်ဖြတ်ပိုင်းပုံစံင်ငွေ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,အကြွေးရှင် apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,row # {0}: Serial မရှိပါမဖြစ်မနေဖြစ်ပါသည် @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,အဆိုပါကုန်လှောင်ရုံ (ထာဝရစာရင်း) ကိုအကောင့်ကိုဒီအကောင့်အောက်မှာနေသူများကဖန်တီးလိမ့်မည်။ apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,စတော့ရှယ်ယာလယ်ဂျာ entry ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။ DocType: Company,Distribution,ဖြန့်ဝေ +sites/assets/js/erpnext.min.js +50,Amount Paid,Paid ငွေပမာဏ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,စီမံကိန်းမန်နေဂျာ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,dispatch apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,item တခုကိုခွင့်ပြုထား max ကိုလျှော့စျေး: {0} သည် {1}% @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,မိဘအကောင့် DocType: Quality Inspection Reading,Reading 3,3 Reading ,Hub,hub DocType: GL Entry,Voucher Type,ဘောက်ချာကအမျိုးအစား +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ် DocType: Expense Claim,Approved,Approved DocType: Pricing Rule,Price,စျေးနှုန်း apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} '' လက်ဝဲ 'အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,ပထမဦးဆုံးအမျိုးအစားလိုက်ကို select ကျေးဇူးပြု. apps/erpnext/erpnext/config/projects.py +18,Project master.,Project မှမာစတာ။ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ငွေကြေးကိုမှစသည်တို့ $ တူသောသင်္ကေတကိုလာမယ့်မပြပါနဲ့။ +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(တစ်ဝက်နေ့) DocType: Supplier,Credit Days,ခရက်ဒစ် Days DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ် apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv index 2b55a3d094..2af323bc58 100644 --- a/erpnext/translations/nl.csv +++ b/erpnext/translations/nl.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Toon Varianten DocType: Sales Invoice Item,Quantity,Hoeveelheid apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Leningen (Passiva) DocType: Employee Education,Year of Passing,Voorbije Jaar +sites/assets/js/erpnext.min.js +27,In Stock,Op Voorraad apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Kan alleen tegen betaling nog niet gefactureerde verkooporder maken DocType: Designation,Designation,Benaming DocType: Production Plan Item,Production Plan Item,Productie Plan Artikel @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Instellingen voor H DocType: SMS Center,SMS Center,SMS Center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rechttrekken DocType: BOM Replace Tool,New BOM,Nieuwe Eenheid +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Tijd Logs voor Billing. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter reeds verzonden DocType: Lead,Request Type,Aanvraag type @@ -303,8 +305,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nieuwe Voorraad Eenheid DocType: Period Closing Voucher,Closing Account Head,Sluiten Account Hoofd DocType: Employee,External Work History,Externe Werk Geschiedenis apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kringverwijzing Error +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Wil je echt wilt stoppen DocType: Communication,Closed,Gesloten DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In woorden (Export) wordt zichtbaar zodra u de vrachtbrief opslaat. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Weet u zeker dat u wilt stoppen DocType: Lead,Industry,Industrie DocType: Employee,Job Profile,Functieprofiel DocType: Newsletter,Newsletter,Nieuwsbrief @@ -738,6 +742,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload vo apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nu verzenden ,Support Analytics,Support Analyse DocType: Item,Website Warehouse,Website Magazijn +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Wil je echt wilt productieorder te stoppen: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","De dag van de maand waarop de automatische factuur zal bijvoorbeeld 05, 28 etc worden gegenereerd" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score moet lager dan of gelijk aan 5 zijn apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C -Form regels @@ -880,6 +885,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Wit DocType: SMS Center,All Lead (Open),Alle Leads (Open) DocType: Purchase Invoice,Get Advances Paid,Get betaalde voorschotten apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Voeg uw foto toe +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Maken DocType: Journal Entry,Total Amount in Words,Totaal bedrag in woorden DocType: Workflow State,Stop,stoppen apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Er is een fout opgetreden . Een mogelijke reden zou kunnen zijn dat u het formulier niet hebt opgeslagen. Neem contact op met Support als het probleem aanhoudt . @@ -960,6 +966,7 @@ DocType: Journal Entry,Make Difference Entry,Maak Verschil Entry DocType: Upload Attendance,Attendance From Date,Aanwezigheid Van Datum DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Vervoer +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,en jaar: DocType: Email Digest,Annual Expense,Jaarlijkse Expense DocType: SMS Center,Total Characters,Totaal Tekens apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Selecteer BOM in BOM veld voor post {0} @@ -1197,6 +1204,7 @@ DocType: Holiday List,Holidays,Feestdagen DocType: Sales Order Item,Planned Quantity,Gepland Aantal DocType: Purchase Invoice Item,Item Tax Amount,Artikel BTW-bedrag DocType: Item,Maintain Stock,Handhaaf Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries al gemaakt voor de productieorder DocType: Leave Control Panel,Leave blank if considered for all designations,Laat leeg indien overwogen voor alle aanduidingen apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1260,6 +1268,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan JV hoeveelheid {2} DocType: Item,Inventory,Voorraad DocType: Features Setup,"To enable ""Point of Sale"" view",Inschakelen "Point of Sale" view +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Betaling kan niet worden gemaakt voor een lege boodschappenmand DocType: Item,Sales Details,Verkoop Details apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning DocType: Opportunity,With Items,Met Items @@ -1452,6 +1461,7 @@ DocType: Item,Weightage,Weging apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mijnbouw apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hars casting apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Een Klantgroep met dezelfde naam bestaat. Gelieve de naam van de Klant of de Klantgroep wijzigen +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Selecteer eerst {0}. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0} DocType: Territory,Parent Territory,Bovenliggende Regio DocType: Quality Inspection Reading,Reading 2,Meting 2 @@ -1633,6 +1643,7 @@ DocType: Features Setup,Brands,Merken DocType: C-Form Invoice Detail,Invoice No,Factuur nr. apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Van Inkooporder DocType: Activity Cost,Costing Rate,Costing Rate +,Customer Addresses And Contacts,Klant adressen en contacten DocType: Employee,Resignation Letter Date,Ontslagbrief Datum apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Prijsbepalingsregels worden verder gefilterd op basis van aantal. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,niet ingesteld @@ -1740,6 +1751,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tijd Log Status moet worden ingediend. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serienummer {0} niet behoren tot een Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opzetten +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Rij # DocType: Purchase Invoice,In Words (Company Currency),In Woorden (Bedrijfsvaluta) DocType: Pricing Rule,Supplier,Leverancier DocType: C-Form,Quarter,Kwartaal @@ -1838,7 +1850,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostenplaatsen kan in groepen worden gemaakt, maar items kunnen worden gemaakt tegen niet-Groepen" DocType: Project,External,Extern DocType: Features Setup,Item Serial Nos,Artikel Serienummers +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en machtigingen DocType: Branch,Branch,Tak +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printen en Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Geen loonstrook gevonden voor deze maand: DocType: Bin,Actual Quantity,Werkelijke hoeveelheid DocType: Shipping Rule,example: Next Day Shipping,Bijvoorbeeld: Next Day Shipping apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serienummer {0} niet gevonden @@ -3097,6 +3112,7 @@ DocType: Serial No,Distinct unit of an Item,Aanwijsbare eenheid van een Artikel DocType: Pricing Rule,Buying,Inkoop DocType: HR Settings,Employee Records to be created by,Werknemer Records worden gecreëerd door apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Deze Tijd Log Batch is geannuleerd. +,Reqd By Date,Benodigd op datum DocType: Salary Slip Earning,Salary Slip Earning,Salarisstrook Inkomen apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Crediteuren apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Rij # {0}: Serienummer is verplicht @@ -3326,6 +3342,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Rekening voor het magazijn wordt aangemaakt onder deze rekening. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazijn kan niet worden verwijderd omdat er voorraadboekingen zijn voor dit magazijn. DocType: Company,Distribution,Distributie +sites/assets/js/erpnext.min.js +50,Amount Paid,Betaald bedrag apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maximale korting toegestaan voor artikel: {0} is {1}% @@ -3831,6 +3848,7 @@ DocType: Account,Parent Account,Bovenliggende rekening DocType: Quality Inspection Reading,Reading 3,Meting 3 ,Hub,Naaf DocType: GL Entry,Voucher Type,Voucher Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld DocType: Expense Claim,Approved,Aangenomen DocType: Pricing Rule,Price,prijs apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten' @@ -3945,6 +3963,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Selecteer eerst een Categorie apps/erpnext/erpnext/config/projects.py +18,Project master.,Project stam. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Vertoon geen symbool zoals $, enz. naast valuta." +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halve Dag) DocType: Supplier,Credit Days,Credit Dagen DocType: Leave Type,Is Carry Forward,Is Forward Carry apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Artikelen ophalen van Stuklijst diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv index 3836ad225e..0ea55e5063 100644 --- a/erpnext/translations/no.csv +++ b/erpnext/translations/no.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis Varianter DocType: Sales Invoice Item,Quantity,Antall apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (gjeld) DocType: Employee Education,Year of Passing,Year of Passing +sites/assets/js/erpnext.min.js +27,In Stock,På Lager apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Kan bare gjøre betaling mot fakturert Salgsordre DocType: Designation,Designation,Betegnelse DocType: Production Plan Item,Production Plan Item,Produksjonsplan Sak @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Innstillinger for H DocType: SMS Center,SMS Center,SMS-senter apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rette DocType: BOM Replace Tool,New BOM,New BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Tid Logger for fakturering. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhetsbrevet har allerede blitt sendt DocType: Lead,Request Type,Forespørsel Type @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New Stock målenheter DocType: Period Closing Voucher,Closing Account Head,Lukke konto Leder DocType: Employee,External Work History,Ekstern Work History apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Rundskriv Reference Error +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Har du virkelig ønsker å slutte DocType: Communication,Closed,Stengt DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I Words (eksport) vil være synlig når du lagrer følgeseddel. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Er du sikker på at du vil stoppe DocType: Lead,Industry,Industry DocType: Employee,Job Profile,Job Profile DocType: Newsletter,Newsletter,Nyhetsbrev @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Last opp apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send Nå ,Support Analytics,Støtte Analytics DocType: Item,Website Warehouse,Nettsted Warehouse +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Har du virkelig ønsker å stoppe produksjonen rekkefølge: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dagen i måneden som auto faktura vil bli generert for eksempel 05, 28 osv" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score må være mindre enn eller lik 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form poster @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvit DocType: SMS Center,All Lead (Open),All Lead (Open) DocType: Purchase Invoice,Get Advances Paid,Få utbetalt forskudd apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Fest Your Picture +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Gjøre DocType: Journal Entry,Total Amount in Words,Totalbeløp i Words DocType: Workflow State,Stop,Stoppe apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Det var en feil. En mulig årsak kan være at du ikke har lagret skjemaet. Ta kontakt support@erpnext.com hvis problemet vedvarer. @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,Gjør forskjell Entry DocType: Upload Attendance,Attendance From Date,Oppmøte Fra dato DocType: Appraisal Template Goal,Key Performance Area,Key Performance-området apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år: DocType: Email Digest,Annual Expense,Årlig Expense DocType: SMS Center,Total Characters,Totalt tegn apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vennligst velg BOM i BOM felt for Element {0} @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,Ferier DocType: Sales Order Item,Planned Quantity,Planlagt Antall DocType: Purchase Invoice Item,Item Tax Amount,Sak Skattebeløp DocType: Item,Maintain Stock,Oppretthold Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre DocType: Leave Control Panel,Leave blank if considered for all designations,La stå tom hvis vurderes for alle betegnelser apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type 'Actual' i rad {0} kan ikke inkluderes i Element Ranger apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik JV mengden {2} DocType: Item,Inventory,Inventar DocType: Features Setup,"To enable ""Point of Sale"" view",For å aktivere "Point of Sale" view +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Betaling kan ikke gjøres for tom handlevogn DocType: Item,Sales Details,Salgs Detaljer apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Låsing DocType: Opportunity,With Items,Med Items @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mining apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin casting apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe eksisterer med samme navn kan du endre Kundens navn eller endre navn på Kundegruppe +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Vennligst velg {0} først. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0} DocType: Territory,Parent Territory,Parent Territory DocType: Quality Inspection Reading,Reading 2,Reading 2 @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,Merker DocType: C-Form Invoice Detail,Invoice No,Faktura Nei apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra innkjøpsordre DocType: Activity Cost,Costing Rate,Costing Rate +,Customer Addresses And Contacts,Kunde Adresser og kontakter DocType: Employee,Resignation Letter Date,Resignasjon Letter Dato apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Prising Reglene er videre filtreres basert på kvantitet. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke sett @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tid Logg Status må sendes inn. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} tilhører ikke noen Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Setter Opp +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta) DocType: Pricing Rule,Supplier,Leverandør DocType: C-Form,Quarter,Quarter @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper DocType: Project,External,Ekstern DocType: Features Setup,Item Serial Nos,Sak Serial Nos +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brukere og tillatelser DocType: Branch,Branch,Branch +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykking og merkevarebygging +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønn slip funnet for måned: DocType: Bin,Actual Quantity,Selve Antall DocType: Shipping Rule,example: Next Day Shipping,Eksempel: Neste Day Shipping apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} ikke funnet @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,Distinkt enhet av et element DocType: Pricing Rule,Buying,Kjøpe DocType: HR Settings,Employee Records to be created by,Medarbeider Records å være skapt av apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Logg Batch har blitt kansellert. +,Reqd By Date,Reqd etter dato DocType: Salary Slip Earning,Salary Slip Earning,Lønn Slip Tjene apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorer apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Serial No er obligatorisk @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual inventar) vil bli opprettet under denne kontoen. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse kan ikke slettes som finnes lager hovedbok oppføring for dette lageret. DocType: Company,Distribution,Distribusjon +sites/assets/js/erpnext.min.js +50,Amount Paid,Beløpet Betalt apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Prosjektleder apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maks rabatt tillatt for element: {0} er {1}% @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,Parent konto DocType: Quality Inspection Reading,Reading 3,Reading 3 ,Hub,Hub DocType: GL Entry,Voucher Type,Kupong Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Prisliste ikke funnet eller deaktivert DocType: Expense Claim,Approved,Godkjent DocType: Pricing Rule,Price,Pris apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som "venstre" @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vennligst første velg kategori apps/erpnext/erpnext/config/projects.py +18,Project master.,Prosjektet mester. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ikke viser noen symbol som $ etc ved siden av valutaer. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halv Dag) DocType: Supplier,Credit Days,Kreditt Days DocType: Leave Type,Is Carry Forward,Er fremføring apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Få Elementer fra BOM diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv index e0afb84f44..89e4c73d08 100644 --- a/erpnext/translations/pl.csv +++ b/erpnext/translations/pl.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Pokaż Wariant DocType: Sales Invoice Item,Quantity,Ilość apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredyty (zobowiązania) DocType: Employee Education,Year of Passing, +sites/assets/js/erpnext.min.js +27,In Stock,W magazynie apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Mogą jedynie wpłaty przed Unbilled zamówienia sprzedaży DocType: Designation,Designation,Nominacja DocType: Production Plan Item,Production Plan Item,Przedmiot planu produkcji @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module, DocType: SMS Center,SMS Center, apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Prostowanie DocType: BOM Replace Tool,New BOM,Nowe zestawienie materiałowe +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Czas Logi do fakturowania. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Odlewania Countergravity apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter już został wysłany DocType: Lead,Request Type, @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nowa jednostka miary stanu DocType: Period Closing Voucher,Closing Account Head, DocType: Employee,External Work History,Historia Zewnętrzna Pracy apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Error Referencje +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Czy naprawdę chcesz zatrzymać DocType: Communication,Closed,Zamknięte DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note., +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Czy na pewno chcesz zatrzymać DocType: Lead,Industry, DocType: Employee,Job Profile,Profil Pracy DocType: Newsletter,Newsletter,Newsletter @@ -484,7 +488,7 @@ apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This DocType: Purchase Receipt,Add / Edit Taxes and Charges, DocType: Purchase Invoice,Supplier Invoice No,Nr faktury dostawcy DocType: Territory,For reference,Dla referencji -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nie możesz usuwać nr seryjny {0}, ponieważ jest wykorzystywany w transakcjach giełdowych" +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nie można usunąć nr seryjnego {0}, ponieważ jest wykorzystywany w transakcjach magazynowych" apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Zamknięcie (Cr) DocType: Serial No,Warranty Period (Days),Okres gwarancji (dni) DocType: Installation Note Item,Installation Note Item, @@ -738,6 +742,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Wyślij b apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now, ,Support Analytics, DocType: Item,Website Warehouse,Magazyn strony WWW +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Czy na pewno chcesz zatrzymać zlecenie produkcyjne: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dzień miesiąca, w którym auto faktury będą generowane na przykład 05, 28 itd" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5, apps/erpnext/erpnext/config/accounts.py +169,C-Form records, @@ -880,6 +885,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bia DocType: SMS Center,All Lead (Open), DocType: Purchase Invoice,Get Advances Paid,Uzyskaj opłacone zaliczki apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Załącz własny obrazek (awatar) +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Stwórz DocType: Journal Entry,Total Amount in Words, DocType: Workflow State,Stop,Zatrzymaj apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists., @@ -960,6 +966,7 @@ DocType: Journal Entry,Make Difference Entry, DocType: Upload Attendance,Attendance From Date, DocType: Appraisal Template Goal,Key Performance Area,Kluczowy obszar wyników apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation, +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i rok: DocType: Email Digest,Annual Expense,Rocznych kosztów DocType: SMS Center,Total Characters,Wszystkich Postacie apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Proszę wybrać LM w dziedzinie BOM dla pozycji {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,Wakacje DocType: Sales Order Item,Planned Quantity,Planowana ilość DocType: Purchase Invoice Item,Item Tax Amount,Wysokość podatku dla tej pozycji DocType: Item,Maintain Stock,Utrzymanie Zapasów +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zbiory wpisy już utworzone dla Produkcji Zakonu DocType: Leave Control Panel,Leave blank if considered for all designations,Zostaw puste jeśli jest to rozważane dla wszystkich nominacji apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate, apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa JV ilości {2} DocType: Item,Inventory,Inwentarz DocType: Features Setup,"To enable ""Point of Sale"" view",Aby włączyć "punkt sprzedaży" widzenia +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Płatność nie może być wykonana za pusty koszyk DocType: Item,Sales Details,Szczegóły sprzedaży apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Przypinanie DocType: Opportunity,With Items,Z przedmiotami @@ -1453,6 +1462,7 @@ DocType: Item,Weightage, apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Górnictwo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Odlewy z żywicy apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa Odbiorców posiada taką nazwę - wprowadź inną nazwę Odbiorcy lub zmień nazwę Grupy +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Proszę najpierw wybrać {0}. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0} DocType: Territory,Parent Territory,Nadrzędne terytorium DocType: Quality Inspection Reading,Reading 2,Odczyt 2 @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,Marki DocType: C-Form Invoice Detail,Invoice No,Nr faktury apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od Zamówienia Kupna DocType: Activity Cost,Costing Rate,Wskaźnik zestawienia kosztów +,Customer Addresses And Contacts, DocType: Employee,Resignation Letter Date, apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Zasady ustalania cen są dalej filtrowane na podstawie ilości. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Brak Ustawień @@ -1680,7 +1691,7 @@ DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave., sites/assets/js/desk.min.js +7805,and,i DocType: Leave Block List Allow,Leave Block List Allow, -apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skrót nie może być puste lub spacja +apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports, apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Razem Rzeczywisty apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,szt. @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Czas Zaloguj status musi być złożony. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Numer seryjny: {0} nie należy do żadnej Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Konfigurowanie +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Wiersz # DocType: Purchase Invoice,In Words (Company Currency), DocType: Pricing Rule,Supplier,Dostawca DocType: C-Form,Quarter,Kwartał @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup" DocType: Project,External,Zewnętrzny DocType: Features Setup,Item Serial Nos, +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Użytkownicy i uprawnienia DocType: Branch,Branch,Odddział +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Drukowanie i firmowanie +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nie znaleziono poślizgu wynagrodzenia miesięcznie: DocType: Bin,Actual Quantity,Rzeczywista Ilość DocType: Shipping Rule,example: Next Day Shipping,przykład: Wysyłka następnego dnia apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Numer seryjny: {0} Nie znaleziono @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,Odrębna jednostka przedmiotu DocType: Pricing Rule,Buying,Zakupy DocType: HR Settings,Employee Records to be created by,Rekordy pracownika do utworzenia przez apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled., +,Reqd By Date, DocType: Salary Slip Earning,Salary Slip Earning, apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Wierzyciele apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Wiersz # {0}: Numer seryjny jest obowiązkowe @@ -3328,6 +3344,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account., apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazyn nie może być skasowany tak długo jak długo istnieją zapisy w księdze stanu dla tego magazynu. DocType: Company,Distribution,Dystrybucja +sites/assets/js/erpnext.min.js +50,Amount Paid,Kwota zapłacona apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager, apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Wyślij apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksymalna zniżka pozwoliło na pozycji: {0} jest {1}% @@ -3836,6 +3853,7 @@ DocType: Account,Parent Account,Nadrzędne konto DocType: Quality Inspection Reading,Reading 3,Odczyt 3 ,Hub,Piasta DocType: GL Entry,Voucher Type,Typ Podstawy +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone DocType: Expense Claim,Approved,Zatwierdzono DocType: Pricing Rule,Price,Cena apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił' @@ -3950,6 +3968,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Proszę najpierw wybrać kategorię apps/erpnext/erpnext/config/projects.py +18,Project master.,Dyrektor projektu DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nie pokazuj żadnych symboli przy walutach, takich jak $" +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Pół dnia) DocType: Supplier,Credit Days, DocType: Leave Type,Is Carry Forward, apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Weź produkty z zestawienia materiałowego diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv index 0ffe642df9..487d01f0b6 100644 --- a/erpnext/translations/pt-BR.csv +++ b/erpnext/translations/pt-BR.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar Varian DocType: Sales Invoice Item,Quantity,Quantidade apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Empréstimos ( Passivo) DocType: Employee Education,Year of Passing,Ano de passagem +sites/assets/js/erpnext.min.js +27,In Stock,Em Estoque apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Só pode fazer o pagamento contra a faturar Ordem de Vendas DocType: Designation,Designation,Designação DocType: Production Plan Item,Production Plan Item,Item do plano de produção @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configurações par DocType: SMS Center,SMS Center,Centro de SMS apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Endireitando DocType: BOM Replace Tool,New BOM,Nova LDM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Logs Tempo para o faturamento. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Fundição Countergravity apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Boletim informativo já foi enviado DocType: Lead,Request Type,Tipo de Solicitação @@ -192,14 +194,14 @@ apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Itens e Preços apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de data deve estar dentro do ano fiscal. Assumindo De Date = {0} DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selecione o funcionário para quem você está criando a Avaliação. apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centro de Custo {0} não pertence a Empresa {1} -DocType: Customer,Individual,Individual +DocType: Customer,Individual,Pessoa Física apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plano de visitas de manutenção. DocType: SMS Settings,Enter url parameter for message,Digite o parâmetro da url para mensagem apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regras para aplicação de preços e de desconto. apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Entrar conflitos desta vez com {0} para {1} {2} apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de Preço deve ser aplicável para comprar ou vender apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Data de instalação não pode ser anterior à data de entrega de item {0} -DocType: Pricing Rule,Discount on Price List Rate (%),Desconto no preço de lista Taxa (%) +DocType: Pricing Rule,Discount on Price List Rate (%),% de Desconto sobre o Preço da Lista de Preços sites/assets/js/form.min.js +279,Start,começo DocType: User,First Name,Nome apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Sua configuração está concluída. Atualizando. @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nova UDM de estoque DocType: Period Closing Voucher,Closing Account Head,Conta de Fechamento DocType: Employee,External Work History,Histórico Profissional no Exterior apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Erro de referência circular +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Você realmente quer parar DocType: Communication,Closed,Fechado DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Por extenso (Exportação) será visível quando você salvar a Guia de Remessa. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Você tem certeza que quer parar DocType: Lead,Industry,Indústria DocType: Employee,Job Profile,Perfil da Vaga DocType: Newsletter,Newsletter,Boletim informativo @@ -443,7 +447,7 @@ DocType: Journal Entry,Accounts Payable,Contas a Pagar apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adicionar Inscritos sites/assets/js/erpnext.min.js +5,""" does not exists",""" não existe" DocType: Pricing Rule,Valid Upto,Válido até -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Liste alguns de seus clientes. Eles podem ser organizações ou indivíduos . +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas. apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Resultado direto apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Não é possível filtrar com base em conta , se agrupados por Conta" apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Escritório Administrativo @@ -551,7 +555,7 @@ apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} DocType: Buying Settings,Settings for Buying Module,Configurações para o Módulo de Compras apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Digite Recibo de compra primeiro DocType: Buying Settings,Supplier Naming By,Fornecedor de nomeação -DocType: Activity Type,Default Costing Rate,A taxa de custeio padrão +DocType: Activity Type,Default Costing Rate,Preço de Custo Padrão DocType: Maintenance Schedule,Maintenance Schedule,Programação da Manutenção apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Então Preços Regras são filtradas com base no Cliente, Grupo de Clientes, Território, fornecedor, fornecedor Tipo, Campanha, Parceiro de vendas etc" apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale o Dropbox módulo python" @@ -736,6 +740,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Carregar apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar agora ,Support Analytics,Análise do Suporte DocType: Item,Website Warehouse,Armazém do Site +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Você realmente quer parar de ordem de produção: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que auto factura será gerado por exemplo, 05, 28, etc" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pontuação deve ser inferior ou igual a 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registros C -Form @@ -792,7 +797,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing ,Available Qty,Disponível Qtde DocType: Purchase Taxes and Charges,On Previous Row Total,No Total na linha anterior DocType: Salary Slip,Working Days,Dias de Trabalho -DocType: Serial No,Incoming Rate,Taxa de entrada +DocType: Serial No,Incoming Rate,Valor de Entrada DocType: Packing Slip,Gross Weight,Peso bruto apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,O nome da sua empresa para a qual você está configurando o sistema. DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir feriados em nenhuma total. de dias de trabalho @@ -879,6 +884,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bran DocType: SMS Center,All Lead (Open),Todos Prospectos (Abertos) DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Anexe sua imagem +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Fazer DocType: Journal Entry,Total Amount in Words,Valor Total por extenso DocType: Workflow State,Stop,pare apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Houve um erro . Uma razão provável pode ser que você não tenha salvo o formulário. Entre em contato com support@erpnext.com se o problema persistir . @@ -949,7 +955,7 @@ apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Para DocType: Time Log Batch,updated via Time Logs,atualizado via Time Logs apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Idade Média DocType: Opportunity,Your sales person who will contact the customer in future,Seu vendedor entrará em contato com o cliente no futuro -apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Liste alguns de seus fornecedores. Eles podem ser organizações ou indivíduos . +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lista de alguns de seus fornecedores. Eles podem ser empresas ou pessoas físicas. DocType: Company,Default Currency,Moeda padrão DocType: Contact,Enter designation of this Contact,Digite a designação deste contato DocType: Contact Us Settings,Address,Endereço @@ -959,6 +965,7 @@ DocType: Journal Entry,Make Difference Entry,Criar diferença de lançamento DocType: Upload Attendance,Attendance From Date,Data Inicial de Comparecimento DocType: Appraisal Template Goal,Key Performance Area,Área Chave de Performance apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,transporte +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e ano: DocType: Email Digest,Annual Expense,Despesa anual DocType: SMS Center,Total Characters,Total de Personagens apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}" @@ -989,7 +996,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Saldo de Contabilidade DocType: Sales Invoice Advance,Sales Invoice Advance,Antecipação da Nota Fiscal de Venda apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada de pedir -apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser maior que ' a 'Data Final Real' +apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser superior que a 'Data Final Real' apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gestão apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipos de atividades para quadro de horários apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Carcaça de investimento @@ -1196,6 +1203,7 @@ DocType: Holiday List,Holidays,Feriados DocType: Sales Order Item,Planned Quantity,Quantidade planejada DocType: Purchase Invoice Item,Item Tax Amount,Valor do Imposto do Item DocType: Item,Maintain Stock,Manter Estoque +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1259,6 +1267,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2} DocType: Item,Inventory,Inventário DocType: Features Setup,"To enable ""Point of Sale"" view",Para ativar "Point of Sale" vista +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio DocType: Item,Sales Details,Detalhes de Vendas apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixando DocType: Opportunity,With Items,Com Itens @@ -1451,6 +1460,7 @@ DocType: Item,Weightage,Peso apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineração apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,De moldagem de resina apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe um grupo de clientes com o mesmo nome, por favor modifique o nome do cliente ou renomeie o grupo de clientes" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Por favor seleccione {0} primeiro. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0} DocType: Territory,Parent Territory,Território pai DocType: Quality Inspection Reading,Reading 2,Leitura 2 @@ -1631,7 +1641,8 @@ DocType: Holiday List,Clear Table,Limpar Tabela DocType: Features Setup,Brands,Marcas DocType: C-Form Invoice Detail,Invoice No,Nota Fiscal nº apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Da Ordem de Compra -DocType: Activity Cost,Costing Rate,Custando Classificação +DocType: Activity Cost,Costing Rate,Preço de Custo +,Customer Addresses And Contacts,Endereços e Contatos do Cliente DocType: Employee,Resignation Letter Date,Data da carta de demissão apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,As regras de tarifação são ainda filtrados com base na quantidade. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,não informado @@ -1739,6 +1750,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Estado devem ser apresentadas. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurando +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),In Words (Moeda Company) DocType: Pricing Rule,Supplier,Fornecedor DocType: C-Form,Quarter,Trimestre @@ -1780,7 +1792,7 @@ DocType: Authorization Rule,Itemwise Discount,Desconto relativo ao Item apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} contra a Ordem de Venda {1} DocType: Account,Fixed Asset,ativos Fixos apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Inventário Serialized -DocType: Activity Type,Default Billing Rate,Faturamento Taxa de Inadimplência +DocType: Activity Type,Default Billing Rate,Preço de Faturamento Padrão DocType: Time Log Batch,Total Billing Amount,Valor Total do faturamento apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Contas a Receber ,Stock Balance,Balanço de Estoque @@ -1824,8 +1836,8 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For { apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Preço de {0} está desativado DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Ordem de Vendas {0} está parado -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de série necessários para item {1}. Forneceu {2}. -DocType: Stock Reconciliation Item,Current Valuation Rate,Avaliação actual Taxa +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de série é necessários para item {1}. Você forneceu {2}. +DocType: Stock Reconciliation Item,Current Valuation Rate,Taxa Atual de Avaliação DocType: Item,Customer Item Codes,Item de cliente Códigos DocType: Opportunity,Lost Reason,Razão da perda apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Criar registro de pagamento para as Ordens ou Faturas. @@ -1837,7 +1849,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups" DocType: Project,External,Externo DocType: Features Setup,Item Serial Nos,Nº de série de Itens +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuários e Permissões DocType: Branch,Branch,Ramo +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impressão e Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No recibo de vencimento encontrado para o mês: DocType: Bin,Actual Quantity,Quantidade Real DocType: Shipping Rule,example: Next Day Shipping,exemplo: Next Day envio apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} não foi encontrado @@ -1951,7 +1966,7 @@ DocType: Print Settings,Modern,Moderno DocType: Communication,Replied,Respondeu DocType: Payment Tool,Total Payment Amount,Valor Total Pagamento apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade planejada ({2}) na ordem de produção {3} -DocType: Shipping Rule,Shipping Rule Label,Regra envio Rótulo +DocType: Shipping Rule,Shipping Rule Label,Rótudo da Regra de Envio apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco. DocType: Newsletter,Test,Teste apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \ @@ -1993,7 +2008,7 @@ DocType: Stock Entry,Purpose,Finalidade DocType: Item,Will also apply for variants unless overrridden,Também se aplica a variantes a não ser que seja sobrescrito DocType: Purchase Invoice,Advances,Avanços apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Usuário Aprovador não pode ser o mesmo usuário da regra: é aplicável a -DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa básica (de acordo da UOM) +DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Preço Unitário (de acordo da UOM) DocType: SMS Log,No of Requested SMS,Nº de SMS pedidos DocType: Campaign,Campaign-.####,Campanha - . # # # # apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perfurante @@ -2422,7 +2437,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasiv DocType: Stock Settings,Freeze Stock Entries,Congelar da Entries DocType: Website Settings,Website Settings,Configurações do site DocType: Item,Reorder level based on Warehouse,Nível de reabastecimento baseado em Armazém -DocType: Activity Cost,Billing Rate,Faturamento Taxa +DocType: Activity Cost,Billing Rate,Preço de Faturamento ,Qty to Deliver,Qt para entregar DocType: Monthly Distribution Percentage,Month,Mês ,Stock Analytics,Análise do Estoque @@ -2445,7 +2460,7 @@ DocType: Lead,Market Segment,Segmento de mercado DocType: Communication,Phone,Telefone DocType: Employee Internal Work History,Employee Internal Work History,Histórico de trabalho interno do Funcionário apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Fechamento (Dr) -DocType: Contact,Passive,Passiva +DocType: Contact,Passive,Indiferente apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Não {0} não em estoque apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modelo imposto pela venda de transações. DocType: Sales Invoice,Write Off Outstanding Amount,Eliminar saldo devedor @@ -2453,7 +2468,7 @@ DocType: Features Setup,"Check if you need automatic recurring invoices. After s DocType: Account,Accounts Manager,Gerente de Contas apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Tempo Log {0} deve ser ' enviado ' DocType: Stock Settings,Default Stock UOM,Padrão da UDM do Estouqe -DocType: Time Log,Costing Rate based on Activity Type (per hour),Taxa de custeio baseado em tipo de atividade (por hora) +DocType: Time Log,Costing Rate based on Activity Type (per hour),Preço de Custo baseado em tipo de atividade (por hora) DocType: Production Planning Tool,Create Material Requests,Criar Pedidos de Materiais DocType: Employee Education,School/University,Escola / Universidade DocType: Sales Invoice Item,Available Qty at Warehouse,Qtde Disponível no Estoque @@ -3042,7 +3057,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandat DocType: Feed,Full Name,Nome Completo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Conquistar apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano -DocType: Stock Settings,Auto insert Price List rate if missing,Inserção automática taxa de lista de preços se ausente +DocType: Stock Settings,Auto insert Price List rate if missing,Inserir automaticamente o preço na lista de preço se não houver nenhum. apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montante total pago ,Transferred Qty,transferido Qtde apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação @@ -3098,6 +3113,7 @@ DocType: Serial No,Distinct unit of an Item,Unidade distinta de um item DocType: Pricing Rule,Buying,Compras DocType: HR Settings,Employee Records to be created by,Empregado Records para ser criado por apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este lote Log Tempo foi cancelada. +,Reqd By Date,Requisições Por Data DocType: Salary Slip Earning,Salary Slip Earning,Ganhos da folha de pagamento apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Credores apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: O número de série é obrigatória @@ -3210,7 +3226,7 @@ DocType: DocField,Currency,Moeda DocType: Opportunity,Opportunity Date,Data da oportunidade DocType: Purchase Receipt,Return Against Purchase Receipt,Retorno Contra Recibo de compra DocType: Purchase Order,To Bill,Para Bill -DocType: Material Request,% Ordered,Pedi% +DocType: Material Request,% Ordered,% Ordenado apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Méd. Taxa de Compra DocType: Task,Actual Time (in Hours),Tempo real (em horas) @@ -3327,6 +3343,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Conta para o armazém ( inventário permanente ) será criado nessa conta. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Armazém não pode ser excluído pois existe entrada de material para este armazém. DocType: Company,Distribution,Distribuição +sites/assets/js/erpnext.min.js +50,Amount Paid,Valor pago apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,expedição apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}% @@ -3801,7 +3818,7 @@ DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} já foi enviado ,Items To Be Requested,Itens a ser solicitado DocType: Purchase Order,Get Last Purchase Rate,Obter Valor da Última Compra -DocType: Time Log,Billing Rate based on Activity Type (per hour),Taxa de facturação com base no tipo de atividade (por hora) +DocType: Time Log,Billing Rate based on Activity Type (per hour),Preço para Facturação com base no tipo de atividade (por hora) DocType: Company,Company Info,Informações da Empresa apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Costura apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","E-mail ID da Empresa não foi encontrado , portanto o e-mail não pode ser enviado" @@ -3833,6 +3850,7 @@ DocType: Account,Parent Account,Conta pai DocType: Quality Inspection Reading,Reading 3,Leitura 3 ,Hub,Cubo DocType: GL Entry,Voucher Type,Tipo de comprovante +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Preço de tabela não encontrado ou deficientes DocType: Expense Claim,Approved,Aprovado DocType: Pricing Rule,Price,Preço apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda' @@ -3947,6 +3965,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Por favor seleccione Categoria primeira apps/erpnext/erpnext/config/projects.py +18,Project master.,Cadastro de Projeto. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como US $ etc ao lado de moedas. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Meio Dia) DocType: Supplier,Credit Days,Dias de Crédito DocType: Leave Type,Is Carry Forward,É encaminhado apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obter itens de BOM diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv index 0ff8dc9c49..1c0dddaa4e 100644 --- a/erpnext/translations/pt.csv +++ b/erpnext/translations/pt.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar Varian DocType: Sales Invoice Item,Quantity,Quantidade apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Empréstimos ( Passivo) DocType: Employee Education,Year of Passing,Ano de Passagem +sites/assets/js/erpnext.min.js +27,In Stock,Em Estoque apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Só pode fazer o pagamento contra a faturar Ordem de Vendas DocType: Designation,Designation,Designação DocType: Production Plan Item,Production Plan Item,Item do plano de produção @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configurações par DocType: SMS Center,SMS Center,SMS Center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Endireitando DocType: BOM Replace Tool,New BOM,Novo BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Logs Tempo para o faturamento. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Fundição Countergravity apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Boletim informativo já foi enviado DocType: Lead,Request Type,Tipo de Solicitação @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nova da UOM DocType: Period Closing Voucher,Closing Account Head,Fechando Chefe Conta DocType: Employee,External Work History,Histórico Profissional no Exterior apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Erro de referência circular +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Você realmente quer parar DocType: Communication,Closed,Fechado DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Em Palavras (Exportação) será visível quando você salvar a Nota de Entrega. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Você tem certeza que quer parar DocType: Lead,Industry,Indústria DocType: Employee,Job Profile,Perfil DocType: Newsletter,Newsletter,Boletim informativo @@ -376,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi ,Purchase Register,Compra Registre DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis DocType: Workstation,Consumable Cost,verbruiksartikelen Cost -apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter papel 'Deixar Approver' +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter regra 'Aprovar ausência' DocType: Purchase Receipt,Vehicle Date,Veículo Data apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,médico apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Carregar apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nu verzenden ,Support Analytics,Analytics apoio DocType: Item,Website Warehouse,Armazém site +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Você realmente quer parar de ordem de produção: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que auto factura será gerado por exemplo, 05, 28, etc" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score moet lager dan of gelijk aan 5 zijn apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C -Form platen @@ -766,7 +771,7 @@ DocType: Sales Order Item,Projected Qty,Qtde Projetada DocType: Sales Invoice,Payment Due Date,Betaling Due Date DocType: Newsletter,Newsletter Manager,Boletim Gerente apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos -apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Opening' +apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Abertura' DocType: Notification Control,Delivery Note Message,Mensagem Nota de Entrega DocType: Expense Claim,Expenses,Despesas DocType: Item Variant Attribute,Item Variant Attribute,Variant item Atributo @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bran DocType: SMS Center,All Lead (Open),Todos chumbo (Aberto) DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Anexar a sua imagem +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Fazer DocType: Journal Entry,Total Amount in Words,Valor Total em Palavras DocType: Workflow State,Stop,pare apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Er is een fout opgetreden . Een mogelijke reden zou kunnen zijn dat je niet hebt opgeslagen het formulier . Neem dan contact support@erpnext.com als het probleem aanhoudt . @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,Faça Entrada Diferença DocType: Upload Attendance,Attendance From Date,Presença de Data DocType: Appraisal Template Goal,Key Performance Area,Performance de Área Chave apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,transporte +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e ano: DocType: Email Digest,Annual Expense,Despesa anual DocType: SMS Center,Total Characters,Total de Personagens apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}" @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,Férias DocType: Sales Order Item,Planned Quantity,Quantidade planejada DocType: Purchase Invoice Item,Item Tax Amount,Valor do imposto item DocType: Item,Maintain Stock,Manter da +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2} DocType: Item,Inventory,Inventário DocType: Features Setup,"To enable ""Point of Sale"" view",Para ativar "Point of Sale" vista +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio DocType: Item,Sales Details,Detalhes de vendas apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixando DocType: Opportunity,With Items,Com Itens @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineração apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,De moldagem de resina apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Um grupo de clientes existente com o mesmo nome, por favor altere o nome do cliente ou renomear o grupo de clientes" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Por favor seleccione {0} primeiro. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0} DocType: Territory,Parent Territory,Território pai DocType: Quality Inspection Reading,Reading 2,Leitura 2 @@ -1634,13 +1644,14 @@ DocType: Features Setup,Brands,Marcas DocType: C-Form Invoice Detail,Invoice No,A factura n º apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Da Ordem de Compra DocType: Activity Cost,Costing Rate,Custando Classificação +,Customer Addresses And Contacts,Endereços e contatos de clientes DocType: Employee,Resignation Letter Date,Data carta de demissão apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,As regras de tarifação são ainda filtrados com base na quantidade. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,niet instellen DocType: Communication,Date,Data apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Cliente Repita apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Hou je vast terwijl uw systeem wordt setup. Dit kan even duren . -apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter o papel de 'Aprovador de Despesas' +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter a regra de 'Aprovador de Despesas' apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,par DocType: Bank Reconciliation Detail,Against Account,Contra Conta DocType: Maintenance Schedule Detail,Actual Date,Data atual @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Estado devem ser apresentadas. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurando +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),In Words (Moeda Company) DocType: Pricing Rule,Supplier,Fornecedor DocType: C-Form,Quarter,Trimestre @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups" DocType: Project,External,Externo DocType: Features Setup,Item Serial Nos,Item n º s de série +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en machtigingen DocType: Branch,Branch,Ramo +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impressão e Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No recibo de vencimento encontrado para o mês: DocType: Bin,Actual Quantity,Quantidade Atual DocType: Shipping Rule,example: Next Day Shipping,exemplo: Next Day envio apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} não foi encontrado @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,Unidade distinta de um item DocType: Pricing Rule,Buying,Comprar DocType: HR Settings,Employee Records to be created by,Registros de funcionário devem ser criados por apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este lote Log Tempo foi cancelada. +,Reqd By Date,Reqd Por Data DocType: Salary Slip Earning,Salary Slip Earning,Folha de salário Ganhando apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Credores apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: O número de série é obrigatória @@ -3211,7 +3227,7 @@ DocType: DocField,Currency,Moeda DocType: Opportunity,Opportunity Date,Data oportunidade DocType: Purchase Receipt,Return Against Purchase Receipt,Retorno Contra Recibo de compra DocType: Purchase Order,To Bill,Para Bill -DocType: Material Request,% Ordered,Pedi% +DocType: Material Request,% Ordered,Ordem% apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Méd. Taxa de Compra DocType: Task,Actual Time (in Hours),Tempo real (em horas) @@ -3328,6 +3344,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Uma conta para o armazém ( Perpetual Inventory ) será criada tendo como base esta conta. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse não pode ser excluído como existe entrada de material de contabilidade para este armazém. DocType: Company,Distribution,Distribuição +sites/assets/js/erpnext.min.js +50,Amount Paid,Valor pago apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,expedição apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}% @@ -3835,6 +3852,7 @@ DocType: Account,Parent Account,Conta pai DocType: Quality Inspection Reading,Reading 3,Leitura 3 ,Hub,Cubo DocType: GL Entry,Voucher Type,Tipo de Vale +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Preço de tabela não encontrado ou deficientes DocType: Expense Claim,Approved,Aprovado DocType: Pricing Rule,Price,Preço apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda' @@ -3949,6 +3967,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Selecteer Categorie eerst apps/erpnext/erpnext/config/projects.py +18,Project master.,Projeto mestre. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como US $ etc ao lado de moedas. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Meio Dia) DocType: Supplier,Credit Days,Dias de crédito DocType: Leave Type,Is Carry Forward,É Carry Forward apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obter itens da Lista de Material diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv index 3173d35f3f..48aaa6a8f5 100644 --- a/erpnext/translations/ro.csv +++ b/erpnext/translations/ro.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Arată Variant DocType: Sales Invoice Item,Quantity,Cantitate apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Imprumuturi (Raspunderi) DocType: Employee Education,Year of Passing,Ani de la promovarea +sites/assets/js/erpnext.min.js +27,In Stock,În Stoc apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Poate face doar plata împotriva vânzări nefacturată comandă DocType: Designation,Designation,Destinatie DocType: Production Plan Item,Production Plan Item,Planul de producție Articol @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Setările pentru mo DocType: SMS Center,SMS Center,SMS Center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Îndreptare DocType: BOM Replace Tool,New BOM,Nou BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Înregistrarile temporale aferente lotului pentru facturare. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Turnare Countergravity apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter-ul a fost deja trimis DocType: Lead,Request Type,Cerere tip @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nou Stock UOM DocType: Period Closing Voucher,Closing Account Head,Închidere Cont Principal DocType: Employee,External Work History,Istoricul lucrului externă apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Eroare de referință Circular +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Doriti intr-adevar sa va OPRITI DocType: Communication,Closed,Închis DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,În cuvinte (de export) va fi vizibil după ce a salva de livrare Nota. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Sunteţi sigur că doriți să vă opriți DocType: Lead,Industry,Industrie DocType: Employee,Job Profile,Profilul postului DocType: Newsletter,Newsletter,Newsletter @@ -735,6 +739,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Încărca apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Trimite Acum ,Support Analytics,Suport Analytics DocType: Item,Website Warehouse,Site-ul Warehouse +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Doriti intr-adevar sa opriti ordinul de productie: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc", apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Scorul trebuie să fie mai mică sau egală cu 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Înregistrări formular-C @@ -877,6 +882,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Alb DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise) DocType: Purchase Invoice,Get Advances Paid,Obtine Avansurile Achitate apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Atașați imaginea dvs. +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Realizare DocType: Journal Entry,Total Amount in Words,Suma totală în cuvinte DocType: Workflow State,Stop,Oprire apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Nu a fost o eroare. Un motiv probabil ar putea fi că nu ați salvat formularul. Vă rugăm să contactați support@erpnext.com dacă problema persistă. @@ -957,6 +963,7 @@ DocType: Journal Entry,Make Difference Entry,Realizeaza Intrare de Diferenta DocType: Upload Attendance,Attendance From Date,Prezenţa del la data DocType: Appraisal Template Goal,Key Performance Area,Domeniu de Performanță Cheie apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,și anul: DocType: Email Digest,Annual Expense,Cheltuieli anuale DocType: SMS Center,Total Characters,Total de caractere apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vă rugăm să selectați BOM BOM în domeniu pentru postul {0} @@ -1194,6 +1201,7 @@ DocType: Holiday List,Holidays,Concedii DocType: Sales Order Item,Planned Quantity,Planificate Cantitate DocType: Purchase Invoice Item,Item Tax Amount,Suma Taxa Articol DocType: Item,Maintain Stock,Menține Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order , DocType: Leave Control Panel,Leave blank if considered for all designations,Lăsați necompletat dacă se consideră pentru toate denumirile apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol""" apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1256,6 +1264,7 @@ DocType: Workstation Working Hour,Workstation Working Hour,Statie de lucru de or apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist DocType: Item,Inventory,Inventarierea DocType: Features Setup,"To enable ""Point of Sale"" view",Pentru a activa "punct de vânzare" vedere +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Plata nu se poate face pentru cart gol DocType: Item,Sales Details,Detalii vânzări apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixarea DocType: Opportunity,With Items,Cu articole @@ -1447,6 +1456,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minerit apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Turnare de rășină apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Există un grup de clienți cu același nume vă rugăm să schimbați numele clientului sau să redenumiți grupul de clienți +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Vă rugăm să selectați {0} primul. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Textul {0} DocType: Territory,Parent Territory,Teritoriul părinte DocType: Quality Inspection Reading,Reading 2,Reading 2 @@ -1626,6 +1636,7 @@ DocType: Features Setup,Brands,Mărci DocType: C-Form Invoice Detail,Invoice No,Factura Nu apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order, Din Ordinul de Comanda DocType: Activity Cost,Costing Rate,Costing Rate +,Customer Addresses And Contacts,Adrese de clienți și Contacte DocType: Employee,Resignation Letter Date,Scrisoare de demisie Data apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Regulile de stabilire a prețurilor sunt filtrate în continuare în funcție de cantitate. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nu a fost setat @@ -1732,6 +1743,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Ora Log Starea trebuie să fie prezentate. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial nr {0} nu apartine nici unei Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurarea +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # , DocType: Purchase Invoice,In Words (Company Currency),În cuvinte (Compania valutar) DocType: Pricing Rule,Supplier,Furnizor DocType: C-Form,Quarter,Trimestru @@ -1830,7 +1842,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centre de costuri pot fi realizate în grupuri, dar intrările pot fi făcute împotriva non-Grupuri" DocType: Project,External,Extern DocType: Features Setup,Item Serial Nos,Nr. de Serie Articol +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilizatori și permisiuni DocType: Branch,Branch,Ramură +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Imprimarea și Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:, DocType: Bin,Actual Quantity,Cantitate Efectivă DocType: Shipping Rule,example: Next Day Shipping,exemplu: Next Day Shipping apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial nr {0} nu a fost găsit @@ -3200,6 +3215,7 @@ DocType: Serial No,Distinct unit of an Item,Unitate distinctă de Postul DocType: Pricing Rule,Buying,Cumpărare DocType: HR Settings,Employee Records to be created by,Inregistrari Angajaților pentru a fi create prin apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Acest lot Timpul Log a fost anulat. +,Reqd By Date,Reqd de Date DocType: Salary Slip Earning,Salary Slip Earning,Salariul Slip Câștigul salarial apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Creditorii apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Nu serial este obligatorie @@ -3428,6 +3444,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Contul aferent depozitului (Inventar Permanent) va fi creat in cadrul acest Cont. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depozit nu pot fi șterse ca exista intrare stoc registrul pentru acest depozit. DocType: Company,Distribution,Distribuire +sites/assets/js/erpnext.min.js +50,Amount Paid,Sumă plătită apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Manager de Proiect apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Expediere apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Discount maxim permis pentru articol: {0} este {1}% @@ -3934,6 +3951,7 @@ DocType: Account,Parent Account,Contul părinte DocType: Quality Inspection Reading,Reading 3,Reading 3 ,Hub,Butuc DocType: GL Entry,Voucher Type,Tip Voucher +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap DocType: Expense Claim,Approved,Aprobat DocType: Pricing Rule,Price,Preț apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat' @@ -4047,6 +4065,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vă rugăm să selectați categoria întâi apps/erpnext/erpnext/config/projects.py +18,Project master.,Maestru proiect. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nu afisa nici un simbol de genul $ etc alături de valute. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Jumatate de zi) DocType: Supplier,Credit Days,Zile de Credit DocType: Leave Type,Is Carry Forward,Este Carry Forward apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obține articole din FDM diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv index 6368ad188d..14837b83e1 100644 --- a/erpnext/translations/ru.csv +++ b/erpnext/translations/ru.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Показат DocType: Sales Invoice Item,Quantity,Количество apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредиты (обязательства) DocType: Employee Education,Year of Passing,Год Passing +sites/assets/js/erpnext.min.js +27,In Stock,В Наличии apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Могу только осуществить платеж против незаконченного фактурного ордена продаж DocType: Designation,Designation,Назначение DocType: Production Plan Item,Production Plan Item,Производственный план Пункт @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки DocType: SMS Center,SMS Center,SMS центр apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Выпрямление DocType: BOM Replace Tool,New BOM,Новый BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Пакетная Журналы Время для оплаты. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Литье сифонной apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Информационный бюллетень уже был отправлен DocType: Lead,Request Type,Тип запроса @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Новый фонда UOM DocType: Period Closing Voucher,Closing Account Head,Закрытие счета руководитель DocType: Employee,External Work History,Внешний Работа История apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циклическая ссылка Ошибка +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,"Вы действительно хотите, чтобы остановить" DocType: Communication,Closed,Закрыт DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,В Слов (Экспорт) будут видны только вы сохраните накладной. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Вы уверены, что хотите, чтобы остановить" DocType: Lead,Industry,Промышленность DocType: Employee,Job Profile,Профиль работы DocType: Newsletter,Newsletter,Рассылка новостей @@ -738,6 +742,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Загр apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Отправить Сейчас ,Support Analytics,Поддержка Аналитика DocType: Item,Website Warehouse,Сайт Склад +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,"Вы действительно хотите, чтобы остановить производственный заказ:" DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День месяца, в который автоматически счет-фактура будет создан, например, 05, 28 и т.д." apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Оценка должна быть меньше или равна 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,С-форма записи @@ -880,6 +885,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бе DocType: SMS Center,All Lead (Open),Все лиды (Открыть) DocType: Purchase Invoice,Get Advances Paid,Получить авансы выданные apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепите свою фотографию +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Сделать DocType: Journal Entry,Total Amount in Words,Общая сумма в словах DocType: Workflow State,Stop,стоп apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Был ошибка. Один вероятной причиной может быть то, что вы не сохранили форму. Пожалуйста, свяжитесь с support@erpnext.com если проблема не устранена." @@ -960,6 +966,7 @@ DocType: Journal Entry,Make Difference Entry,Сделать Разница за DocType: Upload Attendance,Attendance From Date,Посещаемость С Дата DocType: Appraisal Template Goal,Key Performance Area,Ключ Площадь Производительность apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Транспортные расходы +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,конец года DocType: Email Digest,Annual Expense,Годовые расходы DocType: SMS Center,Total Characters,Персонажей apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}" @@ -1197,6 +1204,7 @@ DocType: Holiday List,Holidays,Праздники DocType: Sales Order Item,Planned Quantity,Планируемый Количество DocType: Purchase Invoice Item,Item Tax Amount,Пункт Сумма налога DocType: Item,Maintain Stock,Поддержание складе +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставьте пустым, если рассматривать для всех обозначений" apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1260,6 +1268,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,А apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Строка {0}: С номером количество {1} должен быть меньше или равен количеству СП {2} DocType: Item,Inventory,Инвентаризация DocType: Features Setup,"To enable ""Point of Sale"" view",Чтобы включить "Точка зрения" Продажа +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Оплата не может быть сделано для пустого корзину DocType: Item,Sales Details,Продажи Подробности apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Закрепление DocType: Opportunity,With Items,С элементами @@ -1452,6 +1461,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Добыча apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Литье смолы apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Пожалуйста, выберите {0} в первую очередь." apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0} DocType: Territory,Parent Territory,Родитель Территория DocType: Quality Inspection Reading,Reading 2,Чтение 2 @@ -1633,6 +1643,7 @@ DocType: Features Setup,Brands,Бренды DocType: C-Form Invoice Detail,Invoice No,Счет-фактура Нет apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,От Заказа DocType: Activity Cost,Costing Rate,Калькуляция Оценить +,Customer Addresses And Contacts,Адреса клиентов и Контакты DocType: Employee,Resignation Letter Date,Отставка Письмо Дата apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Цены Правила дополнительно фильтруются на основе количества. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не указано @@ -1740,6 +1751,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Время входа Статус должен быть представлен. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серийный номер {0} не принадлежит ни к одной Склад apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Настройка +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ряд # DocType: Purchase Invoice,In Words (Company Currency),В Слов (Компания валюте) DocType: Pricing Rule,Supplier,Поставщик DocType: C-Form,Quarter,Квартал @@ -1838,7 +1850,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп" DocType: Project,External,Внешний GPS с RS232 DocType: Features Setup,Item Serial Nos,Пункт Серийный Нос +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Пользователи и разрешения DocType: Branch,Branch,Ветвь +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печать и брендинг +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Нет скольжения зарплата найдено месяц: DocType: Bin,Actual Quantity,Фактическое Количество DocType: Shipping Rule,example: Next Day Shipping,пример: Следующий день доставка apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серийный номер {0} не найден @@ -3098,6 +3113,7 @@ DocType: Serial No,Distinct unit of an Item,Отдельного подразд DocType: Pricing Rule,Buying,Покупка DocType: HR Settings,Employee Records to be created by,Сотрудник отчеты должны быть созданные apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Это Пакетная Время Лог был отменен. +,Reqd By Date,Логика включения по дате DocType: Salary Slip Earning,Salary Slip Earning,Зарплата скольжения Заработок apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Кредиторы apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Ряд # {0}: Серийный номер является обязательным @@ -3327,6 +3343,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Счет для склада (непрерывной инвентаризации) будет создан для этого счета. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада. DocType: Company,Distribution,Распределение +sites/assets/js/erpnext.min.js +50,Amount Paid,Выплачиваемая сумма apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Руководитель проекта apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Отправка apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс скидка позволило пункта: {0} {1}% @@ -3834,6 +3851,7 @@ DocType: Account,Parent Account,Родитель счета DocType: Quality Inspection Reading,Reading 3,Чтение 3 ,Hub,Концентратор DocType: GL Entry,Voucher Type,Ваучер Тип +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Прайс-лист не найден или отключен DocType: Expense Claim,Approved,Утверждено DocType: Pricing Rule,Price,Цена apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые""" @@ -3948,6 +3966,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Пожалуйста, выберите категорию первый" apps/erpnext/erpnext/config/projects.py +18,Project master.,Мастер проекта. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показывать любой символ вроде $ и т.д. рядом с валютами. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Полдня) DocType: Supplier,Credit Days,Кредитные дней DocType: Leave Type,Is Carry Forward,Является ли переносить apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Получить элементов из спецификации diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv index e1f81ed3a8..1e89b95e4e 100644 --- a/erpnext/translations/sk.csv +++ b/erpnext/translations/sk.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Zobrazit Varia DocType: Sales Invoice Item,Quantity,Množství apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Úvěry (závazky) DocType: Employee Education,Year of Passing,Rok Passing +sites/assets/js/erpnext.min.js +27,In Stock,Na skladě apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Možno vykonať len platbu proti nevyfakturované zákazky odberateľa DocType: Designation,Designation,Označení DocType: Production Plan Item,Production Plan Item,Výrobní program Item @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavení pro HR m DocType: SMS Center,SMS Center,SMS centrum apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rovnacie DocType: BOM Replace Tool,New BOM,New BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch čas Záznamy pro fakturaci. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity liatie apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter již byla odeslána DocType: Lead,Request Type,Typ požadavku @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nových akcií UOM DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava DocType: Employee,External Work History,Vnější práce History apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kruhové Referenčné Chyba +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,"Opravdu chcete, aby STOP " DocType: Communication,Closed,Zavřeno DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku." +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Jste si jisti, že chcete zastavit" DocType: Lead,Industry,Průmysl DocType: Employee,Job Profile,Job Profile DocType: Newsletter,Newsletter,Newsletter @@ -509,7 +513,7 @@ apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanč apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit" apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Ujistěte se prodejní objednávky DocType: Project Task,Project Task,Úloha Project -,Lead Id,Olovo Id +,Lead Id,Id Obchodnej iniciatívy DocType: C-Form Invoice Detail,Grand Total,Celkem DocType: About Us Settings,Website Manager,Správce webu apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Datum zahájení Fiskálního roku by nemělo být větší než datum ukončení @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Nahrát n apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Odeslat nyní ,Support Analytics,Podpora Analytics DocType: Item,Website Warehouse,Sklad pro web +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Opravdu chcete zastavit výrobní zakázky: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form záznamy @@ -849,7 +854,7 @@ DocType: Stock Entry,Total Outgoing Value,Celková hodnota Odchozí DocType: Lead,Request for Information,Žádost o informace DocType: Payment Tool,Paid,Placený DocType: Salary Slip,Total in words,Celkem slovy -DocType: Material Request Item,Lead Time Date,Lead Time data +DocType: Material Request Item,Lead Time Date,Čas a Dátum Obchodnej iniciatívy apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1} apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pre "produktom Bundle predmety, sklad, sériové číslo a dávkové No bude považovaná zo" Balenie zoznam 'tabuľky. Ak Warehouse a Batch No sú rovnaké pre všetky balenia položky pre akúkoľvek "Výrobok balík" položky, tieto hodnoty môžu byť zapísané do hlavnej tabuľky položky, budú hodnoty skopírované do "Balenie zoznam" tabuľku." apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Zásilky zákazníkům. @@ -878,9 +883,10 @@ apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Stro apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prevedené apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později). apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Biela -DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny) +DocType: SMS Center,All Lead (Open),Všetky Iniciatívy (Otvorené) DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Připojit svůj obrázek +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Dělat DocType: Journal Entry,Total Amount in Words,Celková částka slovy DocType: Workflow State,Stop,Stop apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává." @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl DocType: Upload Attendance,Attendance From Date,Účast Datum od DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Doprava +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,a rok: DocType: Email Digest,Annual Expense,Ročná Expense DocType: SMS Center,Total Characters,Celkový počet znaků apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0} @@ -1017,7 +1024,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka" apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ďalšie účty môžu byť vyrobené v rámci skupiny, ale údaje je možné proti non-skupín" apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Daňové a jiné platové srážky. -DocType: Lead,Lead,Olovo +DocType: Lead,Lead,Obchodná iniciatíva DocType: Email Digest,Payables,Závazky DocType: Account,Warehouse,Sklad apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat @@ -1035,7 +1042,7 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Smířit platbě DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem DocType: Lead,Call,Volání -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"""Položky"" nemůžou být prázdné" +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne" apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1} ,Trial Balance,Trial Balance apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Nastavenie Zamestnanci @@ -1076,7 +1083,7 @@ DocType: Purchase Receipt,Rejected Warehouse,Zamítnuto Warehouse DocType: GL Entry,Against Voucher,Proti poukazu DocType: Item,Default Buying Cost Center,Výchozí Center Nákup Cost apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Položka {0} musí být Sales Item -DocType: Item,Lead Time in days,Olovo Čas v dňoch +DocType: Item,Lead Time in days,Vek Obchodnej iniciatívy v dňoch ,Accounts Payable Summary,Splatné účty Shrnutí apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0} DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur @@ -1167,7 +1174,7 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ag apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Můžete udělat časový záznam pouze proti předložené výrobní objednávce DocType: Maintenance Schedule Item,No of Visits,Počet návštěv DocType: File,old_parent,old_parent -apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Zpravodaje ke kontaktům, vede." +apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter kontaktom a obchodným iniciatívam apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Súčet bodov za všetkých cieľov by malo byť 100. Je {0} apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operace nemůže být prázdné. ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných @@ -1193,11 +1200,12 @@ apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_re DocType: Pricing Rule,Campaign,Kampaň apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto""" DocType: Purchase Invoice,Contact Person,Kontaktní osoba -apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"""Očekávaný Datum Začátku"" nemůže být větší než ""Očekávanou Datum Konce""" +apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"""Očakávaný Dátum Začiatku"" nemôže být vetší ako ""Očekávaný Dátum Konca""" DocType: Holiday List,Holidays,Prázdniny DocType: Sales Order Item,Planned Quantity,Plánované Množství DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky -DocType: Item,Maintain Stock,Udržiavať Stock +DocType: Item,Maintain Stock,Udržiavať Zásoby +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení" apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate" apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}" DocType: Item,Inventory,Inventář DocType: Features Setup,"To enable ""Point of Sale"" view",Ak chcete povoliť "Point of Sale" pohľadu +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík DocType: Item,Sales Details,Prodejní Podrobnosti apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pripne DocType: Opportunity,With Items,S položkami @@ -1329,7 +1338,7 @@ apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Mat apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Riadok # {0}: vrátenej položky {1} neexistuje v {2} {3} apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovní účty ,Bank Reconciliation Statement,Bank Odsouhlasení prohlášení -DocType: Address,Lead Name,Olovo Name +DocType: Address,Lead Name,Meno Obchodnej iniciatívy ,POS,POS apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otvorenie Sklad Balance apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} musí být uvedeny pouze jednou @@ -1410,7 +1419,7 @@ DocType: Quotation,Term Details,Termín Podrobnosti DocType: Manufacturing Settings,Capacity Planning For (Days),Plánovanie kapacít Pro (dni) apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Žiadny z týchto položiek má žiadnu zmenu v množstve alebo hodnote. DocType: Warranty Claim,Warranty Claim,Záruční reklamace -,Lead Details,Olověné Podrobnosti +,Lead Details,Podrobnosti Obchodnej iniciatívy DocType: Authorization Rule,Approving User,Schvalování Uživatel apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovania apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pokovovanie @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Baníctvo apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin liatie apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Prosím, vyberte {0} jako první." apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Text {0} DocType: Territory,Parent Territory,Parent Territory DocType: Quality Inspection Reading,Reading 2,Čtení 2 @@ -1478,7 +1488,7 @@ DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky. DocType: Sales Invoice Item,Batch No,Č. šarže DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povoliť viac Predajné objednávky proti Zákazníka Objednávky -apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hlavní +apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hlavné DocType: DocPerm,Delete,Smazat apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Varianta sites/assets/js/desk.min.js +7971,New {0},Nový: {0} @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,Značky DocType: C-Form Invoice Detail,Invoice No,Faktura č apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Z vydané objednávky DocType: Activity Cost,Costing Rate,Kalkulácie Rate +,Customer Addresses And Contacts,Adresy zákazníkov a kontakty DocType: Employee,Resignation Letter Date,Rezignace Letter Datum apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Není nastaveno @@ -1719,7 +1730,7 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sur DocType: Employee,Date of Birth,Datum narození apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Bod {0} již byla vrácena DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **. -DocType: Opportunity,Customer / Lead Address,Zákazník / Lead Address +DocType: Opportunity,Customer / Lead Address,Zákazník / Iniciatíva Adresa DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel) DocType: Purchase Taxes and Charges,Deduct,Odečíst @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Poradové číslo {0} nepatrí do skladu," apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavení +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti) DocType: Pricing Rule,Supplier,Dodavatel DocType: C-Form,Quarter,Čtvrtletí @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Ďalšie nákladové strediská môžu byť vyrobené v rámci skupiny, ale položky môžu byť vykonané proti non-skupín" DocType: Project,External,Externí DocType: Features Setup,Item Serial Nos,Položka sériových čísel +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění DocType: Branch,Branch,Větev +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tisk a identita +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No plat skluzu nalezen na měsíc: DocType: Bin,Actual Quantity,Skutečné Množství DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen @@ -1868,7 +1883,7 @@ DocType: Company,For Reference Only.,Pouze orientační. apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Neplatný {0}: {1} DocType: Sales Invoice Advance,Advance Amount,Záloha ve výši DocType: Manufacturing Settings,Capacity Planning,Plánovanie kapacít -apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Datum od"" je povinné" +apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Dátum od"" je povinný" DocType: Journal Entry,Reference Number,Referenční číslo DocType: Employee,Employment Details,Informace o zaměstnání DocType: Employee,New Workplace,Nové pracoviště @@ -2068,7 +2083,7 @@ apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py DocType: Stock Entry,Manufacture,Výroba apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Dodávka Vezměte prosím na vědomí první DocType: Purchase Invoice,Currency and Price List,Měna a ceník -DocType: Opportunity,Customer / Lead Name,Zákazník / Lead Name +DocType: Opportunity,Customer / Lead Name,Zákazník / Iniciatíva Meno apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Výprodej Datum není uvedeno apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Výroba DocType: Item,Allow Production Order,Povolit výrobní objednávky @@ -2198,7 +2213,7 @@ DocType: Price List,Price List Master,Ceník Master DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle." ,S.O. No.,SO Ne. DocType: Production Order Operation,Make Time Log,Udělejte si čas Přihlásit -apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0} +apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prosím vytvorte Zákazníka z Obchodnej iniciatívy {0} DocType: Price List,Applicable for Countries,Pre krajiny apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Počítače apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-chemické brúsenie @@ -2477,7 +2492,7 @@ apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against C apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie" apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0} DocType: Leave Allocation,Carry Forwarded Leaves,Carry Předáno listy -apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD""" +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátum DO"" musí byť po ""Dátum OD""" ,Stock Projected Qty,Reklamní Plánovaná POČET apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1} DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka @@ -2560,7 +2575,7 @@ apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Custome DocType: Item Group,Check this if you want to show in website,"Zaškrtněte, pokud chcete zobrazit v webové stránky" apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Vítejte na ERPNext DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Počet -apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Olovo na kotácie +apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Obchodná iniciatíva na Ponuku DocType: Lead,From Customer,Od Zákazníka apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Volá DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulácie Čiastka (cez Time Záznamy) @@ -2623,7 +2638,7 @@ DocType: Account,Sales User,Uživatel prodeje apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min množství nemůže být větší než Max Množství DocType: Stock Entry,Customer or Supplier Details,Zákazníka alebo dodávateľa Podrobnosti apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Nastavit -DocType: Lead,Lead Owner,Olovo Majitel +DocType: Lead,Lead Owner,Získateľ Obchodnej iniciatívy apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Je potrebná Warehouse DocType: Employee,Marital Status,Rodinný stav DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka @@ -2763,7 +2778,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand cas apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating DocType: Purchase Invoice Item,Rate,Rychlost apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Internovat -DocType: Newsletter,A Lead with this email id should exist,Lead s touto e-mailovou id by měla již existovat +DocType: Newsletter,A Lead with this email id should exist,Obchodná iniciatíva s touto emailovou adresou by už mala existovať DocType: Stock Entry,From BOM,Od BOM apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Základní apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky DocType: Pricing Rule,Buying,Nákupy DocType: HR Settings,Employee Records to be created by,"Zaměstnanec Záznamy, které vytvořil" apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,To Batch Time Log byla zrušena. +,Reqd By Date,Pr p Podľa dátumu DocType: Salary Slip Earning,Salary Slip Earning,Plat Slip Zisk apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Věřitelé apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Riadok # {0}: Výrobné číslo je povinné @@ -3127,7 +3143,7 @@ DocType: Address,Postal Code,poštové smerovacie číslo DocType: Production Order Operation,"in Minutes Updated via 'Time Log'","v minutách aktualizovat přes ""Time Log""" -DocType: Customer,From Lead,Od Leadu +DocType: Customer,From Lead,Od Obchodnej iniciatívy apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Objednávky uvolněna pro výrobu. apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vyberte fiskálního roku ... apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup" @@ -3328,6 +3344,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu." apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad." DocType: Company,Distribution,Distribuce +sites/assets/js/erpnext.min.js +50,Amount Paid,Zaplacené částky apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}% @@ -3423,7 +3440,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business De DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Období ,General Ledger,Hlavní Účetní Kniha -apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobraziť Vodítka +apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobraziť Obchodné iniciatívy DocType: Item Attribute Value,Attribute Value,Hodnota atributu apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-mail id musí být jedinečný, již existuje {0}" ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level @@ -3460,7 +3477,7 @@ DocType: Salary Slip Deduction,Default Amount,Výchozí částka apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Sklad nebyl nalezen v systému apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Tento mesiac je zhrnutie DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading -apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit Zásoby Starší Vic jak` by měla být menší než %d dnů. +apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmraziť zásoby staršie ako` malo by byť menšie než %d dní. DocType: Tax Rule,Purchase Tax Template,Spotrebná daň šablóny ,Project wise Stock Tracking,Sledování zboží dle projektu apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0} @@ -3510,7 +3527,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electro DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}" -apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hlavní zprávy +apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hlavné správy apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Sklad Ledger položky bilancí aktualizováno apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE @@ -3784,7 +3801,7 @@ DocType: Manufacturing Settings,Default Finished Goods Warehouse,Východzí hoto apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Prodej Osoba DocType: Sales Invoice,Cold Calling,Cold Calling DocType: SMS Parameter,SMS Parameter,SMS parametrů -DocType: Maintenance Schedule Item,Half Yearly,Pololetní +DocType: Maintenance Schedule Item,Half Yearly,Polročne DocType: Lead,Blog Subscriber,Blog Subscriber apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Vytvoření pravidla pro omezení transakce na základě hodnot. DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Pokud je zaškrtnuto, Total no. pracovních dnů bude zahrnovat dovolenou, a to sníží hodnotu platu za každý den" @@ -3834,6 +3851,7 @@ DocType: Account,Parent Account,Nadřazený účet DocType: Quality Inspection Reading,Reading 3,Čtení 3 ,Hub,Hub DocType: GL Entry,Voucher Type,Voucher Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán DocType: Expense Claim,Approved,Schválený DocType: Pricing Rule,Price,Cena apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left""" @@ -3948,10 +3966,11 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Half Day) DocType: Supplier,Credit Days,Úvěrové dny DocType: Leave Type,Is Carry Forward,Je převádět apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Získat předměty z BOM -apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dodací lhůta dny +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Days apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kusovník apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riadok {0}: Typ Party Party a je nutné pre pohľadávky / záväzky na účte {1} DocType: Dropbox Backup,Send Notifications To,Odeslat upozornění diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv new file mode 100644 index 0000000000..3d657d2527 --- /dev/null +++ b/erpnext/translations/sl.csv @@ -0,0 +1,3910 @@ +DocType: Employee,Salary Mode,Način plače +DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Izberite mesečnim izplačilom, če želite spremljati glede na sezono." +DocType: Employee,Divorced,Ločen +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Opozorilo: Same postavka je bila vpisana večkrat. +apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Postavke že sinhronizirano +DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Dovoli Postavka, ki se doda večkrat v transakciji" +apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Opusti Material obisk {0} pred preklicem te garancije +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Izberite Party Vrsta najprej +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Žarjenje +DocType: Item,Customer Items,Točke strank +apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Račun {0}: Matično račun {1} ne more biti knjiga +DocType: Item,Publish Item to hub.erpnext.com,Objavite element na hub.erpnext.com +apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-poštna obvestila +DocType: Item,Default Unit of Measure,Privzeto mersko enoto +DocType: SMS Center,All Sales Partner Contact,Vse Sales Partner Kontakt +DocType: Employee,Leave Approvers,Pustite Approvers +DocType: Sales Partner,Dealer,Trgovec +DocType: Employee,Rented,Najemu +DocType: About Us Settings,Website,Spletna stran +DocType: POS Profile,Applicable for User,Velja za člane +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ustavljen Proizvodnja naročite ni mogoče preklicati, ga najprej Odčepiti preklicati" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zbijanje plus sintranje +apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebna za tečajnico {0} +DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bo izračunana v transakciji. +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Od Material zahtevo +apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree +DocType: Job Applicant,Job Applicant,Job Predlagatelj +apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ni več zadetkov. +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Pravna +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Dejanska davčna vrsta ne more biti vključen v ceno postavko v vrstici {0} +DocType: C-Form,Customer,Stranka +DocType: Purchase Receipt Item,Required By,Zahtevani Z +DocType: Delivery Note,Return Against Delivery Note,Vrni Proti dobavnica +DocType: Department,Department,Oddelek +DocType: Purchase Order,% Billed,% Zaračunali +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Menjalni tečaj mora biti enaka kot {0} {1} ({2}) +DocType: Sales Invoice,Customer Name,Ime stranke +DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Vsa izvozna polja, povezana kot valuto, konverzijo, izvoza skupaj, izvozno skupni vsoti itd so na voljo v dobavnica, POS, predračun, prodajne fakture, Sales Order itd" +DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Glave (ali skupine), proti katerim vknjižbe so narejeni in stanje se ohranijo." +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Izjemna za {0} ne more biti manjša od nič ({1}) +DocType: Manufacturing Settings,Default 10 mins,Privzeto 10 minut +DocType: Leave Type,Leave Type Name,Pustite Tip Ime +apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija Posodobljeno Uspešno +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šivi +DocType: Pricing Rule,Apply On,Nanesite na +DocType: Item Price,Multiple Item prices.,Več cene postavko. +,Purchase Order Items To Be Received,Naročilnica Postavke da bodo prejete +DocType: SMS Center,All Supplier Contact,Vse Dobavitelj Kontakt +DocType: Quality Inspection Reading,Parameter,Parameter +apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Pričakuje Končni datum ne more biti manjši od pričakovanega začetka Datum +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Ali res želite Odčepiti proizvodne red: +apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Vrstica # {0}: Stopnja mora biti enaka kot {1}: {2} ({3} / {4}) +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,New Leave Application +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Osnutek +DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Da bi ohranili stranke pametno Koda in da bi jim iskanje, ki temelji na njihovi kode uporabite to možnost" +DocType: Mode of Payment Account,Mode of Payment Account,Način plačilnega računa +apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Prikaži Variante +DocType: Sales Invoice Item,Quantity,Količina +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Posojili (obveznosti) +DocType: Employee Education,Year of Passing,"Leto, ki poteka" +sites/assets/js/erpnext.min.js +27,In Stock,Na zalogi +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Lahko le plačilo proti neobračunano Sales Order +DocType: Designation,Designation,Imenovanje +DocType: Production Plan Item,Production Plan Item,Proizvodni načrt Postavka +apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uporabnik {0} je že dodeljen Employee {1} +apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Naredite nov POS Profile +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Skrb za zdravje +DocType: Purchase Invoice,Monthly,Mesečni +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Račun +DocType: Maintenance Schedule Item,Periodicity,Periodičnost +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email naslov +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obramba +DocType: Company,Abbr,Abbr +DocType: Appraisal Goal,Score (0-5),Ocena (0-5) +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3} +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Vrstica # {0}: +DocType: Delivery Note,Vehicle No,Nobeno vozilo +sites/assets/js/erpnext.min.js +55,Please select Price List,Izberite Cenik +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Lesno +DocType: Production Order Operation,Work In Progress,V razvoju +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D tiskanje +DocType: Employee,Holiday List,Holiday Seznam +DocType: Time Log,Time Log,Čas Log +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Računovodja +DocType: Cost Center,Stock User,Stock Uporabnik +DocType: Company,Phone No,Telefon Ni +DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Dnevnik aktivnosti, ki jih uporabniki zoper Naloge, ki se lahko uporabljajo za sledenje časa, zaračunavanje izvedli." +apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},New {0}: # {1} +,Sales Partners Commission,Partnerji Sales Komisija +apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Kratica ne more imeti več kot 5 znakov +apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \ + exist with this Attribute.",Lastnost Vrednost {0} ni mogoče odstraniti iz {1} kot postavko variante \ obstaja s tega atributa. +DocType: Print Settings,Classic,Classic +apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,To je račun root in jih ni mogoče urejati. +DocType: BOM,Operations,Operacije +apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ni mogoče nastaviti dovoljenja na podlagi popust za {0} +DocType: Bin,Quantity Requested for Purchase,Količina za nabavo +DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pripni datoteko .csv z dvema stolpcema, eno za staro ime in enega za novim imenom" +DocType: Packed Item,Parent Detail docname,Parent Detail docname +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg +apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Odpiranje za službo. +DocType: Item Attribute,Increment,Prirastek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Oglaševanje +DocType: Employee,Married,Poročen +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0} +DocType: Payment Reconciliation,Reconcile,Uskladite +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Trgovina z živili +DocType: Quality Inspection Reading,Reading 1,Branje 1 +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Naredite Bank Entry +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pokojninski skladi +apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Skladišče je obvezna, če tip račun skladišče" +DocType: SMS Center,All Sales Person,Vse Sales oseba +DocType: Lead,Person Name,Ime oseba +DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Preverite, če ponavljajoče se naročilo, počistite ustaviti ponavljajoče se ali dati ustrezno End Date" +DocType: Sales Invoice Item,Sales Invoice Item,Prodaja Račun Postavka +DocType: Account,Credit,Credit +apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko> Nastavitve HR +DocType: POS Profile,Write Off Cost Center,Napišite Off stroškovni center +DocType: Warehouse,Warehouse Detail,Skladišče Detail +apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prečkal za stranko {0} {1} / {2} +DocType: Tax Rule,Tax Type,Davčna Type +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Nimate dovoljenja za dodajanje ali posodobitev vnose pred {0} +DocType: Item,Item Image (if not slideshow),Postavka Image (če ne slideshow) +apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Obstaja Stranka z istim imenom +DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Urne / 60) * Dejanska Operacija čas +DocType: SMS Log,SMS Log,SMS Log +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Nabavna vrednost dobavljenega predmeta +DocType: Blog Post,Guest,Gost +DocType: Quality Inspection,Get Specification Details,Pridobite Specification Podrobnosti +DocType: Lead,Interested,Zanima +apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvoritev +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1} +DocType: Item,Copy From Item Group,Kopiranje iz postavke skupine +DocType: Journal Entry,Opening Entry,Otvoritev Začetek +apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} je obvezna +DocType: Stock Entry,Additional Costs,Dodatni stroški +apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Račun z obstoječim poslom ni mogoče pretvoriti v skupini. +DocType: Lead,Product Enquiry,Povpraševanje izdelek +DocType: Standard Reply,Owner,Lastnik +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosimo, da najprej vnesete podjetje" +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Prosimo, izberite Company najprej" +DocType: Employee Education,Under Graduate,Pod Graduate +apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Ciljna Na +DocType: BOM,Total Cost,Skupni stroški +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Povrtavanje +apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti: +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nepremičnina +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Izkaz računa +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmacevtski izdelki +DocType: Expense Claim Detail,Claim Amount,Trditev Znesek +DocType: Employee,Mr,gospod +DocType: Custom Script,Client,Client +apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavitelj Vrsta / dobavitelj +DocType: Naming Series,Prefix,Predpona +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Potrošni +DocType: Upload Attendance,Import Log,Uvoz Log +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Pošlji +DocType: SMS Center,All Contact,Vse Kontakt +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Letne plače +DocType: Period Closing Voucher,Closing Fiscal Year,Zapiranje poslovno leto +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Zaloga Stroški +DocType: Newsletter,Email Sent?,Email Sent? +DocType: Journal Entry,Contra Entry,Contra Začetek +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Prikaži Čas Dnevniki +DocType: Journal Entry Account,Credit in Company Currency,Kredit v podjetju valuti +DocType: Delivery Note,Installation Status,Namestitev Status +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Sprejeta + Zavrnjeno Količina mora biti enaka Prejeto količini za postavko {0} +DocType: Item,Supply Raw Materials for Purchase,Dobava surovine za nakup +apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Postavka {0} mora biti Nakup postavka +DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file. +All dates and employee combination in the selected period will come in the template, with existing attendance records","Prenesite predloge, izpolnite ustrezne podatke in priložite spremenjeno datoteko. Vsi datumi in zaposleni kombinacija v izbranem obdobju, bo prišel v predlogo, z obstoječimi zapisi postrežbo" +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Postavka {0} ni aktiven ali je bil dosežen konec življenja +DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bo treba posodobiti po Sales predložen račun. +apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi" +apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavitve za HR modula +DocType: SMS Center,SMS Center,SMS center +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ravnanje +DocType: BOM Replace Tool,New BOM,New BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Serija Čas Hlodovina za zaračunavanje. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity litje +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Glasilo je bilo že poslano +DocType: Lead,Request Type,Zahteva Type +DocType: Leave Application,Reason,Razlog +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Izvedba +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Prvi uporabnik bo postala System Manager (lahko spremenite kasneje). +apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o poslovanju izvajajo. +DocType: Serial No,Maintenance Status,Status vzdrževanje +apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Predmeti in Pricing +apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma mora biti v poslovnem letu. Ob predpostavki Od datuma = {0} +DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Izberite zaposlenega, za katerega ste ustvarili cenitve." +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Stalo Center {0} ne pripada družbi {1} +DocType: Customer,Individual,Individualno +apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Načrt za vzdrževanje obiskov. +DocType: SMS Settings,Enter url parameter for message,Vnesite url parameter za sporočila +apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Pravila za uporabo cene in popust. +apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Ta čas Log v nasprotju s {0} za {1} {2} +apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenik mora biti primerno za nakup ali prodajo +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Datum namestitve ne more biti pred datumom dostave za postavko {0} +DocType: Pricing Rule,Discount on Price List Rate (%),Popust na ceno iz cenika Stopnja (%) +sites/assets/js/form.min.js +279,Start,Začetek +DocType: User,First Name,Ime +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Vaša nastavitev je končana. Osvežujoče. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-plesni litje +DocType: Offer Letter,Select Terms and Conditions,Izberite Pogoji +DocType: Production Planning Tool,Sales Orders,Prodajni Naročila +DocType: Purchase Taxes and Charges,Valuation,Vrednotenje +apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Nastavi kot privzeto +,Purchase Order Trends,Naročilnica Trendi +apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Dodeli liste za leto. +DocType: Earning Type,Earning Type,Zaslužek Type +DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Onemogoči Capacity Planning and Time Tracking +DocType: Bank Reconciliation,Bank Account,Bančni račun +DocType: Leave Type,Allow Negative Balance,Dovoli negativni saldo +DocType: Selling Settings,Default Territory,Privzeto Territory +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizija +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Zarezam +DocType: Production Order Operation,Updated via 'Time Log',Posodobljeno preko "Čas Logu" +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Račun {0} ne pripada družbi {1} +DocType: Naming Series,Series List for this Transaction,Serija Seznam za to transakcijo +DocType: Sales Invoice,Is Opening Entry,Je vstopna odprtina +DocType: Customer Group,Mention if non-standard receivable account applicable,"Omemba če nestandardni terjatve račun, ki se uporablja" +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Za skladišče je pred potreben Submit +DocType: Sales Partner,Reseller,Reseller +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Vnesite Company +DocType: Delivery Note Item,Against Sales Invoice Item,Proti Sales računa Postavka +,Production Orders in Progress,Proizvodna naročila v teku +DocType: Lead,Address & Contact,Naslov in kontakt +apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Naslednja Ponavljajoči {0} se bo ustvaril na {1} +DocType: Newsletter List,Total Subscribers,Skupaj Naročniki +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontaktno ime +DocType: Production Plan Item,SO Pending Qty,SO Do Kol +DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ustvari plačilni list za zgoraj omenjenih kriterijev. +apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zaprosi za nakup. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dvojno ohišje +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application +apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Listi na leto +apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Prosim, nastavite Poimenovanje Series za {0} preko Nastavitev> Nastavitve> za poimenovanje Series" +DocType: Time Log,Will be updated when batched.,"Bo treba posodobiti, če Posodi." +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Vrstica {0}: Prosimo, preverite "Je Advance" proti račun {1}, če je to predujem vnos." +apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Skladišče {0} ne pripada podjetju {1} +DocType: Bulk Email,Message,Sporočilo +DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija +DocType: Dropbox Backup,Dropbox Access Key,Dropbox Dostop Key +DocType: Payment Tool,Reference No,Referenčna številka +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Pustite blokiranih +apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1} +apps/erpnext/erpnext/accounts/utils.py +339,Annual,Letno +DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka +DocType: Stock Entry,Sales Invoice No,Prodaja Račun Ne +DocType: Material Request Item,Min Order Qty,Min naročilo Kol +DocType: Lead,Do Not Contact,Ne Pišite +DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Edinstven ID za sledenje vse ponavljajoče račune. To je ustvarila na oddajte. +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Razvijalec programske opreme +DocType: Item,Minimum Order Qty,Najmanjše naročilo Kol +DocType: Pricing Rule,Supplier Type,Dobavitelj Type +DocType: Item,Publish in Hub,Objavite v Hub +,Terretory,Terretory +apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Postavka {0} je odpovedan +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Material Zahteva +DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum +DocType: Item,Purchase Details,Nakup Podrobnosti +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Postavka {0} ni bilo mogoče najti v "surovin, dobavljenih" mizo v narocilo {1}" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire ščetkanje +DocType: Employee,Relation,Razmerje +DocType: Shipping Rule,Worldwide Shipping,Dostava po celem svetu +apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potrjeni naročila od strank. +DocType: Purchase Receipt Item,Rejected Quantity,Zavrnjeno Količina +DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Polje na voljo na dobavnici, Kotacija, prodajni fakturi, Sales Order" +DocType: SMS Settings,SMS Sender Name,SMS Sender Name +DocType: Contact,Is Primary Contact,Je Primarni Kontakt +DocType: Notification Control,Notification Control,Nadzor obvestilo +DocType: Lead,Suggestions,Predlogi +DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Postavka proračuni Skupina pametno na tem ozemlju. Lahko tudi sezonske z nastavitvijo Distribution. +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Vnesite matično skupino računa za skladišče {0} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plačilo pred {0} {1} ne sme biti večja od neporavnanega zneska {2} +DocType: Supplier,Address HTML,Naslov HTML +DocType: Lead,Mobile No.,Mobilni No. +DocType: Maintenance Schedule,Generate Schedule,Ustvarjajo Urnik +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing +DocType: Purchase Invoice Item,Expense Head,Expense Head +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Prosimo, izberite Charge Vrsta najprej" +apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Zadnje +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 znakov +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Izberite svoj jezik +DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Prvi Leave odobritelj na seznamu, bo nastavljen kot privzeti Leave odobritelja" +DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders. +Operations shall not be tracked against Production Order",Onemogoči oblikovanje časovnih dnevnikov proti proizvodnji naročil. Operacije se ne gosenicami proti Production reda +DocType: Accounts Settings,Settings for Accounts,Nastavitve za račune +apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Upravljanje prodaje oseba drevo. +DocType: Item,Synced With Hub,Sinhronizirano Z Hub +apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Napačno geslo +DocType: Item,Variant Of,Varianta +apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Postavka {0} mora biti storitev Postavka +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Dopolnil Količina ne sme biti večja od "Kol za Izdelava" +DocType: DocType,Administrator,Administrator +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Lasersko vrtanje +DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM +DocType: Period Closing Voucher,Closing Account Head,Zapiranje računa Head +DocType: Employee,External Work History,Zunanji Delo Zgodovina +apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Krožna Reference Error +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Ali res želite STOP +DocType: Communication,Closed,Zaprto +DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Z besedami (izvoz) bo viden, ko boste shranite dobavnici." +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Ali ste prepričani, da želite STOP" +DocType: Lead,Industry,Industrija +DocType: Employee,Job Profile,Job profila +DocType: Newsletter,Newsletter,Newsletter +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hidroformiranjem +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking +DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obvesti po e-pošti na ustvarjanje avtomatičnega Material dogovoru +DocType: Journal Entry,Multi Currency,Multi Valuta +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Točka je posodobljen +DocType: Async Task,System Manager,System Manager +DocType: Payment Reconciliation Invoice,Invoice Type,Račun Type +DocType: Sales Invoice Item,Delivery Note,Poročilo o dostavi +DocType: Dropbox Backup,Allow Dropbox Access,Dovoli Dropbox dostop +apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavitev Davki +apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Začetek Plačilo je bil spremenjen, ko je potegnil. Prosimo, še enkrat vleči." +apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Povzetek za ta teden in ki potekajo dejavnosti +DocType: Workstation,Rent Cost,Najem Stroški +apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Prosimo, izberite mesec in leto" +DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Vnesite email id ločeni z vejicami, bo račun avtomatično poslali na določen datum" +DocType: Employee,Company Email,Družba E-pošta +DocType: GL Entry,Debit Amount in Account Currency,Debetno Znesek v Valuta računa +DocType: Shipping Rule,Valid for Countries,Velja za države +DocType: Workflow State,Refresh,Osveži +DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Vse uvozne polja, povezana kot valuto, konverzijo, uvoz skupaj, uvoz skupni vsoti itd so na voljo v Potrdilo o nakupu, dobavitelj Kotacija, računu o nakupu, narocilo itd" +apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ta postavka je Predloga in je ni mogoče uporabiti v transakcijah. Atributi postavka bodo kopirali več kot v različicah, razen če je nastavljeno "Ne Kopiraj«" +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Skupaj naročite Upoštevani +apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposleni (npr CEO, direktor itd.)" +apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Prosimo, vpišite "Ponovi na dan v mesecu" vrednosti polja" +DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Stopnjo, po kateri je naročnik Valuta pretvori v osnovni valuti kupca" +DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Na voljo v BOM, dobavnica, računu o nakupu, proizvodnje reda, narocilo, Potrdilo o nakupu, prodajni fakturi, Sales Order, Stock vstopu, Timesheet" +DocType: Item Tax,Tax Rate,Davčna stopnja +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Izberite Item +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \ + Stock Reconciliation, instead use Stock Entry","Postavka: {0} je uspelo šaržno, ni mogoče uskladiti z uporabo \ zaloge sprave, namesto tega uporabite zaloge Entry" +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Vrstica # {0}: mora Serija Ne biti enaka kot {1} {2} +apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,"Pretvarjanje, da non-Group" +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Potrdilo o nakupu je treba predložiti +DocType: Stock UOM Replace Utility,Current Stock UOM,Trenutni Stock UOM +apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Serija (lot) postavke. +DocType: C-Form Invoice Detail,Invoice Date,Datum računa +DocType: GL Entry,Debit Amount,Debetne Znesek +apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}" +apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaš email naslov +apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Glej prilogo +DocType: Purchase Order,% Received,% Prejeto +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vodnim curkom +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup Že Complete !! +,Finished Goods,"Končnih izdelkov," +DocType: Delivery Note,Instructions,Navodila +DocType: Quality Inspection,Inspected By,Pregledajo +DocType: Maintenance Visit,Maintenance Type,Vzdrževanje Type +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serijska št {0} ne pripada dobavnica {1} +DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Postavka Inšpekcijski parametrov kakovosti +DocType: Leave Application,Leave Approver Name,Pustite odobritelju Name +,Schedule Date,Urnik Datum +DocType: Packed Item,Packed Item,Pakirani Postavka +apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Privzete nastavitve za nakup poslov. +apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Obstaja Stroški dejavnosti za Employee {0} proti vrsti dejavnosti - {1} +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Prosimo, da ne ustvarjajo računov za kupce in dobavitelje. Ti so ustvarili neposredno od Stranka / dobavitelj mojstrov." +DocType: Currency Exchange,Currency Exchange,Menjalnica +DocType: Purchase Invoice Item,Item Name,Ime izdelka +apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance +DocType: Employee,Widowed,Ovdovela +DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Postavke, ki bodo zahtevana ki so "Razprodan" ob upoštevanju vseh skladišč, ki temelji na predvidenem kol in minimalnega naročila Kol" +DocType: Workstation,Working Hours,Delovni čas +DocType: Naming Series,Change the starting / current sequence number of an existing series.,Spremenite izhodiščni / trenutno število zaporedno obstoječe serije. +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Če je več Rules Cenik še naprej prevladovala, so pozvane, da nastavite Priority ročno za reševanje morebitnih sporov." +,Purchase Register,Nakup Register +DocType: Landed Cost Item,Applicable Charges,Veljavnih cenah +DocType: Workstation,Consumable Cost,Potrošni Stroški +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo "Leave odobritelj" +DocType: Purchase Receipt,Vehicle Date,Datum vozilo +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medical +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog za izgubo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube Nizanje perli +apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zaprt na naslednje datume kot na Holiday Seznam: {0} +DocType: Employee,Single,Samski +DocType: Issue,Attachment,Attachment +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Proračun ni mogoče nastaviti za stroškovno mesto skupine +DocType: Account,Cost of Goods Sold,Nabavna vrednost prodanega blaga +DocType: Purchase Invoice,Yearly,Letni +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Vnesite stroškovni center +DocType: Journal Entry Account,Sales Order,Prodajno naročilo +apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Prodajni tečaj +DocType: Purchase Order,Start date of current order's period,Datum začetka obdobja Trenutni vrstni red je +apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Količina ne more biti del v vrstici {0} +DocType: Purchase Invoice Item,Quantity and Rate,Količina in stopnja +DocType: Delivery Note,% Installed,% Nameščeni +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Prosimo, da najprej vpišete ime podjetja" +DocType: BOM,Item Desription,Postavka Desription +DocType: Purchase Invoice,Supplier Name,Dobavitelj Name +DocType: Account,Is Group,Is Group +DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Samodejno nastavi Serijska št temelji na FIFO +DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Preverite Dobavitelj Številka računa Edinstvenost +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Toplo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Rezanje +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"Da Case No." ne more biti nižja od "Od zadevi št ' +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ni začelo +DocType: Lead,Channel Partner,Channel Partner +DocType: Account,Old Parent,Stara Parent +DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Prilagodite uvodno besedilo, ki gre kot del te e-pošte. Vsaka transakcija ima ločeno uvodno besedilo." +DocType: Sales Taxes and Charges Template,Sales Master Manager,Prodaja Master Manager +apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globalne nastavitve za vseh proizvodnih procesov. +DocType: Accounts Settings,Accounts Frozen Upto,Računi Zamrznjena Stanuje +DocType: SMS Log,Sent On,Pošlje On +apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli +DocType: Sales Order,Not Applicable,Se ne uporablja +apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday gospodar. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell modeliranje +DocType: Material Request Item,Required Date,Zahtevani Datum +DocType: Delivery Note,Billing Address,Naslov za pošiljanje računa +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Vnesite Koda. +DocType: BOM,Costing,Stanejo +DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Če je omogočeno, se bo štela za znesek davka, kot je že vključena v Print Oceni / Print Znesek" +apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Skupaj Kol +DocType: Employee,Health Concerns,Zdravje Zaskrbljenost +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Neplačana +DocType: Packing Slip,From Package No.,Od paketa No. +DocType: Item Attribute,To Range,Da Domet +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrednostne papirje in depozite +DocType: Features Setup,Imports,Uvoz +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lepljenje +DocType: Job Opening,Description of a Job Opening,Opis službo Otvoritev +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,V čakanju na aktivnosti za danes +apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Šivih. +DocType: Bank Reconciliation,Journal Entries,Revija Vnosi +DocType: Sales Order Item,Used for Production Plan,Uporablja se za proizvodnjo načrta +DocType: System Settings,Loading...,Nalaganje ... +DocType: DocField,Password,Geslo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Taljenega modeliranje odlaganje +DocType: Manufacturing Settings,Time Between Operations (in mins),Čas med dejavnostmi (v minutah) +DocType: Customer,Buyer of Goods and Services.,Kupec blaga in storitev. +DocType: Journal Entry,Accounts Payable,Računi se plačuje +apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj naročnikov +sites/assets/js/erpnext.min.js +5,""" does not exists","Ne obstaja +DocType: Pricing Rule,Valid Upto,Valid Stanuje +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki. +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Neposredne dohodkovne +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Filter ne more temeljiti na račun, če je združena s račun" +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Upravni uradnik +DocType: Payment Tool,Received Or Paid,Prejete ali plačane +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Prosimo, izberite Company" +DocType: Stock Entry,Difference Account,Razlika račun +apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Ne more blizu naloga, saj je njena odvisna Naloga {0} ni zaprt." +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva" +DocType: Production Order,Additional Operating Cost,Dodatne operacijski stroškov +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kozmetika +DocType: DocField,Type,Tip +apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov" +DocType: Communication,Subject,Predmet +DocType: Shipping Rule,Net Weight,Neto teža +DocType: Employee,Emergency Phone,Zasilna Telefon +,Serial No Warranty Expiry,Zaporedna številka Garancija preteka +apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Ali res želite STOP tega materiala Zahtevaj? +DocType: Sales Order,To Deliver,Dostaviti +DocType: Purchase Invoice Item,Item,Postavka +DocType: Journal Entry,Difference (Dr - Cr),Razlika (Dr - Cr) +DocType: Account,Profit and Loss,Dobiček in izguba +apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Upravljanje Podizvajalci +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM ne sme biti tipa celo število +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Pohištvo in koledarjev +DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Obrestna mera, po kateri Cenik valuti, se pretvori v osnovni valuti družbe" +apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Račun {0} ne pripada podjetju: {1} +DocType: Selling Settings,Default Customer Group,Privzeta skupina kupcev +DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Če onemogočiti, polje "zaokrožena Skupaj 'ne bo viden v vsakem poslu" +DocType: BOM,Operating Cost,Obratovalni stroški +,Gross Profit,Bruto dobiček +apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Prirastek ne more biti 0 +DocType: Production Planning Tool,Material Requirement,Material Zahteva +DocType: Company,Delete Company Transactions,Izbriši Company transakcije +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Postavka {0} ni Nakup Item +apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \ + Email Address'",{0} je neveljaven e-poštni naslov v "Obvestilo \ e-poštni naslov ' +apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Skupaj plačevanja To leto: +DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / Uredi davkov in dajatev +DocType: Purchase Invoice,Supplier Invoice No,Dobavitelj Račun Ne +DocType: Territory,For reference,Za sklic +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne morem izbrisati Serijska št {0}, saj je uporabljen v transakcijah zalogi" +apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Zapiranje (Cr) +DocType: Serial No,Warranty Period (Days),Garancijski rok (dni) +DocType: Installation Note Item,Installation Note Item,Namestitev Opomba Postavka +,Pending Qty,Pending Kol +DocType: Job Applicant,Thread HTML,Nit HTML +DocType: Company,Ignore,Ignoriraj +apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslan na naslednjih številkah: {0} +apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavitelj Skladišče obvezno za podizvajalcev Potrdilo o nakupu +DocType: Pricing Rule,Valid From,Velja od +DocType: Sales Invoice,Total Commission,Skupaj Komisija +DocType: Pricing Rule,Sales Partner,Prodaja Partner +DocType: Buying Settings,Purchase Receipt Required,Potrdilo o nakupu Obvezno +DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business. + +To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Mesečni Distribution ** vam pomaga pri razporejanju proračuna po mesecih, če imate sezonskost v vašem podjetju. Distribuirati proračun z uporabo te distribucije, nastavite to ** mesečnim izplačilom ** v ** Center stroškov **" +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ni najdenih v tabeli računa zapisov +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Izberite podjetja in Zabava Vrsta najprej +apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finančni / računovodstvo leto. +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Oprostite, Serijska št ni mogoče združiti" +apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Naredite Sales Order +DocType: Project Task,Project Task,Project Task +,Lead Id,Svinec Id +DocType: C-Form Invoice Detail,Grand Total,Skupna vsota +DocType: About Us Settings,Website Manager,Spletna stran Manager +apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskalna Leto Datum začetka ne sme biti večja od poslovnega leta End Datum +DocType: Warranty Claim,Resolution,Ločljivost +apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dobava: {0} +apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Plačljivo račun +DocType: Sales Order,Billing and Delivery Status,Zaračunavanje in Delivery Status +apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Stranke +DocType: Leave Control Panel,Allocate,Dodeli +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Prejšnja +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Prodaja Return +DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Izberite prodajnih nalogov, iz katerega želite ustvariti naročila za proizvodnjo." +apps/erpnext/erpnext/config/hr.py +120,Salary components.,Deli plače. +apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Podatkovna baza potencialnih strank. +apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza podatkov o strankah. +DocType: Quotation,Quotation To,Kotacija Da +DocType: Lead,Middle Income,Bližnji Prihodki +apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Odprtino (Cr) +apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Gimnastika +DocType: Purchase Order Item,Billed Amt,Bremenjenega Amt +DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logično Warehouse, zoper katerega so narejeni vnosov zalog." +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenčna št & Referenčni datum je potrebna za {0} +DocType: Event,Wednesday,Sreda +DocType: Sales Invoice,Customer's Vendor,Prodajalec stranke +apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodnja naročilo je Obvezno +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Predlog Pisanje +apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Obstaja še ena Sales Oseba {0} z enako id zaposlenih +apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativno Stock Error ({6}) za postavko {0} v skladišču {1} na {2} {3} v {4} {5} +DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna Leto Company +DocType: Packing Slip Item,DN Detail,DN Detail +DocType: Time Log,Billed,Zaračunavajo +DocType: Batch,Batch Description,Serija Opis +DocType: Delivery Note,Time at which items were delivered from warehouse,"Čas, v katerem so predmeti dostavijo iz skladišča" +DocType: Sales Invoice,Sales Taxes and Charges,Prodajne Davki in dajatve +DocType: Employee,Organization Profile,Organizacija Profil +apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Prosimo nastavitev številčenje serij za udeležbo preko Setup> oštevilčevanje Series +DocType: Employee,Reason for Resignation,Razlog za odstop +apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Predloga za izvajanje cenitve. +DocType: Payment Reconciliation,Invoice/Journal Entry Details,Račun / Journal Entry Podrobnosti +apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} {1} "ni v proračunskem letu {2} +DocType: Buying Settings,Settings for Buying Module,Nastavitve za nakup modula +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Prosimo, da najprej vnesete Potrdilo o nakupu" +DocType: Buying Settings,Supplier Naming By,Dobavitelj Imenovanje Z +DocType: Activity Type,Default Costing Rate,Privzeto Costing Rate +DocType: Maintenance Schedule,Maintenance Schedule,Vzdrževanje Urnik +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Potem Označevanje cen Pravila se filtrirajo temeljijo na stranke, skupine kupcev, ozemlje, dobavitelja, dobavitelj Type, kampanje, prodajnemu partnerju itd" +apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Prosimo namestite varno shrambo python modul +DocType: Employee,Passport Number,Številka potnega lista +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Od Potrdilo o nakupu +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Enako postavka je bila vpisana večkrat. +DocType: SMS Settings,Receiver Parameter,Sprejemnik Parameter +apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""Na podlagi" in "skupina, ki jo" ne more biti enaka" +DocType: Sales Person,Sales Person Targets,Prodaja Osebni cilji +sites/assets/js/form.min.js +271,To,Če želite +apps/frappe/frappe/templates/base.html +143,Please enter email address,Vnesite e-poštni naslov +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Konec cevarne +DocType: Production Order Operation,In minutes,V minutah +DocType: Issue,Resolution Date,Resolucija Datum +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}" +DocType: Selling Settings,Customer Naming By,Stranka Imenovanje Z +apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pretvarjanje skupini +DocType: Activity Cost,Activity Type,Vrsta dejavnosti +apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Delivered Znesek +DocType: Customer,Fixed Days,Fiksni dnevi +DocType: Sales Invoice,Packing List,Seznam pakiranja +apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Naročila dati dobaviteljev. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Založništvo +DocType: Activity Cost,Projects User,Projekti Uporabnik +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Porabljeno +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ni mogoče najti v računa Podrobnosti tabeli +DocType: Company,Round Off Cost Center,Zaokrožijo stroškovni center +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vzdrževanje obisk {0} je treba odpovedati pred preklicem te Sales Order +DocType: Material Request,Material Transfer,Prenos materialov +apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Odprtje (Dr) +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Napotitev žig mora biti po {0} +apps/frappe/frappe/config/setup.py +59,Settings,Nastavitve +DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Iztovorjeni stroškov Davki in prispevki +DocType: Production Order Operation,Actual Start Time,Actual Start Time +DocType: BOM Operation,Operation Time,Operacija čas +sites/assets/js/list.min.js +5,More,Več +DocType: Pricing Rule,Sales Manager,Vodja prodaje +sites/assets/js/desk.min.js +7673,Rename,Preimenovanje +DocType: Journal Entry,Write Off Amount,Napišite enkratnem znesku +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Upogibanje +apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Dovoli Uporabnik +DocType: Journal Entry,Bill No,Bill Ne +DocType: Purchase Invoice,Quarterly,Četrtletno +DocType: Selling Settings,Delivery Note Required,Dostava Opomba Obvezno +DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (družba Valuta) +DocType: Manufacturing Settings,Backflush Raw Materials Based On,"Backflush Surovine, ki temelji na" +apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosimo, vnesite podatke točko" +DocType: Purchase Receipt,Other Details,Drugi podatki +DocType: Account,Accounts,Računi +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Trženje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Naravnost striženje +DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Slediti element pri prodaji in nakupu listin, ki temelji na njihovih serijskih nos. To je mogoče uporabiti tudi za sledenje podrobnosti garancijske izdelka." +DocType: Purchase Receipt Item Supplied,Current Stock,Trenutna zaloga +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Zavrnjeno Skladišče je obvezna proti regected postavki +DocType: Account,Expenses Included In Valuation,Stroški Vključeno v vrednotenju +DocType: Employee,Provide email id registered in company,"Zagotovite email id, registrirano v družbi" +DocType: Hub Settings,Seller City,Prodajalec Mesto +DocType: Email Digest,Next email will be sent on:,Naslednje sporočilo bo poslano na: +DocType: Offer Letter Term,Offer Letter Term,Pisna ponudba Term +apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Element ima variante. +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Postavka {0} ni bilo mogoče najti +DocType: Bin,Stock Value,Stock Value +apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type +DocType: BOM Explosion Item,Qty Consumed Per Unit,Količina porabljene na enoto +DocType: Serial No,Warranty Expiry Date,Garancija Datum preteka +DocType: Material Request Item,Quantity and Warehouse,Količina in skladišča +DocType: Sales Invoice,Commission Rate (%),Komisija Stopnja (%) +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Proti bon mora Vrsta biti eden od prodaje reda, Sales računa ali list Začetek" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining +apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Ni mogoče najti tečaja +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Dobrodošli +DocType: Journal Entry,Credit Card Entry,Začetek Credit Card +apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Naloga Predmet +apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,"Blago, prejetih od dobaviteljev." +DocType: Communication,Open,Odpri +DocType: Lead,Campaign Name,Ime kampanje +,Reserved,Rezervirano +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Ali res želite Odčepiti +DocType: Purchase Order,Supply Raw Materials,Oskrba z Surovine +DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, na katerega se bo ustvarila naslednji račun. To je ustvarila na oddajte." +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Kratkoročna sredstva +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} ni zaloge Item +DocType: Mode of Payment Account,Default Account,Privzeti račun +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Svinec je treba določiti, če je priložnost narejen iz svinca" +DocType: Contact Us Settings,Address Title,Naslov Naslov +apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Prosimo, izberite tedensko off dan" +DocType: Production Order Operation,Planned End Time,Načrtovano Končni čas +,Sales Person Target Variance Item Group-Wise,Prodaja Oseba Target Varianca Postavka Group-Wise +DocType: Dropbox Backup,Daily,Daily +apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Račun z obstoječim poslom ni mogoče pretvoriti v knjigo terjatev +DocType: Delivery Note,Customer's Purchase Order No,Stranke Naročilo Ne +DocType: Employee,Cell Number,Število celic +apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v "Proti listu vstopa" stolpcu" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energy +DocType: Opportunity,Opportunity From,Priložnost Od +apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mesečno poročilo o izplačanih plačah. +DocType: Item Group,Website Specifications,Spletna Specifikacije +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nov račun +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} tipa {1} +apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Vknjižbe se lahko izvede pred listnimi vozlišč. Vpisi zoper skupin niso dovoljeni. +DocType: ToDo,High,Visoka +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne more izključiti ali preklicati BOM saj je povezan z drugimi BOMs +DocType: Opportunity,Maintenance,Vzdrževanje +DocType: User,Male,Moški +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Potrdilo o nakupu številka potreben za postavko {0} +DocType: Item Attribute Value,Item Attribute Value,Postavka Lastnost Vrednost +apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodajne akcije. +DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc. + +#### Note + +The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master. + +#### Description of Columns + +1. Calculation Type: + - This can be on **Net Total** (that is the sum of basic amount). + - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total. + - **Actual** (as mentioned). +2. Account Head: The Account ledger under which this tax will be booked +3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center. +4. Description: Description of the tax (that will be printed in invoices / quotes). +5. Rate: Tax rate. +6. Amount: Tax amount. +7. Total: Cumulative total to this point. +8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row). +9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standardna davčna predlogo, ki se lahko uporablja za vse prodajne transakcije. To predlogo lahko vsebuje seznam davčnih glavami in tudi druge glave strošek / dohodki, kot so "Shipping", "zavarovanje", "Ravnanje" itd #### Opomba davčno stopnjo, ki jo določite tu bo standard davčna stopnja za vse ** Postavke **. Če obstajajo ** Items **, ki imajo različne stopnje, ki jih je treba dodati v ** Element davku ** miza v ** Element ** mojstra. #### Opis Stolpci 1. Vrsta Izračun: - To je lahko na ** Net Total ** (to je vsota osnovnega zneska). - ** Na prejšnje vrstice Total / Znesek ** (za kumulativnih davkov ali dajatev). Če izberete to možnost, bo davek treba uporabiti kot odstotek prejšnje vrstice (davčne tabele) znesek ali skupaj. - ** Dejanska ** (kot je omenjeno). 2. Račun Head: The knjiga račun, pod katerimi se bodo rezervirana ta davek 3. stroškovni center: Če davek / pristojbina je prihodek (kot ladijski promet) ali odhodek je treba rezervirana proti centru stroškov. 4. Opis: Opis davka (bo, da se natisne v faktur / narekovajev). 5. stopnja: Davčna stopnja. 6. Znesek: Davčna znesek. 7. Skupaj: Kumulativno do te točke. 8. Vnesite Row: Če je na osnovi "Prejšnji Row Total" lahko izberete številko vrstice, ki bo sprejet kot osnova za ta izračun (privzeta je prejšnja vrstica). 9. Ali je to DDV vključen v osnovni stopnji ?: Če preverite to, to pomeni, da ta davek ne bo prikazan pod tabelo postavk, vendar bodo vključeni v osnovne stopnje v svoji glavni element tabele. To je uporabno, kadar želite dati ravno ceno (vključno z vsemi davki) ceno za kupce." +DocType: Employee,Bank A/C No.,Bank A / C No. +DocType: Expense Claim,Project,Project +DocType: Quality Inspection Reading,Reading 7,Branje 7 +DocType: Address,Personal,Osebni +DocType: Expense Claim Detail,Expense Claim Type,Expense Zahtevek Type +DocType: Shopping Cart Settings,Default settings for Shopping Cart,Privzete nastavitve za Košarica +apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} je povezano proti odredbi {1}, preverite, če je treba potegniti kot vnaprej v tem računu." +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnologija +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Pisarniška Vzdrževanje Stroški +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Prosimo, da najprej vnesete artikel" +DocType: Account,Liability,Odgovornost +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}. +DocType: Company,Default Cost of Goods Sold Account,Privzeto Nabavna vrednost prodanega blaga račun +apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Cenik ni izbrana +DocType: Employee,Family Background,Družina Ozadje +DocType: Process Payroll,Send Email,Pošlji e-pošto +apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ne Dovoljenje +DocType: Company,Default Bank Account,Privzeto bančnega računa +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Za filtriranje, ki temelji na stranke, da izberete Party Vnesite prvi" +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},""Update Stock", ni mogoče preveriti, ker so predmeti, ki niso dostavljena prek {0}" +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos +DocType: Item,Items with higher weightage will be shown higher,Postavke z višjo weightage bo prikazan višje +DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Sprava Detail +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moji računi +apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Najdenih ni delavec +DocType: Purchase Order,Stopped,Ustavljen +DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca +apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Izberite BOM začeti +DocType: SMS Center,All Customer Contact,Vse Customer Contact +apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Naloži zaloge ravnovesje preko CSV. +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošlji Zdaj +,Support Analytics,Podpora Analytics +DocType: Item,Website Warehouse,Spletna stran Skladišče +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Ali res želite ustaviti proizvodnjo red: +DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dan v mesecu, v katerem se bo samodejno Račun ustvarjen na primer 05, 28, itd" +apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultat mora biti manjša od ali enaka 5 +apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Zapisi C-Form +apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Kupec in dobavitelj +DocType: Email Digest,Email Digest Settings,E-pošta Digest Nastavitve +apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Podpora poizvedbe strank. +DocType: Features Setup,"To enable ""Point of Sale"" features",Da bi omogočili "prodajno mesto" funkcije +DocType: Bin,Moving Average Rate,Moving Average Rate +DocType: Production Planning Tool,Select Items,Izberite Items +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} proti Bill {1} ​​dne {2} +DocType: Comment,Reference Name,Referenca Ime +DocType: Maintenance Visit,Completion Status,Zaključek Status +DocType: Sales Invoice Item,Target Warehouse,Ciljna Skladišče +DocType: Item,Allow over delivery or receipt upto this percent,Dovoli nad dostavo ali prejem upto tem odstotkov +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Pričakuje Dostava datum ne more biti pred Sales Order Datum +DocType: Upload Attendance,Import Attendance,Uvoz Udeležba +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Vse Postavka Skupine +DocType: Process Payroll,Activity Log,Dnevnik aktivnosti +apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Čisti dobiček / izguba +apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Samodejno sestavite sporočilo o predložitvi transakcij. +DocType: Production Order,Item To Manufacture,Postavka za izdelavo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Kalup za vlivanje +apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Nakup naročila do plačila +DocType: Sales Order Item,Projected Qty,Predvidoma Kol +DocType: Sales Invoice,Payment Due Date,Plačilo Zaradi Datum +DocType: Newsletter,Newsletter Manager,Newsletter Manager +apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi +apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"Odpiranje" +DocType: Notification Control,Delivery Note Message,Dostava Opomba Sporočilo +DocType: Expense Claim,Expenses,Stroški +DocType: Item Variant Attribute,Item Variant Attribute,Postavka Variant Lastnost +,Purchase Receipt Trends,Nakup Prejem Trendi +DocType: Appraisal,Select template from which you want to get the Goals,"Izberite predlogo, iz katere želite, da bi dobili tisočletja" +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Raziskave in razvoj +,Amount to Bill,Znesek za Bill +DocType: Company,Registration Details,Registracija Podrobnosti +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Upravičuje +DocType: Item,Re-Order Qty,Ponovno naročila Kol +DocType: Leave Block List Date,Leave Block List Date,Pustite Block List Datum +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Načrtovano poslati {0} +DocType: Pricing Rule,Price or Discount,Cena ali Popust +DocType: Sales Team,Incentives,Spodbude +DocType: SMS Log,Requested Numbers,Zahtevane številke +apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Cenitev uspešnosti. +DocType: Sales Invoice Item,Stock Details,Stock Podrobnosti +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Value +apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Prodajno mesto +apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},"Ne morejo opravljati naprej, {0}" +apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje na računu že v kreditu, ki vam ni dovoljeno, da nastavite "Stanje mora biti" kot "bremenitev"" +DocType: Account,Balance must be,Ravnotežju mora biti +DocType: Hub Settings,Publish Pricing,Objavite Pricing +DocType: Notification Control,Expense Claim Rejected Message,Expense zahtevek zavrnjen Sporočilo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Žeblji +,Available Qty,Na voljo Količina +DocType: Purchase Taxes and Charges,On Previous Row Total,Na prejšnje vrstice Skupaj +DocType: Salary Slip,Working Days,Delovni dnevi +DocType: Serial No,Incoming Rate,Dohodni Rate +DocType: Packing Slip,Gross Weight,Bruto Teža +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Ime vašega podjetja, za katero ste vzpostavitvijo tega sistema." +DocType: HR Settings,Include holidays in Total no. of Working Days,Vključi počitnice v Total no. delovnih dni +DocType: Job Applicant,Hold,Držite +DocType: Employee,Date of Joining,Datum pridružitve +DocType: Naming Series,Update Series,Posodobitev Series +DocType: Supplier Quotation,Is Subcontracted,Je v podizvajanje +DocType: Item Attribute,Item Attribute Values,Postavka Lastnost Vrednote +apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Poglej Naročniki +DocType: Purchase Invoice Item,Purchase Receipt,Potrdilo o nakupu +,Received Items To Be Billed,Prejete Postavke placevali +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrazivnega sredstva +sites/assets/js/desk.min.js +3938,Ms,gospa +apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Menjalnega tečaja valute gospodar. +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Ni mogoče najti terminu v naslednjih {0} dni za delovanje {1} +DocType: Production Order,Plan material for sub-assemblies,Plan material za sklope +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} mora biti aktiven +apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Prosimo, najprej izberite vrsto dokumenta" +apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Preklic Material Obiski {0} pred preklicem to vzdrževanje obisk +DocType: Salary Slip,Leave Encashment Amount,Pustite unovčitve Znesek +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijska št {0} ne pripada postavki {1} +DocType: Purchase Receipt Item Supplied,Required Qty,Zahtevani Kol +DocType: Bank Reconciliation,Total Amount,Skupni znesek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Založništvo +DocType: Production Planning Tool,Production Orders,Proizvodne Naročila +apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Vrednost +apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodaja Cenik +apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavite sinhronizirati elemente +DocType: GL Entry,Account Currency,Valuta računa +apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Navedite zaokrožijo račun v družbi +DocType: Purchase Receipt,Range,Razpon +DocType: Supplier,Default Payable Accounts,Privzete plačuje računov +apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja +DocType: Features Setup,Item Barcode,Postavka Barcode +apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Postavka Variante {0} posodobljen +DocType: Quality Inspection Reading,Reading 6,Branje 6 +DocType: Purchase Invoice Advance,Purchase Invoice Advance,Nakup računa Advance +DocType: Address,Shop,Trgovina +DocType: Hub Settings,Sync Now,Sync Now +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Vrstica {0}: Credit vnos ni mogoče povezati z {1} +DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Privzeto Bank / Cash račun bo samodejno posodobi v POS računa, ko je izbrana ta način." +DocType: Employee,Permanent Address Is,Stalni naslov je +DocType: Production Order Operation,Operation completed for how many finished goods?,"Operacija zaključena, za koliko končnih izdelkov?" +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand +apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Dodatek za prekomerno {0} prečkal za postavko {1}. +DocType: Employee,Exit Interview Details,Exit Intervju Podrobnosti +DocType: Item,Is Purchase Item,Je Nakup Postavka +DocType: Journal Entry Account,Purchase Invoice,Nakup Račun +DocType: Stock Ledger Entry,Voucher Detail No,Bon Detail Ne +DocType: Stock Entry,Total Outgoing Value,Skupaj Odhodni Vrednost +DocType: Lead,Request for Information,Zahteva za informacije +DocType: Payment Tool,Paid,Plačan +DocType: Salary Slip,Total in words,Skupaj z besedami +DocType: Material Request Item,Lead Time Date,Lead Time Datum +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Vrstica # {0}: Navedite Zaporedna številka za postavko {1} +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Za "izdelek Bundle 'predmetov, skladišče, serijska številka in serijska se ne šteje od" seznam vsebine "mizo. Če so skladišča in serija ni enaka za vso embalažo postavke za kakršno koli "izdelek Bundle 'postavko, lahko te vrednosti je treba vnesti v glavnem Element tabele, bodo vrednosti, ki se kopira na" seznam vsebine "mizo." +apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Pošiljke strankam. +DocType: Purchase Invoice Item,Purchase Order Item,Naročilnica item +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Posredna Prihodki +DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Nastavite Znesek plačila = neporavnanega zneska +DocType: Contact Us Settings,Address Line 1,Naslov Line 1 +apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variance +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ime podjetja +DocType: SMS Center,Total Message(s),Skupaj sporočil (-i) +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Izberite Postavka za prenos +DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izberite račun vodja banke, kjer je bila deponirana pregled." +DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Dovoli uporabniku, da uredite Cenik Ocenite v transakcijah" +DocType: Pricing Rule,Max Qty,Max Kol +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Vrstica {0}: morala Plačilo proti prodaja / narocilo vedno označen kot vnaprej +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemical +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Vsi predmeti so že prenesli za to Production Order. +DocType: Process Payroll,Select Payroll Year and Month,Izberite Payroll leto in mesec +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pojdi na ustrezno skupino (običajno uporabo sredstev> obratnih sredstev> bančnih računov in ustvarite nov račun (s klikom na Dodaj Child) tipa "banka" +DocType: Workstation,Electricity Cost,Stroški električne energije +DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pošiljajte zaposlenih rojstnodnevnih opomnikov +DocType: Comment,Unsubscribed,Odjavljeni +DocType: Opportunity,Walk In,Vstopiti +DocType: Item,Inspection Criteria,Merila Inšpekcijske +apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Drevo finanial centrov stalo. +apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenese +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje). +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bela +DocType: SMS Center,All Lead (Open),Vse Lead (Open) +DocType: Purchase Invoice,Get Advances Paid,Get plačanih predplačil +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Priložite svojo sliko +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Poskrbite +DocType: Journal Entry,Total Amount in Words,Skupni znesek v besedi +DocType: Workflow State,Stop,Stop +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Prišlo je do napake. Eden verjeten razlog je lahko, da niste shranili obrazec. Obrnite support@erpnext.com če je težava odpravljena." +apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Košarica +apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Sklep Tip mora biti eden od {0} +DocType: Lead,Next Contact Date,Naslednja Stik Datum +apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Odpiranje Količina +DocType: Holiday List,Holiday List Name,Ime Holiday Seznam +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Delniških opcij +DocType: Journal Entry Account,Expense Claim,Expense zahtevek +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Količina za {0} +DocType: Leave Application,Leave Application,Zapusti Application +apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Pustite Orodje razdelitve emisijskih +DocType: Leave Block List,Leave Block List Dates,Pustite Block List termini +DocType: Company,If Monthly Budget Exceeded (for expense account),Če Mesečni proračun Presežena (za odhodek račun) +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Obrezovanje +DocType: Workstation,Net Hour Rate,Neto urna postavka +DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Pristali Stroški Potrdilo o nakupu +DocType: Company,Default Terms,Privzete Pogoji +DocType: Packing Slip Item,Packing Slip Item,Pakiranje Slip Postavka +DocType: POS Profile,Cash/Bank Account,Gotovina / bančni račun +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti. +DocType: Delivery Note,Delivery To,Dostava +apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Lastnost miza je obvezna +DocType: Production Planning Tool,Get Sales Orders,Pridobite prodajnih nalogov +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne more biti negativna +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Vložitev +apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Popust +DocType: Features Setup,Purchase Discounts,Odkupne Popusti +DocType: Workstation,Wages,Plače +DocType: Time Log,Will be updated only if Time Log is 'Billable',"Bo treba posodobiti le, če je čas Prijava je "Odgovorni"" +DocType: Project,Internal,Notranja +DocType: Task,Urgent,Nujna +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Navedite veljavno Row ID za vrstico {0} v tabeli {1} +DocType: Item,Manufacturer,Proizvajalec +DocType: Landed Cost Item,Purchase Receipt Item,Potrdilo o nakupu Postavka +DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse v Sales Order / dokončanih proizvodov Warehouse +apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Prodajni Znesek +apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Čas Dnevniki +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ste Expense odobritelj za ta zapis. Prosimo Posodobite "status" in Shrani +DocType: Serial No,Creation Document No,Za ustvarjanje dokumentov ni +DocType: Issue,Issue,Težava +apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za postavko variant. primer velikost, barvo itd" +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Skladišče +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijska št {0} je pod vzdrževalne pogodbe stanuje {1} +DocType: BOM Operation,Operation,Delovanje +DocType: Lead,Organization Name,Organization Name +DocType: Tax Rule,Shipping State,Dostava država +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Postavka je treba dodati uporabo "dobili predmetov iz nakupu prejemki" gumb +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajna Stroški +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardna Nakup +DocType: GL Entry,Against,Proti +DocType: Item,Default Selling Cost Center,Privzeto Center Prodajni Stroški +DocType: Sales Partner,Implementation Partner,Izvajanje Partner +DocType: Opportunity,Contact Info,Contact Info +apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Izdelava Zaloga Entries +DocType: Packing Slip,Net Weight UOM,Neto teža UOM +DocType: Item,Default Supplier,Privzeto Dobavitelj +DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjo dodatku Odstotek +DocType: Shipping Rule Condition,Shipping Rule Condition,Dostava Pravilo Pogoj +DocType: Features Setup,Miscelleneous,Miscelleneous +DocType: Holiday List,Get Weekly Off Dates,Get Tedenski datumov +apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Končni datum ne sme biti manj kot začetni dan +DocType: Sales Person,Select company name first.,Izberite ime podjetja prvič. +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr +apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citati, prejetih od dobaviteljev." +apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Za {0} | {1} {2} +DocType: Time Log Batch,updated via Time Logs,posodablja preko Čas Dnevniki +apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Povprečna starost +DocType: Opportunity,Your sales person who will contact the customer in future,"Vaš prodajni oseba, ki bo stopil v stik v prihodnosti" +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Naštejte nekaj vaših dobaviteljev. Ti bi se lahko organizacije ali posamezniki. +DocType: Company,Default Currency,Privzeta valuta +DocType: Contact,Enter designation of this Contact,Vnesite poimenovanje te Kontakt +DocType: Contact Us Settings,Address,Naslov +DocType: Expense Claim,From Employee,Od zaposlenega +apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Opozorilo: Sistem ne bo preveril previsokih saj znesek za postavko {0} v {1} je nič +DocType: Journal Entry,Make Difference Entry,Naredite Razlika Entry +DocType: Upload Attendance,Attendance From Date,Udeležba Od datuma +DocType: Appraisal Template Goal,Key Performance Area,Key Uspešnost Area +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Prevoz +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,in leto: +DocType: Email Digest,Annual Expense,Letno Expense +DocType: SMS Center,Total Characters,Skupaj Znaki +apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Prosimo, izberite BOM BOM v polju za postavko {0}" +DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Račun Detail +DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Plačilo Sprava Račun +apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Prispevek% +DocType: Item,website page link,spletna stran link +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Oglejmo pripraviti sistem za prvo uporabo. +DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registracija podjetja številke za vaše reference. Davčne številke itd +DocType: Sales Partner,Distributor,Distributer +DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Pravilo +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja naročite {0} je treba preklicati pred preklicem te Sales Order +,Ordered Items To Be Billed,Naročeno Postavke placevali +apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od mora biti manj Razpon kot gibala +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Izberite Time Dnevniki in predložiti ustvariti nov prodajni fakturi. +DocType: Global Defaults,Global Defaults,Globalni Privzeto +DocType: Salary Slip,Deductions,Odbitki +DocType: Purchase Invoice,Start date of current invoice's period,Datum začetka obdobja sedanje faktura je +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Serija je bila zaračunavajo. +apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Ustvarite priložnost +DocType: Salary Slip,Leave Without Pay,Leave brez plačila +DocType: Supplier,Communications,Communications +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapaciteta Napaka Načrtovanje +,Trial Balance for Party,Trial Balance za stranke +DocType: Lead,Consultant,Svetovalec +DocType: Salary Slip,Earnings,Zaslužek +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Končano Postavka {0} je treba vpisati za vpis tipa Proizvodnja +apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Odpiranje Računovodstvo Bilanca +DocType: Sales Invoice Advance,Sales Invoice Advance,Prodaja Račun Advance +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nič zahtevati +apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"Dejanski datum začetka" ne more biti večja od "dejanskim koncem Datum" +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Vodstvo +apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Vrste dejavnosti za delo in odhodov +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Litja +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Bodisi debetna ali kreditna znesek je potreben za {0} +DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bo dodan Točka Kodeksa variante. Na primer, če je vaša kratica je "SM", in oznaka postavka je "T-shirt", postavka koda varianto bo "T-SHIRT-SM"" +DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (z besedami), bo viden, ko boste shranite plačilnega lista." +apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Active +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blue +DocType: Purchase Invoice,Is Return,Je Return +DocType: Price List Country,Price List Country,Cenik Država +apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Nadaljnje vozlišča lahko ustvari samo na podlagi tipa vozlišča "skupina" +DocType: Item,UOMs,UOMs +apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} veljavna serijski nos za postavko {1} +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Oznaka se ne more spremeniti za Serial No. +apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} že ustvarili za uporabnika: {1} in podjetje {2} +DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor +DocType: Stock Settings,Default Item Group,Privzeto Element Group +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lepljeno objekt za proizvodnjo +apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Dobavitelj baze podatkov. +DocType: Account,Balance Sheet,Bilanca stanja +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika " +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Natezno preoblikovanje +DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Vaš prodajni oseba bo dobil opomin na ta dan, da se obrnete na stranko" +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Nadaljnje računi se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin" +apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Davčna in drugi odbitki plače. +DocType: Lead,Lead,Svinec +DocType: Email Digest,Payables,Obveznosti +DocType: Account,Warehouse,Skladišče +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj +,Purchase Order Items To Be Billed,Naročilnica Postavke placevali +DocType: Purchase Invoice Item,Net Rate,Net Rate +DocType: Purchase Invoice Item,Purchase Invoice Item,Nakup računa item +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Zaloga Glavna knjiga Prijave in GL Vnosi se oglaša za izbrane Nakup Prejemki +apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Postavka 1 +DocType: Holiday,Holiday,Počitnice +DocType: Event,Saturday,Sobota +DocType: Leave Control Panel,Leave blank if considered for all branches,"Pustite prazno, če velja za vse veje" +,Daily Time Log Summary,Dnevni Povzetek Čas Log +DocType: DocField,Label,Label +DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Plačilni Podrobnosti +DocType: Global Defaults,Current Fiscal Year,Tekočem proračunskem letu +DocType: Global Defaults,Disable Rounded Total,Onemogoči Zaobljeni Skupaj +DocType: Lead,Call,Call +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"Navedbe" ne more biti prazna +apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dvojnik vrstica {0} z enako {1} +,Trial Balance,Trial Balance +apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Postavitev Zaposleni +sites/assets/js/erpnext.min.js +5,"Grid """,Mreža " +apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosimo, izberite predpono najprej" +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Raziskave +DocType: Maintenance Visit Purpose,Work Done,Delo končano +apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Prosimo navedite vsaj en atribut v tabeli Atributi +DocType: Contact,User ID,Uporabniško ime +DocType: Communication,Sent,Pošlje +apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ogled Ledger +DocType: File,Lft,LFT +apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša +apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element" +DocType: Communication,Delivery Status,Dostava Status +DocType: Production Order,Manufacture against Sales Order,Izdelava zoper Sales Order +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Ostali svet +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postavki {0} ne more imeti Batch +,Budget Variance Report,Proračun Varianca Poročilo +DocType: Salary Slip,Gross Pay,Bruto Pay +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Plačane dividende +DocType: Stock Reconciliation,Difference Amount,Razlika Znesek +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Preneseni čisti poslovni izid +DocType: BOM Item,Item Description,Postavka Opis +DocType: Payment Tool,Payment Mode,Način Plačilo +DocType: Purchase Invoice,Is Recurring,Je Ponavljajoči +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Neposrednega laserskega sintranja kovinskih +DocType: Purchase Order,Supplied Items,Priložena Items +DocType: Production Order,Qty To Manufacture,Količina za izdelavo +DocType: Buying Settings,Maintain same rate throughout purchase cycle,Ohraniti enako stopnjo celotni nabavni cikel +DocType: Opportunity Item,Opportunity Item,Priložnost Postavka +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Začasna Otvoritev +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling +,Employee Leave Balance,Zaposleni Leave Balance +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},"Saldo račun {0}, morajo biti vedno {1}" +DocType: Address,Address Type,Naslov Type +DocType: Purchase Receipt,Rejected Warehouse,Zavrnjeno Skladišče +DocType: GL Entry,Against Voucher,Proti Voucher +DocType: Item,Default Buying Cost Center,Privzeto Center nakupovanje Stroški +apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Postavka {0} mora biti Sales postavka +DocType: Item,Lead Time in days,Svinec čas v dnevih +,Accounts Payable Summary,Računi plačljivo Povzetek +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Ne smejo urejati zamrznjeni račun {0} +DocType: Journal Entry,Get Outstanding Invoices,Pridobite neplačanih računov +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ni veljaven +apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni" +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Majhno +DocType: Employee,Employee Number,Število zaposlenih +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Zadeva št (y) že v uporabi. Poskusite z zadevo št {0} +,Invoiced Amount (Exculsive Tax),Obračunani znesek (Exculsive Tax) +apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Postavka 2 +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Glava račun {0} ustvaril +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Green +DocType: Item,Auto re-order,Auto re-order +apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Skupaj Doseženi +DocType: Employee,Place of Issue,Kraj izdaje +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Naročilo +DocType: Report,Disabled,Onemogočeno +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},"UOM coversion dejavnik, potreben za UOM: {0} v postavki: {1}" +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Posredni stroški +apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Vrstica {0}: Kol je obvezna +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Kmetijstvo +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Svoje izdelke ali storitve +DocType: Mode of Payment,Mode of Payment,Način plačila +apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"To je skupina, root element in ga ni mogoče urejati." +DocType: Journal Entry Account,Purchase Order,Naročilnica +DocType: Warehouse,Warehouse Contact Info,Skladišče Kontakt Info +sites/assets/js/form.min.js +190,Name is required,Zahtevano je ime +DocType: Purchase Invoice,Recurring Type,Ponavljajoči Type +DocType: Address,City/Town,Mesto / Kraj +DocType: Email Digest,Annual Income,Letni dohodek +DocType: Serial No,Serial No Details,Serijska št Podrobnosti +DocType: Purchase Invoice Item,Item Tax Rate,Postavka Davčna stopnja +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika" +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila +apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalski Oprema +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cen Pravilo je najprej treba izbrati glede na "Uporabi On 'polju, ki je lahko točka, točka Group ali Brand." +DocType: Hub Settings,Seller Website,Prodajalec Spletna stran +apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Skupna dodeljena odstotek za prodajne ekipe mora biti 100 +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status proizvodnja Sklep je {0} +DocType: Appraisal Goal,Goal,Cilj +DocType: Sales Invoice Item,Edit Description,Uredi Opis +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Pričakuje Dobavni rok je manj od načrtovanega začetni datum. +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Za dobavitelja +DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavitev Vrsta računa pomaga pri izbiri ta račun v transakcijah. +DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (družba Valuta) +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Skupaj Odhodni +apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Obstaja lahko samo en prevoz pravilo Pogoj z 0 ali prazno vrednost za "ceniti" +DocType: Authorization Rule,Transaction,Posel +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Opomba: Ta Stroški Center je skupina. Ne more vknjižbe proti skupinam. +apps/erpnext/erpnext/config/projects.py +43,Tools,Orodja +DocType: Item,Website Item Groups,Spletna stran Element Skupine +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Število proizvodnja naročilo je obvezna za izdelavo vstopne stock namena +DocType: Purchase Invoice,Total (Company Currency),Skupaj (družba Valuta) +apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Serijska številka {0} je začela več kot enkrat +DocType: Journal Entry,Journal Entry,Vnos v dnevnik +DocType: Workstation,Workstation Name,Workstation Name +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest: +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1} +DocType: Sales Partner,Target Distribution,Target Distribution +sites/assets/js/desk.min.js +7652,Comments,Komentarji +DocType: Salary Slip,Bank Account No.,Bančni račun No. +DocType: Naming Series,This is the number of the last created transaction with this prefix,To je številka zadnjega ustvarjene transakcijo s tem predpono +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Oceni Vrednotenje potreben za postavko {0} +DocType: Quality Inspection Reading,Reading 8,Branje 8 +DocType: Sales Partner,Agent,Agent +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Skupno {0} za vse postavke je nič, morda bi morali spremeniti "Razdeli pristojbin na podlagi"" +DocType: Purchase Invoice,Taxes and Charges Calculation,Davki in dajatve Izračun +DocType: BOM Operation,Workstation,Workstation +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Strojna oprema +DocType: Attendance,HR Manager,HR Manager +apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Prosimo izberite Company +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Zapusti +DocType: Purchase Invoice,Supplier Invoice Date,Dobavitelj Datum računa +apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Morate omogočiti Košarica +sites/assets/js/form.min.js +212,No Data,Ni podatkov +DocType: Appraisal Template Goal,Appraisal Template Goal,Cenitev Predloga cilj +DocType: Salary Slip,Earning,Služenje +DocType: Payment Tool,Party Account Currency,Party Valuta računa +,BOM Browser,BOM Browser +DocType: Purchase Taxes and Charges,Add or Deduct,Dodajte ali odštejemo +DocType: Company,If Yearly Budget Exceeded (for expense account),Če Letni proračun Presežena (za odhodek račun) +apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Prekrivajoča pogoji najdemo med: +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Proti listu Začetek {0} je že prilagojena proti neki drugi kupon +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Skupna vrednost naročila +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Hrana +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Staranje Območje 3 +apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,"Lahko naredite časovni dnevnik le zoper predložene proizvodnje, da bi" +DocType: Maintenance Schedule Item,No of Visits,Število obiskov +DocType: File,old_parent,old_parent +apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Glasila do stikov, vodi." +apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Seštevek točk za vseh ciljev bi morala biti 100. To je {0} +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacije ne sme ostati prazen. +,Delivered Items To Be Billed,Dobavljeni artikli placevali +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladišče ni mogoče spremeniti za Serial No. +apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status posodobljen na {0} +DocType: DocField,Description,Opis +DocType: Authorization Rule,Average Discount,Povprečen Popust +DocType: Letter Head,Is Default,Je Privzeto +DocType: Address,Utilities,Utilities +DocType: Purchase Invoice Item,Accounting,Računovodstvo +DocType: Features Setup,Features Setup,Značilnosti Setup +apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Ogled Ponudba Letter +DocType: Communication,Communication,Sporočilo +DocType: Item,Is Service Item,Je Service Postavka +DocType: Activity Cost,Projects,Projekti +apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Prosimo, izberite poslovno leto" +apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2} +DocType: BOM Operation,Operation Description,Operacija Opis +DocType: Item,Will also apply to variants,Bo veljalo tudi za variante +apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Ne more spremeniti poslovno leto začetni datum in fiskalnem letu End Datum, ko je poslovno leto shranjen." +DocType: Quotation,Shopping Cart,Nakupovalni voziček +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odhodni +DocType: Pricing Rule,Campaign,Kampanja +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Stanje odobritve mora biti "Approved" ali "Zavrnjeno" +DocType: Purchase Invoice,Contact Person,Kontaktna oseba +apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"Pričakovani datum začetka" ne more biti večja od "Pričakovan End Date" +DocType: Holiday List,Holidays,Počitnice +DocType: Sales Order Item,Planned Quantity,Načrtovana Količina +DocType: Purchase Invoice Item,Item Tax Amount,Postavka Znesek davka +DocType: Item,Maintain Stock,Ohraniti park +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zaloga Vpisi že ustvarjene za proizvodnjo red +DocType: Leave Control Panel,Leave blank if considered for all designations,"Pustite prazno, če velja za vse označb" +apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip "Dejanski" v vrstici {0} ni mogoče vključiti v postavko Rate +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} +apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime +DocType: Email Digest,For Company,Za podjetja +apps/erpnext/erpnext/config/support.py +38,Communication log.,Sporočilo dnevnik. +apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Odkup Znesek +DocType: Sales Invoice,Shipping Address Name,Dostava Naslov Name +apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontnem +DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne more biti večja kot 100 +apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Postavka {0} ni zaloge Item +DocType: Maintenance Visit,Unscheduled,Nenačrtovana +DocType: Employee,Owned,Lasti +DocType: Salary Slip Deduction,Depends on Leave Without Pay,Odvisno od dopusta brez plačila +DocType: Pricing Rule,"Higher the number, higher the priority","Višja kot je številka, višja je prioriteta" +,Purchase Invoice Trends,Račun za nakup Trendi +DocType: Employee,Better Prospects,Boljši obeti +DocType: Appraisal,Goals,Cilji +DocType: Warranty Claim,Warranty / AMC Status,Garancija / AMC Status +,Accounts Browser,Računi Browser +DocType: GL Entry,GL Entry,GL Začetek +DocType: HR Settings,Employee Settings,Nastavitve zaposlenih +,Batch-Wise Balance History,Serija-Wise Balance Zgodovina +apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Seznam opravil +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Vajenec +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativno Količina ni dovoljeno +DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field. +Used for Taxes and Charges",Davčna podrobnosti tabela nerealne iz postavke mojstra kot vrvico in shranjena na tem področju. Uporablja se za davki in dajatve +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing +apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Delavec ne more poročati zase. +DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Če računa je zamrznjeno, so vpisi dovoljeni omejenih uporabnikov." +DocType: Email Digest,Bank Balance,Banka Balance +apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}" +DocType: Job Opening,"Job profile, qualifications required etc.","Profil delovnega mesta, potrebna usposobljenost itd" +DocType: Journal Entry Account,Account Balance,Stanje na računu +apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Davčna pravilo za transakcije. +DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta preimenovati. +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kupimo ta artikel +DocType: Address,Billing,Zaračunavanje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging +DocType: Bulk Email,Not Sent,Ni Poslano +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplozivno oblikovanje +DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Skupaj davki in dajatve (Company valuti) +DocType: Shipping Rule,Shipping Account,Dostava račun +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Načrtovano poslati {0} prejemnikov +DocType: Quality Inspection,Readings,Readings +DocType: Stock Entry,Total Additional Costs,Skupaj Dodatni stroški +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sklope +DocType: Shipping Rule Condition,To Value,Do vrednosti +DocType: Supplier,Stock Manager,Stock Manager +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Vir skladišče je obvezna za vrstico {0} +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Pakiranje listek +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Urad za najem +apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavitve Setup SMS gateway +apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz uspelo! +sites/assets/js/erpnext.min.js +24,No address added yet.,Še ni naslov dodal. +DocType: Workstation Working Hour,Workstation Working Hour,Workstation delovno uro +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analitik +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka JV znesku {2}" +DocType: Item,Inventory,Popis +DocType: Features Setup,"To enable ""Point of Sale"" view",Da bi omogočili "prodajno mesto" pogled +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Plačilo ne more biti narejen za prazen voziček +DocType: Item,Sales Details,Prodajna Podrobnosti +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pripenjanje +DocType: Opportunity,With Items,Z Items +apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Kol +DocType: Notification Control,Expense Claim Rejected,Expense zahtevek zavrnjen +DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit. +","Datum, na katerega se bo ustvarila naslednji račun. To je ustvarila na oddajte." +DocType: Item Attribute,Item Attribute,Postavka Lastnost +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vlada +apps/erpnext/erpnext/config/stock.py +273,Item Variants,Artikel Variante +DocType: Company,Services,Storitve +apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Skupaj ({0}) +DocType: Cost Center,Parent Cost Center,Parent Center Stroški +DocType: Sales Invoice,Source,Vir +DocType: Leave Type,Is Leave Without Pay,Se Leave brez plačila +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Proračunsko leto Start Date +DocType: Employee External Work History,Total Experience,Skupaj Izkušnje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Grezenju +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Dobavnico (e) odpovedan +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Tovorni in Forwarding Stroški +DocType: Material Request Item,Sales Order No,Prodaja Zaporedna številka +DocType: Item Group,Item Group Name,Item Name Group +apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Taken +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferji Materiali za Izdelava +DocType: Pricing Rule,For Price List,Za cenik +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search +apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Nakupni tečaj za postavko: {0} ni mogoče najti, ki je potrebna za rezervacijo knjižbo (odhodki). Navedite ceno artikla proti seznama za nakupno ceno." +DocType: Maintenance Schedule,Schedules,Urniki +DocType: Purchase Invoice Item,Net Amount,Neto znesek +DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Ne +DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Znesek (Valuta Company) +DocType: Period Closing Voucher,CoA Help,CoA Pomoč +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Napaka: {0}> {1} +apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosimo, ustvarite nov račun iz kontnega načrta." +DocType: Maintenance Visit,Maintenance Visit,Vzdrževanje obisk +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Stranka> Skupina Customer> Territory +DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostopno Serija Količina na Warehouse +DocType: Time Log Batch Detail,Time Log Batch Detail,Čas Log Serija Detail +DocType: Workflow State,Tasks,Naloge +DocType: Landed Cost Voucher,Landed Cost Help,Pristali Stroški Pomoč +DocType: Event,Tuesday,Torek +DocType: Leave Block List,Block Holidays on important days.,Blokiranje Počitnice na pomembnih dni. +,Accounts Receivable Summary,Terjatve Povzetek +apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Prosim, nastavite ID uporabnika polje v zapisu zaposlenih za določen Vloga zaposlenih" +DocType: UOM,UOM Name,UOM Name +DocType: Top Bar Item,Target,Target +apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Prispevek Znesek +DocType: Sales Invoice,Shipping Address,naslov za pošiljanje +DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,To orodje vam pomaga posodobiti ali popravite količino in vrednotenje zalog v sistemu. To se ponavadi uporablja za sinhronizacijo sistemske vrednosti in kaj dejansko obstaja v vaših skladiščih. +DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"V besedi bo viden, ko boste shranite dobavnici." +apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand gospodar. +DocType: ToDo,Due Date,Datum zapadlosti +DocType: Sales Invoice Item,Brand Name,Blagovna znamka +DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Škatla +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizacija +DocType: Monthly Distribution,Monthly Distribution,Mesečni Distribution +apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Sprejemnik Seznam je prazen. Prosimo, da ustvarite sprejemnik seznam" +DocType: Production Plan Sales Order,Production Plan Sales Order,Proizvodni načrt Sales Order +DocType: Sales Partner,Sales Partner Target,Prodaja Partner Target +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Vstop za {0} se lahko izvede samo v valuti: {1} +DocType: Pricing Rule,Pricing Rule,Cen Pravilo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Prepuščanjem +apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Material Zahteva za narocilo +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Vrstica # {0}: Vrnjeno Postavka {1} ne obstaja v {2} {3} +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bančni računi +,Bank Reconciliation Statement,Izjava Bank Sprava +DocType: Address,Lead Name,Svinec Name +,POS,POS +apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Odpiranje Stock Balance +apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} se morajo pojaviti le enkrat +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ne sme odtujiti bolj {0} od {1} proti narocilo {2} +apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Listi Dodeljena Uspešno za {0} +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ni prispevkov za pakiranje +DocType: Shipping Rule Condition,From Value,Od vrednosti +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna +apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Zneski, ki se ne odraža v banki" +DocType: Quality Inspection Reading,Reading 4,Branje 4 +apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Terjatve za račun družbe. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugalno litje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetno polje pomaga oplemenitenje +DocType: Company,Default Holiday List,Privzeto Holiday seznam +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Zaloga Obveznosti +DocType: Purchase Receipt,Supplier Warehouse,Dobavitelj Skladišče +DocType: Opportunity,Contact Mobile No,Kontakt Mobile No +DocType: Production Planning Tool,Select Sales Orders,Izberite prodajnih nalogov +,Material Requests for which Supplier Quotations are not created,Material Prošnje za katere so Dobavitelj Citati ni ustvaril +DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za sledenje predmetov s pomočjo črtne kode. Morda ne boste mogli vnesti elemente v dobavnice in prodajne fakture s skeniranjem črtne kode elementa. +apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Naredite predračun +DocType: Dependent Task,Dependent Task,Odvisna Task +apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}" +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1} +DocType: Manufacturing Settings,Try planning operations for X days in advance.,Poskusite načrtovanju operacij za X dni vnaprej. +DocType: HR Settings,Stop Birthday Reminders,Stop Birthday opomniki +DocType: SMS Center,Receiver List,Sprejemnik Seznam +DocType: Payment Tool Detail,Payment Amount,Plačilo Znesek +apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Porabljeni znesek +sites/assets/js/erpnext.min.js +51,{0} View,{0} Poglej +DocType: Salary Structure Deduction,Salary Structure Deduction,Plača Struktura Odbitek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivno lasersko sintranje +apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat +apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Uvoz uspešno! +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Strošek izdanih postavk +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne sme biti več kot {0} +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Starost (dnevi) +DocType: Quotation Item,Quotation Item,Kotacija Postavka +DocType: Account,Account Name,Ime računa +apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Od datum ne more biti večja kot doslej +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijska št {0} količina {1} ne more biti del +apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dobavitelj Type gospodar. +DocType: Purchase Order Item,Supplier Part Number,Dobavitelj Številka dela +apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Dodaj +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Menjalno razmerje ne more biti 0 ali 1 +apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} je odpovedan ali ustavi +DocType: Accounts Settings,Credit Controller,Credit Controller +DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Potrdilo o nakupu {0} ni predložila +DocType: Company,Default Payable Account,Privzeto plačljivo račun +apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavitve za spletni košarici, kot so predpisi v pomorskem prometu, cenik itd" +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete +apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% zaračunali +apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Rezervirano Kol +DocType: Party Account,Party Account,Račun Party +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Človeški viri +DocType: Lead,Upper Income,Zgornja Prihodki +DocType: Journal Entry Account,Debit in Company Currency,Debetno v podjetju valuti +apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moja vprašanja +DocType: BOM Item,BOM Item,BOM Postavka +DocType: Appraisal,For Employee,Za zaposlenega +DocType: Company,Default Values,Privzete vrednosti +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Vrstica {0}: Znesek plačila ne more biti negativna +DocType: Expense Claim,Total Amount Reimbursed,"Skupnega zneska, povrnjenega" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Sporočilo za vgradnjo +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1} +DocType: Customer,Default Price List,Privzeto Cenik +DocType: Payment Reconciliation,Payments,Plačila +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Vroče izostatično stiskanje +DocType: ToDo,Medium,Medium +DocType: Budget Detail,Budget Allocated,Proračun Dodeljena +DocType: Journal Entry,Entry Type,Začetek Type +,Customer Credit Balance,Stranka Credit Balance +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Prosimo, preverite svoj email id" +apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Stranka zahteva za "Customerwise popust" +apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Posodobite rok plačila banka s revijah. +DocType: Quotation,Term Details,Izraz Podrobnosti +DocType: Manufacturing Settings,Capacity Planning For (Days),Kapaciteta Načrtovanje Za (dnevi) +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nobena od postavk imate kakršne koli spremembe v količini ali vrednosti. +DocType: Warranty Claim,Warranty Claim,Garancija zahtevek +,Lead Details,Svinec Podrobnosti +DocType: Authorization Rule,Approving User,Odobritvi Uporabnik +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovanje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating +DocType: Purchase Invoice,End date of current invoice's period,Končni datum obdobja tekočega faktura je +DocType: Pricing Rule,Applicable For,Velja za +DocType: Bank Reconciliation,From Date,Od datuma +DocType: Shipping Rule Country,Shipping Rule Country,Dostava Pravilo Država +DocType: Maintenance Visit,Partially Completed,Delno Dopolnil +DocType: Leave Type,Include holidays within leaves as leaves,Vključite počitnice v listih kot listja +DocType: Sales Invoice,Packed Items,Pakirane Items +apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Garancija zahtevek zoper Serial No. +DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Zamenjajte posebno kosovnico v vseh drugih BOMs, kjer se uporablja. To bo nadomestila staro BOM povezavo, posodobite stroške in regenerira "BOM Explosion item» mizo kot na novo BOM" +DocType: Shopping Cart Settings,Enable Shopping Cart,Omogoči Košarica +DocType: Employee,Permanent Address,stalni naslov +apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Postavka {0} mora biti Service postavka. +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \ + than Grand Total {2}",Izplačano predplačilo proti {0} {1} ne more biti večja \ kot Grand Total {2} +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Prosimo, izberite postavko kodo" +DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Zmanjšajte Odbitek za dopust brez plačila (md) +DocType: Territory,Territory Manager,Ozemlje Manager +DocType: Sales Invoice,Paid Amount (Company Currency),Plačan znesek (družba Valuta) +DocType: Purchase Invoice,Additional Discount,Dodatni popust +DocType: Selling Settings,Selling Settings,Prodaja Nastavitve +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Dražbe +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Prosimo, navedite bodisi količina ali Ocenite vrednotenja ali oboje" +apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Podjetje, Mesec in poslovno leto je obvezna" +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketing Stroški +,Item Shortage Report,Postavka Pomanjkanje Poročilo +apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja "Teža UOM" preveč" +DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Zahteva se uporablja za izdelavo tega staleža Entry +apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enotni enota točke. +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Čas Log Serija {0} je treba "Submitted" +DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Naredite vknjižba Za vsako borzno gibanje +DocType: Leave Allocation,Total Leaves Allocated,Skupaj Listi Dodeljena +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Skladišče zahteva pri Row št {0} +DocType: Employee,Date Of Retirement,Datum upokojitve +DocType: Upload Attendance,Get Template,Get predlogo +DocType: Address,Postal,Postal +DocType: Item,Weightage,Weightage +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin litje +apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Skupina kupcev obstaja z istim imenom, prosimo spremenite ime stranke ali preimenovati skupino odjemalcev" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Prosimo, izberite {0} prvi." +apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Besedilo {0} +DocType: Territory,Parent Territory,Parent Territory +DocType: Quality Inspection Reading,Reading 2,Branje 2 +DocType: Stock Entry,Material Receipt,Material Prejem +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Izdelki +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},"Vrsta stranka in stranka, ki je potrebna za terjatve / obveznosti račun {0}" +DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Če ima ta postavka variante, potem ne more biti izbran v prodajnih naročil itd" +DocType: Lead,Next Contact By,Naslednja Kontakt Z +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},"Količina, potrebna za postavko {0} v vrstici {1}" +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Skladišče {0} ni mogoče izbrisati, kot obstaja količina za postavko {1}" +DocType: Quotation,Order Type,Sklep Type +DocType: Purchase Invoice,Notification Email Address,Obvestilo e-poštni naslov +DocType: Payment Tool,Find Invoices to Match,"Najdi račune, da se ujemajo" +,Item-wise Sales Register,Element-pametno Sales Registriraj se +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",npr "XYZ National Bank" +DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to DDV vključen v osnovni stopnji? +apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Skupaj Target +apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Košarica je omogočena +DocType: Job Applicant,Applicant for a Job,Kandidat za službo +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ni Proizvodne Naročila ustvarjena +apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plača listek delavca {0} že ustvarjena za ta mesec +DocType: Stock Reconciliation,Reconciliation JSON,Sprava JSON +apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Preveč stolpcev. Izvoziti poročilo in ga natisnete s pomočjo aplikacije za preglednice. +DocType: Sales Invoice Item,Batch No,Serija Ne +DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dovoli več prodajnih nalogov zoper naročnikovo narocilo +apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main +DocType: DocPerm,Delete,Izbriši +apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variant +sites/assets/js/desk.min.js +7971,New {0},New {0} +DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Ustavil naročila ni mogoče preklicati. Odčepiti preklicati. +apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo +DocType: Employee,Leave Encashed?,Dopusta unovčijo? +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Priložnost Iz polja je obvezno +DocType: Item,Variants,Variante +apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Naredite narocilo +DocType: SMS Center,Send To,Pošlji +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0} +DocType: Sales Team,Contribution to Net Total,Prispevek k Net Total +DocType: Sales Invoice Item,Customer's Item Code,Koda artikla stranke +DocType: Stock Reconciliation,Stock Reconciliation,Stock Sprava +DocType: Territory,Territory Name,Territory Name +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Work-in-Progress Warehouse je pred potreben Submit +apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Kandidat za službo. +DocType: Purchase Order Item,Warehouse and Reference,Skladišče in Reference +DocType: Supplier,Statutory info and other general information about your Supplier,Statutarna info in druge splošne informacije o vašem dobavitelju +DocType: Country,Country,Država +apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Naslovi +DocType: Communication,Received,Prejetih +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Podvajati Zaporedna številka vpisana v postavko {0} +DocType: Shipping Rule Condition,A condition for a Shipping Rule,Pogoj za Shipping pravilu +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Točka ni dovoljeno imeti Production Order. +DocType: DocField,Attach Image,Priložite sliko +DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto teža tega paketa. (samodejno izračuna kot vsota neto težo blaga) +DocType: Stock Reconciliation Item,Leave blank if no change,"Pustite prazno, če ni sprememb" +DocType: Sales Order,To Deliver and Bill,Dostaviti in Bill +DocType: GL Entry,Credit Amount in Account Currency,Credit Znesek v Valuta računa +apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Čas Hlodi za proizvodnjo. +DocType: Item,Apply Warehouse-wise Reorder Level,Uporabi skladišča pametno preuredite Raven +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} je treba predložiti +DocType: Authorization Control,Authorization Control,Pooblastilo za nadzor +apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Čas Prijava za naloge. +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Plačilo +DocType: Production Order Operation,Actual Time and Cost,Dejanski čas in stroške +apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Material Zahteva za največ {0} se lahko izvede za postavko {1} proti Sales Order {2} +DocType: Employee,Salutation,Pozdrav +DocType: Communication,Rejected,Zavrnjeno +DocType: Pricing Rule,Brand,Brand +DocType: Item,Will also apply for variants,Bo veljalo tudi za variante +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Delivered +apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle predmeti v času prodaje. +DocType: Sales Order Item,Actual Qty,Dejanska Kol +DocType: Sales Invoice Item,References,Reference +DocType: Quality Inspection Reading,Reading 10,Branje 10 +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaših izdelkov ali storitev, ki jih kupujejo ali prodajajo. Poskrbite, da preverite skupino item, merska enota in ostalih nepremičninah, ko začnete." +DocType: Hub Settings,Hub Node,Hub Node +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Vnesli ste podvojene elemente. Prosimo, popravi in ​​poskusite znova." +apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Vrednost {0} za Attribute {1} ne obstaja na seznamu veljavnega Postavka vrednosti atributov +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Sodelavec +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Postavka {0} ni serialized postavka +DocType: SMS Center,Create Receiver List,Ustvarite sprejemnik seznam +apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Potekel +DocType: Packing Slip,To Package No.,Če želite Paket No. +DocType: DocType,System,Sistem +DocType: Warranty Claim,Issue Date,Datum izdaje +DocType: Activity Cost,Activity Cost,Stroški dejavnost +DocType: Purchase Receipt Item Supplied,Consumed Qty,Porabljeno Kol +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikacije +DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Kaže, da je paket del tega dostave (samo osnutka)" +DocType: Payment Tool,Make Payment Entry,Naredite Entry plačila +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Količina za postavko {0} sme biti manjša od {1} +,Sales Invoice Trends,Prodajni fakturi Trendi +DocType: Leave Application,Apply / Approve Leaves,Uporabi / Odobri Leaves +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Lahko sklicuje vrstico le, če je tip naboj "Na prejšnje vrstice Znesek" ali "prejšnje vrstice Total"" +DocType: Sales Order Item,Delivery Warehouse,Dostava Skladišče +DocType: Stock Settings,Allowance Percent,Nadomestilo Odstotek +DocType: SMS Settings,Message Parameter,Sporočilo Parameter +DocType: Serial No,Delivery Document No,Dostava dokument št +DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dobili predmetov iz nakupa Prejemki +DocType: Serial No,Creation Date,Datum nastanka +apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Postavka {0} pojavi večkrat v Ceniku {1} +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodajanje je treba preveriti, če se uporablja za izbrana kot {0}" +DocType: Purchase Order Item,Supplier Quotation Item,Dobavitelj Kotacija Postavka +apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Naredite plač Struktura +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Striženje +DocType: Item,Has Variants,Ima Variante +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"S klikom na gumb "Make Sales računu", da ustvarite nov prodajni fakturi." +apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,"Obdobje Od in obdobje, da datumi obvezne za ponavljajoče% s" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakiranje in označevanje +DocType: Monthly Distribution,Name of the Monthly Distribution,Ime mesečnim izplačilom +DocType: Sales Person,Parent Sales Person,Nadrejena Sales oseba +apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Prosimo, navedite privzeta valuta v podjetju mojstrom in globalne privzetih" +DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Dostop Secret +DocType: Purchase Invoice,Recurring Invoice,Ponavljajoči Račun +apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Upravljanje projektov +DocType: Supplier,Supplier of Goods or Services.,Dobavitelj blaga ali storitev. +DocType: Budget Detail,Fiscal Year,Poslovno leto +DocType: Cost Center,Budget,Proračun +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun ne more biti dodeljena pred {0}, ker to ni prihodek ali odhodek račun" +apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Doseženi +apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Stranka +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,na primer 5 +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka zaračunati neodplačanega {2}" +DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"V besedi bo viden, ko boste prihranili prodajni fakturi." +DocType: Item,Is Sales Item,Je Sales Postavka +apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Element Group Tree +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postavka {0} ni setup za Serijska št. Preverite item mojster +DocType: Maintenance Visit,Maintenance Time,Vzdrževanje čas +,Amount to Deliver,"Znesek, Deliver" +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Izdelek ali storitev +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Tam so bile napake. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Prisluškovanje +DocType: Naming Series,Current Value,Trenutna vrednost +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} ustvaril +DocType: Delivery Note Item,Against Sales Order,Proti Sales Order +,Serial No Status,Serijska Status Ne +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Postavka miza ne more biti prazno +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \ + must be greater than or equal to {2}","Vrstica {0}: nastavi {1} periodičnost, razlika med od do sedaj \ mora biti večja od ali enaka {2}" +DocType: Pricing Rule,Selling,Prodajanje +DocType: Employee,Salary Information,Plača Informacije +DocType: Sales Person,Name and Employee ID,Ime in zaposlenih ID +apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja +DocType: Website Item Group,Website Item Group,Spletna stran Element Group +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Dajatve in davki +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Vnesite Referenčni datum +apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} vnosov plačil ni mogoče filtrirati s {1} +DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela za postavko, ki bo prikazana na spletni strani" +DocType: Purchase Order Item Supplied,Supplied Qty,Priložena Kol +DocType: Material Request Item,Material Request Item,Material Zahteva Postavka +apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Drevo Artikel skupin. +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Ne more sklicevati številko vrstice večja ali enaka do trenutne številke vrstice za to vrsto Charge +,Item-wise Purchase History,Element-pametno Zgodovina nakupov +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Red +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosimo, kliknite na "ustvarjajo Seznamu" puščati Serijska št dodal za postavko {0}" +DocType: Account,Frozen,Frozen +,Open Production Orders,Odprte Proizvodne Naročila +DocType: Installation Note,Installation Time,Namestitev čas +DocType: Sales Invoice,Accounting Details,Računovodstvo Podrobnosti +apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Izbriši vse transakcije za te družbe +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Vrstica # {0}: Operacija {1} ni končana, za {2} Kol končnih izdelkov v proizvodnji naročite # {3}. Prosimo, posodobite statusa delovanja preko Čas Dnevniki" +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Naložbe +DocType: Issue,Resolution Details,Resolucija Podrobnosti +apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Spremenite UOM za točko. +DocType: Quality Inspection Reading,Acceptance Criteria,Merila sprejemljivosti +DocType: Item Attribute,Attribute Name,Ime atributa +apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Postavka {0} mora biti prodaja ali storitev postavka v {1} +DocType: Item Group,Show In Website,Pokaži V Website +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Skupina +DocType: Task,Expected Time (in hours),Pričakovani čas (v urah) +,Qty to Order,Količina naročiti +DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Za sledenje blagovno znamko v naslednjih dokumentih dobavnica, Priložnost, Industrijska zahtevo postavki, narocilo, nakup kupona, kupec prejemu, navajanje, prodajne fakture, Product Bundle, Sales Order Zaporedna številka" +apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Ganttov diagram vseh nalog. +DocType: Appraisal,For Employee Name,Za imena zaposlenih +DocType: Holiday List,Clear Table,Jasno Tabela +DocType: Features Setup,Brands,Blagovne znamke +DocType: C-Form Invoice Detail,Invoice No,Račun št +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od narocilo +DocType: Activity Cost,Costing Rate,Stanejo Rate +,Customer Addresses And Contacts,Naslovi strank in kontakti +DocType: Employee,Resignation Letter Date,Odstop pismo Datum +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Cenovne Pravila so dodatno filtriran temelji na količini. +apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ni nastavljeno +DocType: Communication,Date,Datum +apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer Prihodki +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sit tesen, medtem ko je vaš sistem pa nastavitev. To lahko traja nekaj trenutkov." +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imeti vlogo "Expense odobritelju" +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par +DocType: Bank Reconciliation Detail,Against Account,Proti račun +DocType: Maintenance Schedule Detail,Actual Date,Dejanski datum +DocType: Item,Has Batch No,Ima Serija Ne +DocType: Delivery Note,Excise Page Number,Trošarinska Številka strani +DocType: Employee,Personal Details,Osebne podrobnosti +,Maintenance Schedules,Vzdrževanje Urniki +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing +,Quotation Trends,Narekovaj Trendi +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},"Element Group, ki niso navedeni v točki mojster za postavko {0}" +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun +apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Kot je Produkcija naročilo lahko izvede za to postavko, mora biti točka parka." +DocType: Shipping Rule Condition,Shipping Amount,Dostava Znesek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Pridružitev +DocType: Authorization Rule,Above Value,Nad vrednostjo +,Pending Amount,Dokler Znesek +DocType: Purchase Invoice Item,Conversion Factor,Faktor pretvorbe +apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Delivered +apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup dohodni strežnik za delovna mesta email id. (npr jobs@example.com) +DocType: Purchase Receipt,Vehicle Number,Število vozil +DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, na katerega se bodo ponavljajoče račun stop" +DocType: Journal Entry,Accounts Receivable,Terjatve +,Supplier-Wise Sales Analytics,Dobavitelj-Wise Prodajna Analytics +DocType: Address Template,This format is used if country specific format is not found,"Ta oblika se uporablja, če je ni mogoče najti poseben format državo" +DocType: Custom Field,Custom,Po meri +DocType: Production Order,Use Multi-Level BOM,Uporabite Multi-Level BOM +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Vbrizgavanje +DocType: Bank Reconciliation,Include Reconciled Entries,Vključi uskladiti Entries +apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Drevo finanial računov. +DocType: Leave Control Panel,Leave blank if considered for all employee types,"Pustite prazno, če velja za vse vrste zaposlenih" +DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuirajo pristojbin na podlagi +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Račun {0}, mora biti tipa "osnovno sredstvo", kot {1} je postavka sredstvo Item" +DocType: HR Settings,HR Settings,Nastavitve HR +apps/frappe/frappe/config/setup.py +130,Printing,Tiskanje +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Terjatev čaka na odobritev. Samo Expense odobritelj lahko posodobite stanje. +DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Količina +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so počitnice. Vam ni treba zaprositi za dopust." +sites/assets/js/desk.min.js +7805,and,in +DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli +apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Šport +apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Skupaj Actual +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enota +apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Prosim, nastavite tipke za dostop Dropbox v vašem mestu config" +apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Prosimo, navedite Company" +,Customer Acquisition and Loyalty,Stranka Pridobivanje in zvestobe +DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Skladišče, kjer ste vzdrževanje zalog zavrnjenih predmetov" +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Vaš proračunsko leto konča na +DocType: POS Profile,Price List,Cenik +apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} je zdaj privzeta poslovno leto. Prosimo, osvežite brskalnik za spremembe začele veljati." +apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Odhodkov Terjatve +DocType: Issue,Support,Podpora +DocType: Authorization Rule,Approving Role,Odobritvi vloge +,BOM Search,BOM Iskanje +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zapiranje (Odpiranje + vsote) +apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Prosimo, navedite valuto v družbi" +DocType: Workstation,Wages per hour,Plače na uro +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ravnotežje Serija {0} bo postal negativen {1} za postavko {2} v skladišču {3} +apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Prikaži / Skrij funkcije, kot zaporedne številke, POS itd" +apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljavna. Valuta računa mora biti {1} +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Pretvorba je potrebno v vrstici {0} +apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum razdalja ne more biti pred datumom check zapored {0} +DocType: Salary Slip,Deduction,Odbitek +DocType: Address Template,Address Template,Naslov Predloga +apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Vnesite ID Employee te prodaje oseba +DocType: Territory,Classification of Customers by region,Razvrstitev stranke po regijah +DocType: Project,% Tasks Completed,% Naloge Dopolnil +DocType: Project,Gross Margin,Gross Margin +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Prosimo, da najprej vnesete Production artikel" +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,onemogočena uporabnik +DocType: Opportunity,Quotation,Kotacija +DocType: Salary Slip,Total Deduction,Skupaj Odbitek +DocType: Quotation,Maintenance User,Vzdrževanje Uporabnik +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Stroškovno Posodobljeno +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,"Ali ste prepričani, da želite Odčepiti" +DocType: Employee,Date of Birth,Datum rojstva +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Postavka {0} je bil že vrnjen +DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** predstavlja poslovno leto. Vse vknjižbe in druge velike transakcije so gosenicami proti ** poslovnega leta **. +DocType: Opportunity,Customer / Lead Address,Stranka / Lead Naslov +DocType: Production Order Operation,Actual Operation Time,Dejanska Operacija čas +DocType: Authorization Rule,Applicable To (User),Ki se uporabljajo za (Uporabnik) +DocType: Purchase Taxes and Charges,Deduct,Odbitka +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Opis dela +DocType: Purchase Order Item,Qty as per Stock UOM,Kol kot na borzi UOM +apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Izberite veljavno datoteko CSV s podatki +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Premaz +apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znaki razen "-" ".", "#", in "/" ni dovoljena v poimenovanju serijo" +DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Spremljajte prodajnih akcij. Spremljajte Interesenti, citatov, Sales Order itd iz akcije, da bi ocenili donosnost naložbe." +DocType: Expense Claim,Approver,Odobritelj +,SO Qty,SO Kol +apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Vpisi Zaloga obstajajo proti skladišču {0}, zato vam ne more ponovno dodeliti ali spremeniti Skladišče" +DocType: Appraisal,Calculate Total Score,Izračunaj skupni rezultat +DocType: Supplier Quotation,Manufacturing Manager,Proizvodnja Manager +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijska št {0} je pod garancijo stanuje {1} +apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Dostava Opomba v pakete. +apps/erpnext/erpnext/hooks.py +84,Shipments,Pošiljke +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip modeliranje +apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Status čas Prijava je treba predložiti. +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijska št {0} ne pripada nobeni Warehouse +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavitev +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Vrstica # +DocType: Purchase Invoice,In Words (Company Currency),V besedi (družba Valuta) +DocType: Pricing Rule,Supplier,Dobavitelj +DocType: C-Form,Quarter,Quarter +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Razni stroški +DocType: Global Defaults,Default Company,Privzeto Company +apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Odhodek ali Razlika račun je obvezna za postavko {0} saj to vpliva na skupna vrednost zalog +apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne more overbill za postavko {0} v vrstici {1} več kot {2}. Da bi omogočili previsokih računov, vas prosimo, nastavite na zalogi Nastavitve" +DocType: Employee,Bank Name,Ime Bank +apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Nad +apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Uporabnik {0} je onemogočena +DocType: Leave Application,Total Leave Days,Skupaj dni dopusta +DocType: Journal Entry Account,Credit in Account Currency,Kredit Valuta računa +DocType: Email Digest,Note: Email will not be sent to disabled users,Opomba: E-mail ne bo poslano uporabnike invalide +apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Izberite Company ... +DocType: Leave Control Panel,Leave blank if considered for all departments,"Pustite prazno, če velja za vse oddelke" +apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)." +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je obvezna za postavko {1} +DocType: Currency Exchange,From Currency,Iz valute +DocType: DocField,Name,Name +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico" +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Sales Order potreben za postavko {0} +apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Zneski, ki se ne odraža v sistemu" +DocType: Purchase Invoice Item,Rate (Company Currency),Oceni (družba Valuta) +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Drugi +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Nastavi kot Ustavljen +DocType: POS Profile,Taxes and Charges,Davki in dajatve +DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Izdelek ali storitev, ki je kupil, prodal ali jih hranijo na zalogi." +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ne morete izbrati vrsto naboja kot "On prejšnje vrstice Znesek" ali "Na prejšnje vrstice Total" za prvi vrsti +apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dopolnil +DocType: Web Form,Select DocType,Izberite DOCTYPE +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Posnemanje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bančništvo +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Prosimo, kliknite na "ustvarjajo Seznamu", da bi dobili razpored" +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,New Center Stroški +DocType: Bin,Ordered Quantity,Naročeno Količina +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",npr "Build orodja za gradbenike" +DocType: Quality Inspection,In Process,V postopku +DocType: Authorization Rule,Itemwise Discount,Itemwise Popust +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} proti Sales Order {1} +DocType: Account,Fixed Asset,Osnovno sredstvo +apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Zaporednimi Inventory +DocType: Activity Type,Default Billing Rate,Privzeto Oceni plačevanja +DocType: Time Log Batch,Total Billing Amount,Skupni znesek plačevanja +apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Terjatev račun +,Stock Balance,Stock Balance +apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Sales Order do plačila +DocType: Expense Claim Detail,Expense Claim Detail,Expense Zahtevek Detail +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Čas Dnevniki ustvaril: +DocType: Item,Weight UOM,Teža UOM +DocType: Employee,Blood Group,Blood Group +DocType: Purchase Invoice Item,Page Break,Page Break +DocType: Production Order Operation,Pending,V teku +DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uporabniki, ki lahko potrdijo zahtevke zapustiti določenega zaposlenega" +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ne morete spremeniti privzeto UOM variante. Če želite spremeniti privzeto UOM za Variant privzeto sprememba UOM na predlogo +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Pisarniška oprema +DocType: Purchase Invoice Item,Qty,Količina +DocType: Fiscal Year,Companies,Podjetja +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electronics +DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Dvignite Material Zahtevaj ko stock doseže stopnjo ponovnega naročila +apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Od razporedom vzdrževanja +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Polni delovni čas +DocType: Purchase Invoice,Contact Details,Kontaktni podatki +DocType: C-Form,Received Date,Prejela Datum +DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Če ste ustvarili standardno predlogo v prodaji davkov in dajatev predlogo, izberite eno in kliknite na gumb spodaj." +apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Prosimo, navedite državo ta prevoz pravilu ali preverite Dostava po celem svetu" +DocType: Stock Entry,Total Incoming Value,Skupaj Dohodni Vrednost +apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nakup Cenik +DocType: Offer Letter Term,Offer Term,Ponudba Term +DocType: Quality Inspection,Quality Manager,Quality Manager +DocType: Job Applicant,Job Opening,Job Otvoritev +DocType: Payment Reconciliation,Payment Reconciliation,Plačilo Sprava +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosimo, izberite ime zadolžen osebe" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tehnologija +DocType: Offer Letter,Offer Letter,Ponujamo Letter +apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Ustvarjajo Materialne zahteve (MRP) in naročila za proizvodnjo. +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Skupaj Fakturna Amt +DocType: Time Log,To Time,Time +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Če želite dodati otrok vozlišča, raziskovanje drevo in kliknite na vozlišču, pod katero želite dodati več vozlišč." +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Za računu mora biti plačljivo račun +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2} +DocType: Production Order Operation,Completed Qty,Dopolnil Kol +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, lahko le debetne račune povezati proti drugemu knjiženje" +apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Seznam Cena {0} je onemogočena +DocType: Manufacturing Settings,Allow Overtime,Dovoli Nadurno delo +apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Sales Order {0} se ustavi +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serijske številke, potrebne za postavko {1}. Ki ste ga navedli {2}." +DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutni tečaj Vrednotenje +DocType: Item,Customer Item Codes,Stranka Postavka Kode +DocType: Opportunity,Lost Reason,Lost Razlog +apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Ustvarite Plačilni Entries proti odločitvam ali računih. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Varjenje +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM je potrebno +DocType: Quality Inspection,Sample Size,Velikost vzorca +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Vsi predmeti so bili že obračunano +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Prosimo, navedite veljaven "Od zadevi št '" +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Nadaljnje stroškovna mesta se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin" +DocType: Project,External,Zunanji +DocType: Features Setup,Item Serial Nos,Postavka Serijska št +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uporabniki in dovoljenja +DocType: Branch,Branch,Branch +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje in Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ne plača slip najti za mesec: +DocType: Bin,Actual Quantity,Dejanska količina +DocType: Shipping Rule,example: Next Day Shipping,Primer: Next Day Shipping +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijska št {0} ni bilo mogoče najti +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaše stranke +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Stiskanjem +DocType: Leave Block List Date,Block Date,Block Datum +DocType: Sales Order,Not Delivered,Ne Delivered +,Bank Clearance Summary,Banka Potrditev Povzetek +apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Ustvarjanje in upravljanje dnevne, tedenske in mesečne email prebavlja." +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Oznaka> Element Group> Brand +DocType: Appraisal Goal,Appraisal Goal,Cenitev cilj +DocType: Event,Friday,Petek +DocType: Time Log,Costing Amount,Stanejo Znesek +DocType: Process Payroll,Submit Salary Slip,Predloži plačilni list +DocType: Salary Structure,Monthly Earning & Deduction,Mesečni zaslužka & Odbitek +apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Maxiumm popust za Element {0} je {1}% +apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Uvoz v razsutem stanju +DocType: Sales Partner,Address & Contacts,Naslov & Kontakti +DocType: SMS Log,Sender Name,Sender Name +DocType: Page,Title,Naslov +sites/assets/js/list.min.js +104,Customize,Prilagajanje +DocType: POS Profile,[Select],[Izberite] +DocType: SMS Log,Sent To,Poslano +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Naredite prodajni fakturi +DocType: Company,For Reference Only.,Samo za referenco. +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Neveljavna {0}: {1} +DocType: Sales Invoice Advance,Advance Amount,Advance Znesek +DocType: Manufacturing Settings,Capacity Planning,Načrtovanje zmogljivosti +apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,""Od datuma", je potrebno" +DocType: Journal Entry,Reference Number,Referenčna številka +DocType: Employee,Employment Details,Podatki o zaposlitvi +DocType: Employee,New Workplace,Novo delovno mesto +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Nastavi kot Zaprto +apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ne Postavka s črtno kodo {0} +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Primer št ne more biti 0 +DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity,"Če imate prodajno ekipo in prodaja Partners (kanal partnerji), se jih lahko označili in vzdržuje svoj prispevek v dejavnosti prodaje" +DocType: Item,Show a slideshow at the top of the page,Prikaži diaprojekcijo na vrhu strani +DocType: Item,"Allow in Sales Order of type ""Service""",Dovoli na Sales Order tipa "službe" +apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Trgovine +DocType: Time Log,Projects Manager,Projekti Manager +DocType: Serial No,Delivery Time,Čas dostave +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Staranje, ki temelji na" +DocType: Item,End of Life,End of Life +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Potovanja +DocType: Leave Block List,Allow Users,Dovoli uporabnike +DocType: Sales Invoice,Recurring,Ponavljajoči +DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledi ločeno prihodki in odhodki za vertikal proizvodov ali delitve. +DocType: Rename Tool,Rename Tool,Preimenovanje orodje +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Posodobitev Stroški +DocType: Item Reorder,Item Reorder,Postavka Preureditev +apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Prenos Material +DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Določite operacij, obratovalne stroške in daje edinstveno Operacija ni na vaše poslovanje." +DocType: Purchase Invoice,Price List Currency,Cenik Valuta +DocType: Naming Series,User must always select,Uporabnik mora vedno izbrati +DocType: Stock Settings,Allow Negative Stock,Dovoli Negative Stock +DocType: Installation Note,Installation Note,Namestitev Opomba +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Dodaj Davki +,Financial Analytics,Finančni Analytics +DocType: Quality Inspection,Verified By,Verified by +DocType: Address,Subsidiary,Hčerinska družba +apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne more spremeniti privzeto valuto družbe, saj so obstoječi posli. Transakcije se treba odpovedati, da spremenite privzeto valuto." +DocType: Quality Inspection,Purchase Receipt No,Potrdilo o nakupu Ne +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kapara +DocType: System Settings,In Hours,V urah +DocType: Process Payroll,Create Salary Slip,Ustvarite plačilnega lista +apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Pričakovana višina kot na banko +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Brušenju +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Vir sredstev (obveznosti) +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina v vrstici {0} ({1}) mora biti enaka kot je bila proizvedena količina {2} +DocType: Appraisal,Employee,Zaposleni +apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz Email Od +apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Povabi kot uporabnik +DocType: Features Setup,After Sale Installations,Po prodajo naprav +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} je v celoti zaračunali +DocType: Workstation Working Hour,End Time,Končni čas +apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni pogodbeni pogoji za prodajo ali nakup. +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Skupina kupon +apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Zahtevani Na +DocType: Sales Invoice,Mass Mailing,Mass Mailing +DocType: Page,Standard,Standardni +DocType: Rename Tool,File to Rename,Datoteka Preimenuj +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Zaporedna številka potreben za postavko {0} +apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Določeno BOM {0} ne obstaja za postavko {1} +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vzdrževanje Urnik {0} je treba odpovedati pred preklicem te Sales Order +apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Velikost +DocType: Notification Control,Expense Claim Approved,Expense Zahtevek Odobreno +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Nabavna vrednost kupljene izdelke +DocType: Selling Settings,Sales Order Required,Sales Order Zahtevano +apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Ustvarite stranko +DocType: Purchase Invoice,Credit To,Kredit +DocType: Employee Education,Post Graduate,Post Graduate +DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vzdrževanje Urnik Detail +DocType: Quality Inspection Reading,Reading 9,Branje 9 +DocType: Supplier,Is Frozen,Je zamrznjena +DocType: Buying Settings,Buying Settings,Nastavitve odkup +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass Dodelava +DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. za Končni Good postavki +DocType: Upload Attendance,Attendance To Date,Udeležba na tekočem +apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup dohodni strežnik za prodajo email id. (npr sales@example.com) +DocType: Warranty Claim,Raised By,Raised By +DocType: Payment Tool,Payment Account,Plačilo računa +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati" +sites/assets/js/list.min.js +23,Draft,Osnutek +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzacijske Off +DocType: Quality Inspection Reading,Accepted,Sprejeto +DocType: User,Female,Ženska +DocType: Journal Entry Account,Debit in Account Currency,Debetno v Valuta računa +apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Prosimo, preverite, ali ste prepričani, da želite izbrisati vse posle, za te družbe. Vaši matični podatki bodo ostali kot je. Ta ukrep ni mogoče razveljaviti." +DocType: Print Settings,Modern,Modern +DocType: Communication,Replied,Odgovorila +DocType: Payment Tool,Total Payment Amount,Skupaj Znesek plačila +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne more biti večji od načrtovanih quanitity ({2}) v proizvodnji naročite {3} +DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Surovine ne more biti prazno. +DocType: Newsletter,Test,Testna +apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \ + you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kot že obstajajo transakcije zalog za to postavko, \ ne morete spremeniti vrednote "Ima Zaporedna številka", "Ima serija ni '," je Stock Postavka "in" metoda vrednotenja "" +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko" +DocType: Employee,Previous Work Experience,Prejšnja Delovne izkušnje +DocType: Stock Entry,For Quantity,Za Količina +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Vnesite načrtovanih Količina za postavko {0} v vrstici {1} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} ni predložena +apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Prošnje za artikle. +DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ločena proizvodnja naročilo bo ustvarjen za vsakega končnega dobro točko. +DocType: Purchase Invoice,Terms and Conditions1,Pogoji in razmer1 +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Popolna Setup +DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Vknjižba zamrzniti do tega datuma, nihče ne more narediti / spremeniti vnos razen vlogi določeno spodaj." +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Prosimo, shranite dokument pred ustvarjanjem razpored vzdrževanja" +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta +DocType: UOM,Check this to disallow fractions. (for Nos),"Preverite, da je to prepoveste frakcij. (za številkami)" +apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing List +DocType: Delivery Note,Transporter Name,Transporter Name +DocType: Contact,Enter department to which this Contact belongs,"Vnesite oddelek, v katerem ta Kontakt pripada" +apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Skupaj Odsoten +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Postavka ali skladišča za vrstico {0} ne ujema Material dogovoru +apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Merska enota +DocType: Fiscal Year,Year End Date,Leto End Date +DocType: Task Depends On,Task Depends On,Naloga je odvisna od +DocType: Lead,Opportunity,Priložnost +DocType: Salary Structure Earning,Salary Structure Earning,Plača Struktura zaslužka +,Completed Production Orders,Zaključeni Proizvodne Naročila +DocType: Operation,Default Workstation,Privzeto Workstation +DocType: Notification Control,Expense Claim Approved Message,Expense Zahtevek Odobreno Sporočilo +DocType: Email Digest,How frequently?,Kako pogosto? +DocType: Purchase Receipt,Get Current Stock,Pridobite trenutne zaloge +apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Drevo Bill of Materials +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Datum začetka vzdrževanje ne more biti pred datumom dostave za serijsko št {0} +DocType: Production Order,Actual End Date,Dejanski končni datum +DocType: Authorization Rule,Applicable To (Role),Ki se uporabljajo za (vloga) +DocType: Stock Entry,Purpose,Namen +DocType: Item,Will also apply for variants unless overrridden,Bo veljalo tudi za variante razen overrridden +DocType: Purchase Invoice,Advances,Predplačila +apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Odobritvi Uporabnik ne more biti isto kot uporabnika je pravilo, ki veljajo za" +DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Osnovni tečaj (kot na borzi UOM) +DocType: SMS Log,No of Requested SMS,Št zaprošene SMS +DocType: Campaign,Campaign-.####,Akcija -. #### +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing +apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Naročilo Končni datum mora biti večja od Datum pridružitve +DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributer tretja oseba / trgovec / provizije agent / podružnica / prodajalec, ki prodaja podjetja, izdelke za provizijo." +DocType: Customer Group,Has Child Node,Ima otrok Node +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} proti narocilo {1} +DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Vnesite statične parametre url tukaj (npr. Pošiljatelj = ERPNext, username = ERPNext, geslo = 1234 itd)" +apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ni v nobeni aktivnem poslovnem letu. Za več podrobnosti preverite {2}. +apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je primer spletne strani samodejno ustvari iz ERPNext +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Staranje Razpon 1 +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemično strojna obdelava +DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc. + +#### Note + +The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master. + +#### Description of Columns + +1. Calculation Type: + - This can be on **Net Total** (that is the sum of basic amount). + - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total. + - **Actual** (as mentioned). +2. Account Head: The Account ledger under which this tax will be booked +3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center. +4. Description: Description of the tax (that will be printed in invoices / quotes). +5. Rate: Tax rate. +6. Amount: Tax amount. +7. Total: Cumulative total to this point. +8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row). +9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both. +10. Add or Deduct: Whether you want to add or deduct the tax.","Standardna davčna predlogo, ki se lahko uporablja za vse nakupnih poslov. To predlogo lahko vsebuje seznam davčnih glavami in tudi drugih odhodkov glavah, kot so "Shipping", "zavarovanje", "Ravnanje" itd #### Opomba davčno stopnjo, ki jo določite tu bo standard davčna stopnja za vse ** Točke * *. Če obstajajo ** Items **, ki imajo različne stopnje, ki jih je treba dodati v ** Element davku ** miza v ** Element ** mojstra. #### Opis Stolpci 1. Vrsta Izračun: - To je lahko na ** Net Total ** (to je vsota osnovnega zneska). - ** Na prejšnje vrstice Total / Znesek ** (za kumulativnih davkov ali dajatev). Če izberete to možnost, bo davek treba uporabiti kot odstotek prejšnje vrstice (davčne tabele) znesek ali skupaj. - ** Dejanska ** (kot je omenjeno). 2. Račun Head: The knjiga račun, pod katerimi se bodo rezervirana ta davek 3. stroškovni center: Če davek / pristojbina je prihodek (kot ladijski promet) ali odhodek je treba rezervirana proti centru stroškov. 4. Opis: Opis davka (bo, da se natisne v faktur / narekovajev). 5. stopnja: Davčna stopnja. 6. Znesek: Davčna znesek. 7. Skupaj: Kumulativno do te točke. 8. Vnesite Row: Če je na osnovi "Prejšnji Row Total" lahko izberete številko vrstice, ki bo sprejet kot osnova za ta izračun (privzeta je prejšnja vrstica). 9. Razmislite davek ali dajatev za: V tem razdelku lahko določite, če je davek / pristojbina le za vrednotenje (ni del skupaj) ali samo za skupno (ne dodajajo vrednost za postavko), ali pa oboje. 10. Dodajte ali odštejemo: Ali želite dodati ali odbiti davek." +DocType: Note,Note,Zapisek +DocType: Purchase Receipt Item,Recd Quantity,Recd Količina +DocType: Email Account,Email Ids,E-pošta ID-ji +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne more proizvajati več item {0} od prodaje kol {1} +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Nastavi kot Unstopped +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila +DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash račun +DocType: Tax Rule,Billing City,Zaračunavanje Mesto +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,To Leave Application čaka na odobritev. Samo Leave odobritelj lahko posodobite stanje. +DocType: Global Defaults,Hide Currency Symbol,Skrij valutni simbol +apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","npr Bank, gotovini, Kreditna kartica" +DocType: Journal Entry,Credit Note,Dobropis +apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Dopolnil Kol ne more biti več kot {0} za delovanje {1} +DocType: Features Setup,Quality,Kakovost +DocType: Contact Us Settings,Introduction,Predstavitev +DocType: Warranty Claim,Service Address,Storitev Naslov +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Največ 100 vrstic za borzno spravo. +DocType: Stock Entry,Manufacture,Izdelava +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Prosimo Delivery Note prvi +DocType: Purchase Invoice,Currency and Price List,Gotovina in Cenik +DocType: Opportunity,Customer / Lead Name,Stranka / Lead Name +apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Potrditev Datum ni omenjena +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Proizvodnja +DocType: Item,Allow Production Order,Dovoli Proizvodnja naročilo +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Vrstica {0}: Začetni datum mora biti pred končnim datumom +apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Skupaj (Kol) +DocType: Installation Note Item,Installed Qty,Nameščen Kol +DocType: Lead,Fax,Fax +DocType: Purchase Taxes and Charges,Parenttype,Parenttype +sites/assets/js/list.min.js +26,Submitted,Predložen +DocType: Salary Structure,Total Earning,Skupaj zaslužka +DocType: Purchase Receipt,Time at which materials were received,"Čas, v katerem so bile prejete materiale" +apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moji Naslovi +DocType: Stock Ledger Entry,Outgoing Rate,Odhodni Rate +apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizacija podružnica gospodar. +apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ali +DocType: Sales Order,Billing Status,Status zaračunavanje +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Pomožni Stroški +apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Nad +DocType: Buying Settings,Default Buying Price List,Privzeto Seznam odkupna cena +,Download Backups,Prenesi Varnostne kopije +DocType: Notification Control,Sales Order Message,Sales Order Sporočilo +apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Privzeta nastavitev Vrednote, kot so podjetja, valuta, tekočem proračunskem letu, itd" +apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Način plačila +DocType: Process Payroll,Select Employees,Izberite Zaposleni +DocType: Bank Reconciliation,To Date,Če želite Datum +DocType: Opportunity,Potential Sales Deal,Potencialni Sales Deal +sites/assets/js/form.min.js +308,Details,Podrobnosti +DocType: Purchase Invoice,Total Taxes and Charges,Skupaj Davki in dajatve +DocType: Employee,Emergency Contact,Zasilna Kontakt +DocType: Item,Quality Parameters,Parametrov kakovosti +DocType: Target Detail,Target Amount,Ciljni znesek +DocType: Shopping Cart Settings,Shopping Cart Settings,Nastavitve Košarica +DocType: Journal Entry,Accounting Entries,Vknjižbe +apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Podvojenega vnosa. Prosimo, preverite Dovoljenje Pravilo {0}" +apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Globalno POS Profil {0} že ustvarili za družbo {1} +DocType: Purchase Order,Ref SQ,Ref SQ +apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Zamenjaj artikel / BOM v vseh BOMs +DocType: Purchase Order Item,Received Qty,Prejela Kol +DocType: Stock Entry Detail,Serial No / Batch,Zaporedna številka / Batch +DocType: Product Bundle,Parent Item,Parent Item +DocType: Account,Account Type,Vrsta računa +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vzdrževanje Urnik se ne ustvari za vse postavke. Prosimo, kliknite na "ustvarjajo Seznamu"" +,To Produce,Za izdelavo +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za vrstico {0} v {1}. Če želite vključiti {2} v stopnji Element, {3}, mora biti vključena tudi vrstice" +DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketu za dostavo (za tisk) +DocType: Bin,Reserved Quantity,Rezervirano Količina +DocType: Landed Cost Voucher,Purchase Receipt Items,Nakup Prejem Items +apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagajanje Obrazci +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Rezanje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Uravnavanjem +DocType: Account,Income Account,Prihodki račun +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modeliranje +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Dostava +DocType: Stock Reconciliation Item,Current Qty,Trenutni Kol +DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Glejte "Oceni materialov na osnovi" v stanejo oddelku +DocType: Appraisal Goal,Key Responsibility Area,Key Odgovornost Area +DocType: Item Reorder,Material Request Type,Material Zahteva Type +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Vrstica {0}: UOM Conversion Factor je obvezna +apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenti +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref +DocType: Cost Center,Cost Center,Stroškovno Center +apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher # +DocType: Notification Control,Purchase Order Message,Naročilnica sporočilo +DocType: Tax Rule,Shipping Country,Dostava Država +DocType: Upload Attendance,Upload HTML,Naloži HTML +apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \ + than the Grand Total ({2})",Skupaj predplačilo ({0}) proti odredbi {1} ne more biti večja \ od Grand Total ({2}) +DocType: Employee,Relieving Date,Lajšanje Datum +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cen Pravilo je narejen prepisati Cenik / določiti diskontno odstotek, na podlagi nekaterih kriterijev." +DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladišče je mogoče spremeniti samo prek borze Vstop / Delivery Note / Potrdilo o nakupu +DocType: Employee Education,Class / Percentage,Razred / Odstotek +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vodja marketinga in prodaje +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Davek na prihodek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser inženirstva neto oblikovanje +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Če je izbrana Cene pravilo narejen za "cena", bo prepisalo Cenik. Cen Pravilo cena je končna cena, zato je treba uporabiti pravšnji za popust. Zato v transakcijah, kot Sales Order, narocilo itd, da bodo nerealne v polje "obrestna mera", namesto da polje »Cenik rate"." +apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track Interesenti ga Industry Type. +DocType: Item Supplier,Item Supplier,Postavka Dobavitelj +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no +apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}" +apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Vsi naslovi. +DocType: Company,Stock Settings,Nastavitve Stock +DocType: User,Bio,Bio +apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company" +apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Upravljanje skupine kupcev drevo. +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,New Stroški Center Ime +DocType: Leave Control Panel,Leave Control Panel,Pustite Nadzorna plošča +apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Ne privzeto Naslov Predloga našel. Prosimo, da ustvarite novega s Setup> Printing in Branding> Naslov predlogo." +DocType: Appraisal,HR User,HR Uporabnik +DocType: Purchase Invoice,Taxes and Charges Deducted,Davki in dajatve Odbitek +apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Vprašanja +apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti eden od {0} +DocType: Sales Invoice,Debit To,Bremenitev +DocType: Delivery Note,Required only for sample item.,Zahteva le za točko vzorca. +DocType: Stock Ledger Entry,Actual Qty After Transaction,Dejanska Kol Po Transaction +,Pending SO Items For Purchase Request,Dokler SO Točke za nakup dogovoru +DocType: Supplier,Billing Currency,Zaračunavanje Valuta +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large +,Profit and Loss Statement,Izkaz poslovnega izida +DocType: Bank Reconciliation Detail,Cheque Number,Ček Število +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Pritiskom +DocType: Payment Tool Detail,Payment Tool Detail,Plačilo Tool Podrobnosti +,Sales Browser,Prodaja Browser +DocType: Journal Entry,Total Credit,Skupaj Credit +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2} +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokalno +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Posojila in predujmi (sredstva) +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dolžniki +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Velika +apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Noben delavec našel! +DocType: C-Form Invoice Detail,Territory,Ozemlje +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Navedite ni obiskov zahtevanih +DocType: Stock Settings,Default Valuation Method,Način Privzeto Vrednotenje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poliranje +DocType: Production Order Operation,Planned Start Time,Načrtovano Start Time +apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Razporejeni +apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zapri Bilanca stanja in rezervirajte poslovnem izidu. +apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \ + you have already made some transaction(s) with another UOM. To change default UOM, \ + use 'UOM Replace Utility' tool under Stock module.","Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker \ ste že naredili nekaj transakcije (-e) z drugo UOM. Če želite spremeniti privzeto UOM \ uporaba "UOM Zamenjaj Utility" orodje v okviru borze modula." +DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Določite Menjalni tečaj za pretvorbo ene valute v drugo +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Kotacija {0} je odpovedan +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Skupni preostali znesek +apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} je bil na dopustu {1}. Ne more označiti prisotnost. +DocType: Sales Partner,Targets,Cilji +DocType: Price List,Price List Master,Cenik Master +DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Vse prodajne transakcije je lahko označena pred številnimi ** Prodajni Osebe **, tako da lahko nastavite in spremljanje ciljev." +,S.O. No.,SO No. +DocType: Production Order Operation,Make Time Log,Vzemite si čas Prijava +apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Prosimo, da ustvarite strank iz svinca {0}" +DocType: Price List,Applicable for Countries,Velja za države +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računalniki +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-kemično brušenje +apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,To je skupina koren stranke in jih ni mogoče urejati. +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosimo nastavitev vaš kontni načrt, preden začnete vknjižbe" +DocType: Purchase Invoice,Ignore Pricing Rule,Ignoriraj Pricing pravilo +sites/assets/js/list.min.js +24,Cancelled,Preklicana +apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od datuma plače strukture ne more biti manjši od zaposlenih Vstop Datum. +DocType: Employee Education,Graduate,Maturirati +DocType: Leave Block List,Block Days,Block dnevi +DocType: Journal Entry,Excise Entry,Trošarina Začetek +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Opozorilo: Sales Order {0} že obstaja zoper naročnikovo narocilo {1} +DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases. + +Examples: + +1. Validity of the offer. +1. Payment Terms (In Advance, On Credit, part advance etc). +1. What is extra (or payable by the Customer). +1. Safety / usage warning. +1. Warranty if any. +1. Returns Policy. +1. Terms of shipping, if applicable. +1. Ways of addressing disputes, indemnity, liability, etc. +1. Address and Contact of your Company.","Standardni Pogoji, ki se lahko dodajajo prodaje in nakupe. Primeri: 1. Veljavnost ponudbe. 1. Plačilni pogoji (vnaprej, na kredit, del predujem itd). 1. Kaj je dodatno (ali ga je dolžan plačati davek). Opozorilo / uporaba 1. varnost. 1. Garancija če sploh. 1. Izjava zasebnosti. 1. Pogoji ladijskega prometa, če je to primerno. 1. načine reševanja sporov, jamstva, odgovornosti, itd 1. Naslov in kontaktne vašega podjetja." +DocType: Attendance,Leave Type,Zapusti Type +apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Razlika račun ({0}) mora biti račun "poslovni izid" +DocType: Account,Accounts User,Računi uporabnikov +DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Preverite, če ponavljajoče račun, počistite ustaviti ponavljajoče se ali dati ustrezno End Date" +apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Udeležba na zaposlenega {0} je že označeno +DocType: Packing Slip,If more than one package of the same type (for print),Če več paketov istega tipa (v tisku) +apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Največje {0} vrstice dovoljeno +DocType: C-Form Invoice Detail,Net Total,Neto Skupaj +DocType: Bin,FCFS Rate,FCFS Rate +apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Zaračunavanje (Sales Invoice) +DocType: Payment Reconciliation Invoice,Outstanding Amount,Neporavnani znesek +DocType: Project Task,Working,Delovna +DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Queue (FIFO) +apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,"Prosimo, izberite Čas Dnevniki." +apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} ne pripada družbi {1} +DocType: Account,Round Off,Zaokrožite +,Requested Qty,Zahteval Kol +DocType: Tax Rule,Use for Shopping Cart,Uporabite za Košarica +DocType: BOM Item,Scrap %,Ostanki% +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Dajatve bodo razdeljeni sorazmerno na podlagi postavka Kol ali znesek, glede na vašo izbiro" +DocType: Maintenance Visit,Purposes,Nameni +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,"Atleast en element, se vpiše z negativnim količino v povratni dokument" +apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} dlje od vseh razpoložljivih delovnih ur v delovni postaji {1}, razčleniti operacijo na več operacij" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemični strojna obdelava +,Requested,Zahteval +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ni Opombe +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zapadle +DocType: Account,Stock Received But Not Billed,Prejete Stock Ampak ne zaračuna +DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plače + arrear Znesek + Vnovčevanje Znesek - Skupaj Odbitek +DocType: Monthly Distribution,Distribution Name,Porazdelitev Name +DocType: Features Setup,Sales and Purchase,Prodaja in nakup +DocType: Purchase Order Item,Material Request No,Material Zahteva Ne +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0} +DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Obrestna mera, po kateri kupec je valuti, se pretvori v osnovni valuti družbe" +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} je bil uspešno odjavili iz tega seznama. +DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (družba Valuta) +apps/frappe/frappe/templates/base.html +132,Added,Dodano +apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Upravljanje Territory drevo. +DocType: Journal Entry Account,Sales Invoice,Prodaja Račun +DocType: Journal Entry Account,Party Balance,Balance Party +DocType: Sales Invoice Item,Time Log Batch,Čas Log Serija +apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na" +DocType: Company,Default Receivable Account,Privzeto Terjatve račun +DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Ustvarite Bank vnos za celotno plačo za zgoraj izbranih kriterijih +DocType: Stock Entry,Material Transfer for Manufacture,Prenos materialov za proizvodnjo +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Popust Odstotek se lahko uporablja bodisi proti ceniku ali za vse cenik. +DocType: Purchase Invoice,Half-yearly,Polletna +apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Poslovno leto {0} ni bilo mogoče najti. +DocType: Bank Reconciliation,Get Relevant Entries,Pridobite ustreznimi vnosi +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Računovodstvo Vstop za zalogi +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Kovanje +DocType: Sales Invoice,Sales Team1,Prodaja TEAM1 +apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Element {0} ne obstaja +DocType: Sales Invoice,Customer Address,Stranka Naslov +apps/frappe/frappe/desk/query_report.py +136,Total,Skupaj +DocType: Purchase Invoice,Apply Additional Discount On,Uporabi dodatni popust na +DocType: Account,Root Type,Root Type +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Vrstica # {0}: ne more vrniti več kot {1} za postavko {2} +apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Plot +DocType: Item Group,Show this slideshow at the top of the page,Pokažite ta diaprojekcije na vrhu strani +DocType: BOM,Item UOM,Postavka UOM +DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Davčna Znesek Po Popust Znesek (družba Valuta) +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Ciljna skladišče je obvezna za vrstico {0} +DocType: Quality Inspection,Quality Inspection,Quality Inspection +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray oblikovanje +apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol" +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Račun {0} je zamrznjena +DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna oseba / Hčerinska družba z ločenim kontnem pripada organizaciji. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Hrana, pijača, tobak" +apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ali BS +apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Stopnja Komisija ne more biti večja od 100 +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalna Inventory Raven +DocType: Stock Entry,Subcontract,Podizvajalska pogodba +DocType: Production Planning Tool,Get Items From Sales Orders,Dobili predmetov iz prodajnih nalogov +DocType: Production Order Operation,Actual End Time,Dejanska Končni čas +DocType: Production Planning Tool,Download Materials Required,"Naložite materialov, potrebnih" +DocType: Item,Manufacturer Part Number,Številka dela proizvajalca +DocType: Production Order Operation,Estimated Time and Cost,Predvideni čas in stroški +DocType: Bin,Bin,Bin +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Njuškanje +DocType: SMS Log,No of Sent SMS,Število poslanih SMS +DocType: Account,Company,Podjetje +DocType: Account,Expense Account,Expense račun +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Programska oprema +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Barva +DocType: Maintenance Visit,Scheduled,Načrtovano +apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosimo, izberite postavko, kjer "Stock postavka je" "Ne" in "Je Sales Postavka" je "Yes" in ni druge Bundle izdelka" +DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izberite mesečnim izplačilom neenakomerno distribucijo ciljev po mesecih. +DocType: Purchase Invoice Item,Valuation Rate,Oceni Vrednotenje +apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Cenik Valuta ni izbran +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Postavka Row {0}: Potrdilo o nakupu {1} ne obstaja v zgornji tabeli "nakup prejemki" +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Employee {0} je že zaprosil za {1} med {2} in {3} +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Start Date +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do +DocType: Rename Tool,Rename Log,Preimenovanje Prijava +DocType: Installation Note Item,Against Document No,Proti dokument št +apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Upravljanje prodajne partnerje. +DocType: Quality Inspection,Inspection Type,Inšpekcijski Type +apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Prosimo, izberite {0}" +DocType: C-Form,C-Form No,C-forma +DocType: BOM,Exploded_items,Exploded_items +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Raziskovalec +apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Update +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Prosimo, shranite Newsletter pred pošiljanjem" +apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Ime ali E-pošta je obvezna +apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Dohodni pregled kakovosti. +DocType: Purchase Order Item,Returned Qty,Vrnjeno Kol +DocType: Employee,Exit,Exit +apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Tip je obvezna +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijska št {0} ustvaril +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibracijski zaključna +DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za udobje kupcev lahko te kode se uporabljajo v tiskanih oblikah, kot so na računih in dobavnicah" +DocType: Employee,You can enter any date manually,Lahko jih vnesete nobenega datuma +DocType: Sales Invoice,Advertisement,Oglaševanje +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Poskusna doba +DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf vozlišča so dovoljene v transakciji +DocType: Expense Claim,Expense Approver,Expense odobritelj +DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Potrdilo o nakupu Postavka Priložena +sites/assets/js/erpnext.min.js +48,Pay,Plačajte +apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Da datetime +DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL +apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevniki za ohranjanje statusa dostave sms +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Brušenje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink zavijanje +apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Čakanju Dejavnosti +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potrjen +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavitelj> dobavitelj Type +apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vnesite lajšanje datum. +apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Pustite samo aplikacije s statusom "Approved" mogoče predložiti +apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Naslov Naslov je obvezen. +DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Vnesite ime oglaševalske akcije, če je vir preiskovalne akcije" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Newspaper Publishers +apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Izberite Fiscal Year +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Taljenje +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Ste Leave odobritelj za ta zapis. Prosimo Posodobite "status" in Shrani +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Preureditev Raven +DocType: Attendance,Attendance Date,Udeležba Datum +DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plača razpadu temelji na zaslužek in odbitka. +apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Račun z zapirali vozlišč ni mogoče pretvoriti v knjigo terjatev +DocType: Address,Preferred Shipping Address,Želeni Shipping Address +DocType: Purchase Receipt Item,Accepted Warehouse,Accepted Skladišče +DocType: Bank Reconciliation Detail,Posting Date,Napotitev Datum +DocType: Item,Valuation Method,Metoda vrednotenja +DocType: Sales Invoice,Sales Team,Sales Team +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Dvojnik vnos +DocType: Serial No,Under Warranty,Pod garancijo +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error] +DocType: Sales Order,In Words will be visible once you save the Sales Order.,"V besedi bo viden, ko boste shranite Sales Order." +,Employee Birthday,Zaposleni Rojstni dan +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Tveganega kapitala +DocType: UOM,Must be Whole Number,Mora biti celo število +DocType: Leave Control Panel,New Leaves Allocated (In Days),Nove Listi Dodeljena (v dnevih) +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijska št {0} ne obstaja +DocType: Pricing Rule,Discount Percentage,Popust Odstotek +DocType: Payment Reconciliation Invoice,Invoice Number,Številka računa +apps/erpnext/erpnext/hooks.py +70,Orders,Naročila +DocType: Leave Control Panel,Employee Type,Vrsta delavec +DocType: Employee Leave Approver,Leave Approver,Pustite odobritelju +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Litje +DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Preneseno za Izdelava +DocType: Expense Claim,"A user with ""Expense Approver"" role",Uporabnik z "Expense odobritelj" vlogi +,Issued Items Against Production Order,Izdane Postavke proti proizvodnji reda +DocType: Pricing Rule,Purchase Manager,Nakup Manager +DocType: Payment Tool,Payment Tool,Plačilo Tool +DocType: Target Detail,Target Detail,Ciljna Detail +DocType: Sales Order,% of materials billed against this Sales Order,% Materialov zaračunali proti tej Sales Order +apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Obdobje Closing Začetek +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v skupini +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija +apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavitelj (-i) +DocType: Customer,Credit Limit,Kreditni limit +apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Izberite vrsto posla +DocType: GL Entry,Voucher No,Voucher ni +DocType: Leave Allocation,Leave Allocation,Pustite Dodelitev +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Material Zahteve {0} ustvarjene +apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Predloga izrazov ali pogodbe. +DocType: Customer,Address and Contact,Naslov in Stik +DocType: Customer,Last Day of the Next Month,Zadnji dan v naslednjem mesecu +DocType: Employee,Feedback,Povratne informacije +apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s) +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Vzdrževalec. Urnik +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazivni curek strojna obdelava +DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Vnosi +DocType: Website Settings,Website Settings,Spletna stran Nastavitve +DocType: Item,Reorder level based on Warehouse,Raven Preureditev temelji na Warehouse +DocType: Activity Cost,Billing Rate,Zaračunavanje Rate +,Qty to Deliver,Količina na Deliver +DocType: Monthly Distribution Percentage,Month,Mesec +,Stock Analytics,Zaloga Analytics +DocType: Installation Note Item,Against Document Detail No,Proti Podrobnosti dokumenta št +DocType: Quality Inspection,Outgoing,Odhodni +DocType: Material Request,Requested For,Zaprosila za +DocType: Quotation Item,Against Doctype,Proti DOCTYPE +DocType: Delivery Note,Track this Delivery Note against any Project,Sledi tej dobavnica proti kateri koli projekt +apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root račun ni mogoče izbrisati +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Prikaži Stock Vnosi +,Is Primary Address,Je primarni naslov +DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referenčna # {0} dne {1} +apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje naslovov +DocType: Pricing Rule,Item Code,Oznaka +DocType: Production Planning Tool,Create Production Orders,Ustvarjanje naročila za proizvodnjo +DocType: Serial No,Warranty / AMC Details,Garancija / AMC Podrobnosti +DocType: Journal Entry,User Remark,Uporabnik Pripomba +DocType: Lead,Market Segment,Tržni segment +DocType: Communication,Phone,Telefon +DocType: Employee Internal Work History,Employee Internal Work History,Zaposleni Notranji Delo Zgodovina +apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Zapiranje (Dr) +DocType: Contact,Passive,Pasivna +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijska št {0} ni na zalogi +apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Davčna predlogo za prodajo transakcije. +DocType: Sales Invoice,Write Off Outstanding Amount,Napišite Off neporavnanega zneska +DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Preverite, če boste potrebovali samodejne ponavljajoče račune. Po predložitvi prometnega račun, bo Ponavljajoči poglavje vidna." +DocType: Account,Accounts Manager,Accounts Manager +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Čas Log {0} je treba "Submitted" +DocType: Stock Settings,Default Stock UOM,Privzeto Stock UOM +DocType: Time Log,Costing Rate based on Activity Type (per hour),Stanejo Ocenite temelji na vrsto dejavnosti (na uro) +DocType: Production Planning Tool,Create Material Requests,Ustvarite Material Zahteve +DocType: Employee Education,School/University,Šola / univerza +DocType: Sales Invoice Item,Available Qty at Warehouse,Na voljo Količina na Warehouse +,Billed Amount,Zaračunavajo Znesek +DocType: Bank Reconciliation,Bank Reconciliation,Banka Sprava +apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dobite posodobitve +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodajte nekaj zapisov vzorčnih +apps/erpnext/erpnext/config/learn.py +208,Leave Management,Pustite upravljanje +DocType: Event,Groups,Skupine +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,"Skupina, ki jo račun" +DocType: Sales Order,Fully Delivered,Popolnoma Delivered +DocType: Lead,Lower Income,Nižji od dobička +DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Glava računa na podlagi odgovornosti, v katerem se bodo rezervirana dobiček / izguba" +DocType: Payment Tool,Against Vouchers,Proti boni +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hitra pomoč +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Vir in cilj skladišče ne more biti enaka za vrstico {0} +DocType: Features Setup,Sales Extras,Prodajna Extras +apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} proti centru Cost {2} bo presegel s {3} +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev" +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0} +DocType: Leave Allocation,Carry Forwarded Leaves,Carry Posredovano Leaves +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Od datuma" mora biti po "Da Datum ' +,Stock Projected Qty,Stock Predvidena Količina +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}" +DocType: Sales Order,Customer's Purchase Order,Stranke Naročilo +DocType: Warranty Claim,From Company,Od družbe +apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vrednost ali Kol +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minute +DocType: Purchase Invoice,Purchase Taxes and Charges,Nakup davki in dajatve +,Qty to Receive,Količina za prejemanje +DocType: Leave Block List,Leave Block List Allowed,Pustite Block Seznam Dovoljeno +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor konverzije ne more biti v frakcijah +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Lahko ga bodo uporabljali za prijavo +DocType: Sales Partner,Retailer,Retailer +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit Za računu mora biti bilanca računa +apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Vse vrste Dobavitelj +apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Oznaka je obvezna, ker se postavka samodejno ni oštevilčen" +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Kotacija {0} ni tipa {1} +DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vzdrževanje Urnik Postavka +DocType: Sales Order,% Delivered,% Delivered +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bančnem računu računa +apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Naredite plačilnega lista +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Odčepiti +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Prebrskaj BOM +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Secured Posojila +apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super izdelki +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Otvoritev Balance Equity +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Ne more odobriti dopusta, kot si ne dovoli, da odobri liste o skupinskih termini" +DocType: Appraisal,Appraisal,Cenitev +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Izgubljene pena litje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Risanje +apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponovi +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0} +DocType: Hub Settings,Seller Email,Prodajalec Email +DocType: Project,Total Purchase Cost (via Purchase Invoice),Skupaj Nakup Cost (via računu o nakupu) +DocType: Workstation Working Hour,Start Time,Začetni čas +DocType: Item Price,Bulk Import Help,Bulk Import Pomoč +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Izberite Količina +apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Odobritvi vloge ne more biti enaka kot vloga je pravilo, ki veljajo za" +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Odjaviti iz te Email Digest +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Sporočilo je bilo poslano +DocType: Production Plan Sales Order,SO Date,SO Datum +DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Obrestna mera, po kateri Cenik valuti se pretvorijo v osn stranke" +DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto znesek (družba Valuta) +DocType: BOM Operation,Hour Rate,Urni tečaj +DocType: Stock Settings,Item Naming By,Postavka Poimenovanje S +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Od Kotacija +apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Drug zaključnem obdobju Začetek {0} je bil dosežen po {1} +DocType: Production Order,Material Transferred for Manufacturing,Material Preneseno za Manufacturing +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Račun {0} ne obstaja +DocType: Purchase Receipt Item,Purchase Order Item No,Naročilnica Art.-Št. +DocType: System Settings,System Settings,Sistemske nastavitve +DocType: Project,Project Type,Projekt Type +apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Bodisi ciljna kol ali ciljna vrednost je obvezna. +apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Stroške različnih dejavnosti +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Ni dovoljeno, da posodobite transakcije zalog starejši od {0}" +DocType: Item,Inspection Required,Inšpekcijski Zahtevano +DocType: Purchase Invoice Item,PR Detail,PR Detail +DocType: Sales Order,Fully Billed,Popolnoma zaračunavajo +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Denarna sredstva v blagajni +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Dostava skladišče potreben za postavko parka {0} +DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto teža paketa. Ponavadi neto teža + embalaža teže. (za tisk) +DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uporabniki s to vlogo dovoljeno postaviti na zamrznjene račune in ustvariti / spreminjanje vknjižbe zoper zamrznjenih računih +DocType: Serial No,Is Cancelled,Je Preklicana +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Moje pošiljke +DocType: Journal Entry,Bill Date,Bill Datum +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Tudi če obstaja več cenovnih Pravila z najvišjo prioriteto, se uporabljajo nato naslednji notranje prednostne naloge:" +DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti +DocType: Communication,Recipients,Prejemniki +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Vijačenje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Narebričenju +DocType: Expense Claim,Approval Status,Stanje odobritve +DocType: Hub Settings,Publish Items to Hub,Objavite artikel v Hub +apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Iz mora biti vrednost manj kot na vrednosti v vrstici {0} +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer +apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Izberite bančni račun +DocType: Newsletter,Create and Send Newsletters,Ustvarjanje in pošiljanje glasila +sites/assets/js/report.min.js +107,From Date must be before To Date,Od datuma mora biti pred Do Datum +DocType: Sales Order,Recurring Order,Ponavljajoči naročilo +DocType: Company,Default Income Account,Privzeto Prihodki račun +apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Skupina kupec / stranka +DocType: Item Group,Check this if you want to show in website,"Označite to, če želite, da kažejo na spletni strani" +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Dobrodošli na ERPNext +DocType: Payment Reconciliation Payment,Voucher Detail Number,Bon Detail Število +apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Privede do Kotacija +DocType: Lead,From Customer,Od kupca +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Poziva +DocType: Project,Total Costing Amount (via Time Logs),Skupaj Stanejo Znesek (preko Čas Dnevniki) +DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila +,Projected,Predvidoma +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijska št {0} ne pripada Warehouse {1} +apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0 +DocType: Notification Control,Quotation Message,Kotacija Sporočilo +DocType: Issue,Opening Date,Otvoritev Datum +DocType: Journal Entry,Remark,Pripomba +DocType: Purchase Receipt Item,Rate and Amount,Stopnja in znesek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Od Sales Order +DocType: Blog Category,Parent Website Route,Parent Website Route +DocType: Sales Order,Not Billed,Ne zaračunavajo +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba Skladišče mora pripadati isti družbi +sites/assets/js/erpnext.min.js +25,No contacts added yet.,Ni stikov še dodal. +apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ni aktiven +apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Proti računa napotitvi Datum +DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Pristali Stroški bon Znesek +DocType: Time Log,Batched for Billing,Posodi za plačevanja +apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Računi, ki jih dobavitelji postavljeno." +DocType: POS Profile,Write Off Account,Napišite Off račun +sites/assets/js/erpnext.min.js +26,Discount Amount,Popust Količina +DocType: Purchase Invoice,Return Against Purchase Invoice,Vrni proti Račun za nakup +DocType: Item,Warranty Period (in days),Garancijski rok (v dnevih) +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,npr DDV +apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Postavka 4 +DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun +DocType: Shopping Cart Settings,Quotation Series,Kotacija Series +apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal plin oblikovanje +DocType: Sales Order Item,Sales Order Date,Sales Order Date +DocType: Sales Invoice Item,Delivered Qty,Delivered Kol +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Skladišče {0}: Podjetje je obvezna +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Pojdi na ustrezno skupino (običajno vir sredstev> kratkoročnimi obveznostmi> davkov in dajatev ter ustvariti nov račun (s klikom na Dodaj Child) tipa "davek" in ne omenjam davčna stopnja. +,Payment Period Based On Invoice Date,Plačilo obdobju na podlagi računa Datum +apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manjka Menjalni tečaji za {0} +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserski razrez +DocType: Event,Monday,Ponedeljek +DocType: Journal Entry,Stock Entry,Stock Začetek +DocType: Account,Payable,Plačljivo +DocType: Salary Slip,Arrear Amount,Arrear Znesek +apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nove stranke +apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Bruto dobiček % +DocType: Appraisal Goal,Weightage (%),Weightage (%) +DocType: Bank Reconciliation Detail,Clearance Date,Potrditev Datum +DocType: Newsletter,Newsletter List,Newsletter Seznam +DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Preverite, če želite poslati plačilni list v pošti na vsakega zaposlenega, medtem ko predložitev plačilni list" +DocType: Lead,Address Desc,Naslov opis izdelka +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mora biti izbran Atleast eden prodaji ali nakupu +apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Kjer so proizvodni postopki. +DocType: Page,All,Vsi +DocType: Stock Entry Detail,Source Warehouse,Vir Skladišče +DocType: Installation Note,Installation Date,Datum vgradnje +DocType: Employee,Confirmation Date,Potrditev Datum +DocType: C-Form,Total Invoiced Amount,Skupaj Obračunani znesek +DocType: Account,Sales User,Prodaja Uporabnik +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Količina ne sme biti večja od Max Kol +DocType: Stock Entry,Customer or Supplier Details,Stranka ali dobavitelj Podrobnosti +apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set +DocType: Lead,Lead Owner,Svinec lastnika +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Je potrebno skladišče +DocType: Employee,Marital Status,Zakonski stan +DocType: Stock Settings,Auto Material Request,Auto Material Zahteva +DocType: Time Log,Will be updated when billed.,"Bo treba posodobiti, če zaračunavajo." +apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Trenutni BOM in New BOM ne more biti enaka +apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum upokojitve sme biti večja od Datum pridružitve +DocType: Sales Invoice,Against Income Account,Proti dohodkov +apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ​​ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki). +DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mesečni Distribution Odstotek +DocType: Territory,Territory Targets,Territory cilji +DocType: Delivery Note,Transporter Info,Transporter Info +DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Nakup Sklep Postavka Priložena +apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Letter Glave za tiskane predloge. +apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za tiskane predloge, npr predračunu." +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Stroški Tip vrednotenje ni mogoče označiti kot Inclusive +DocType: POS Profile,Update Stock,Posodobitev Stock +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Drugačna UOM za artikle bo privedlo do napačne (skupno) Neto teža vrednosti. Prepričajte se, da je neto teža vsake postavke v istem UOM." +apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Prosimo povlecite predmete iz dobavnice +apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Revija Vnosi {0} so un-povezani +apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Evidenca vseh komunikacij tipa elektronski pošti, telefonu, klepet, obisk, itd" +apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Navedite zaokrožijo stroškovno mesto v družbi +DocType: Purchase Invoice,Terms,Pogoji +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Ustvari novo +DocType: Buying Settings,Purchase Order Required,Naročilnica obvezno +,Item-wise Sales History,Element-pametno Sales Zgodovina +DocType: Expense Claim,Total Sanctioned Amount,Skupaj sankcionirano Znesek +,Purchase Analytics,Odkupne Analytics +DocType: Sales Invoice Item,Delivery Note Item,Dostava Opomba Postavka +DocType: Expense Claim,Task,Naloga +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Britje +DocType: Purchase Taxes and Charges,Reference Row #,Referenčna Row # +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Serijska številka je obvezna za postavko {0} +apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je koren prodaje oseba in jih ni mogoče urejati. +,Stock Ledger,Stock Ledger +apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Stopnja: {0} +DocType: Salary Slip Deduction,Salary Slip Deduction,Plača Slip Odbitek +apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Opombe +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Izberite skupino vozlišče prvi. +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cilj mora biti eden od {0} +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Izpolnite obrazec in ga shranite +DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Prenesite poročilo, ki vsebuje vse surovine s svojo najnovejšo stanja zalog" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Soočenje +DocType: Leave Application,Leave Balance Before Application,Pustite Stanje pred uporabo +DocType: SMS Center,Send SMS,Pošlji SMS +DocType: Company,Default Letter Head,Privzeto glavi pisma +DocType: Time Log,Billable,Plačljivo +DocType: Authorization Rule,This will be used for setting rule in HR module,Ta se bo uporabljal za vzpostavitev vladavine v HR modula +DocType: Account,Rate at which this tax is applied,"Hitrost, s katero se ta davek" +apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Preureditev Kol +DocType: Company,Stock Adjustment Account,Račun Prilagoditev Stock +DocType: Journal Entry,Write Off,Odpisati +DocType: Time Log,Operation ID,Operacija ID +DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem uporabniku (login) ID. Če je nastavljeno, bo postala privzeta za vse oblike HR." +apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Od {1} +DocType: Task,depends_on,odvisno od +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Priložnost Lost +DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Popust Polja bo na voljo v narocilo, Potrdilo o nakupu, nakup računa" +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ime novega računa. Opomba: Prosimo, da ne ustvarjajo računov za kupce in dobavitelje" +DocType: Report,Report Type,Poročilo Type +apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Nalaganje +DocType: BOM Replace Tool,BOM Replace Tool,BOM Zamenjaj orodje +apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država pametno privzeti naslov Predloge +apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0} +apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import Export +DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Če se vključujejo v proizvodne dejavnosti. Omogoča Postavka "izdeluje" +DocType: Sales Invoice,Rounded Total,Zaobljeni Skupaj +DocType: Product Bundle,List items that form the package.,"Seznam predmetov, ki tvorijo paket." +apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Odstotek dodelitve mora biti enaka 100% +DocType: Serial No,Out of AMC,Od AMC +DocType: Purchase Order Item,Material Request Detail No,Material Zahteva Detail Ne +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard turning +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Naredite Maintenance obisk +apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo" +DocType: Company,Default Cash Account,Privzeto Cash račun +apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ne stranka ali dobavitelj) gospodar. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Prosimo, vpišite "Pričakovana Dostava Date"" +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Plačan znesek + odpis Znesek ne sme biti večja od Grand Skupaj +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ni veljavna številka serije za postavko {1} +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0} +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Opomba: Če se plačilo ni izvedeno pred kakršno koli sklicevanje, da Journal Entry ročno." +DocType: Item,Supplier Items,Dobavitelj Items +DocType: Opportunity,Opportunity Type,Priložnost Type +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Nova podjetja +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Stroškov Center je potrebno za "izkaz poslovnega izida" račun {0} +apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transakcije se lahko izbriše le s ustvarjalca družbe +apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nepravilno število General Ledger Entries našel. Morda ste izbrali napačen račun v transakciji. +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Če želite ustvariti račun Bank +DocType: Hub Settings,Publish Availability,Objavite Razpoložljivost +apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Datum rojstva ne more biti večja, kot je danes." +,Stock Ageing,Stock Staranje +apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} "je onemogočena +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavi kot Odpri +DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošlji samodejne elektronske pošte v Contacts o posredovanju transakcij. +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}. + Available Qty: {4}, Transfer Qty: {5}","Vrstica {0}: Kol ne avalable v skladišču {1} na {2} {3}. Na voljo Kol: {4}, Prenos Količina: {5}" +apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postavka 3 +DocType: Event,Sunday,Nedelja +DocType: Sales Team,Contribution (%),Prispevek (%) +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opomba: Začetek Plačilo se ne bodo ustvarili, saj "gotovinski ali bančni račun" ni bil podan" +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti +apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Predloga +DocType: Sales Person,Sales Person Name,Prodaja Oseba Name +apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vnesite atleast 1 račun v tabeli +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj uporabnike +DocType: Pricing Rule,Item Group,Element Group +DocType: Task,Actual Start Date (via Time Logs),Actual Start Date (via Čas Dnevniki) +DocType: Stock Reconciliation Item,Before reconciliation,Pred sprave +apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0} +DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Davki in dajatve na dodano vrednost (Company Valuta) +apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi +DocType: Sales Order,Partly Billed,Delno zaračunavajo +DocType: Item,Default BOM,Privzeto BOM +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering +apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Prosimo, ponovno tip firma za potrditev" +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Skupaj Izjemna Amt +DocType: Time Log Batch,Total Hours,Skupaj ure +DocType: Journal Entry,Printing Settings,Printing Settings +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0} +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Avtomobilizem +apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Listi za tip {0} že dodeljene za Employee {1} za poslovno leto {0} +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Je potrebno postavko +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal brizganje +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Od dobavnica +DocType: Time Log,From Time,Od časa +DocType: Notification Control,Custom Message,Sporočilo po meri +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investicijsko bančništvo +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Izberite vašo državo, časovni pas in valuto" +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Gotovina ali bančnega računa je obvezen za izdelavo vnos plačila +DocType: Purchase Invoice,Price List Exchange Rate,Cenik Exchange Rate +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Dekapiranje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Pesek litje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanizacije +DocType: Purchase Invoice Item,Rate,Stopnja +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern +DocType: Newsletter,A Lead with this email id should exist,Vodilno vlogo pri tem email id morala obstajati +DocType: Stock Entry,From BOM,Od BOM +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Osnovni +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Zaloga transakcije pred {0} so zamrznjeni +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Prosimo, kliknite na "ustvarjajo Seznamu"" +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Do datuma mora biti enaka kot Od datuma za pol dneva dopusta +apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","npr Kg, Unit, Nos, m" +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenčna številka je obvezna, če ste vnesli Referenčni datum" +apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum Pridružil sme biti večja od Datum rojstva +DocType: Salary Structure,Salary Structure,Plača Struktura +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \ + conflict by assigning priority. Price Rules: {0}","Multiple Cena pravilo obstaja z istimi merili, prosim rešiti \ konflikt z dodeljevanjem prednost. Cena Pravila: {0}" +DocType: Account,Bank,Bank +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Airline +apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Vprašanje Material +DocType: Material Request Item,For Warehouse,Za Skladišče +DocType: Employee,Offer Date,Ponudba Datum +DocType: Hub Settings,Access Token,Dostopni žeton +DocType: Sales Invoice Item,Serial No,Zaporedna številka +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Prosimo, da najprej vnesete Maintaince Podrobnosti" +DocType: Item,Is Fixed Asset Item,Je osnovno sredstvo Item +DocType: Stock Entry,Including items for sub assemblies,"Vključno s postavkami, za sklope" +DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Če imate dolge oblike tiskanja, lahko ta funkcija se uporablja za razdeliti stran se natisne na več straneh z vsemi glave in noge na vsaki strani" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Vse Territories +DocType: Purchase Invoice,Items,Predmeti +DocType: Fiscal Year,Year Name,Leto Name +DocType: Process Payroll,Process Payroll,Proces na izplačane plače +apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Obstaja več prazniki od delovnih dneh tega meseca. +DocType: Product Bundle Item,Product Bundle Item,Izdelek Bundle Postavka +DocType: Sales Partner,Sales Partner Name,Prodaja Partner Name +DocType: Purchase Invoice Item,Image View,Image View +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Dodelava in industrijsko obdelavo +DocType: Issue,Opening Time,Otvoritev čas +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od in Do datumov zahtevanih +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze +DocType: Shipping Rule,Calculate Based On,Izračun temelji na +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Vrtanje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Pihanje +DocType: Purchase Taxes and Charges,Valuation and Total,Vrednotenje in Total +DocType: Tax Rule,Shipping City,Dostava Mesto +apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ta postavka je varianta {0} (Template). Atributi bodo kopirali več iz predloge, če je nastavljen "Ne Kopiraj«" +DocType: Account,Purchase User,Nakup Uporabnik +DocType: Notification Control,Customize the Notification,Prilagodite Obvestilo +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Kovanje +DocType: Web Page,Slideshow,Slideshow +apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Privzeto Naslov Predloga ni mogoče izbrisati +DocType: Sales Invoice,Shipping Rule,Dostava Pravilo +DocType: Journal Entry,Print Heading,Print Postavka +DocType: Quotation,Maintenance Manager,Vzdrževanje Manager +DocType: Workflow State,Search,Iskanje +apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Skupaj ne more biti nič +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"Dnevi od zadnjega reda" mora biti večji ali enak nič +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Spajkanje +DocType: C-Form,Amended From,Spremenjeni Od +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surovina +DocType: Leave Application,Follow via Email,Sledite preko e-maila +DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Davčna Znesek Po Popust Znesek +apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,"Otrok račun obstaja za ta račun. Ne, ne moreš izbrisati ta račun." +apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Bodisi ciljna kol ali ciljna vrednost je obvezna +apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej" +DocType: Leave Allocation,Carry Forward,Carry Forward +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v knjigo terjatev +DocType: Department,Days for which Holidays are blocked for this department.,"Dni, za katere so Holidays blokirana za ta oddelek." +,Produced,Proizvedena +DocType: Item,Item Code for Suppliers,Oznaka za dobavitelje +DocType: Issue,Raised By (Email),Postavljeno Z (e-naslov) +apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Splošno +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Priložite pisemski +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne more odbiti, če je kategorija za "vrednotenje" ali "Vrednotenje in Total"" +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Seznam vaših davčnih glave (npr DDV, carine itd, morajo imeti edinstvena imena) in njihovi standardni normativi. To bo ustvarilo standardno predlogo, ki jo lahko urediti in dodati več kasneje." +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serijska št Zahtevano za zaporednimi postavki {0} +DocType: Journal Entry,Bank Entry,Banka Začetek +DocType: Authorization Rule,Applicable To (Designation),Ki se uporabljajo za (Oznaka) +DocType: Blog Post,Blog Post,Blog Post +apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Skupina S +apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Omogoči / onemogoči valute. +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštni stroški +apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Skupaj (Amt) +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Zabava & prosti čas +DocType: Purchase Order,The date on which recurring order will be stop,"Datum, na katerega se bodo ponavljajoče se naročilo ustavi" +DocType: Quality Inspection,Item Serial No,Postavka Zaporedna številka +apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} je treba zmanjšati za {1} ali pa bi se morala povečati strpnost preliva +apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Skupaj Present +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Ura +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \ + using Stock Reconciliation",Zaporednimi Postavka {0} ni mogoče posodobiti \ uporabo zaloge sprave +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Prenos Material za dobavitelja +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nova serijska številka ne more imeti skladišče. Skladišče mora nastaviti borze vstopu ali Potrdilo o nakupu +DocType: Lead,Lead Type,Svinec Type +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Ustvarite predračun +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Vsi ti predmeti so bili že obračunano +apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mogoče odobriti {0} +DocType: Shipping Rule,Shipping Rule Conditions,Dostava Pravilo Pogoji +DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM po zamenjavi +DocType: Features Setup,Point of Sale,Prodajno mesto +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling +DocType: Account,Tax,Davčna +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Vrstica {0}: {1} ni veljaven {2} +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafiniranje +DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool +DocType: Quality Inspection,Report Date,Poročilo Datum +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Usmerjanje +DocType: C-Form,Invoices,Računi +DocType: Job Opening,Job Title,Job Naslov +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Prejemniki +DocType: Features Setup,Item Groups in Details,Postavka Skupine v Podrobnosti +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0. +apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Začetek Point-of-Sale (POS) +apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Obiščite poročilo za vzdrževalna klic. +DocType: Stock Entry,Update Rate and Availability,Posodobitev Oceni in razpoložljivost +DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Odstotek ste dovoljeno prejemati ali dostaviti bolj proti količine naročenega. Na primer: Če ste naročili 100 enot. in vaš dodatek za 10%, potem ste lahko prejeli 110 enot." +DocType: Pricing Rule,Customer Group,Skupina za stranke +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0} +DocType: Item,Website Description,Spletna stran Opis +DocType: Serial No,AMC Expiry Date,AMC preteka Datum +,Sales Register,Prodaja Register +DocType: Quotation,Quotation Lost Reason,Kotacija Lost Razlog +DocType: Address,Plant,Rastlina +DocType: DocType,Setup,Nastaviti +apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nič ni za urejanje. +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Povzetek za ta mesec in v teku dejavnosti +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Hladno valjanje +DocType: Customer Group,Customer Group Name,Skupina Ime stranke +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}" +DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosimo, izberite Carry Forward, če želite vključiti tudi v preteklem poslovnem letu je bilanca prepušča tem fiskalnem letu" +DocType: GL Entry,Against Voucher Type,Proti bon Type +DocType: Item,Attributes,Atributi +DocType: Packing Slip,Get Items,Pridobite Items +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Vnesite Napišite Off račun +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Zadnja Datum naročila +DocType: DocField,Image,Image +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Naredite trošarine fakturo +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Račun {0} ne pripada podjetju {1} +DocType: Communication,Other,Drugi +DocType: C-Form,C-Form,C-Form +apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacija ID ni nastavljen +DocType: Production Order,Planned Start Date,Načrtovani datum začetka +DocType: Serial No,Creation Document Type,Creation Document Type +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Vzdrževalec. Obisk +DocType: Leave Type,Is Encash,Je vnovči +DocType: Purchase Invoice,Mobile No,Mobile No +DocType: Payment Tool,Make Journal Entry,Naredite Journal Entry +DocType: Leave Allocation,New Leaves Allocated,Nove Listi Dodeljena +apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Podatki projekt pametno ni na voljo za ponudbo +DocType: Project,Expected End Date,Pričakovani datum zaključka +DocType: Appraisal Template,Appraisal Template Title,Cenitev Predloga Naslov +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Commercial +apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} ne sme biti Stock Postavka +DocType: Cost Center,Distribution Id,Porazdelitev Id +apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super Storitve +apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Vse izdelke ali storitve. +DocType: Purchase Invoice,Supplier Address,Dobavitelj Naslov +DocType: Contact Us Settings,Address Line 2,Naslov Line 2 +DocType: ToDo,Reference,Sklicevanje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforiranje +apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Kol +apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravila za izračun zneska ladijskega za prodajo +apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serija je obvezna +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finančne storitve +apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrednost za Attribute {0} mora biti v razponu od {1} na {2} v korakih po {3} +DocType: Tax Rule,Sales,Prodaja +DocType: Stock Entry Detail,Basic Amount,Osnovni znesek +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr +DocType: Customer,Default Receivable Accounts,Privzeto Terjatev računov +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Žaganje +DocType: Tax Rule,Billing State,Država za zaračunavanje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminiranje +DocType: Item Reorder,Transfer,Prenos +apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov) +DocType: Authorization Rule,Applicable To (Employee),Ki se uporabljajo za (zaposlenih) +apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum zapadlosti je obvezno +apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0 +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintranje +DocType: Journal Entry,Pay To / Recd From,Pay / Recd Od +DocType: Naming Series,Setup Series,Setup Series +DocType: Supplier,Contact HTML,Kontakt HTML +DocType: Landed Cost Voucher,Purchase Receipts,Odkupne Prejemki +DocType: Payment Reconciliation,Maximum Amount,Najvišji znesek +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako Pricing pravilo se uporablja? +DocType: Quality Inspection,Delivery Note No,Dostava Opomba Ne +DocType: Company,Retail,Maloprodaja +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Stranka {0} ne obstaja +DocType: Attendance,Absent,Odsoten +DocType: Product Bundle,Product Bundle,Bundle izdelek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Drobljenje +DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Nakup davki in dajatve Template +DocType: Upload Attendance,Download Template,Download Predloga +DocType: GL Entry,Remarks,Opombe +DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Oznaka +DocType: Journal Entry,Write Off Based On,Odpisuje temelji na +DocType: Features Setup,POS View,POS View +apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Namestitev rekord Serial No. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuirano litje +sites/assets/js/erpnext.min.js +10,Please specify a,"Prosimo, določite" +DocType: Offer Letter,Awaiting Response,Čakanje na odgovor +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Nad +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Hladno dimenzioniranje +DocType: Salary Slip,Earning & Deduction,Zaslužek & Odbitek +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Upoštevati {0} ne more biti skupina +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regija +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Neobvezno. Ta nastavitev bo uporabljena za filtriranje v različnih poslih. +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno +DocType: Holiday List,Weekly Off,Tedenski Off +DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za primer leta 2012, 2012-13" +apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Začasna dobiček / izguba (Credit) +DocType: Sales Invoice,Return Against Sales Invoice,Vrni proti prodajne fakture +apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Postavka 5 +apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Prosim, nastavite privzeto vrednost {0} v družbi {1}" +DocType: Serial No,Creation Time,Čas ustvarjanja +apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Skupni prihodki +DocType: Sales Invoice,Product Bundle Help,Izdelek Bundle Pomoč +,Monthly Attendance Sheet,Mesečni Udeležba Sheet +apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nobenega zapisa najdenih +apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Stroški Center je obvezen za postavko {2} +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Račun {0} je neaktiven +DocType: GL Entry,Is Advance,Je Advance +apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Udeležba Od datuma in udeležba na Datum je obvezna +apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Prosimo, vpišite "Je v podizvajanje", kot DA ali NE" +DocType: Sales Team,Contact No.,Kontakt No. +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Izkaz poslovnega izida" tip račun {0} ni dovoljen v vstopna odprtina +DocType: Workflow State,Time,Čas +DocType: Features Setup,Sales Discounts,Prodajna Popusti +DocType: Hub Settings,Seller Country,Prodajalec Država +DocType: Authorization Rule,Authorization Rule,Dovoljenje Pravilo +DocType: Sales Invoice,Terms and Conditions Details,Pogoji in Podrobnosti +DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodajne Davki in dajatve predloge +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Oblačila in dodatki +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Število reda +DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, ki se bo prikazal na vrhu seznama izdelkov." +DocType: Shipping Rule,Specify conditions to calculate shipping amount,Navedite pogoje za izračun zneska ladijskega +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Dodaj Child +DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,"Vloga dovoliti, da določijo zamrznjenih računih in uredi Zamrznjen Entries" +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ni mogoče pretvoriti v stroškovni center za knjigo, saj ima otrok vozlišč" +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Je potrebna pretvorba Factor +apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial # +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisija za prodajo +DocType: Offer Letter Term,Value / Description,Vrednost / Opis +DocType: Tax Rule,Billing Country,Zaračunavanje Država +,Customers Not Buying Since Long Time,"Kupci ne kupujejo, saj dolgo časa" +DocType: Production Order,Expected Delivery Date,Pričakuje Dostava Datum +apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetnih in kreditnih ni enaka za {0} # {1}. Razlika je {2}. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Izbuljene +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Izhlapevanja-vzorec litje +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Stroški +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} je treba preklicati pred ukinitvijo te Sales Order +apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Starost +DocType: Time Log,Billing Amount,Zaračunavanje Znesek +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Neveljavna količina, določena za postavko {0}. Količina mora biti večja od 0." +apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Vloge za dopust. +apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Pravni stroški +DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dan v mesecu, v katerem se bo samodejno naročilo ustvarila npr 05, 28, itd" +DocType: Sales Invoice,Posting Time,Napotitev čas +DocType: Sales Order,% Amount Billed,% Zaračunani znesek +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefonske Stroški +DocType: Sales Partner,Logo,Logo +DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Označite to, če želite, da prisili uporabnika, da izberete vrsto pred shranjevanjem. Tam ne bo privzeto, če to preverite." +apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ne Postavka s serijsko št {0} +apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Odprte Obvestila +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Neposredni stroški +apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Ali res želite Odčepiti tega materiala Zahtevaj? +apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer Prihodki +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Potni stroški +DocType: Maintenance Visit,Breakdown,Zlomiti se +apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1} +DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum +apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: Matično račun {1} ne pripada podjetju: {2} +apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspešno izbrisana vse transakcije v zvezi s to družbo! +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kot na datum +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honanje +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Poskusno delo +apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Privzeto Skladišče je obvezna za borzo točki. +DocType: Feed,Full Name,Polno ime +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching +apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Izplačilo plače za mesec {0} in leto {1} +DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert stopnja Cenik če manjka +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Skupaj Plačan znesek +,Transferred Qty,Prenese Kol +apps/erpnext/erpnext/config/learn.py +11,Navigating,Krmarjenje +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Načrtovanje +apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Naredite Čas Log Batch +apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Izdala +DocType: Project,Total Billing Amount (via Time Logs),Skupni znesek plačevanja (preko Čas Dnevniki) +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Prodamo ta artikel +apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dobavitelj Id +DocType: Journal Entry,Cash Entry,Cash Začetek +DocType: Sales Partner,Contact Desc,Kontakt opis izdelka +apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Vrsta listov kot priložnostno, bolni itd" +DocType: Email Digest,Send regular summary reports via Email.,Pošlji redna zbirna poročila preko e-maila. +DocType: Brand,Item Manager,Element Manager +DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Dodajte vrstice, da določijo letne proračune na računih." +DocType: Buying Settings,Default Supplier Type,Privzeta Dobavitelj Type +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Kamnolomi +DocType: Production Order,Total Operating Cost,Skupni operativni stroški +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat +apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Vsi stiki. +DocType: Newsletter,Test Email Id,Testna Email Id +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Kratica podjetje +DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Če sledite kontrolo kakovosti. Omogoča item QA obvezno in ZK ni v Potrdilo o nakupu +DocType: GL Entry,Party Type,Vrsta Party +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,"Surovina, ne more biti isto kot glavni element" +DocType: Item Attribute Value,Abbreviation,Kratica +apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"Ne authroized saj je {0}, presega meje" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotacijsko oblikovanje +apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plača predlogo gospodar. +DocType: Leave Type,Max Days Leave Allowed,Max dni dopusta Dovoljeno +apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Nastavite Davčna pravilo za nakupovalno košarico +DocType: Payment Tool,Set Matching Amounts,Nastavite ujemanja Zneski +DocType: Purchase Invoice,Taxes and Charges Added,Davki in dajatve Dodano +,Sales Funnel,Prodaja toka +apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Kratica je obvezna +apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Košarica +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Zahvaljujemo se vam za vaše zanimanje za prijavo na naših posodobitve +,Qty to Transfer,Količina Prenos +apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citati za Interesenti ali stranke. +DocType: Stock Settings,Role Allowed to edit frozen stock,Vloga Dovoljeno urediti zamrznjeno zalog +,Territory Target Variance Item Group-Wise,Ozemlje Ciljna Varianca Postavka Group-Wise +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Vse skupine strank +apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezna. Mogoče je Menjalni zapis ni ustvarjen za {1} na {2}. +apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Davčna Predloga je obvezna. +apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Račun {0}: Matično račun {1} ne obstaja +DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenik Rate (družba Valuta) +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} status "Ustavljen" +DocType: Account,Temporary,Začasna +DocType: Address,Preferred Billing Address,Želeni plačevanja Naslov +DocType: Monthly Distribution Percentage,Percentage Allocation,Odstotek dodelitve +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretar +DocType: Serial No,Distinct unit of an Item,Ločena enota Postavka +DocType: Pricing Rule,Buying,Odkup +DocType: HR Settings,Employee Records to be created by,"Zapisi zaposlenih, ki ga povzročajo" +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Serija je bila preklicana. +,Reqd By Date,Reqd po Datum +DocType: Salary Slip Earning,Salary Slip Earning,Plača Slip zaslužka +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Upniki +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Vrstica # {0}: Zaporedna številka je obvezna +DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postavka Wise Davčna Detail +,Item-wise Price List Rate,Element-pametno Cenik Rate +DocType: Purchase Order Item,Supplier Quotation,Dobavitelj za predračun +DocType: Quotation,In Words will be visible once you save the Quotation.,"V besedi bo viden, ko boste prihranili citata." +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Likanje +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} je ustavila +apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1} +DocType: Lead,Add to calendar on this date,Dodaj v koledar na ta dan +apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodajanje stroškov dostave. +apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Prihajajoči dogodki +apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je potrebno kupca +DocType: Letter Head,Letter Head,Pismo Head +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obvezna za vrnitev +DocType: Purchase Order,To Receive,Prejeti +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink opremljanje +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com +DocType: Email Digest,Income / Expense,Prihodki / odhodki +DocType: Employee,Personal Email,Osebna Email +apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Skupne variance +DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Če je omogočeno, bo sistem objavili računovodske vnose za popis samodejno." +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Posredništvo +DocType: Address,Postal Code,Poštna številka +DocType: Production Order Operation,"in Minutes +Updated via 'Time Log'",v minutah Posodobljeno preko "Čas Logu" +DocType: Customer,From Lead,Iz svinca +apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Naročila sprosti za proizvodnjo. +apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Izberite poslovno leto ... +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry" +DocType: Hub Settings,Name Token,Ime Token +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Inženiring +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardna Prodaja +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast eno skladišče je obvezna +DocType: Serial No,Out of Warranty,Iz garancije +DocType: BOM Replace Tool,Replace,Zamenjaj +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} proti prodajne fakture {1} +apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Vnesite privzeto mersko enoto +DocType: Purchase Invoice Item,Project Name,Ime projekta +DocType: Supplier,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun +DocType: Workflow State,Edit,Urejanje +DocType: Journal Entry Account,If Income or Expense,Če prihodek ali odhodek +DocType: Features Setup,Item Batch Nos,Postavka Serija Nos +DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Razlika +apps/erpnext/erpnext/config/learn.py +199,Human Resource,Človeški viri +DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Plačilo Sprava Plačilo +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Davčni Sredstva +DocType: BOM Item,BOM No,BOM Ne +DocType: Contact Us Settings,Pincode,Kodi PIN +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nima računa {1} ali že primerjali z drugimi kupon +DocType: Item,Moving Average,Moving Average +DocType: BOM Replace Tool,The BOM which will be replaced,BOM ki bo nadomestila +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM mora biti drugačna od trenutne zaloge UOM +DocType: Account,Debit,Debetne +apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,Listi morajo biti dodeljen v večkratnikih 0.5 +DocType: Production Order,Operation Cost,Delovanje Stroški +apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Naloži udeležbo iz .csv datoteke +apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izjemna Amt +DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Določiti cilje Postavka Group-pametno za te prodaje oseba. +DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Dodeliti to težavo, uporabite gumb "Dodeli" v stranski vrstici." +DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zaloge Older Than [dni] +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Če dva ali več Cenik Pravilnik ugotovila na podlagi zgoraj navedenih pogojev, se uporablja Prioriteta. Prednostno je število med 0 do 20, medtem ko privzeta vrednost nič (prazno). Višja številka pomeni, da bo prednost, če obstaja več cenovnih Pravila z enakimi pogoji." +apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Proti računa +apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Poslovno leto: {0} ne obstaja +DocType: Currency Exchange,To Currency,Valutnemu +DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Pustimo, da se naslednji uporabniki za odobritev dopusta Aplikacije za blok dni." +apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Vrste Expense zahtevka. +DocType: Item,Taxes,Davki +DocType: Project,Default Cost Center,Privzeto Center Stroški +DocType: Purchase Invoice,End Date,Končni datum +DocType: Employee,Internal Work History,Notranji Delo Zgodovina +DocType: DocField,Column Break,Stolpec Break +DocType: Event,Thursday,Četrtek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Obračanja +DocType: Maintenance Visit,Customer Feedback,Customer Feedback +DocType: Account,Expense,Expense +DocType: Sales Invoice,Exhibition,Razstava +DocType: Item Attribute,From Range,Od Območje +apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Postavka {0} prezrta, ker ne gre za element parka" +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Predloži ta proizvodnja red za nadaljnjo predelavo. +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Da ne uporabljajo Cenovno pravilo v posameznem poslu, bi morali vsi, ki se uporabljajo pravila za oblikovanje cen so onemogočeni." +DocType: Company,Domain,Domena +,Sales Order Trends,Sales Order Trendi +DocType: Employee,Held On,Potekala v +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Proizvodnja Postavka +,Employee Information,Informacije zaposleni +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stopnja (%) +DocType: Stock Entry Detail,Additional Cost,Dodatne Stroški +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Proračunsko leto End Date +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Filter ne more temeljiti na kupona št, če je združena s Voucher" +apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Naredite Dobavitelj predračun +DocType: Quality Inspection,Incoming,Dohodni +DocType: BOM,Materials Required (Exploded),Potreben materiali (eksplodirala) +DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmanjšajte Služenje za dopust brez plačila (md) +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Dodati uporabnike za vašo organizacijo, razen sebe" +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Vrstica # {0}: Serijska št {1} ne ujema z {2} {3} +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Zapusti +DocType: Batch,Batch ID,Serija ID +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Opomba: {0} +,Delivery Note Trends,Dobavnica Trendi +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Povzetek Ta teden je +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora biti kupljena ali podizvajalcev Postavka v vrstici {1} +apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Račun: {0} se lahko posodobi samo preko delniških poslov +DocType: GL Entry,Party,Zabava +DocType: Sales Order,Delivery Date,Datum dostave +DocType: DocField,Currency,Valuta +DocType: Opportunity,Opportunity Date,Priložnost Datum +DocType: Purchase Receipt,Return Against Purchase Receipt,Vrni Proti Potrdilo o nakupu +DocType: Purchase Order,To Bill,Billu +DocType: Material Request,% Ordered,% Ž +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akord +apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Odkup tečaj +DocType: Task,Actual Time (in Hours),Dejanski čas (v urah) +DocType: Employee,History In Company,Zgodovina V družbi +apps/erpnext/erpnext/config/learn.py +92,Newsletters,Glasila +DocType: Address,Shipping,Dostava +DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry +DocType: Department,Leave Block List,Pustite Block List +DocType: Customer,Tax ID,Davčna številka +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Postavka {0} ni setup za Serijska št. Kolona mora biti prazno +DocType: Accounts Settings,Accounts Settings,Računi Nastavitve +DocType: Customer,Sales Partner and Commission,Prodaja Partner in Komisija +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Naprav in strojev +DocType: Sales Partner,Partner's Website,Spletna stran partnerja +DocType: Opportunity,To Discuss,Razpravljati +DocType: SMS Settings,SMS Settings,Nastavitve SMS +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Začasni računi +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Črna +DocType: BOM Explosion Item,BOM Explosion Item,BOM Eksplozija Postavka +DocType: Account,Auditor,Revizor +DocType: Purchase Order,End date of current order's period,Končni datum obdobja Trenutni vrstni red je +apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Naredite Pisna ponudba +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Return +apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Privzeto mersko enoto za Variant mora biti enaka kot predlogo +DocType: DocField,Fold,Zložite +DocType: Production Order Operation,Production Order Operation,Proizvodnja naročite Delovanje +DocType: Pricing Rule,Disable,Onemogoči +DocType: Project Task,Pending Review,Dokler Pregled +apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Prosimo, navedite" +DocType: Task,Total Expense Claim (via Expense Claim),Total Expense zahtevek (preko Expense zahtevka) +apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID stranke +DocType: Page,Page Name,Page Name +apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Da mora biti čas biti večja od od časa +DocType: Journal Entry Account,Exchange Rate,Menjalni tečaj +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} ni predložila +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladišče {0}: Matično račun {1} ne Bolong podjetju {2} +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Vreteno Dodelava +DocType: BOM,Last Purchase Rate,Zadnja Purchase Rate +DocType: Account,Asset,Asset +DocType: Project Task,Task ID,Naloga ID +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",npr "MC" +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Stock ne more obstajati za postavko {0}, saj ima variant" +,Sales Person-wise Transaction Summary,Prodaja Oseba pametno Transakcijski Povzetek +DocType: System Settings,Time Zone,Časovni pas +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Skladišče {0} ne obstaja +apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registracija Za ERPNext Hub +DocType: Monthly Distribution,Monthly Distribution Percentages,Mesečni Distribucijski Odstotki +apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Izbrana postavka ne more imeti Batch +DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materialov podal proti tej dobavnici +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Spenjanje +DocType: Customer,Customer Details,Podrobnosti strank +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Oblikovanje +DocType: Employee,Reports to,Poročila +DocType: SMS Settings,Enter url parameter for receiver nos,Vnesite url parameter za sprejemnik nos +DocType: Sales Invoice,Paid Amount,Plačan znesek +apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',"Zapiranje račun {0}, mora biti tipa "odgovornosti"" +,Available Stock for Packing Items,Zaloga za Embalaža Items +DocType: Item Variant,Item Variant,Postavka Variant +apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Nastavitev ta naslov predlogo kot privzeto saj ni druge privzeto +apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu že v obremenitve, se vam ni dovoljeno, da nastavite "Stanje mora biti" kot "kredit"" +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kakovosti +DocType: Production Planning Tool,Filter based on customer,"Filter, ki temelji na kupca" +DocType: Payment Tool Detail,Against Voucher No,Proti kupona št +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Vnesite količino za postavko {0} +DocType: Employee External Work History,Employee External Work History,Delavec Zunanji Delo Zgodovina +DocType: Tax Rule,Purchase,Nakup +apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Kol +DocType: Item Group,Parent Item Group,Parent Item Group +apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} za {1} +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Stroškovnih mestih +apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Skladišča. +DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Obrestna mera, po kateri dobavitelj je valuti, se pretvori v osnovni valuti družbe" +apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Vrstica # {0}: čase v nasprotju z vrsto {1} +DocType: Opportunity,Next Contact,Naslednja Kontakt +DocType: Employee,Employment Type,Vrsta zaposlovanje +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Osnovna sredstva +DocType: Item Group,Default Expense Account,Privzeto Expense račun +DocType: Employee,Notice (days),Obvestilo (dni) +DocType: Page,Yes,Da +DocType: Tax Rule,Sales Tax Template,Sales Tax Predloga +DocType: Employee,Encashment Date,Vnovčevanje Datum +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Proti bon mora Vrsta biti eden narocilo, Nakup računa ali list Začetek" +DocType: Account,Stock Adjustment,Prilagoditev Stock +apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Obstaja Stroški Privzeta aktivnost za vrsto dejavnosti - {0} +DocType: Production Order,Planned Operating Cost,Načrtovana operacijski stroškov +apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Name +apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},V prilogi vam pošiljamo {0} # {1} +DocType: Job Applicant,Applicant Name,Predlagatelj Ime +DocType: Authorization Rule,Customer / Item Name,Stranka / Item Name +DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. + +The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"". + +For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item. + +Note: BOM = Bill of Materials","Agregat skupina ** Items ** v drugo ** postavki **. To je uporabno, če ste združevanje neka ** Items ** v paketu in jo vzdrževati zalogo pakiranih ** Items ** in ne agregat ** item **. Paket ** Item ** bodo imeli "Je Stock Postavka" kot "ne" in "Je Sales Item", kot je "Yes". Na primer: Če prodajate Prenosniki in nahrbtniki ločeno in imajo posebno ceno, če kupec kupi tako, potem bo Laptop + nahrbtnik nov Bundle Izdelek točka. Opomba: BOM = Bill of Materials" +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Zaporedna številka je obvezna za postavko {0} +DocType: Item Variant Attribute,Attribute,Lastnost +apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Prosimo, navedite iz / v razponu" +sites/assets/js/desk.min.js +7652,Created By,Ustvaril +DocType: Serial No,Under AMC,Pod AMC +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Stopnja vrednotenje sredstev se preračuna razmišlja pristali stroškovno vrednost kupona +apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Privzete nastavitve za prodajne transakcije. +DocType: BOM Replace Tool,Current BOM,Trenutni BOM +sites/assets/js/erpnext.min.js +8,Add Serial No,Dodaj Serijska št +DocType: Production Order,Warehouses,Skladišča +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print in Stacionarna +apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Skupina Node +DocType: Payment Reconciliation,Minimum Amount,Minimalni znesek +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,"Posodobitev končnih izdelkov," +DocType: Workstation,per hour,na uro +apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serija {0} že uporabljajo v {1} +DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladišče (Perpetual Inventory) bo nastala na podlagi tega računa. +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladišče ni mogoče črtati, saj obstaja vnos stock knjiga za to skladišče." +DocType: Company,Distribution,Porazdelitev +sites/assets/js/erpnext.min.js +50,Amount Paid,Plačani znesek +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max popust dovoljena za postavko: {0} je {1}% +DocType: Customer,Default Taxes and Charges,Privzete Davki in dajatve +DocType: Account,Receivable,Terjatev +DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vloga, ki jo je dovoljeno vložiti transakcije, ki presegajo omejitve posojil zastavili." +DocType: Sales Invoice,Supplier Reference,Dobavitelj Reference +DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Če je omogočeno, bo BOM za podsklopov postavk šteti za pridobivanje surovin. V nasprotnem primeru bodo vsi podsklopi postavke se obravnavajo kot surovino." +DocType: Material Request,Material Issue,Material Issue +DocType: Hub Settings,Seller Description,Prodajalec Opis +DocType: Employee Education,Qualification,Kvalifikacije +DocType: Item Price,Item Price,Item Cena +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Detergent +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video +apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naročeno +DocType: Warehouse,Warehouse Name,Skladišče Name +DocType: Naming Series,Select Transaction,Izberite Transaction +apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vnesite Odobritev vloge ali Potrditev uporabnika +DocType: Journal Entry,Write Off Entry,Napišite Off Entry +DocType: BOM,Rate Of Materials Based On,Oceni materialov na osnovi +apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics +apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Podjetje manjka v skladiščih {0} +DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Zamenjaj Utility +DocType: POS Profile,Terms and Conditions,Pravila in pogoji +apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Do datuma mora biti v poslovnem letu. Ob predpostavki, da želite Datum = {0}" +DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Tukaj lahko ohranijo višino, težo, alergije, zdravstvene pomisleke itd" +DocType: Leave Block List,Applies to Company,Velja za podjetja +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Ni mogoče preklicati, ker je predložila Stock Začetek {0} obstaja" +DocType: Purchase Invoice,In Words,V besedi +apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,Danes je {0} 's rojstni dan! +DocType: Production Planning Tool,Material Request For Warehouse,Material Zahteva za skladišča +DocType: Sales Order Item,For Production,Za proizvodnjo +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Prosimo, vnesite prodajno naročilo v zgornji tabeli" +DocType: Project Task,View Task,Ogled Task +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Vaš proračunsko leto se začne na +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Vnesite Nakup Prejemki +DocType: Sales Invoice,Get Advances Received,Get prejeti predujmi +DocType: Email Digest,Add/Remove Recipients,Dodaj / Odstrani prejemnike +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakcija ni dovoljena zoper ustavili proizvodnjo naročite {0} +apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Če želite nastaviti to poslovno leto kot privzeto, kliknite na "Set as Default"" +apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup dohodni strežnik za podporo email id. (npr support@example.com) +apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Pomanjkanje Kol +apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi +DocType: Salary Slip,Salary Slip,Plača listek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruniranje +apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"Da Datum" je potrebno +DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Ustvarjajo dobavnic, da paketi dostavi. Uporablja se za uradno številko paketa, vsebino paketa in njegovo težo." +DocType: Sales Invoice Item,Sales Order Item,Sales Order Postavka +DocType: Salary Slip,Payment Days,Plačilni dnevi +DocType: BOM,Manage cost of operations,Upravljati stroške poslovanja +DocType: Features Setup,Item Advanced,Postavka Napredno +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Toplo valjanje +DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ko kateri koli od pregledanih transakcij "Objavil", e-pop-up samodejno odpre, da pošljete e-pošto s pripadajočim "stik" v tem poslu, s poslom, kot prilogo. Uporabnik lahko ali pa ne pošljete e-pošto." +apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalni Nastavitve +DocType: Employee Education,Employee Education,Izobraževanje delavec +DocType: Salary Slip,Net Pay,Neto plača +DocType: Account,Account,Račun +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijska št {0} je že prejela +,Requested Items To Be Transferred,Zahtevane blago prenaša +DocType: Purchase Invoice,Recurring Id,Ponavljajoči Id +DocType: Customer,Sales Team Details,Sales Team Podrobnosti +DocType: Expense Claim,Total Claimed Amount,Skupaj zahtevani znesek +apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potencialne možnosti za prodajo. +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Bolniški dopust +DocType: Email Digest,Email Digest,Email Digest +DocType: Delivery Note,Billing Address Name,Zaračunavanje Naslov Name +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Veleblagovnice +apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistem Balance +DocType: Workflow,Is Active,Je aktiven +apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ni vknjižbe za naslednjih skladiščih +apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Shranite dokument na prvem mestu. +DocType: Account,Chargeable,Obračuna +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing +DocType: Company,Change Abbreviation,Spremeni Kratica +DocType: Workflow State,Primary,Primarni +DocType: Expense Claim Detail,Expense Date,Expense Datum +DocType: Item,Max Discount (%),Max Popust (%) +DocType: Communication,More Information,Več informacij +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Zadnja naročite Znesek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Miniranje +DocType: Company,Warn,Opozori +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Postavka vrednotenje posodobljeni +DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Kakršne koli druge pripombe, omembe vredna napora, da bi moral iti v evidencah." +DocType: BOM,Manufacturing User,Proizvodnja Uporabnik +DocType: Purchase Order,Raw Materials Supplied,"Surovin, dobavljenih" +DocType: Purchase Invoice,Recurring Print Format,Ponavljajoči Print Format +DocType: Communication,Series,Series +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Pričakuje Dostava datum ne more biti pred narocilo Datum +DocType: Appraisal,Appraisal Template,Cenitev Predloga +DocType: Communication,Email,E-naslov +DocType: Item Group,Item Classification,Postavka Razvrstitev +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager +DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vzdrževanje Obiščite Namen +apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Obdobje +,General Ledger,Glavna knjiga +apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Poglej Interesenti +DocType: Item Attribute Value,Attribute Value,Vrednosti atributa +apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id mora biti edinstven, že obstaja za {0}" +,Itemwise Recommended Reorder Level,Itemwise Priporočena Preureditev Raven +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Prosimo, izberite {0} najprej" +DocType: Features Setup,To get Item Group in details table,Da bi dobili item Group v podrobnosti tabeli +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Serija {0} od Postavka {1} je potekla. +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Jedkanje +DocType: Sales Invoice,Commission,Komisija +DocType: Address Template,"

    Default Template

    +

    Uses Jinja Templating and all the fields of Address (including Custom Fields if any) will be available

    +
    {{ address_line1 }}<br>
+{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
+{{ city }}<br>
+{% if state %}{{ state }}<br>{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}<br>{% endif -%}
+{{ country }}<br>
+{% if phone %}Phone: {{ phone }}<br>{% endif -%}
+{% if fax %}Fax: {{ fax }}<br>{% endif -%}
+{% if email_id %}Email: {{ email_id }}<br>{% endif -%}
+
    ","

    Privzeto Predloga

    Uporablja Jinja templating in vsa področja naslov (vključno s po meri Fields če sploh) bo na voljo 

     {{ address_line1 }}<br> {% if address_line2 %}{{ address_line2 }}<br>{% endif -%} {{ city }}<br> {% if state %}{{ state }}<br>{% endif -%} {% if pincode %} PIN: {{ pincode }}<br>{% endif -%} {{ country }}<br> {% if phone %}Phone: {{ phone }}<br>{% endif -%} {% if fax %}Fax: {{ fax }}<br>{% endif -%} {% if email_id %}Email: {{ email_id }}<br>{% endif -%}
    " +DocType: Salary Slip Deduction,Default Amount,Privzeto Znesek +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Skladišče ni mogoče najti v sistemu +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Povzetek tega meseca je +DocType: Quality Inspection Reading,Quality Inspection Reading,Kakovost Inšpekcijski Reading +apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Zaloge Starejši Than` mora biti manjša od% d dni. +DocType: Tax Rule,Purchase Tax Template,Nakup Davčna Template +,Project wise Stock Tracking,Projekt pametno Stock Tracking +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Obstaja vzdrževanje Urnik {0} proti {0} +DocType: Stock Entry Detail,Actual Qty (at source/target),Dejanska Količina (pri viru / cilju) +DocType: Item Customer Detail,Ref Code,Ref Code +apps/erpnext/erpnext/config/hr.py +13,Employee records.,Evidence zaposlenih. +DocType: HR Settings,Payroll Settings,Nastavitve plače +apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match nepovezane računov in plačil. +apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Naročiti +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root ne more imeti matična stroškovno mesto v +DocType: Sales Invoice,C-Form Applicable,"C-obliki, ki velja" +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}" +DocType: Supplier,Address and Contacts,Naslov in kontakti +DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),"Imejte to spletno prijazno 900px (w), ki ga 100px (h)" +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Proizvodnja naročilo ne more biti postavljeno pred Predloga Postavka +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Dajatve so posodobljeni v Potrdilo o nakupu ob vsaki postavki +DocType: Payment Tool,Get Outstanding Vouchers,Pridobite Neporavnane bonov +DocType: Warranty Claim,Resolved By,Rešujejo s +DocType: Appraisal,Start Date,Datum začetka +sites/assets/js/desk.min.js +7629,Value,Vrednost +apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Dodeli liste za obdobje. +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Kliknite tukaj, da se preveri" +apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Račun {0}: ne moreš sam dodeliti kot matično račun +DocType: Purchase Invoice Item,Price List Rate,Cenik Rate +DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Pokaži "Na zalogi" ali "Ni na zalogi", ki temelji na zalogi na voljo v tem skladišču." +apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Kosovnica (BOM) +DocType: Item,Average time taken by the supplier to deliver,"Povprečen čas, ki ga dobavitelj dostaviti" +DocType: Time Log,Hours,Ur +DocType: Project,Expected Start Date,Pričakovani datum začetka +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Valjanje +DocType: ToDo,Priority,Prednost +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Odstranite element, če stroški ne nanaša na to postavko" +DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox dostop dovoljen +DocType: Dropbox Backup,Weekly,Tedenski +DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr. smsgateway.com/api/send_sms.cgi +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Prejeti +DocType: Maintenance Visit,Fully Completed,V celoti končana +apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete +DocType: Employee,Educational Qualification,Izobraževalni Kvalifikacije +DocType: Workstation,Operating Costs,Obratovalni stroški +DocType: Employee Leave Approver,Employee Leave Approver,Zaposleni Leave odobritelj +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je bil uspešno dodan v seznam novice. +apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1} +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil." +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Strojna žarek elektronov +DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nakup Master Manager +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Proizvodnja naročite {0} je treba predložiti +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Prosimo, izberite Start in končni datum za postavko {0}" +apps/erpnext/erpnext/config/stock.py +141,Main Reports,Glavni Poročila +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger vnosi bilanc posodobljene +apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danes ne more biti pred od datuma +DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE +apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Dodaj / Uredi Cene +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon stroškovnih mest +,Requested Items To Be Ordered,Zahtevane Postavke naloži +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Moja naročila +DocType: Price List,Price List Name,Cenik Ime +DocType: Time Log,For Manufacturing,Za Manufacturing +apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Pri zaokrožanju +DocType: BOM,Manufacturing,Predelovalne dejavnosti +,Ordered Items To Be Delivered,Naročeno Točke je treba dostaviti +DocType: Account,Income,Prihodki +,Setup Wizard,Setup Wizard +DocType: Industry Type,Industry Type,Industrija Type +apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nekaj ​​je šlo narobe! +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Prodaja Račun {0} je že bila predložena +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,datum dokončanja +DocType: Purchase Invoice Item,Amount (Company Currency),Znesek (družba Valuta) +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Litja +DocType: Email Alert,Reference Date,Referenčni datum +apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,"Organizacijska enota (oddelek), master." +apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Vnesite veljavne mobilne nos +DocType: Budget Detail,Budget Detail,Proračun Detail +apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vnesite sporočilo pred pošiljanjem +DocType: Async Task,Status,Status +apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM posodobljena za postavko {0} +DocType: Company History,Year,Leto +apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profila +apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Prosimo Posodobite Nastavitve SMS +apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Čas Log {0} že zaračunavajo +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Nezavarovana posojila +DocType: Cost Center,Cost Center Name,Stalo Ime Center +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Postavka {0} s serijsko št {1} je že nameščen +DocType: Maintenance Schedule Detail,Scheduled Date,Načrtovano Datum +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Paid Amt +DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Sporočila večji od 160 znakov, bo razdeljeno v več sporočilih" +DocType: Purchase Receipt Item,Received and Accepted,Prejme in potrdi +,Serial No Service Contract Expiry,Zaporedna številka Service Contract preteka +DocType: Item,Unit of Measure Conversion,Merska enota konverzijo +apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Delavec se ne more spremeniti +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času" +DocType: Naming Series,Help HTML,Pomoč HTML +apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0} +apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Dodatek za prekomerno {0} prečkal za postavko {1} +DocType: Address,Name of person or organization that this address belongs to.,"Ime osebe ali organizacije, ki ta naslov pripada." +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaše Dobavitelji +apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order." +apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Drug Plača Struktura {0} je aktiven na zaposlenega {1}. Prosimo, da se njegov status "neaktivno" za nadaljevanje." +DocType: Purchase Invoice,Contact,Kontakt +DocType: Features Setup,Exports,Izvoz +DocType: Lead,Converted,Pretvorjena +DocType: Item,Has Serial No,Ima Serijska št +DocType: Employee,Date of Issue,Datum izdaje +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} za {1} +DocType: Issue,Content Type,Vrsta vsebine +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Računalnik +DocType: Item,List this Item in multiple groups on the website.,Seznam ta postavka v več skupinah na spletni strani. +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti" +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Postavka: {0} ne obstaja v sistemu +apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost +DocType: Payment Reconciliation,Get Unreconciled Entries,Pridobite Unreconciled Entries +DocType: Cost Center,Budgets,Proračuni +apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Posodobljeno +DocType: Employee,Emergency Contact Details,Zasilna Kontaktni podatki +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Kaj to naredi? +DocType: Delivery Note,To Warehouse,Za skladišča +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Račun {0} je bila vpisana več kot enkrat za fiskalno leto {1} +,Average Commission Rate,Povprečen Komisija Rate +apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"Ima Serial ne" ne more biti 'Da' za ne-parka postavko +apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume +DocType: Pricing Rule,Pricing Rule Help,Cen Pravilo Pomoč +DocType: Purchase Taxes and Charges,Account Head,Račun Head +apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Posodobite dodatnih stroškov za izračun iztovori stroške predmetov +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Električno +DocType: Stock Entry,Total Value Difference (Out - In),Skupna vrednost Razlika (Out - IN) +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen +apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID uporabnika ni nastavljena za Employee {0} +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening +apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Iz garancijskega zahtevka +DocType: Stock Entry,Default Source Warehouse,Privzeto Vir Skladišče +DocType: Item,Customer Code,Koda za stranke +apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}" +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lepanje +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dni od zadnjega reda +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa +DocType: Buying Settings,Naming Series,Poimenovanje serije +DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List +DocType: User,Enabled,Omogočeno +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Zaloga Sredstva +apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},"Ali res želite, da predložijo vse plačilnega lista za mesec {0} in leto {1}" +apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Uvozna Naročniki +DocType: Target Detail,Target Qty,Ciljna Kol +DocType: Attendance,Present,Present +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Dobavnica {0} ni treba predložiti +DocType: Notification Control,Sales Invoice Message,Prodaja Račun Sporočilo +DocType: Authorization Rule,Based On,Temelji na +,Ordered Qty,Naročeno Kol +DocType: Stock Settings,Stock Frozen Upto,Stock Zamrznjena Stanuje +apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektna dejavnost / naloga. +apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Ustvarjajo plače kombineže +apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ni veljaven email id +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Odkup je treba preveriti, če se uporablja za izbrana kot {0}" +apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Popust, mora biti manj kot 100" +DocType: ToDo,Low,Nizka +DocType: Purchase Invoice,Write Off Amount (Company Currency),Napišite enkratni znesek (družba Valuta) +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning +DocType: Landed Cost Voucher,Landed Cost Voucher,Pristali Stroški bon +apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Prosim, nastavite {0}" +DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan Meseca +DocType: Employee,Health Details,Zdravje Podrobnosti +DocType: Offer Letter,Offer Letter Terms,Pisna ponudba pogoji +DocType: Features Setup,To track any installation or commissioning related work after sales,Slediti nobene namestitve ali naročanjem povezano delo po prodaji +DocType: Project,Estimated Costing,Ocenjena Costing +DocType: Purchase Invoice Advance,Journal Entry Detail No,Journal Entry Detail Ne +DocType: Employee External Work History,Salary,Plača +DocType: Serial No,Delivery Document Type,Dostava Document Type +DocType: Process Payroll,Submit all salary slips for the above selected criteria,Predložiti vse plačilne liste za zgoraj izbranih kriterijih +apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Postavke sinhronizirano +DocType: Sales Order,Partly Delivered,Delno Delivered +DocType: Sales Invoice,Existing Customer,Obstoječih kupcev +DocType: Email Digest,Receivables,Terjatve +DocType: Customer,Additional information regarding the customer.,Dodatne informacije o kupcu. +DocType: Quality Inspection Reading,Reading 5,Branje 5 +DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Vnesite email id ločeni z vejicami, bo naročilo samodejno poslali na določen datum" +apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Je potrebno Ime akcija +DocType: Maintenance Visit,Maintenance Date,Vzdrževanje Datum +DocType: Purchase Receipt Item,Rejected Serial No,Zavrnjeno Zaporedna številka +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Globoko vlečenje +apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Začetni datum mora biti manjša od končnega datuma za postavko {0} +apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Prikaži Balance +DocType: Item,"Example: ABCD.##### +If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Primer:. ABCD ##### Če je serija nastavljen in serijska številka ni navedena v transakcijah, se bo ustvaril nato samodejno serijska številka, ki temelji na tej seriji. Če ste si vedno želeli izrecno omeniti Serial številk za to postavko. pustite prazno." +DocType: Upload Attendance,Upload Attendance,Naloži Udeležba +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Količina so obvezna +apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Staranje Razpon 2 +DocType: Journal Entry Account,Amount,Znesek +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Kovičenje +apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nadomesti +,Sales Analytics,Prodajna Analytics +DocType: Manufacturing Settings,Manufacturing Settings,Proizvodne Nastavitve +apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavitev Email +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Vnesite privzeto valuto v podjetju Master +DocType: Stock Entry Detail,Stock Entry Detail,Stock Začetek Detail +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Dnevni opomniki +apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Davčna Pravilo Konflikti z {0} +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Ime računa +DocType: Purchase Invoice Item,Raw Materials Supplied Cost,"Surovin, dobavljenih Stroški" +DocType: Selling Settings,Settings for Selling Module,Nastavitve za prodajo Module +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Storitev za stranke +DocType: Item,Thumbnail,Thumbnail +DocType: Item Customer Detail,Item Customer Detail,Postavka Detail Stranka +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potrdite svoj e-poštni +apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ponudba kandidat Job. +DocType: Notification Control,Prompt for Email on Submission of,Vprašal za e-poštni ob predložitvi +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Postavka {0} mora biti stock postavka +DocType: Manufacturing Settings,Default Work In Progress Warehouse,Privzeto Delo v skladišču napredku +apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Privzete nastavitve za računovodske posle. +apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je potrebno +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vacuum modeliranje +apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Pričakovani datum ne more biti pred Material Request Datum +DocType: Contact Us Settings,City,Kraj +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic strojna obdelava +apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Napaka: Ni veljaven id? +apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Postavka {0} mora biti Sales postavka +DocType: Naming Series,Update Series Number,Posodobitev Series Število +DocType: Account,Equity,Kapital +DocType: Sales Order,Printing Details,Tiskanje Podrobnosti +DocType: Task,Closing Date,Zapiranje Datum +DocType: Sales Order Item,Produced Quantity,Proizvedena količina +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inženir +apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Iskanje sklope +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Oznaka zahteva pri Row št {0} +DocType: Sales Partner,Partner Type,Partner Type +DocType: Purchase Taxes and Charges,Actual,Actual +DocType: Authorization Rule,Customerwise Discount,Customerwise Popust +DocType: Purchase Invoice,Against Expense Account,Proti Expense račun +DocType: Production Order,Production Order,Proizvodnja naročilo +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0} +DocType: Quotation Item,Against Docname,Proti Docname +DocType: SMS Center,All Employee (Active),Vsi zaposlenih (Active) +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Oglejte si zdaj +DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Izberite obdobje, ko bo račun samodejno ustvari" +DocType: BOM,Raw Material Cost,Raw Material Stroški +DocType: Item,Re-Order Level,Ponovno naročila ravni +DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Vnesite predmete in načrtovano kol, za katere želite, da dvig proizvodnih nalogov ali prenos surovin za analizo." +sites/assets/js/list.min.js +174,Gantt Chart,Gantogram +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Krajši delovni čas +DocType: Employee,Applicable Holiday List,Velja Holiday Seznam +DocType: Employee,Cheque,Ček +apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Posodobljeno +apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Vrsta poročila je obvezna +DocType: Item,Serial Number Series,Serijska številka serije +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Skladišče je obvezna za borzo postavki {0} v vrstici {1} +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Trgovina na drobno in na debelo +DocType: Issue,First Responded On,Najprej odgovorila +DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Uvrstitev točke v več skupinah +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Prva Uporabnik: You +apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna Leto Start Date in fiskalno leto End Date so že določeni v proračunskem letu {0} +apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Uspešno Pobotano +DocType: Production Order,Planned End Date,Načrtovan End Date +apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Če so predmeti shranjeni. +DocType: Tax Rule,Validity,Veljavnost +apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Obračunani znesek +DocType: Attendance,Attendance,Udeležba +DocType: Page,No,Ne +DocType: BOM,Materials,Materiali +DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Če ni izbrana, bo seznam je treba dodati, da vsak oddelek, kjer je treba uporabiti." +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna" +apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Davčna predlogo za nakup transakcij. +,Item Prices,Postavka Cene +DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"V besedi bo viden, ko boste prihranili naročilnico." +DocType: Period Closing Voucher,Period Closing Voucher,Obdobje Closing bon +apps/erpnext/erpnext/config/stock.py +125,Price List master.,Cenik gospodar. +DocType: Task,Review Date,Pregled Datum +DocType: Purchase Invoice,Advance Payments,Predplačila +DocType: DocPerm,Level,Stopnja +DocType: Purchase Taxes and Charges,On Net Total,On Net Total +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Ciljna skladišče v vrstici {0} mora biti enaka kot Production reda +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ni dovoljenja za uporabo plačilnega orodje +apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"Obvestilo o e-poštni naslovi" niso določeni za ponavljajoče% s +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Rezkanje +apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Valuta ni mogoče spremeniti, potem ko vnose uporabljate kakšno drugo valuto" +DocType: Company,Round Off Account,Zaokrožijo račun +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Grizljanjem +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni stroški +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting +DocType: Customer Group,Parent Customer Group,Parent Customer Group +sites/assets/js/erpnext.min.js +50,Change,Spremeni +DocType: Purchase Invoice,Contact Email,Kontakt E-pošta +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Naročilnica {0} je "Ustavljen" +DocType: Appraisal Goal,Score Earned,Rezultat Zaslužili +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",na primer "My Company LLC" +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Odpovedni rok +DocType: Bank Reconciliation Detail,Voucher ID,Bon ID +apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To je koren ozemlje in ga ni mogoče urejati. +DocType: Packing Slip,Gross Weight UOM,Bruto Teža UOM +DocType: Email Digest,Receivables / Payables,Terjatve / obveznosti +DocType: Delivery Note Item,Against Sales Invoice,Proti prodajni fakturi +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Žigosanje +DocType: Landed Cost Item,Landed Cost Item,Pristali Stroški Postavka +apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Prikaži ničelnimi vrednostmi +DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina postavke pridobljeno po proizvodnji / prepakiranja iz danih količin surovin +DocType: Payment Reconciliation,Receivable / Payable Account,Terjatve / plačljivo račun +DocType: Delivery Note Item,Against Sales Order Item,Proti Sales Order Postavka +apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}" +DocType: Item,Default Warehouse,Privzeto Skladišče +DocType: Task,Actual End Date (via Time Logs),Dejanski končni datum (via Čas Dnevniki) +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Proračun ne more biti dodeljena pred Group račun {0} +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Vnesite stroškovno mesto matično +DocType: Delivery Note,Print Without Amount,Natisni Brez Znesek +apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Davčna kategorija ne more biti "Vrednotenje" ali "Vrednotenje in celokupni", saj so vsi predmeti brez zalogi" +DocType: User,Last Name,Priimek +DocType: Web Page,Left,Levo +DocType: Event,All Day,Cel dan +DocType: Issue,Support Team,Support Team +DocType: Appraisal,Total Score (Out of 5),Skupna ocena (od 5) +DocType: Contact Us Settings,State,Država +DocType: Batch,Batch,Serija +apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance +DocType: Project,Total Expense Claim (via Expense Claims),Total Expense zahtevek (preko Expense zahtevkov) +DocType: User,Gender,Spol +DocType: Journal Entry,Debit Note,Opomin +DocType: Stock Entry,As per Stock UOM,Kot je na borzi UOM +apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ni potekel +DocType: Journal Entry,Total Debit,Skupaj Debetna +DocType: Manufacturing Settings,Default Finished Goods Warehouse,Privzete Končano Blago Skladišče +apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Prodaja oseba +DocType: Sales Invoice,Cold Calling,Cold Calling +DocType: SMS Parameter,SMS Parameter,SMS Parameter +DocType: Maintenance Schedule Item,Half Yearly,Polletne +DocType: Lead,Blog Subscriber,Blog Subscriber +apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,"Ustvarite pravila za omejitev transakcije, ki temeljijo na vrednotah." +DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Če je označeno, Total no. delovnih dni bo vključeval praznike, in to se bo zmanjšala vrednost plač dan na" +DocType: Purchase Invoice,Total Advance,Skupaj Advance +apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Odčepiti Material Zahteva +DocType: Workflow State,User,Uporabnik +apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Predelava na izplačane plače +DocType: Opportunity Item,Basic Rate,Osnovni tečaj +DocType: GL Entry,Credit Amount,Credit Znesek +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Nastavi kot Lost +DocType: Customer,Credit Days Based On,Kreditne dni na podlagi +DocType: Tax Rule,Tax Rule,Davčna Pravilo +DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Ohraniti ista stopnja V celotnem ciklu prodaje +DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Načrtujte čas dnevnike zunaj Workstation delovnih ur. +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} je že bil predložen +,Items To Be Requested,"Predmeti, ki bodo zahtevana" +DocType: Purchase Order,Get Last Purchase Rate,Get zadnjega nakupa Rate +DocType: Time Log,Billing Rate based on Activity Type (per hour),Zaračunavanje Ocena temelji na vrsto dejavnosti (na uro) +DocType: Company,Company Info,Podjetje Info +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming +apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Družba E-pošta ID ni mogoče najti, zato pošta ni poslala" +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Uporaba sredstev (sredstva) +DocType: Production Planning Tool,Filter based on item,"Filter, ki temelji na točki" +DocType: Fiscal Year,Year Start Date,Leto Start Date +DocType: Attendance,Employee Name,ime zaposlenega +DocType: Sales Invoice,Rounded Total (Company Currency),Zaokrožena Skupaj (Company Valuta) +apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Ne more prikrite skupini, saj je izbrana vrsta računa." +DocType: Purchase Common,Purchase Common,Nakup Splošno +apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} je bila spremenjena. Osvežite. +DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop uporabnike iz česar dopusta aplikacij na naslednjih dneh. +apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Priložnost +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Slepimi +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaslužki zaposlencev +DocType: Sales Invoice,Is POS,Je POS +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1} +DocType: Production Order,Manufactured Qty,Izdelano Kol +DocType: Purchase Receipt Item,Accepted Quantity,Accepted Količina +apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne obstaja +apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Računi zbrana strankam. +DocType: DocField,Default,Privzeto +apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekt +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2} +apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} naročnikov dodane +DocType: Maintenance Schedule,Schedule,Urnik +DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Določite proračun za to stroškovno mesto. Če želite nastaviti proračunske ukrepe, glejte "Seznam Company"" +DocType: Account,Parent Account,Matično račun +DocType: Quality Inspection Reading,Reading 3,Branje 3 +,Hub,Hub +DocType: GL Entry,Voucher Type,Bon Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena +DocType: Expense Claim,Approved,Odobreno +DocType: Pricing Rule,Price,Cena +apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot "levo" +DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Izbira "Yes" bo dala edinstveno identiteto za vse subjekte te točke, ki jih lahko preberete v Serijska št mojstra." +apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Cenitev {0} ustvarjena za Employee {1} v določenem časovnem obdobju +DocType: Employee,Education,Izobraževanje +DocType: Selling Settings,Campaign Naming By,Imenovanje akcija Z +DocType: Employee,Current Address Is,Trenutni Naslov je +DocType: Address,Office,Pisarna +apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardne Poročila +apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Vpisi računovodstvo lista. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi." +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Vrstica {0}: Party / račun se ne ujema z {1} / {2} v {3} {4} +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Če želite ustvariti davčnem obračunu +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Vnesite Expense račun +DocType: Account,Stock,Stock +DocType: Employee,Current Address,Trenutni naslov +DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Če postavka je varianta drug element, potem opis, slike, cene, davki, itd bo določil iz predloge, razen če je izrecno določeno" +DocType: Serial No,Purchase / Manufacture Details,Nakup / Izdelava Podrobnosti +apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Serija Inventory +DocType: Employee,Contract End Date,Naročilo End Date +DocType: Sales Order,Track this Sales Order against any Project,Sledi tej Sales Order proti kateri koli projekt +DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodajne Pull naročil (v pričakovanju, da poda), na podlagi zgornjih meril" +DocType: DocShare,Document Type,Vrsta dokumenta +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Od dobavitelja Kotacija +DocType: Deduction Type,Deduction Type,Odbitek Type +DocType: Attendance,Half Day,Poldnevni +DocType: Pricing Rule,Min Qty,Min Kol +DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Za sledenje izdelkov v prodajnih in nabavnih dokumentov z šaržnih nos. "Prednostna industrija: Kemikalije" +DocType: GL Entry,Transaction Date,Transakcijski Datum +DocType: Production Plan Item,Planned Qty,Načrtovano Kol +apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Skupna davčna +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Za Količina (Izdelano Kol) obvezna +DocType: Stock Entry,Default Target Warehouse,Privzeto Target Skladišče +DocType: Purchase Invoice,Net Total (Company Currency),Net Total (družba Valuta) +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Vrstica {0}: Vrsta stranka in stranka se uporablja samo zoper terjatve / obveznosti račun +DocType: Notification Control,Purchase Receipt Message,Potrdilo o nakupu Sporočilo +DocType: Production Order,Actual Start Date,Dejanski datum začetka +DocType: Sales Order,% of materials delivered against this Sales Order,% Materialov podal proti tej Sales Order +apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Record gibanje postavka. +DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Seznam Subscriber +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dolbenje +DocType: Email Account,Service,Storitev +DocType: Hub Settings,Hub Settings,Nastavitve Hub +DocType: Project,Gross Margin %,Gross Margin% +DocType: BOM,With Operations,Pri poslovanju +apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}. +,Monthly Salary Register,Mesečni Plača Register +apps/frappe/frappe/website/template.py +123,Next,Naslednja +DocType: Warranty Claim,If different than customer address,Če je drugačen od naslova kupca +DocType: BOM Operation,BOM Operation,BOM Delovanje +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing +DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prejšnje vrstice Znesek +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Vnesite znesek plačila v atleast eno vrstico +DocType: POS Profile,POS Profile,POS profila +apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonskost za nastavitev proračunov, cilji itd" +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Vrstica {0}: Plačilo Znesek ne sme biti večja od neporavnanega zneska +apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Skupaj Neplačana +apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Čas Log ni plačljivih +apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Postavka {0} je predlogo, izberite eno od njenih različic" +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupec +apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Neto plača ne more biti negativna +apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Prosimo ročno vnesti s knjigovodskimi +DocType: SMS Settings,Static Parameters,Statični Parametri +DocType: Purchase Order,Advance Paid,Advance Paid +DocType: Item,Item Tax,Postavka Tax +DocType: Expense Claim,Employees Email Id,Zaposleni Email Id +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kratkoročne obveznosti +apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Pošlji množično SMS vaših stikov +DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite davek ali dajatev za +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Dejanska Količina je obvezna +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolling +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card +DocType: BOM,Item to be manufactured or repacked,"Postavka, ki se proizvaja ali prepakirana" +apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Privzete nastavitve za transakcije vrednostnih papirjev. +DocType: Purchase Invoice,Next Date,Naslednja Datum +DocType: Employee Education,Major/Optional Subjects,Major / Izbirni predmeti +apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vnesite davki in dajatve +apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Strojna +DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Tukaj lahko vzdržujejo družinske podrobnosti, kot so ime in poklic staršev, zakonca in otrok" +DocType: Hub Settings,Seller Name,Prodajalec Name +DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Davki in dajatve Odbitek (družba Valuta) +DocType: Item Group,General Settings,Splošne nastavitve +apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Od denarja in denarja ne more biti enaka +DocType: Stock Entry,Repack,Zapakirajte +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Morate Shranite obrazec, preden nadaljujete" +DocType: Item Attribute,Numeric Values,Numerične vrednosti +apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Priložite Logo +DocType: Customer,Commission Rate,Komisija Rate +apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Naredite Variant +apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikacije blok dopustu oddelka. +apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košarica je Prazna +DocType: Production Order,Actual Operating Cost,Dejanski operacijski stroškov +apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root ni mogoče urejati. +apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,"Lahko dodeli znesek, ki ni večja od unadusted zneska" +DocType: Manufacturing Settings,Allow Production on Holidays,Dovoli Proizvodnja na počitnicah +DocType: Sales Order,Customer's Purchase Order Date,Stranke Naročilo Datum +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Osnovni kapital +DocType: Packing Slip,Package Weight Details,Paket Teža Podrobnosti +apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Izberite csv datoteko +DocType: Dropbox Backup,Send Backups to Dropbox,Pošlji varnostne kopije na Dropbox +DocType: Purchase Order,To Receive and Bill,Za prejemanje in Bill +apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Oblikovalec +apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Pogoji Template +DocType: Serial No,Delivery Details,Dostava Podrobnosti +apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}" +DocType: Item,Automatically create Material Request if quantity falls below this level,Samodejno ustvari Material Zahtevaj če količina pade pod to raven +,Item-wise Purchase Register,Element-pametno Nakup Registriraj se +DocType: Batch,Expiry Date,Rok uporabnosti +apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Če želite nastaviti raven naročanje, mora postavka biti Nakup Postavka ali Manufacturing Postavka" +,Supplier Addresses and Contacts,Dobavitelj Naslovi +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Prosimo, izberite kategorijo najprej" +apps/erpnext/erpnext/config/projects.py +18,Project master.,Master projekt. +DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne kažejo vsak simbol, kot $ itd zraven valute." +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Poldnevni) +DocType: Supplier,Credit Days,Kreditne dnevi +DocType: Leave Type,Is Carry Forward,Se Carry Forward +apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Dobili predmetov iz BOM +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dobavni rok dni +apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Vrstica {0}: Vrsta stranka in stranka je potrebna za terjatve / obveznosti račun {1} +DocType: Dropbox Backup,Send Notifications To,Pošiljanje obvestil +apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum +DocType: Employee,Reason for Leaving,Razlog za odhod +DocType: Expense Claim Detail,Sanctioned Amount,Sankcionirano Znesek +DocType: GL Entry,Is Opening,Je Odpiranje +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1} +apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Račun {0} ne obstaja +DocType: Account,Cash,Cash +DocType: Employee,Short biography for website and other publications.,Kratka biografija za spletne strani in drugih publikacij. +apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Prosimo, da ustvarite plač strukturo za zaposlenega {0}" diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv index 26367e4d83..1c27f9f092 100644 --- a/erpnext/translations/sq.csv +++ b/erpnext/translations/sq.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Shfaq Variante DocType: Sales Invoice Item,Quantity,Sasi apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredi (obligimeve) DocType: Employee Education,Year of Passing,Viti i kalimit +sites/assets/js/erpnext.min.js +27,In Stock,Në magazinë apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Vetëm mund të bëni pagesën ndaj Sales pafaturuar Rendit DocType: Designation,Designation,Përcaktim DocType: Production Plan Item,Production Plan Item,Prodhimit Plani i artikullit @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Cilësimet për HR DocType: SMS Center,SMS Center,SMS Center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Straightening DocType: BOM Replace Tool,New BOM,Bom i ri +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Koha Shkrime për faturim. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Hedh Countergravity apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter tashmë është dërguar DocType: Lead,Request Type,Kërkesë Type @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM DocType: Period Closing Voucher,Closing Account Head,Mbyllja Shef Llogaria DocType: Employee,External Work History,Historia e jashtme apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Qarkorja Referenca Gabim +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,A jeni të vërtetë dëshironi të ndaluar DocType: Communication,Closed,Mbyllur DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Me fjalë (eksport) do të jetë i dukshëm një herë ju ruani notën shpërndarëse. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Jeni te sigurte qe doni për të ndaluar DocType: Lead,Industry,Industri DocType: Employee,Job Profile,Profile Job DocType: Newsletter,Newsletter,Newsletter @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Ngarko ek apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Dërgo Tani ,Support Analytics,Analytics Mbështetje DocType: Item,Website Warehouse,Website Magazina +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,A jeni të vërtetë doni për të ndaluar rendin prodhimit: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Ditë të muajit në të cilin fatura auto do të gjenerohet p.sh. 05, 28 etj" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultati duhet të jetë më pak se ose e barabartë me 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Të dhënat C-Forma @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,E ba DocType: SMS Center,All Lead (Open),Të gjitha Lead (Open) DocType: Purchase Invoice,Get Advances Paid,Get Paid Përparimet apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Bashkangjit foton tuaj +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Bëj DocType: Journal Entry,Total Amount in Words,Shuma totale në fjalë DocType: Workflow State,Stop,Stop apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Pati një gabim. Një arsye e mundshme mund të jetë që ju nuk e keni ruajtur formën. Ju lutemi te kontaktoni support@erpnext.com nëse problemi vazhdon. @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,Bëni Diferenca Hyrja DocType: Upload Attendance,Attendance From Date,Pjesëmarrja Nga Data DocType: Appraisal Template Goal,Key Performance Area,Key Zona Performance apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dhe vit: DocType: Email Digest,Annual Expense,Shpenzimet vjetore DocType: SMS Center,Total Characters,Totali Figurë apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Ju lutem, përzgjidhni bom në fushën BOM për Item {0}" @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,Pushime DocType: Sales Order Item,Planned Quantity,Sasia e planifikuar DocType: Purchase Invoice Item,Item Tax Amount,Shuma Tatimore Item DocType: Item,Maintain Stock,Ruajtja Stock +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries krijuar tashmë për Rendin Production DocType: Leave Control Panel,Leave blank if considered for all designations,Lini bosh nëse konsiderohet për të gjitha përcaktimeve apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit 'aktuale' në rresht {0} nuk mund të përfshihen në Item Rate apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e JV {2} DocType: Item,Inventory,Inventar DocType: Features Setup,"To enable ""Point of Sale"" view",Për të mundësuar "Pika e Shitjes" pikëpamje +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Pagesa nuk mund të bëhet për karrocë bosh DocType: Item,Sales Details,Shitjet Detajet apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning DocType: Opportunity,With Items,Me Items @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Miniere apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hedh rrëshirë apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Një grup të konsumatorëve ekziston me të njëjtin emër, ju lutem të ndryshojë emrin Customer ose riemërtoni grup të konsumatorëve" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Ju lutem, përzgjidhni {0} parë." apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Teksti {0} DocType: Territory,Parent Territory,Territori prind DocType: Quality Inspection Reading,Reading 2,Leximi 2 @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,Markat DocType: C-Form Invoice Detail,Invoice No,Fatura Asnjë apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Nga Rendit Blerje DocType: Activity Cost,Costing Rate,Kushton Rate +,Customer Addresses And Contacts,Adresat dhe kontaktet Customer DocType: Employee,Resignation Letter Date,Dorëheqja Letër Data apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Rregullat e Çmimeve të filtruar më tej në bazë të sasisë. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nuk është caktuar @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Koha Identifikohu Statusi duhet të dorëzohet. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial Asnjë {0} nuk i përkasin ndonjë Magazina apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Setting Up +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),Me fjalë (Kompania Valuta) DocType: Pricing Rule,Supplier,Furnizuesi DocType: C-Form,Quarter,Çerek @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Qendrat e mëtejshme e kostos mund të bëhet në bazë të Grupeve por hyra mund të bëhet kundër jo-grupeve DocType: Project,External,I jashtëm DocType: Features Setup,Item Serial Nos,Item Serial Nos +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Përdoruesit dhe Lejet DocType: Branch,Branch,Degë +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printime dhe quajtur +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nuk shqip Paga gjetur për muajin: DocType: Bin,Actual Quantity,Sasia aktuale DocType: Shipping Rule,example: Next Day Shipping,shembull: Transporti Dita e ardhshme apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial Asnjë {0} nuk u gjet @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,Njësi të dallueshme nga një artik DocType: Pricing Rule,Buying,Blerje DocType: HR Settings,Employee Records to be created by,Të dhënat e punonjësve që do të krijohet nga apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Kjo Serisë Koha Identifikohu është anuluar. +,Reqd By Date,Reqd By Date DocType: Salary Slip Earning,Salary Slip Earning,Shqip Paga Fituar apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorët apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Asnjë Serial është i detyrueshëm @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Llogaria për depo (Inventari pandërprerë) do të krijohet në bazë të kësaj llogarie. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depo nuk mund të fshihet si ekziston hyrja aksioneve librit për këtë depo. DocType: Company,Distribution,Shpërndarje +sites/assets/js/erpnext.min.js +50,Amount Paid,Shuma e paguar apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Menaxher i Projektit apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dërgim apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max zbritje lejohet për artikull: {0} është {1}% @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,Llogaria prind DocType: Quality Inspection Reading,Reading 3,Leximi 3 ,Hub,Qendër DocType: GL Entry,Voucher Type,Voucher Type +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara DocType: Expense Claim,Approved,I miratuar DocType: Pricing Rule,Price,Çmim apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si 'majtë' @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ju lutemi zgjidhni kategorinë e parë apps/erpnext/erpnext/config/projects.py +18,Project master.,Mjeshtër projekt. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,A nuk tregojnë ndonjë simbol si $ etj ardhshëm të valutave. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Gjysme Dite) DocType: Supplier,Credit Days,Ditët e kreditit DocType: Leave Type,Is Carry Forward,Është Mbaj Forward apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Të marrë sendet nga bom diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv index 910d38792f..9546525ab8 100644 --- a/erpnext/translations/sr.csv +++ b/erpnext/translations/sr.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Схов Ва DocType: Sales Invoice Item,Quantity,Количина apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредиты ( обязательства) DocType: Employee Education,Year of Passing,Година Пассинг +sites/assets/js/erpnext.min.js +27,In Stock,На складишту apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Може само извршити уплату против Неприходована Салес Ордер DocType: Designation,Designation,Ознака DocType: Production Plan Item,Production Plan Item,Производња план шифра @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки DocType: SMS Center,SMS Center,СМС центар apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Исправљање DocType: BOM Replace Tool,New BOM,Нови БОМ +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Батцх Тиме трупци за наплату. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Цоунтергравити ливење apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Информационный бюллетень уже был отправлен DocType: Lead,Request Type,Захтев Тип @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Нова берза УОМ DocType: Period Closing Voucher,Closing Account Head,Затварање рачуна Хеад DocType: Employee,External Work History,Спољни власници apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циркуларне референце Грешка +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Да ли заиста желите да СТОП DocType: Communication,Closed,Затворено DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,У Вордс (извоз) ће бити видљив када сачувате напомену Деливери. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Да ли сте сигурни да желите да СТОП DocType: Lead,Industry,Индустрија DocType: Employee,Job Profile,Профиль работы DocType: Newsletter,Newsletter,Билтен @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Упло apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Пошаљи сада ,Support Analytics,Подршка Аналитика DocType: Item,Website Warehouse,Сајт Магацин +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Да ли заиста желите да зауставите производњу ред: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Дан у месецу на којем друмски фактура ће бити генерисан нпр 05, 28 итд" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Коначан мора бити мања или једнака 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Ц - Форма евиденција @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бе DocType: SMS Center,All Lead (Open),Све Олово (Опен) DocType: Purchase Invoice,Get Advances Paid,Гет аванси apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепите свою фотографию +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Правити DocType: Journal Entry,Total Amount in Words,Укупан износ у речи DocType: Workflow State,Stop,стани apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји . @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,Направите унос Диф DocType: Upload Attendance,Attendance From Date,Гледалаца Од датума DocType: Appraisal Template Goal,Key Performance Area,Кључна Перформансе Област apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,транспорт +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и година: DocType: Email Digest,Annual Expense,Годишњи трошак DocType: SMS Center,Total Characters,Укупно Карактери apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Молимо Вас да изаберете БОМ БОМ у пољу за ставку {0} @@ -1197,6 +1204,7 @@ DocType: Holiday List,Holidays,Празници DocType: Sales Order Item,Planned Quantity,Планирана количина DocType: Purchase Invoice Item,Item Tax Amount,Ставка Износ пореза DocType: Item,Maintain Stock,Одржавајте Стоцк +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Мак: {0} @@ -1260,6 +1268,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,а apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака количини ЈВ {2} DocType: Item,Inventory,Инвентар DocType: Features Setup,"To enable ""Point of Sale"" view",Да бисте омогућили "Поинт Оф Сале" поглед +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Плаћање не може се за празан корпу DocType: Item,Sales Details,Детаљи продаје apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Пиннинг DocType: Opportunity,With Items,Са ставкама @@ -1452,6 +1461,7 @@ DocType: Item,Weightage,Веигхтаге apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Рударство apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Смола ливење apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Изаберите {0} прво. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0} DocType: Territory,Parent Territory,Родитељ Територија DocType: Quality Inspection Reading,Reading 2,Читање 2 @@ -1632,6 +1642,7 @@ DocType: Features Setup,Brands,Брендови DocType: C-Form Invoice Detail,Invoice No,Рачун Нема apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Од наруџбеницу DocType: Activity Cost,Costing Rate,Кошта курс +,Customer Addresses And Contacts,Кориснички Адресе и контакти DocType: Employee,Resignation Letter Date,Оставка Писмо Датум apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Цене Правила се даље филтрира на основу количине. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Нот Сет @@ -1739,6 +1750,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Пријави статус мора да се поднесе. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серијски број {0} не припада ниједној Варехоусе apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Подешавање +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ров # DocType: Purchase Invoice,In Words (Company Currency),Речима (Друштво валута) DocType: Pricing Rule,Supplier,Добављач DocType: C-Form,Quarter,Четврт @@ -1836,7 +1848,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама" DocType: Project,External,Спољни DocType: Features Setup,Item Serial Nos,Итем Сериал Нос +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволе DocType: Branch,Branch,Филијала +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печать и брендинг +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Нема слип плата фоунд фор мјесец: DocType: Bin,Actual Quantity,Стварна Количина DocType: Shipping Rule,example: Next Day Shipping,Пример: Нект Даи Схиппинг apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серијски број {0} није пронађен @@ -3092,6 +3107,7 @@ DocType: Serial No,Distinct unit of an Item,Разликује јединица DocType: Pricing Rule,Buying,Куповина DocType: HR Settings,Employee Records to be created by,Евиденција запослених које ће креирати apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ово време Пријава серија је отказана. +,Reqd By Date,Рекд по датуму DocType: Salary Slip Earning,Salary Slip Earning,Плата Слип Зарада apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Повериоци apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Ред # {0}: Серијски број је обавезан @@ -3321,6 +3337,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рачун за складишта ( сталне инвентуре ) ће бити направљен у оквиру овог рачуна . apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада . DocType: Company,Distribution,Дистрибуција +sites/assets/js/erpnext.min.js +50,Amount Paid,Износ Плаћени apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Пројецт Манагер apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,депеша apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Максимална дозвољена попуст за ставку: {0} је {1}% @@ -3827,6 +3844,7 @@ DocType: Account,Parent Account,Родитељ рачуна DocType: Quality Inspection Reading,Reading 3,Читање 3 ,Hub,Средиште DocType: GL Entry,Voucher Type,Тип ваучера +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ценовник није пронађен или онемогућен DocType: Expense Claim,Approved,Одобрено DocType: Pricing Rule,Price,цена apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые""" @@ -3941,6 +3959,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Прво изаберите категорију apps/erpnext/erpnext/config/projects.py +18,Project master.,Пројекат господар. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показују као симбол $ итд поред валутама. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Пола дана) DocType: Supplier,Credit Days,Кредитни Дана DocType: Leave Type,Is Carry Forward,Је напред Царри apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Се ставке из БОМ diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv index 7bcb208022..e8ece53623 100644 --- a/erpnext/translations/sv.csv +++ b/erpnext/translations/sv.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Visar variante DocType: Sales Invoice Item,Quantity,Kvantitet apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (skulder) DocType: Employee Education,Year of Passing,Passerande År +sites/assets/js/erpnext.min.js +27,In Stock,I Lager apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Kan bara göra betalning mot ofakturerade kundorder DocType: Designation,Designation,Beteckning DocType: Production Plan Item,Production Plan Item,Produktionsplan för artikel @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Inställningar för DocType: SMS Center,SMS Center,SMS Center apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Räta DocType: BOM Replace Tool,New BOM,Ny BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch tidsloggar för fakturering. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Antigravitions gjutning apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhetsbrev har redan skickats DocType: Lead,Request Type,Typ av förfrågan @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Ny Lager UOM DocType: Period Closing Voucher,Closing Account Head,Stänger Konto Huvud DocType: Employee,External Work History,Extern Arbetserfarenhet apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkelreferens fel +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Vill du verkligen STOPPA DocType: Communication,Closed,Stängt DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I ord (Export) kommer att vara synlig när du sparar följesedel. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Är du säker på att du vill stoppa DocType: Lead,Industry,Industri DocType: Employee,Job Profile,Jobbprofilen DocType: Newsletter,Newsletter,Nyhetsbrev @@ -715,6 +719,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Ladda lag apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Skicka Nu ,Support Analytics,Stöd Analytics DocType: Item,Website Warehouse,Webbplatslager +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Vill du verkligen stoppa produktionsorder: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dagen i den månad som auto faktura kommer att genereras t.ex. 05, 28 etc" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Betyg måste vara mindre än eller lika med 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form arkiv @@ -857,6 +862,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Vit DocType: SMS Center,All Lead (Open),Alla Ledare (Öppna) DocType: Purchase Invoice,Get Advances Paid,Få utbetalda förskott apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Bifoga din bild +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Göra DocType: Journal Entry,Total Amount in Words,Total mängd i ord DocType: Workflow State,Stop,Stoppa apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Det var ett problem. En trolig orsak kan vara att du inte har sparat formuläret. Vänligen kontakta support@erpnext.com om problemet kvarstår. @@ -937,6 +943,7 @@ DocType: Journal Entry,Make Difference Entry,Skapa Differensinlägg DocType: Upload Attendance,Attendance From Date,Närvaro Från datum DocType: Appraisal Template Goal,Key Performance Area,Nyckelperformance Områden apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transportfordon +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,och år: DocType: Email Digest,Annual Expense,Årlig Expense DocType: SMS Center,Total Characters,Totalt Tecken apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Välj BOM i BOM fältet för produkt{0} @@ -1174,6 +1181,7 @@ DocType: Holiday List,Holidays,Helgdagar DocType: Sales Order Item,Planned Quantity,Planerad Kvantitet DocType: Purchase Invoice Item,Item Tax Amount,Produkt skattebeloppet DocType: Item,Maintain Stock,Behåll Lager +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Aktie Inlägg redan skapats för produktionsorder DocType: Leave Control Panel,Leave blank if considered for all designations,Lämna tomt om det anses vara för alla beteckningar apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen" apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1236,6 +1244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med JV mängd {2} DocType: Item,Inventory,Inventering DocType: Features Setup,"To enable ""Point of Sale"" view",För att aktivera "Point of Sale" view +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Betalning kan inte göras för tomma kundvagnar DocType: Item,Sales Details,Försäljnings Detaljer apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Nålning DocType: Opportunity,With Items,Med artiklar @@ -1428,6 +1437,7 @@ DocType: Item,Weightage,Vikt apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Gruv apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hartsgjutning apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En kundgrupp finns med samma namn, ändra Kundens namn eller döp om kundgruppen" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Välj {0} först. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0} DocType: Territory,Parent Territory,Överordnat område DocType: Quality Inspection Reading,Reading 2,Avläsning 2 @@ -1608,6 +1618,7 @@ DocType: Features Setup,Brands,Varumärken DocType: C-Form Invoice Detail,Invoice No,Faktura Nr apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Från beställning DocType: Activity Cost,Costing Rate,Kalkylfrekvens +,Customer Addresses And Contacts,Kund adresser och kontakter DocType: Employee,Resignation Letter Date,Avskedsbrev Datum apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Prissättning Regler ytterligare filtreras baserat på kvantitet. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Inte Inställd @@ -1715,6 +1726,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tid Log Status måste lämnas in. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Löpnummer {0} inte tillhör någon Warehouse apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Konfigurera +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Rad # DocType: Purchase Invoice,In Words (Company Currency),I ord (Företagsvaluta) DocType: Pricing Rule,Supplier,Leverantör DocType: C-Form,Quarter,Kvartal @@ -1813,7 +1825,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligare kostnadsställen kan göras i grupperna men poster kan göras mot icke-grupper DocType: Project,External,Extern DocType: Features Setup,Item Serial Nos,Produkt serie nr +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Användare och behörigheter DocType: Branch,Branch,Bransch +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tryckning och Branding +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Inga lönebesked hittades för månad: DocType: Bin,Actual Quantity,Verklig Kvantitet DocType: Shipping Rule,example: Next Day Shipping,exempel: Nästa dag Leverans apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Löpnummer {0} hittades inte @@ -3037,6 +3052,7 @@ DocType: Serial No,Distinct unit of an Item,Distinkt enhet för en försändelse DocType: Pricing Rule,Buying,Köpa DocType: HR Settings,Employee Records to be created by,Personal register som skall skapas av apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch har avbrutits. +,Reqd By Date,Reqd Efter datum DocType: Salary Slip Earning,Salary Slip Earning,Lön Slip Tjänar apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Borgenärer apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Rad # {0}: Löpnummer är obligatorisk @@ -3265,6 +3281,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto för lagret (Perpetual Inventory) kommer att skapas inom ramen för detta konto. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Lager kan inte tas bort som lagrets huvudbok existerar för det här lagret. DocType: Company,Distribution,Fördelning +sites/assets/js/erpnext.min.js +50,Amount Paid,Betald Summa apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektledare apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Skicka apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabatt tillåtet för objektet: {0} är {1}% @@ -3759,6 +3776,7 @@ DocType: Account,Parent Account,Moderbolaget konto DocType: Quality Inspection Reading,Reading 3,Avläsning 3 ,Hub,Nav DocType: GL Entry,Voucher Type,Rabatt Typ +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Prislista hittades inte eller avaktiverad DocType: Expense Claim,Approved,Godkänd DocType: Pricing Rule,Price,Pris apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat""" @@ -3873,6 +3891,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vänligen välj kategori först apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektchef. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Visa inte någon symbol som $ etc bredvid valutor. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halv Dag) DocType: Supplier,Credit Days,Kreditdagar DocType: Leave Type,Is Carry Forward,Är Överförd apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Hämta artiklar från BOM diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv index f4419287d5..78620c9095 100644 --- a/erpnext/translations/ta.csv +++ b/erpnext/translations/ta.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,காட் DocType: Sales Invoice Item,Quantity,அளவு apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),கடன்கள் ( கடன்) DocType: Employee Education,Year of Passing,தேர்ச்சி பெறுவதற்கான ஆண்டு +sites/assets/js/erpnext.min.js +27,In Stock,பங்கு apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,மட்டுமே unbilled விற்பனை ஆணை எதிராக கட்டணம் செய்யலாம் DocType: Designation,Designation,பதவி DocType: Production Plan Item,Production Plan Item,உற்பத்தி திட்டம் பொருள் @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,அலுவலக DocType: SMS Center,SMS Center,எஸ்எம்எஸ் மையம் apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,நேராக்க DocType: BOM Replace Tool,New BOM,புதிய BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,தொகுதி பில்லிங் நேரம் பதிவுகள். apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity நடிப்பதற்கு apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,செய்திமடல் ஏற்கனவே அனுப்பப்பட்டுள்ளது DocType: Lead,Request Type,கோரிக்கை வகை @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,புதிய பங்கு DocType: Period Closing Voucher,Closing Account Head,கணக்கு தலைமை மூடுவதற்கு DocType: Employee,External Work History,வெளி வேலை வரலாறு apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,வட்ட குறிப்பு பிழை +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,நீங்கள் உண்மையில் நிறுத்த விரும்புகிறீர்களா DocType: Communication,Closed,மூடிய DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,நீங்கள் டெலிவரி குறிப்பு சேமிக்க முறை வேர்ட்ஸ் (ஏற்றுமதி) காண முடியும். +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,நீங்கள் நிறுத்த வேண்டும் என்பதில் உறுதியாக இருக்கிறீர்களா DocType: Lead,Industry,தொழில் DocType: Employee,Job Profile,வேலை விவரம் DocType: Newsletter,Newsletter,செய்தி மடல் @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Csv வ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,இப்போது அனுப்பவும் ,Support Analytics,ஆதரவு ஆய்வு DocType: Item,Website Warehouse,இணைய கிடங்கு +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,நீங்கள் உண்மையில் உத்தரவு நிறுத்த வேண்டும்: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","கார் விலைப்பட்டியல் 05, 28 எ.கா. உருவாக்கப்படும் மாதத்தின் நாள்" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ஸ்கோர் குறைவாக அல்லது 5 சமமாக இருக்க வேண்டும் apps/erpnext/erpnext/config/accounts.py +169,C-Form records,சி படிவம் பதிவுகள் @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,வ DocType: SMS Center,All Lead (Open),அனைத்து முன்னணி (திறந்த) DocType: Purchase Invoice,Get Advances Paid,கட்டண முன்னேற்றங்கள் கிடைக்கும் apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,உங்கள் படம் இணைக்கவும் +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,செய்ய DocType: Journal Entry,Total Amount in Words,சொற்கள் மொத்த தொகை DocType: Workflow State,Stop,நிறுத்த apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ஒரு பிழை ஏற்பட்டது . ஒரு சாத்தியமான காரணம் நீங்கள் வடிவம் காப்பாற்ற முடியாது என்று இருக்க முடியும் . சிக்கல் தொடர்ந்தால் support@erpnext.com தொடர்பு கொள்ளவும். @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,வித்தியாசம் DocType: Upload Attendance,Attendance From Date,வரம்பு தேதி வருகை DocType: Appraisal Template Goal,Key Performance Area,முக்கிய செயல்திறன் பகுதி apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,போக்குவரத்து +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ஆண்டு: DocType: Email Digest,Annual Expense,வருடாந்த செலவு DocType: SMS Center,Total Characters,மொத்த எழுத்துகள் apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},பொருள் BOM துறையில் BOM தேர்ந்தெடுக்கவும் {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,விடுமுறை DocType: Sales Order Item,Planned Quantity,திட்டமிட்ட அளவு DocType: Purchase Invoice Item,Item Tax Amount,உருப்படியை வரி தொகை DocType: Item,Maintain Stock,பங்கு பராமரிக்கவும் +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ஏற்கனவே உற்பத்தி ஆணை உருவாக்கப்பட்ட பங்கு பதிவுகள் DocType: Leave Control Panel,Leave blank if considered for all designations,அனைத்து வடிவ கருத்தில் இருந்தால் வெறுமையாக apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},அதிகபட்சம்: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ஆ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது கூட்டுத் தொழில் தொகை சமம் வேண்டும் {2} DocType: Item,Inventory,சரக்கு DocType: Features Setup,"To enable ""Point of Sale"" view",பார்வை "விற்பனை செய்யுமிடம்" செயல்படுத்த +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,கொடுப்பனவு காலியாக வண்டி முடியாது DocType: Item,Sales Details,விற்பனை விவரம் apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,பின்செய்யப்படுகிறது DocType: Opportunity,With Items,பொருட்களை கொண்டு @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,சுரங்க apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ரெசின் நடிப்பதற்கு apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க +sites/assets/js/erpnext.min.js +37,Please select {0} first.,முதல் {0} தேர்ந்தெடுக்கவும். apps/erpnext/erpnext/templates/pages/order.html +57,text {0},உரை {0} DocType: Territory,Parent Territory,பெற்றோர் மண்டலம் DocType: Quality Inspection Reading,Reading 2,2 படித்தல் @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,பிராண்ட்கள் DocType: C-Form Invoice Detail,Invoice No,இல்லை விலைப்பட்டியல் apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,கொள்முதல் ஆணை இருந்து DocType: Activity Cost,Costing Rate,இதற்கான செலவு மதிப்பீடு +,Customer Addresses And Contacts,வாடிக்கையாளர் முகவரிகள் மற்றும் தொடர்புகள் DocType: Employee,Resignation Letter Date,ராஜினாமா கடிதம் தேதி apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,விலை விதிமுறைகள் மேலும் அளவு அடிப்படையில் வடிகட்டப்பட்டு. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,அமை @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,நேரம் பதிவு நிலைமை சமர்ப்பிக்க வேண்டும். apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,தொ.எ. {0} எந்த கிடங்கு சொந்தம் இல்லை apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,அமைக்கிறது +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ரோ # DocType: Purchase Invoice,In Words (Company Currency),வேர்ட்ஸ் (நிறுவனத்தின் கரன்சி) DocType: Pricing Rule,Supplier,கொடுப்பவர் DocType: C-Form,Quarter,காலாண்டு @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும் DocType: Project,External,வெளி DocType: Features Setup,Item Serial Nos,உருப்படியை தொடர் இலக்கங்கள் +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,பயனர்கள் மற்றும் அனுமதிகள் DocType: Branch,Branch,கிளை +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,அச்சிடுதல் மற்றும் பிராண்டிங் +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,மாதம் எதுவும் இல்லை வருமான சீட்டு: DocType: Bin,Actual Quantity,உண்மையான அளவு DocType: Shipping Rule,example: Next Day Shipping,உதாரணமாக: அடுத்த நாள் கப்பல் apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,இல்லை தொ.இல. {0} @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,"ஒரு பொருள், DocType: Pricing Rule,Buying,வாங்குதல் DocType: HR Settings,Employee Records to be created by,பணியாளர் ரெக்கார்ட்ஸ் விவரங்களை வேண்டும் apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,இந்த நேரம் புகுபதிகை தொகுப்பு ரத்து செய்யப்பட்டது. +,Reqd By Date,தேதி வாக்கில் Reqd DocType: Salary Slip Earning,Salary Slip Earning,சம்பளம் ஸ்லிப் ஆதாயம் apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,பற்றாளர்களின் apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,ரோ # {0}: தொடர் எந்த கட்டாய ஆகிறது @@ -3328,6 +3344,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,கிடங்கு ( நிரந்தர இருப்பு ) கணக்கு இந்த கணக்கு கீழ் உருவாக்கப்பட்டது. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,பங்கு லெட்ஜர் நுழைவு கிடங்கு உள்ளது என கிடங்கு நீக்க முடியாது . DocType: Company,Distribution,பகிர்ந்தளித்தல் +sites/assets/js/erpnext.min.js +50,Amount Paid,கட்டண தொகை apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,திட்ட மேலாளர் apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,கொல் apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,மேக்ஸ் தள்ளுபடி உருப்படியை அனுமதி: {0} {1}% ஆகும் @@ -3834,6 +3851,7 @@ DocType: Account,Parent Account,பெற்றோர் கணக்கு DocType: Quality Inspection Reading,Reading 3,3 படித்தல் ,Hub,மையம் DocType: GL Entry,Voucher Type,ரசீது வகை +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற DocType: Expense Claim,Approved,ஏற்பளிக்கப்பட்ட DocType: Pricing Rule,Price,விலை apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும் @@ -3948,6 +3966,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,முதல் வகையை தேர்ந்தெடுக்கவும் apps/erpnext/erpnext/config/projects.py +18,Project master.,திட்டம் மாஸ்டர். DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,நாணயங்கள் அடுத்த $ ஹிப்ரு போன்றவை எந்த சின்னம் காட்டாதே. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(அரை நாள்) DocType: Supplier,Credit Days,கடன் நாட்கள் DocType: Leave Type,Is Carry Forward,அடுத்த Carry apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM இருந்து பொருட்களை பெற diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv index 93d22b36be..a87730330d 100644 --- a/erpnext/translations/th.csv +++ b/erpnext/translations/th.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,แสดง DocType: Sales Invoice Item,Quantity,ปริมาณ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน ) DocType: Employee Education,Year of Passing,ปีที่ผ่าน +sites/assets/js/erpnext.min.js +27,In Stock,ในสต็อก apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,สามารถชำระเงินกับการสั่งซื้อยังไม่เรียกเก็บขาย DocType: Designation,Designation,การแต่งตั้ง DocType: Production Plan Item,Production Plan Item,สินค้าแผนการผลิต @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,การตั้ DocType: SMS Center,SMS Center,ศูนย์ SMS apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ยืด DocType: BOM Replace Tool,New BOM,BOM ใหม่ +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,บันทึกเวลา Batch สำหรับการเรียกเก็บเงิน apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,หล่อ Countergravity apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,จดหมายข่าว ได้ถูกส่งไป แล้ว DocType: Lead,Request Type,ชนิดของการร้องขอ @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,ใหม่ UOM สต็อ DocType: Period Closing Voucher,Closing Account Head,ปิดหัวบัญชี DocType: Employee,External Work History,ประวัติการทำงานภายนอก apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,คุณต้องการที่จะหยุด DocType: Communication,Closed,ปิด DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ในคำพูดของ (ส่งออก) จะปรากฏเมื่อคุณบันทึกหมายเหตุจัดส่งสินค้า +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,คุณแน่ใจหรือว่าต้องการที่จะหยุด DocType: Lead,Industry,อุตสาหกรรม DocType: Employee,Job Profile,รายละเอียด งาน DocType: Newsletter,Newsletter,จดหมายข่าว @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,อัพ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ส่งเดี๋ยวนี้ ,Support Analytics,Analytics สนับสนุน DocType: Item,Website Warehouse,คลังสินค้าเว็บไซต์ +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,คุณต้องการที่จะหยุดการสั่งซื้อการผลิต: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","วันของเดือนที่ใบแจ้งหนี้อัตโนมัติจะถูกสร้างขึ้นเช่น 05, 28 ฯลฯ" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,คะแนน ต้องน้อยกว่า หรือ เท่ากับ 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C- บันทึก แบบฟอร์ม @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ข DocType: SMS Center,All Lead (Open),ช่องทางทั้งหมด (เปิด) DocType: Purchase Invoice,Get Advances Paid,รับเงินทดรองจ่าย apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,แนบ รูปของคุณ +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,ทำ DocType: Journal Entry,Total Amount in Words,จำนวนเงินทั้งหมดในคำ DocType: Workflow State,Stop,หยุด apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,เกิดข้อผิดพลาด น่าจะเป็น เหตุผลหนึ่งที่ อาจ เป็นไปได้ว่า คุณ ยังไม่ได้บันทึก ในรูปแบบ โปรดติดต่อ support@erpnext.com ถ้า ปัญหายังคงอยู่ @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,ทำรายการที่ DocType: Upload Attendance,Attendance From Date,ผู้เข้าร่วมจากวันที่ DocType: Appraisal Template Goal,Key Performance Area,พื้นที่การดำเนินงานหลัก apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,การขนส่ง +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,และปี: DocType: Email Digest,Annual Expense,ค่าใช้จ่ายประจำปี DocType: SMS Center,Total Characters,ตัวอักษรรวม apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},กรุณาเลือก BOM BOM ในด้านการพิจารณาวาระที่ {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,วันหยุด DocType: Sales Order Item,Planned Quantity,จำนวนวางแผน DocType: Purchase Invoice Item,Item Tax Amount,จำนวนภาษีรายการ DocType: Item,Maintain Stock,รักษาสต็อก +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,รายการสต็อกที่สร้างไว้แล้วสำหรับการสั่งซื้อการผลิต DocType: Leave Control Panel,Leave blank if considered for all designations,เว้นไว้หากพิจารณากำหนดทั้งหมด apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},แม็กซ์: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,น apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับจำนวนเงินที่ JV {2} DocType: Item,Inventory,รายการสินค้า DocType: Features Setup,"To enable ""Point of Sale"" view",ต้องการเปิดใช้งาน "จุดขาย" มุมมอง +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,การชำระเงินไม่สามารถทำรถว่างเปล่า DocType: Item,Sales Details,รายละเอียดการขาย apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ปักหมุด DocType: Opportunity,With Items,กับรายการ @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,การทำเหมืองแร่ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,การหล่อเรซิ่น apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า +sites/assets/js/erpnext.min.js +37,Please select {0} first.,กรุณาเลือก {0} ครั้งแรก apps/erpnext/erpnext/templates/pages/order.html +57,text {0},ข้อความ {0} DocType: Territory,Parent Territory,ดินแดนปกครอง DocType: Quality Inspection Reading,Reading 2,Reading 2 @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,แบรนด์ DocType: C-Form Invoice Detail,Invoice No,ใบแจ้งหนี้ไม่มี apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,จากการสั่งซื้อ DocType: Activity Cost,Costing Rate,อัตราการคิดต้นทุน +,Customer Addresses And Contacts,ที่อยู่ของลูกค้าและการติดต่อ DocType: Employee,Resignation Letter Date,วันที่ใบลาออก apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,กฎการกำหนดราคาจะถูกกรองต่อไปขึ้นอยู่กับปริมาณ apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,ยังไม่ได้ระบุ @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ต้องส่งสถานะของบันทึกเวลา apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ไม่มี Serial {0} ไม่ได้อยู่ในโกดังสินค้าใด ๆ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,การตั้งค่า +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,แถว # DocType: Purchase Invoice,In Words (Company Currency),ในคำ (สกุลเงิน บริษัท ) DocType: Pricing Rule,Supplier,ผู้จัดจำหน่าย DocType: C-Form,Quarter,หนึ่งในสี่ @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่ DocType: Project,External,ภายนอก DocType: Features Setup,Item Serial Nos,Nos อนุกรมรายการ +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ผู้ใช้และสิทธิ์ DocType: Branch,Branch,สาขา +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,การพิมพ์และ การสร้างแบรนด์ +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,ไม่มีสลิปเงินเดือนเดือนพบ: DocType: Bin,Actual Quantity,จำนวนที่เกิดขึ้นจริง DocType: Shipping Rule,example: Next Day Shipping,ตัวอย่างเช่นการจัดส่งสินค้าวันถัดไป apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,ไม่มี Serial {0} ไม่พบ @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,หน่วยที่แตกต DocType: Pricing Rule,Buying,การซื้อ DocType: HR Settings,Employee Records to be created by,ระเบียนพนักงานที่จะถูกสร้างขึ้นโดย apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,บันทึกเวลาชุดนี้ถูกยกเลิกแล้ว +,Reqd By Date,reqd โดยวันที่ DocType: Salary Slip Earning,Salary Slip Earning,สลิปเงินเดือนรายได้ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,เจ้าหนี้ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,แถว # {0}: ไม่มีอนุกรมมีผลบังคับใช้ @@ -3327,6 +3343,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,บัญชีสำหรับ คลังสินค้า( Inventory ตลอด ) จะถูก สร้างขึ้นภายใต้ บัญชี นี้ apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,คลังสินค้า ไม่สามารถลบได้ เป็นรายการ บัญชีแยกประเภท หุ้น ที่มีอยู่สำหรับ คลังสินค้า นี้ DocType: Company,Distribution,การกระจาย +sites/assets/js/erpnext.min.js +50,Amount Paid,จำนวนเงินที่ชำระ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ผู้จัดการโครงการ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,ส่งไป apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ส่วนลดสูงสุดที่ได้รับอนุญาตสำหรับรายการ: {0} เป็น {1}% @@ -3833,6 +3850,7 @@ DocType: Account,Parent Account,บัญชีผู้ปกครอง DocType: Quality Inspection Reading,Reading 3,Reading 3 ,Hub,ดุม DocType: GL Entry,Voucher Type,ประเภทบัตรกำนัล +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,ราคาไม่พบหรือคนพิการ DocType: Expense Claim,Approved,ได้รับการอนุมัติ DocType: Pricing Rule,Price,ราคา apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย ' @@ -3947,6 +3965,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,กรุณาเลือก หมวดหมู่ แรก apps/erpnext/erpnext/config/projects.py +18,Project master.,ต้นแบบโครงการ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ไม่แสดงสัญลักษณ์ใด ๆ เช่น ฯลฯ $ ต่อไปกับเงินสกุล +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(ครึ่งวัน) DocType: Supplier,Credit Days,วันเครดิต DocType: Leave Type,Is Carry Forward,เป็น Carry Forward apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,รับสินค้า จาก BOM diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv index 465879471c..ae3692b5cd 100644 --- a/erpnext/translations/tr.csv +++ b/erpnext/translations/tr.csv @@ -74,6 +74,7 @@ DocType: Sales Invoice Item,Quantity,Miktar apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Krediler (Yükümlülükler) apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Krediler (Yükümlülükler) DocType: Employee Education,Year of Passing,Geçiş Yılı +sites/assets/js/erpnext.min.js +27,In Stock,Stokta Var apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Sadece faturasız Satış Siparişi karşı ödeme yapabilirsiniz DocType: Designation,Designation,Atama DocType: Designation,Designation,Atama @@ -226,6 +227,7 @@ DocType: SMS Center,SMS Center,SMS Merkezi DocType: SMS Center,SMS Center,SMS Merkezi apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Doğrultma DocType: BOM Replace Tool,New BOM,Yeni BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Toplu Fatura Zaman Kayıtlar. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity döküm apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Bülten zaten gönderildi DocType: Lead,Request Type,İstek Türü @@ -376,9 +378,11 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Yeni Stok UOM DocType: Period Closing Voucher,Closing Account Head,Kapanış Hesap Başkanı DocType: Employee,External Work History,Dış Çalışma Geçmişi apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Dairesel Referans Hatası +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Eğer gerçekten DURDURMAK istiyor musunuz DocType: Communication,Closed,Kapalı DocType: Communication,Closed,Kapalı DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Sözlü (İhracat) İrsaliyeyi kaydettiğinizde görünür olacaktır. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Eğer STOP istediğinizden emin misiniz DocType: Lead,Industry,Sanayi DocType: Employee,Job Profile,İş Profili DocType: Employee,Job Profile,İş Profili @@ -548,7 +552,7 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),(Dakika içind DocType: Customer,Buyer of Goods and Services.,Mal ve Hizmet Alıcı. DocType: Journal Entry,Accounts Payable,Vadesi gelmiş hesaplar apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Abone Ekle -sites/assets/js/erpnext.min.js +5,""" does not exists",""" Mevcut Değildir" +sites/assets/js/erpnext.min.js +5,""" does not exists",""" mevcut değildir" DocType: Pricing Rule,Valid Upto,Tarihine kadar geçerli apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir. apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Doğrudan Gelir @@ -922,6 +926,7 @@ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Şi apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Şimdi Gönder ,Support Analytics,Destek Analizi DocType: Item,Website Warehouse,Web Sitesi Depo +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Eğer gerçekten üretim siparişi durdurmak istiyor musunuz: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Otomatik fatura 05, 28 vb gibi oluşturulur hangi ayın günü" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor 5'ten az veya eşit olmalıdır apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form kayıtları @@ -979,7 +984,7 @@ apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Performans değerle apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Performans değerlendirme. DocType: Sales Invoice Item,Stock Details,Stok Detayları apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Proje Bedeli -apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Satış noktası +apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Satış Noktası apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Ileriye taşıyamaz {0} apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",Bakiye alacaklı durumdaysa borçlu duruma çevrilemez. DocType: Account,Balance must be,Bakiye şu olmalıdır @@ -1093,6 +1098,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Beya DocType: SMS Center,All Lead (Open),Bütün Başlıklar (Açık) DocType: Purchase Invoice,Get Advances Paid,Avansları Öde apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Resminizi Ekleyin +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Yapmak DocType: Journal Entry,Total Amount in Words,Sözlü Toplam Tutar DocType: Workflow State,Stop,dur apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Hata oluştu. Bunun sebebi formu kaydetmemeniz olabilir. Sorun devam ederse support@erpnext.com adresi ile iltişime geçiniz @@ -1186,6 +1192,7 @@ DocType: Upload Attendance,Attendance From Date,Tarihten itibaren katılım DocType: Appraisal Template Goal,Key Performance Area,Kilit Performans Alanı apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Taşıma apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Taşıma +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ve yıl DocType: Email Digest,Annual Expense,Yıllık Gider DocType: SMS Center,Total Characters,Toplam Karakterler DocType: SMS Center,Total Characters,Toplam Karakterler @@ -1481,6 +1488,7 @@ DocType: Sales Order Item,Planned Quantity,Planlanan Miktar DocType: Purchase Invoice Item,Item Tax Amount,Ürün Vergi Tutarı DocType: Purchase Invoice Item,Item Tax Amount,Ürün Vergi Tutarı DocType: Item,Maintain Stock,Stok koruyun +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zaten Üretim Siparişi için oluşturulan Stok Girişler DocType: Leave Control Panel,Leave blank if considered for all designations,Tüm tanımları için kabul ise boş bırakın apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1559,6 +1567,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Ana apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Satır {0}: Tahsis miktar {1} daha az olması veya JV miktarı eşittir gerekir {2} DocType: Item,Inventory,Stok DocType: Features Setup,"To enable ""Point of Sale"" view",Bakış "Sale Noktası" etkinleştirmek için +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Boş sepet için ödeme yapılamaz DocType: Item,Sales Details,Satış Ayrıntılar apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Iğneleme DocType: Opportunity,With Items,Öğeler ile @@ -1794,6 +1803,7 @@ DocType: Item,Weightage,Ağırlık apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Madencilik apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Reçine döküm apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Aynı adda bir Müşteri Grubu bulunmaktadır. Lütfen Müşteri Grubu ismini değiştirin. +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Önce {0} seçiniz apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Metin {0} DocType: Territory,Parent Territory,Ana Bölge DocType: Quality Inspection Reading,Reading 2,2 Okuma @@ -1823,7 +1833,7 @@ DocType: Stock Reconciliation,Reconciliation JSON,Uzlaşma JSON apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Çok fazla sütun. Raporu çıkarın ve spreadsheet uygulaması kullanarak yazdırın. DocType: Sales Invoice Item,Batch No,Parti No DocType: Sales Invoice Item,Batch No,Parti No -DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Bir Müşterinin Satınalma Siparişi karşı birden Satış Siparişleri izin ver +DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Bir Müşterinin Satınalma Siparişi karşı birden Satış Siparişine izin ver apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Ana apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Ana DocType: DocPerm,Delete,Sil @@ -2010,6 +2020,8 @@ DocType: C-Form Invoice Detail,Invoice No,Fatura No DocType: C-Form Invoice Detail,Invoice No,Fatura No apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Satın Alma Emrinden DocType: Activity Cost,Costing Rate,Maliyet Oranı +,Customer Addresses And Contacts,Müşteri Adresleri ve İletişim +,Customer Addresses And Contacts,Müşteri Adresleri Ve İletişim DocType: Employee,Resignation Letter Date,İstifa Mektubu Tarihi DocType: Employee,Resignation Letter Date,İstifa Mektubu Tarihi apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Fiyatlandırma Kuralları miktara dayalı olarak tekrar filtrelenir. @@ -2139,6 +2151,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Günlük durumu Teslim Edildi olmalıdır. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seri Hayır {0} herhangi Warehouse ait değil apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Kurma +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Satır # DocType: Purchase Invoice,In Words (Company Currency),Sözlü (Firma para birimi) olarak DocType: Pricing Rule,Supplier,Tedarikçi DocType: Pricing Rule,Supplier,Tedarikçi @@ -2187,7 +2200,7 @@ DocType: Bin,Ordered Quantity,Sipariş Edilen Miktar apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları" DocType: Quality Inspection,In Process,Süreci DocType: Authorization Rule,Itemwise Discount,Ürün İndirimi -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} Satış Siparişi karşı {1} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} Satış Siparişine karşı {1} DocType: Account,Fixed Asset,Sabit Varlık apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serileştirilmiş Envanteri DocType: Activity Type,Default Billing Rate,Varsayılan Fatura Oranı @@ -2257,7 +2270,11 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daha fazla masraf Gruplar altında yapılabilir, ancak girişleri olmayan Gruplar karşı yapılabilir" DocType: Project,External,Harici DocType: Features Setup,Item Serial Nos,Ürün Seri Numaralar +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Kullanıcılar ve İzinler DocType: Branch,Branch,Şube +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Baskı ve Markalaşma +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Baskı ve Markalaşma +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ay bulunamadı maaş kayma: DocType: Bin,Actual Quantity,Gerçek Miktar DocType: Shipping Rule,example: Next Day Shipping,Örnek: Bir sonraki gün sevkiyat apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Bulunamadı Seri No {0} @@ -2306,7 +2323,7 @@ apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Bar apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Durum No 0 olamaz DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity,Satış Takımınız ve Satış Ortaklarınız (Kanal Ortakları) varsa işaretlenebilirler ve satış faaliyetine katkılarını sürdürebilirler DocType: Item,Show a slideshow at the top of the page,Sayfanın üstünde bir slayt gösterisi göster -DocType: Item,"Allow in Sales Order of type ""Service""",Türü "Hizmet" Satış Siparişi izin ver +DocType: Item,"Allow in Sales Order of type ""Service""","Satış Siparişi türünde ""Hizmet""e izin ver" apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Mağazalar apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Mağazalar DocType: Time Log,Projects Manager,Proje Yöneticisi @@ -2742,7 +2759,7 @@ apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0 DocType: C-Form Invoice Detail,Net Total,Net Toplam DocType: C-Form Invoice Detail,Net Total,Net Toplam DocType: Bin,FCFS Rate,FCFS Oranı -apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Fatura (Satış Fatura) +apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Faturalama (Satış Fatura) DocType: Payment Reconciliation Invoice,Outstanding Amount,Bekleyen Tutar DocType: Project Task,Working,Çalışıyor DocType: Stock Ledger Entry,Stock Queue (FIFO),Stok Kuyruğu (FIFO) @@ -3774,6 +3791,7 @@ DocType: Serial No,Distinct unit of an Item,Bir Öğe Farklı birim DocType: Pricing Rule,Buying,Satın alma DocType: HR Settings,Employee Records to be created by,Oluşturulacak Çalışan Kayıtları apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Bu Günlük partisi iptal edildi. +,Reqd By Date,Tarihle gerekli DocType: Salary Slip Earning,Salary Slip Earning,Bordro Dahili Kazanç apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Alacaklılar apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Satır # {0}: Seri No zorunludur @@ -3820,7 +3838,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one w DocType: Serial No,Out of Warranty,Garanti Dışı DocType: Serial No,Out of Warranty,Garanti Dışı DocType: BOM Replace Tool,Replace,Değiştir -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} Satış Fatura karşı {1} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1} apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Lütfen Varsayılan Ölçü birimini girin DocType: Purchase Invoice Item,Project Name,Proje Adı DocType: Purchase Invoice Item,Project Name,Proje Adı @@ -4055,6 +4073,7 @@ DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be creat apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Bu depo için defter girdisi mevcutken depo silinemez. DocType: Company,Distribution,Dağıtım DocType: Company,Distribution,Dağıtım +sites/assets/js/erpnext.min.js +50,Amount Paid,Ödenen Tutar; apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Sevk @@ -4316,7 +4335,7 @@ DocType: Async Task,Status,Durum apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stok UOM Ürün için güncelleştirilmiş {0} DocType: Company History,Year,Yıl DocType: Company History,Year,Yıl -apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Satış Profili +apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Satış Noktası Profili apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Lütfen SMS ayarlarını güncelleyiniz apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Zaten fatura Zaman Günlüğü {0} apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Teminatsız Krediler @@ -4666,7 +4685,7 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed qu DocType: Production Order,Manufactured Qty,Üretilen Miktar DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar -apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} var olmadı +apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} mevcut değil apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Müşterilere artırılan faturalar DocType: DocField,Default,Varsayılan DocType: DocField,Default,Varsayılan @@ -4680,6 +4699,7 @@ DocType: Quality Inspection Reading,Reading 3,Reading 3 DocType: Quality Inspection Reading,Reading 3,Reading 3 ,Hub,Hub DocType: GL Entry,Voucher Type,Föy Türü +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil DocType: Expense Claim,Approved,Onaylandı DocType: Pricing Rule,Price,Fiyat DocType: Pricing Rule,Price,Fiyat @@ -4820,6 +4840,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268, apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,İlk Kategori seçiniz apps/erpnext/erpnext/config/projects.py +18,Project master.,Proje alanı. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Para birimlerinin yanında $ vb semboller kullanmayın. +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Yarım Gün) DocType: Supplier,Credit Days,Kredi Günleri DocType: Leave Type,Is Carry Forward,İleri taşınmış apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM dan Ürünleri alın diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv index f31e880ccc..cc86d2bebb 100644 --- a/erpnext/translations/uk.csv +++ b/erpnext/translations/uk.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Показат DocType: Sales Invoice Item,Quantity,Кількість apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредити (зобов'язання) DocType: Employee Education,Year of Passing,Рік Passing +sites/assets/js/erpnext.min.js +27,In Stock,В наявності apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Можу тільки здійснити платіж проти незакінченого фактурного ордена продажів DocType: Designation,Designation,Позначення DocType: Production Plan Item,Production Plan Item,Виробничий план товару @@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Налаштува DocType: SMS Center,SMS Center,SMS-центр apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Випрямлення DocType: BOM Replace Tool,New BOM,Новий специфікації +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Пакетна Журнали Час для виставлення рахунків. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Лиття сифонной apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Розсилка вже відправлено DocType: Lead,Request Type,Тип запиту @@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Новий зі UOM DocType: Period Closing Voucher,Closing Account Head,Закриття рахунку Керівник DocType: Employee,External Work History,Зовнішній роботи Історія apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циклічна посилання Помилка +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,"Ви дійсно хочете, щоб зупинити" DocType: Communication,Closed,Закрито DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"За словами (експорт) будуть видні, як тільки ви збережете накладну." +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Ви впевнені, що хочете, щоб зупинити" DocType: Lead,Industry,Промисловість DocType: Employee,Job Profile,Профіль роботи DocType: Newsletter,Newsletter,Інформаційний бюлетень @@ -714,6 +718,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Зава apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Відправити зараз ,Support Analytics,Підтримка аналітика DocType: Item,Website Warehouse,Сайт Склад +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,"Ви дійсно хочете, щоб зупинити виробничий замовлення:" DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День місяця, в який автоматично рахунок-фактура буде створений, наприклад, 05, 28 і т.д." apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Оцінка повинна бути менше або дорівнює 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,С-Form записи @@ -856,6 +861,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бі DocType: SMS Center,All Lead (Open),Всі Свинець (відкрито) DocType: Purchase Invoice,Get Advances Paid,"Отримати Аванси, видані" apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикріпіть свою фотографію +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Зробити DocType: Journal Entry,Total Amount in Words,Загальна сума прописом DocType: Workflow State,Stop,Стоп apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Був помилка. Одна з можливих причин може бути те, що ви не зберегли форму. Будь ласка, зв'яжіться з support@erpnext.com якщо проблема не усунена." @@ -936,6 +942,7 @@ DocType: Journal Entry,Make Difference Entry,Зробити запис Differenc DocType: Upload Attendance,Attendance From Date,Відвідуваність З дати DocType: Appraisal Template Goal,Key Performance Area,Ключ Площа Продуктивність apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Транспорт +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,і рік: DocType: Email Digest,Annual Expense,Річні витрати DocType: SMS Center,Total Characters,Всього Персонажі apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Будь ласка, виберіть специфікації в специфікації поля для Пункт {0}" @@ -1173,6 +1180,7 @@ DocType: Holiday List,Holidays,Канікули DocType: Sales Order Item,Planned Quantity,Плановані Кількість DocType: Purchase Invoice Item,Item Tax Amount,Пункт Сума податку DocType: Item,Maintain Stock,Підтримання складі +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток Записи вже створені для виробничого замовлення DocType: Leave Control Panel,Leave blank if considered for all designations,"Залиште порожнім, якщо вважати всіх позначень" apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу "Актуальні 'в рядку {0} не можуть бути включені в п Оцінити apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Макс: {0} @@ -1235,6 +1243,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,А apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Рядок {0}: виділеної суми {1} повинен бути менше або дорівнює кількості СП {2} DocType: Item,Inventory,Інвентаризація DocType: Features Setup,"To enable ""Point of Sale"" view",Щоб включити "Точка зору" Продаж +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Оплата не може бути зроблено для порожньої кошик DocType: Item,Sales Details,Продажі Детальніше apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Закріплення DocType: Opportunity,With Items,З пунктами @@ -1427,6 +1436,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Видобуток apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Смола лиття apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"А Група клієнтів існує з таким же ім'ям, будь ласка, змініть ім'я клієнта або перейменувати групу клієнтів" +sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Будь ласка, виберіть {0} перший." apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0} DocType: Territory,Parent Territory,Батько Територія DocType: Quality Inspection Reading,Reading 2,Читання 2 @@ -1607,6 +1617,7 @@ DocType: Features Setup,Brands,Бренди DocType: C-Form Invoice Detail,Invoice No,Рахунок Немає apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Від Замовлення DocType: Activity Cost,Costing Rate,Калькуляція Оцінити +,Customer Addresses And Contacts,Адреси та контакти з клієнтами DocType: Employee,Resignation Letter Date,Відставка Лист Дата apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Ціни Правила далі фільтруються на основі кількості. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не вказаний @@ -1714,6 +1725,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Час Статус журналу повинні бути представлені. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серійний номер {0} не належить ні до однієї Склад apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Налаштування +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ряд # DocType: Purchase Invoice,In Words (Company Currency),У Слів (Компанія валют) DocType: Pricing Rule,Supplier,Постачальник DocType: C-Form,Quarter,Чверть @@ -1812,7 +1824,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Подальші МВЗ можуть бути зроблені під угруповань, але дані можуть бути зроблені у відношенні не-груп" DocType: Project,External,Зовнішній DocType: Features Setup,Item Serial Nos,Пункт Серійний пп +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Люди і дозволу DocType: Branch,Branch,Філія +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Друк і брендинг +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Немає ковзання зарплата знайдено місяць: DocType: Bin,Actual Quantity,Фактична кількість DocType: Shipping Rule,example: Next Day Shipping,приклад: на наступний день відправка apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серійний номер {0} знайдений @@ -3033,6 +3048,7 @@ DocType: Serial No,Distinct unit of an Item,Окремий підрозділ в DocType: Pricing Rule,Buying,Купівля DocType: HR Settings,Employee Records to be created by,"Співробітник звіти, які будуть створені" apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ця партія Час Ввійти був скасований. +,Reqd By Date,Reqd за датою DocType: Salary Slip Earning,Salary Slip Earning,Зарплата ковзання Заробіток apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Кредитори apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Ряд # {0}: Серійний номер є обов'язковим @@ -3260,6 +3276,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рахунок для складу (Perpetual Inventory) буде створена під цим обліковим записом. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не може бути видалений, поки існує запис складі книга для цього складу." DocType: Company,Distribution,Розподіл +sites/assets/js/erpnext.min.js +50,Amount Paid,Виплачувана сума apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Керівник проекту apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Відправка apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс знижка дозволило пункту: {0} {1}% @@ -3753,6 +3770,7 @@ DocType: Account,Parent Account,Батьки рахунку DocType: Quality Inspection Reading,Reading 3,Читання 3 ,Hub,Концентратор DocType: GL Entry,Voucher Type,Ваучер Тип +sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ціни не знайдений або відключений DocType: Expense Claim,Approved,Затверджений DocType: Pricing Rule,Price,Ціна apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як "ліві" @@ -3867,6 +3885,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Ласка, виберіть категорію в першу чергу" apps/erpnext/erpnext/config/projects.py +18,Project master.,Майстер проекту. DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Не відображати будь-який символ, як $ і т.д. поряд з валютами." +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Половина дня) DocType: Supplier,Credit Days,Кредитні Дні DocType: Leave Type,Is Carry Forward,Є переносити apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Отримати елементів із специфікації diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv index 201dafc3e9..d94d47254d 100644 --- a/erpnext/translations/vi.csv +++ b/erpnext/translations/vi.csv @@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Hiện biến DocType: Sales Invoice Item,Quantity,Số lượng apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Các khoản vay (Nợ phải trả) DocType: Employee Education,Year of Passing,Năm Passing +sites/assets/js/erpnext.min.js +27,In Stock,Sản phẩm trong kho apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Chỉ có thể thực hiện thanh toán đối với unbilled Sales Order DocType: Designation,Designation,Định DocType: Production Plan Item,Production Plan Item,Kế hoạch sản xuất hàng @@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Cài đặt cho nh DocType: SMS Center,SMS Center,Trung tâm nhắn tin apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Thẳng DocType: BOM Replace Tool,New BOM,Mới BOM +apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Hàng loạt Time Logs cho Thanh toán. apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Đúc Countergravity apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Bản tin đã được gửi DocType: Lead,Request Type,Yêu cầu Loại @@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Mới Cổ UOM DocType: Period Closing Voucher,Closing Account Head,Đóng Trưởng Tài khoản DocType: Employee,External Work History,Bên ngoài Quá trình công tác apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Thông tư tham khảo Lỗi +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Bạn có thực sự muốn để STOP DocType: Communication,Closed,Đã đóng DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Trong từ (xuất khẩu) sẽ được hiển thị khi bạn lưu Giao hàng tận nơi Lưu ý. +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Bạn có chắc chắn bạn muốn để STOP DocType: Lead,Industry,Ngành công nghiệp DocType: Employee,Job Profile,Hồ sơ công việc DocType: Newsletter,Newsletter,Đăng ký nhận tin @@ -674,7 +678,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If #### Description of Columns -1. Calculation Type: +1. Calculation Type: - This can be on **Net Total** (that is the sum of basic amount). - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total. - **Actual** (as mentioned). @@ -685,19 +689,19 @@ The tax rate you define here will be the standard tax rate for all **Items**. If 6. Amount: Tax amount. 7. Total: Cumulative total to this point. 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row). -9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Mẫu thuế tiêu chuẩn có thể được áp dụng cho tất cả các giao dịch bán hàng. Mẫu này có thể chứa danh sách của người đứng đầu và thuế cũng khác người đứng đầu chi phí / thu nhập như ""Vận chuyển"", ""bảo hiểm"", ""Xử lý"" vv - +9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Mẫu thuế tiêu chuẩn có thể được áp dụng cho tất cả các giao dịch bán hàng. Mẫu này có thể chứa danh sách của người đứng đầu và thuế cũng khác người đứng đầu chi phí / thu nhập như ""Vận chuyển"", ""bảo hiểm"", ""Xử lý"" vv + #### Chú ý Các mức thuế suất bạn xác định đây sẽ là mức thuế suất tiêu chuẩn cho tất cả các mục ** **. Nếu có những mục ** ** mà có mức giá khác nhau, chúng phải được thêm vào trong các mục ** ** Thuế bảng trong mục ** ** master. - #### Mô tả Cột + #### Mô tả Cột - 1. Loại tính: + 1. Loại tính: - Điều này có thể được trên Net ** Tổng số ** (đó là tổng số tiền cơ bản). - ** Mở Row Previous Total / Số tiền ** (cho các loại thuế, phí tích lũy). Nếu bạn chọn tùy chọn này, thuế sẽ được áp dụng như là một tỷ lệ phần trăm của các dòng trước đó (theo Biểu thuế) hoặc tổng số tiền. - ** ** Thực tế (như đã đề cập). - 2. Tài khoản Head: Các tài khoản sổ cái theo đó thuế này sẽ được đặt + 2. Tài khoản Head: Các tài khoản sổ cái theo đó thuế này sẽ được đặt 3. Trung tâm chi phí: Nếu thuế / phí là một khoản thu nhập (như vận chuyển) hoặc chi phí nó cần phải được đặt trước một Trung tâm chi phí. 4. Mô tả: Mô tả về thuế (sẽ được in trên hoá đơn / dấu ngoặc kép). 5. Rate: Thuế suất. @@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Tải lê apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Bây giờ gửi ,Support Analytics,Hỗ trợ Analytics DocType: Item,Website Warehouse,Trang web kho +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Bạn có thực sự muốn dừng lại để sản xuất: DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Các ngày trong tháng mà tự động hóa đơn sẽ được tạo ra ví dụ như 05, 28 vv" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Điểm số phải nhỏ hơn hoặc bằng 5 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Hồ sơ C-Mẫu @@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Tr DocType: SMS Center,All Lead (Open),Tất cả chì (Open) DocType: Purchase Invoice,Get Advances Paid,Được trả tiền trước apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Hình ảnh đính kèm của bạn +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Làm DocType: Journal Entry,Total Amount in Words,Tổng số tiền trong từ DocType: Workflow State,Stop,dừng lại apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Có một lỗi. Một lý do có thể xảy ra có thể là bạn đã không được lưu dưới dạng. Vui lòng liên hệ support@erpnext.com nếu vấn đề vẫn tồn tại. @@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,Hãy khác biệt nhập DocType: Upload Attendance,Attendance From Date,Từ ngày tham gia DocType: Appraisal Template Goal,Key Performance Area,Hiệu suất chủ chốt trong khu vực apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Vận chuyển +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: , DocType: Email Digest,Annual Expense,Chi phí hàng năm DocType: SMS Center,Total Characters,Tổng số nhân vật apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vui lòng chọn BOM BOM trong lĩnh vực cho hàng {0} @@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,Ngày lễ DocType: Sales Order Item,Planned Quantity,Số lượng dự kiến DocType: Purchase Invoice Item,Item Tax Amount,Số tiền hàng Thuế DocType: Item,Maintain Stock,Duy trì Cổ +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Cổ Entries đã tạo ra cho sản xuất theo thứ tự DocType: Leave Control Panel,Leave blank if considered for all designations,Để trống nếu xem xét tất cả các chỉ định apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0} @@ -1261,6 +1269,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Chu apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng số tiền JV {2} DocType: Item,Inventory,Hàng tồn kho DocType: Features Setup,"To enable ""Point of Sale"" view",Để kích hoạt tính năng "Point of Sale" view +sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Thanh toán không thể được thực hiện cho hàng trống DocType: Item,Sales Details,Thông tin chi tiết bán hàng apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Ghim DocType: Opportunity,With Items,Với mục @@ -1453,6 +1462,7 @@ DocType: Item,Weightage,Weightage apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Khai thác mỏ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Đúc nhựa apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Một Nhóm khách hàng tồn tại với cùng một tên xin thay đổi tên khách hàng hoặc đổi tên nhóm khách hàng +sites/assets/js/erpnext.min.js +37,Please select {0} first.,Vui lòng chọn {0} đầu tiên. apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0} DocType: Territory,Parent Territory,Lãnh thổ cha mẹ DocType: Quality Inspection Reading,Reading 2,Đọc 2 @@ -1634,6 +1644,7 @@ DocType: Features Setup,Brands,Thương hiệu DocType: C-Form Invoice Detail,Invoice No,Không hóa đơn apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Từ Mua hàng DocType: Activity Cost,Costing Rate,Chi phí Rate +,Customer Addresses And Contacts,Địa chỉ khách hàng và Liên hệ DocType: Employee,Resignation Letter Date,Thư từ chức ngày apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Nội quy định giá được tiếp tục lọc dựa trên số lượng. apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Không đặt @@ -1741,6 +1752,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Giờ trạng phải Đăng. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,{0} nối tiếp Không không thuộc về bất kỳ kho apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Thiết lập +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # DocType: Purchase Invoice,In Words (Company Currency),Trong từ (Công ty tiền tệ) DocType: Pricing Rule,Supplier,Nhà cung cấp DocType: C-Form,Quarter,Quarter @@ -1839,7 +1851,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Trung tâm chi phí có thể tiếp tục được thực hiện theo nhóm nhưng mục có thể được thực hiện đối với phi Groups DocType: Project,External,Bên ngoài DocType: Features Setup,Item Serial Nos,Mục nối tiếp Nos +apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Người sử dụng và Quyền DocType: Branch,Branch,Nhánh +apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,In ấn và xây dựng thương hiệu +apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Không tìm thấy cho phiếu lương tháng: DocType: Bin,Actual Quantity,Số lượng thực tế DocType: Shipping Rule,example: Next Day Shipping,Ví dụ: Ngày hôm sau Vận chuyển apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Số thứ tự {0} không tìm thấy @@ -2015,7 +2030,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If #### Description of Columns -1. Calculation Type: +1. Calculation Type: - This can be on **Net Total** (that is the sum of basic amount). - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total. - **Actual** (as mentioned). @@ -2027,19 +2042,19 @@ The tax rate you define here will be the standard tax rate for all **Items**. If 7. Total: Cumulative total to this point. 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row). 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both. -10. Add or Deduct: Whether you want to add or deduct the tax.","Mẫu thuế tiêu chuẩn có thể được áp dụng cho tất cả các giao dịch mua hàng. Mẫu này có thể chứa danh sách của người đứng đầu về thuế và cũng đứng đầu chi phí khác như ""Vận chuyển"", ""bảo hiểm"", ""Xử lý"" vv - +10. Add or Deduct: Whether you want to add or deduct the tax.","Mẫu thuế tiêu chuẩn có thể được áp dụng cho tất cả các giao dịch mua hàng. Mẫu này có thể chứa danh sách của người đứng đầu về thuế và cũng đứng đầu chi phí khác như ""Vận chuyển"", ""bảo hiểm"", ""Xử lý"" vv + #### Chú ý Các mức thuế bạn xác định ở đây sẽ là mức thuế suất tiêu chuẩn cho tất cả các mục ** **. Nếu có những mục ** ** mà có mức giá khác nhau, chúng phải được thêm vào trong các mục ** ** Thuế bảng trong mục ** ** master. - #### Mô tả Cột + #### Mô tả Cột - 1. Loại tính: + 1. Loại tính: - Điều này có thể được trên Net ** Tổng số ** (đó là tổng số tiền cơ bản). - ** Mở Row Previous Total / Số tiền ** (cho các loại thuế, phí tích lũy). Nếu bạn chọn tùy chọn này, thuế sẽ được áp dụng như là một tỷ lệ phần trăm của các dòng trước đó (theo Biểu thuế) hoặc tổng số tiền. - ** ** Thực tế (như đã đề cập). - 2. Tài khoản Head: Các tài khoản sổ cái theo đó thuế này sẽ được đặt + 2. Tài khoản Head: Các tài khoản sổ cái theo đó thuế này sẽ được đặt 3. Trung tâm chi phí: Nếu thuế / phí là một khoản thu nhập (như vận chuyển) hoặc chi phí nó cần phải được đặt trước một Trung tâm chi phí. 4. Mô tả: Mô tả về thuế (sẽ được in trên hoá đơn / dấu ngoặc kép). 5. Rate: Thuế suất. @@ -2225,7 +2240,7 @@ Examples: 1. Ways of addressing disputes, indemnity, liability, etc. 1. Address and Contact of your Company.","Điều khoản và Điều kiện có thể được thêm vào để bán hàng và mua tiêu chuẩn. - Ví dụ: + Ví dụ: 1. Hiệu lực của đề nghị. 1. Điều khoản thanh toán (Trong Advance, On Credit, phần trước vv). @@ -2234,7 +2249,7 @@ Examples: 1. Bảo hành nếu có. 1. Trả Policy. 1. Điều khoản vận chuyển, nếu áp dụng. - 1. Cách giải quyết tranh chấp, bồi thường, trách nhiệm pháp lý, vv + 1. Cách giải quyết tranh chấp, bồi thường, trách nhiệm pháp lý, vv 1. Địa chỉ và liên hệ của công ty của bạn." DocType: Attendance,Leave Type,Loại bỏ apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Chi phí tài khoản / khác biệt ({0}) phải là một ""lợi nhuận hoặc lỗ 'tài khoản" @@ -3099,6 +3114,7 @@ DocType: Serial No,Distinct unit of an Item,Đơn vị riêng biệt của một DocType: Pricing Rule,Buying,Mua DocType: HR Settings,Employee Records to be created by,Nhân viên ghi được tạo ra bởi apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Hàng loạt Giờ này đã bị hủy. +,Reqd By Date,Reqd theo địa điểm DocType: Salary Slip Earning,Salary Slip Earning,Lương trượt Earning apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Nợ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Serial No là bắt buộc @@ -3125,7 +3141,7 @@ DocType: Accounts Settings,"If enabled, the system will post accounting entries apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Môi giới DocType: Address,Postal Code,Mã bưu chính DocType: Production Order Operation,"in Minutes -Updated via 'Time Log'","trong Minutes +Updated via 'Time Log'","trong Minutes Cập nhật qua 'Giờ'" DocType: Customer,From Lead,Từ chì apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Đơn đặt hàng phát hành để sản xuất. @@ -3302,7 +3318,7 @@ apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Na apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},{0} # Xin vui lòng tìm thấy kèm theo {1} DocType: Job Applicant,Applicant Name,Tên đơn DocType: Authorization Rule,Customer / Item Name,Khách hàng / Item Name -DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. +DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"". @@ -3328,6 +3344,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Tài khoản cho các kho (vĩnh viễn tồn kho) sẽ được tạo ra trong Tài khoản này. apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Kho không thể bị xóa sổ cái như nhập chứng khoán tồn tại cho kho này. DocType: Company,Distribution,Gửi đến: +sites/assets/js/erpnext.min.js +50,Amount Paid,Số tiền trả apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Giám đốc dự án apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Công văn apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Tối đa cho phép giảm giá cho mặt hàng: {0} {1}% @@ -3444,17 +3461,17 @@ DocType: Address Template,"

    Default Template

    {% if phone %}Phone: {{ phone }}<br>{% endif -%} {% if fax %}Fax: {{ fax }}<br>{% endif -%} {% if email_id %}Email: {{ email_id }}<br>{% endif -%} -","

    Default Template -

    Sử dụng Jinja Templating và tất cả các lĩnh vực của Địa chỉ ( bao gồm Tuỳ chỉnh Fields nếu có) sẽ có sẵn - 

      {{address_line1}} & lt; br & gt;
+
    ","

    Default Template +

    Sử dụng Jinja Templating và tất cả các lĩnh vực của Địa chỉ ( bao gồm Tuỳ chỉnh Fields nếu có) sẽ có sẵn + 

      {{address_line1}} & lt; br & gt; 
  {% nếu address_line2%} {{address_line2}} & lt; br & gt; { endif% -%} {{
- thành phố}} & lt; br & gt;
+ thành phố}} & lt; br & gt; 
  {% nếu nhà nước%} {{}} nhà nước & lt; br & gt; {% endif -%} {
-% nếu mã pin%} PIN: {{mã pin}} & lt; br & gt; {% endif -%}
- {{country}} & lt; br & gt;
- {% nếu điện thoại%} Điện thoại: {{phone}} & lt; br & gt; { % endif -%}
- {% nếu fax%} Fax: {{fax}} & lt; br & gt; {% endif -%}
- {% nếu email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -}%
+% nếu mã pin%} PIN: {{mã pin}} & lt; br & gt; {% endif -%} 
+ {{country}} & lt; br & gt; 
+ {% nếu điện thoại%} Điện thoại: {{phone}} & lt; br & gt; { % endif -%} 
+ {% nếu fax%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
+ {% nếu email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -}% 
   "
 DocType: Salary Slip Deduction,Default Amount,Số tiền mặc định
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Kho không tìm thấy trong hệ thống
@@ -3645,7 +3662,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New News
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Ngày bắt đầu phải nhỏ hơn ngày kết thúc cho hàng {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Hiện Balance
 DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Ví dụ:. ABCD #####
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Ví dụ:. ABCD ##### 
  Nếu series được thiết lập và Serial No không được đề cập trong các giao dịch, số serial sau đó tự động sẽ được tạo ra dựa trên series này. Nếu bạn luôn muốn đề cập đến một cách rõ ràng nối tiếp Nos cho mặt hàng này. để trống này."
 DocType: Upload Attendance,Upload Attendance,Tải lên tham dự
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM và Sản xuất Số lượng được yêu cầu
@@ -3776,7 +3793,7 @@ DocType: Batch,Batch,Hàng loạt
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Tổng số yêu cầu bồi thường chi phí (thông qua Tuyên bố Expense)
 DocType: User,Gender,Giới Tính
-DocType: Journal Entry,Debit Note,"nợ Ghi"
+DocType: Journal Entry,Debit Note,nợ Ghi
 DocType: Stock Entry,As per Stock UOM,Theo Cổ UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Không hết hạn
 DocType: Journal Entry,Total Debit,Tổng số Nợ
@@ -3834,6 +3851,7 @@ DocType: Account,Parent Account,Tài khoản cha mẹ
 DocType: Quality Inspection Reading,Reading 3,Đọc 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Loại chứng từ
+sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
 DocType: Expense Claim,Approved,Đã được phê duyệt
 DocType: Pricing Rule,Price,Giá
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
@@ -3948,6 +3966,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vui lòng chọn mục đầu tiên
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Chủ dự án.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Không hiển thị bất kỳ biểu tượng như $ vv bên cạnh tiền tệ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Nửa ngày)
 DocType: Supplier,Credit Days,Ngày tín dụng
 DocType: Leave Type,Is Carry Forward,Được Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Được mục từ BOM
diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index af09c7e832..7c243478a1 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,显示变体
 DocType: Sales Invoice Item,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（负债）
 DocType: Employee Education,Year of Passing,按年排序
+sites/assets/js/erpnext.min.js +27,In Stock,库存
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,只能使支付对未付款的销售订单
 DocType: Designation,Designation,指派
 DocType: Production Plan Item,Production Plan Item,生产计划项目
@@ -178,6 +179,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,人力资源模块
 DocType: SMS Center,SMS Center,短信中心
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,直
 DocType: BOM Replace Tool,New BOM,新建物料清单
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,批处理的时间记录进行计费。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,反重力铸造
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,通讯已发送过
 DocType: Lead,Request Type,请求类型
@@ -301,8 +303,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,新建库存计量单位
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循环引用错误
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,你真的要停止
 DocType: Communication,Closed,已关闭
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,大写金额（出口）将在送货单保存后显示。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,您确定要停止
 DocType: Lead,Industry,行业
 DocType: Employee,Job Profile,工作简介
 DocType: Newsletter,Newsletter,通讯
@@ -726,6 +730,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,通过CSV
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即发送
 ,Support Analytics,客户支持分析
 DocType: Item,Website Warehouse,网站仓库
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,你真的要停止生产订单：
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必须小于或等于5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-表记录
@@ -868,6 +873,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,白
 DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,附上你的照片
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,使
 DocType: Journal Entry,Total Amount in Words,总金额词
 DocType: Workflow State,Stop,停止
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,发生了错误，一个可能的原因可能是您没有保存表单。如果问题仍然存在请联系管理员或support@erpnext.com。
@@ -948,6 +954,7 @@ DocType: Journal Entry,Make Difference Entry,创建差异分录
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,关键绩效区
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,运输
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,和年份：
 DocType: Email Digest,Annual Expense,年费用
 DocType: SMS Center,Total Characters,总字符
 apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
@@ -1185,6 +1192,7 @@ DocType: Holiday List,Holidays,假期
 DocType: Sales Order Item,Planned Quantity,计划数量
 DocType: Purchase Invoice Item,Item Tax Amount,品目税额
 DocType: Item,Maintain Stock,维持股票
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,生产订单已创建Stock条目
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
 apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大值：{0}
@@ -1247,6 +1255,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,分
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必须小于或等于合资量{2}
 DocType: Item,Inventory,库存
 DocType: Features Setup,"To enable ""Point of Sale"" view",为了让观“销售点”
+sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,付款方式不能为空购物车制造
 DocType: Item,Sales Details,销售详情
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,钢钉
 DocType: Opportunity,With Items,随着项目
@@ -1439,6 +1448,7 @@ DocType: Item,Weightage,权重
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,矿业
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,树脂浇注
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户群组已经存在，请更改客户姓名或重命名客户集团
+sites/assets/js/erpnext.min.js +37,Please select {0} first.,请选择{0}第一。
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
 DocType: Territory,Parent Territory,家长领地
 DocType: Quality Inspection Reading,Reading 2,阅读2
@@ -1620,6 +1630,7 @@ DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,发票号码
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,来自采购订单
 DocType: Activity Cost,Costing Rate,成本率
+,Customer Addresses And Contacts,客户的地址和联系方式
 DocType: Employee,Resignation Letter Date,辞职信日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,未设置
@@ -1727,6 +1738,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,时间日志状态必须被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,正在设置
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大写金额（公司货币）
 DocType: Pricing Rule,Supplier,供应商
 DocType: C-Form,Quarter,季
@@ -1825,7 +1837,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,品目序列号
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用户和权限
 DocType: Branch,Branch,分支
+apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷及品牌
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,没有工资单找到了一个月：
 DocType: Bin,Actual Quantity,实际数量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日发货
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列号{0}未找到
@@ -3063,6 +3078,7 @@ DocType: Serial No,Distinct unit of an Item,品目的属性
 DocType: Pricing Rule,Buying,采购
 DocType: HR Settings,Employee Records to be created by,雇员记录创建于
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,此时日志批次已被取消。
+,Reqd By Date,REQD按日期
 DocType: Salary Slip Earning,Salary Slip Earning,工资单收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,债权人
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,行＃{0}：序列号是必需的
@@ -3291,6 +3307,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,仓库（永续盘存）的账户将在该帐户下创建。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除，因为此仓库有库存分类账分录。
 DocType: Company,Distribution,分配
+sites/assets/js/erpnext.min.js +50,Amount Paid,已支付的款项
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,项目经理
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,调度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
@@ -3797,6 +3814,7 @@ DocType: Account,Parent Account,父帐户
 DocType: Quality Inspection Reading,Reading 3,阅读3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,凭证类型
+sites/assets/js/erpnext.min.js +34,Price List not found or disabled,价格表未找到或禁用
 DocType: Expense Claim,Approved,已批准
 DocType: Pricing Rule,Price,价格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
@@ -3911,6 +3929,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,属性是相同的两个记录。
 apps/erpnext/erpnext/config/projects.py +18,Project master.,项目主。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号，例如$等。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,从物料清单获取品目
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index 59248c581a..e1b109a29f 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -59,6 +59,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,顯示變體
 DocType: Sales Invoice Item,Quantity,數量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（負債）
 DocType: Employee Education,Year of Passing,路過的一年
+sites/assets/js/erpnext.min.js +27,In Stock,庫存
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,只能使支付對未付款的銷售訂單
 DocType: Designation,Designation,指定
 DocType: Production Plan Item,Production Plan Item,生產計劃項目
@@ -179,6 +180,7 @@ apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,設定人力資源
 DocType: SMS Center,SMS Center,短信中心
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,直
 DocType: BOM Replace Tool,New BOM,新的物料清單
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,批處理的時間記錄進行計費。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,反重力鑄造
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,新聞已發送
 DocType: Lead,Request Type,請求類型
@@ -302,8 +304,10 @@ DocType: Stock UOM Replace Utility,New Stock UOM,新的庫存計量單位
 DocType: Period Closing Voucher,Closing Account Head,關閉帳戶頭
 DocType: Employee,External Work History,外部工作經歷
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環引用錯誤
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,你真的要停止
 DocType: Communication,Closed,關閉
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,送貨單一被儲存，(Export)就會顯示出來。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,您確定要停止
 DocType: Lead,Industry,行業
 DocType: Employee,Job Profile,工作簡介
 DocType: Newsletter,Newsletter,新聞
@@ -739,6 +743,7 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,通過CSV
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即發送
 ,Support Analytics,支援分析
 DocType: Item,Website Warehouse,網站倉庫
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,你真的要停止生產訂單：
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",該月的一天，在這汽車的發票將產生如05，28等
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必須小於或等於5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-往績紀錄
@@ -881,6 +886,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,白
 DocType: SMS Center,All Lead (Open),所有鉛（開放）
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,附上你的照片
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,使
 DocType: Journal Entry,Total Amount in Words,總金額大寫
 DocType: Workflow State,Stop,停止
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
@@ -961,6 +967,7 @@ DocType: Journal Entry,Make Difference Entry,使不同入口
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,關鍵績效區
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,運輸
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,和年份：
 DocType: Email Digest,Annual Expense,年費用
 DocType: SMS Center,Total Characters,總字元數
 apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
@@ -1198,6 +1205,7 @@ DocType: Holiday List,Holidays,假期
 DocType: Sales Order Item,Planned Quantity,計劃數量
 DocType: Purchase Invoice Item,Item Tax Amount,項目稅額
 DocType: Item,Maintain Stock,維護庫存資料
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
 apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},馬克斯：{0}
@@ -1260,6 +1268,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,分
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必須小於或等於合資量{2}
 DocType: Item,Inventory,庫存
 DocType: Features Setup,"To enable ""Point of Sale"" view",為了讓觀“銷售點”
+sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,無法由空的購物車產生款項
 DocType: Item,Sales Details,銷售詳細資訊
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,鋼釘
 DocType: Opportunity,With Items,隨著項目
@@ -1452,6 +1461,7 @@ DocType: Item,Weightage,權重
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,礦業
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,樹脂澆注
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
+sites/assets/js/erpnext.min.js +37,Please select {0} first.,請先選擇{0}。
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
 DocType: Territory,Parent Territory,家長領地
 DocType: Quality Inspection Reading,Reading 2,閱讀2
@@ -1633,6 +1643,7 @@ DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,發票號碼
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,從採購訂單
 DocType: Activity Cost,Costing Rate,成本率
+,Customer Addresses And Contacts,客戶的地址和聯繫方式
 DocType: Employee,Resignation Letter Date,辭退信日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,定價規則進一步過濾基於數量。
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,沒有設置
@@ -1740,6 +1751,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip mold
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間日誌狀態必須被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,設置
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大寫（Company Currency）
 DocType: Pricing Rule,Supplier,供應商
 DocType: C-Form,Quarter,季
@@ -1838,7 +1850,10 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please speci
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,產品序列號
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用戶和權限
 DocType: Branch,Branch,支
+apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷及品牌
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,沒有工資單找到了一個月：
 DocType: Bin,Actual Quantity,實際數量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日發貨
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列號{0}未找到
@@ -3102,6 +3117,7 @@ DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
 DocType: Pricing Rule,Buying,採購
 DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,此時日誌批次已被取消。
+,Reqd By Date,REQD按日期
 DocType: Salary Slip Earning,Salary Slip Earning,工資單盈利
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,債權人
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,行＃{0}：序列號是必需的
@@ -3331,6 +3347,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,帳戶倉庫（永續盤存）將在該帳戶下新增。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
 DocType: Company,Distribution,分配
+sites/assets/js/erpnext.min.js +50,Amount Paid,已支付的款項
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,專案經理
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,調度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
@@ -3837,6 +3854,7 @@ DocType: Account,Parent Account,父帳戶
 DocType: Quality Inspection Reading,Reading 3,閱讀3
 ,Hub,樞紐
 DocType: GL Entry,Voucher Type,憑證類型
+sites/assets/js/erpnext.min.js +34,Price List not found or disabled,價格表未找到或禁用
 DocType: Expense Claim,Approved,批准
 DocType: Pricing Rule,Price,價格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
@@ -3951,6 +3969,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,請先選擇分類
 apps/erpnext/erpnext/config/projects.py +18,Project master.,專案主持。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要顯示如$等任何貨幣符號。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),（半天）
 DocType: Supplier,Credit Days,信貸天
 DocType: Leave Type,Is Carry Forward,是弘揚
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,從物料清單獲取項目

From aba8fdd18d9285e149b18b3579dd336952f00f6a Mon Sep 17 00:00:00 2001
From: Anand Doshi 
Date: Sat, 31 Oct 2015 22:49:42 +0530
Subject: [PATCH 35/59] [fix] issues encountered migrating from v3/4 to 6

---
 erpnext/controllers/recurring_document.py       |  2 +-
 erpnext/patches/v4_4/make_email_accounts.py     |  4 +++-
 erpnext/patches/v5_0/update_projects.py         |  7 ++++++-
 erpnext/patches/v5_4/fix_missing_item_images.py | 12 +++++++++++-
 erpnext/patches/v6_0/set_default_title.py       |  3 +++
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py
index 9edac2e803..41fd8b27b5 100644
--- a/erpnext/controllers/recurring_document.py
+++ b/erpnext/controllers/recurring_document.py
@@ -163,7 +163,7 @@ def validate_recurring_document(doc):
 			raise_exception=1)
 
 		elif not (doc.from_date and doc.to_date):
-			throw(_("Period From and Period To dates mandatory for recurring %s") % doc.doctype)
+			throw(_("Period From and Period To dates mandatory for recurring {0}").format(doc.doctype))
 
 #
 def convert_to_recurring(doc, posting_date):
diff --git a/erpnext/patches/v4_4/make_email_accounts.py b/erpnext/patches/v4_4/make_email_accounts.py
index e495bcd0b0..1acd8de68c 100644
--- a/erpnext/patches/v4_4/make_email_accounts.py
+++ b/erpnext/patches/v4_4/make_email_accounts.py
@@ -9,7 +9,9 @@ def execute():
 	if outgoing and outgoing['mail_server'] and outgoing['mail_login']:
 		account = frappe.new_doc("Email Account")
 		mapping = {
-			"email_id": "mail_login",
+			"login_id_is_different": 1,
+			"email_id": "auto_email_id",
+			"login_id": "mail_login",
 			"password": "mail_password",
 			"footer": "footer",
 			"smtp_server": "mail_server",
diff --git a/erpnext/patches/v5_0/update_projects.py b/erpnext/patches/v5_0/update_projects.py
index 6214927654..68e03c9bdb 100644
--- a/erpnext/patches/v5_0/update_projects.py
+++ b/erpnext/patches/v5_0/update_projects.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import frappe
 
 def execute():
@@ -11,9 +13,12 @@ def execute():
 	for m in frappe.get_all("Project Milestone", "*"):
 		if (m.milestone and m.milestone_date
 			and frappe.db.exists("Project", m.parent)):
+			subject = (m.milestone[:139] + "…") if (len(m.milestone) > 140) else m.milestone
+			description = m.milestone
 			task = frappe.get_doc({
 				"doctype": "Task",
-				"subject": m.milestone,
+				"subject": subject,
+				"description": description if description!=subject else None,
 				"expected_start_date": m.milestone_date,
 				"status": "Open" if m.status=="Pending" else "Closed",
 				"project": m.parent,
diff --git a/erpnext/patches/v5_4/fix_missing_item_images.py b/erpnext/patches/v5_4/fix_missing_item_images.py
index 1dffc216cf..1891d2d622 100644
--- a/erpnext/patches/v5_4/fix_missing_item_images.py
+++ b/erpnext/patches/v5_4/fix_missing_item_images.py
@@ -40,7 +40,17 @@ def fix_files_for_item(files_path, unlinked_files):
 		file_data = frappe.get_doc("File", unlinked_files[file_url]["file"])
 		file_data.attached_to_doctype = "Item"
 		file_data.attached_to_name = item_code
-		file_data.save()
+		file_data.flags.ignore_folder_validate = True
+
+		try:
+			file_data.save()
+		except IOError:
+			print "File {0} does not exist".format(new_file_url)
+
+			# marking fix to prevent further errors
+			fixed_files.append(file_url)
+
+			continue
 
 		# set it as image in Item
 		if not frappe.db.get_value("Item", item_code, "image"):
diff --git a/erpnext/patches/v6_0/set_default_title.py b/erpnext/patches/v6_0/set_default_title.py
index e72e5c0f8b..83b6b59897 100644
--- a/erpnext/patches/v6_0/set_default_title.py
+++ b/erpnext/patches/v6_0/set_default_title.py
@@ -30,3 +30,6 @@ def execute():
 
 	frappe.reload_doctype("Sales Invoice")
 	frappe.db.sql("""update `tabSales Invoice` set title = customer_name""")
+
+	frappe.reload_doctype("Expense Claim")
+	frappe.db.sql("""update `tabExpense Claim` set title = employee_name""")

From 381385d19a26c9bf368a44c4d0e26f5c430605b9 Mon Sep 17 00:00:00 2001
From: Saurabh 
Date: Mon, 2 Nov 2015 11:30:51 +0530
Subject: [PATCH 36/59] [fixes] add status 'Closed' in filter creating PR, PI
 from PO and SI, DN from SO

---
 erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js | 2 +-
 erpnext/accounts/doctype/sales_invoice/sales_invoice.js       | 2 +-
 erpnext/stock/doctype/delivery_note/delivery_note.js          | 2 +-
 erpnext/stock/doctype/purchase_receipt/purchase_receipt.js    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 2e3794a238..3c2d3f6cb4 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -38,7 +38,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 						get_query_filters: {
 							supplier: cur_frm.doc.supplier || undefined,
 							docstatus: 1,
-							status: ["!=", "Stopped"],
+							status: ["not in", ["Stopped", "Closed"]],
 							per_billed: ["<", 99.99],
 							company: cur_frm.doc.company
 						}
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 9b9ab24811..213c2491e4 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -111,7 +111,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 					source_doctype: "Sales Order",
 					get_query_filters: {
 						docstatus: 1,
-						status: ["!=", "Stopped"],
+						status: ["not in", ["Stopped", "Closed"]],
 						per_billed: ["<", 99.99],
 						customer: cur_frm.doc.customer || undefined,
 						company: cur_frm.doc.company
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 17194fdd4a..876e369946 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -30,7 +30,7 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 							source_doctype: "Sales Order",
 							get_query_filters: {
 								docstatus: 1,
-								status: ["!=", "Stopped"],
+								status: ["not in", ["Stopped", "Closed"]],
 								per_delivered: ["<", 99.99],
 								project_name: cur_frm.doc.project_name || undefined,
 								customer: cur_frm.doc.customer || undefined,
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 38b054cbfd..0ebd7538b0 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -43,7 +43,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 							get_query_filters: {
 								supplier: cur_frm.doc.supplier || undefined,
 								docstatus: 1,
-								status: ["!=", "Stopped"],
+								status: ["not in", ["Stopped", "Closed"]],
 								per_received: ["<", 99.99],
 								company: cur_frm.doc.company
 							}

From a8a91cca16b731706367c09266b5de828509acc5 Mon Sep 17 00:00:00 2001
From: Saurabh 
Date: Mon, 2 Nov 2015 12:57:08 +0530
Subject: [PATCH 37/59] [feature] Close feature for Purchase Receipt and
 Delivery Note

---
 .../purchase_invoice/purchase_invoice.js       |  1 +
 .../delivered_items_to_be_billed.json          |  6 ++++--
 .../received_items_to_be_billed.json           |  6 ++++--
 erpnext/controllers/queries.py                 |  2 +-
 erpnext/controllers/status_updater.py          |  2 ++
 .../installation_note/installation_note.js     |  2 +-
 .../doctype/delivery_note/delivery_note.js     | 18 +++++++++++++++---
 .../doctype/delivery_note/delivery_note.json   | 12 ++++++------
 .../doctype/delivery_note/delivery_note.py     | 14 ++++++++++++++
 .../delivery_note/delivery_note_list.js        |  6 ++++--
 .../delivery_note/test_delivery_note.py        |  9 +++++++++
 .../purchase_receipt/purchase_receipt.js       | 16 ++++++++++++++--
 .../purchase_receipt/purchase_receipt.json     | 12 ++++++------
 .../purchase_receipt/purchase_receipt.py       | 14 +++++++++++++-
 .../purchase_receipt/purchase_receipt_list.js  |  6 ++++--
 .../purchase_receipt/test_purchase_receipt.py  | 10 +++++++++-
 16 files changed, 107 insertions(+), 29 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 2e3794a238..82b89afb16 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -52,6 +52,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 						get_query_filters: {
 							supplier: cur_frm.doc.supplier || undefined,
 							docstatus: 1,
+							status: ["!=", "Closed"],
 							company: cur_frm.doc.company
 						}
 					})
diff --git a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
index c503f68cf9..41e42f7394 100644
--- a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
+++ b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
@@ -1,16 +1,18 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-07-30 17:28:49", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2015-03-30 05:33:45.353064", 
+ "modified": "2015-11-02 12:32:02.048551", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Delivered Items To Be Billed", 
  "owner": "Administrator", 
- "query": "select\n    `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n\t`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n\t`tabDelivery Note`.`posting_date` as \"Date:Date\",\n\t`tabDelivery Note`.`project_name` as \"Project\",\n\t`tabDelivery Note Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabDelivery Note Item`.`qty` - ifnull((select sum(qty) from `tabSales Invoice Item` \n\t    where `tabSales Invoice Item`.docstatus=1 and \n            `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n\t        `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\n\t\tas \"Qty:Float:110\",\n\t(`tabDelivery Note Item`.`base_amount` - ifnull((select sum(base_amount) from `tabSales Invoice Item` \n        where `tabSales Invoice Item`.docstatus=1 and \n            `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n            `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\n\t\tas \"Amount:Currency:110\",\n\t`tabDelivery Note Item`.`item_name` as \"Item Name::150\",\n\t`tabDelivery Note Item`.`description` as \"Description::200\",\n\t`tabDelivery Note`.`company` as \"Company:Link/Company:\"\nfrom `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n    `tabDelivery Note`.docstatus = 1 and\n\t`tabDelivery Note`.`status` != \"Stopped\" and\n    `tabDelivery Note`.name = `tabDelivery Note Item`.parent and\n    (`tabDelivery Note Item`.qty > ifnull((select sum(qty) from `tabSales Invoice Item` \n        where `tabSales Invoice Item`.docstatus=1 and \n            `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n            `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\norder by `tabDelivery Note`.`name` desc", 
+ "query": "select\n    `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n\t`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n\t`tabDelivery Note`.`posting_date` as \"Date:Date\",\n\t`tabDelivery Note`.`project_name` as \"Project\",\n\t`tabDelivery Note Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabDelivery Note Item`.`qty` - ifnull((select sum(qty) from `tabSales Invoice Item` \n\t    where `tabSales Invoice Item`.docstatus=1 and \n            `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n\t        `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\n\t\tas \"Qty:Float:110\",\n\t(`tabDelivery Note Item`.`base_amount` - ifnull((select sum(base_amount) from `tabSales Invoice Item` \n        where `tabSales Invoice Item`.docstatus=1 and \n            `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n            `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\n\t\tas \"Amount:Currency:110\",\n\t`tabDelivery Note Item`.`item_name` as \"Item Name::150\",\n\t`tabDelivery Note Item`.`description` as \"Description::200\",\n\t`tabDelivery Note`.`company` as \"Company:Link/Company:\"\nfrom `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n    `tabDelivery Note`.docstatus = 1 and\n\t`tabDelivery Note`.`status` not in (\"Stopped\", \"Closed\") and\n    `tabDelivery Note`.name = `tabDelivery Note Item`.parent and\n    (`tabDelivery Note Item`.qty > ifnull((select sum(qty) from `tabSales Invoice Item` \n        where `tabSales Invoice Item`.docstatus=1 and \n            `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n            `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\norder by `tabDelivery Note`.`name` desc", 
  "ref_doctype": "Sales Invoice", 
  "report_name": "Delivered Items To Be Billed", 
  "report_type": "Query Report"
diff --git a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
index 697cee019a..97b0985cca 100644
--- a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
+++ b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
@@ -1,16 +1,18 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-07-30 18:35:10", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2015-04-14 11:56:02.323769", 
+ "modified": "2015-11-02 12:33:11.681513", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Received Items To Be Billed", 
  "owner": "Administrator", 
- "query": "select\n    `tabPurchase Receipt`.`name` as \"Purchase Receipt:Link/Purchase Receipt:120\",\n    `tabPurchase Receipt`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Receipt`.`posting_date` as \"Date:Date\",\n\t`tabPurchase Receipt Item`.`project_name` as \"Project\",\n\t`tabPurchase Receipt Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabPurchase Receipt Item`.`qty` - ifnull((select sum(qty) from `tabPurchase Invoice Item` \n\t    where `tabPurchase Invoice Item`.purchase_receipt = `tabPurchase Receipt`.name and\n            `tabPurchase Invoice Item`.docstatus = 1 and\n\t    `tabPurchase Invoice Item`.pr_detail = `tabPurchase Receipt Item`.name), 0))\n\t    as \"Qty:Float:110\",\n\t(`tabPurchase Receipt Item`.`base_amount` - ifnull((select sum(base_amount) \n             from `tabPurchase Invoice Item` \n             where `tabPurchase Invoice Item`.purchase_receipt = `tabPurchase Receipt`.name and\n            `tabPurchase Invoice Item`.docstatus = 1 and\n            `tabPurchase Invoice Item`.pr_detail = `tabPurchase Receipt Item`.name), 0))\n\t    as \"Amount:Currency:110\",\n\t`tabPurchase Receipt Item`.`item_name` as \"Item Name::150\",\n\t`tabPurchase Receipt Item`.`description` as \"Description::200\",\n\t`tabPurchase Receipt`.`company` as \"Company:Link/Company:\"\nfrom `tabPurchase Receipt`, `tabPurchase Receipt Item`\nwhere\n    `tabPurchase Receipt`.docstatus = 1 and\n    `tabPurchase Receipt`.name = `tabPurchase Receipt Item`.parent and\n    (`tabPurchase Receipt Item`.qty > ifnull((select sum(qty) from `tabPurchase Invoice Item` \n        where `tabPurchase Invoice Item`.purchase_receipt = `tabPurchase Receipt`.name and\n            `tabPurchase Invoice Item`.docstatus=1 and \n            `tabPurchase Invoice Item`.pr_detail = `tabPurchase Receipt Item`.name), 0))\norder by `tabPurchase Receipt`.`name` desc", 
+ "query": "select\n    `tabPurchase Receipt`.`name` as \"Purchase Receipt:Link/Purchase Receipt:120\",\n    `tabPurchase Receipt`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Receipt`.`posting_date` as \"Date:Date\",\n\t`tabPurchase Receipt Item`.`project_name` as \"Project\",\n\t`tabPurchase Receipt Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabPurchase Receipt Item`.`qty` - ifnull((select sum(qty) from `tabPurchase Invoice Item` \n\t    where `tabPurchase Invoice Item`.purchase_receipt = `tabPurchase Receipt`.name and\n            `tabPurchase Invoice Item`.docstatus = 1 and\n\t    `tabPurchase Invoice Item`.pr_detail = `tabPurchase Receipt Item`.name), 0))\n\t    as \"Qty:Float:110\",\n\t(`tabPurchase Receipt Item`.`base_amount` - ifnull((select sum(base_amount) \n             from `tabPurchase Invoice Item` \n             where `tabPurchase Invoice Item`.purchase_receipt = `tabPurchase Receipt`.name and\n            `tabPurchase Invoice Item`.docstatus = 1 and\n            `tabPurchase Invoice Item`.pr_detail = `tabPurchase Receipt Item`.name), 0))\n\t    as \"Amount:Currency:110\",\n\t`tabPurchase Receipt Item`.`item_name` as \"Item Name::150\",\n\t`tabPurchase Receipt Item`.`description` as \"Description::200\",\n\t`tabPurchase Receipt`.`company` as \"Company:Link/Company:\"\nfrom `tabPurchase Receipt`, `tabPurchase Receipt Item`\nwhere\n    `tabPurchase Receipt`.docstatus = 1 and `tabPurchase Receipt`.status != \"Closed\" and \n    `tabPurchase Receipt`.name = `tabPurchase Receipt Item`.parent and\n    (`tabPurchase Receipt Item`.qty > ifnull((select sum(qty) from `tabPurchase Invoice Item` \n        where `tabPurchase Invoice Item`.purchase_receipt = `tabPurchase Receipt`.name and\n            `tabPurchase Invoice Item`.docstatus=1 and \n            `tabPurchase Invoice Item`.pr_detail = `tabPurchase Receipt Item`.name), 0))\norder by `tabPurchase Receipt`.`name` desc", 
  "ref_doctype": "Purchase Invoice", 
  "report_name": "Received Items To Be Billed", 
  "report_type": "Query Report"
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index ffc682f03c..0af0b81265 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -216,7 +216,7 @@ def get_delivery_notes_to_be_billed(doctype, txt, searchfield, start, page_len,
 	return frappe.db.sql("""select `tabDelivery Note`.name, `tabDelivery Note`.customer_name
 		from `tabDelivery Note`
 		where `tabDelivery Note`.`%(key)s` like %(txt)s and
-			`tabDelivery Note`.docstatus = 1 %(fcond)s and
+			`tabDelivery Note`.docstatus = 1 and status not in ("Stopped", "Closed") %(fcond)s and
 			(ifnull((select sum(qty) from `tabDelivery Note Item` where
 					`tabDelivery Note Item`.parent=`tabDelivery Note`.name), 0) >
 				ifnull((select sum(qty) from `tabSales Invoice Item` where
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 94cddeeac3..8a516bb29d 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -51,11 +51,13 @@ status_map = {
 		["Draft", None],
 		["Submitted", "eval:self.docstatus==1"],
 		["Cancelled", "eval:self.docstatus==2"],
+		["Closed", "eval:self.status=='Closed'"],
 	],
 	"Purchase Receipt": [
 		["Draft", None],
 		["Submitted", "eval:self.docstatus==1"],
 		["Cancelled", "eval:self.docstatus==2"],
+		["Closed", "eval:self.status=='Closed'"],
 	]
 }
 
diff --git a/erpnext/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js
index 707cbd7453..d9ca366d98 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.js
+++ b/erpnext/selling/doctype/installation_note/installation_note.js
@@ -54,7 +54,7 @@ erpnext.selling.InstallationNote = frappe.ui.form.Controller.extend({
 						source_doctype: "Delivery Note",
 						get_query_filters: {
 							docstatus: 1,
-							status: ["!=", "Stopped"],
+							status: ["not in", ["Stopped", "Closed"]],
 							per_installed: ["<", 99.99],
 							customer: cur_frm.doc.customer || undefined,
 							company: cur_frm.doc.company
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 17194fdd4a..8ca9325da7 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -9,7 +9,7 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 	refresh: function(doc, dt, dn) {
 		this._super();
 
-		if (!doc.is_return) {
+		if (!doc.is_return && doc.status!="Closed") {
 			if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1)
 				cur_frm.add_custom_button(__('Installation Note'), this.make_installation_note);
 
@@ -41,14 +41,15 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 			}
 		}
 
-		if (doc.docstatus==1) {
+		if (doc.docstatus==1 && doc.status!="Closed") {
 			this.show_stock_ledger();
 			if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
 				this.show_general_ledger();
 			}
+			cur_frm.add_custom_button(__("Close"), this.close_delivery_note)
 		}
 
-		if(doc.__onload && !doc.__onload.billing_complete && doc.docstatus==1 && !doc.is_return) {
+		if(doc.__onload && !doc.__onload.billing_complete && doc.docstatus==1 && !doc.is_return && doc.status!="Closed") {
 			// show Make Invoice button only if Delivery Note is not created from Sales Invoice
 			var from_sales_invoice = false;
 			from_sales_invoice = cur_frm.doc.items.some(function(item) {
@@ -93,6 +94,17 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 
 	items_on_form_rendered: function(doc, grid_row) {
 		erpnext.setup_serial_no();
+	},
+	
+	close_delivery_note: function(doc){
+		frappe.call({
+			method:"erpnext.stock.doctype.delivery_note.delivery_note.close_delivery_note",
+			args: {docname: cur_frm.doc.name, status:"Closed"},
+			callback: function(r){
+				if(!r.exc)
+					cur_frm.reload_doc();
+			}
+		})
 	}
 
 });
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 5475f00a9b..16c1e6de8a 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -87,7 +87,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -1205,7 +1205,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Apply Additional Discount On",  
+   "label": "Apply Additional Discount On", 
    "no_copy": 0, 
    "options": "\nGrand Total\nNet Total", 
    "permlevel": 0, 
@@ -1873,7 +1873,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Source",  
+   "label": "Source", 
    "no_copy": 0, 
    "oldfieldname": "source", 
    "oldfieldtype": "Select", 
@@ -2108,11 +2108,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
-   "options": "\nDraft\nSubmitted\nCancelled", 
+   "options": "\nDraft\nSubmitted\nCancelled\nClosed", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_width": "150px", 
@@ -2438,7 +2438,7 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:44.497411", 
+ "modified": "2015-11-02 01:20:58.934509", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 6339752634..7e5f68a12e 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -10,6 +10,8 @@ from frappe import msgprint, _
 import frappe.defaults
 from frappe.model.mapper import get_mapped_doc
 from erpnext.controllers.selling_controller import SellingController
+from frappe.desk.notifications import clear_doctype_notifications
+
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -268,6 +270,12 @@ class DeliveryNote(SellingController):
 				ps.cancel()
 			frappe.msgprint(_("Packing Slip(s) cancelled"))
 
+	def update_status(self, status):
+		self.db_set('status', status)
+		self.set_status(update=True)
+		self.notify_update()
+		clear_doctype_notifications(self)
+		
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
@@ -386,3 +394,9 @@ def make_packing_slip(source_name, target_doc=None):
 def make_sales_return(source_name, target_doc=None):
 	from erpnext.controllers.sales_and_purchase_return import make_return_doc
 	return make_return_doc("Delivery Note", source_name, target_doc)
+
+
+@frappe.whitelist()
+def close_delivery_note(docname, status):
+	dn = frappe.get_doc("Delivery Note", docname)
+	dn.update_status(status)
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.js b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
index d79015e566..fbbf08f047 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_list.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
@@ -1,9 +1,11 @@
 frappe.listview_settings['Delivery Note'] = {
 	add_fields: ["customer", "customer_name", "base_grand_total", "per_installed",
-		"transporter_name", "grand_total", "is_return"],
+		"transporter_name", "grand_total", "is_return", "status"],
 	get_indicator: function(doc) {
 		if(cint(doc.is_return)==1) {
 			return [__("Return"), "darkgrey", "is_return,=,Yes"];
-		}
+		} else if(doc.status==="Closed") {
+			return [__("Closed"), "green", "status,=,Closed"];
+		} 
 	}
 };
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 07308e6c30..98acb6253d 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -396,6 +396,15 @@ class TestDeliveryNote(unittest.TestCase):
 			self.assertEquals([gle.debit, gle.credit], expected_values.get(gle.account))
 
 		set_perpetual_inventory(0)
+		
+	def test_closed_delivery_note(self):
+		from erpnext.stock.doctype.delivery_note.delivery_note import close_delivery_note
+		
+		dn = create_delivery_note(do_not_submit=True)
+		dn.submit()
+		
+		close_delivery_note(dn.name, "Closed")
+		self.assertEquals(frappe.db.get_value("Delivery Note", dn.name, "Status"), "Closed")
 
 def create_delivery_note(**args):
 	dn = frappe.new_doc("Delivery Note")
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 38b054cbfd..2427b51882 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -33,7 +33,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 		if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
 			this.show_general_ledger();
 		}
-		if(!this.frm.doc.is_return) {
+		if(!this.frm.doc.is_return && this.frm.doc.status!="Closed") {
 			if(this.frm.doc.docstatus==0) {
 				cur_frm.add_custom_button(__('From Purchase Order'),
 					function() {
@@ -51,11 +51,12 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 				});
 			}
 
-			if(this.frm.doc.docstatus == 1) {
+			if(this.frm.doc.docstatus == 1 && this.frm.doc.status!="Closed") {
 				cur_frm.add_custom_button(__('Return'), this.make_purchase_return);
 				if(this.frm.doc.__onload && !this.frm.doc.__onload.billing_complete) {
 					cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice).addClass("btn-primary");
 				}
+				cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt)
 			}
 		}
 
@@ -121,6 +122,17 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 	tc_name: function() {
 		this.get_terms();
 	},
+	
+	close_purchase_receipt: function() {
+		frappe.call({
+			method:"erpnext.stock.doctype.purchase_receipt.purchase_receipt.close_purchase_receipt",
+			args: {"docname": cur_frm.doc.name, "status":"Closed"},
+			callback: function(r){
+				if(!r.exc)
+					cur_frm.reload_doc();
+			}
+		})
+	}
 
 });
 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 8218f98820..adb27617eb 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -88,7 +88,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -1062,7 +1062,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Apply Additional Discount On",  
+   "label": "Apply Additional Discount On", 
    "no_copy": 0, 
    "options": "\nGrand Total\nNet Total", 
    "permlevel": 0, 
@@ -1498,7 +1498,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Raw Materials Supplied",  
+   "label": "Raw Materials Supplied", 
    "no_copy": 0, 
    "oldfieldname": "is_subcontracted", 
    "oldfieldtype": "Select", 
@@ -1643,11 +1643,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
-   "options": "\nDraft\nSubmitted\nCancelled", 
+   "options": "\nDraft\nSubmitted\nCancelled\nClosed", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_width": "150px", 
@@ -2076,7 +2076,7 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:05.186518", 
+ "modified": "2015-11-02 01:19:45.539793", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 1ca81b66d9..28a86f794f 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -11,6 +11,7 @@ import frappe.defaults
 
 from erpnext.controllers.buying_controller import BuyingController
 from erpnext.accounts.utils import get_account_currency
+from frappe.desk.notifications import clear_doctype_notifications
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -426,7 +427,12 @@ class PurchaseReceipt(BuyingController):
 				"\n".join(warehouse_with_no_account))
 
 		return process_gl_map(gl_entries)
-
+	
+	def update_status(self, status):
+		self.db_set('status', status)
+		self.set_status(update=True)
+		self.notify_update()
+		clear_doctype_notifications(self)
 
 @frappe.whitelist()
 def make_purchase_invoice(source_name, target_doc=None):
@@ -487,3 +493,9 @@ def get_invoiced_qty_map(purchase_receipt):
 def make_purchase_return(source_name, target_doc=None):
 	from erpnext.controllers.sales_and_purchase_return import make_return_doc
 	return make_return_doc("Purchase Receipt", source_name, target_doc)
+
+
+@frappe.whitelist()
+def close_purchase_receipt(docname, status):
+	pr = frappe.get_doc("Purchase Receipt", docname)
+	pr.update_status(status)
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
index 838fbb03a1..63148995fa 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
@@ -1,9 +1,11 @@
 frappe.listview_settings['Purchase Receipt'] = {
 	add_fields: ["supplier", "supplier_name", "base_grand_total", "is_subcontracted",
-		"transporter_name", "is_return"],
+		"transporter_name", "is_return", "status"],
 	get_indicator: function(doc) {
 		if(cint(doc.is_return)==1) {
 			return [__("Return"), "darkgrey", "is_return,=,Yes"];
-		}
+		} else if(doc.status==="Closed") {
+			return [__("Closed"), "green", "status,=,Closed"];
+		} 
 	}
 };
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 7ad6489295..3c121e5f4a 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -175,8 +175,16 @@ class TestPurchaseReceipt(unittest.TestCase):
 			"purchase_document_no": pr.name,
 			"delivery_document_no": return_pr.name
 		})
+	
+	def test_closed_purchase_receipt(self):
+		from erpnext.stock.doctype.purchase_receipt.purchase_receipt import close_purchase_receipt
+		
+		pr = make_purchase_receipt(do_not_submit=True)
+		pr.submit()
+		
+		close_purchase_receipt(pr.name, "Closed")
+		self.assertEquals(frappe.db.get_value("Purchase Receipt", pr.name, "status"), "Closed")
 		
-
 def get_gl_entries(voucher_type, voucher_no):
 	return frappe.db.sql("""select account, debit, credit
 		from `tabGL Entry` where voucher_type=%s and voucher_no=%s

From 126fb31f9a2d71a45da6e615852da9a194ee60ae Mon Sep 17 00:00:00 2001
From: superlack 
Date: Mon, 2 Nov 2015 00:38:17 -0800
Subject: [PATCH 38/59] Update time_log_batch_detail.json

---
 .../time_log_batch_detail.json                | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.json b/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.json
index e13d4eb1e3..fe9793715b 100644
--- a/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.json
+++ b/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.json
@@ -115,6 +115,27 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  },
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "note", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Note", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -133,4 +154,4 @@
  "permissions": [], 
  "read_only": 0, 
  "read_only_onload": 0
-}
\ No newline at end of file
+}

From 41f7f7442bf3cb25db80f68eb2a9fcdc0ac63f67 Mon Sep 17 00:00:00 2001
From: superlack 
Date: Mon, 2 Nov 2015 00:39:36 -0800
Subject: [PATCH 39/59] Update time_log_batch.py

---
 erpnext/projects/doctype/time_log_batch/time_log_batch.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.py b/erpnext/projects/doctype/time_log_batch/time_log_batch.py
index 03bd881602..a692949f3d 100644
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.py
+++ b/erpnext/projects/doctype/time_log_batch/time_log_batch.py
@@ -28,7 +28,8 @@ class TimeLogBatch(Document):
 		d.update({
 			"hours": tl.hours,
 			"activity_type": tl.activity_type,
-			"billing_amount": tl.billing_amount
+			"billing_amount": tl.billing_amount,
+			"note": tl.note
 		})
 
 	def validate_time_log_is_submitted(self, tl):

From 66340f98942465fce4f7b2672e955d8443538b70 Mon Sep 17 00:00:00 2001
From: Nabin Hait 
Date: Mon, 2 Nov 2015 14:40:42 +0530
Subject: [PATCH 40/59] [cleanup] Make Payment Entry from Order/Invoice

---
 .../doctype/journal_entry/journal_entry.js    |   2 +
 .../doctype/journal_entry/journal_entry.py    | 304 ++++++------------
 .../purchase_invoice/purchase_invoice.js      |   5 +-
 .../doctype/sales_invoice/sales_invoice.js    |   5 +-
 .../doctype/purchase_order/purchase_order.js  |   5 +-
 .../doctype/sales_order/sales_order.js        |   5 +-
 6 files changed, 120 insertions(+), 206 deletions(-)

diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index 7dbbeab47b..b1c355b375 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -408,6 +408,8 @@ $.extend(erpnext.journal_entry, {
 
 		frappe.model.set_value(cdt, cdn, "credit",
 			flt(flt(row.credit_in_account_currency)*row.exchange_rate), precision("credit", row));
+			
+		cur_frm.cscript.update_totals(frm.doc);
 	},
 
 	set_exchange_rate: function(frm, cdt, cdn) {
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index a0bf0813de..835679c241 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -8,7 +8,7 @@ from frappe import msgprint, _, scrub
 from erpnext.controllers.accounts_controller import AccountsController
 from erpnext.accounts.utils import get_balance_on, get_account_currency
 from erpnext.setup.utils import get_company_currency
-
+from erpnext.accounts.party import get_party_account
 
 class JournalEntry(AccountsController):
 	def __init__(self, arg1, arg2=None):
@@ -27,6 +27,7 @@ class JournalEntry(AccountsController):
 		self.validate_cheque_info()
 		self.validate_entries_for_advance()
 		self.validate_multi_currency()
+		self.set_amounts_in_company_currency()
 		self.validate_debit_and_credit()
 		self.validate_against_jv()
 		self.validate_reference_doc()
@@ -279,7 +280,8 @@ class JournalEntry(AccountsController):
 				frappe.throw(_("Please check Multi Currency option to allow accounts with other currency"))
 
 		self.set_exchange_rate()
-
+	
+	def set_amounts_in_company_currency(self):
 		for d in self.get("accounts"):
 			d.debit = flt(flt(d.debit_in_account_currency)*flt(d.exchange_rate), d.precision("debit"))
 			d.credit = flt(flt(d.credit_in_account_currency)*flt(d.exchange_rate), d.precision("credit"))
@@ -515,211 +517,118 @@ def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None):
 			"account_currency": account_details.account_currency,
 			"account_type": account_details.account_type
 		}
-
+		
 @frappe.whitelist()
-def get_payment_entry_from_sales_invoice(sales_invoice):
-	"""Returns new Journal Entry document as dict for given Sales Invoice"""
-	from erpnext.accounts.utils import get_balance_on
-	si = frappe.get_doc("Sales Invoice", sales_invoice)
-
-	# exchange rate
-	exchange_rate = get_exchange_rate(si.debit_to, si.party_account_currency, si.company,
-		si.doctype, si.name)
-
-	jv = get_payment_entry(si)
-	jv.remark = 'Payment received against Sales Invoice {0}. {1}'.format(si.name, si.remarks)
-
-	# credit customer
-	row1 = jv.get("accounts")[0]
-	row1.account = si.debit_to
-	row1.account_currency = si.party_account_currency
-	row1.party_type = "Customer"
-	row1.party = si.customer
-	row1.balance = get_balance_on(si.debit_to)
-	row1.party_balance = get_balance_on(party=si.customer, party_type="Customer")
-	row1.credit_in_account_currency = si.outstanding_amount
-	row1.reference_type = si.doctype
-	row1.reference_name = si.name
-	row1.exchange_rate = exchange_rate
-	row1.account_type = "Receivable" if si.customer else ""
-
-	# debit bank
-	row2 = jv.get("accounts")[1]
-	if row2.account_currency == si.party_account_currency:
-		row2.debit_in_account_currency = si.outstanding_amount
+def get_payment_entry_against_order(dt, dn):
+	ref_doc = frappe.get_doc(dt, dn)
+	
+	if flt(ref_doc.per_billed, 2) > 0:
+		frappe.throw(_("Can only make payment against unbilled {0}").format(dt))
+		
+	if dt == "Sales Order":
+		party_type = "Customer"
+		amount_field_party = "credit_in_account_currency"
+		amount_field_bank = "debit_in_account_currency"
 	else:
-		row2.debit_in_account_currency = si.outstanding_amount * exchange_rate
-
-	# set multi currency check
-	if row1.account_currency != si.company_currency or row2.account_currency != si.company_currency:
-		jv.multi_currency = 1
-
-	return jv.as_dict()
-
-@frappe.whitelist()
-def get_payment_entry_from_purchase_invoice(purchase_invoice):
-	"""Returns new Journal Entry document as dict for given Purchase Invoice"""
-	pi = frappe.get_doc("Purchase Invoice", purchase_invoice)
-
-	exchange_rate = get_exchange_rate(pi.credit_to, pi.party_account_currency, pi.company,
-		pi.doctype, pi.name)
-
-	jv = get_payment_entry(pi)
-	jv.remark = 'Payment against Purchase Invoice {0}. {1}'.format(pi.name, pi.remarks)
-	jv.exchange_rate = exchange_rate
-
-	# credit supplier
-	row1 = jv.get("accounts")[0]
-	row1.account = pi.credit_to
-	row1.account_currency = pi.party_account_currency
-	row1.party_type = "Supplier"
-	row1.party = pi.supplier
-	row1.balance = get_balance_on(pi.credit_to)
-	row1.party_balance = get_balance_on(party=pi.supplier, party_type="Supplier")
-	row1.debit_in_account_currency = pi.outstanding_amount
-	row1.reference_type = pi.doctype
-	row1.reference_name = pi.name
-	row1.exchange_rate = exchange_rate
-	row1.account_type = "Payable" if pi.supplier else ""
-
-	# credit bank
-	row2 = jv.get("accounts")[1]
-	if row2.account_currency == pi.party_account_currency:
-		row2.credit_in_account_currency = pi.outstanding_amount
-	else:
-		row2.credit_in_account_currency = pi.outstanding_amount * exchange_rate
-
-	# set multi currency check
-	if row1.account_currency != pi.company_currency or row2.account_currency != pi.company_currency:
-		jv.multi_currency = 1
-
-	return jv.as_dict()
-
-@frappe.whitelist()
-def get_payment_entry_from_sales_order(sales_order):
-	"""Returns new Journal Entry document as dict for given Sales Order"""
-	from erpnext.accounts.utils import get_balance_on
-	from erpnext.accounts.party import get_party_account
-
-	so = frappe.get_doc("Sales Order", sales_order)
-
-	if flt(so.per_billed, 2) != 0.0:
-		frappe.throw(_("Can only make payment against unbilled Sales Order"))
-
-	jv = get_payment_entry(so)
-	jv.remark = 'Advance payment received against Sales Order {0}.'.format(so.name)
-
-	party_account = get_party_account("Customer", so.customer, so.company)
+		party_type = "Supplier"
+		amount_field_party = "debit_in_account_currency"
+		amount_field_bank = "credit_in_account_currency"
+		
+	party_account = get_party_account(party_type, ref_doc.get(party_type.lower()), ref_doc.company)
 	party_account_currency = get_account_currency(party_account)
-
-	exchange_rate = get_exchange_rate(party_account, party_account_currency, so.company)
-
-	if party_account_currency == so.company_currency:
-		amount = flt(so.base_grand_total) - flt(so.advance_paid)
+	
+	if party_account_currency == ref_doc.company_currency:
+		amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid)
 	else:
-		amount = flt(so.grand_total) - flt(so.advance_paid)
-
-	# credit customer
-	row1 = jv.get("accounts")[0]
-	row1.account = party_account
-	row1.account_currency = party_account_currency
-	row1.party_type = "Customer"
-	row1.party = so.customer
-	row1.balance = get_balance_on(party_account)
-	row1.party_balance = get_balance_on(party=so.customer, party_type="Customer")
-	row1.credit_in_account_currency = amount
-	row1.reference_type = so.doctype
-	row1.reference_name = so.name
-	row1.is_advance = "Yes"
-	row1.exchange_rate = exchange_rate
-	row1.account_type = "Receivable"
-
-	# debit bank
-	row2 = jv.get("accounts")[1]
-	if row2.account_currency == party_account_currency:
-		row2.debit_in_account_currency = amount
-	else:
-		row2.debit_in_account_currency = amount * exchange_rate
-
-	# set multi currency check
-	if row1.account_currency != so.company_currency or row2.account_currency != so.company_currency:
-		jv.multi_currency = 1
-
-	return jv.as_dict()
-
+		amount = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid)
+		
+	return get_payment_entry(ref_doc, {
+		"party_type": party_type,
+		"party_account": party_account,
+		"party_account_currency": party_account_currency,
+		"amount_field_party": amount_field_party,
+		"amount_field_bank": amount_field_bank,
+		"amount": amount,
+		"remarks": 'Advance Payment received against {0} {1}'.format(dt, dn),
+		"is_advance": "Yes"
+	})
+	
 @frappe.whitelist()
-def get_payment_entry_from_purchase_order(purchase_order):
-	"""Returns new Journal Entry document as dict for given Sales Order"""
-	from erpnext.accounts.utils import get_balance_on
-	from erpnext.accounts.party import get_party_account
-	po = frappe.get_doc("Purchase Order", purchase_order)
-
-	if flt(po.per_billed, 2) != 0.0:
-		frappe.throw(_("Can only make payment against unbilled Sales Order"))
-
-	jv = get_payment_entry(po)
-	jv.remark = 'Advance payment made against Purchase Order {0}.'.format(po.name)
-
-	party_account = get_party_account("Supplier", po.supplier, po.company)
-	party_account_currency = get_account_currency(party_account)
-
-	exchange_rate = get_exchange_rate(party_account, party_account_currency, po.company)
-
-	if party_account_currency == po.company_currency:
-		amount = flt(po.base_grand_total) - flt(po.advance_paid)
+def get_payment_entry_against_invoice(dt, dn):
+	ref_doc = frappe.get_doc(dt, dn)
+	if dt == "Sales Invoice":
+		party_type = "Customer"
+		party_account = ref_doc.debit_to
+		amount_field_party = "credit_in_account_currency"
+		amount_field_bank = "debit_in_account_currency"
 	else:
-		amount = flt(po.grand_total) - flt(po.advance_paid)
+		party_type = "Supplier"
+		party_account = ref_doc.credit_to
+		amount_field_party = "debit_in_account_currency"
+		amount_field_bank = "credit_in_account_currency"
+		
+	return get_payment_entry(ref_doc, {
+		"party_type": party_type,
+		"party_account": party_account,
+		"party_account_currency": ref_doc.party_account_currency,
+		"amount_field_party": amount_field_party,
+		"amount_field_bank": amount_field_bank,
+		"amount": ref_doc.outstanding_amount,
+		"remarks": 'Payment received against {0} {1}. {2}'.format(dt, dn, ref_doc.remarks),
+		"is_advance": "No"
+	})
+	
+def get_payment_entry(ref_doc, args):
+	cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center")
+	exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"), 
+		ref_doc.company, ref_doc.doctype, ref_doc.name)
 
-	# credit customer
-	row1 = jv.get("accounts")[0]
-	row1.account = party_account
-	row1.party_type = "Supplier"
-	row1.party = po.supplier
-	row1.balance = get_balance_on(party_account)
-	row1.party_balance = get_balance_on(party=po.supplier, party_type="Supplier")
-	row1.debit_in_account_currency = amount
-	row1.reference_type = po.doctype
-	row1.reference_name = po.name
-	row1.is_advance = "Yes"
-	row1.exchange_rate = exchange_rate
-	row1.account_type = "Payable"
-
-	# debit bank
-	row2 = jv.get("accounts")[1]
-	if row2.account_currency == party_account_currency:
-		row2.credit_in_account_currency = amount
-	else:
-		row2.credit_in_account_currency = amount * exchange_rate
-
-	# set multi currency check
-	if row1.account_currency != po.company_currency or row2.account_currency != po.company_currency:
-		jv.multi_currency = 1
-
-	return jv.as_dict()
-
-def get_payment_entry(doc):
-	bank_account = get_default_bank_cash_account(doc.company, "Bank Entry")
-	cost_center = frappe.db.get_value("Company", doc.company, "cost_center")
-
-	jv = frappe.new_doc('Journal Entry')
-	jv.voucher_type = 'Bank Entry'
-	jv.company = doc.company
-	jv.fiscal_year = doc.fiscal_year
-
-	d1 = jv.append("accounts")
-	d1.cost_center = cost_center
-	d2 = jv.append("accounts")
+	jv = frappe.new_doc("Journal Entry")
+	jv.update({
+		"voucher_type": "Bank Entry",
+		"company": ref_doc.company,
+		"remark": args.get("remarks")
+	})
+	
+	party_row = jv.append("accounts", {
+		"account": args.get("party_account"),
+		"party_type": args.get("party_type"),
+		"party": ref_doc.get(args.get("party_type").lower()),
+		"cost_center": cost_center,
+		"account_type": frappe.db.get_value("Account", args.get("party_account"), "account_type"),
+		"account_currency": args.get("party_account_currency") or \
+			get_account_currency(args.get("party_account")),
+		"account_balance": get_balance_on(args.get("party_account")),
+		"party_balance": get_balance_on(party=args.get("party"), party_type=args.get("party_type")),
+		"exchange_rate": exchange_rate,
+		args.get("amount_field_party"): args.get("amount"),
+		"is_advance": args.get("is_advance"),
+		"reference_type": ref_doc.doctype,
+		"reference_name": ref_doc.name
+	})
 
+	bank_row = jv.append("accounts")
+	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank Entry")
 	if bank_account:
-		d2.account = bank_account["account"]
-		d2.balance = bank_account["balance"]
-		d2.account_currency = bank_account["account_currency"]
-		d2.account_type = bank_account["account_type"]
-		d2.exchange_rate = get_exchange_rate(bank_account["account"],
-			bank_account["account_currency"], doc.company)
-		d2.cost_center = cost_center
+		bank_row.update(bank_account)
+		bank_row.exchange_rate = get_exchange_rate(bank_account["account"], 
+			bank_account["account_currency"], ref_doc.company)
+			
+	bank_row.cost_center = cost_center
+	
+	if bank_row.account_currency == args.get("party_account_currency"):
+		bank_row.set(args.get("amount_field_bank"), args.get("amount"))
+	else:
+		bank_row.set(args.get("amount_field_bank"), args.get("amount") * exchange_rate)
 
-	return jv
+	# set multi currency check
+	if party_row.account_currency != ref_doc.company_currency \
+		or (bank_row.account_currency and bank_row.account_currency != ref_doc.company_currency):
+			jv.multi_currency = 1
+
+	jv.set_amounts_in_company_currency()
+	
+	return jv.as_dict()
 
 @frappe.whitelist()
 def get_opening_accounts(company):
@@ -781,7 +690,6 @@ def get_party_account_and_balance(company, party_type, party):
 	if not frappe.has_permission("Account"):
 		frappe.msgprint(_("No Permission"), raise_exception=1)
 
-	from erpnext.accounts.party import get_party_account
 	account = get_party_account(party_type, party, company)
 
 	account_balance = get_balance_on(account=account)
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 2e3794a238..a1f57290a6 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -135,9 +135,10 @@ cur_frm.script_manager.make(erpnext.accounts.PurchaseInvoice);
 
 cur_frm.cscript.make_bank_entry = function() {
 	return frappe.call({
-		method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_from_purchase_invoice",
+		method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice",
 		args: {
-			"purchase_invoice": cur_frm.doc.name,
+			"dt": "Purchase Invoice",
+			"dn": cur_frm.doc.name
 		},
 		callback: function(r) {
 			var doclist = frappe.model.sync(r.message);
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 95e5a1c340..8d68d0f7ef 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -323,9 +323,10 @@ cur_frm.cscript['Make Delivery Note'] = function() {
 
 cur_frm.cscript.make_bank_entry = function() {
 	return frappe.call({
-		method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_from_sales_invoice",
+		method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice",
 		args: {
-			"sales_invoice": cur_frm.doc.name
+			"dt": "Sales Invoice",
+			"dn": cur_frm.doc.name
 		},
 		callback: function(r) {
 			var doclist = frappe.model.sync(r.message);
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 6ae83d0f00..e9ca0beeea 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -146,9 +146,10 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 
 	make_bank_entry: function() {
 		return frappe.call({
-			method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_from_purchase_order",
+			method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order",
 			args: {
-				"purchase_order": cur_frm.doc.name
+				"dt": "Purchase Order"
+				"dn": cur_frm.doc.name
 			},
 			callback: function(r) {
 				var doclist = frappe.model.sync(r.message);
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 4a047e41ae..4aa3e9b009 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -136,9 +136,10 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 
 	make_bank_entry: function() {
 		return frappe.call({
-			method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_from_sales_order",
+			method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order",
 			args: {
-				"sales_order": cur_frm.doc.name
+				"dt": "Sales Order",
+				"dn": cur_frm.doc.name
 			},
 			callback: function(r) {
 				var doclist = frappe.model.sync(r.message);

From 7cd0ba70d925694421c98962acc3b0f30f187e02 Mon Sep 17 00:00:00 2001
From: Saurabh 
Date: Mon, 2 Nov 2015 15:18:23 +0530
Subject: [PATCH 41/59] [fixes] typo error

---
 .../doctype/sales_invoice_item/sales_invoice_item.json | 10 +++++-----
 .../buying/doctype/purchase_order/purchase_order.js    |  4 ++--
 .../doctype/sales_order_item/sales_order_item.json     | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index d4c40f2ade..0dcf9f5d0a 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -685,13 +685,13 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "eval:doc.delivered_by_supplier==1", 
-   "fieldname": "by_supplier", 
+   "fieldname": "drop_ship", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Delivered By Sypplier", 
+   "label": "Drop Ship", 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -718,7 +718,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
-   "read_only": 0, 
+   "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1327,8 +1327,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-27 16:59:39.595490", 
- "modified_by": "saurabh@erpnext.com", 
+ "modified": "2015-11-02 15:14:02.306067", 
+ "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 
  "owner": "Administrator", 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 146694e27d..463b5d9901 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -166,7 +166,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 		cur_frm.cscript.update_status('Stop', 'Stopped')
 	},
 	unstop_purchase_order: function(){
-		cur_frm.cscript.update_status('UNSTOP', 'Submitted')
+		cur_frm.cscript.update_status('Resume', 'Submitted')
 	},
 	close_purchase_order: function(){
 		cur_frm.cscript.update_status('Close', 'Closed')
@@ -174,7 +174,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 	delivered_by_supplier: function(){
 		return frappe.call({
 			method: "erpnext.buying.doctype.purchase_order.purchase_order.delivered_by_supplier",
-			freez: true,
+			freeze: true,
 			args:{
 				purchase_order: cur_frm.doc.name
 			},
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index e8ad1e82f5..93ba3a5f94 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -688,17 +688,17 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "eval:doc.delivered_by_supplier==1||doc.supplier", 
-   "fieldname": "by_supplier", 
+   "fieldname": "drop_ship", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Delivered by Supplier", 
+   "label": "Drop Ship", 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1206,8 +1206,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-27 17:00:01.005108", 
- "modified_by": "saurabh@erpnext.com", 
+ "modified": "2015-11-02 15:15:05.774529", 
+ "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
  "owner": "Administrator", 

From 12ffd914eee983349da9f55ac14f29fa33aa5546 Mon Sep 17 00:00:00 2001
From: Saurabh 
Date: Mon, 2 Nov 2015 16:10:09 +0530
Subject: [PATCH 42/59] [fixes] args fixes

---
 erpnext/buying/doctype/purchase_order/purchase_order.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 17c63f7ed2..3fca0f8bcd 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -154,7 +154,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 		return frappe.call({
 			method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order",
 			args: {
-				"dt": "Purchase Order"
+				"dt": "Purchase Order",
 				"dn": cur_frm.doc.name
 			},
 			callback: function(r) {

From a9dda232b20d9124e279172e4a527251ef7bcab5 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Mon, 2 Nov 2015 10:45:18 +0530
Subject: [PATCH 43/59] [minor] move item to top in stock module page

---
 erpnext/change_log/current/desktop.md |  2 ++
 erpnext/config/desktop.py             |  4 ++--
 erpnext/config/stock.py               | 10 +++++-----
 erpnext/hooks.py                      |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 erpnext/change_log/current/desktop.md

diff --git a/erpnext/change_log/current/desktop.md b/erpnext/change_log/current/desktop.md
new file mode 100644
index 0000000000..9b4667b819
--- /dev/null
+++ b/erpnext/change_log/current/desktop.md
@@ -0,0 +1,2 @@
+- **Desktop Reorganization:** To Do, Calendar, Messages, Notes, Activty have been moved into module **Tools**
+- Integrations and Installer has been moved into **Setup**
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index 498d100a12..c3fe141ff8 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -64,9 +64,9 @@ def get_data():
 			"type": "module"
 		},
 		"Learn": {
-			"color": "#FCB868",
+			"color": "#FF888B",
 			"force_show": True,
-			"icon": "icon-facetime-video",
+			"icon": "octicon octicon-device-camera-video",
 			"type": "module",
 			"is_help": True
 		}
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index dab009df3b..a4a7202008 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -7,6 +7,11 @@ def get_data():
 			"label": _("Documents"),
 			"icon": "icon-star",
 			"items": [
+				{
+					"type": "doctype",
+					"name": "Item",
+					"description": _("All Products or Services."),
+				},
 				{
 					"type": "doctype",
 					"name": "Material Request",
@@ -32,11 +37,6 @@ def get_data():
 					"name": "Installation Note",
 					"description": _("Installation record for a Serial No.")
 				},
-				{
-					"type": "doctype",
-					"name": "Item",
-					"description": _("All Products or Services."),
-				},
 				{
 					"type": "doctype",
 					"name": "Warehouse",
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 471b69220f..2c647e8803 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -30,7 +30,7 @@ blogs.
 app_icon = "icon-th"
 app_color = "#e74c3c"
 app_version = "6.6.7"
-github_link = "https://github.com/frappe/erpnext"
+source_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"
 

From c40148e0da86eb152c00feff576b04965f9c91e0 Mon Sep 17 00:00:00 2001
From: Saurabh 
Date: Tue, 3 Nov 2015 10:32:46 +0530
Subject: [PATCH 44/59] [fixes] missing delivered by supplier field

---
 erpnext/stock/doctype/item/item.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 8632d124d3..2ed54c8241 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -2157,7 +2157,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-10-29 02:25:26.256373", 
+ "modified": "2015-11-03 02:25:26.256373", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 

From 7d23e4286e6c8ccf46d115382679b63b43b46a43 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Mon, 2 Nov 2015 10:45:18 +0530
Subject: [PATCH 45/59] [minor] move item to top in stock module page

---
 erpnext/change_log/current/desktop.md |  2 ++
 erpnext/config/desktop.py             |  4 ++--
 erpnext/config/stock.py               | 10 +++++-----
 erpnext/hooks.py                      |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 erpnext/change_log/current/desktop.md

diff --git a/erpnext/change_log/current/desktop.md b/erpnext/change_log/current/desktop.md
new file mode 100644
index 0000000000..9b4667b819
--- /dev/null
+++ b/erpnext/change_log/current/desktop.md
@@ -0,0 +1,2 @@
+- **Desktop Reorganization:** To Do, Calendar, Messages, Notes, Activty have been moved into module **Tools**
+- Integrations and Installer has been moved into **Setup**
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index 498d100a12..c3fe141ff8 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -64,9 +64,9 @@ def get_data():
 			"type": "module"
 		},
 		"Learn": {
-			"color": "#FCB868",
+			"color": "#FF888B",
 			"force_show": True,
-			"icon": "icon-facetime-video",
+			"icon": "octicon octicon-device-camera-video",
 			"type": "module",
 			"is_help": True
 		}
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index dab009df3b..a4a7202008 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -7,6 +7,11 @@ def get_data():
 			"label": _("Documents"),
 			"icon": "icon-star",
 			"items": [
+				{
+					"type": "doctype",
+					"name": "Item",
+					"description": _("All Products or Services."),
+				},
 				{
 					"type": "doctype",
 					"name": "Material Request",
@@ -32,11 +37,6 @@ def get_data():
 					"name": "Installation Note",
 					"description": _("Installation record for a Serial No.")
 				},
-				{
-					"type": "doctype",
-					"name": "Item",
-					"description": _("All Products or Services."),
-				},
 				{
 					"type": "doctype",
 					"name": "Warehouse",
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 471b69220f..2c647e8803 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -30,7 +30,7 @@ blogs.
 app_icon = "icon-th"
 app_color = "#e74c3c"
 app_version = "6.6.7"
-github_link = "https://github.com/frappe/erpnext"
+source_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"
 

From bd4814fbb7e97c2f3181335c18877dd28c724be8 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Mon, 2 Nov 2015 17:47:10 +0530
Subject: [PATCH 46/59] [fix] email digest periods for weekly and monthly

---
 .../doctype/journal_entry/journal_entry.py    | 17 ++++++----
 .../doctype/email_digest/email_digest.py      | 32 ++++++-------------
 .../email_digest/templates/default.html       |  1 +
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 835679c241..c5035adcb6 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -176,6 +176,9 @@ class JournalEntry(AccountsController):
 				against_voucher = frappe.db.get_value(d.reference_type, d.reference_name,
 					[scrub(dt) for dt in field_dict.get(d.reference_type)])
 
+				if not against_voucher:
+					frappe.throw(_("Row {0}: Invalid reference {1}").format(d.idx, d.reference_name))
+
 				# check if party and account match
 				if d.reference_type in ("Sales Invoice", "Purchase Invoice"):
 					if (against_voucher[0] != d.party or against_voucher[1] != d.account):
@@ -500,16 +503,16 @@ def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None):
 	if voucher_type=="Bank Entry":
 		account = frappe.db.get_value("Company", company, "default_bank_account")
 		if not account:
-			account = frappe.db.get_value("Account", 
+			account = frappe.db.get_value("Account",
 				{"company": company, "account_type": "Bank", "is_group": 0})
 	elif voucher_type=="Cash Entry":
 		account = frappe.db.get_value("Company", company, "default_cash_account")
 		if not account:
-			account = frappe.db.get_value("Account", 
+			account = frappe.db.get_value("Account",
 				{"company": company, "account_type": "Cash", "is_group": 0})
 
 	if account:
-		account_details = frappe.db.get_value("Account", account, 
+		account_details = frappe.db.get_value("Account", account,
 			["account_currency", "account_type"], as_dict=1)
 		return {
 			"account": account,
@@ -731,15 +734,15 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi
 def get_exchange_rate(account, account_currency=None, company=None,
 		reference_type=None, reference_name=None, debit=None, credit=None, exchange_rate=None):
 	from erpnext.setup.utils import get_exchange_rate
-	account_details = frappe.db.get_value("Account", account, 
+	account_details = frappe.db.get_value("Account", account,
 		["account_type", "root_type", "account_currency", "company"], as_dict=1)
-	
+
 	if not company:
 		company = account_details.company
-		
+
 	if not account_currency:
 		account_currency = account_details.account_currency
-		
+
 	company_currency = get_company_currency(company)
 
 	if account_currency != company_currency:
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index e2b0de0eb6..2053fc003b 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -111,7 +111,8 @@ class EmailDigest(Document):
 		"""Set standard digest style"""
 		context.text_muted = '#8D99A6'
 		context.text_color = '#36414C'
-		context.h1 = 'margin-bottom: 30px; margin-bottom: 0; margin-top: 40px; font-weight: 400;'
+		context.h1 = 'margin-bottom: 30px; margin-top: 40px; font-weight: 400; font-size: 30px;'
+		context.h2 = 'margin-bottom: 30px; margin-top: -20px; font-weight: 400; font-size: 20px;'
 		context.label_css = '''display: inline-block; color: {text_muted};
 			padding: 3px 7px; margin-right: 7px;'''.format(text_muted = context.text_muted)
 		context.section_head = 'margin-top: 60px; font-size: 16px;'
@@ -152,7 +153,7 @@ class EmailDigest(Document):
 
 		todo_list = frappe.db.sql("""select *
 			from `tabToDo` where (owner=%s or assigned_by=%s) and status="Open"
-			order by field(priority, 'High', 'Medium', 'Low') asc, date asc""",
+			order by field(priority, 'High', 'Medium', 'Low') asc, date asc limit 20""",
 			(user_id, user_id), as_dict=True)
 
 		for t in todo_list:
@@ -289,6 +290,7 @@ class EmailDigest(Document):
 		elif self.frequency == "Weekly":
 			# from date is the previous week's monday
 			from_date = today - timedelta(days=today.weekday(), weeks=1)
+
 			# to date is sunday i.e. the previous day
 			to_date = from_date + timedelta(days=6)
 		else:
@@ -300,32 +302,18 @@ class EmailDigest(Document):
 		return from_date, to_date
 
 	def set_dates(self):
-		today = now_datetime().date()
+		self.future_from_date, self.future_to_date = self.from_date, self.to_date
 
 		# decide from date based on email digest frequency
 		if self.frequency == "Daily":
-			# from date, to_date is today
-			self.future_from_date = self.future_to_date = today
-			self.past_from_date = self.past_to_date = today - relativedelta(days = 1)
+			self.past_from_date = self.past_to_date = self.future_from_date - relativedelta(days = 1)
 
 		elif self.frequency == "Weekly":
-			# from date is the current week's monday
-			self.future_from_date = today - relativedelta(days=today.weekday())
-
-			# to date is the current week's sunday
-			self.future_to_date = self.future_from_date + relativedelta(days=6)
-
-			self.past_from_date = self.future_from_date - relativedelta(days=7)
-			self.past_to_date = self.future_to_date - relativedelta(days=7)
+			self.past_from_date = self.future_from_date - relativedelta(weeks=1)
+			self.past_to_date = self.future_from_date - relativedelta(days=1)
 		else:
-			# from date is the 1st day of the current month
-			self.future_from_date = today - relativedelta(days=today.day-1)
-
-			# to date is the last day of the current month
-			self.future_to_date = self.future_from_date + relativedelta(days=-1, months=1)
-
-			self.past_from_date = self.future_from_date - relativedelta(month=1)
-			self.past_to_date = self.future_to_date - relativedelta(month=1)
+			self.past_from_date = self.future_from_date - relativedelta(months=1)
+			self.past_to_date = self.future_from_date - relativedelta(days=1)
 
 	def get_next_sending(self):
 		from_date, to_date = self.get_from_to_date()
diff --git a/erpnext/setup/doctype/email_digest/templates/default.html b/erpnext/setup/doctype/email_digest/templates/default.html
index d0bd13a7d4..bd88baf9f1 100644
--- a/erpnext/setup/doctype/email_digest/templates/default.html
+++ b/erpnext/setup/doctype/email_digest/templates/default.html
@@ -11,6 +11,7 @@
 
    
 
 
    {{ title }}
    
+
    {{ company }}
    
 
    
     
    {% if frequency == "Daily" %}
         {{ frappe.format_date(future_from_date) }}

From 5951692db0a4a530b8b341cede27e3a8bbd442cd Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Tue, 3 Nov 2015 18:20:39 +0530
Subject: [PATCH 47/59] [fix] cleanup stop-resume code

---
 .../doctype/purchase_order/purchase_order.js  | 35 ++++++------
 .../doctype/purchase_order/purchase_order.py  | 18 +++---
 .../purchase_order/purchase_order_list.js     | 12 ++--
 .../process_payroll/process_payroll.js        |  6 +-
 .../production_order/production_order.js      | 13 +----
 .../doctype/sales_order/sales_order.js        | 56 +++++++++----------
 .../doctype/sales_order/sales_order.py        | 41 +++++++-------
 .../doctype/sales_order/sales_order_list.js   | 22 ++++----
 .../material_request/material_request.js      | 30 +++-------
 .../material_request/material_request.py      |  1 -
 10 files changed, 100 insertions(+), 134 deletions(-)

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 3fca0f8bcd..38146cf990 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -25,11 +25,11 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 				cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order);
 
 			cur_frm.add_custom_button(__('Close'), this.close_purchase_order);
-			
+
 			if(doc.delivered_by_supplier && doc.status!="Delivered"){
 				cur_frm.add_custom_button(__('Delivered By Supplier'), this.delivered_by_supplier);
 			}
-				
+
 			if(flt(doc.per_billed)==0) {
 				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry);
 			}
@@ -51,8 +51,8 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 			cur_frm.cscript.add_from_mappers();
 		}
 
-		if(doc.docstatus == 1 && doc.status == 'Stopped')
-			cur_frm.add_custom_button(__('Unstop'), this.unstop_purchase_order);
+		if(doc.docstatus == 1 && (doc.status === 'Stopped' || doc.status === "Closed"))
+			cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order);
 	},
 
 	make_stock_entry: function() {
@@ -167,7 +167,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 		cur_frm.cscript.update_status('Stop', 'Stopped')
 	},
 	unstop_purchase_order: function(){
-		cur_frm.cscript.update_status('Resume', 'Submitted')
+		cur_frm.cscript.update_status('Re-open', 'Submitted')
 	},
 	close_purchase_order: function(){
 		cur_frm.cscript.update_status('Close', 'Closed')
@@ -193,19 +193,18 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 $.extend(cur_frm.cscript, new erpnext.buying.PurchaseOrderController({frm: cur_frm}));
 
 cur_frm.cscript.update_status= function(label, status){
-	var doc = cur_frm.doc;
-	var check = confirm(__("Do you really want to {0} {1}",[label, doc.name]));
-	
-	if (check) {
-		frappe.call({
-			method: "erpnext.buying.doctype.purchase_order.purchase_order.update_status",
-			args:{status: status, name: doc.name},
-			callback:function(r){
-				cur_frm.set_value("status", status);
-				cur_frm.reload_doc();			
-			}
-		})
-	}
+	frappe.ui.form.is_saving = true;
+	frappe.call({
+		method: "erpnext.buying.doctype.purchase_order.purchase_order.update_status",
+		args: {status: status, name: cur_frm.doc.name},
+		callback: function(r) {
+			cur_frm.set_value("status", status);
+			cur_frm.reload_doc();
+		},
+		always: function() {
+			frappe.ui.form.is_saving = false;
+		}
+	})
 }
 
 cur_frm.fields_dict['supplier_address'].get_query = function(doc, cdt, cdn) {
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 4f373e0eb2..6d0ddb4aff 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -164,7 +164,7 @@ class PurchaseOrder(BuyingController):
 	def on_submit(self):
 		if self.delivered_by_supplier == 1:
 			self.update_status_updater()
-		
+
 		super(PurchaseOrder, self).on_submit()
 
 		purchase_controller = frappe.get_doc("Purchase Common")
@@ -181,7 +181,7 @@ class PurchaseOrder(BuyingController):
 	def on_cancel(self):
 		if self.delivered_by_supplier == 1:
 			self.update_status_updater()
-		
+
 		pc_obj = frappe.get_doc('Purchase Common')
 		self.check_for_stopped_or_closed_status(pc_obj)
 
@@ -219,7 +219,7 @@ class PurchaseOrder(BuyingController):
 			for field in ("received_qty", "billed_amt", "prevdoc_doctype", "prevdoc_docname",
 				"prevdoc_detail_docname", "supplier_quotation", "supplier_quotation_item"):
 					d.set(field, None)
-					
+
 	def update_status_updater(self):
 		self.status_updater[0].update({
 			"target_parent_dt": "Sales Order",
@@ -227,7 +227,7 @@ class PurchaseOrder(BuyingController):
 			'target_field': 'ordered_qty',
 			"target_parent_field": ''
 		})
-		
+
 @frappe.whitelist()
 def stop_or_unstop_purchase_orders(names, status):
 	if not frappe.has_permission("Purchase Order", "write"):
@@ -241,7 +241,7 @@ def stop_or_unstop_purchase_orders(names, status):
 				if po.status not in ("Stopped", "Cancelled", "Closed") and (po.per_received < 100 or po.per_billed < 100):
 					po.update_status(status)
 			else:
-				if po.status == "Stopped":
+				if po.status in ("Stopped", "Closed"):
 					po.update_status("Draft")
 
 	frappe.local.message_log = []
@@ -344,22 +344,20 @@ def make_stock_entry(purchase_order, item_code):
 def update_status(status, name):
 	po = frappe.get_doc("Purchase Order", name)
 	po.update_status(status)
-	
+
 @frappe.whitelist()
 def	delivered_by_supplier(purchase_order):
 	po = frappe.get_doc("Purchase Order", purchase_order)
 	update_delivered_qty(po)
 	po.update_status("Delivered")
-	
+
 def update_delivered_qty(purchase_order):
-	sales_order_list = []
 	so_name = ''
 	for item in purchase_order.items:
 		if item.prevdoc_doctype == "Sales Order":
 			so_name = item.prevdoc_docname
-			
+
 	so = frappe.get_doc("Sales Order", so_name)
 	so.update_delivery_status(purchase_order.name)
 	so.set_status(update=True)
 	so.notify_update()
-	
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
index 0f1581dfb4..253eb4bccd 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
@@ -25,16 +25,16 @@ frappe.listview_settings['Purchase Order'] = {
 	onload: function(listview) {
 		var method = "erpnext.buying.doctype.purchase_order.purchase_order.stop_or_unstop_purchase_orders";
 
-		listview.page.add_menu_item(__("Set as Stopped"), function() {
+		listview.page.add_menu_item(__("Close"), function() {
+			listview.call_for_selected_items(method, {"status": "Closed"});
+		});
+
+		listview.page.add_menu_item(__("Stop"), function() {
 			listview.call_for_selected_items(method, {"status": "Stopped"});
 		});
 
-		listview.page.add_menu_item(__("Set as Unstopped"), function() {
+		listview.page.add_menu_item(__("Re-open"), function() {
 			listview.call_for_selected_items(method, {"status": "Submitted"});
 		});
-		
-		listview.page.add_menu_item(__("Set as Closed"), function() {
-			listview.call_for_selected_items(method, {"status": "Closed"});
-		});
 	}
 };
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.js b/erpnext/hr/doctype/process_payroll/process_payroll.js
index d88234997b..3da896cfc5 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.js
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.js
@@ -25,8 +25,8 @@ cur_frm.cscript.create_salary_slip = function(doc, cdt, cdn) {
 
 cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
 	cur_frm.cscript.display_activity_log("");
-	var check = confirm(__("Do you really want to Submit all Salary Slip for month {0} and year {1}", [doc.month, doc.fiscal_year]));
-	if(check){
+
+	frappe.confirm(__("Do you really want to Submit all Salary Slip for month {0} and year {1}", [doc.month, doc.fiscal_year]), function() {
 		// clear all in locals
 		if(locals["Salary Slip"]) {
 			$.each(locals["Salary Slip"], function(name, d) {
@@ -40,7 +40,7 @@ cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
 		}
 
 		return $c('runserverobj', args={'method':'submit_salary_slip','docs':doc},callback);
-	}
+	});
 }
 
 cur_frm.cscript.make_bank_entry = function(doc,cdt,cdn){
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index 7c92f2de9a..7349447ffd 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -83,7 +83,7 @@ erpnext.production_order = {
 				frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Production Order'],
 					"icon-exclamation", "btn-default");
 			} else if (doc.status == 'Stopped') {
-				frm.add_custom_button(__('Unstop'), cur_frm.cscript['Unstop Production Order'],
+				frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unstop Production Order'],
 				"icon-check", "btn-default");
 			}
 
@@ -239,18 +239,11 @@ $.extend(cur_frm.cscript, {
 });
 
 cur_frm.cscript['Stop Production Order'] = function() {
-	var doc = cur_frm.doc;
-	var check = confirm(__("Do you really want to stop production order: " + doc.name));
-	if (check) {
-		return $c_obj(doc, 'stop_unstop', 'Stopped', function(r, rt) {cur_frm.refresh();});
-	}
+	$c_obj(cur_frm.doc, 'stop_unstop', 'Stopped', function(r, rt) {cur_frm.refresh();});
 }
 
 cur_frm.cscript['Unstop Production Order'] = function() {
-	var doc = cur_frm.doc;
-	var check = confirm(__("Do really want to unstop production order: " + doc.name));
-	if (check)
-		return $c_obj(doc, 'stop_unstop', 'Unstopped', function(r, rt) {cur_frm.refresh();});
+	$c_obj(cur_frm.doc, 'stop_unstop', 'Unstopped', function(r, rt) {cur_frm.refresh();});
 }
 
 cur_frm.cscript['Transfer Raw Materials'] = function() {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index e7ef1e307a..cd5ca9dbc2 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -17,10 +17,10 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 		this.frm.dashboard.reset();
 		var is_delivered_by_supplier = false;
 		var is_delivery_note = false;
-		
+
 		if(doc.docstatus==1) {
 			if(doc.status != 'Stopped' && doc.status != 'Closed') {
-				
+
 				$.each(cur_frm.doc.items, function(i, item){
 					if(item.delivered_by_supplier == 1 || item.supplier){
 						if(item.qty > item.ordered_qty)
@@ -49,8 +49,8 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 				if(flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed) < 100) {
 						cur_frm.add_custom_button(__('Stop'), this.stop_sales_order)
 					}
-				
-				
+
+
 				cur_frm.add_custom_button(__('Close'), this.close_sales_order)
 
 				// maintenance
@@ -67,14 +67,13 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 				if(flt(doc.per_billed, 2) < 100) {
 					cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary");
 				}
-				
+
 				if(flt(doc.per_delivered, 2) < 100 && is_delivered_by_supplier)
 					cur_frm.add_custom_button(__('Make Purchase Order'), cur_frm.cscript.make_purchase_order).addClass("btn-primary");
 
 			} else {
 				// un-stop
-				if( doc.status != 'Closed')
-					cur_frm.add_custom_button(__('Unstop'), cur_frm.cscript['Unstop Sales Order']);
+				cur_frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unstop Sales Order']);
 			}
 		}
 
@@ -206,10 +205,10 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 		dialog.show();
 	},
 	stop_sales_order: function(){
-		cur_frm.cscript.update_status("Stop", "Stopped") 
+		cur_frm.cscript.update_status("Stop", "Stopped")
 	},
 	close_sales_order: function(){
-		cur_frm.cscript.update_status("Close", "Closed") 
+		cur_frm.cscript.update_status("Close", "Closed")
 	}
 
 });
@@ -235,32 +234,27 @@ cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) {
 
 cur_frm.cscript.update_status = function(label, status){
 	var doc = cur_frm.doc;
-	var check = confirm(__("Do you really want to {0} {1}",[label, doc.name]));
-	
-	if (check) {
-		frappe.call({
-			method: "erpnext.selling.doctype.sales_order.sales_order.update_status",
-			args:{status: status, name: doc.name},
-			callback:function(r){
-				cur_frm.reload_doc();
-			}
-		})
-	}
+	frappe.ui.form.is_saving = true;
+	frappe.call({
+		method: "erpnext.selling.doctype.sales_order.sales_order.update_status",
+		args: {status: status, name: doc.name},
+		callback: function(r){
+			cur_frm.reload_doc();
+		},
+		always: function() {
+			frappe.ui.form.is_saving = false;
+		}
+	});
 }
 
 cur_frm.cscript['Unstop Sales Order'] = function() {
 	var doc = cur_frm.doc;
-
-	var check = confirm(__("Are you sure you want to UNSTOP ") + doc.name);
-
-	if (check) {
-		return $c('runserverobj', {
-			'method':'unstop_sales_order',
-			'docs': doc
-		}, function(r,rt) {
-			cur_frm.refresh();
-		});
-	}
+	return $c('runserverobj', {
+		'method':'unstop_sales_order',
+		'docs': doc
+	}, function(r,rt) {
+		cur_frm.refresh();
+	});
 }
 
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 7ea796cc99..d55d49da2a 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -258,23 +258,23 @@ class SalesOrder(SellingController):
 
 	def on_update(self):
 		pass
-	
+
 	def before_update_after_submit(self):
-		self.validate_drop_ship()	
+		self.validate_drop_ship()
 		self.validate_po()
-		
+
 	def validate_po(self):
 		exc_list = []
-		
+
 		for item in self.items:
-			supplier = frappe.db.get_value("Sales Order Item", {"parent": self.name, "item_code": item.item_code}, 
+			supplier = frappe.db.get_value("Sales Order Item", {"parent": self.name, "item_code": item.item_code},
 				"supplier")
 			if item.ordered_qty > 0.0 and item.supplier != supplier:
 				exc_list.append("Row #{0}: Not allowed to change supplier as Purchase Order already exists".format(item.idx))
-		
-		if exc_list:		
+
+		if exc_list:
 			frappe.throw('\n'.join(exc_list))
-		
+
 	def update_delivery_status(self, po_name):
 		tot_qty, delivered_qty = 0.0, 0.0
 
@@ -282,12 +282,12 @@ class SalesOrder(SellingController):
 			if item.delivered_by_supplier:
 				delivered_qty = frappe.db.get_value("Purchase Order Item", {"parent": po_name, "item_code": item.item_code}, "qty")
 				frappe.db.set_value("Sales Order Item", item.name, "delivered_qty", delivered_qty)
-				
+
 			delivered_qty += item.delivered_qty
 			tot_qty += item.qty
-			
+
 		frappe.db.set_value("Sales Order", self.name, "per_delivered", flt(delivered_qty/tot_qty) * 100)
-		
+
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
@@ -307,7 +307,7 @@ def stop_or_unstop_sales_orders(names, status):
 				if so.status not in ("Stopped", "Cancelled", "Closed") and (so.per_delivered < 100 or so.per_billed < 100):
 					so.stop_sales_order(status)
 			else:
-				if so.status == "Stopped":
+				if so.status in ("Stopped", "Closed"):
 					so.unstop_sales_order()
 
 	frappe.local.message_log = []
@@ -525,14 +525,14 @@ def get_events(start, end, filters=None):
 	return data
 
 @frappe.whitelist()
-def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc=None):	
+def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc=None):
 	def set_missing_values(source, target):
 		target.supplier = for_supplier
-		
+
 		default_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list")
 		if default_price_list:
 			target.buying_price_list = default_price_list
-			
+
 		target.delivered_by_supplier = 1
 		target.run_method("set_missing_values")
 		target.run_method("calculate_taxes_and_totals")
@@ -552,10 +552,10 @@ def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc=
 				"contact_person": "customer_contact_person"
 			},
 			"field_no_map": [
-				"address_display", 
-				"contact_display", 
-				"contact_mobile", 
-				"contact_email", 
+				"address_display",
+				"contact_display",
+				"contact_mobile",
+				"contact_email",
 				"contact_person"
 			],
 			"validation": {
@@ -579,7 +579,7 @@ def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc=
 			"condition": lambda doc: doc.ordered_qty < doc.qty and doc.supplier == for_supplier
 		}
 	}, target_doc, set_missing_values)
-	
+
 	return doclist
 
 @frappe.whitelist()
@@ -615,4 +615,3 @@ def get_supplier(doctype, txt, searchfield, start, page_len, filters):
 def update_status(status, name):
 	so = frappe.get_doc("Sales Order", name)
 	so.stop_sales_order(status)
-	
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js
index 8030ff80e4..ff9ff91beb 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_list.js
+++ b/erpnext/selling/doctype/sales_order/sales_order_list.js
@@ -7,7 +7,7 @@ frappe.listview_settings['Sales Order'] = {
 
         } else if(doc.status==="Closed"){
         	return [__("Closed"), "green", "status,=,Closed"];
-			
+
         } else if (doc.order_type !== "Maintenance"
 			&& flt(doc.per_delivered, 2) < 100 && frappe.datetime.get_diff(doc.delivery_date) < 0) {
 			// to bill & overdue
@@ -44,17 +44,17 @@ frappe.listview_settings['Sales Order'] = {
 	onload: function(listview) {
 		var method = "erpnext.selling.doctype.sales_order.sales_order.stop_or_unstop_sales_orders";
 
-		listview.page.add_menu_item(__("Set as Stopped"), function() {
-			listview.call_for_selected_items(method, {"status": "Stoped"});
-		});
-
-		listview.page.add_menu_item(__("Set as Unstopped"), function() {
-			listview.call_for_selected_items(method, {"status": "Unstop"});
-		});
-		
-		listview.page.add_menu_item(__("Set as Closed"), function() {
+		listview.page.add_menu_item(__("Close"), function() {
 			listview.call_for_selected_items(method, {"status": "Closed"});
 		});
 
+		listview.page.add_menu_item(__("Stop"), function() {
+			listview.call_for_selected_items(method, {"status": "Stoped"});
+		});
+
+		listview.page.add_menu_item(__("Re-open"), function() {
+			listview.call_for_selected_items(method, {"status": "Unstop"});
+		});
+
 	}
-};
\ No newline at end of file
+};
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index a7b9df4ec1..3a1f508f31 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -28,14 +28,6 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
 	refresh: function(doc) {
 		this._super();
 
-		// dashboard
-		cur_frm.dashboard.reset();
-		if(doc.docstatus===1) {
-			if(doc.status==="Stopped") {
-				cur_frm.dashboard.set_headline_alert(__("Stopped"), "alert-danger", "octicon octicon-circle-slash")
-			}
-		}
-
 		if(doc.docstatus==0) {
 			cur_frm.add_custom_button(__("Get Items from BOM"),
 				cur_frm.cscript.get_items_from_bom, "icon-sitemap", "btn-default");
@@ -84,7 +76,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
 		}
 
 		if(doc.docstatus == 1 && doc.status == 'Stopped')
-			cur_frm.add_custom_button(__('Unstop Material Request'),
+			cur_frm.add_custom_button(__('Re-open'),
 				cur_frm.cscript['Unstop Material Request'], "icon-check");
 
 	},
@@ -175,24 +167,16 @@ $.extend(cur_frm.cscript, new erpnext.buying.MaterialRequestController({frm: cur
 
 cur_frm.cscript['Stop Material Request'] = function() {
 	var doc = cur_frm.doc;
-	var check = confirm(__("Do you really want to STOP this Material Request?"));
-
-	if (check) {
-		return $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs': doc}, function(r,rt) {
-			cur_frm.refresh();
-		});
-	}
+	$c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs': doc}, function(r,rt) {
+		cur_frm.refresh();
+	});
 };
 
 cur_frm.cscript['Unstop Material Request'] = function(){
 	var doc = cur_frm.doc;
-	var check = confirm(__("Do you really want to UNSTOP this Material Request?"));
-
-	if (check) {
-		return $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted','docs': doc}, function(r,rt) {
-			cur_frm.refresh();
-		});
-	}
+	$c('runserverobj', args={'method':'update_status', 'arg': 'Submitted','docs': doc}, function(r,rt) {
+		cur_frm.refresh();
+	});
 };
 
 
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 9ca4758854..e65cc4b0dc 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -98,7 +98,6 @@ class MaterialRequest(BuyingController):
 		self.check_modified_date()
 		frappe.db.set(self, 'status', cstr(status))
 		self.update_requested_qty()
-		frappe.msgprint(_("Status updated to {0}").format(_(status)))
 
 	def on_cancel(self):
 		pc_obj = frappe.get_doc('Purchase Common')

From 9c044eefff353574a2af2bf93e7d84495b4226fe Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Tue, 3 Nov 2015 18:28:37 +0530
Subject: [PATCH 48/59] [cleanup] re-arrange drop ship field

---
 .../sales_order_item/sales_order_item.json    | 44 +++++++++---------
 erpnext/stock/doctype/item/item.json          | 46 +++++++++----------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index 93ba3a5f94..b0f7109957 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -728,27 +728,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_32", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 1, 
    "bold": 0, 
@@ -772,6 +751,27 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_32", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1206,7 +1206,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-11-02 15:15:05.774529", 
+ "modified": "2015-11-03 07:58:15.034750", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 2ed54c8241..678bedd89f 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -246,28 +246,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "delivered_by_supplier", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Delivered By Supplier", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1187,6 +1165,28 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "delivered_by_supplier", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Delivered By Supplier (Drop Ship)", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -2157,7 +2157,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-11-03 02:25:26.256373", 
+ "modified": "2015-11-03 07:52:41.416937", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 

From b7f0a4961edcdfd416b82a8f8122b35fdc8f5ded Mon Sep 17 00:00:00 2001
From: Saurabh 
Date: Wed, 4 Nov 2015 12:03:54 +0530
Subject: [PATCH 49/59] =?UTF-8?q?-=20no=20delivery=20/=20reserve=20warehou?=
 =?UTF-8?q?se=20in=20drop=20ship=20-=20=E2=80=9CRe-open=E2=80=9D=20in=20DN?=
 =?UTF-8?q?=20/=20PR=20after=20=E2=80=9CStop=E2=80=9D=20/=20=E2=80=9CClose?=
 =?UTF-8?q?"=20-=20check=20for=20closed=20status=20in=20reports?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ordered_items_to_be_billed.json           |  6 ++--
 .../purchase_order_items_to_be_billed.json    |  5 +--
 .../doctype/sales_order/sales_order.py        |  2 +-
 .../doctype/sales_order/test_sales_order.py   | 16 ++++-----
 .../sales_order_item/sales_order_item.json    | 25 ++-----------
 .../doctype/delivery_note/delivery_note.js    | 31 +++++++++++-----
 .../doctype/delivery_note/delivery_note.py    |  2 +-
 .../purchase_receipt/purchase_receipt.js      | 36 +++++++++++++------
 .../purchase_receipt/purchase_receipt.py      |  2 +-
 .../ordered_items_to_be_delivered.json        |  4 +--
 .../purchase_order_items_to_be_received.json  |  5 +--
 11 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
index 887258a46c..cdbd5c1c01 100644
--- a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
+++ b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
@@ -1,16 +1,18 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-02-21 14:26:44", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2015-03-30 05:33:29.382709", 
+ "modified": "2015-11-04 11:56:32.699103", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Ordered Items To Be Billed", 
  "owner": "Administrator", 
- "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.base_amount as \"Amount:Currency:110\",\n (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (ifnull(`tabSales Order Item`.base_amount, 0) - (ifnull(`tabSales Order Item`.billed_amt, 0) * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order`.`company` as \"Company:Link/Company:\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Stopped\"\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.amount,0)\norder by `tabSales Order`.transaction_date asc", 
+ "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.base_amount as \"Amount:Currency:110\",\n (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (ifnull(`tabSales Order Item`.base_amount, 0) - (ifnull(`tabSales Order Item`.billed_amt, 0) * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order`.`company` as \"Company:Link/Company:\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status not in (\"Stopped\", \"Closed\")\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.amount,0)\norder by `tabSales Order`.transaction_date asc", 
  "ref_doctype": "Sales Invoice", 
  "report_name": "Ordered Items To Be Billed", 
  "report_type": "Query Report"
diff --git a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json
index 084fd8cf5c..38361fb19b 100644
--- a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json
+++ b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json
@@ -2,16 +2,17 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-05-28 15:54:16", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2015-03-30 05:37:23.626083", 
+ "modified": "2015-11-04 11:56:14.321664", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Order Items To Be Billed", 
  "owner": "Administrator", 
- "query": "select \n    `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n    `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project_name` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t(`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1))) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n\t`tabPurchase Order`.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status != \"Stopped\"\n\tand (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1)) < ifnull(`tabPurchase Order Item`.base_amount, 0)\norder by `tabPurchase Order`.transaction_date asc", 
+ "query": "select \n    `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n    `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project_name` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t(`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1))) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n\t`tabPurchase Order`.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status not in (\"Stopped\", \"Closed\")\n\tand (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1)) < ifnull(`tabPurchase Order Item`.base_amount, 0)\norder by `tabPurchase Order`.transaction_date asc", 
  "ref_doctype": "Purchase Invoice", 
  "report_name": "Purchase Order Items To Be Billed", 
  "report_type": "Query Report"
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index d55d49da2a..2bc89d5c4d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -68,7 +68,7 @@ class SalesOrder(SellingController):
 
 			if (frappe.db.get_value("Item", d.item_code, "is_stock_item")==1 or
 				(self.has_product_bundle(d.item_code) and self.product_bundle_has_stock_item(d.item_code))) \
-				and not d.warehouse:
+				and not d.warehouse and not cint(d.delivered_by_supplier):
 				frappe.throw(_("Delivery warehouse required for stock item {0}").format(d.item_code),
 					WarehouseRequired)
 
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 1d11a8bead..748af3cc11 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -314,7 +314,7 @@ class TestSalesOrder(unittest.TestCase):
 		so_items = [
 			{
 				"item_code": po_item.item_code,
-				"warehouse": "_Test Warehouse - _TC",
+				"warehouse": "",
 				"qty": 2,
 				"rate": 400,
 				"delivered_by_supplier": 1,
@@ -360,13 +360,13 @@ class TestSalesOrder(unittest.TestCase):
 		ordered_qty, reserved_qty = frappe.db.get_value("Bin", 
 			{"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"])
 		
-		self.assertEquals(abs(ordered_qty), existing_ordered_qty + so_items[0]['qty'])			
-		self.assertEquals(abs(reserved_qty), existing_reserved_qty + so_items[0]['qty'])
+		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty + so_items[0]['qty'])			
+		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
 		
 		reserved_qty = frappe.db.get_value("Bin", 
 					{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
 		
-		self.assertEquals(abs(reserved_qty), existing_reserved_qty_for_dn_item + 1)
+		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item + 1)
 		
 		#test po_item length
 		self.assertEquals(len(po.items), 1)
@@ -380,7 +380,7 @@ class TestSalesOrder(unittest.TestCase):
 		reserved_qty = frappe.db.get_value("Bin", 
 			{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
 		
-		self.assertEquals(abs(reserved_qty), existing_reserved_qty_for_dn_item)
+		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item)
 		
 		#test after closing so
 		so.db_set('status', "Closed")
@@ -389,13 +389,13 @@ class TestSalesOrder(unittest.TestCase):
 		ordered_qty, reserved_qty = frappe.db.get_value("Bin", 
 			{"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"])
 		
-		self.assertEquals(abs(ordered_qty), existing_ordered_qty)			
-		self.assertEquals(abs(reserved_qty), existing_reserved_qty)
+		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty)			
+		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
 		
 		reserved_qty = frappe.db.get_value("Bin", 
 			{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
 		
-		self.assertEquals(abs(reserved_qty), existing_reserved_qty)
+		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
 		
 	def test_reserved_qty_for_closing_so(self):
 		bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"}, 
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index b0f7109957..b5a1d817a5 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -751,27 +751,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_32", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -797,6 +776,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "eval:doc.delivered_by_supplier!=1", 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -823,6 +803,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "eval:doc.delivered_by_supplier!=1", 
    "fieldname": "target_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1206,7 +1187,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-11-03 07:58:15.034750", 
+ "modified": "2015-11-04 11:29:57.645382", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index c4d8b42866..688db9c11c 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -60,6 +60,9 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 				cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary");
 		}
 
+		if(doc.docstatus==1 && doc.status === "Closed") {
+			cur_frm.add_custom_button(__('Re-open'), this.reopen_delivery_note)
+		}
 		erpnext.stock.delivery_note.set_print_hide(doc, dt, dn);
 
 		// unhide expense_account and cost_center is auto_accounting_for_stock enabled
@@ -97,14 +100,11 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 	},
 	
 	close_delivery_note: function(doc){
-		frappe.call({
-			method:"erpnext.stock.doctype.delivery_note.delivery_note.close_delivery_note",
-			args: {docname: cur_frm.doc.name, status:"Closed"},
-			callback: function(r){
-				if(!r.exc)
-					cur_frm.reload_doc();
-			}
-		})
+		cur_frm.cscript.update_status("Closed")
+	},
+	
+	reopen_delivery_note : function() {
+		cur_frm.cscript.update_status("Submitted")
 	}
 
 });
@@ -120,6 +120,21 @@ cur_frm.cscript.new_contact = function(){
 }
 
 
+cur_frm.cscript.update_status = function(status) {
+	frappe.ui.form.is_saving = true;
+	frappe.call({
+		method:"erpnext.stock.doctype.delivery_note.delivery_note.update_delivery_note_status",
+		args: {docname: cur_frm.doc.name, status: status},
+		callback: function(r){
+			if(!r.exc)
+				cur_frm.reload_doc();
+		},
+		always: function(){
+			frappe.ui.form.is_saving = false;
+		}
+	})
+}
+
 // ***************** Get project name *****************
 cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) {
 	return {
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index abc68cc872..8d90e3b992 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -397,6 +397,6 @@ def make_sales_return(source_name, target_doc=None):
 
 
 @frappe.whitelist()
-def close_delivery_note(docname, status):
+def update_delivery_note_status(docname, status):
 	dn = frappe.get_doc("Delivery Note", docname)
 	dn.update_status(status)
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 52191424f7..092a7e41a3 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -59,7 +59,12 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 				cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt)
 			}
 		}
-
+		
+		
+		if(this.frm.doc.docstatus==1 && this.frm.doc.status === "Closed") {
+			cur_frm.add_custom_button(__('Re-open'), this.reopen_delivery_note)
+		}
+		
 		this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted==="Yes");
 	},
 
@@ -124,22 +129,33 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 	},
 	
 	close_purchase_receipt: function() {
-		frappe.call({
-			method:"erpnext.stock.doctype.purchase_receipt.purchase_receipt.close_purchase_receipt",
-			args: {"docname": cur_frm.doc.name, "status":"Closed"},
-			callback: function(r){
-				if(!r.exc)
-					cur_frm.reload_doc();
-			}
-		})
+		cur_frm.cscript.update_status("Closed");
+	},
+	
+	reopen_delivery_note: function() {
+		cur_frm.cscript.update_status("Submitted");
 	}
 
 });
 
-
 // for backward compatibility: combine new and previous states
 $.extend(cur_frm.cscript, new erpnext.stock.PurchaseReceiptController({frm: cur_frm}));
 
+cur_frm.cscript.update_status = function(status) {
+	frappe.ui.form.is_saving = true;
+	frappe.call({
+		method:"erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_order_status",
+		args: {docname: cur_frm.doc.name, status: status},
+		callback: function(r){
+			if(!r.exc)
+				cur_frm.reload_doc();
+		},
+		always: function(){
+			frappe.ui.form.is_saving = false;
+		}
+	})
+}
+
 cur_frm.fields_dict['supplier_address'].get_query = function(doc, cdt, cdn) {
 	return {
 		filters: { 'supplier': doc.supplier}
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 239d74ef59..68a3022413 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -496,6 +496,6 @@ def make_purchase_return(source_name, target_doc=None):
 
 
 @frappe.whitelist()
-def close_purchase_receipt(docname, status):
+def update_purchase_order_status(docname, status):
 	pr = frappe.get_doc("Purchase Receipt", docname)
 	pr.update_status(status)
\ No newline at end of file
diff --git a/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
index 14af598b76..f6c847758b 100644
--- a/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
+++ b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
@@ -7,12 +7,12 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2015-10-06 12:43:37.547654", 
+ "modified": "2015-11-04 12:00:40.085130", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Ordered Items To Be Delivered", 
  "owner": "Administrator", 
- "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.qty as \"Qty:Float:140\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float:140\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float:140\",\n `tabSales Order Item`.base_rate as \"Rate:Float:140\",\n `tabSales Order Item`.base_amount as \"Amount:Float:140\",\n ((`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0))*`tabSales Order Item`.base_rate) as \"Amount to Deliver:Float:140\",\n `tabBin`.actual_qty as \"Available Qty:Float:120\",\n `tabBin`.projected_qty as \"Projected Qty:Float:120\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date:Date:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order Item`.item_group as \"Item Group:Link/Item Group:120\",\n `tabSales Order Item`.warehouse as \"Warehouse:Link/Warehouse:200\"\nfrom\n `tabSales Order` JOIN `tabSales Order Item` \n LEFT JOIN `tabBin` ON (`tabBin`.item_code = `tabSales Order Item`.item_code\n and `tabBin`.warehouse = `tabSales Order Item`.warehouse)\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Stopped\"\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc", 
+ "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.qty as \"Qty:Float:140\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float:140\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float:140\",\n `tabSales Order Item`.base_rate as \"Rate:Float:140\",\n `tabSales Order Item`.base_amount as \"Amount:Float:140\",\n ((`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0))*`tabSales Order Item`.base_rate) as \"Amount to Deliver:Float:140\",\n `tabBin`.actual_qty as \"Available Qty:Float:120\",\n `tabBin`.projected_qty as \"Projected Qty:Float:120\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date:Date:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order Item`.item_group as \"Item Group:Link/Item Group:120\",\n `tabSales Order Item`.warehouse as \"Warehouse:Link/Warehouse:200\"\nfrom\n `tabSales Order` JOIN `tabSales Order Item` \n LEFT JOIN `tabBin` ON (`tabBin`.item_code = `tabSales Order Item`.item_code\n and `tabBin`.warehouse = `tabSales Order Item`.warehouse)\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status not in (\"Stopped\", \"Closed\")\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc", 
  "ref_doctype": "Delivery Note", 
  "report_name": "Ordered Items To Be Delivered", 
  "report_type": "Query Report"
diff --git a/erpnext/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.json b/erpnext/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.json
index ca8efb7746..bca9a20fd7 100644
--- a/erpnext/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.json
+++ b/erpnext/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.json
@@ -2,16 +2,17 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-02-22 18:01:55", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2015-03-30 05:47:04.213199", 
+ "modified": "2015-11-04 12:01:22.108641", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Order Items To Be Received", 
  "owner": "Administrator", 
- "query": "select \n    `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n\t`tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order Item`.`schedule_date` as \"Reqd by Date:Date:110\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project_name` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.qty as \"Qty:Float:100\",\n\t`tabPurchase Order Item`.received_qty as \"Received Qty:Float:100\", \n\t(`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0)) as \"Qty to Receive:Float:100\",\n    `tabPurchase Order Item`.warehouse as \"Warehouse:Link/Warehouse:150\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n    `tabPurchase Order Item`.brand as \"Brand::100\",\n\t`tabPurchase Order`.`company` as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status != \"Stopped\"\n\tand ifnull(`tabPurchase Order Item`.received_qty, 0) < ifnull(`tabPurchase Order Item`.qty, 0)\norder by `tabPurchase Order`.transaction_date asc", 
+ "query": "select \n    `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n\t`tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order Item`.`schedule_date` as \"Reqd by Date:Date:110\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project_name` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.qty as \"Qty:Float:100\",\n\t`tabPurchase Order Item`.received_qty as \"Received Qty:Float:100\", \n\t(`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0)) as \"Qty to Receive:Float:100\",\n    `tabPurchase Order Item`.warehouse as \"Warehouse:Link/Warehouse:150\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n    `tabPurchase Order Item`.brand as \"Brand::100\",\n\t`tabPurchase Order`.`company` as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status not in (\"Stopped\", \"Closed\")\n\tand ifnull(`tabPurchase Order Item`.received_qty, 0) < ifnull(`tabPurchase Order Item`.qty, 0)\norder by `tabPurchase Order`.transaction_date asc", 
  "ref_doctype": "Purchase Receipt", 
  "report_name": "Purchase Order Items To Be Received", 
  "report_type": "Query Report"

From 95fbfa49283782399e63fc90616e11db9f621ded Mon Sep 17 00:00:00 2001
From: Saurabh 
Date: Wed, 4 Nov 2015 12:10:01 +0530
Subject: [PATCH 50/59] [fixes] typo fixes

---
 erpnext/stock/doctype/purchase_receipt/purchase_receipt.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 092a7e41a3..4af0e6cbf3 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -62,7 +62,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 		
 		
 		if(this.frm.doc.docstatus==1 && this.frm.doc.status === "Closed") {
-			cur_frm.add_custom_button(__('Re-open'), this.reopen_delivery_note)
+			cur_frm.add_custom_button(__('Re-open'), this.reopen_purchase_receipt)
 		}
 		
 		this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted==="Yes");
@@ -132,7 +132,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 		cur_frm.cscript.update_status("Closed");
 	},
 	
-	reopen_delivery_note: function() {
+	reopen_purchase_receipt: function() {
 		cur_frm.cscript.update_status("Submitted");
 	}
 

From 6197860643feacfd1ad05dd7a317cf9e30500122 Mon Sep 17 00:00:00 2001
From: Saurabh 
Date: Wed, 4 Nov 2015 12:43:40 +0530
Subject: [PATCH 51/59] [fixes] test case update

---
 erpnext/stock/doctype/delivery_note/test_delivery_note.py     | 4 ++--
 erpnext/stock/doctype/purchase_receipt/purchase_receipt.py    | 2 +-
 .../stock/doctype/purchase_receipt/test_purchase_receipt.py   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 98acb6253d..c3d8447dca 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -398,12 +398,12 @@ class TestDeliveryNote(unittest.TestCase):
 		set_perpetual_inventory(0)
 		
 	def test_closed_delivery_note(self):
-		from erpnext.stock.doctype.delivery_note.delivery_note import close_delivery_note
+		from erpnext.stock.doctype.delivery_note.delivery_note import update_delivery_note_status
 		
 		dn = create_delivery_note(do_not_submit=True)
 		dn.submit()
 		
-		close_delivery_note(dn.name, "Closed")
+		update_delivery_note_status(dn.name, "Closed")
 		self.assertEquals(frappe.db.get_value("Delivery Note", dn.name, "Status"), "Closed")
 
 def create_delivery_note(**args):
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 68a3022413..ddd2feb000 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -496,6 +496,6 @@ def make_purchase_return(source_name, target_doc=None):
 
 
 @frappe.whitelist()
-def update_purchase_order_status(docname, status):
+def update_purchase_receipt_status(docname, status):
 	pr = frappe.get_doc("Purchase Receipt", docname)
 	pr.update_status(status)
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 3c121e5f4a..8aa9761ead 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -177,12 +177,12 @@ class TestPurchaseReceipt(unittest.TestCase):
 		})
 	
 	def test_closed_purchase_receipt(self):
-		from erpnext.stock.doctype.purchase_receipt.purchase_receipt import close_purchase_receipt
+		from erpnext.stock.doctype.purchase_receipt.purchase_receipt import update_purchase_receipt_status
 		
 		pr = make_purchase_receipt(do_not_submit=True)
 		pr.submit()
 		
-		close_purchase_receipt(pr.name, "Closed")
+		update_purchase_receipt_status(pr.name, "Closed")
 		self.assertEquals(frappe.db.get_value("Purchase Receipt", pr.name, "status"), "Closed")
 		
 def get_gl_entries(voucher_type, voucher_no):

From b4a51ec80b96a7f30390f61ec8175f77b7fecb14 Mon Sep 17 00:00:00 2001
From: Nabin Hait 
Date: Wed, 4 Nov 2015 13:09:37 +0530
Subject: [PATCH 52/59] [report] Added delay in payment column

---
 .../payment_period_based_on_invoice_date.py   | 60 ++++++++++++-------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
index 786a494eba..20bdae8121 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 from erpnext.accounts.report.accounts_receivable.accounts_receivable import get_ageing_data
-from frappe.utils import flt
+from frappe.utils import flt, getdate
 
 def execute(filters=None):
 	if not filters: filters = {}
@@ -13,25 +13,27 @@ def execute(filters=None):
 
 	columns = get_columns(filters)
 	entries = get_entries(filters)
-	invoice_posting_date_map = get_invoice_posting_date_map(filters)
+	invoice_details = get_invoice_posting_date_map(filters)
 	against_date = ""
 
 	data = []
 	for d in entries:
-		against_date = invoice_posting_date_map.get(d.reference_name) or ""
+		invoice = invoice_details.get(d.reference_name) or frappe._dict()
 		if d.reference_type=="Purchase Invoice":
 			payment_amount = flt(d.debit) or -1 * flt(d.credit)
 		else:
 			payment_amount = flt(d.credit) or -1 * flt(d.debit)
 
-		row = [d.name, d.party_type, d.party, d.posting_date, d.reference_name,
-			against_date, d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark]
+		row = [d.name, d.party_type, d.party, d.posting_date, d.reference_name, invoice.posting_date, 
+			invoice.due_date, d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark]
 
 		if d.reference_name:
 			row += get_ageing_data(30, 60, 90, d.posting_date, against_date, payment_amount)
 		else:
 			row += ["", "", "", "", ""]
-
+		if invoice.due_date:
+			row.append((getdate(d.posting_date) - getdate(invoice.due_date)).days or 0)
+		
 		data.append(row)
 
 	return columns, data
@@ -43,13 +45,25 @@ def validate_filters(filters):
 				.format(filters.payment_type, filters.party_type))
 
 def get_columns(filters):
-	return [_("Journal Entry") + ":Link/Journal Entry:140",
-		_("Party Type") + "::100", _("Party") + ":Dynamic Link/Party Type:140",
+	return [
+		_("Journal Entry") + ":Link/Journal Entry:140",
+		_("Party Type") + "::100", 
+		_("Party") + ":Dynamic Link/Party Type:140",
 		_("Posting Date") + ":Date:100",
-		_("Against Invoice") + (":Link/Purchase Invoice:130" if filters.get("payment_type") == "Outgoing" else ":Link/Sales Invoice:130"),
-		_("Against Invoice Posting Date") + ":Date:130", _("Debit") + ":Currency:120", _("Credit") + ":Currency:120",
-		_("Reference No") + "::100", _("Reference Date") + ":Date:100", _("Remarks") + "::150", _("Age") +":Int:40",
-		"0-30:Currency:100", "30-60:Currency:100", "60-90:Currency:100", _("90-Above") + ":Currency:100"
+		_("Invoice") + (":Link/Purchase Invoice:130" if filters.get("payment_type") == "Outgoing" else ":Link/Sales Invoice:130"),
+		_("Invoice Posting Date") + ":Date:130", 
+		_("Payment Due Date") + ":Date:130", 
+		_("Debit") + ":Currency:120", 
+		_("Credit") + ":Currency:120",
+		_("Reference No") + "::100", 
+		_("Reference Date") + ":Date:100", 
+		_("Remarks") + "::150", 
+		_("Age") +":Int:40",
+		"0-30:Currency:100", 
+		"30-60:Currency:100", 
+		"60-90:Currency:100", 
+		_("90-Above") + ":Currency:100",
+		_("Delay in payment (Days)") + "::150"
 	]
 
 def get_conditions(filters):
@@ -66,7 +80,14 @@ def get_conditions(filters):
 
 	if filters.get("party"):
 		conditions.append("jvd.party=%(party)s")
-
+		
+	if filters.get("party_type"):
+		conditions.append("jvd.reference_type=%(reference_type)s")
+		if filters.get("party_type") == "Customer":
+			filters["reference_type"] = "Sales Invoice"
+		else:
+			filters["reference_type"] = "Purchase Invoice"
+		
 	if filters.get("company"):
 		conditions.append("jv.company=%(company)s")
 
@@ -89,12 +110,9 @@ def get_entries(filters):
 	return entries
 
 def get_invoice_posting_date_map(filters):
-	invoice_posting_date_map = {}
-	if filters.get("payment_type") == "Incoming":
-		for t in frappe.db.sql("""select name, posting_date from `tabSales Invoice`"""):
-			invoice_posting_date_map[t[0]] = t[1]
-	else:
-		for t in frappe.db.sql("""select name, posting_date from `tabPurchase Invoice`"""):
-			invoice_posting_date_map[t[0]] = t[1]
+	invoice_details = {}
+	dt = "Sales Invoice" if filters.get("payment_type") == "Incoming" else "Purchase Invoice"
+	for t in frappe.db.sql("select name, posting_date, due_date from `tab{0}`".format(dt), as_dict=1):
+		invoice_details[t.name] = t
 
-	return invoice_posting_date_map
+	return invoice_details

From d48c2394e80c28c0f38e1bca1c0ba782ec6865a6 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Wed, 4 Nov 2015 15:20:50 +0530
Subject: [PATCH 53/59] [cleanup] drop ship testing & cleanup

---
 .../doctype/purchase_order/purchase_order.js  |   27 +-
 .../purchase_order/purchase_order.json        |  367 ++-
 .../doctype/purchase_order/purchase_order.py  |   34 +-
 .../purchase_order_item.json                  | 2212 ++++++++---------
 erpnext/controllers/status_updater.py         |   12 +-
 .../leave_allocation/leave_allocation.json    |  125 +-
 .../leave_allocation/leave_allocation.py      |   13 +-
 .../doctype/sales_order/sales_order.js        |   27 +-
 .../doctype/sales_order/sales_order.py        |   47 +-
 .../doctype/sales_order/test_sales_order.py   |  106 +-
 .../sales_order_item/sales_order_item.json    | 2192 ++++++++--------
 .../doctype/delivery_note/delivery_note.py    |   11 +-
 erpnext/stock/doctype/item/item.json          |   46 +-
 .../purchase_receipt/purchase_receipt.py      |    7 +-
 14 files changed, 2676 insertions(+), 2550 deletions(-)

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 38146cf990..2a76f8a2b1 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -19,15 +19,16 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 		this._super();
 		// this.frm.dashboard.reset();
 
-		if(doc.docstatus == 1 && doc.status != 'Stopped' && doc.status != 'Closed') {
+		if(doc.docstatus == 1 && !in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
 
-			if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100)
+			if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) {
 				cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order);
+			}
 
 			cur_frm.add_custom_button(__('Close'), this.close_purchase_order);
 
 			if(doc.delivered_by_supplier && doc.status!="Delivered"){
-				cur_frm.add_custom_button(__('Delivered By Supplier'), this.delivered_by_supplier);
+				cur_frm.add_custom_button(__('Mark as Delivered'), this.delivered_by_supplier);
 			}
 
 			if(flt(doc.per_billed)==0) {
@@ -51,8 +52,9 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 			cur_frm.cscript.add_from_mappers();
 		}
 
-		if(doc.docstatus == 1 && (doc.status === 'Stopped' || doc.status === "Closed"))
+		if(doc.docstatus == 1 && in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
 			cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order);
+		}
 	},
 
 	make_stock_entry: function() {
@@ -173,18 +175,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 		cur_frm.cscript.update_status('Close', 'Closed')
 	},
 	delivered_by_supplier: function(){
-		return frappe.call({
-			method: "erpnext.buying.doctype.purchase_order.purchase_order.delivered_by_supplier",
-			freeze: true,
-			args:{
-				purchase_order: cur_frm.doc.name
-			},
-			callback:function(r){
-				if(!r.exc) {
-					cur_frm.reload_doc();
-				}
-			}
-		})
+		cur_frm.cscript.update_status('Deliver', 'Delivered')
 	}
 
 });
@@ -193,16 +184,12 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 $.extend(cur_frm.cscript, new erpnext.buying.PurchaseOrderController({frm: cur_frm}));
 
 cur_frm.cscript.update_status= function(label, status){
-	frappe.ui.form.is_saving = true;
 	frappe.call({
 		method: "erpnext.buying.doctype.purchase_order.purchase_order.update_status",
 		args: {status: status, name: cur_frm.doc.name},
 		callback: function(r) {
 			cur_frm.set_value("status", status);
 			cur_frm.reload_doc();
-		},
-		always: function() {
-			frappe.ui.form.is_saving = false;
 		}
 	})
 }
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index cd4290134c..0b03319e1d 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -151,53 +151,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.delivered_by_supplier==1", 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer", 
-   "no_copy": 0, 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.delivered_by_supplier==1", 
-   "fieldname": "customer_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Name", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
+   "depends_on": "", 
    "fieldname": "address_display", 
    "fieldtype": "Small Text", 
    "hidden": 1, 
@@ -215,28 +169,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_address_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Address", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -258,28 +190,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Contact", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -301,28 +211,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_contact_mobile", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Mobile No", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -344,28 +232,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_contact_email", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Contact Email", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -461,6 +327,76 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "delivered_by_supplier", 
+   "fieldname": "drop_ship", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Drop Ship", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "delivered_by_supplier", 
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer", 
+   "no_copy": 0, 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "delivered_by_supplier", 
+   "fieldname": "customer_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Name", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -471,7 +407,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Delivered By Supplier", 
+   "label": "To be delivered to customer", 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -483,6 +419,163 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_19", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "delivered_by_supplier", 
+   "fieldname": "customer_address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Address", 
+   "no_copy": 0, 
+   "options": "Address", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "delivered_by_supplier", 
+   "fieldname": "customer_contact_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Contact", 
+   "no_copy": 0, 
+   "options": "Contact", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer_address_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Address Display", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer_contact_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Contact", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer_contact_mobile", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Mobile No", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer_contact_email", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Contact Email", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -2190,7 +2283,7 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-29 16:41:30.749753", 
+ "modified": "2015-11-04 04:44:22.025827", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 6d0ddb4aff..01ebcb9f07 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -154,8 +154,7 @@ class PurchaseOrder(BuyingController):
 
 	def update_status(self, status):
 		self.check_modified_date()
-		self.db_set('status', status)
-		self.set_status(update=True)
+		self.set_status(update=True, status=status)
 		self.update_requested_qty()
 		self.update_ordered_qty()
 		self.notify_update()
@@ -228,6 +227,20 @@ class PurchaseOrder(BuyingController):
 			"target_parent_field": ''
 		})
 
+	def update_delivered_qty_in_sales_order(self):
+		"""Update delivered qty in Sales Order for drop ship"""
+		sales_orders_to_update = []
+		for item in self.items:
+			if item.prevdoc_doctype == "Sales Order":
+				if item.prevdoc_docname not in sales_orders_to_update:
+					sales_orders_to_update.append(item.prevdoc_docname)
+
+		for so_name in sales_orders_to_update:
+			so = frappe.get_doc("Sales Order", so_name)
+			so.update_delivery_status(self.name)
+			so.set_status(update=True)
+			so.notify_update()
+
 @frappe.whitelist()
 def stop_or_unstop_purchase_orders(names, status):
 	if not frappe.has_permission("Purchase Order", "write"):
@@ -344,20 +357,5 @@ def make_stock_entry(purchase_order, item_code):
 def update_status(status, name):
 	po = frappe.get_doc("Purchase Order", name)
 	po.update_status(status)
+	po.update_delivered_qty_in_sales_order()
 
-@frappe.whitelist()
-def	delivered_by_supplier(purchase_order):
-	po = frappe.get_doc("Purchase Order", purchase_order)
-	update_delivered_qty(po)
-	po.update_status("Delivered")
-
-def update_delivered_qty(purchase_order):
-	so_name = ''
-	for item in purchase_order.items:
-		if item.prevdoc_doctype == "Sales Order":
-			so_name = item.prevdoc_docname
-
-	so = frappe.get_doc("Sales Order", so_name)
-	so.update_delivery_status(purchase_order.name)
-	so.set_status(update=True)
-	so.notify_update()
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index 70e08e5d26..af084735d7 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -1,1214 +1,1214 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "creation": "2013-05-24 19:29:06", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "hash",
+ "creation": "2013-05-24 19:29:06",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Item Code", 
-   "no_copy": 0, 
-   "oldfieldname": "item_code", 
-   "oldfieldtype": "Link", 
-   "options": "Item", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Item Code",
+   "no_copy": 0,
+   "oldfieldname": "item_code",
+   "oldfieldtype": "Link",
+   "options": "Item",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "supplier_part_no", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Supplier Part Number", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "",
+   "fieldname": "supplier_part_no",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Supplier Part Number",
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "item_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Item Name", 
-   "no_copy": 0, 
-   "oldfieldname": "item_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "item_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Item Name",
+   "no_copy": 0,
+   "oldfieldname": "item_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "fieldname": "schedule_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Reqd By Date", 
-   "no_copy": 0, 
-   "oldfieldname": "schedule_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "fieldname": "schedule_date",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Reqd By Date",
+   "no_copy": 0,
+   "oldfieldname": "schedule_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "fieldname": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Description", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "fieldname": "section_break_5",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Description",
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Description", 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "300px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Description",
+   "no_copy": 0,
+   "oldfieldname": "description",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_width": "300px",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "300px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "col_break1",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "image", 
-   "fieldtype": "Attach", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Image", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "image",
+   "fieldtype": "Attach",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Image",
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "image_view", 
-   "fieldtype": "Image", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Image View", 
-   "no_copy": 0, 
-   "options": "image", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "image_view",
+   "fieldtype": "Image",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Image View",
+   "no_copy": 0,
+   "options": "image",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "quantity_and_rate", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Quantity and Rate", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "quantity_and_rate",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Quantity and Rate",
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "fieldname": "qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Quantity", 
-   "no_copy": 0, 
-   "oldfieldname": "qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "60px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "fieldname": "qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Quantity",
+   "no_copy": 0,
+   "oldfieldname": "qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_width": "60px",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "60px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "stock_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Stock UOM", 
-   "no_copy": 0, 
-   "oldfieldname": "stock_uom", 
-   "oldfieldtype": "Data", 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "100px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "stock_uom",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Stock UOM",
+   "no_copy": 0,
+   "oldfieldname": "stock_uom",
+   "oldfieldtype": "Data",
+   "options": "UOM",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "100px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "col_break2",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "UOM", 
-   "no_copy": 0, 
-   "oldfieldname": "uom", 
-   "oldfieldtype": "Link", 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "100px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "uom",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "UOM",
+   "no_copy": 0,
+   "oldfieldname": "uom",
+   "oldfieldtype": "Link",
+   "options": "UOM",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_width": "100px",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "conversion_factor", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "UOM Conversion Factor", 
-   "no_copy": 0, 
-   "oldfieldname": "conversion_factor", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "100px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "conversion_factor",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "UOM Conversion Factor",
+   "no_copy": 0,
+   "oldfieldname": "conversion_factor",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "100px",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "sec_break1", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "sec_break1",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "price_list_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Price List Rate", 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "price_list_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Price List Rate",
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "price_list_rate", 
-   "fieldname": "discount_percentage", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Discount on Price List Rate (%)", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "price_list_rate",
+   "fieldname": "discount_percentage",
+   "fieldtype": "Percent",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Discount on Price List Rate (%)",
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "col_break3",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_price_list_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Price List Rate (Company Currency)", 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "base_price_list_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Price List Rate (Company Currency)",
+   "no_copy": 0,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "sec_break2", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "sec_break2",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "fieldname": "rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Rate ", 
-   "no_copy": 0, 
-   "oldfieldname": "import_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "fieldname": "rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Rate ",
+   "no_copy": 0,
+   "oldfieldname": "import_rate",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Amount", 
-   "no_copy": 0, 
-   "oldfieldname": "import_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Amount",
+   "no_copy": 0,
+   "oldfieldname": "import_amount",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "col_break4",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Rate (Company Currency)", 
-   "no_copy": 0, 
-   "oldfieldname": "purchase_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "100px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "base_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Rate (Company Currency)",
+   "no_copy": 0,
+   "oldfieldname": "purchase_rate",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "100px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Amount (Company Currency)", 
-   "no_copy": 0, 
-   "oldfieldname": "amount", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "base_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Amount (Company Currency)",
+   "no_copy": 0,
+   "oldfieldname": "amount",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "pricing_rule", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Pricing Rule", 
-   "no_copy": 0, 
-   "options": "Pricing Rule", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "pricing_rule",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Pricing Rule",
+   "no_copy": 0,
+   "options": "Pricing Rule",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "section_break_29", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "section_break_29",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "net_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Net Rate", 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "net_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Net Rate",
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "net_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Net Amount", 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "net_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Net Amount",
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_32", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break_32",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_net_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Net Rate (Company Currency)", 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "base_net_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Net Rate (Company Currency)",
+   "no_copy": 0,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_net_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Net Amount (Company Currency)", 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "base_net_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Net Amount (Company Currency)",
+   "no_copy": 0,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "warehouse_and_reference", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Warehouse and Reference", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "warehouse_and_reference",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Warehouse and Reference",
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Warehouse", 
-   "no_copy": 0, 
-   "oldfieldname": "warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "warehouse",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Warehouse",
+   "no_copy": 0,
+   "oldfieldname": "warehouse",
+   "oldfieldtype": "Link",
+   "options": "Warehouse",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "project_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Project Name", 
-   "no_copy": 0, 
-   "options": "Project", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "project_name",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Project Name",
+   "no_copy": 0,
+   "options": "Project",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "prevdoc_doctype", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Prevdoc DocType", 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_doctype", 
-   "oldfieldtype": "Data", 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "prevdoc_doctype",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Reference Document Type",
+   "no_copy": 1,
+   "oldfieldname": "prevdoc_doctype",
+   "oldfieldtype": "Data",
+   "options": "DocType",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "prevdoc_docname", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Reference Name", 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_docname", 
-   "oldfieldtype": "Link", 
-   "options": "prevdoc_doctype", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "120px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "prevdoc_docname",
+   "fieldtype": "Dynamic Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Reference Name",
+   "no_copy": 1,
+   "oldfieldname": "prevdoc_docname",
+   "oldfieldtype": "Link",
+   "options": "prevdoc_doctype",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "120px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "120px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "prevdoc_detail_docname", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Material Request Detail No", 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_detail_docname", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "prevdoc_detail_docname",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Material Request Detail No",
+   "no_copy": 1,
+   "oldfieldname": "prevdoc_detail_docname",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "supplier_quotation", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Supplier Quotation", 
-   "no_copy": 1, 
-   "options": "Supplier Quotation", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "supplier_quotation",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Supplier Quotation",
+   "no_copy": 1,
+   "options": "Supplier Quotation",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "supplier_quotation_item", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Supplier Quotation Item", 
-   "no_copy": 1, 
-   "options": "Supplier Quotation Item", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "supplier_quotation_item",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Supplier Quotation Item",
+   "no_copy": 1,
+   "options": "Supplier Quotation Item",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "col_break5",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "item_group", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Item Group", 
-   "no_copy": 0, 
-   "oldfieldname": "item_group", 
-   "oldfieldtype": "Link", 
-   "options": "Item Group", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "",
+   "fieldname": "item_group",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Item Group",
+   "no_copy": 0,
+   "oldfieldname": "item_group",
+   "oldfieldtype": "Link",
+   "options": "Item Group",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "brand", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Brand", 
-   "no_copy": 0, 
-   "oldfieldname": "brand", 
-   "oldfieldtype": "Link", 
-   "options": "Brand", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "brand",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Brand",
+   "no_copy": 0,
+   "oldfieldname": "brand",
+   "oldfieldtype": "Link",
+   "options": "Brand",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "bom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "BOM", 
-   "no_copy": 1, 
-   "options": "BOM", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "bom",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "BOM",
+   "no_copy": 1,
+   "options": "BOM",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "stock_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Qty as per Stock UOM", 
-   "no_copy": 1, 
-   "oldfieldname": "stock_qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "100px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "stock_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Qty as per Stock UOM",
+   "no_copy": 1,
+   "oldfieldname": "stock_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "100px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "received_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Received Qty", 
-   "no_copy": 1, 
-   "oldfieldname": "received_qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "received_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Received Qty",
+   "no_copy": 1,
+   "oldfieldname": "received_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "returned_qty", 
-   "fieldname": "returned_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Returned Qty", 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "returned_qty",
+   "fieldname": "returned_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Returned Qty",
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "billed_amt", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Billed Amt", 
-   "no_copy": 1, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "billed_amt",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Billed Amt",
+   "no_copy": 1,
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
-   "fieldname": "item_tax_rate", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Item Tax Rate", 
-   "no_copy": 0, 
-   "oldfieldname": "item_tax_rate", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges",
+   "fieldname": "item_tax_rate",
+   "fieldtype": "Small Text",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Item Tax Rate",
+   "no_copy": 0,
+   "oldfieldname": "item_tax_rate",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "page_break", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Page Break", 
-   "no_copy": 1, 
-   "oldfieldname": "page_break", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "page_break",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Page Break",
+   "no_copy": 1,
+   "oldfieldname": "page_break",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "modified": "2015-10-19 03:04:51.773011", 
- "modified_by": "Administrator", 
- "module": "Buying", 
- "name": "Purchase Order Item", 
- "owner": "Administrator", 
- "permissions": [], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 1,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "modified": "2015-10-19 03:04:51.773012",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Purchase Order Item",
+ "owner": "Administrator",
+ "permissions": [],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
  "sort_order": "DESC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 05fb746ab2..f221fc216d 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -76,12 +76,16 @@ class StatusUpdater(Document):
 		self.update_qty()
 		self.validate_qty()
 
-	def set_status(self, update=False):
+	def set_status(self, update=False, status=None):
 		if self.is_new():
 			return
 
 		if self.doctype in status_map:
 			_status = self.status
+
+			if status and update:
+				self.db_set("status", status)
+
 			sl = status_map[self.doctype][:]
 			sl.reverse()
 			for s in sl:
@@ -176,7 +180,7 @@ class StatusUpdater(Document):
 			if change_modified:
 				args['set_modified'] = ', modified = now(), modified_by = "{0}"'\
 					.format(frappe.db.escape(frappe.session.user))
-						
+
 			self._update_children(args)
 
 			if "percent_join_field" in args:
@@ -256,9 +260,9 @@ class StatusUpdater(Document):
 					zero_amount_refdoc.append(item.get(ref_fieldname))
 
 		if zero_amount_refdoc:
-			self.update_biling_status(zero_amount_refdoc, ref_dt, ref_fieldname)
+			self.update_billing_status(zero_amount_refdoc, ref_dt, ref_fieldname)
 
-	def update_biling_status(self, zero_amount_refdoc, ref_dt, ref_fieldname):
+	def update_billing_status(self, zero_amount_refdoc, ref_dt, ref_fieldname):
 		for ref_dn in zero_amount_refdoc:
 			ref_doc_qty = flt(frappe.db.sql("""select sum(ifnull(qty, 0)) from `tab%s Item`
 				where parent=%s""" % (ref_dt, '%s'), (ref_dn))[0][0])
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index 070e518588..2f606bd839 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -78,25 +78,22 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "leave_type", 
-   "fieldtype": "Link", 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Leave Type", 
+   "in_filter": 0, 
+   "in_list_view": 0, 
    "no_copy": 0, 
-   "oldfieldname": "leave_type", 
-   "oldfieldtype": "Link", 
-   "options": "Leave Type", 
    "permlevel": 0, 
    "print_hide": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
+   "unique": 0, 
+   "width": "50%"
   }, 
   {
    "allow_on_submit": 0, 
@@ -126,22 +123,46 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "leave_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Leave Type", 
+   "no_copy": 0, 
+   "oldfieldname": "leave_type", 
+   "oldfieldtype": "Link", 
+   "options": "Leave Type", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
   }, 
   {
    "allow_on_submit": 0, 
@@ -191,15 +212,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "carry_forward", 
-   "fieldtype": "Check", 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Carry Forward", 
    "no_copy": 0, 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -208,28 +229,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "carry_forward", 
-   "fieldname": "carry_forwarded_leaves", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Carry Forwarded Leaves", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 1, 
    "bold": 0, 
@@ -251,6 +250,50 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "carry_forward", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Add unused leaves from previous allocations", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "carry_forward", 
+   "fieldname": "carry_forwarded_leaves", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Unused leaves", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 1, 
    "bold": 0, 
@@ -306,7 +349,7 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-28 18:18:29.137427", 
+ "modified": "2015-11-04 03:13:11.121463", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Allocation", 
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.py b/erpnext/hr/doctype/leave_allocation/leave_allocation.py
index 146c3fa38e..f8461241ad 100755
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.py
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.py
@@ -23,11 +23,11 @@ class LeaveAllocation(Document):
 
 	def on_update(self):
 		self.get_total_allocated_leaves()
-	
+
 	def validate_period(self):
 		if date_diff(self.to_date, self.from_date) <= 0:
 			frappe.throw(_("Invalid period"))
-	
+
 	def validate_new_leaves_allocated_value(self):
 		"""validate that leave allocation is in multiples of 0.5"""
 		if flt(self.new_leaves_allocated) % 0.5:
@@ -35,14 +35,14 @@ class LeaveAllocation(Document):
 
 	def check_existing_leave_allocation(self):
 		"""check whether leave for same type is already allocated or not"""
-		leave_allocation = frappe.db.sql("""select name from `tabLeave Allocation` 
+		leave_allocation = frappe.db.sql("""select name from `tabLeave Allocation`
 			where employee='%s' and leave_type='%s' and to_date >= '%s' and from_date <= '%s' and docstatus=1
 		"""%(self.employee, self.leave_type, self.from_date, self.to_date))
 
 		if leave_allocation:
 			frappe.msgprint(_("Leaves for type {0} already allocated for Employee {1} for period {2} - {3}").format(self.leave_type,
 				self.employee, self.from_date, self.to_date))
-			frappe.throw('{0}'.format(leave_allocation[0][0]))
+			frappe.throw(_('Reference') + ': {0}'.format(leave_allocation[0][0]))
 
 	def get_leave_bal(self):
 		return self.get_leaves_allocated() - self.get_leaves_applied()
@@ -73,11 +73,11 @@ class LeaveAllocation(Document):
 	def get_carry_forwarded_leaves(self):
 		if self.carry_forward:
 			self.allow_carry_forward()
-			
+
 		prev_bal = 0
 		if cint(self.carry_forward) == 1:
 			prev_bal = self.get_leave_bal()
-		
+
 		ret = {
 			'carry_forwarded_leaves': prev_bal,
 			'total_leaves_allocated': flt(prev_bal) + flt(self.new_leaves_allocated)
@@ -93,4 +93,3 @@ class LeaveAllocation(Document):
 	def validate_total_leaves_allocated(self, leave_det):
 		if date_diff(self.to_date, self.from_date) <= leave_det['total_leaves_allocated']:
 			frappe.throw(_("Total allocated leaves are more than period"))
-		
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index cd5ca9dbc2..33863c637e 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -23,23 +23,25 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 
 				$.each(cur_frm.doc.items, function(i, item){
 					if(item.delivered_by_supplier == 1 || item.supplier){
-						if(item.qty > item.ordered_qty)
+						if(item.qty > flt(item.ordered_qty))
 							is_delivered_by_supplier = true;
 					}
 					else{
-						if(item.qty > item.delivered_qty)
+						if(item.qty > flt(item.delivered_qty))
 							is_delivery_note = true;
 					}
 				})
 
-				// cur_frm.dashboard.add_progress(cint(doc.per_delivered) + __("% Delivered"),
-				// 	doc.per_delivered);
-				// cur_frm.dashboard.add_progress(cint(doc.per_billed) + __("% Billed"),
-				// 	doc.per_billed);
+				// material request
+				if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1
+					&& flt(doc.per_delivered, 2) < 100) {
+						cur_frm.add_custom_button(__('Material Request'), this.make_material_request);
+				}
 
-				// indent
-				if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && flt(doc.per_delivered, 2) < 100 && !is_delivered_by_supplier)
-					cur_frm.add_custom_button(__('Material Request'), this.make_material_request);
+				// make purchase order
+				if(flt(doc.per_delivered, 2) < 100 && is_delivered_by_supplier) {
+					cur_frm.add_custom_button(__('Purchase Order'), cur_frm.cscript.make_purchase_order);
+				}
 
 				if(flt(doc.per_billed)==0) {
 					cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry);
@@ -60,16 +62,15 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 				}
 
 				// delivery note
-				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && is_delivery_note)
+				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && is_delivery_note) {
 					cur_frm.add_custom_button(__('Delivery'), this.make_delivery_note).addClass("btn-primary");
+				}
 
 				// sales invoice
 				if(flt(doc.per_billed, 2) < 100) {
 					cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary");
 				}
 
-				if(flt(doc.per_delivered, 2) < 100 && is_delivered_by_supplier)
-					cur_frm.add_custom_button(__('Make Purchase Order'), cur_frm.cscript.make_purchase_order).addClass("btn-primary");
 
 			} else {
 				// un-stop
@@ -178,7 +179,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 							filters: {'parent': cur_frm.doc.name}
 						}
 					}, "reqd": 1 },
-				{"fieldtype": "Button", "label": __("Make Purchase Order"), "fieldname": "make_purchase_order"},
+				{"fieldtype": "Button", "label": __("Make Purchase Order"), "fieldname": "make_purchase_order", "cssClass": "btn-primary"},
 			]
 		});
 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 2bc89d5c4d..f1d82c33f1 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -220,20 +220,13 @@ class SalesOrder(SellingController):
 		if date_diff and date_diff[0][0]:
 			frappe.throw(_("{0} {1} has been modified. Please refresh.").format(self.doctype, self.name))
 
-	def stop_sales_order(self, status):
+	def update_status(self, status):
 		self.check_modified_date()
-		self.db_set('status', status)
+		self.set_status(update=True, status=status)
 		self.update_reserved_qty()
 		self.notify_update()
 		clear_doctype_notifications(self)
 
-	def unstop_sales_order(self):
-		self.check_modified_date()
-		self.db_set('status', 'Draft')
-		self.set_status(update=True)
-		self.update_reserved_qty()
-		clear_doctype_notifications(self)
-
 	def update_reserved_qty(self, so_item_rows=None):
 		"""update requested qty (before ordered_qty is updated)"""
 		item_wh_list = []
@@ -261,27 +254,38 @@ class SalesOrder(SellingController):
 
 	def before_update_after_submit(self):
 		self.validate_drop_ship()
-		self.validate_po()
+		self.validate_supplier_after_submit()
 
-	def validate_po(self):
+	def validate_supplier_after_submit(self):
+		"""Check that supplier is the same after submit if PO is already made"""
 		exc_list = []
 
 		for item in self.items:
-			supplier = frappe.db.get_value("Sales Order Item", {"parent": self.name, "item_code": item.item_code},
-				"supplier")
-			if item.ordered_qty > 0.0 and item.supplier != supplier:
-				exc_list.append("Row #{0}: Not allowed to change supplier as Purchase Order already exists".format(item.idx))
+			if item.supplier:
+				supplier = frappe.db.get_value("Sales Order Item", {"parent": self.name, "item_code": item.item_code},
+					"supplier")
+				if item.ordered_qty > 0.0 and item.supplier != supplier:
+					exc_list.append(_("Row #{0}: Not allowed to change Supplier as Purchase Order already exists").format(item.idx))
 
 		if exc_list:
 			frappe.throw('\n'.join(exc_list))
 
 	def update_delivery_status(self, po_name):
+		"""Update delivery status from Purchase Order for drop shipping"""
 		tot_qty, delivered_qty = 0.0, 0.0
 
 		for item in self.items:
 			if item.delivered_by_supplier:
-				delivered_qty = frappe.db.get_value("Purchase Order Item", {"parent": po_name, "item_code": item.item_code}, "qty")
-				frappe.db.set_value("Sales Order Item", item.name, "delivered_qty", delivered_qty)
+				delivered_qty = frappe.db.sql("""select qty
+					from `tabPurchase Order Item` poi, `tabPurchase Order` po
+					where poi.prevdoc_docname = %s
+						and poi.prevdoc_doctype = 'Sales Order'
+						and poi.item_code = %s
+						and poi.parent = po.name
+						and po.status = 'Delivered'""", (self.name, item.item_code))
+
+				delivered_qty = delivered_qty[0][0] if delivered_qty else 0
+				item.db_set("delivered_qty", delivered_qty)
 
 			delivered_qty += item.delivered_qty
 			tot_qty += item.qty
@@ -305,10 +309,10 @@ def stop_or_unstop_sales_orders(names, status):
 		if so.docstatus == 1:
 			if status in ("Stopped", "Closed"):
 				if so.status not in ("Stopped", "Cancelled", "Closed") and (so.per_delivered < 100 or so.per_billed < 100):
-					so.stop_sales_order(status)
+					so.update_status(status)
 			else:
 				if so.status in ("Stopped", "Closed"):
-					so.unstop_sales_order()
+					so.update_status('Draft')
 
 	frappe.local.message_log = []
 
@@ -545,11 +549,12 @@ def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc=
 		"Sales Order": {
 			"doctype": "Purchase Order",
 			"field_map": {
+				"customer_address": "customer_address",
+				"contact_person": "customer_contact_person",
 				"address_display": "customer_address_display",
 				"contact_display": "customer_contact_display",
 				"contact_mobile": "customer_contact_mobile",
 				"contact_email": "customer_contact_email",
-				"contact_person": "customer_contact_person"
 			},
 			"field_no_map": [
 				"address_display",
@@ -614,4 +619,4 @@ def get_supplier(doctype, txt, searchfield, start, page_len, filters):
 @frappe.whitelist()
 def update_status(status, name):
 	so = frappe.get_doc("Sales Order", name)
-	so.stop_sales_order(status)
+	so.update_status(status)
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 748af3cc11..3ee0a51779 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -7,8 +7,6 @@ import frappe.permissions
 import unittest
 from erpnext.selling.doctype.sales_order.sales_order \
 	import make_material_request, make_delivery_note, make_sales_invoice, WarehouseRequired
-from erpnext.accounts.doctype.journal_entry.test_journal_entry \
-	import make_journal_entry
 
 from frappe.tests.test_permissions import set_user_permission_doctypes
 
@@ -97,12 +95,12 @@ class TestSalesOrder(unittest.TestCase):
 
 		# stop so
 		so.load_from_db()
-		so.stop_sales_order("Stopped")
+		so.update_status("Stopped")
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty)
 
 		# unstop so
 		so.load_from_db()
-		so.unstop_sales_order()
+		so.update_status('Draft')
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty + 5)
 
 		dn.cancel()
@@ -147,14 +145,14 @@ class TestSalesOrder(unittest.TestCase):
 
 		# stop so
 		so.load_from_db()
-		so.stop_sales_order("Stopped")
+		so.update_status("Stopped")
 
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1)
 		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2)
 
 		# unstop so
 		so.load_from_db()
-		so.unstop_sales_order()
+		so.update_status('Draft')
 
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1 + 25)
 		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"),
@@ -295,14 +293,14 @@ class TestSalesOrder(unittest.TestCase):
 			{"price_list": "_Test Price List", "item_code": "_Test Item for Auto Price List"}, "price_list_rate"), None)
 
 		frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1)
-	
+
 	def test_drop_shipping(self):
-		from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order_for_drop_shipment, make_delivery_note
+		from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order_for_drop_shipment
 		from erpnext.stock.doctype.item.test_item import make_item
 		from erpnext.buying.doctype.purchase_order.purchase_order import delivered_by_supplier
 
 		po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "is_sales_item": 1,
-			"is_purchase_item": 1, "delivered_by_supplier": 1, 'default_supplier': '_Test Supplier', 
+			"is_purchase_item": 1, "delivered_by_supplier": 1, 'default_supplier': '_Test Supplier',
 		    "expense_account": "_Test Account Cost for Goods Sold - _TC",
 		    "cost_center": "_Test Cost Center - _TC"
 			})
@@ -328,90 +326,90 @@ class TestSalesOrder(unittest.TestCase):
 				"conversion_factor": 1.0
 			}
 		]
-		
+
 		#setuo existing qty from bin
-		bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, 
+		bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"},
 			fields=["ordered_qty", "reserved_qty"])
-			
+
 		existing_ordered_qty = bin[0].ordered_qty if bin else 0.0
 		existing_reserved_qty = bin[0].reserved_qty if bin else 0.0
-		
-		bin = frappe.get_all("Bin", filters={"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, 
+
+		bin = frappe.get_all("Bin", filters={"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"},
 			fields=["reserved_qty"])
-		
+
 		existing_reserved_qty_for_dn_item = bin[0].reserved_qty if bin else 0.0
-		
+
 		#create so, po and partial dn
 		so = make_sales_order(item_list=so_items, do_not_submit=True)
 		so.submit()
-		
+
 		po = make_purchase_order_for_drop_shipment(so.name, '_Test Supplier')
 		po.submit()
-		
+
 		dn = create_dn_against_so(so.name, delivered_qty=1)
-		
+
 		self.assertEquals(so.customer, po.customer)
 		self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order")
 		self.assertEquals(po.items[0].prevdoc_docname, so.name)
 		self.assertEquals(po.items[0].item_code, po_item.item_code)
 		self.assertEquals(dn.items[0].item_code, dn_item.item_code)
-		
-		#test ordered_qty and reserved_qty		
-		ordered_qty, reserved_qty = frappe.db.get_value("Bin", 
+
+		#test ordered_qty and reserved_qty
+		ordered_qty, reserved_qty = frappe.db.get_value("Bin",
 			{"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"])
-		
-		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty + so_items[0]['qty'])			
+
+		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty + so_items[0]['qty'])
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
-		
-		reserved_qty = frappe.db.get_value("Bin", 
+
+		reserved_qty = frappe.db.get_value("Bin",
 					{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
-		
+
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item + 1)
-		
+
 		#test po_item length
 		self.assertEquals(len(po.items), 1)
-		
+
 		#test per_delivered status
 		delivered_by_supplier(po.name)
 		self.assertEquals(flt(frappe.db.get_value("Sales Order", so.name, "per_delivered"), 2), 75.00)
-		
+
 		#test reserved qty after complete delivery
 		dn = create_dn_against_so(so.name, delivered_qty=1)
-		reserved_qty = frappe.db.get_value("Bin", 
+		reserved_qty = frappe.db.get_value("Bin",
 			{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
-		
+
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item)
-		
+
 		#test after closing so
 		so.db_set('status', "Closed")
 		so.update_reserved_qty()
-		
-		ordered_qty, reserved_qty = frappe.db.get_value("Bin", 
+
+		ordered_qty, reserved_qty = frappe.db.get_value("Bin",
 			{"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"])
-		
-		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty)			
+
+		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty)
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
-		
-		reserved_qty = frappe.db.get_value("Bin", 
+
+		reserved_qty = frappe.db.get_value("Bin",
 			{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
-		
+
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
-		
+
 	def test_reserved_qty_for_closing_so(self):
-		bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"}, 
-			fields=["reserved_qty"])	
-		
+		bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"},
+			fields=["reserved_qty"])
+
 		existing_reserved_qty = bin[0].reserved_qty if bin else 0.0
-			
+
 		so = make_sales_order(item_code="_Test Item", qty=1)
-		
+
 		self.assertEquals(get_reserved_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_reserved_qty+1)
-		
-		so.stop_sales_order("Closed")
-		
+
+		so.update_status("Closed")
+
 		self.assertEquals(get_reserved_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_reserved_qty)
-		
-		
+
+
 def make_sales_order(**args):
 	so = frappe.new_doc("Sales Order")
 	args = frappe._dict(args)
@@ -427,11 +425,11 @@ def make_sales_order(**args):
 
 	if "warehouse" not in args:
 		args.warehouse = "_Test Warehouse - _TC"
-		
+
 	if args.item_list:
 		for item in args.item_list:
 			so.append("items", item)
-		
+
 	else:
 		so.append("items", {
 			"item_code": args.item or args.item_code or "_Test Item",
@@ -440,7 +438,7 @@ def make_sales_order(**args):
 			"rate": args.rate or 100,
 			"conversion_factor": 1.0,
 		})
-		
+
 	if not args.do_not_save:
 		so.insert()
 		if not args.do_not_submit:
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index b5a1d817a5..7f4e4009f7 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -1,1200 +1,1200 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "creation": "2013-03-07 11:42:58", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "hash",
+ "creation": "2013-03-07 11:42:58",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Item Code", 
-   "no_copy": 0, 
-   "oldfieldname": "item_code", 
-   "oldfieldtype": "Link", 
-   "options": "Item", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "150px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Item Code",
+   "no_copy": 0,
+   "oldfieldname": "item_code",
+   "oldfieldtype": "Link",
+   "options": "Item",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_width": "150px",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_item_code", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer's Item Code", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "customer_item_code",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Customer's Item Code",
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "col_break1",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "item_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Item Name", 
-   "no_copy": 0, 
-   "oldfieldname": "item_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "150", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "item_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Item Name",
+   "no_copy": 0,
+   "oldfieldname": "item_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "150",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "150"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "fieldname": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Description", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "fieldname": "section_break_5",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Description",
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Description", 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "300px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Description",
+   "no_copy": 0,
+   "oldfieldname": "description",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_width": "300px",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "300px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_7", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break_7",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "image", 
-   "fieldtype": "Attach", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Image", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "image",
+   "fieldtype": "Attach",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Image",
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "image_view", 
-   "fieldtype": "Image", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Image View", 
-   "no_copy": 0, 
-   "options": "image", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "image_view",
+   "fieldtype": "Image",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Image View",
+   "no_copy": 0,
+   "options": "image",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "quantity_and_rate", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Quantity and Rate", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "quantity_and_rate",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Quantity and Rate",
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Quantity", 
-   "no_copy": 0, 
-   "oldfieldname": "qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "100px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Quantity",
+   "no_copy": 0,
+   "oldfieldname": "qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_width": "100px",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "price_list_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Price List Rate", 
-   "no_copy": 0, 
-   "oldfieldname": "ref_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "70px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "price_list_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Price List Rate",
+   "no_copy": 0,
+   "oldfieldname": "ref_rate",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "70px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "70px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "price_list_rate", 
-   "fieldname": "discount_percentage", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Discount on Price List Rate (%)", 
-   "no_copy": 0, 
-   "oldfieldname": "adj_rate", 
-   "oldfieldtype": "Float", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "70px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "price_list_rate",
+   "fieldname": "discount_percentage",
+   "fieldtype": "Percent",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Discount on Price List Rate (%)",
+   "no_copy": 0,
+   "oldfieldname": "adj_rate",
+   "oldfieldtype": "Float",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "70px",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "70px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "col_break2",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "stock_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "UOM", 
-   "no_copy": 0, 
-   "oldfieldname": "stock_uom", 
-   "oldfieldtype": "Data", 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "70px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "stock_uom",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "UOM",
+   "no_copy": 0,
+   "oldfieldname": "stock_uom",
+   "oldfieldtype": "Data",
+   "options": "UOM",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_width": "70px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "70px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_price_list_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Price List Rate (Company Currency)", 
-   "no_copy": 0, 
-   "oldfieldname": "base_ref_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "100px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "base_price_list_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Price List Rate (Company Currency)",
+   "no_copy": 0,
+   "oldfieldname": "base_ref_rate",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "100px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "section_break_simple1", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "section_break_simple1",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Rate", 
-   "no_copy": 0, 
-   "oldfieldname": "export_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "100px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Rate",
+   "no_copy": 0,
+   "oldfieldname": "export_rate",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_width": "100px",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Amount", 
-   "no_copy": 0, 
-   "oldfieldname": "export_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "100px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Amount",
+   "no_copy": 0,
+   "oldfieldname": "export_amount",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_width": "100px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "col_break3",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Basic Rate (Company Currency)", 
-   "no_copy": 0, 
-   "oldfieldname": "basic_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "100px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "base_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Basic Rate (Company Currency)",
+   "no_copy": 0,
+   "oldfieldname": "basic_rate",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "100px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Amount (Company Currency)", 
-   "no_copy": 0, 
-   "oldfieldname": "amount", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "100px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "base_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Amount (Company Currency)",
+   "no_copy": 0,
+   "oldfieldname": "amount",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "100px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "pricing_rule", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Pricing Rule", 
-   "no_copy": 0, 
-   "options": "Pricing Rule", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "pricing_rule",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Pricing Rule",
+   "no_copy": 0,
+   "options": "Pricing Rule",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "section_break_24", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "section_break_24",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "net_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Net Rate", 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "net_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Net Rate",
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "net_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Net Amount", 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "net_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Net Amount",
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_27", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break_27",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_net_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Net Rate (Company Currency)", 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "base_net_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Net Rate (Company Currency)",
+   "no_copy": 0,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_net_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Net Amount (Company Currency)", 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "base_net_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Net Amount (Company Currency)",
+   "no_copy": 0,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "eval:doc.delivered_by_supplier==1||doc.supplier", 
-   "fieldname": "drop_ship", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Drop Ship", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "eval:doc.delivered_by_supplier==1||doc.supplier",
+   "fieldname": "drop_ship_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Drop Ship",
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "delivered_by_supplier", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Delivered By Supplier", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "delivered_by_supplier",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Supplier delivers to Customer",
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Supplier", 
-   "no_copy": 0, 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Supplier",
+   "no_copy": 0,
+   "options": "Supplier",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "warehouse_and_reference", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Warehouse and Reference", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "warehouse_and_reference",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Warehouse and Reference",
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.delivered_by_supplier!=1", 
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Delivery Warehouse", 
-   "no_copy": 0, 
-   "oldfieldname": "reserved_warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "150px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:doc.delivered_by_supplier!=1",
+   "fieldname": "warehouse",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Delivery Warehouse",
+   "no_copy": 0,
+   "oldfieldname": "reserved_warehouse",
+   "oldfieldtype": "Link",
+   "options": "Warehouse",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "150px",
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.delivered_by_supplier!=1", 
-   "fieldname": "target_warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Target Warehouse", 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:doc.delivered_by_supplier!=1",
+   "fieldname": "target_warehouse",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Target Warehouse",
+   "no_copy": 0,
+   "options": "Warehouse",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "prevdoc_docname", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Quotation", 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_docname", 
-   "oldfieldtype": "Link", 
-   "options": "Quotation", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "prevdoc_docname",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Quotation",
+   "no_copy": 1,
+   "oldfieldname": "prevdoc_docname",
+   "oldfieldtype": "Link",
+   "options": "Quotation",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "brand", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Brand Name", 
-   "no_copy": 0, 
-   "oldfieldname": "brand", 
-   "oldfieldtype": "Link", 
-   "options": "Brand", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "brand",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Brand Name",
+   "no_copy": 0,
+   "oldfieldname": "brand",
+   "oldfieldtype": "Link",
+   "options": "Brand",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "item_group", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Item Group", 
-   "no_copy": 0, 
-   "oldfieldname": "item_group", 
-   "oldfieldtype": "Link", 
-   "options": "Item Group", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "",
+   "fieldname": "item_group",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Item Group",
+   "no_copy": 0,
+   "oldfieldname": "item_group",
+   "oldfieldtype": "Link",
+   "options": "Item Group",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "page_break", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Page Break", 
-   "no_copy": 0, 
-   "oldfieldname": "page_break", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "page_break",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Page Break",
+   "no_copy": 0,
+   "oldfieldname": "page_break",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "col_break4",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "projected_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Projected Qty", 
-   "no_copy": 1, 
-   "oldfieldname": "projected_qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "70px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "projected_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Projected Qty",
+   "no_copy": 1,
+   "oldfieldname": "projected_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "70px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "70px"
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "actual_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Actual Qty", 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "70px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "actual_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Actual Qty",
+   "no_copy": 1,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "70px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "70px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "ordered_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Ordered Qty", 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "ordered_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Ordered Qty",
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "delivered_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Delivered Qty", 
-   "no_copy": 1, 
-   "oldfieldname": "delivered_qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "100px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "delivered_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Delivered Qty",
+   "no_copy": 1,
+   "oldfieldname": "delivered_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "100px",
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "returned_qty", 
-   "fieldname": "returned_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Returned Qty", 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "returned_qty",
+   "fieldname": "returned_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Returned Qty",
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "billed_amt", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Billed Amt", 
-   "no_copy": 1, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "billed_amt",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Billed Amt",
+   "no_copy": 1,
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "For Production", 
-   "fieldname": "planned_qty", 
-   "fieldtype": "Float", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Planned Quantity", 
-   "no_copy": 1, 
-   "oldfieldname": "planned_qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "50px", 
-   "read_only": 1, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "For Production",
+   "fieldname": "planned_qty",
+   "fieldtype": "Float",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Planned Quantity",
+   "no_copy": 1,
+   "oldfieldname": "planned_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "50px",
+   "read_only": 1,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "For Production", 
-   "fieldname": "produced_qty", 
-   "fieldtype": "Float", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Produced Quantity", 
-   "no_copy": 0, 
-   "oldfieldname": "produced_qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "50px", 
-   "read_only": 1, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "For Production",
+   "fieldname": "produced_qty",
+   "fieldtype": "Float",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Produced Quantity",
+   "no_copy": 0,
+   "oldfieldname": "produced_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "50px",
+   "read_only": 1,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "item_tax_rate", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Item Tax Rate", 
-   "no_copy": 0, 
-   "oldfieldname": "item_tax_rate", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "item_tax_rate",
+   "fieldtype": "Small Text",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Item Tax Rate",
+   "no_copy": 0,
+   "oldfieldname": "item_tax_rate",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Used for Production Plan", 
-   "fieldname": "transaction_date", 
-   "fieldtype": "Date", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Order Date", 
-   "no_copy": 0, 
-   "oldfieldname": "transaction_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "Used for Production Plan",
+   "fieldname": "transaction_date",
+   "fieldtype": "Date",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Sales Order Date",
+   "no_copy": 0,
+   "oldfieldname": "transaction_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 1,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "modified": "2015-11-04 11:29:57.645382", 
- "modified_by": "Administrator", 
- "module": "Selling", 
- "name": "Sales Order Item", 
- "owner": "Administrator", 
- "permissions": [], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 1,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "modified": "2015-11-04 11:29:57.645383",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Sales Order Item",
+ "owner": "Administrator",
+ "permissions": [],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
  "sort_order": "DESC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 8d90e3b992..6346c6353e 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -216,10 +216,10 @@ class DeliveryNote(SellingController):
 		self.cancel_packing_slips()
 
 		self.make_gl_entries_on_cancel()
-		
+
 	def check_credit_limit(self):
 		from erpnext.selling.doctype.customer.customer import check_credit_limit
-		
+
 		validate_against_credit_limit = False
 		for d in self.get("items"):
 			if not (d.against_sales_order or d.against_sales_invoice):
@@ -271,11 +271,10 @@ class DeliveryNote(SellingController):
 			frappe.msgprint(_("Packing Slip(s) cancelled"))
 
 	def update_status(self, status):
-		self.db_set('status', status)
-		self.set_status(update=True)
+		self.set_status(update=True, status=status)
 		self.notify_update()
 		clear_doctype_notifications(self)
-		
+
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
@@ -399,4 +398,4 @@ def make_sales_return(source_name, target_doc=None):
 @frappe.whitelist()
 def update_delivery_note_status(docname, status):
 	dn = frappe.get_doc("Delivery Note", docname)
-	dn.update_status(status)
\ No newline at end of file
+	dn.update_status(status)
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 678bedd89f..c05170d592 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1165,28 +1165,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "delivered_by_supplier", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Delivered By Supplier (Drop Ship)", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1210,6 +1188,28 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "delivered_by_supplier", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Delivered by Supplier (Drop Ship)", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -2157,7 +2157,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-11-03 07:52:41.416937", 
+ "modified": "2015-11-04 04:50:02.051468", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index ddd2feb000..c1316f949b 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -427,10 +427,9 @@ class PurchaseReceipt(BuyingController):
 				"\n".join(warehouse_with_no_account))
 
 		return process_gl_map(gl_entries)
-	
+
 	def update_status(self, status):
-		self.db_set('status', status)
-		self.set_status(update=True)
+		self.set_status(update=True, status = status)
 		self.notify_update()
 		clear_doctype_notifications(self)
 
@@ -498,4 +497,4 @@ def make_purchase_return(source_name, target_doc=None):
 @frappe.whitelist()
 def update_purchase_receipt_status(docname, status):
 	pr = frappe.get_doc("Purchase Receipt", docname)
-	pr.update_status(status)
\ No newline at end of file
+	pr.update_status(status)

From 20a7d820ab42a54d9006f42e3289ac8a3043fbfc Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Wed, 4 Nov 2015 15:31:41 +0530
Subject: [PATCH 54/59] [fix] shot ledger buttons for closed DN / PR

---
 .../doctype/sales_order/sales_order.js        |  8 +-------
 .../doctype/delivery_note/delivery_note.js    | 11 +++++++----
 .../purchase_receipt/purchase_receipt.js      | 19 +++++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 33863c637e..8b18fcccc2 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -249,13 +249,7 @@ cur_frm.cscript.update_status = function(label, status){
 }
 
 cur_frm.cscript['Unstop Sales Order'] = function() {
-	var doc = cur_frm.doc;
-	return $c('runserverobj', {
-		'method':'unstop_sales_order',
-		'docs': doc
-	}, function(r,rt) {
-		cur_frm.refresh();
-	});
+	cur_frm.cscript.update_status('Re-open', 'Draft')
 }
 
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 688db9c11c..9cd4936ba5 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -41,12 +41,15 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 			}
 		}
 
-		if (doc.docstatus==1 && doc.status!="Closed") {
+		if (doc.docstatus==1) {
 			this.show_stock_ledger();
 			if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
 				this.show_general_ledger();
 			}
-			cur_frm.add_custom_button(__("Close"), this.close_delivery_note)
+
+			if(doc.status !== "Closed") {
+				cur_frm.add_custom_button(__("Close"), this.close_delivery_note)
+			}
 		}
 
 		if(doc.__onload && !doc.__onload.billing_complete && doc.docstatus==1 && !doc.is_return && doc.status!="Closed") {
@@ -98,11 +101,11 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 	items_on_form_rendered: function(doc, grid_row) {
 		erpnext.setup_serial_no();
 	},
-	
+
 	close_delivery_note: function(doc){
 		cur_frm.cscript.update_status("Closed")
 	},
-	
+
 	reopen_delivery_note : function() {
 		cur_frm.cscript.update_status("Submitted")
 	}
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 4af0e6cbf3..acf6809ae9 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -29,10 +29,13 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 	refresh: function() {
 		this._super();
 
-		this.show_stock_ledger();
-		if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
-			this.show_general_ledger();
+		if(this.frm.doc.docstatus===1) {
+			this.show_stock_ledger();
+			if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
+				this.show_general_ledger();
+			}
 		}
+
 		if(!this.frm.doc.is_return && this.frm.doc.status!="Closed") {
 			if(this.frm.doc.docstatus==0) {
 				cur_frm.add_custom_button(__('From Purchase Order'),
@@ -59,12 +62,12 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 				cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt)
 			}
 		}
-		
-		
+
+
 		if(this.frm.doc.docstatus==1 && this.frm.doc.status === "Closed") {
 			cur_frm.add_custom_button(__('Re-open'), this.reopen_purchase_receipt)
 		}
-		
+
 		this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted==="Yes");
 	},
 
@@ -127,11 +130,11 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 	tc_name: function() {
 		this.get_terms();
 	},
-	
+
 	close_purchase_receipt: function() {
 		cur_frm.cscript.update_status("Closed");
 	},
-	
+
 	reopen_purchase_receipt: function() {
 		cur_frm.cscript.update_status("Submitted");
 	}

From ac53f2dbb106f694ceb7c3a56df0c70c78ded7a2 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Wed, 4 Nov 2015 15:47:08 +0530
Subject: [PATCH 55/59] [test] [fix]

---
 erpnext/selling/doctype/sales_order/test_sales_order.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 3ee0a51779..61ee1106e1 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -297,7 +297,7 @@ class TestSalesOrder(unittest.TestCase):
 	def test_drop_shipping(self):
 		from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order_for_drop_shipment
 		from erpnext.stock.doctype.item.test_item import make_item
-		from erpnext.buying.doctype.purchase_order.purchase_order import delivered_by_supplier
+		from erpnext.buying.doctype.purchase_order.purchase_order import update_status
 
 		po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "is_sales_item": 1,
 			"is_purchase_item": 1, "delivered_by_supplier": 1, 'default_supplier': '_Test Supplier',
@@ -370,7 +370,7 @@ class TestSalesOrder(unittest.TestCase):
 		self.assertEquals(len(po.items), 1)
 
 		#test per_delivered status
-		delivered_by_supplier(po.name)
+		update_status("Delivered", po.name)
 		self.assertEquals(flt(frappe.db.get_value("Sales Order", so.name, "per_delivered"), 2), 75.00)
 
 		#test reserved qty after complete delivery

From d805bd7daf992926fc2fc245d1f80918d37b38a7 Mon Sep 17 00:00:00 2001
From: Saurabh 
Date: Wed, 4 Nov 2015 16:29:46 +0530
Subject: [PATCH 56/59] [fixes] update delivery status

---
 erpnext/selling/doctype/sales_order/sales_order.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index f1d82c33f1..2f4884b185 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -276,7 +276,7 @@ class SalesOrder(SellingController):
 
 		for item in self.items:
 			if item.delivered_by_supplier:
-				delivered_qty = frappe.db.sql("""select qty
+				item_delivered_qty  = frappe.db.sql("""select qty
 					from `tabPurchase Order Item` poi, `tabPurchase Order` po
 					where poi.prevdoc_docname = %s
 						and poi.prevdoc_doctype = 'Sales Order'
@@ -284,8 +284,8 @@ class SalesOrder(SellingController):
 						and poi.parent = po.name
 						and po.status = 'Delivered'""", (self.name, item.item_code))
 
-				delivered_qty = delivered_qty[0][0] if delivered_qty else 0
-				item.db_set("delivered_qty", delivered_qty)
+				item_delivered_qty = item_delivered_qty[0][0] if item_delivered_qty else 0
+				item.db_set("delivered_qty", item_delivered_qty)
 
 			delivered_qty += item.delivered_qty
 			tot_qty += item.qty

From b9e7cb02f4e351344cd5f85dc3070ec18dbf5b4c Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Wed, 4 Nov 2015 17:00:02 +0530
Subject: [PATCH 57/59] [change-log]

---
 erpnext/change_log/current/desktop.md          |  2 --
 erpnext/change_log/current/drop-ship.md        |  2 --
 erpnext/change_log/v6/v6_7_0.md                |  7 +++++++
 .../leave_application/leave_application.js     | 15 ---------------
 sponsors.md                                    | 18 +++++++++++++-----
 5 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 erpnext/change_log/current/desktop.md
 delete mode 100644 erpnext/change_log/current/drop-ship.md
 create mode 100644 erpnext/change_log/v6/v6_7_0.md

diff --git a/erpnext/change_log/current/desktop.md b/erpnext/change_log/current/desktop.md
deleted file mode 100644
index 9b4667b819..0000000000
--- a/erpnext/change_log/current/desktop.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- **Desktop Reorganization:** To Do, Calendar, Messages, Notes, Activty have been moved into module **Tools**
-- Integrations and Installer has been moved into **Setup**
diff --git a/erpnext/change_log/current/drop-ship.md b/erpnext/change_log/current/drop-ship.md
deleted file mode 100644
index daa06c2c39..0000000000
--- a/erpnext/change_log/current/drop-ship.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- **Drop Ship**
- - Make Sales Order with mrked item as **_Delivered By Supplier_** and submit SO and then make a Purchase Order.
\ No newline at end of file
diff --git a/erpnext/change_log/v6/v6_7_0.md b/erpnext/change_log/v6/v6_7_0.md
new file mode 100644
index 0000000000..7aefba541a
--- /dev/null
+++ b/erpnext/change_log/v6/v6_7_0.md
@@ -0,0 +1,7 @@
+- **Desktop Reorganization:** To Do, Calendar, Messages, Notes, Activty have been moved into module **Tools**
+- Integrations and Installer has been moved into **Setup**
+- Make Purchase Order from Sales Order if Supplier is mentioned.
+- **Drop Ship Integration:** Make Sales Order with item marked as **Supplier delivers to Customer** and then make a Purchase Order from the Sales Order with Supplier details.
+- Customer details in Purchase Order for Drop Ship.
+- Set Sales Order, Purchase Order, Delivery Note and Purchase Receipt as **Closed** to clear notifications.
+- Allocate leaves in **Leave Allocation** by specific dates and not Fiscal Year. Sponsored by [Believer's Church](https://www.believerschurch.com)
diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js
index c8bd753a18..835170a154 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.js
+++ b/erpnext/hr/doctype/leave_application/leave_application.js
@@ -28,21 +28,6 @@ frappe.ui.form.on("Leave Application", {
 			frm.set_value("status", "Open");
 			frm.trigger("calculate_total_days");
 		}
-
-		frm.set_intro("");
-		if (frm.is_new() && !in_list(user_roles, "HR User")) {
-			frm.set_intro(__("Fill the form and save it"));
-		} else {
-			if(frm.doc.docstatus==0 && frm.doc.status=="Open") {
-				if(user==frm.doc.leave_approver) {
-					frm.set_intro(__("You are the Leave Approver for this record. Please Update the 'Status' and Save"));
-					frm.toggle_enable("status", true);
-				} else {
-					frm.set_intro(__("This Leave Application is pending approval. Only the Leave Approver can update status."))
-					frm.toggle_enable("status", false);
-				}
-			}
-		}
 	},
 
 	leave_approver: function(frm) {
diff --git a/sponsors.md b/sponsors.md
index c7c7b0f952..bfa9e51ae6 100644
--- a/sponsors.md
+++ b/sponsors.md
@@ -9,7 +9,7 @@
 				McLean Images
 			
 			
-				For credit period setting options
+				Credit period setting options
 				for Customer #3451
 			
 		
@@ -18,7 +18,7 @@
 				Strella Consulting Sdn Bhd
 			
 			
-				For Sales / Purchase Return Enhancement #3582
+				Sales / Purchase Return Enhancement #3582
 			
 		
 		
@@ -26,7 +26,7 @@
 				PT. Ridho Sribumi Sejahtera
 			
 			
-				For Additional Costs in Stock Entry #3613
+				Additional Costs in Stock Entry #3613
 			
 		
 		
@@ -34,7 +34,7 @@
 				Rohit Industries
 			
 			
-				For Mandrill Integration #3546
+				Mandrill Integration #3546
 			
 		
 		
@@ -42,7 +42,15 @@
 				Startrack
 			
 			
-				For Delivery to Target Warehouse #3546
+				Delivery to Target Warehouse #3546
+			
+		
+		
+			
+				Believer's Church
+			
+			
+				Leave Allocation based on Arbitrary Dates #1938
 			
 		
 	

From fc307970aa3e4b0a9d96918086ead752aca2dbe1 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Wed, 4 Nov 2015 18:02:45 +0530
Subject: [PATCH 58/59] [translations]

---
 erpnext/translations/ar.csv    |  660 +--
 erpnext/translations/bg.csv    |  660 +--
 erpnext/translations/bn.csv    |  660 +--
 erpnext/translations/bs.csv    |  659 +--
 erpnext/translations/ca.csv    |  661 +--
 erpnext/translations/cs.csv    |  660 +--
 erpnext/translations/da-DK.csv | 7250 ++++++++++++++++----------------
 erpnext/translations/da.csv    |  660 +--
 erpnext/translations/de.csv    |  868 ++--
 erpnext/translations/el.csv    |  660 +--
 erpnext/translations/es-PE.csv |  544 ++-
 erpnext/translations/es.csv    | 1283 +++---
 erpnext/translations/fa.csv    |  660 +--
 erpnext/translations/fi.csv    |  660 +--
 erpnext/translations/fr.csv    |  662 +--
 erpnext/translations/he.csv    |  643 +--
 erpnext/translations/hi.csv    |  660 +--
 erpnext/translations/hr.csv    |  660 +--
 erpnext/translations/hu.csv    |  660 +--
 erpnext/translations/id.csv    |  660 +--
 erpnext/translations/it.csv    |  660 +--
 erpnext/translations/ja.csv    |  661 +--
 erpnext/translations/km.csv    |  410 +-
 erpnext/translations/kn.csv    |  660 +--
 erpnext/translations/ko.csv    |  660 +--
 erpnext/translations/lv.csv    |  660 +--
 erpnext/translations/mk.csv    |  660 +--
 erpnext/translations/mr.csv    |  660 +--
 erpnext/translations/my.csv    |  659 +--
 erpnext/translations/nl.csv    |  660 +--
 erpnext/translations/no.csv    |  660 +--
 erpnext/translations/pl.csv    |  660 +--
 erpnext/translations/pt-BR.csv |  660 +--
 erpnext/translations/pt.csv    |  660 +--
 erpnext/translations/ro.csv    |  657 +--
 erpnext/translations/ru.csv    |  660 +--
 erpnext/translations/sk.csv    |  966 ++---
 erpnext/translations/sl.csv    |  676 +--
 erpnext/translations/sq.csv    |  660 +--
 erpnext/translations/sr.csv    |  659 +--
 erpnext/translations/sv.csv    |  660 +--
 erpnext/translations/ta.csv    |  660 +--
 erpnext/translations/th.csv    |  660 +--
 erpnext/translations/tr.csv    |  749 ++--
 erpnext/translations/uk.csv    |  654 +--
 erpnext/translations/vi.csv    |  660 +--
 erpnext/translations/zh-cn.csv |  660 +--
 erpnext/translations/zh-tw.csv |  676 +--
 48 files changed, 20086 insertions(+), 19051 deletions(-)

diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 40b9ba5e48..b5fb474295 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,وضع الراتب
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",تحديد التوزيع الشهري، إذا كنت تريد أن تتبع على أساس موسمية.
 DocType: Employee,Divorced,المطلقات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات: تحذير.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات: تحذير.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,البنود مزامنة بالفعل
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,تسمح البند التي يمكن ان تضاف عدة مرات في معاملة
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,إلغاء مادة زيارة موقع {0} قبل إلغاء هذه المطالبة الضمان
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,الضغط بالإضافة إلى تلبد
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},مطلوب العملة لقائمة الأسعار {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* سيتم احتسابه في المعاملة.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,من المواد طلب
+DocType: Purchase Order,Customer Contact,العملاء الاتصال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,من المواد طلب
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} شجرة
 DocType: Job Applicant,Job Applicant,طالب العمل
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,لا مزيد من النتائج.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,اسم العميل
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",هي المجالات ذات الصلة عن تصدير مثل العملة ، ومعدل التحويل ، ومجموع التصدير، تصدير الخ المجموع الكلي المتاحة في توصيل ملاحظة ، ونقاط البيع ، اقتباس، فاتورة المبيعات ، ترتيب المبيعات الخ
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,رؤساء (أو مجموعات) التي تتم ضد القيود المحاسبية ويتم الاحتفاظ التوازنات.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقيقة
 DocType: Leave Type,Leave Type Name,ترك اسم نوع
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,أسعار الإغلاق متعددة
 DocType: SMS Center,All Supplier Contact,جميع الموردين بيانات الاتصال
 DocType: Quality Inspection Reading,Parameter,المعلمة
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,يتوقع نهاية التاريخ لا يمكن أن يكون أقل من تاريخ بدء المتوقعة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,هل تريد حقا أن نزع السدادة أمر الإنتاج:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,الصف # {0}: تقييم يجب أن يكون نفس {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,إجازة جديدة التطبيق
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,إجازة جديدة التطبيق
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,البنك مشروع
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. للحفاظ على العملاء رمز البند الحكيمة والبحث فيها لجعلها تقوم على التعليمات البرمجية الخاصة بهم استخدام هذا الخيار
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,مشاهدة 
 DocType: Sales Invoice Item,Quantity,كمية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),القروض ( المطلوبات )
 DocType: Employee Education,Year of Passing,اجتياز سنة
-sites/assets/js/erpnext.min.js +27,In Stock,في الأوراق المالية
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,يمكن تسديد فواتير المبيعات ضد بالدفع فقط
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,في الأوراق المالية
 DocType: Designation,Designation,تعيين
 DocType: Production Plan Item,Production Plan Item,خطة إنتاج السلعة
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},المستخدم {0} تم تعيينه بالفعل إلى موظف {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,جعل الملف الجديد POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,الرعاية الصحية
 DocType: Purchase Invoice,Monthly,شهريا
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,فاتورة
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),التأخير في الدفع (أيام)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,فاتورة
 DocType: Maintenance Schedule Item,Periodicity,دورية
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,عنوان البريد الإلكتروني
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,دفاع
 DocType: Company,Abbr,ابر
 DocType: Appraisal Goal,Score (0-5),نقاط (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,الصف # {0}
 DocType: Delivery Note,Vehicle No,السيارة لا
-sites/assets/js/erpnext.min.js +55,Please select Price List,الرجاء اختيار قائمة الأسعار
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,الرجاء اختيار قائمة الأسعار
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,النجارة
 DocType: Production Order Operation,Work In Progress,التقدم في العمل
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,طباعة ثلاثية الأبعاد
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,الأم تفاصيل docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,كجم
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,فتح عن وظيفة.
 DocType: Item Attribute,Increment,زيادة
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,حدد مستودع ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,إعلان
 DocType: Employee,Married,متزوج
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث الأسهم ضد تسليم مذكرة {0}
 DocType: Payment Reconciliation,Reconcile,توفيق
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,بقالة
 DocType: Quality Inspection Reading,Reading 1,قراءة 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,جعل الدخول البنك
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,جعل الدخول البنك
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,صناديق المعاشات التقاعدية
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,مستودع إلزامي إذا كان نوع الحساب هو مستودع
 DocType: SMS Center,All Sales Person,كل عملية بيع شخص
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,شطب مركز التكلفة
 DocType: Warehouse,Warehouse Detail, تفاصيل المستودع
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},وقد عبرت الحد الائتماني للعميل {0} {1} / {2}
 DocType: Tax Rule,Tax Type,نوع الضريبة
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},غير مصرح لك لإضافة أو تحديث الإدخالات قبل {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},غير مصرح لك لإضافة أو تحديث الإدخالات قبل {0}
 DocType: Item,Item Image (if not slideshow),صورة البند (إن لم يكن عرض الشرائح)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,موجود على العملاء مع نفس الاسم
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(سعر الساعة / 60) * وقت العمل الفعلي
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,ضيف
 DocType: Quality Inspection,Get Specification Details,الحصول على تفاصيل المواصفات
 DocType: Lead,Interested,مهتم
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,فاتورة المواد
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,افتتاح
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,افتتاح
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},من {0} إلى {1}
 DocType: Item,Copy From Item Group,نسخة من المجموعة السلعة
 DocType: Journal Entry,Opening Entry,فتح دخول
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,المنتج استفسار
 DocType: Standard Reply,Owner,مالك
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,يرجى إدخال الشركة الأولى
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,يرجى تحديد الشركة أولا
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,يرجى تحديد الشركة أولا
 DocType: Employee Education,Under Graduate,تحت الدراسات العليا
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,الهدف في
 DocType: BOM,Total Cost,التكلفة الكلية لل
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,بادئة
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,الاستهلاكية
 DocType: Upload Attendance,Import Log,استيراد دخول
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,إرسال
+DocType: Sales Invoice Item,Delivered By Supplier,سلمت من قبل مزود
 DocType: SMS Center,All Contact,جميع الاتصالات
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,الراتب السنوي
 DocType: Period Closing Voucher,Closing Fiscal Year,إغلاق السنة المالية
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,الدخول كونترا
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,عرض الوقت سجلات
 DocType: Journal Entry Account,Credit in Company Currency,الائتمان في الشركة العملات
 DocType: Delivery Note,Installation Status,تثبيت الحالة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},الكمية المقبولة + المرفوضة يجب أن تساوي الكمية المستلمة من الصنف {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},الكمية المقبولة + المرفوضة يجب أن تساوي الكمية المستلمة من الصنف {0}
 DocType: Item,Supply Raw Materials for Purchase,توريد مواد خام للشراء
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,البند {0} يجب أن يكون شراء السلعة
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","تحميل قالب، وملء البيانات المناسبة وإرفاق الملف المعدل.
  جميع التواريخ والموظف الجمع في الفترة المختارة سيأتي في القالب، مع سجلات الحضور القائمة"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,البند {0} غير نشط أو تم التوصل إلى نهاية الحياة
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,البند {0} غير نشط أو تم التوصل إلى نهاية الحياة
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,سيتم تحديث بعد تقديم فاتورة المبيعات.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,إعدادات وحدة الموارد البشرية
 DocType: SMS Center,SMS Center,مركز SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,استقامة
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,أدخل عنوان URL ل
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,قواعد لتطبيق التسعير والخصم .
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},الصراعات دخول هذا الوقت مع {0} ل {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,يجب أن تكون قائمة الأسعار المعمول بها لشراء أو بيع
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},تاريخ التثبيت لا يمكن أن يكون قبل تاريخ التسليم القطعة ل {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},تاريخ التثبيت لا يمكن أن يكون قبل تاريخ التسليم القطعة ل {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),خصم على قائمة الأسعار معدل (٪)
-sites/assets/js/form.min.js +279,Start,بداية
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,بداية
 DocType: User,First Name,الاسم الأول
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,الإعداد الخاص بك كامل. منعش.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,كامل قالب الصب
 DocType: Offer Letter,Select Terms and Conditions,اختر الشروط والأحكام
 DocType: Production Planning Tool,Sales Orders,أوامر البيع
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,مقابل فاتورة المبيعات 
 ,Production Orders in Progress,أوامر الإنتاج في التقدم
 DocType: Lead,Address & Contact,معلومات الاتصال والعنوان
+DocType: Leave Allocation,Add unused leaves from previous allocations,إضافة الأوراق غير المستخدمة من المخصصات السابقة
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},المتكرر التالي {0} سيتم إنشاؤها على {1}
 DocType: Newsletter List,Total Subscribers,إجمالي عدد المشتركين
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,اسم جهة الاتصال
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,وفي انتظار SO الكمية
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,يخلق زلة مرتبات المعايير المذكورة أعلاه.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,طلب للشراء.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,الإسكان مزدوج
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تخفيف التسجيل يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,يترك في السنة
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,الرجاء تعيين تسمية Series لل{0} عبر إعداد> إعدادات> تسمية السلسلة
 DocType: Time Log,Will be updated when batched.,سيتم تحديث عندما دفعات.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"صف {0}: يرجى التحقق ""هل المسبق ضد حساب {1} إذا كان هذا هو إدخال مسبق."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"صف {0}: يرجى التحقق ""هل المسبق ضد حساب {1} إذا كان هذا هو إدخال مسبق."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},مستودع {0} لا تنتمي إلى شركة {1}
 DocType: Bulk Email,Message,رسالة
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
 DocType: Dropbox Backup,Dropbox Access Key,دروببوإكس مفتاح الوصول
 DocType: Payment Tool,Reference No,المرجع لا
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,ترك الممنوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ترك الممنوع
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,الأسهم المصالحة البند
 DocType: Stock Entry,Sales Invoice No,فاتورة مبيعات لا
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,الحد الأدنى لطلب الكمية
 DocType: Pricing Rule,Supplier Type,المورد نوع
 DocType: Item,Publish in Hub,نشر في المحور
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,البند {0} تم إلغاء
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,طلب المواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,طلب المواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 DocType: Item,Purchase Details,تفاصيل شراء
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},البند {0} غير موجودة في "المواد الخام الموردة" الجدول في أمر الشراء {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,إعلام التحكم
 DocType: Lead,Suggestions,اقتراحات
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,تعيين مجموعة من الحكمة الإغلاق الميزانيات على هذا الإقليم. يمكنك أيضا تضمين الموسمية عن طريق تعيين التوزيع.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},الرجاء إدخال مجموعة حساب الأصل لمستودع {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},دفع ضد {0} {1} لا يمكن أن يكون أكبر من قيمة المعلقة {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},دفع ضد {0} {1} لا يمكن أن يكون أكبر من قيمة المعلقة {2}
 DocType: Supplier,Address HTML,معالجة HTML
 DocType: Lead,Mobile No.,رقم الجوال
 DocType: Maintenance Schedule,Generate Schedule,توليد جدول
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,ألبوم جديد UOM
 DocType: Period Closing Voucher,Closing Account Head,إغلاق حساب رئيس
 DocType: Employee,External Work History,التاريخ العمل الخارجي
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,خطأ مرجع دائري
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,هل تريد حقا أن توقف
 DocType: Communication,Closed,مغلق
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,وبعبارة (تصدير) أن تكون واضحة مرة واحدة قمت بحفظ ملاحظة التسليم.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,هل أنت متأكد أنك تريد أن تتوقف
 DocType: Lead,Industry,صناعة
 DocType: Employee,Job Profile,الملف ظيفة
 DocType: Newsletter,Newsletter,النشرة الإخبارية
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,ملاحظة التسليم
 DocType: Dropbox Backup,Allow Dropbox Access,تسمح قطاف الدخول
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,إنشاء الضرائب
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ملخص لهذا الأسبوع والأنشطة المعلقة
 DocType: Workstation,Rent Cost,الإيجار التكلفة
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,الرجاء اختيار الشهر والسنة
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,المعدل الذي يتم تحويل العملة إلى عملة الأساس العملاء العميل
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",المتاحة في BOM ، تسليم مذكرة ، شراء الفاتورة ، ترتيب الإنتاج، طلب شراء ، شراء استلام ، فاتورة المبيعات ، ترتيب المبيعات ، اسهم الدخول و الجدول الزمني
 DocType: Item Tax,Tax Rate,ضريبة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,اختر البند
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,اختر البند
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","البند: {0} المدارة دفعة الحكيمة، لا يمكن التوفيق بينها باستخدام \
  المالية المصالحة، بدلا من استخدام الدخول المالية"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: لا دفعة ويجب أن يكون نفس {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,تحويل لغير المجموعه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,يجب تقديم شراء إيصال
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,الأسهم الحالية
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,رقم المجموعة للصنف
 DocType: C-Form Invoice Detail,Invoice Date,تاريخ الفاتورة
 DocType: GL Entry,Debit Amount,قيمة الخصم
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,عنوان البريد الإلكتروني الخاص بك
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,يرجى الاطلاع على المرفقات
 DocType: Purchase Order,% Received,تم استلام٪
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,تعليمات
 DocType: Quality Inspection,Inspected By,تفتيش من قبل
 DocType: Maintenance Visit,Maintenance Type,صيانة نوع
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},المسلسل لا {0} لا تنتمي إلى التسليم ملاحظة {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},المسلسل لا {0} لا تنتمي إلى التسليم ملاحظة {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,معلمة البند التفتيش الجودة
 DocType: Leave Application,Leave Approver Name,ترك اسم الموافق
 ,Schedule Date,جدول التسجيل
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,سجل شراء
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
 DocType: Workstation,Consumable Cost,التكلفة الاستهلاكية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات) 
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات) 
 DocType: Purchase Receipt,Vehicle Date,مركبة التسجيل
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,طبي
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,السبب لفقدان
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,٪ تم تثبيت
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,الرجاء إدخال اسم الشركة الأولى
 DocType: BOM,Item Desription,البند Desription
 DocType: Purchase Invoice,Supplier Name,اسم المورد
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,قراءة دليل ERPNext
 DocType: Account,Is Group,غير المجموعة
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,تعيين تلقائيا المسلسل رقم استنادا FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,الاختيار فاتورة المورد عدد تفرد
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,مدير المب
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,الإعدادات العمومية لجميع عمليات التصنيع.
 DocType: Accounts Settings,Accounts Frozen Upto,حسابات مجمدة حتي
 DocType: SMS Log,Sent On,ارسلت في
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,عطلة الرئيسي.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,صب قذيفة
 DocType: Material Request Item,Required Date,تاريخ المطلوبة
 DocType: Delivery Note,Billing Address,عنوان الفواتير
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,الرجاء إدخال رمز المدينة .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,الرجاء إدخال رمز المدينة .
 DocType: BOM,Costing,تكلف
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",إذا كانت محددة، سيتم النظر في مقدار ضريبة والمدرجة بالفعل في قيم طباعة / المبلغ طباعة
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,إجمالي الكمية
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),الوقت ب
 DocType: Customer,Buyer of Goods and Services.,المشتري من السلع والخدمات.
 DocType: Journal Entry,Accounts Payable,ذمم دائنة
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,إضافة المشتركين
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" لا يوجد"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" لا يوجد"
 DocType: Pricing Rule,Valid Upto,صالحة لغاية
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,قائمة قليلة من الزبائن. يمكن أن تكون المنظمات أو الأفراد.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,الدخل المباشر
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",لا يمكن تصفية استنادا إلى الحساب ، إذا جمعت بواسطة حساب
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,موظف إداري
 DocType: Payment Tool,Received Or Paid,تلقى أو المدفوعة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,يرجى تحديد الشركة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,يرجى تحديد الشركة
 DocType: Stock Entry,Difference Account,حساب الفرق
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,لا يمكن عمل أقرب لم يتم إغلاق المهمة التابعة لها {0}.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,من فضلك ادخل مستودع لل والتي سيتم رفع طلب المواد
 DocType: Production Order,Additional Operating Cost,إضافية تكاليف التشغيل
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,مستحضرات التجميل
 DocType: DocField,Type,نوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
 DocType: Communication,Subject,موضوع
 DocType: Shipping Rule,Net Weight,الوزن الصافي
 DocType: Employee,Emergency Phone,الهاتف في حالات الطوارئ
 ,Serial No Warranty Expiry,المسلسل لا عودة انتهاء الاشتراك
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,هل تريد حقا لوقف هذا طلب المواد ؟
 DocType: Sales Order,To Deliver,لتسليم
 DocType: Purchase Invoice Item,Item,بند
 DocType: Journal Entry,Difference (Dr - Cr),الفرق ( الدكتور - الكروم )
 DocType: Account,Profit and Loss,الربح والخسارة
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,إدارة التعاقد من الباطن
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,إدارة التعاقد من الباطن
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,يجب أن لا تكون جديدة UOM من النوع الجامع رقم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,الأثاث و تركيبات
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لشركة
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,إضافة / تعديل 
 DocType: Purchase Invoice,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",لا يمكن حذف الرقم التسلسلي {0}، كما يتم استخدامه في المعاملات الأسهم
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),إغلاق (الكروم)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),إغلاق (الكروم)
 DocType: Serial No,Warranty Period (Days),فترة الضمان (أيام)
 DocType: Installation Note Item,Installation Note Item,ملاحظة تثبيت الإغلاق
 ,Pending Qty,في انتظار الكمية
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,الفوترة والدفع ا
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,تكرار العملاء
 DocType: Leave Control Panel,Allocate,تخصيص
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,سابق
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,مبيعات العودة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,مبيعات العودة
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,حدد أوامر المبيعات التي تريد إنشاء أوامر الإنتاج.
+DocType: Item,Delivered by Supplier (Drop Ship),سلمت من قبل مزود (هبوط السفينة)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,الراتب المكونات.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,قاعدة بيانات من العملاء المحتملين.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,العملاء قاعدة البيانات.
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,تراجع
 DocType: Purchase Order Item,Billed Amt,المنقار AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,مستودع المنطقي الذي ضد مصنوعة إدخالات الأسهم.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},مطلوب المرجعية لا والمراجع التسجيل لل {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},مطلوب المرجعية لا والمراجع التسجيل لل {0}
 DocType: Event,Wednesday,الأربعاء
 DocType: Sales Invoice,Customer's Vendor,العميل البائع
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,إنتاج النظام هو إجباري
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,استقبال معلمة
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""" بناء على "" و "" مجمع بــ ' لا يمكن أن يتطابقا"
 DocType: Sales Person,Sales Person Targets,أهداف المبيعات شخص
-sites/assets/js/form.min.js +271,To,إلى
-apps/frappe/frappe/templates/base.html +143,Please enter email address,يرجى إدخال عنوان البريد الإلكتروني
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,إلى
+apps/frappe/frappe/templates/base.html +145,Please enter email address,يرجى إدخال عنوان البريد الإلكتروني
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,نهاية أنبوب تشكيل
 DocType: Production Order Operation,In minutes,في دقائق
 DocType: Issue,Resolution Date,تاريخ القرار
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,مشاريع العضو
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,مستهلك
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} غير موجود في جدول تفاصيل الفاتورة
 DocType: Company,Round Off Cost Center,جولة قبالة مركز التكلفة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,صيانة زيارة {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,صيانة زيارة {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 DocType: Material Request,Material Transfer,لنقل المواد
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),افتتاح ( الدكتور )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},يجب أن يكون الطابع الزمني بالإرسال بعد {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,إعدادات
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,الضرائب التكلفة هبطت والرسوم
 DocType: Production Order Operation,Actual Start Time,الفعلي وقت البدء
 DocType: BOM Operation,Operation Time,عملية الوقت
-sites/assets/js/list.min.js +5,More,أكثر
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,أكثر
 DocType: Pricing Rule,Sales Manager,مدير المبيعات
-sites/assets/js/desk.min.js +7673,Rename,إعادة تسمية
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,إعادة تسمية
 DocType: Journal Entry,Write Off Amount,شطب المبلغ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,تقويس
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,تسمح للمستخدم
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,مستقيم قص
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,لتتبع البند في المبيعات وثائق الشراء على أساس غ من المسلسل. ويمكن أيضا استخدام هذه المعلومات لتعقب الضمان للمنتج.
 DocType: Purchase Receipt Item Supplied,Current Stock,الأسهم الحالية
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,مستودع رفض إلزامي ضد البند regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,مستودع رفض إلزامي ضد البند regected
 DocType: Account,Expenses Included In Valuation,وشملت النفقات في التقييم
 DocType: Employee,Provide email id registered in company,توفير معرف البريد الإلكتروني المسجلة في الشركة
 DocType: Hub Settings,Seller City,مدينة البائع
 DocType: Email Digest,Next email will be sent on:,سيتم إرسال البريد الإلكتروني التالي على:
 DocType: Offer Letter Term,Offer Letter Term,تقديم رسالة الأجل
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,البند لديه المتغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,البند لديه المتغيرات.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,البند {0} لم يتم العثور على
 DocType: Bin,Stock Value,الأسهم القيمة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,نوع الشجرة
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ترحيب
 DocType: Journal Entry,Credit Card Entry,الدخول بطاقة الائتمان
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,مهمة موضوع
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,تلقى السلع من الموردين.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,تلقى السلع من الموردين.
 DocType: Communication,Open,فتح
 DocType: Lead,Campaign Name,اسم الحملة
 ,Reserved,محجوز
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,هل تريد حقا أن نزع السدادة
 DocType: Purchase Order,Supply Raw Materials,توريد المواد الخام
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,التاريخ الذي سيتم إنشاء الفاتورة القادمة. يتم إنشاؤها على تقديم.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,الموجودات المتداولة
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,الزبون أمر الشراء لا
 DocType: Employee,Cell Number,الخلية رقم
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,مفقود
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,"لا يمكنك إدخال قسيمة الحالي في ""ضد إدخال دفتر اليومية"" عمود"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"لا يمكنك إدخال قسيمة الحالي في ""ضد إدخال دفتر اليومية"" عمود"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,طاقة
 DocType: Opportunity,Opportunity From,فرصة من
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,بيان الراتب الشهري.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,مسئولية
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,المبلغ عقوبات لا يمكن أن يكون أكبر من مبلغ المطالبة في صف {0}.
 DocType: Company,Default Cost of Goods Sold Account,التكلفة الافتراضية لحساب السلع المباعة
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,قائمة الأسعار غير محددة
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,قائمة الأسعار غير محددة
 DocType: Employee,Family Background,الخلفية العائلية
 DocType: Process Payroll,Send Email,إرسال البريد الإلكتروني
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,لا يوجد تصريح
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,غ
 DocType: Item,Items with higher weightage will be shown higher,وسيتم عرض البنود مع أعلى الترجيح العالي
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,تفاصيل تسوية البنك
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,بلدي الفواتير
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,لا توجد موظف
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,لا توجد موظف
 DocType: Purchase Order,Stopped,توقف
 DocType: Item,If subcontracted to a vendor,إذا الباطن للبائع
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,حدد BOM لبدء
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,تحمي
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,أرسل الآن
 ,Support Analytics,دعم تحليلات
 DocType: Item,Website Warehouse,مستودع الموقع
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,هل تريد حقا لوقف أمر الإنتاج:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",في يوم من الشهر الذي سيتم إنشاء فاتورة السيارات سبيل المثال 05، 28 الخ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,يجب أن تكون النتيجة أقل من أو يساوي 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,سجلات النموذج - س
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,دع
 DocType: Features Setup,"To enable ""Point of Sale"" features",لتمكين "نقطة بيع" ميزات
 DocType: Bin,Moving Average Rate,الانتقال متوسط ​​معدل
 DocType: Production Planning Tool,Select Items,حدد العناصر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
 DocType: Comment,Reference Name,مرجع اسم
 DocType: Maintenance Visit,Completion Status,استكمال الحالة
 DocType: Sales Invoice Item,Target Warehouse,الهدف مستودع
 DocType: Item,Allow over delivery or receipt upto this percent,سماح على تسليم أو استلام تصل هذه النسبة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ ترتيب المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ ترتيب المبيعات
 DocType: Upload Attendance,Import Attendance,الحضور الاستيراد
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,جميع مجموعات الصنف
 DocType: Process Payroll,Activity Log,سجل النشاط
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,يؤلف تلقائيا رسالة على تقديم المعاملات.
 DocType: Production Order,Item To Manufacture,البند لتصنيع
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,قالب الصب الدائم
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,أمر الشراء إلى الدفع
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} الوضع هو {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,أمر الشراء إلى الدفع
 DocType: Sales Order Item,Projected Qty,الكمية المتوقع
 DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
 DocType: Newsletter,Newsletter Manager,مدير النشرة الإخبارية
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,أرقام طلب
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,تقييم الأداء.
 DocType: Sales Invoice Item,Stock Details,الأسهم تفاصيل
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,المشروع القيمة
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,نقطة البيع
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},لا يمكن المضي قدما {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,نقطة البيع
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},لا يمكن المضي قدما {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","رصيد حساب بالفعل في الائتمان، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'كما' الخصم '"
 DocType: Account,Balance must be,يجب أن يكون التوازن
 DocType: Hub Settings,Publish Pricing,نشر التسعير
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,ايصال شراء
 ,Received Items To Be Billed,العناصر الواردة إلى أن توصف
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,الكشط
-sites/assets/js/desk.min.js +3938,Ms,MS
+DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,أسعار صرف العملات الرئيسية .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
 DocType: Production Order,Plan material for sub-assemblies,المواد خطة للجمعيات الفرعي
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,نطاق
 DocType: Supplier,Default Payable Accounts,الحسابات الدائنة الافتراضي
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,موظف {0} غير نشط أو غير موجود
 DocType: Features Setup,Item Barcode,البند الباركود
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,البند المتغيرات {0} تحديث
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,مقدم فاتورة الشراء
 DocType: Address,Shop,تسوق
 DocType: Hub Settings,Sync Now,مزامنة الآن
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط دخول الائتمان مع {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط دخول الائتمان مع {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,سيتم الافتراضي بنك / الصرف حساب الفاتورة تلقائيا تحديث في POS عند تحديد هذا الوضع.
 DocType: Employee,Permanent Address Is,العنوان الدائم هو
 DocType: Production Order Operation,Operation completed for how many finished goods?,اكتمال عملية لكيفية العديد من السلع تامة الصنع؟
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,العلامة التجارية
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,اتاحة لأكثر من {0} للصنف {1}
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,اتاحة لأكثر من {0} للصنف {1}
 DocType: Employee,Exit Interview Details,تفاصيل مقابلة الخروج
 DocType: Item,Is Purchase Item,هو شراء مادة
 DocType: Journal Entry Account,Purchase Invoice,فاتورة شراء
 DocType: Stock Ledger Entry,Voucher Detail No,تفاصيل قسيمة لا
 DocType: Stock Entry,Total Outgoing Value,إجمالي القيمة الصادرة
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,يجب فتح التسجيل وتاريخ الإنتهاء تكون ضمن نفس السنة المالية
 DocType: Lead,Request for Information,طلب المعلومات
 DocType: Payment Tool,Paid,مدفوع
 DocType: Salary Slip,Total in words,وبعبارة مجموع
 DocType: Material Request Item,Lead Time Date,تاريخ و وقت مبادرة البيع
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,إلزامي. ربما لا يتم إنشاء سجل صرف العملات ل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},الصف # {0}: يرجى تحديد رقم التسلسلي للتاريخ {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",وللسلع "حزمة المنتج، مستودع، المسلسل لا دفعة ويتم النظر في أي من الجدول" قائمة التعبئة ". إذا مستودع ودفعة لا هي نفسها لجميع عناصر التعبئة لمادة أي 'حزمة المنتج، يمكن إدخال تلك القيم في الجدول الرئيسي عنصر، سيتم نسخ القيم إلى "قائمة التعبئة" الجدول.
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,الشحنات للعملاء.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,الشحنات للعملاء.
 DocType: Purchase Invoice Item,Purchase Order Item,شراء السلعة ترتيب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,الدخل غير المباشرة
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,ضبط كمية الدفع = المبلغ المستحق
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,العنوان سطر 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,فرق
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,اسم الشركة
 DocType: SMS Center,Total Message(s),مجموع الرسائل ( ق )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,عرض قائمة من جميع ملفات الفيديو مساعدة
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,حدد رئيس حساب في البنك حيث أودع الاختيار.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,تسمح للمستخدم لتحرير الأسعار قائمة قيم في المعاملات
 DocType: Pricing Rule,Max Qty,ماكس الكمية
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,مادة كيميائية
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
 DocType: Process Payroll,Select Payroll Year and Month,حدد الرواتب السنة والشهر
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",انتقل إلى المجموعة المناسبة (عادة طلب تمويل> الأصول الحالية> الحسابات المصرفية وإنشاء حساب جديد (بالنقر على إضافة الطفل) من نوع "البنك"
 DocType: Workstation,Electricity Cost,تكلفة الكهرباء
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,أب
 DocType: SMS Center,All Lead (Open),جميع الرصاص (فتح)
 DocType: Purchase Invoice,Get Advances Paid,الحصول على السلف المدفوعة
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,إرفاق صورتك
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,جعل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,جعل
 DocType: Journal Entry,Total Amount in Words,المبلغ الكلي في كلمات
 DocType: Workflow State,Stop,توقف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,كان هناك خطأ . يمكن أن يكون أحد الأسباب المحتملة التي قد لا يتم حفظ النموذج. يرجى الاتصال support@erpnext.com إذا استمرت المشكلة.
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,التعبئة الإغلاق زل
 DocType: POS Profile,Cash/Bank Account,النقد / البنك حساب
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,الجدول السمة إلزامي
 DocType: Production Planning Tool,Get Sales Orders,الحصول على أوامر المبيعات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} لا يمكن أن تكون سلبية
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,الايداع
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',وسيتم تح
 DocType: Project,Internal,داخلي
 DocType: Task,Urgent,ملح
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},يرجى تحديد هوية الصف صالحة لصف {0} في الجدول {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,اذهب إلى سطح المكتب والبدء في استخدام ERPNext
 DocType: Item,Manufacturer,الصانع
 DocType: Landed Cost Item,Purchase Receipt Item,شراء السلعة استلام
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,مستودع محجوزة في ترتيب المبيعات / السلع تامة الصنع في معرض النماذج
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,كمية البيع
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,سجلات الوقت
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"كنت الموافق المصروفات لهذا السجل . يرجى تحديث ""الحالة"" و فروا"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"كنت الموافق المصروفات لهذا السجل . يرجى تحديث ""الحالة"" و فروا"
 DocType: Serial No,Creation Document No,إنشاء وثيقة لا
 DocType: Issue,Issue,قضية
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",سمات البدائل للصنف. على سبيل المثال الحجم واللون الخ
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,ضد
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
 DocType: Sales Partner,Implementation Partner,تنفيذ الشريك
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},ترتيب المبيعات {0} {1}
 DocType: Opportunity,Contact Info,معلومات الاتصال
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,جعل الأسهم مقالات
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,جعل الأسهم مقالات
 DocType: Packing Slip,Net Weight UOM,الوزن الصافي UOM
 DocType: Item,Default Supplier,مزود الافتراضي
 DocType: Manufacturing Settings,Over Production Allowance Percentage,أكثر من الإنتاج بدل النسبة المئوية
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,متفرقات
 DocType: Holiday List,Get Weekly Off Dates,الحصول على مواعيد معطلة أسبوعي
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,تاريخ نهاية لا يمكن أن يكون أقل من تاريخ بدء
 DocType: Sales Person,Select company name first.,حدد اسم الشركة الأول.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,الدكتور
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,الدكتور
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,الاقتباسات الواردة من الموردين.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},إلى {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,تحديث عن طريق سجلات الوقت
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,أرقام تسجيل الشركة للرجوع اليها. أرقام الضرائب الخ.
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 ,Ordered Items To Be Billed,أمرت البنود التي يتعين صفت
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,من المدى يجب أن يكون أقل من أن تتراوح
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,حدد وقت السجلات وتقديمها إلى إنشاء فاتورة مبيعات جديدة.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,الضر
 DocType: Lead,Lead,مبادرة بيع
 DocType: Email Digest,Payables,الذمم الدائنة
 DocType: Account,Warehouse,مستودع
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
 ,Purchase Order Items To Be Billed,أمر الشراء البنود لتكون وصفت
 DocType: Purchase Invoice Item,Net Rate,صافي معدل
 DocType: Purchase Invoice Item,Purchase Invoice Item,شراء السلعة الفاتورة
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,لم تتم تسو
 DocType: Global Defaults,Current Fiscal Year,السنة المالية الحالية
 DocType: Global Defaults,Disable Rounded Total,تعطيل إجمالي مدور
 DocType: Lead,Call,دعوة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},صف مكررة {0} مع نفسه {1}
 ,Trial Balance,ميزان المراجعة
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,إعداد الموظفين
-sites/assets/js/erpnext.min.js +5,"Grid ""","الشبكة """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,إعداد الموظفين
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","الشبكة """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,الرجاء اختيار البادئة الأولى
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,بحث
 DocType: Maintenance Visit Purpose,Work Done,العمل المنجز
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,أرسلت
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,عرض ليدجر
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,أقرب
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
 DocType: Communication,Delivery Status,حالة التسليم
 DocType: Production Order,Manufacture against Sales Order,تصنيع ضد ترتيب المبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,بقية العالم
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,بقية العالم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,العنصر {0} لا يمكن أن يكون دفعة
 ,Budget Variance Report,تقرير الفرق الميزانية
 DocType: Salary Slip,Gross Pay,إجمالي الأجور
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,أرباح الأسهم المدفوعة
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,المحاسبة ليدجر
 DocType: Stock Reconciliation,Difference Amount,مقدار الفرق
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,الأرباح المحتجزة
 DocType: BOM Item,Item Description,وصف السلعة
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,فرصة السلعة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,افتتاح مؤقت
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,الموظف اترك الرصيد
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},التوازن ل حساب {0} يجب أن يكون دائما {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},التوازن ل حساب {0} يجب أن يكون دائما {1}
 DocType: Address,Address Type,نوع العنوان
 DocType: Purchase Receipt,Rejected Warehouse,رفض مستودع
 DocType: GL Entry,Against Voucher,ضد قسيمة
 DocType: Item,Default Buying Cost Center,الافتراضي شراء مركز التكلفة
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",للحصول على أفضل النتائج من ERPNext، ونحن نوصي بأن تأخذ بعض الوقت ومشاهدة أشرطة الفيديو هذه المساعدة.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,البند {0} يجب أن تكون مبيعات السلعة
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,إلى
 DocType: Item,Lead Time in days,يؤدي الوقت في أيام
 ,Accounts Payable Summary,ملخص الحسابات الدائنة
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},غير مخول لتحرير الحساب المجمد {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},غير مخول لتحرير الحساب المجمد {0}
 DocType: Journal Entry,Get Outstanding Invoices,الحصول على الفواتير المستحقة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,ترتيب المبيعات {0} غير صالح
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,مكان الإصدار
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,عقد
 DocType: Report,Disabled,معاق
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM اللازمة لUOM: {0} في المدينة: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM اللازمة لUOM: {0} في المدينة: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,المصاريف غير المباشرة
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,الصف {0}: الكمية إلزامي
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,زراعة
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,طريقة الدفع
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
 DocType: Journal Entry Account,Purchase Order,أمر الشراء
 DocType: Warehouse,Warehouse Contact Info,معلومات اتصال المستودع 
-sites/assets/js/form.min.js +190,Name is required,مطلوب اسم
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,مطلوب اسم
 DocType: Purchase Invoice,Recurring Type,نوع المتكررة
 DocType: Address,City/Town,المدينة / البلدة
 DocType: Email Digest,Annual Income,الدخل السنوي
 DocType: Serial No,Serial No Details,تفاصيل المسلسل
 DocType: Purchase Invoice Item,Item Tax Rate,البند ضريبة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,معدات العاصمة
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,تحرير الوصف
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,التسليم المتوقع التاريخ هو أقل من الموعد المقرر ابدأ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,ل مزود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,ل مزود
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تحديد نوع الحساب يساعد في تحديد هذا الحساب في المعاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),المجموع الكلي (العملات شركة)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,مجموع المنتهية ولايته
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","يمكن أن يكون هناك واحد فقط الشحن القاعدة الحالة مع 0 أو قيمة فارغة ل "" إلى القيمة """
 DocType: Authorization Rule,Transaction,صفقة
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ملاحظة : هذا هو مركز التكلفة المجموعة . لا يمكن إجراء القيود المحاسبية ضد الجماعات .
-apps/erpnext/erpnext/config/projects.py +43,Tools,أدوات
+apps/frappe/frappe/config/desk.py +7,Tools,أدوات
 DocType: Item,Website Item Groups,مجموعات الأصناف للموقع
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,عدد أمر الإنتاج إلزامي لدخول الأسهم صناعة الغرض
 DocType: Purchase Invoice,Total (Company Currency),مجموع (شركة العملات)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,اسم محطة العمل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,أرسل دايجست:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
 DocType: Sales Partner,Target Distribution,هدف التوزيع
-sites/assets/js/desk.min.js +7652,Comments,تعليقات
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,تعليقات
 DocType: Salary Slip,Bank Account No.,رقم الحساب في البك
 DocType: Naming Series,This is the number of the last created transaction with this prefix,هذا هو عدد المعاملات التي تم إنشاؤها باستخدام مشاركة هذه البادئة
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},قيم التقييم المطلوبة القطعة ل {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,الرجاء
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,امتياز الإجازة
 DocType: Purchase Invoice,Supplier Invoice Date,المورد فاتورة التسجيل
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,تحتاج إلى تمكين سلة التسوق
-sites/assets/js/form.min.js +212,No Data,لا توجد بيانات
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,لا توجد بيانات
 DocType: Appraisal Template Goal,Appraisal Template Goal,تقييم قالب الهدف
 DocType: Salary Slip,Earning,كسب
 DocType: Payment Tool,Party Account Currency,حزب حساب العملات
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,حزب حساب العملات
 DocType: Purchase Taxes and Charges,Add or Deduct,إضافة أو خصم
 DocType: Company,If Yearly Budget Exceeded (for expense account),إذا كانت الميزانية السنوية تجاوزت (لحساب المصاريف)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,الظروف المتداخلة وجدت بين:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,ضد مجلة الدخول {0} يتم ضبط بالفعل ضد بعض قسيمة أخرى
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,ضد مجلة الدخول {0} يتم ضبط بالفعل ضد بعض قسيمة أخرى
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,مجموع قيمة الطلب
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,غذاء
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,المدى شيخوخة 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,لا الزيارات
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",النشرات الإخبارية إلى جهات الاتصال، ويؤدي.
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},يجب أن تكون عملة الحساب الختامي {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع النقاط لجميع الأهداف يجب أن يكون 100. ومن {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,لا يمكن ترك عمليات فارغا.
 ,Delivered Items To Be Billed,وحدات تسليمها الى أن توصف
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,لا يمكن تغيير الرقم التسلسلي لل مستودع
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},الحالة المحدثة إلى {0}
 DocType: DocField,Description,وصف
 DocType: Authorization Rule,Average Discount,متوسط ​​الخصم
 DocType: Letter Head,Is Default,افتراضي
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,البند ضريبة المبل
 DocType: Item,Maintain Stock,الحفاظ على الأوراق المالية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,مقالات الأسهم التي تم إنشاؤها بالفعل لترتيب الإنتاج
 DocType: Leave Control Panel,Leave blank if considered for all designations,ترك فارغا إذا نظرت لجميع التسميات
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},الحد الأقصى: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,من التاريخ والوقت
 DocType: Email Digest,For Company,لشركة
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,الشحن العنوان الاس
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,دليل الحسابات
 DocType: Material Request,Terms and Conditions Content,الشروط والأحكام المحتوى
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
 DocType: Employee,Owned,تملكها
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,الضمان / AMC الحالة
 DocType: GL Entry,GL Entry,GL الدخول
 DocType: HR Settings,Employee Settings,إعدادات موظف
 ,Batch-Wise Balance History,دفعة الحكيم التاريخ الرصيد
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,قائمة المهام
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,قائمة المهام
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,مبتدئ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,لا يسمح السلبية الكمية
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,مكتب للإيجار
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,إعدادات العبارة الإعداد SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,استيراد فشل !
-sites/assets/js/erpnext.min.js +24,No address added yet.,أي عنوان أضاف بعد.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,أي عنوان أضاف بعد.
 DocType: Workstation Working Hour,Workstation Working Hour,محطة العمل ساعة العمل
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,محلل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ JV {2} الصف {0}
 DocType: Item,Inventory,جرد
 DocType: Features Setup,"To enable ""Point of Sale"" view",لتمكين "نقطة البيع" وجهة نظر
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,لا يمكن أن يتم السداد للسلة فارغة
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,لا يمكن أن يتم السداد للسلة فارغة
 DocType: Item,Sales Details,تفاصيل المبيعات
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,تعلق
 DocType: Opportunity,With Items,مع الأصناف
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",التاريخ الذي سيتم إنشاء الفاتورة القادمة. يتم إنشاؤها على تقديم.
 DocType: Item Attribute,Item Attribute,البند السمة
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,حكومة
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,المتغيرات البند
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,المتغيرات البند
 DocType: Company,Services,الخدمات
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),مجموع ({0})
 DocType: Cost Center,Parent Cost Center,الأم تكلفة مركز
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,تاريخ بدء السنة المالية
 DocType: Employee External Work History,Total Experience,مجموع الخبرة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,التوسيع
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,الشحن و التخليص الرسوم
 DocType: Material Request Item,Sales Order No,ترتيب المبيعات لا
 DocType: Item Group,Item Group Name,البند اسم المجموعة
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,مأخوذ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,مأخوذ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,المواد نقل لصناعة
 DocType: Pricing Rule,For Price List,لائحة الأسعار
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,البحث التنفيذي
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,جداول
 DocType: Purchase Invoice Item,Net Amount,صافي القيمة
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفاصيل لا
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),إضافي مقدار الخصم (العملة الشركة)
-DocType: Period Closing Voucher,CoA Help,تعليمات لجنة الزراعة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},الخطأ: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},الخطأ: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,يرجى إنشاء حساب جديد من الرسم البياني للحسابات .
 DocType: Maintenance Visit,Maintenance Visit,صيانة زيارة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,العملاء> مجموعة العملاء> إقليم
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,هبطت التكلفة مساعد
 DocType: Event,Tuesday,الثلاثاء
 DocType: Leave Block List,Block Holidays on important days.,عطلات كتلة في الأيام الهامة.
 ,Accounts Receivable Summary,حسابات المقبوضات ملخص
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},يترك لنوع {0} المخصصة أصلا لموظف {1} لفترة {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,الرجاء تعيين حقل معرف المستخدم في سجل الموظف لتحديد دور موظف
 DocType: UOM,UOM Name,UOM اسم
 DocType: Top Bar Item,Target,الهدف
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,مبيعات الشريك الهدف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},القيد المحاسبي ل{0} لا يمكن إلا أن تكون في العملة: {1}
 DocType: Pricing Rule,Pricing Rule,التسعير القاعدة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,الإحراز
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,طلب المادي لأمر الشراء
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,طلب المادي لأمر الشراء
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},لا يوجد عاد هذا البند {1} في {2} {3} الصف # {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,الحسابات المصرفية
 ,Bank Reconciliation Statement,بيان تسوية البنك
 DocType: Address,Lead Name,اسم مبادرة البيع
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,فتح البورصة الميزان
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,فتح البورصة الميزان
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} يجب أن تظهر مرة واحدة فقط
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},لا يسمح للإنتقال أكثر {0} من {1} ضد طلب شراء {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},الأوراق المخصصة بنجاح ل {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},الأوراق المخصصة بنجاح ل {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,لا توجد عناصر لحزمة
 DocType: Shipping Rule Condition,From Value,من القيمة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,تصنيع الكمية إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,تصنيع الكمية إلزامي
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,المبالغ لا ينعكس في البنك
 DocType: Quality Inspection Reading,Reading 4,قراءة 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,مطالبات لحساب الشركة.
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,الاتصال المحمول لا
 DocType: Production Planning Tool,Select Sales Orders,حدد أوامر المبيعات
 ,Material Requests for which Supplier Quotations are not created,طلبات المواد التي الاقتباسات مورد لا يتم إنشاء
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,لتعقب العناصر باستخدام الباركود. سوف تكون قادرة على الدخول في بنود مذكرة التسليم والفاتورة المبيعات عن طريق مسح الباركود من العنصر.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,إجعلها تسليم
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,جعل الاقتباس
 DocType: Dependent Task,Dependent Task,العمل تعتمد
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,محاولة التخطيط لعمليات لX أيام مقدما.
 DocType: HR Settings,Stop Birthday Reminders,توقف عيد ميلاد تذكير
 DocType: SMS Center,Receiver List,استقبال قائمة
 DocType: Payment Tool Detail,Payment Amount,دفع مبلغ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,الكمية المستهلكة
-sites/assets/js/erpnext.min.js +51,{0} View,{0} مشاهدة
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} مشاهدة
 DocType: Salary Structure Deduction,Salary Structure Deduction,هيكل المرتبات / الخصومات
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,انتقائية تلبد الليزر
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,استيراد الناجحة !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تكلفة عناصر صدر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,افتراضي الدائنة حساب
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات الإنترنت عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,الإعداد كاملة
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0} فوترت٪
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,الكمية المحجوزة
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,الكمية المحجوزة
 DocType: Party Account,Party Account,حساب طرف
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,الموارد البشرية
 DocType: Lead,Upper Income,العلوي الدخل
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,تمكين سلة التسوق
 DocType: Employee,Permanent Address,العنوان الدائم
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,البند {0} يجب أن تكون خدمة عنصر .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",السلفة ضد {0} {1} لا يمكن أن يكون أكبر \ من المجموع الكلي {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,الرجاء اختيار رمز العنصر
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),تخفيض خصم لإجازة بدون أجر (LWP)
 DocType: Territory,Territory Manager,مدير إقليم
+DocType: Delivery Note Item,To Warehouse (Optional),إلى مستودع (اختياري)
 DocType: Sales Invoice,Paid Amount (Company Currency),المبلغ المدفوع (شركة العملات)
 DocType: Purchase Invoice,Additional Discount,خصم إضافي
 DocType: Selling Settings,Selling Settings,بيع إعدادات
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,الوزن
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,تعدين
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,الراتنج صب
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء مع نفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية المجموعة العملاء
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,الرجاء اختيار {0} أولا.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,الرجاء اختيار {0} أولا.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},النص {0}
 DocType: Territory,Parent Territory,الأم الأرض
 DocType: Quality Inspection Reading,Reading 2,القراءة 2
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,رقم دفعة
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,السماح عدة أوامر البيع ضد طلب شراء العميل
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,رئيسي
 DocType: DocPerm,Delete,حذف
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,مختلف
-sites/assets/js/desk.min.js +7971,New {0},جديد {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,مختلف
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},جديد {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,لا يمكن إلغاء النظام على توقف . نزع السدادة لإلغاء .
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,لا يمكن إلغاء النظام على توقف . نزع السدادة لإلغاء .
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
 DocType: Employee,Leave Encashed?,ترك صرفها؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصة من الحقل إلزامي
 DocType: Item,Variants,المتغيرات
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,بلد
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,عناوين
 DocType: Communication,Received,تلقى
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,ضد مجلة الدخول {0} ليس لديه أي لا مثيل لها {1} دخول
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ضد مجلة الدخول {0} ليس لديه أي لا مثيل لها {1} دخول
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},تكرار المسلسل لا دخل القطعة ل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,وهناك شرط للحصول على الشحن القاعدة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,لا يسمح البند لأمر الإنتاج.
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,تحية
 DocType: Communication,Rejected,مرفوض
 DocType: Pricing Rule,Brand,علامة تجارية
 DocType: Item,Will also apply for variants,سوف تنطبق أيضا على متغيرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,سلمت ٪
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,حزمة الأصناف في وقت البيع.
 DocType: Sales Order Item,Actual Qty,الكمية الفعلية
 DocType: Sales Invoice Item,References,المراجع
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,قص
 DocType: Item,Has Variants,لديها المتغيرات
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,انقر على 'جعل مبيعات الفاتورة "الزر لإنشاء فاتورة مبيعات جديدة.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,فترة من والفترة مواعيد إلزامية لالمتكررة٪ الصورة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,التعبئة والتغليف ووضع العلامات
 DocType: Monthly Distribution,Name of the Monthly Distribution,اسم التوزيع الشهري
 DocType: Sales Person,Parent Sales Person,الأم المبيعات شخص
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,يرجى تحديد العملة الافتراضية في شركة ماستر وافتراضيات العالمية
 DocType: Dropbox Backup,Dropbox Access Secret,دروببوإكس الدخول السرية
 DocType: Purchase Invoice,Recurring Invoice,فاتورة المتكررة
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,إدارة المشاريع
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,إدارة المشاريع
 DocType: Supplier,Supplier of Goods or Services.,المورد من السلع أو الخدمات.
 DocType: Budget Detail,Fiscal Year,السنة المالية
 DocType: Cost Center,Budget,ميزانية
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,بيع
 DocType: Employee,Salary Information,معلومات الراتب
 DocType: Sales Person,Name and Employee ID,الاسم والرقم الوظيفي
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,بسبب التاريخ لا يمكن أن يكون قبل المشاركة في التسجيل
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,بسبب التاريخ لا يمكن أن يكون قبل المشاركة في التسجيل
 DocType: Website Item Group,Website Item Group,مجموعة الأصناف للموقع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,الرسوم والضرائب
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} إدخالات الدفع لا يمكن أن تتم تصفيته من قبل {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} إدخالات الدفع لا يمكن أن تتم تصفيته من قبل {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,الجدول القطعة لأنه سيظهر في الموقع
 DocType: Purchase Order Item Supplied,Supplied Qty,الموردة الكمية
 DocType: Material Request Item,Material Request Item,طلب المواد الإغلاق
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,شجرة المج
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول
 ,Item-wise Purchase History,البند الحكيم تاريخ الشراء
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,أحمر
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},الرجاء انقر على ' إنشاء الجدول ' لجلب رقم المسلسل أضاف القطعة ل {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},الرجاء انقر على ' إنشاء الجدول ' لجلب رقم المسلسل أضاف القطعة ل {0}
 DocType: Account,Frozen,تجميد
 ,Open Production Orders,أوامر مفتوحة الانتاج
 DocType: Installation Note,Installation Time,تثبيت الزمن
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,اتجاهات الاقتباس
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",لأنه يمكن أن يتم اصدار أمر إنتاج لهذا الصنف، يجب أن يكون الصنف من نوع المخزون .
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",لأنه يمكن أن يتم اصدار أمر إنتاج لهذا الصنف، يجب أن يكون الصنف من نوع المخزون .
 DocType: Shipping Rule Condition,Shipping Amount,الشحن المبلغ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,انضمام
 DocType: Authorization Rule,Above Value,فوق القيمة
 ,Pending Amount,في انتظار المبلغ
 DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,تسليم
+DocType: Purchase Order,Delivered,تسليم
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),إعداد ملقم واردة عن وظائف البريد الإلكتروني معرف . (على سبيل المثال jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,عدد المركبات
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,التاريخ الذي سيتم فاتورة المتكررة وقف
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,توزيع الرسوم
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"حساب {0} يجب أن تكون من النوع ' الأصول الثابتة "" لأن الصنف {1} من ضمن الأصول"
 DocType: HR Settings,HR Settings,إعدادات HR
 apps/frappe/frappe/config/setup.py +130,Printing,طبع
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,حساب المطالبة بانتظار الموافقة. فقط الموافق المصروفات يمكن تحديث الحالة.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,حساب المطالبة بانتظار الموافقة. فقط الموافق المصروفات يمكن تحديث الحالة.
 DocType: Purchase Invoice,Additional Discount Amount,إضافي مقدار الخصم
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,اليوم ( ق ) التي كنت متقدما للحصول على إذن هي عطلة. لا تحتاج إلى تطبيق للحصول على إجازة .
-sites/assets/js/desk.min.js +7805,and,و
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,و
 DocType: Leave Block List Allow,Leave Block List Allow,ترك قائمة الحظر السماح
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,ابر لا يمكن أن تكون فارغة أو الفضاء
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,الرياضة
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,تسعيرة
 DocType: Salary Slip,Total Deduction,مجموع الخصم
 DocType: Quotation,Maintenance User,الصيانة العضو
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,تكلفة تحديث
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,هل أنت متأكد أنك تريد نزع السدادة
 DocType: Employee,Date of Birth,تاريخ الميلاد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,البند {0} تم بالفعل عاد
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** السنة المالية ** يمثل السنة المالية. يتم تعقب كل القيود المحاسبية والمعاملات الرئيسية الأخرى مقابل السنة المالية ** **.
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",تتبع الحملات المبيعات. تتبع يؤدي، الاقتباسات، ترتيب المبيعات الخ من الحملات لقياس العائد على الاستثمار. 
 DocType: Expense Claim,Approver,الموافق
 ,SO Qty,SO الكمية
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",توجد إدخالات الاسهم ضد مستودع {0}، وبالتالي لا يمكنك إعادة تعيين أو تعديل مستودع
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",توجد إدخالات الاسهم ضد مستودع {0}، وبالتالي لا يمكنك إعادة تعيين أو تعديل مستودع
 DocType: Appraisal,Calculate Total Score,حساب النتيجة الإجمالية
 DocType: Supplier Quotation,Manufacturing Manager,مدير التصنيع
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},المسلسل لا {0} هو تحت الضمان لغاية {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ملاحظة تقسيم التوصيل في حزم.
 apps/erpnext/erpnext/hooks.py +84,Shipments,شحنات
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,تراجع صب
+DocType: Purchase Order,To be delivered to customer,ليتم تسليمها إلى العملاء
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,يجب تقديم الوقت سجل الحالة.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,المسلسل لا {0} لا تنتمي إلى أي مستودع
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,إنشاء
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,من العملات
 DocType: DocField,Name,اسم
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},ترتيب المبيعات المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},ترتيب المبيعات المطلوبة القطعة ل {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,المبالغ لم تنعكس في نظام
 DocType: Purchase Invoice Item,Rate (Company Currency),معدل (عملة الشركة)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,آخرون
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,تعيين متوقف
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,لا يمكن العثور على مطابقة البند. الرجاء تحديد قيمة أخرى ل{0}.
 DocType: POS Profile,Taxes and Charges,الضرائب والرسوم
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",منتج أو الخدمة التي يتم شراؤها أو بيعها أو حملها في المخزون.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"لا يمكن تحديد نوع التهمة باسم ' في الصف السابق المبلغ ' أو ' في السابق صف إجمالي "" ل لصف الأول"
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,حدد DOCTYPE
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,التطرق
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,مصرفي
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,الرجاء انقر على ' إنشاء الجدول ' للحصول على الجدول الزمني
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,مركز تكلفة جديدة
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,مركز تكلفة جديدة
 DocType: Bin,Ordered Quantity,أمرت الكمية
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","مثلاً: ""نبني أدوات البنائين"""
 DocType: Quality Inspection,In Process,في عملية
 DocType: Authorization Rule,Itemwise Discount,Itemwise الخصم
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
+DocType: Purchase Order Item,Reference Document Type,مرجع نوع الوثيقة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
 DocType: Account,Fixed Asset,الأصول الثابتة
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,جرد المتسلسلة
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,جرد المتسلسلة
 DocType: Activity Type,Default Billing Rate,افتراضي الفواتير أسعار
 DocType: Time Log Batch,Total Billing Amount,المبلغ الكلي الفواتير
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,حساب المستحق
 ,Stock Balance,الأسهم الرصيد
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,ترتيب مبيعات لدفع
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ترتيب مبيعات لدفع
 DocType: Expense Claim Detail,Expense Claim Detail,حساب المطالبة التفاصيل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,الوقت سجلات خلق:
 DocType: Item,Weight UOM,وحدة قياس الوزن
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,يجب أن يكون الائتمان لحساب حسابات المدفوعات
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM العودية : {0} لا يمكن أن يكون الأم أو الطفل من {2}
 DocType: Production Order Operation,Completed Qty,الكمية الانتهاء
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حسابات الخصم يمكن ربط ضد دخول ائتمان أخرى
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,قائمة الأسعار {0} تم تعطيل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حسابات الخصم يمكن ربط ضد دخول ائتمان أخرى
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,قائمة الأسعار {0} تم تعطيل
 DocType: Manufacturing Settings,Allow Overtime,تسمح العمل الإضافي
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,ترتيب المبيعات {0} توقفت
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} الأرقام التسلسلية اللازمة لالبند {1}. لقد قدمت {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,معدل التقييم الحالي
 DocType: Item,Customer Item Codes,رموز العملاء البند
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,لحام
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,مطلوب اسهم جديدة UOM
 DocType: Quality Inspection,Sample Size,حجم العينة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',الرجاء تحديد صالح 'من القضية رقم'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير-
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير-
 DocType: Project,External,خارجي
 DocType: Features Setup,Item Serial Nos,المسلسل ارقام البند
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,المستخدمين وأذونات
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,معلومات الاتصال والعنوان
 DocType: SMS Log,Sender Name,المرسل اسم
 DocType: Page,Title,لقب
-sites/assets/js/list.min.js +104,Customize,تخصيص
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,تخصيص
 DocType: POS Profile,[Select],[اختر ]
 DocType: SMS Log,Sent To,يرسل الى
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,جعل فاتورة المبيعات
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,نهاية الحياة
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,سفر
 DocType: Leave Block List,Allow Users,السماح للمستخدمين
+DocType: Purchase Order,Customer Mobile No,العميل رقم هاتفك الجوال
 DocType: Sales Invoice,Recurring,تواتري
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,تتبع الدخل والنفقات منفصل عن القطاعات المنتج أو الانقسامات.
 DocType: Rename Tool,Rename Tool,إعادة تسمية أداة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,تحديث التكلفة
 DocType: Item Reorder,Item Reorder,البند إعادة ترتيب
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,نقل المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,نقل المواد
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",تحديد العمليات ، وتكلفة التشغيل وإعطاء عملية فريدة من نوعها لا لل عمليات الخاصة بك.
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,موظف
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,استيراد البريد الإلكتروني من
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,دعوة كمستخدم
 DocType: Features Setup,After Sale Installations,بعد التثبيت بيع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
 DocType: Workstation Working Hour,End Time,نهاية الوقت
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شروط العقد القياسية ل مبيعات أو شراء .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,المجموعة بواسطة قسيمة
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,الشامل البريدية
 DocType: Page,Standard,معيار
 DocType: Rename Tool,File to Rename,ملف إعادة تسمية
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},رقم الطلب من purchse المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,مشاهدة المدفوعات
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,{0} يجب أن يتم إلغاء جدول الصيانة قبل إلغاء هذا الأمر المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,{0} يجب أن يتم إلغاء جدول الصيانة قبل إلغاء هذا الأمر المبيعات
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,حجم
 DocType: Notification Control,Expense Claim Approved,المطالبة حساب المعتمدة
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,الأدوية
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,الحضور إلى تاريخ
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),إعداد ملقم البريد الإلكتروني الوارد لل مبيعات الهوية. (على سبيل المثال sales@example.com )
 DocType: Warranty Claim,Raised By,التي أثارها
 DocType: Payment Tool,Payment Account,حساب الدفع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
-sites/assets/js/list.min.js +23,Draft,مسودة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,مسودة
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,التعويضية
 DocType: Quality Inspection Reading,Accepted,مقبول
 DocType: User,Female,أنثى
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,الشحن تسمية القاعدة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
 DocType: Newsletter,Test,اختبار
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",كما أن هناك معاملات الأوراق المالية الموجودة لهذا البند، \ لا يمكنك تغيير قيم "ليس لديه المسلسل '،' لديه دفعة لا '،' هل البند الأسهم" و "أسلوب التقييم"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,خيارات مجلة الدخول
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير معدل إذا ذكر BOM agianst أي بند
 DocType: Employee,Previous Work Experience,خبرة العمل السابقة
 DocType: Stock Entry,For Quantity,لالكمية
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},يرجى إدخال الكمية المخططة القطعة ل {0} في {1} الصف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} لم يتم تأكيده
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,طلبات البنود.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} لم يتم تأكيده
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,طلبات البنود.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سيتم إنشاء منفصلة أمر الإنتاج لمادة جيدة لكل النهائي.
 DocType: Purchase Invoice,Terms and Conditions1,حيث وConditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,الإعداد الكامل
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,النشرة ال
 DocType: Delivery Note,Transporter Name,نقل اسم
 DocType: Contact,Enter department to which this Contact belongs,أدخل الدائرة التي ينتمي هذا الاتصال
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,إجمالي غائب
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,البند أو مستودع لل صف {0} لا يطابق المواد طلب
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,البند أو مستودع لل صف {0} لا يطابق المواد طلب
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,وحدة القياس
 DocType: Fiscal Year,Year End Date,تاريخ نهاية العام
 DocType: Task Depends On,Task Depends On,المهمة يعتمد على
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ الانتهاء العقد أكبر من تاريخ الالتحاق بالعمل
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,موزع طرف ثالث / تاجر / عمولة الوكيل / التابعة / التجزئة الذي يبيع منتجات شركة من أجل عمولة.
 DocType: Customer Group,Has Child Node,وعقدة الطفل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} مقابل طلب شراء {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} مقابل طلب شراء {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",أدخل المعلمات URL ثابت هنا (مثلا المرسل = ERPNext، اسم المستخدم = ERPNext، كلمة المرور = 1234 الخ)
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} لا في أي سنة مالية نشطة. لمزيد من التفاصيل الاختيار {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,هذا مثال موقع ولدت لصناعة السيارات من ERPNext
@@ -2067,11 +2078,9 @@ DocType: Note,Note,لاحظ
 DocType: Purchase Receipt Item,Recd Quantity,Recd الكمية
 DocType: Email Account,Email Ids,البريد الإلكتروني معرفات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,على النحو تتفتح
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,لم يقدم الاسهم الدخول {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,لم يقدم الاسهم الدخول {0}
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
 DocType: Tax Rule,Billing City,مدينة الفوترة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,هذا التطبيق إجازة بانتظار الموافقة. فقط اترك الموافق يمكن تحديث الحالة.
 DocType: Global Defaults,Hide Currency Symbol,إخفاء رمز العملة
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card",على سبيل المثال البنك، نقدا، بطاقة الائتمان
 DocType: Journal Entry,Credit Note,ملاحظة الائتمان
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),إجمالي (الكم
 DocType: Installation Note Item,Installed Qty,تثبيت الكمية
 DocType: Lead,Fax,فاكس
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,المقدمة
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,المقدمة
 DocType: Salary Structure,Total Earning,إجمالي الدخل
 DocType: Purchase Receipt,Time at which materials were received,الوقت الذي وردت المواد
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,بلدي العناوين
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,فرع الم
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,أو
 DocType: Sales Order,Billing Status,الحالة الفواتير
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,مصاريف فائدة
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 وفوق
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 وفوق
 DocType: Buying Settings,Default Buying Price List,الافتراضي شراء قائمة الأسعار
 ,Download Backups,تحميل النسخ الاحتياطية
 DocType: Notification Control,Sales Order Message,ترتيب المبيعات رسالة
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,حدد الموظفين
 DocType: Bank Reconciliation,To Date,حتى الان
 DocType: Opportunity,Potential Sales Deal,المبيعات المحتملة صفقة
-sites/assets/js/form.min.js +308,Details,تفاصيل
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,تفاصيل
 DocType: Purchase Invoice,Total Taxes and Charges,مجموع الضرائب والرسوم
 DocType: Employee,Emergency Contact,الاتصال في حالات الطوارئ
 DocType: Item,Quality Parameters,معايير الجودة
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,تلقى الكمية
 DocType: Stock Entry Detail,Serial No / Batch,المسلسل لا / دفعة
 DocType: Product Bundle,Parent Item,الأم المدينة
 DocType: Account,Account Type,نوع الحساب
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',لم يتم إنشاء الجدول الصيانة ل كافة العناصر. الرجاء انقر على ' إنشاء الجدول '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',لم يتم إنشاء الجدول الصيانة ل كافة العناصر. الرجاء انقر على ' إنشاء الجدول '
 ,To Produce,لإنتاج
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لصف {0} في {1}. لتشمل {2} في سعر البند، {3} يجب أيضا أن يدرج الصفوف
 DocType: Packing Slip,Identification of the package for the delivery (for print),تحديد حزمة لتسليم (للطباعة)
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,تسطيح
 DocType: Account,Income Account,دخل الحساب
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,صب
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,تسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,تسليم
 DocType: Stock Reconciliation Item,Current Qty,الكمية الحالية
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",انظر "نسبة المواد على أساس" التكلفة في القسم
 DocType: Appraisal Goal,Key Responsibility Area,مفتاح مسؤولية المنطقة
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,جميع العناوين.
 DocType: Company,Stock Settings,إعدادات الأسهم
 DocType: User,Bio,نبذة
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,إدارة مجموعة العملاء شجرة .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,الجديد اسم مركز التكلفة
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,الجديد اسم مركز التكلفة
 DocType: Leave Control Panel,Leave Control Panel,ترك لوحة التحكم
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,لم يتم العثور على قالب العنوان الافتراضي. يرجى إنشاء واحدة جديدة من الإعداد> طباعة والعلامات التجارية> قالب العنوان.
 DocType: Appraisal,HR User,HR العضو
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,دفع أداة التفاصيل
 ,Sales Browser,متصفح المبيعات
 DocType: Journal Entry,Total Credit,إجمالي الائتمان
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد دخول الأسهم {2}: تحذير
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,محلي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد دخول الأسهم {2}: تحذير
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,محلي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),القروض والسلفيات (الأصول )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,المدينين
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,كبير
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,أي موظف موجود!
 DocType: C-Form Invoice Detail,Territory,إقليم
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,يرجى ذكر أي من الزيارات المطلوبة
+DocType: Purchase Order,Customer Address Display,عنوان العميل العرض
 DocType: Stock Settings,Default Valuation Method,أسلوب التقييم الافتراضي
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,تلميع
 DocType: Production Order Operation,Planned Start Time,المخططة بداية
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,تخصيص
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,وثيقة الميزانية العمومية و كتاب الربح أو الخسارة .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",وحدة القياس الافتراضية للالبند {0} لا يمكن أن تتغير بشكل مباشر بسبب \ كنت قد قدمت بالفعل بعض المعاملات (s) مع UOM آخر. لتغيير UOM الافتراضي، \ استخدام "UOM استبدال أداة" أداة تحت وحدة المالية.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,تحديد سعر الصرف لتحويل عملة إلى أخرى
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,اقتباس {0} تم إلغاء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,اقتباس {0} تم إلغاء
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,إجمالي المبلغ المستحق
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} كان الموظف في إجازة في {1} . لا يمكن ان يمثل الحضور.
 DocType: Sales Partner,Targets,أهداف
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,هذه هي مجموعة العملاء الجذرية والتي لا يمكن تحريرها.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,إرضاء الإعداد مخططك من الحسابات قبل البدء مقالات المحاسبة
 DocType: Purchase Invoice,Ignore Pricing Rule,تجاهل التسعير القاعدة
-sites/assets/js/list.min.js +24,Cancelled,إلغاء
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,إلغاء
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,من التسجيل في هيكل الراتب لا يمكن أن يكون أقل من الموظف تاريخ الالتحاق بالعمل.
 DocType: Employee Education,Graduate,تخريج
 DocType: Leave Block List,Block Days,كتلة أيام
 DocType: Journal Entry,Excise Entry,الدخول المكوس
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},تحذير: ترتيب المبيعات {0} موجود بالفعل ضد طلب شراء الزبون {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},تحذير: ترتيب المبيعات {0} موجود بالفعل ضد طلب شراء الزبون {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,الأسهم المتلقى ول
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,إجمالي المبلغ المتأخر الدفع + + المبلغ التحصيل - خصم إجمالي
 DocType: Monthly Distribution,Distribution Name,توزيع الاسم
 DocType: Features Setup,Sales and Purchase,المبيعات والمشتريات
-DocType: Purchase Order Item,Material Request No,طلب مواد لا
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
+DocType: Supplier Quotation Item,Material Request No,طلب مواد لا
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,المعدل الذي يتم تحويل العملة إلى عملة العميل قاعدة الشركة
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} لقد تم إلغاء اشتراكك بنجاح من هذه القائمة.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),صافي معدل (شركة العملات)
-apps/frappe/frappe/templates/base.html +132,Added,وأضاف
+apps/frappe/frappe/templates/base.html +134,Added,وأضاف
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,إدارة شجرة الإقليم.
 DocType: Journal Entry Account,Sales Invoice,فاتورة مبيعات
 DocType: Journal Entry Account,Party Balance,ميزان الحزب
 DocType: Sales Invoice Item,Time Log Batch,الوقت الدفعة دخول
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,الرجاء حدد تطبيق خصم على
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,الرجاء حدد تطبيق خصم على
 DocType: Company,Default Receivable Account,افتراضي المقبوضات حساب
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,خلق دخول بنك الراتب الإجمالي المدفوع للمعايير المحدد أعلاه
 DocType: Stock Entry,Material Transfer for Manufacture,نقل المواد لتصنيع
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,الحصول على مقالا
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,الدخول المحاسبة للسهم
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,السك
 DocType: Sales Invoice,Sales Team1,مبيعات Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,البند {0} غير موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,البند {0} غير موجود
 DocType: Sales Invoice,Customer Address,العنوان العملاء
 apps/frappe/frappe/desk/query_report.py +136,Total,مجموع
 DocType: Purchase Invoice,Apply Additional Discount On,تطبيق خصم إضافي على
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,فحص الجودة
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,اضافية الصغيرة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,رش تشكيل
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : المواد المطلوبة الكمية هي أقل من الحد الأدنى للطلب الكمية
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,حساب {0} مجمد
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,حساب {0} مجمد
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,كيان قانوني / الفرعية مع مخطط مستقل للحسابات تابعة للمنظمة.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",الغذاء و المشروبات و التبغ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL أو BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},ان تجعل دفع فواتير فقط ضد {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,معدل العمولة لا يمكن أن يكون أكبر من 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,الحد الأدنى مستوى المخزون
 DocType: Stock Entry,Subcontract,قام بمقاولة فرعية
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,الرجاء إدخال {0} أولا
 DocType: Production Planning Tool,Get Items From Sales Orders,الحصول على سلع من طلبات البيع
 DocType: Production Order Operation,Actual End Time,الفعلي وقت الانتهاء
 DocType: Production Planning Tool,Download Materials Required,تحميل المواد المطلوبة
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,من المقرر
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",يرجى تحديد عنصر، حيث قال "هل البند الأسهم" هو "لا" و "هل المبيعات البند" هو "نعم" وليس هناك حزمة المنتجات الأخرى
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,تحديد التوزيع الشهري لتوزيع غير متساو أهداف على مدى عدة شهور.
 DocType: Purchase Invoice Item,Valuation Rate,تقييم قيم
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,قائمة أسعار العملات غير محددة
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,قائمة أسعار العملات غير محددة
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"البند صف {0} إيصال الشراء {1} غير موجود في الجدول 'شراء إيصالات ""أعلاه"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},موظف {0} وقد طبقت بالفعل ل {1} {2} بين و {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},موظف {0} وقد طبقت بالفعل ل {1} {2} بين و {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,المشروع تاريخ البدء
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,حتى
 DocType: Rename Tool,Rename Log,إعادة تسمية الدخول
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ويسمح العقد ورقة فقط في المعاملة
 DocType: Expense Claim,Expense Approver,حساب الموافق
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,شراء السلعة استلام الموردة
-sites/assets/js/erpnext.min.js +48,Pay,دفع
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,دفع
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,إلى التاريخ والوقت
 DocType: SMS Settings,SMS Gateway URL,SMS بوابة URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,سجلات للحفاظ على حالة تسليم الرسائل القصيرة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,طحن
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,يتقلص التفاف
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,الأنشطة المعلقة
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,الأنشطة المعلقة
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,مؤكد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,المورد> نوع مورد
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,من فضلك ادخل تاريخ التخفيف .
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,أ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,صحيفة الناشرين
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,تحديد السنة المالية
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,صهر
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"كنت في إجازة الموافق لهذا السجل . يرجى تحديث ""الحالة"" و فروا"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,إعادة ترتيب مستوى
 DocType: Attendance,Attendance Date,تاريخ الحضور
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,تفكك الراتب على أساس الكسب وخصم.
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى مجموعة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,خفض
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),المورد (ق)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,فترة غير صالحة
 DocType: Customer,Credit Limit,الحد الائتماني
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,حدد النوع من المعاملات
 DocType: GL Entry,Voucher No,رقم السند
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,قا
 DocType: Customer,Address and Contact,عنوان والاتصال
 DocType: Customer,Last Day of the Next Month,اليوم الأخير من الشهر المقبل
 DocType: Employee,Feedback,تعليقات
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,صيانة جدول
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,صيانة جدول
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,جلخ الآلات النفاثة
 DocType: Stock Settings,Freeze Stock Entries,تجميد مقالات المالية
 DocType: Website Settings,Website Settings,إعدادات الموقع
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,المنتهية ولايته
 DocType: Material Request,Requested For,طلب لل
 DocType: Quotation Item,Against Doctype,DOCTYPE ضد
 DocType: Delivery Note,Track this Delivery Note against any Project,تتبع هذه ملاحظة التوصيل ضد أي مشروع
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,لا يمكن حذف حساب الجذر
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,لا يمكن حذف حساب الجذر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,مشاهدة سهم مقالات
 ,Is Primary Address,هو العنوان الرئيسي
 DocType: Production Order,Work-in-Progress Warehouse,مستودع العمل قيد التنفيذ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,إدارة العناوين
 DocType: Pricing Rule,Item Code,البند الرمز
 DocType: Production Planning Tool,Create Production Orders,إنشاء أوامر الإنتاج
@@ -2460,14 +2471,14 @@ DocType: Journal Entry,User Remark,ملاحظة المستخدم
 DocType: Lead,Market Segment,سوق القطاع
 DocType: Communication,Phone,هاتف
 DocType: Employee Internal Work History,Employee Internal Work History,التاريخ الموظف العمل الداخلية
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),إغلاق (الدكتور)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),إغلاق (الدكتور)
 DocType: Contact,Passive,سلبي
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,المسلسل لا {0} ليس في الأوراق المالية
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,قالب الضريبية لبيع صفقة.
 DocType: Sales Invoice,Write Off Outstanding Amount,شطب المبلغ المستحق
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",تحقق مما إذا كنت بحاجة الفواتير المتكررة التلقائي. بعد تقديم أي فاتورة المبيعات، وقسم التكراري تكون مرئية.
 DocType: Account,Accounts Manager,مدير حسابات
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',وقت دخول {0} يجب ' نشره '
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',وقت دخول {0} يجب ' نشره '
 DocType: Stock Settings,Default Stock UOM,افتراضي ألبوم UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),تكلف معدل على أساس نوع النشاط (في الساعة)
 DocType: Production Planning Tool,Create Material Requests,إنشاء طلبات المواد
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,تسوية البنك
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,الحصول على التحديثات
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقف
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,إضافة بعض السجلات عينة
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,ترك الإدارة
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,ترك الإدارة
 DocType: Event,Groups,مجموعات
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,مجموعة بواسطة حساب
 DocType: Sales Order,Fully Delivered,سلمت بالكامل
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,مبيعات إضافات
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ميزانية الحساب {1} مقابل مركز التكلفة {2} سيتجاوز التي كتبها {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",يجب أن يكون حساب الفرق حساب نوع الأصول / الخصوم، لأن هذا المخزون المصالحة هو الدخول افتتاح
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,تحمل أوراق واحال
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
 ,Stock Projected Qty,الأسهم المتوقعة الكمية
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},العملاء {0} لا تنتمي لمشروع {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},العملاء {0} لا تنتمي لمشروع {1}
 DocType: Sales Order,Customer's Purchase Order,طلب شراء الزبون
 DocType: Warranty Claim,From Company,من شركة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,القيمة أو الكمية
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,متاجر التجزئة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,يجب أن يكون الائتمان لحساب حساب الميزانية العمومية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,جميع أنواع مزود
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,صيانة جدول السلعة
 DocType: Sales Order,%  Delivered,تم إيصاله٪
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,حساب السحب على المكشوف المصرفي
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,جعل زلة الراتب
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,نزع السدادة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,تصفح BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,القروض المضمونة
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,المنتجات رهيبة
@@ -2523,7 +2532,7 @@ DocType: Appraisal,Appraisal,تقييم
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,صب فقدت رغوة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,رسم
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,ويتكرر التاريخ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},يجب أن تكون واحدة من ترك الموافق {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},يجب أن تكون واحدة من ترك الموافق {0}
 DocType: Hub Settings,Seller Email,البائع البريد الإلكتروني
 DocType: Project,Total Purchase Cost (via Purchase Invoice),مجموع تكلفة الشراء (عن طريق شراء الفاتورة)
 DocType: Workstation Working Hour,Start Time,بداية
@@ -2537,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),صافي المبلغ (شركة العملات)
 DocType: BOM Operation,Hour Rate,ساعة قيم
 DocType: Stock Settings,Item Naming By,البند تسمية بواسطة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,من اقتباس
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},دخول أخرى الفترة الإنتهاء {0} أحرز بعد {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,من اقتباس
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},دخول أخرى الفترة الإنتهاء {0} أحرز بعد {1}
 DocType: Production Order,Material Transferred for Manufacturing,المواد المنقولة لغرض التصنيع
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,حساب {0} لا يوجد
 DocType: Purchase Receipt Item,Purchase Order Item No,شراء السلعة طلب No
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,التفتيش المطلوبة
 DocType: Purchase Invoice Item,PR Detail,PR التفاصيل
 DocType: Sales Order,Fully Billed,وصفت تماما
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,نقد في الصندوق
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},مستودع تسليم المطلوب للبند الأوراق المالية {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},مستودع تسليم المطلوب للبند الأوراق المالية {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),الوزن الكلي للحزمة. الوزن الصافي عادة + تغليف المواد الوزن. (للطباعة)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,يسمح للمستخدمين مع هذا الدور لضبط الحسابات المجمدة و إنشاء / تعديل القيود المحاسبية على حسابات مجمدة
 DocType: Serial No,Is Cancelled,وألغي
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,بلدي الشحنات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,بلدي الشحنات
 DocType: Journal Entry,Bill Date,تاريخ الفاتورة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتى لو كانت هناك قوانين التسعير متعددة مع الأولوية القصوى، يتم تطبيق الأولويات الداخلية ثم التالية:
 DocType: Supplier,Supplier Details,تفاصيل المورد
@@ -2568,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,حوالة مصرفية
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,الرجاء اختيار حساب البنك
 DocType: Newsletter,Create and Send Newsletters,إنشاء وإرسال النشرات الإخبارية
-sites/assets/js/report.min.js +107,From Date must be before To Date,يجب أن تكون من تاريخ إلى تاريخ قبل
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,يجب أن تكون من تاريخ إلى تاريخ قبل
 DocType: Sales Order,Recurring Order,ترتيب متكرر
 DocType: Company,Default Income Account,الافتراضي الدخل حساب
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,المجموعة العملاء / الزبائن
@@ -2583,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,الأسهم UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
 ,Projected,المتوقع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},المسلسل لا {0} لا ينتمي إلى مستودع {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة : سوف النظام لا تحقق الإفراط التسليم و الإفراط في حجز القطعة ل {0} حيث الكمية أو المبلغ 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة : سوف النظام لا تحقق الإفراط التسليم و الإفراط في حجز القطعة ل {0} حيث الكمية أو المبلغ 0
 DocType: Notification Control,Quotation Message,رسالة التسعيرة
 DocType: Issue,Opening Date,تاريخ الفتح
 DocType: Journal Entry,Remark,كلام
 DocType: Purchase Receipt Item,Rate and Amount,معدل والمبلغ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ممل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,من طلب مبيعات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,من طلب مبيعات
 DocType: Blog Category,Parent Website Route,الوالد موقع الطريق
 DocType: Sales Order,Not Billed,لا صفت
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,كلا مستودع يجب أن تنتمي إلى نفس الشركة
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,وأضافت أي اتصالات حتى الان.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,وأضافت أي اتصالات حتى الان.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,غير نشطة
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,ضد الفاتورة تاريخ النشر
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,التكلفة هبطت قيمة قسيمة
 DocType: Time Log,Batched for Billing,دفعات عن الفواتير
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,رفعت فواتير من قبل الموردين.
 DocType: POS Profile,Write Off Account,شطب حساب
-sites/assets/js/erpnext.min.js +26,Discount Amount,خصم المبلغ
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,خصم المبلغ
 DocType: Purchase Invoice,Return Against Purchase Invoice,العودة ضد شراء فاتورة
 DocType: Item,Warranty Period (in days),فترة الضمان (بالأيام)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,على سبيل المثال ضريبة
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,البند 4
 DocType: Journal Entry Account,Journal Entry Account,حساب إدخال دفتر اليومية
 DocType: Shopping Cart Settings,Quotation Series,اقتباس السلسلة
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,الغاز المعدن الساخن تشكيل
 DocType: Sales Order Item,Sales Order Date,مبيعات الترتيب التاريخ
 DocType: Sales Invoice Item,Delivered Qty,تسليم الكمية
@@ -2639,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,العملاء أو الموردين بيانات
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,مجموعة
 DocType: Lead,Lead Owner,مسئول مبادرة البيع
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,مطلوب مستودع
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,مطلوب مستودع
 DocType: Employee,Marital Status,الحالة الإجتماعية
 DocType: Stock Settings,Auto Material Request,السيارات مادة طلب
 DocType: Time Log,Will be updated when billed.,سيتم تحديث عندما توصف.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,تتوفر الكمية دفعة من مستودع في
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM BOM الحالية و الجديدة لا يمكن أن يكون نفس
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,تاريخ التقاعد يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
 DocType: Sales Invoice,Against Income Account,ضد حساب الدخل
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,تحديث الأسهم
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,سوف UOM مختلفة لعناصر تؤدي إلى غير صحيحة ( مجموع ) صافي قيمة الوزن . تأكد من أن الوزن الصافي من كل عنصر في نفس UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM أسعار
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,يرجى سحب العناصر من التسليم ملاحظة
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,يرجى سحب العناصر من التسليم ملاحظة
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,مجلة مقالات {0} هي الامم المتحدة ومرتبطة
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",سجل جميع الاتصالات من نوع البريد الإلكتروني، الهاتف، والدردشة، والزيارة، الخ
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,يرجى ذكر جولة معطلة مركز التكلفة في الشركة
 DocType: Purchase Invoice,Terms,حيث
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,خلق جديد
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,خلق جديد
 DocType: Buying Settings,Purchase Order Required,أمر الشراء المطلوبة
 ,Item-wise Sales History,البند الحكيم تاريخ المبيعات
 DocType: Expense Claim,Total Sanctioned Amount,المبلغ الكلي للعقوبات
@@ -2681,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,زلة الراتب خصم
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,ملاحظات
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,حدد عقدة المجموعة أولا.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},يجب أن يكون هدف واحد من {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,تعبئة النموذج وحفظه
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,تعبئة النموذج وحفظه
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,تحميل تقريرا يتضمن جميع المواد الخام مع وضعهم أحدث المخزون
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,مواجهة
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,منتديات
 DocType: Leave Application,Leave Balance Before Application,ترك الرصيد قبل تطبيق
 DocType: SMS Center,Send SMS,إرسال SMS
 DocType: Company,Default Letter Head,افتراضي رسالة رئيس
 DocType: Time Log,Billable,فوترة
 DocType: Authorization Rule,This will be used for setting rule in HR module,وسوف تستخدم هذه القاعدة لإعداد وحدة في HR
 DocType: Account,Rate at which this tax is applied,المعدل الذي يتم تطبيق هذه الضريبة
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,إعادة ترتيب الكميه
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,إعادة ترتيب الكميه
 DocType: Company,Stock Adjustment Account,حساب تسوية الأوراق المالية
 DocType: Journal Entry,Write Off,لا تصلح
 DocType: Time Log,Operation ID,عملية ID
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",وسوف تكون متاحة الخصم الحقول في أمر الشراء، وتلقي الشراء، فاتورة الشراء
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,اسم الحساب الجديد. ملاحظة: الرجاء عدم إنشاء حسابات للعملاء والموردين
 DocType: Report,Report Type,نوع التقرير
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,تحميل
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,تحميل
 DocType: BOM Replace Tool,BOM Replace Tool,BOM استبدال أداة
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,قوالب بلد الحكمة العنوان الافتراضي
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},المقرر / المرجع تاريخ لا يمكن أن يكون بعد {0}
+DocType: Sales Order Item,Supplier delivers to Customer,المورد يسلم للعميل
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,مشاهدة الضرائب تفكك
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},المقرر / المرجع تاريخ لا يمكن أن يكون بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,استيراد وتصدير البيانات
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',إذا كنت تنطوي في نشاط الصناعات التحويلية . تمكن السلعة ' يتم تصنيعها '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,الفاتورة تاريخ النشر
 DocType: Sales Invoice,Rounded Total,تقريب إجمالي
 DocType: Product Bundle,List items that form the package.,عناصر القائمة التي تشكل الحزمة.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,يجب أن تكون نسبة تخصيص تساوي 100 ٪
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال للمستخدم الذين لديهم مدير المبيعات ماستر {0} دور
 DocType: Company,Default Cash Account,الحساب النقدي الافتراضي
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,شركة (وليس العميل أو المورد) الرئيسي.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"يرجى إدخال "" التاريخ المتوقع تسليم '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"يرجى إدخال "" التاريخ المتوقع تسليم '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة للصنف {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},ملاحظة : ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
@@ -2740,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","صف {0}: الكمية لا أفالابل في مستودع {1} على {2} {3}.
  المتاحة الكمية: {4}، نقل الكمية: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,البند 3
+DocType: Purchase Order,Customer Contact Email,العملاء الاتصال البريد الإلكتروني
 DocType: Event,Sunday,الأحد
 DocType: Sales Team,Contribution (%),مساهمة (٪)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,المسؤوليات
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,ال
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ال
 DocType: Sales Person,Sales Person Name,مبيعات الشخص اسم
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,الرجاء إدخال الاقل فاتورة 1 في الجدول
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,إضافة مستخدمين
@@ -2753,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),تاريخ بدء الفعلي (
 DocType: Stock Reconciliation Item,Before reconciliation,قبل المصالحة
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},إلى {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),الضرائب والرسوم المضافة (عملة الشركة)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
 DocType: Sales Order,Partly Billed,وصفت جزئيا
 DocType: Item,Default BOM,الافتراضي BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2761,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,إجمالي المعلقة آمت
 DocType: Time Log Batch,Total Hours,مجموع ساعات
 DocType: Journal Entry,Printing Settings,إعدادات الطباعة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,السيارات
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},يترك لنوع {0} خصصت بالفعل لل موظف {1} للسنة المالية {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,مطلوب البند
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,المعادن حقن صب
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,من التسليم ملاحظة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,من التسليم ملاحظة
 DocType: Time Log,From Time,من وقت
 DocType: Notification Control,Custom Message,رسالة مخصصة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,الخدمات المصرفية الاستثمارية
@@ -2782,10 +2795,10 @@ DocType: Newsletter,A Lead with this email id should exist,وينبغي أن ي
 DocType: Stock Entry,From BOM,من BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,الأساسية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,يتم تجميد المعاملات الاسهم قبل {0}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',الرجاء انقر على ' إنشاء الجدول '
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,إلى التسجيل يجب أن يكون نفس التاريخ من ل إجازة نصف يوم
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',الرجاء انقر على ' إنشاء الجدول '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,إلى التسجيل يجب أن يكون نفس التاريخ من ل إجازة نصف يوم
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",على سبيل المثال كجم، وحدة، غ م أ، م
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,المرجعية لا إلزامي إذا كنت دخلت التاريخ المرجعي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,المرجعية لا إلزامي إذا كنت دخلت التاريخ المرجعي
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,يجب أن يكون تاريخ الالتحاق بالعمل أكبر من تاريخ الميلاد
 DocType: Salary Structure,Salary Structure,هيكل المرتبات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,7 +2806,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  الصراع عن طريق تعيين الأولوية. قواعد السعر: {0}"
 DocType: Account,Bank,مصرف
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,شركة الطيران
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,قضية المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,قضية المواد
 DocType: Material Request Item,For Warehouse,لمستودع
 DocType: Employee,Offer Date,عرض التسجيل
 DocType: Hub Settings,Access Token,رمز وصول
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,يفتح من الساعة
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,من و إلى مواعيد
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية و البورصات السلعية
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
+DocType: Delivery Note Item,From Warehouse,من مستودع
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,حفر
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ضربة صب
 DocType: Purchase Taxes and Charges,Valuation and Total,التقييم وتوتال
@@ -2837,11 +2851,12 @@ DocType: C-Form,Amended From,عدل من
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,المواد الخام
 DocType: Leave Application,Follow via Email,متابعة عبر البريد الإلكتروني
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,المبلغ الضريبي بعد الخصم المبلغ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,موجود حساب الطفل لهذا الحساب . لا يمكنك حذف هذا الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,موجود حساب الطفل لهذا الحساب . لا يمكنك حذف هذا الحساب.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,إما الكمية المستهدفة أو المبلغ المستهدف إلزامي
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,يرجى تحديد تاريخ النشر لأول مرة
-DocType: Leave Allocation,Carry Forward,المضي قدما
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,يرجى تحديد تاريخ النشر لأول مرة
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,يجب فتح التسجيل يكون قبل تاريخ الإنتهاء
+DocType: Leave Control Panel,Carry Forward,المضي قدما
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى دفتر الأستاذ
 DocType: Department,Days for which Holidays are blocked for this department.,يتم حظر أيام الأعياد التي لهذا القسم.
 ,Produced,أنتجت
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),إجمالي (آمت)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,الترفيه وترفيهية
 DocType: Purchase Order,The date on which recurring order will be stop,التاريخ الذي سيتم تتوقف أجل متكرر
 DocType: Quality Inspection,Item Serial No,البند رقم المسلسل
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} يجب تخفيض كتبها {1} أو يجب زيادة الفائض التسامح
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} يجب تخفيض كتبها {1} أو يجب زيادة الفائض التسامح
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,إجمالي الحاضر
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ساعة
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","متسلسلة البند {0} لا يمكن تحديث \
  باستخدام الأسهم المصالحة"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,نقل المواد إلى المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,نقل المواد إلى المورد
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد لا يمكن أن يكون المستودع. يجب تعيين مستودع من قبل دخول الأسهم أو شراء الإيصال
 DocType: Lead,Lead Type,نوع مبادرة البيع
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,إنشاء اقتباس
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},يمكن أن يكون وافق عليها {0}
 DocType: Shipping Rule,Shipping Rule Conditions,الشحن شروط القاعدة
 DocType: BOM Replace Tool,The new BOM after replacement,وBOM الجديدة بعد استبدال
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,نموذج C-
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID العملية لم تحدد
 DocType: Production Order,Planned Start Date,المخطط لها تاريخ بدء
 DocType: Serial No,Creation Document Type,نوع الوثيقة إنشاء
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,صيانة زيارة
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,صيانة زيارة
 DocType: Leave Type,Is Encash,هو يحققوا ربحا
 DocType: Purchase Invoice,Mobile No,رقم الجوال
 DocType: Payment Tool,Make Journal Entry,جعل إدخال دفتر اليومية
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,الجديد يترك المخص
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,بيانات المشروع من الحكمة ليست متاحة لل اقتباس
 DocType: Project,Expected End Date,تاريخ الإنتهاء المتوقع
 DocType: Appraisal Template,Appraisal Template Title,تقييم قالب عنوان
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,تجاري
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,تجاري
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,الأم البند {0} لا يجب أن يكون البند الأسهم
 DocType: Cost Center,Distribution Id,توزيع رقم
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات رهيبة
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},يجب أن تكون قيمة للسمة {0} ضمن مجموعة من {1} إلى {2} في الزيادات من {3}
 DocType: Tax Rule,Sales,مبيعات
 DocType: Stock Entry Detail,Basic Amount,المبلغ الأساسي
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,كر
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
+DocType: Leave Allocation,Unused leaves,الأوراق غير المستخدمة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,كر
 DocType: Customer,Default Receivable Accounts,افتراضي حسابات المقبوضات
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,نشر
 DocType: Tax Rule,Billing State,الدولة الفواتير
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,الترقق
 DocType: Item Reorder,Transfer,نقل
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
 DocType: Authorization Rule,Applicable To (Employee),تنطبق على (موظف)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,يرجع تاريخ إلزامي
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,الاضافة للسمة {0} لا يمكن أن يكون 0
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,بيع بالتجزئة
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,العملاء {0} غير موجود
 DocType: Attendance,Absent,غائب
 DocType: Product Bundle,Product Bundle,حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,الساحق
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,شراء قالب الضرائب والرسوم
 DocType: Upload Attendance,Download Template,تحميل قالب
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,تصريحات
 DocType: Purchase Order Item Supplied,Raw Material Item Code,قانون المواد الخام المدينة
 DocType: Journal Entry,Write Off Based On,شطب بناء على
 DocType: Features Setup,POS View,عرض نقطة مبيعات
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,سجل لتثبيت الرقم التسلسلي
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,سجل لتثبيت الرقم التسلسلي
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,الصب المستمر
-sites/assets/js/erpnext.min.js +10,Please specify a,الرجاء تحديد
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,الرجاء تحديد
 DocType: Offer Letter,Awaiting Response,في انتظار الرد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,فوق
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,التحجيم البارد
 DocType: Salary Slip,Earning & Deduction,وكسب الخصم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,حساب {0} لا يمكن أن يكون مجموعة
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,منطقة
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,لا يسمح السلبية قيم التقييم
 DocType: Holiday List,Weekly Off,العطلة الأسبوعية
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",ل، 2012 على سبيل المثال 2012-13
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,منتفخ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,التبخر نمط الصب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,مصاريف الترفيه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,فاتورة المبيعات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,عمر
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,فاتورة المبيعات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,عمر
 DocType: Time Log,Billing Amount,قيمة الفواتير
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,كمية غير صالحة المحدد لمادة {0} . يجب أن تكون كمية أكبر من 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,طلبات الحصول على إجازة.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,حساب مع الصفقة الحالية لا يمكن حذف
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,حساب مع الصفقة الحالية لا يمكن حذف
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,المصاريف القانونية
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",في يوم من الشهر الذي سيتم إنشاء ترتيب السيارات سبيل المثال 05، 28 الخ
 DocType: Sales Invoice,Posting Time,نشر التوقيت
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,شعار
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,التحقق من ذلك إذا كنت تريد لإجبار المستخدم لتحديد سلسلة قبل الحفظ. لن يكون هناك الافتراضي إذا قمت بتحديد هذا.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,الإخطارات المفتوحة
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,الإخطارات المفتوحة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,المصاريف المباشرة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,هل تريد حقا أن نزع السدادة هذا طلب المواد ؟
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,جديد إيرادات العملاء
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,مصاريف السفر
 DocType: Maintenance Visit,Breakdown,انهيار
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,كما في تاريخ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,جلخ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,امتحان
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,مستودع الافتراضي هو إلزامي بالنسبة لمخزون السلعة .
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,مستودع الافتراضي هو إلزامي بالنسبة لمخزون السلعة .
 DocType: Feed,Full Name,الاسم الكامل
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,حسمه
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},دفع المرتبات لشهر {0} و السنة {1}
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,إضافة صف
 DocType: Buying Settings,Default Supplier Type,الافتراضي مزود نوع
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,المحاجر
 DocType: Production Order,Total Operating Cost,إجمالي تكاليف التشغيل
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,ملاحظة : البند {0} دخلت عدة مرات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,ملاحظة : البند {0} دخلت عدة مرات
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,جميع جهات الاتصال.
 DocType: Newsletter,Test Email Id,اختبار البريد الإلكتروني معرف
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,اختصار الشركة
@@ -3101,11 +3117,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,اقت
 DocType: Stock Settings,Role Allowed to edit frozen stock,دور الأليفة لتحرير الأسهم المجمدة
 ,Territory Target Variance Item Group-Wise,الأراضي المستهدفة الفرق البند المجموعة الحكيم
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,جميع المجموعات العملاء
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لا يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لا يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,قالب الضرائب إلزامي.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,حساب {0}: حساب الرئيسي {1} غير موجود
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قائمة الأسعار معدل (عملة الشركة)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} الحالة هو ' توقف '
 DocType: Account,Temporary,مؤقت
 DocType: Address,Preferred Billing Address,يفضل عنوان الفواتير
 DocType: Monthly Distribution Percentage,Percentage Allocation,نسبة توزيع
@@ -3123,13 +3138,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,الحكيم البند
 DocType: Purchase Order Item,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,الكي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} لم يتوقف
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} لم يتوقف
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
 DocType: Lead,Add to calendar on this date,إضافة إلى التقويم في هذا التاريخ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,الأحداث القادمة
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,الأحداث القادمة
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,مطلوب العملاء
 DocType: Letter Head,Letter Head,رسالة رئيس
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,دخول سريع
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} غير إلزامية من أجل العودة
 DocType: Purchase Order,To Receive,تلقي
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,يتقلص المناسب
@@ -3153,25 +3169,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
 DocType: Serial No,Out of Warranty,لا تغطيه الضمان
 DocType: BOM Replace Tool,Replace,استبدل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,الرجاء إدخال حدة القياس الافتراضية
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,الرجاء إدخال حدة القياس الافتراضية
 DocType: Purchase Invoice Item,Project Name,اسم المشروع
 DocType: Supplier,Mention if non-standard receivable account,أذكر إذا غير القياسية حساب المستحق
 DocType: Workflow State,Edit,تحرير
 DocType: Journal Entry Account,If Income or Expense,إذا دخل أو مصروف
 DocType: Features Setup,Item Batch Nos,ارقام البند دفعة
 DocType: Stock Ledger Entry,Stock Value Difference,قيمة الأسهم الفرق
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,الموارد البشرية
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,الموارد البشرية
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,دفع المصالحة الدفع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,الأصول الضريبية
 DocType: BOM Item,BOM No,لا BOM
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,إدخال دفتر اليومية {0} ليس لديه حساب {1} أو بالفعل يقابل ضد قسيمة أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,إدخال دفتر اليومية {0} ليس لديه حساب {1} أو بالفعل يقابل ضد قسيمة أخرى
 DocType: Item,Moving Average,المتوسط ​​المتحرك
 DocType: BOM Replace Tool,The BOM which will be replaced,وBOM التي سيتم استبدالها
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,يجب أن تكون جديدة اسهم UOM مختلفة من UOM الأسهم الحالية
 DocType: Account,Debit,مدين
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,يجب تخصيص الأوراق في مضاعفات 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,يجب تخصيص الأوراق في مضاعفات 0.5
 DocType: Production Order,Operation Cost,التكلفة العملية
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,تحميل الحضور من ملف CSV.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,آمت المتميز
@@ -3179,7 +3195,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,تحد
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",لتعيين هذه المشكلة، استخدم "تعيين" الموجود في الشريط الجانبي.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],تجميد الأرصدة أقدم من [ أيام]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",إذا تم العثور على أساس دولتين أو أكثر من قواعد التسعير على الشروط المذكورة أعلاه، يتم تطبيق الأولوية. الأولوية هو رقم بين 0-20 في حين القيمة الافتراضية هي صفر (فارغة). عدد العالي يعني ان الامر سيستغرق الأسبقية إذا كانت هناك قواعد التسعير متعددة مع نفس الظروف.
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,ضد الفاتورة
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,السنة المالية: {0} لا موجود
 DocType: Currency Exchange,To Currency,إلى العملات
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,تسمح للمستخدمين التالية للموافقة على طلبات الحصول على إجازة أيام بلوك.
@@ -3208,7 +3223,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),مع
 DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,تاريخ نهاية السنة المالية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن تصفية استنادا قسيمة لا، إذا تم تجميعها حسب قسيمة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,جعل مورد اقتباس
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,جعل مورد اقتباس
 DocType: Quality Inspection,Incoming,الوارد
 DocType: BOM,Materials Required (Exploded),المواد المطلوبة (انفجرت)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),خفض عائد لإجازة بدون أجر (LWP)
@@ -3216,10 +3231,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: المسلسل لا {1} لا يتطابق مع {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,عارضة اترك
 DocType: Batch,Batch ID,دفعة ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},ملاحظة : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},ملاحظة : {0}
 ,Delivery Note Trends,ملاحظة اتجاهات التسليم
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ملخص هذا الأسبوع
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} يجب أن يكون الصنف مشترى أو متعاقد من الباطن في الصف {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} يجب أن يكون الصنف مشترى أو متعاقد من الباطن في الصف {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,الحساب: {0} لا يمكن إلا أن يتم تحديثه عن طريق المعاملات المالية
 DocType: GL Entry,Party,الطرف
 DocType: Sales Order,Delivery Date,تاريخ التسليم
@@ -3232,7 +3247,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,متوسط. سعر شراء
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
 DocType: Employee,History In Company,وفي تاريخ الشركة
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,النشرات الإخبارية
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,النشرات الإخبارية
 DocType: Address,Shipping,الشحن
 DocType: Stock Ledger Entry,Stock Ledger Entry,الأسهم ليدجر الدخول
 DocType: Department,Leave Block List,ترك قائمة الحظر
@@ -3251,7 +3266,7 @@ DocType: Account,Auditor,مدقق حسابات
 DocType: Purchase Order,End date of current order's period,تاريخ انتهاء الفترة لكي الحالي
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,تقديم عرض رسالة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,عودة
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,يجب أن تكون وحدة القياس الافتراضية للخيار نفس قالب
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,يجب أن تكون وحدة القياس الافتراضية للخيار نفس قالب
 DocType: DocField,Fold,طية
 DocType: Production Order Operation,Production Order Operation,أمر الإنتاج عملية
 DocType: Pricing Rule,Disable,تعطيل
@@ -3283,7 +3298,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,تقارير إلى
 DocType: SMS Settings,Enter url parameter for receiver nos,أدخل عنوان URL لمعلمة NOS استقبال
 DocType: Sales Invoice,Paid Amount,المبلغ المدفوع
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',إغلاق الحساب {0} يجب أن تكون من النوع ' المسؤولية '
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',إغلاق الحساب {0} يجب أن تكون من النوع ' المسؤولية '
 ,Available Stock for Packing Items,المخزون المتاج للأصناف المعبأة
 DocType: Item Variant,Item Variant,البديل البند
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
@@ -3291,7 +3306,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,إدارة الجودة
 DocType: Production Planning Tool,Filter based on customer,تصفية على أساس العملاء
 DocType: Payment Tool Detail,Against Voucher No,ضد قسيمة لا
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},الرجاء إدخال كمية القطعة ل {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},الرجاء إدخال كمية القطعة ل {0}
 DocType: Employee External Work History,Employee External Work History,التاريخ الموظف العمل الخارجي
 DocType: Tax Rule,Purchase,شراء
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,التوازن الكمية
@@ -3328,28 +3343,29 @@ Note: BOM = Bill of Materials",مجموعة الإجمالية للعناصر **
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},لا المسلسل إلزامي القطعة ل {0}
 DocType: Item Variant Attribute,Attribute,سمة
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,يرجى تحديد من / أن يتراوح
-sites/assets/js/desk.min.js +7652,Created By,التي أنشأتها
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,التي أنشأتها
 DocType: Serial No,Under AMC,تحت AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,يتم حساب معدل تقييم البند النظر هبطت تكلفة مبلغ قسيمة
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,الإعدادات الافتراضية لبيع صفقة.
 DocType: BOM Replace Tool,Current BOM,BOM الحالي
-sites/assets/js/erpnext.min.js +8,Add Serial No,إضافة رقم تسلسلي
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,إضافة رقم تسلسلي
 DocType: Production Order,Warehouses,المستودعات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,طباعة و قرطاسية
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,عقدة المجموعة
 DocType: Payment Reconciliation,Minimum Amount,الحد الأدنى المبلغ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,تحديث السلع منتهية
 DocType: Workstation,per hour,كل ساعة
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},الترقيم المتسلسل {0} مستخدم بالفعل في {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},الترقيم المتسلسل {0} مستخدم بالفعل في {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,سيتم إنشاء حساب المستودع ( الجرد الدائم ) في إطار هذا الحساب.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
 DocType: Company,Distribution,التوزيع
-sites/assets/js/erpnext.min.js +50,Amount Paid,المبلغ المدفوع
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,المبلغ المدفوع
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,مدير المشروع
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,إيفاد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ماكس الخصم المسموح به لمادة: {0} {1}٪
 DocType: Customer,Default Taxes and Charges,الضرائب والرسوم الافتراضية
 DocType: Account,Receivable,القبض
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,الصف # {0}: غير مسموح لتغيير مورد السلعة كما طلب شراء موجود بالفعل
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,الدور الذي يسمح بتقديم المعاملات التي تتجاوز حدود الائتمان تعيين.
 DocType: Sales Invoice,Supplier Reference,مرجع المورد
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",إذا كانت محددة، سينظر BOM لبنود فرعية الجمعية للحصول على المواد الخام. خلاف ذلك، سيتم معاملة جميع البنود الفرعية الجمعية كمادة خام.
@@ -3386,8 +3402,8 @@ DocType: Email Digest,Add/Remove Recipients,إضافة / إزالة المستل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},الصفقة لا يسمح ضد توقفت أمر الإنتاج {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","لتعيين هذه السنة المالية كما الافتراضي، انقر على ' تعيين كافتراضي """
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),إعداد ملقم واردة ل دعم البريد الإلكتروني معرف . (على سبيل المثال support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,نقص الكمية
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
 DocType: Salary Slip,Salary Slip,إيصال الراتب
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,الصقل
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' إلى تاريخ ' مطلوب
@@ -3400,6 +3416,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",عند "المقدمة" أي من المعاملات تم، بريد الكتروني المنبثقة تلقائيا فتح لإرسال بريد الكتروني الى "الاتصال" المرتبطة في تلك المعاملة، مع الصفقة كمرفق. يجوز للمستخدم أو قد لا إرسال البريد الإلكتروني.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,إعدادات العالمية
 DocType: Employee Education,Employee Education,موظف التعليم
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,هناك حاجة لجلب البند التفاصيل.
 DocType: Salary Slip,Net Pay,صافي الراتب
 DocType: Account,Account,حساب
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,المسلسل لا {0} وقد وردت بالفعل
@@ -3432,7 +3449,7 @@ DocType: BOM,Manufacturing User,التصنيع العضو
 DocType: Purchase Order,Raw Materials Supplied,المواد الخام الموردة
 DocType: Purchase Invoice,Recurring Print Format,تنسيق طباعة متكرر
 DocType: Communication,Series,سلسلة ترقيم الوثيقة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ طلب شراء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ طلب شراء
 DocType: Appraisal,Appraisal Template,تقييم قالب
 DocType: Communication,Email,البريد الإلكتروني
 DocType: Item Group,Item Classification,تصنيف البند
@@ -3488,6 +3505,7 @@ DocType: HR Settings,Payroll Settings,إعدادات الرواتب
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,غير مطابقة الفواتير والمدفوعات المرتبطة.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,طلب مكان
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,الجذر لا يمكن أن يكون مركز تكلفة الأصل
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,اختر الماركة ...
 DocType: Sales Invoice,C-Form Applicable,C-نموذج قابل للتطبيق
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},عملية الوقت يجب أن تكون أكبر من 0 لعملية {0}
 DocType: Supplier,Address and Contacts,عنوان واتصالات
@@ -3498,7 +3516,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,الحصول على قسائم المعلقة
 DocType: Warranty Claim,Resolved By,حلها عن طريق
 DocType: Appraisal,Start Date,تاريخ البدء
-sites/assets/js/desk.min.js +7629,Value,قيمة
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,قيمة
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,تخصيص يترك لفترة .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,انقر هنا للتحقق من
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,حساب {0}: لا يمكنك تعيين نفسه كحساب الأم
@@ -3514,14 +3532,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,دروببوإكس الدخول الأليفة
 DocType: Dropbox Backup,Weekly,الأسبوعية
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,على سبيل المثال. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,تسلم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,تسلم
 DocType: Maintenance Visit,Fully Completed,يكتمل
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مكتمل
 DocType: Employee,Educational Qualification,المؤهلات العلمية
 DocType: Workstation,Operating Costs,تكاليف التشغيل
 DocType: Employee Leave Approver,Employee Leave Approver,الموظف إجازة الموافق
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} تمت إضافة بنجاح إلى قائمة النشرة الإخبارية لدينا.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,الإلكترون شعاع بالقطع
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,مدير ماستر شراء
@@ -3534,7 +3552,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,إضافة / تحرير الأسعار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,بيانيا من مراكز التكلفة
 ,Requested Items To Be Ordered,البنود المطلوبة إلى أن يؤمر
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,بلدي أوامر
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,بلدي أوامر
 DocType: Price List,Price List Name,قائمة الأسعار اسم
 DocType: Time Log,For Manufacturing,لصناعة
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,المجاميع
@@ -3545,7 +3563,7 @@ DocType: Account,Income,دخل
 DocType: Industry Type,Industry Type,صناعة نوع
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,حدث خطأ!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,يحتوي التطبيق اترك التواريخ الكتلة التالية: تحذير
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,{0} سبق أن قدمت فاتورة المبيعات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,{0} سبق أن قدمت فاتورة المبيعات
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,تاريخ الانتهاء
 DocType: Purchase Invoice Item,Amount (Company Currency),المبلغ (عملة الشركة)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,يموت الصب
@@ -3559,10 +3577,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,عام
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,نقطة من بيع الشخصي
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,يرجى تحديث إعدادات SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,الوقت سجل {0} صفت بالفعل
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,الوقت سجل {0} صفت بالفعل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,القروض غير المضمونة
 DocType: Cost Center,Cost Center Name,اسم مركز تكلفة
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,البند {0} مع المسلسل لا {1} مثبت مسبقا
 DocType: Maintenance Schedule Detail,Scheduled Date,المقرر تاريخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,مجموع المبالغ المدفوعة آمت
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,سيتم انقسم رسالة أكبر من 160 حرف في mesage متعددة
@@ -3570,10 +3587,10 @@ DocType: Purchase Receipt Item,Received and Accepted,تلقت ومقبول
 ,Serial No Service Contract Expiry,مسلسل العقد لا انتهاء الاشتراك خدمة
 DocType: Item,Unit of Measure Conversion,وحدة القياس التحويل
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,لا يمكن تغيير موظف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
 DocType: Naming Series,Help HTML,مساعدة HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},اتاحة لأكثر من {0} للصنف {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},اتاحة لأكثر من {0} للصنف {1}
 DocType: Address,Name of person or organization that this address belongs to.,اسم الشخص أو المنظمة التي ينتمي إلى هذا العنوان.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,لديك موردون
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
@@ -3584,10 +3601,11 @@ DocType: Lead,Converted,تحويل
 DocType: Item,Has Serial No,ورقم المسلسل
 DocType: Employee,Date of Issue,تاريخ الإصدار
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0} من {0} ب {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
 DocType: Issue,Content Type,نوع المحتوى
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,الكمبيوتر
 DocType: Item,List this Item in multiple groups on the website.,قائمة هذا البند في مجموعات متعددة على شبكة الانترنت.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,البند: {0} غير موجود في النظام
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
 DocType: Payment Reconciliation,Get Unreconciled Entries,الحصول على مقالات لم تتم تسويتها
@@ -3598,14 +3616,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,لمستودع
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},تم إدخال حساب {0} أكثر من مرة للعام المالي {1}
 ,Average Commission Rate,متوسط ​​العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,""" لا يحوي رقم متسلسل""  لا يمكن أن يكون "" نعم "" للأصناف الغير مخزنة"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,""" لا يحوي رقم متسلسل""  لا يمكن أن يكون "" نعم "" للأصناف الغير مخزنة"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,لا يمكن أن ىكون تاريخ الحضور تاريخ مستقبلي
 DocType: Pricing Rule,Pricing Rule Help,تعليمات التسعير القاعدة
 DocType: Purchase Taxes and Charges,Account Head,رئيس حساب
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,تحديث تكاليف إضافية لحساب تكلفة هبطت من البنود
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,كهربائي
 DocType: Stock Entry,Total Value Difference (Out - In),إجمالي قيمة الفرق (خارج - في)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},هوية المستخدم لم يتم تعيين موظف ل {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,الرصاص Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,من المطالبة الضمان
@@ -3619,15 +3637,17 @@ DocType: Buying Settings,Naming Series,تسمية السلسلة
 DocType: Leave Block List,Leave Block List Name,ترك اسم كتلة قائمة
 DocType: User,Enabled,تمكين
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,الموجودات الأسهم
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},هل تريد حقا لتقديم كل زلة الرواتب ل شهر {0} و السنة {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},هل تريد حقا لتقديم كل زلة الرواتب ل شهر {0} و السنة {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,المشتركون استيراد
 DocType: Target Detail,Target Qty,الهدف الكمية
 DocType: Attendance,Present,تقديم
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,تسليم مذكرة {0} يجب ألا المقدمة
 DocType: Notification Control,Sales Invoice Message,فاتورة مبيعات رسالة
 DocType: Authorization Rule,Based On,وبناء على
-,Ordered Qty,أمرت الكمية
+DocType: Sales Order Item,Ordered Qty,أمرت الكمية
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,الأسهم المجمدة لغاية
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,مشروع النشاط / المهمة.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,توليد قسائم راتب
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} بريد إلكتروني غير صحيح
@@ -3667,7 +3687,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,تحميل الحضور
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,ويلزم BOM والتصنيع الكمية
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,المدى شيخوخة 2
-DocType: Journal Entry Account,Amount,كمية
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,كمية
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,التثبيت
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,استبدال BOM
 ,Sales Analytics,مبيعات تحليلات
@@ -3694,7 +3714,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,التاريخ المتوقع لا يمكن أن يكون قبل تاريخ طلب المواد
 DocType: Contact Us Settings,City,مدينة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,بالموجات فوق الصوتية بالقطع
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,خطأ: لا بطاقة هوية صالحة؟
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,خطأ: لا بطاقة هوية صالحة؟
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,البند {0} يجب أن يكون عنصر المبيعات
 DocType: Naming Series,Update Series Number,تحديث الرقم المتسلسل
 DocType: Account,Equity,إنصاف
@@ -3709,7 +3729,7 @@ DocType: Purchase Taxes and Charges,Actual,فعلي
 DocType: Authorization Rule,Customerwise Discount,Customerwise الخصم
 DocType: Purchase Invoice,Against Expense Account,ضد حساب المصاريف
 DocType: Production Order,Production Order,الإنتاج ترتيب
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,تركيب ملاحظة {0} وقد تم بالفعل قدمت
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,تركيب ملاحظة {0} وقد تم بالفعل قدمت
 DocType: Quotation Item,Against Docname,ضد Docname
 DocType: SMS Center,All Employee (Active),جميع الموظفين (فعالة)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,عرض الآن
@@ -3717,14 +3737,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,المواد الخام التكلفة
 DocType: Item,Re-Order Level,إعادة ترتيب مستوى
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,إدخال عناصر والكمية المخططة التي تريد رفع أوامر الإنتاج أو تحميل المواد الخام لتحليلها.
-sites/assets/js/list.min.js +174,Gantt Chart,مخطط جانت
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,مخطط جانت
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,جزئي
 DocType: Employee,Applicable Holiday List,ينطبق عطلة قائمة
 DocType: Employee,Cheque,شيك
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,تم تحديث الرقم المتسلسل
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,تقرير نوع إلزامي
 DocType: Item,Serial Number Series,المسلسل عدد سلسلة
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},مستودع إلزامي للسهم المدينة {0} في {1} الصف
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},مستودع إلزامي للسهم المدينة {0} في {1} الصف
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,تجارة التجزئة و الجملة
 DocType: Issue,First Responded On,أجاب أولا على
 DocType: Website Item Group,Cross Listing of Item in multiple groups,قائمة صليب البند في مجموعات متعددة
@@ -3739,7 +3759,7 @@ DocType: Attendance,Attendance,الحضور
 DocType: Page,No,لا
 DocType: BOM,Materials,المواد
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",إن لم يكن تم، سيكون لديك قائمة تضاف إلى كل قسم حيث أنه لا بد من تطبيقها.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,تاريخ نشرها ونشر الوقت إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,تاريخ نشرها ونشر الوقت إلزامي
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,قالب الضرائب لشراء صفقة.
 ,Item Prices,البند الأسعار
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,وبعبارة تكون مرئية بمجرد حفظ أمر الشراء.
@@ -3759,9 +3779,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,المصاريف الإدارية
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,الاستشارات
 DocType: Customer Group,Parent Customer Group,الأم العملاء مجموعة
-sites/assets/js/erpnext.min.js +50,Change,تغيير
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,تغيير
 DocType: Purchase Invoice,Contact Email,عنوان البريد الإلكتروني
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',شراء بالدفع {0} ' توقف '
 DocType: Appraisal Goal,Score Earned,نقاط المكتسبة
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","على سبيل المثال ""شركتي ذ.م.م. """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,فترة إشعار
@@ -3771,12 +3790,13 @@ DocType: Packing Slip,Gross Weight UOM,الوزن الإجمالي UOM
 DocType: Email Digest,Receivables / Payables,الذمم المدينة / الدائنة
 DocType: Delivery Note Item,Against Sales Invoice,ضد فاتورة المبيعات
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,ختم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,حساب الائتمان
 DocType: Landed Cost Item,Landed Cost Item,هبطت تكلفة السلعة
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,إظهار القيم الصفر
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,كمية البند تم الحصول عليها بعد تصنيع / إعادة التعبئة من كميات معينة من المواد الخام
 DocType: Payment Reconciliation,Receivable / Payable Account,القبض / حساب الدائنة
 DocType: Delivery Note Item,Against Sales Order Item,مقابل المبيعات 
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
 DocType: Item,Default Warehouse,النماذج الافتراضية
 DocType: Task,Actual End Date (via Time Logs),الفعلي تاريخ الانتهاء (عبر الزمن سجلات)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},الميزانية لا يمكن تعيين ضد المجموعة حساب {0}
@@ -3790,7 +3810,7 @@ DocType: Issue,Support Team,فريق الدعم
 DocType: Appraisal,Total Score (Out of 5),مجموع نقاط (من 5)
 DocType: Contact Us Settings,State,دولة
 DocType: Batch,Batch,دفعة
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,توازن
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,توازن
 DocType: Project,Total Expense Claim (via Expense Claims),مجموع المطالبة المصاريف (عبر مطالبات النفقات)
 DocType: User,Gender,جنس
 DocType: Journal Entry,Debit Note,ملاحظة الخصم
@@ -3806,9 +3826,8 @@ DocType: Lead,Blog Subscriber,بلوق المشترك
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,إنشاء قواعد لتقييد المعاملات على أساس القيم.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",إذا تم، المشاركات لا. من أيام عمل وسوف تشمل أيام العطل، وهذا سوف يقلل من قيمة الراتب لكل يوم
 DocType: Purchase Invoice,Total Advance,إجمالي المقدمة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,نزع السدادة المواد طلب
 DocType: Workflow State,User,مستخدم
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,تجهيز كشوف المرتبات
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,تجهيز كشوف المرتبات
 DocType: Opportunity Item,Basic Rate,قيم الأساسية
 DocType: GL Entry,Credit Amount,مبلغ الائتمان
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,على النحو المفقودة
@@ -3816,7 +3835,7 @@ DocType: Customer,Credit Days Based On,يوم الائتمان بناء على
 DocType: Tax Rule,Tax Rule,القاعدة الضريبية
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,الحفاظ على نفس المعدل خلال دورة المبيعات
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,تخطيط سجلات الوقت خارج ساعات العمل محطة العمل.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} قد تم بالفعل تأكيده
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} قد تم بالفعل تأكيده
 ,Items To Be Requested,البنود يمكن طلبه
 DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر سعر شراء
 DocType: Time Log,Billing Rate based on Activity Type (per hour),أسعار الفواتير على أساس نوع النشاط (في الساعة)
@@ -3825,6 +3844,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",شركة البريد الإلكتروني معرف لم يتم العثور على ، وبالتالي لم ترسل البريد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),تطبيق الأموال (الأصول )
 DocType: Production Planning Tool,Filter based on item,تصفية استنادا إلى البند
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,حساب الخصم
 DocType: Fiscal Year,Year Start Date,تاريخ بدء العام
 DocType: Attendance,Employee Name,اسم الموظف
 DocType: Sales Invoice,Rounded Total (Company Currency),المشاركات تقريب (العملة الشركة)
@@ -3836,14 +3856,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,تقطيع
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,فوائد الموظف
 DocType: Sales Invoice,Is POS,هو POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
 DocType: Production Order,Manufactured Qty,الكمية المصنعة
 DocType: Purchase Receipt Item,Accepted Quantity,كمية مقبولة
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} {1} غير موجود
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,رفعت فواتير للعملاء.
 DocType: DocField,Default,الافتراضي
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,معرف المشروع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}  مشتركين تم اضافتهم
 DocType: Maintenance Schedule,Schedule,جدول
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",تحديد الميزانية لهذا مركز التكلفة. لمجموعة العمل الميزانية، انظر "قائمة الشركات"
@@ -3851,7 +3871,7 @@ DocType: Account,Parent Account,الأصل حساب
 DocType: Quality Inspection Reading,Reading 3,قراءة 3
 ,Hub,محور
 DocType: GL Entry,Voucher Type,نوع السند
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
 DocType: Expense Claim,Approved,وافق
 DocType: Pricing Rule,Price,السعر
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',يجب أن يتم تعيين الموظف مرتاح على {0} ك ' اليسار '
@@ -3860,23 +3880,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,تعليم
 DocType: Selling Settings,Campaign Naming By,حملة التسمية بواسطة
 DocType: Employee,Current Address Is,العنوان الحالي هو
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",اختياري. يحدد العملة الافتراضية الشركة، إذا لم يكن محددا.
 DocType: Address,Office,مكتب
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,تقارير قياسية
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,المحاسبة إدخالات دفتر اليومية.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,الكمية المتوفرة في المستودعات من
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,لإنشاء حساب الضرائب
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,الرجاء إدخال حساب المصاريف
 DocType: Account,Stock,المخزون
 DocType: Employee,Current Address,العنوان الحالي
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",إذا كان البند هو البديل من بند آخر ثم وصف، صورة، والتسعير، والضرائب سيتم تعيين غيرها من القالب، ما لم يذكر صراحة
 DocType: Serial No,Purchase / Manufacture Details,تفاصيل شراء / تصنيع
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,دفعة الجرد
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,دفعة الجرد
 DocType: Employee,Contract End Date,تاريخ نهاية العقد
 DocType: Sales Order,Track this Sales Order against any Project,تتبع هذا الأمر ضد أي مشروع المبيعات
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,سحب أوامر البيع (في انتظار لتسليم) بناء على المعايير المذكورة أعلاه
 DocType: DocShare,Document Type,نوع الوثيقة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,من مزود اقتباس
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,من مزود اقتباس
 DocType: Deduction Type,Deduction Type,خصم نوع
 DocType: Attendance,Half Day,نصف يوم
 DocType: Pricing Rule,Min Qty,دقيقة الكمية
@@ -3887,20 +3909,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,لالكمية (الكمية المصنعة) إلزامي
 DocType: Stock Entry,Default Target Warehouse,الهدف الافتراضي مستودع
 DocType: Purchase Invoice,Net Total (Company Currency),المجموع الصافي (عملة الشركة)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,الصف {0}: نوع الحزب والحزب لا ينطبق إلا على المقبوضات / حسابات المدفوعات
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,الصف {0}: نوع الحزب والحزب لا ينطبق إلا على المقبوضات / حسابات المدفوعات
 DocType: Notification Control,Purchase Receipt Message,رسالة إيصال شراء
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,مجموع الأوراق المخصصة لأكثر من فترة
 DocType: Production Order,Actual Start Date,تاريخ البدء الفعلي
 DocType: Sales Order,% of materials delivered against this Sales Order,٪ من المواد الموردة أوصلت مقابل أمر المبيعات
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,تسجيل حركة البند.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,تسجيل حركة البند.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,قائمة النشرة المشترك
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,خدمة
 DocType: Hub Settings,Hub Settings,إعدادات المحور
 DocType: Project,Gross Margin %,هامش إجمالي٪
 DocType: BOM,With Operations,مع عمليات
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,وقد أجريت بالفعل القيود المحاسبية بالعملة {0} لشركة {1}. يرجى تحديد حساب المستحق أو تدفع بالعملة {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,وقد أجريت بالفعل القيود المحاسبية بالعملة {0} لشركة {1}. يرجى تحديد حساب المستحق أو تدفع بالعملة {0}.
 ,Monthly Salary Register,سجل الراتب الشهري
-apps/frappe/frappe/website/template.py +123,Next,التالي
+apps/frappe/frappe/website/template.py +140,Next,التالي
 DocType: Warranty Claim,If different than customer address,إذا كان مختلفا عن عنوان العميل
 DocType: BOM Operation,BOM Operation,BOM عملية
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,بالكهرباء
@@ -3931,6 +3954,7 @@ DocType: Purchase Invoice,Next Date,تاريخ القادمة
 DocType: Employee Education,Major/Optional Subjects,الرئيسية / اختياري الموضوعات
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,من فضلك ادخل الضرائب والرسوم
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,بالقطع
+DocType: Sales Invoice Item,Drop Ship,هبوط السفينة
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",هنا يمكنك الحفاظ على تفاصيل مثل اسم العائلة واحتلال الزوج، الوالدين والأطفال
 DocType: Hub Settings,Seller Name,البائع اسم
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),الضرائب والرسوم مقطوعة (عملة الشركة)
@@ -3957,29 +3981,29 @@ DocType: Purchase Order,To Receive and Bill,لتلقي وبيل
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,مصمم
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,الشروط والأحكام قالب
 DocType: Serial No,Delivery Details,الدفع تفاصيل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,إنشاء المواد طلب تلقائيا إذا وقعت كمية أقل من هذا المستوى
 ,Item-wise Purchase Register,البند من الحكمة الشراء تسجيل
 DocType: Batch,Expiry Date,تاريخ انتهاء الصلاحية
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",لضبط مستوى إعادة الطلب، يجب أن يكون البند لشراء السلعة أو التصنيع البند
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",لضبط مستوى إعادة الطلب، يجب أن يكون البند لشراء السلعة أو التصنيع البند
 ,Supplier Addresses and Contacts,العناوين المورد و اتصالات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,الرجاء اختيار الفئة الأولى
 apps/erpnext/erpnext/config/projects.py +18,Project master.,المشروع الرئيسي.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,لا تظهر أي رمز مثل $ الخ بجانب العملات.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(نصف يوم)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
 DocType: Leave Type,Is Carry Forward,والمضي قدما
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,الحصول على عناصر من BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,الحصول على عناصر من BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,يوم ووقت مبادرة البيع
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,فاتورة المواد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
 DocType: Dropbox Backup,Send Notifications To,إرسال إشعارات إلى
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,المرجع التسجيل
 DocType: Employee,Reason for Leaving,سبب ترك العمل
 DocType: Expense Claim Detail,Sanctioned Amount,يعاقب المبلغ
 DocType: GL Entry,Is Opening,وفتح
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,حساب {0} غير موجود
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,حساب {0} غير موجود
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,نبذة عن سيرة حياة لموقع الويب وغيرها من المطبوعات.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},يرجى إنشاء هيكل الرواتب ل موظف {0}
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index 36e553c7db..5d24ea5f35 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Mode Заплата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Изберете месец Distribution, ако искате да проследите различните сезони."
 DocType: Employee,Divorced,Разведен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Внимание: една и съща позиция е въведен няколко пъти.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Внимание: една и съща позиция е въведен няколко пъти.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Предмети вече синхронизирани
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Оставя т да бъдат добавени няколко пъти в една сделка
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Отмени Материал посещение {0}, преди да анулира този гаранционен иск"
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Уплътняване плюс синтероване
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Се изисква валута за Ценоразпис {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ще се изчисли при транзакция.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,От Материал Искане
+DocType: Purchase Order,Customer Contact,Клиента Контакти
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,От Материал Искане
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дървовидно
 DocType: Job Applicant,Job Applicant,Кандидат За Работа
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Не повече резултати.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Име на клиента
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Всички свързаните с тях области износ като валута, обменен курс,, износ общо, износ сбор т.н. са на разположение в Бележка за доставка, POS, цитата, фактурата за продажба, продажба Поръчка т.н."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (или групи), срещу които са направени счетоводни записвания и баланси се поддържат."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Изключително за {0} не може да бъде по-малък от нула ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Изключително за {0} не може да бъде по-малък от нула ({1})
 DocType: Manufacturing Settings,Default 10 mins,По подразбиране 10 минути
 DocType: Leave Type,Leave Type Name,Оставете Тип Име
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series успешно обновени
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Множество цени елеме
 DocType: SMS Center,All Supplier Contact,All доставчика Свържи се с
 DocType: Quality Inspection Reading,Parameter,Параметър
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Очаквано Крайна дата не може да бъде по-малко от очакваното Начална дата
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Да наистина искате да отпуши производствена поръчка:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Курсове трябва да е същото като {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,New Оставете Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Оставете Application
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Проект
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. To maintain the customer wise item code and to make them searchable based on their code use this option 
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на разплащателна сметка
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Покажи 
 DocType: Sales Invoice Item,Quantity,Количество
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Заеми (пасиви)
 DocType: Employee Education,Year of Passing,Година на Passing
-sites/assets/js/erpnext.min.js +27,In Stock,В Наличност
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Мога само да направи плащане срещу нетаксувано Продажби Поръчка
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличност
 DocType: Designation,Designation,Предназначение
 DocType: Production Plan Item,Production Plan Item,Производство Plan Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Потребителят {0} вече е назначен служител {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Направете нов POS профил
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Грижа за здравето
 DocType: Purchase Invoice,Monthly,Месечно
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Фактура
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Забавяне на плащане (дни)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Имейл Адрес
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Отбрана
 DocType: Company,Abbr,Съкращение
 DocType: Appraisal Goal,Score (0-5),Резултати на (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} не съвпада с {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} не съвпада с {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Превозно средство не
-sites/assets/js/erpnext.min.js +55,Please select Price List,Моля изберете Ценоразпис
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Моля изберете Ценоразпис
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Дървообработване
 DocType: Production Order Operation,Work In Progress,Незавършено производство
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D печат
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Родител Подробности
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Откриване на работа.
 DocType: Item Attribute,Increment,Увеличение
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Изберете Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Реклама
 DocType: Employee,Married,Омъжена
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
 DocType: Payment Reconciliation,Reconcile,Съгласувайте
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Хранителни стоки
 DocType: Quality Inspection Reading,Reading 1,Четене 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Направи Bank Влизане
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Направи Bank Влизане
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пенсионни фондове
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse е задължително, ако типа на профила е Warehouse"
 DocType: SMS Center,All Sales Person,Всички продажби Person
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Отпишат Cost Center
 DocType: Warehouse,Warehouse Detail,Warehouse Подробности
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е била пресечена за клиенти {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Данъчна Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Вие не можете да добавяте или актуализация записи преди {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Вие не можете да добавяте или актуализация записи преди {0}
 DocType: Item,Item Image (if not slideshow),Точка на снимката (ако не слайдшоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Съществува Customer със същото име
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(надница на час / 60) * действително отработено време
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Гост
 DocType: Quality Inspection,Get Specification Details,Вземи Specification Детайли
 DocType: Lead,Interested,Заинтересован
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Бил на Материал
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Отвор
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Отвор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},"От {0}, за да {1}"
 DocType: Item,Copy From Item Group,Copy от позиция Group
 DocType: Journal Entry,Opening Entry,Откриване Влизане
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Каталог Запитване
 DocType: Standard Reply,Owner,Собственик
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Моля, въведете първата компания"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Моля изберете Company първа
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Моля изберете Company първа
 DocType: Employee Education,Under Graduate,Под Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Обща Цена
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Консумативи
 DocType: Upload Attendance,Import Log,Внос Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Изпращам
+DocType: Sales Invoice Item,Delivered By Supplier,Доставени от доставчик
 DocType: SMS Center,All Contact,Всички контакти
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годишна заплата
 DocType: Period Closing Voucher,Closing Fiscal Year,Приключване на финансовата година
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Contra Влизане
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Покажи Час Logs
 DocType: Journal Entry Account,Credit in Company Currency,Credit през Company валути
 DocType: Delivery Note,Installation Status,Монтаж Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прието + Отхвърлено Количество трябва да бъде равно на Получено количество за {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прието + Отхвърлено Количество трябва да бъде равно на Получено количество за {0}
 DocType: Item,Supply Raw Materials for Purchase,Доставка на суровини за пазаруване
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Точка {0} трябва да бъде покупка Точка
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Изтеглете шаблони, попълнете необходимите данни и се прикрепва на текущото изображение. Всички дати и служител комбинация в избрания период ще дойде в шаблона, със съществуващите записи посещаемост"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Точка {0} не е активен или е било постигнато в края на жизнения
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Точка {0} не е активен или е било постигнато в края на жизнения
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Ще бъде актуализиран след фактурата за продажба е подадено.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки за Module HR
 DocType: SMS Center,SMS Center,SMS Center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Изправяне
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Въведете URL па
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Правила за прилагане на ценообразуване и отстъпка.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Този път си Вход конфликти с {0} за {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Цена списък трябва да бъде приложимо за покупка или продажба
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Дата на монтаж не може да бъде преди датата на доставка за позиция {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Дата на монтаж не може да бъде преди датата на доставка за позиция {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Отстъпка за Ценоразпис Rate (%)
-sites/assets/js/form.min.js +279,Start,Начало
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Начало
 DocType: User,First Name,Първо Име
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Вие като инсталацията приключи. Освежаващо.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Леене в пълен мухъл
 DocType: Offer Letter,Select Terms and Conditions,Изберете Общи условия
 DocType: Production Planning Tool,Sales Orders,Продажби Поръчки
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Срещу ред от фактура за продажба
 ,Production Orders in Progress,Производствени поръчки в процес на извършване
 DocType: Lead,Address & Contact,Адрес и контакти
+DocType: Leave Allocation,Add unused leaves from previous allocations,Добави неизползвани отпуски от предишни разпределения
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следваща повтарящо {0} ще бъде създаден на {1}
 DocType: Newsletter List,Total Subscribers,Общо Абонати
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Име За Контакт
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,"Така, докато се Кол
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Създава заплата приплъзване за посочените по-горе критерии.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Заявка за покупка.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двойна жилища
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Листата на година
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Моля, задайте именуване Series за {0} чрез Setup> Settings> именуване Series"
 DocType: Time Log,Will be updated when batched.,"Ще бъде актуализиран, когато дозирани."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Моля, проверете "е Advance" срещу Account {1}, ако това е предварително влизане."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Моля, проверете "е Advance" срещу Account {1}, ако това е предварително влизане."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} не принадлежи на фирмата {1}
 DocType: Bulk Email,Message,Съобщение
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Референтен номер по
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Оставете Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
 DocType: Stock Entry,Sales Invoice No,Продажби Фактура Не
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Минимална поръчка Количес
 DocType: Pricing Rule,Supplier Type,Доставчик Type
 DocType: Item,Publish in Hub,Публикувай в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Точка {0} е отменен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Материал Искане
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Точка {0} е отменен
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Материал Искане
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
 DocType: Item,Purchase Details,Изкупните Детайли
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не е открит в "суровини Доставя" маса в Поръчката {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Уведомление Contro
 DocType: Lead,Suggestions,Предложения
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Задаване на елемент Група-мъдър бюджети на тази територия. Можете също така да включват сезон, като настроите разпределение."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Моля, въведете група майка сметка за склад {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Заплащане срещу {0} {1} не може да бъде по-голяма от дължимата сума, {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Заплащане срещу {0} {1} не може да бъде по-голяма от дължимата сума, {2}"
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Генериране Schedule
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New фондова мерна 
 DocType: Period Closing Voucher,Closing Account Head,Закриване на профила Head
 DocType: Employee,External Work History,Външно работа
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Референтен Error
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Наистина ли искате да спрете
 DocType: Communication,Closed,Затворен
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,По думите (износ) ще бъде видим след като запазите бележката за доставката.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Наистина ли искате да спрете
 DocType: Lead,Industry,Промишленост
 DocType: Employee,Job Profile,Job профил
 DocType: Newsletter,Newsletter,Newsletter
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Фактура
 DocType: Dropbox Backup,Allow Dropbox Access,Оставя Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Създаване Данъци
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Заплащане вписване е променен, след като го извади. Моля, изтеглете го отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме за тази седмица и предстоящи дейности
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Моля, изберете месец и година"
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Скоростта, с която Customer валути се превръща в основна валута на клиента"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Предлага се в BOM, известието за доставка, фактурата за покупка, производство поръчка за покупка, покупка разписка, фактурата за продажба, продажба Поръчка, Фондова вписване, график"
 DocType: Item Tax,Tax Rate,Данъчна Ставка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Изберете Точка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Изберете Точка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Позиция: {0} успя партиди, не може да се примири с помощта \ фондова помирение, вместо това използвайте фондова Влизане"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Не трябва да е същото като {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Конвертиране в не-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Покупка разписка трябва да бъде представено
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Current Stock мерна е
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (много) на дадена позиция.
 DocType: C-Form Invoice Detail,Invoice Date,Дата на фактура
 DocType: GL Entry,Debit Amount,Debit Сума
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Не може да има само един акаунт на тази фирма и в {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Не може да има само един акаунт на тази фирма и в {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Вашата електронна поща
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Моля, вижте прикачения файл"
 DocType: Purchase Order,% Received,% Получени
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Инспектирани от
 DocType: Maintenance Visit,Maintenance Type,Тип Поддръжка
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Пореден № {0} не принадлежи на доставка Забележка {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Пореден № {0} не принадлежи на доставка Забележка {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Позиция проверка на качеството на параметър
 DocType: Leave Application,Leave Approver Name,Оставете одобряващ Име
 ,Schedule Date,График Дата
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Покупка Регистрация
 DocType: Landed Cost Item,Applicable Charges,Приложимите цени
 DocType: Workstation,Consumable Cost,Консумативи Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
 DocType: Purchase Receipt,Vehicle Date,Камион Дата
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медицински
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за загубата
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% Инсталиран
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Моля, въведете име на компанията първа"
 DocType: BOM,Item Desription,Позиция описан начинът
 DocType: Purchase Invoice,Supplier Name,Доставчик Наименование
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочетете инструкциите ERPNext
 DocType: Account,Is Group,Is Група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматично Определете серийни номера на базата на FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверете доставчик Invoice Брой Уникалност
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Продажби
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобални настройки за всички производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Замразени Сметки до
 DocType: SMS Log,Sent On,Изпратено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday майстор.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell корнизи
 DocType: Material Request Item,Required Date,Задължително Дата
 DocType: Delivery Note,Billing Address,Адрес На Плащане
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Моля, въведете Код."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Моля, въведете Код."
 DocType: BOM,Costing,Остойностяване
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако е избрано, размерът на данъка ще се считат за която вече е включена в Print Курсове / Print размер"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Общо Количество
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Време м
 DocType: Customer,Buyer of Goods and Services.,Купувач на стоки и услуги.
 DocType: Journal Entry,Accounts Payable,Задължения
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Добави Абонати
-sites/assets/js/erpnext.min.js +5,""" does not exists","Не съществува
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","Не съществува
 DocType: Pricing Rule,Valid Upto,Валиден Upto
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Списък някои от вашите клиенти. Те могат да бъдат организации или лица.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direct подоходно
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не може да се филтрира по Account, ако групирани по профил"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Административният директор
 DocType: Payment Tool,Received Or Paid,Получени или заплатени
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Моля изберете Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Моля изберете Company
 DocType: Stock Entry,Difference Account,Разлика Акаунт
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Не може да се близо задача, тъй като си зависим задача {0} не е затворен."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
 DocType: Production Order,Additional Operating Cost,Допълнителна експлоатационни разходи
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Козметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
 DocType: Communication,Subject,Предмет
 DocType: Shipping Rule,Net Weight,Нето Тегло
 DocType: Employee,Emergency Phone,Телефон за спешни
 ,Serial No Warranty Expiry,Пореден № Warranty Изтичане
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Наистина ли искате да спрете този материал Заявка?
 DocType: Sales Order,To Deliver,Да Достави
 DocType: Purchase Invoice Item,Item,Артикул
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Dr - Cr)
 DocType: Account,Profit and Loss,Приходите и разходите
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Управление Подизпълнители
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управление Подизпълнители
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Нова мерна единица не трябва да се от тип цяло число
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Мебели и фиксиране
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Скоростта, с която Ценоразпис валута се превръща в основна валута на компанията"
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавяне / Ред
 DocType: Purchase Invoice,Supplier Invoice No,Доставчик Invoice Не
 DocType: Territory,For reference,За справка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не може да се изтрие Пореден № {0}, тъй като се използва в сделки с акции"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Закриване (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Закриване (Cr)
 DocType: Serial No,Warranty Period (Days),Гаранционен период (дни)
 DocType: Installation Note Item,Installation Note Item,Монтаж Забележка Точка
 ,Pending Qty,Отложена Количество
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Billing и Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повторете клиенти
 DocType: Leave Control Panel,Allocate,Разпределяйте
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Предишен
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Продажбите Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажбите Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Изберете Продажби Поръчки от която искате да създадете производствени поръчки.
+DocType: Item,Delivered by Supplier (Drop Ship),Доставени от доставчик (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Компоненти заплата.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База данни за потенциални клиенти.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Клиентска база данни.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Акробатика
 DocType: Purchase Order Item,Billed Amt,Таксуваната Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логически Склад, за които са направени стоковите разписки."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Референтен номер по & Референтен Дата се изисква за {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Референтен номер по & Референтен Дата се изисква за {0}
 DocType: Event,Wednesday,Сряда
 DocType: Sales Invoice,Customer's Vendor,Търговец на клиента
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производство на поръчката е задължително
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Приемник на параметъра
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Въз основа на"" и ""Групиране По"" не може да бъде един и същ"
 DocType: Sales Person,Sales Person Targets,Търговец Цели
-sites/assets/js/form.min.js +271,To,Към
-apps/frappe/frappe/templates/base.html +143,Please enter email address,"Моля, въведете имейл адреса си"
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Към
+apps/frappe/frappe/templates/base.html +145,Please enter email address,"Моля, въведете имейл адреса си"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,"Край тръба, образуваща"
 DocType: Production Order Operation,In minutes,В минути
 DocType: Issue,Resolution Date,Резолюция Дата
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,Проекти на потребителя
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Консумирана
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} не е намерен в Таблица Фактури
 DocType: Company,Round Off Cost Center,Завършете Cost Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Поддръжка посещение {0} трябва да се отмени преди анулирането този Продажби Поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Поддръжка посещение {0} трябва да се отмени преди анулирането този Продажби Поръчка
 DocType: Material Request,Material Transfer,Материал Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Откриване (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Публикуване клеймо трябва да е след {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Settings
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Приземи Разходни данъци и такси
 DocType: Production Order Operation,Actual Start Time,Действително Начално Време
 DocType: BOM Operation,Operation Time,Операция на времето
-sites/assets/js/list.min.js +5,More,Още
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Още
 DocType: Pricing Rule,Sales Manager,Мениджър Продажби
-sites/assets/js/desk.min.js +7673,Rename,Преименувам
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Преименувам
 DocType: Journal Entry,Write Off Amount,Отпишат Сума
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Огъване
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Позволи на потребителя
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Прав срязване
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,За да проследите позиция в продажбите и закупуване на документи въз основа на техните серийни номера. Това е също може да се използва за проследяване на информацията за гаранцията на продукта.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Отхвърлени Warehouse е задължително срещу regected т
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Отхвърлени Warehouse е задължително срещу regected т
 DocType: Account,Expenses Included In Valuation,"Разходи, включени в остойностяване"
 DocType: Employee,Provide email id registered in company,Осигуряване на имейл ID регистриран в компания
 DocType: Hub Settings,Seller City,Продавач City
 DocType: Email Digest,Next email will be sent on:,Следваща ще бъде изпратен имейл на:
 DocType: Offer Letter Term,Offer Letter Term,Оферта Писмо Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Точка има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Точка има варианти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е намерен
 DocType: Bin,Stock Value,Стойността на акциите
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Добре дошъл
 DocType: Journal Entry,Credit Card Entry,Credit Card Влизане
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Относно
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Получените стоки от доставчици.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Получените стоки от доставчици.
 DocType: Communication,Open,Отворено
 DocType: Lead,Campaign Name,Име на кампанията
 ,Reserved,Резервирано
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Наистина ли искате да отпуши
 DocType: Purchase Order,Supply Raw Materials,Доставка суровини
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Датата, на която ще се генерира следващата фактура. Той се генерира на представи."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Текущите активи
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Клиента поръчка Не
 DocType: Employee,Cell Number,Броя на клетките
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Загубен
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер "Срещу вестник Entry" колона
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер "Срещу вестник Entry" колона
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Енергия
 DocType: Opportunity,Opportunity From,Opportunity От
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечно извлечение заплата.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Отговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Default Себестойност на продадените стоки Акаунт
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Ценова листа не избран
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ценова листа не избран
 DocType: Employee,Family Background,Семейна среда
 DocType: Process Payroll,Send Email,Изпрати е-мейл
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Няма разрешение
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Предмети с висше weightage ще бъдат показани по-високи
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,"Банково извлечение, Подробности"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Моят Фактури
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Няма намерен служител
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Няма намерен служител
 DocType: Purchase Order,Stopped,Спряно
 DocType: Item,If subcontracted to a vendor,Ако възложи на продавача
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Изберете BOM до начало
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Качв
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Изпрати сега
 ,Support Analytics,Поддръжка Analytics
 DocType: Item,Website Warehouse,Website Warehouse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Наистина ли искате да спрете производствена поръчка:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Денят от месеца, на която автоматично фактура ще бъде генериран например 05, 28 и т.н."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Резултати трябва да бъде по-малка или равна на 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-форма записи
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,По
 DocType: Features Setup,"To enable ""Point of Sale"" features",За да се даде възможност на "точка на продажба" функции
 DocType: Bin,Moving Average Rate,Moving Average Курсове
 DocType: Production Planning Tool,Select Items,Изберете артикули
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} срещу Сметка {1} ​​от {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} срещу Сметка {1} ​​от {2}
 DocType: Comment,Reference Name,Референтен номер Име
 DocType: Maintenance Visit,Completion Status,Завършване Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Оставя се в продължение на доставка или получаване до запълването този процент
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Очаквана дата на доставка не може да бъде преди Продажби Поръчка Дата
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Очаквана дата на доставка не може да бъде преди Продажби Поръчка Дата
 DocType: Upload Attendance,Import Attendance,Внос Присъствие
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Всички стокови групи
 DocType: Process Payroll,Activity Log,Activity Log 
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматично композира съобщение при представяне на сделките.
 DocType: Production Order,Item To Manufacture,Точка за производство
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постоянен леярска форма
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Поръчка за покупка на плащане
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статут е {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Поръчка за покупка на плащане
 DocType: Sales Order Item,Projected Qty,Прогнозно Количество
 DocType: Sales Invoice,Payment Due Date,Дължимото плащане Дата
 DocType: Newsletter,Newsletter Manager,Newsletter мениджъра
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,Желани Numbers
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Оценката на изпълнението.
 DocType: Sales Invoice Item,Stock Details,Фондова Детайли
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Проект Стойност
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Точка на продажба
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Не може да се пренесе {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Точка на продажба
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не може да се пренесе {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit' "
 DocType: Account,Balance must be,Баланс трябва да бъде
 DocType: Hub Settings,Publish Pricing,Публикуване на ценообразуване
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Покупка Разписка
 ,Received Items To Be Billed,"Приети артикули, които се таксуват"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrasive blasting
-sites/assets/js/desk.min.js +3938,Ms,Госпожица
+DocType: Employee,Ms,Госпожица
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валута на валутния курс майстор.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал за частите
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,Диапазон
 DocType: Supplier,Default Payable Accounts,По подразбиране Платими сметки
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
 DocType: Features Setup,Item Barcode,Позиция Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Позиция Варианти {0} актуализиран
 DocType: Quality Inspection Reading,Reading 6,Четене 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка Advance
 DocType: Address,Shop,Магазин
 DocType: Hub Settings,Sync Now,Sync сега
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit влизане не може да бъде свързана с {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit влизане не може да бъде свързана с {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Default Bank / Cash сметка ще се актуализира автоматично в POS Invoice, когато е избран този режим."
 DocType: Employee,Permanent Address Is,Постоянен адрес е
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операция попълва за колко готова продукция?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Марката
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Помощи за свръх {0} прекоси за позиция {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Помощи за свръх {0} прекоси за позиция {1}.
 DocType: Employee,Exit Interview Details,Exit Интервю Детайли
 DocType: Item,Is Purchase Item,Дали Покупка Точка
 DocType: Journal Entry Account,Purchase Invoice,Покупка Invoice
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Подробности Не
 DocType: Stock Entry,Total Outgoing Value,Общо Изходящ Value
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Откриване Дата и крайния срок трябва да бъде в рамките на същата фискална година
 DocType: Lead,Request for Information,Заявка за информация
 DocType: Payment Tool,Paid,Платен
 DocType: Salary Slip,Total in words,Общо в думи
 DocType: Material Request Item,Lead Time Date,Lead Time Дата
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,е задължително. Може би рекорд на валута не е създаден за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Моля, посочете Пореден № за позиция {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За 'Продукт Пакетни ", склад, сериен номер и партидният няма да се счита от" Опаковка Списък "масата. Ако Warehouse и партиден № са едни и същи за всички опаковъчни артикули за т всеки "Продукт Bundle", тези стойности могат да бъдат вписани в основния таблицата позиция, стойностите ще се копират в "Опаковка Списък" маса."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Превозите на клиентите.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Превозите на клиентите.
 DocType: Purchase Invoice Item,Purchase Order Item,Поръчка за покупка Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Непряко подоходно
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Определете сумата на плащането = непогасения размер
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,Адрес Line 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Вариране
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Име На Фирмата
 DocType: SMS Center,Total Message(s),Общо Message (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Изберете точката за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Изберете точката за прехвърляне
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Вижте списък на всички помощни видеоклипове
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Изберете акаунт шеф на банката, в която е депозирана проверка."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Позволи на потребителя да редактира Ценоразпис Курсове по сделки
 DocType: Pricing Rule,Max Qty,Max Количество
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Плащането срещу Продажби / Поръчката трябва винаги да бъде маркиран, като предварително"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Плащането срещу Продажби / Поръчката трябва винаги да бъде маркиран, като предварително"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Химически
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
 DocType: Process Payroll,Select Payroll Year and Month,Изберете Payroll година и месец
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Отидете на подходящата група (обикновено Прилагане на фондове> Текущи активи> Банкови сметки и да създадете нов акаунт (като кликнете върху Добавяне на детето) от тип "Bank"
 DocType: Workstation,Electricity Cost,Ток Cost
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бя
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Вземи платени аванси
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепете вашата снимка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Правя
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Правя
 DocType: Journal Entry,Total Amount in Words,Обща сума в Думи
 DocType: Workflow State,Stop,Спри
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Имаше грешка. Една вероятна причина може да бъде, че не сте запаметили формата. Моля, свържете се support@erpnext.com ако проблемът не бъде отстранен."
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,"Приемо-предавател
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Planning Tool,Get Sales Orders,Вземи Продажби Поръчки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да бъде отрицателна
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Регистриране
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"Ще бъде
 DocType: Project,Internal,Вътрешен
 DocType: Task,Urgent,Спешно
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Моля, посочете валиден Row ID за ред {0} в таблица {1}"
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Отидете на работния плот и започнете да използвате ERPNext
 DocType: Item,Manufacturer,Производител
 DocType: Landed Cost Item,Purchase Receipt Item,Покупка Квитанция Точка
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Включено Warehouse в продажбите Поръчка / готова продукция Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Продажба Сума
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Час Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте за сметка одобряващ за този запис. Моля Актуализирайте "Състояние" и спести
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте за сметка одобряващ за този запис. Моля Актуализирайте "Състояние" и спести
 DocType: Serial No,Creation Document No,Създаване документ №
 DocType: Issue,Issue,Проблем
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за т варианти. например размер, цвят и т.н."
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Default Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Партньор за изпълнение
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Продажбите Поръчка {0} е {1}
 DocType: Opportunity,Contact Info,Информация За Контакт
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Осъществяване на склад влизания
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Осъществяване на склад влизания
 DocType: Packing Slip,Net Weight UOM,Нето тегло мерна единица
 DocType: Item,Default Supplier,Default доставчик
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Над Производство Allowance Процент
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Вземи Седмичен дати
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Крайна дата не може да бъде по-малка от началната дата
 DocType: Sales Person,Select company name first.,Изберете име на компанията на първо място.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Цитатите, получени от доставчици."
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},За да {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,актуализиран чрез Час Logs
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Регистрационен номер на дружеството, за ваше сведение. Данъчни номера и т.н."
 DocType: Sales Partner,Distributor,Разпределител
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Количка Доставка Правило
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
 ,Ordered Items To Be Billed,"Поръчаните артикули, които се таксуват"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,От Range трябва да бъде по-малко от гамата
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Изберете Час Logs и подадем да създадете нов фактурата за продажба.
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Данъ
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Задължения
 DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
 ,Purchase Order Items To Be Billed,"Покупка Поръчка артикули, които се таксуват"
 DocType: Purchase Invoice Item,Net Rate,Нетен коефициент
 DocType: Purchase Invoice Item,Purchase Invoice Item,"Фактурата за покупка, т"
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Неизравне
 DocType: Global Defaults,Current Fiscal Year,Текущата фискална година
 DocType: Global Defaults,Disable Rounded Total,Забранете Rounded Общо
 DocType: Lead,Call,Повикване
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"Записи" не могат да бъдат празни
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"Записи" не могат да бъдат празни
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate ред {0} със същия {1}
 ,Trial Balance,Оборотна ведомост
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Създаване Служители
-sites/assets/js/erpnext.min.js +5,"Grid """,Grid "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Създаване Служители
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Моля изберете префикс първа
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Проучване
 DocType: Maintenance Visit Purpose,Work Done,"Работата, извършена"
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,Изпратено
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Виж Ledger
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Най-ранната
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
 DocType: Communication,Delivery Status,Delivery Status
 DocType: Production Order,Manufacture against Sales Order,Производство срещу Продажби Поръчка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Останалата част от света
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Останалата част от света
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Продуктът {0} не може да има Batch
 ,Budget Variance Report,Бюджет Вариацията Доклад
 DocType: Salary Slip,Gross Pay,Брутно възнаграждение
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,"Дивидентите, изплащани"
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Счетоводство Ledger
 DocType: Stock Reconciliation,Difference Amount,Разлика Сума
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Неразпределена Печалба
 DocType: BOM Item,Item Description,Елемент Описание
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,Елемент възможност
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Временно Откриване
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Служител Оставете Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Везни за Account {0} винаги трябва да е {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Везни за Account {0} винаги трябва да е {1}
 DocType: Address,Address Type,Вид Адрес
 DocType: Purchase Receipt,Rejected Warehouse,Отхвърлени Warehouse
 DocType: GL Entry,Against Voucher,Срещу ваучер
 DocType: Item,Default Buying Cost Center,Default Изкупуването Cost Center
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","За да получите най-доброто от ERPNext, ние ви препоръчваме да отнеме известно време, и да гледате тези помощни видеоклипове."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,"Точка {0} трябва да продава, т"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,да се
 DocType: Item,Lead Time in days,Lead Time в дни
 ,Accounts Payable Summary,Задължения Резюме
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Не е разрешено да редактирате замразена сметка {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Не е разрешено да редактирате замразена сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Вземи неплатените фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продажбите Поръчка {0} не е валидна
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Място на издаване
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Договор
 DocType: Report,Disabled,За хора с увреждания
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Мерна единица фактор coversion изисква за мерна единица: {0} в продукт: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Мерна единица фактор coversion изисква за мерна единица: {0} в продукт: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Непреките разходи
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Кол е задължително
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Земеделие
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,Начин на плащане
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Това е главната позиция група и не може да се редактира.
 DocType: Journal Entry Account,Purchase Order,Поръчка
 DocType: Warehouse,Warehouse Contact Info,Склад Информация за контакт
-sites/assets/js/form.min.js +190,Name is required,Необходимо е име
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Необходимо е име
 DocType: Purchase Invoice,Recurring Type,Повтарящо Type
 DocType: Address,City/Town,City / Town
 DocType: Email Digest,Annual Income,Годишен доход
 DocType: Serial No,Serial No Details,Пореден № Детайли
 DocType: Purchase Invoice Item,Item Tax Rate,Позиция данъчна ставка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Точка {0} трябва да бъде подизпълнители Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капиталови УРЕДИ
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Гол
 DocType: Sales Invoice Item,Edit Description,Edit Описание
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Очаквана дата на доставка е по-малка от планираното Начална дата.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,За доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,За доставчик
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Задаване типа на профила ви помага при избора на този профил в сделките.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company валути)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Общо Outgoing
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Не може да има само една доставка Правило Състояние с 0 или празно стойност за "да цени"
 DocType: Authorization Rule,Transaction,Транзакция
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Забележка: Тази Cost Center е група. Не може да се направи счетоводни записи срещу групи.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Инструменти
+apps/frappe/frappe/config/desk.py +7,Tools,Инструменти
 DocType: Item,Website Item Groups,Website стокови групи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Производство пореден номер е задължително за производство влизане фондова цел
 DocType: Purchase Invoice,Total (Company Currency),Общо (Company валути)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,Workstation Име
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email бюлетин:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към т {1}
 DocType: Sales Partner,Target Distribution,Target Разпределение
-sites/assets/js/desk.min.js +7652,Comments,Коментари
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Коментари
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Това е поредният номер на последната създадена сделката с този префикс
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},"Курсове на оценка, необходима за т {0}"
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Моля и
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege отпуск
 DocType: Purchase Invoice,Supplier Invoice Date,Доставчик Дата Invoice
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Трябва да се даде възможност на количката
-sites/assets/js/form.min.js +212,No Data,Няма Данни
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Няма Данни
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оценка Template Goal
 DocType: Salary Slip,Earning,Приходи
 DocType: Payment Tool,Party Account Currency,Party Account валути
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,Party Account валути
 DocType: Purchase Taxes and Charges,Add or Deduct,Добави или Приспадни
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ако годишен бюджет Превишена (за сметка сметка)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Припокриване условия намерени между:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Against Journal Entry {0} is already adjusted against some other voucher 
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Against Journal Entry {0} is already adjusted against some other voucher 
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Обща стойност на поръчката
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Храна
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Застаряването на населението Range 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Не на Посещения
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Бюлетини за контакти, води."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на Затварянето Сметката трябва да е {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума от точки за всички цели трябва да бъде 100. Това е {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Операциите не може да бъде оставено празно.
 ,Delivered Items To Be Billed,"Доставени изделия, които се таксуват"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse не може да се променя за Serial No.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},"Статус актуализиран, за да {0}"
 DocType: DocField,Description,Описание
 DocType: Authorization Rule,Average Discount,Средна отстъпка
 DocType: Letter Head,Is Default,Дали Default
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Елемент от данъци
 DocType: Item,Maintain Stock,Поддържайте Фондова
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Вписване в запасите вече създадени за производствена поръчка
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставете празно, ако считат за всички наименования"
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип "Край" в ред {0} не могат да бъдат включени в т Курсове
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип "Край" в ред {0} не могат да бъдат включени в т Курсове
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,От за дата
 DocType: Email Digest,For Company,За Company
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,Адрес за доставка И
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Сметкоплан
 DocType: Material Request,Terms and Conditions Content,Условия Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може да бъде по-голяма от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
 DocType: Employee,Owned,Собственост
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи от тръгне без Pay
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Гаранция / AMC Status
 DocType: GL Entry,GL Entry,GL Влизане
 DocType: HR Settings,Employee Settings,Настройки на наети
 ,Batch-Wise Balance History,Партиди Balance История
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,За да се направи списък
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,За да се направи списък
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Чирак
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Отрицателна величина не е позволено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Офис под наем
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Настройки Setup SMS Gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Внос Неуспех!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Не адрес добавя още.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Не адрес добавя още.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation работен час
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на JV количество {2}
 DocType: Item,Inventory,Инвентаризация
 DocType: Features Setup,"To enable ""Point of Sale"" view",За да се даде възможност на "точка на продажба" изглед
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Плащането не може да се направи за празна количката
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плащането не може да се направи за празна количката
 DocType: Item,Sales Details,Продажби Детайли
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Прикова
 DocType: Opportunity,With Items,С артикули
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Датата, на която ще се генерира следващата фактура. Той се генерира на представи."
 DocType: Item Attribute,Item Attribute,Позиция атрибут
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Правителство
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Елемент Варианти
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Елемент Варианти
 DocType: Company,Services,Услуги
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Общо ({0})
 DocType: Cost Center,Parent Cost Center,Родител Cost Center
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Финансова година Начална дата
 DocType: Employee External Work History,Total Experience,Общо Experience
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Зенкероване
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товарни и спедиция Такси
 DocType: Material Request Item,Sales Order No,Продажбите Заповед №
 DocType: Item Group,Item Group Name,Име на артикул Group
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Взети
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Взети
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Прехвърляне Материали за Производство
 DocType: Pricing Rule,For Price List,За Ценовата листа
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,Списъци
 DocType: Purchase Invoice Item,Net Amount,Нетна сума
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Подробности Не
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Допълнителна отстъпка сума (във Валута на Фирмата)
-DocType: Period Closing Voucher,CoA Help,CoA Помощ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Грешка: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Грешка: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Моля да създадете нов акаунт от сметкоплан.
 DocType: Maintenance Visit,Maintenance Visit,Поддръжка посещение
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer> Customer Group> Territory
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Поземлен Cost Помощ
 DocType: Event,Tuesday,Вторник
 DocType: Leave Block List,Block Holidays on important days.,Блок Holidays по важни дни.
 ,Accounts Receivable Summary,Вземания Резюме
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Листата за вид {0} вече разпределена за Employee {1} за период {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Моля, задайте поле ID на потребителя в рекордно Employee да зададете Role Employee"
 DocType: UOM,UOM Name,Мерна единица Име
 DocType: Top Bar Item,Target,Мишена
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,Продажбите Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Счетоводство Entry за {0} може да се направи само в валута: {1}
 DocType: Pricing Rule,Pricing Rule,Ценообразуване Правило
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Назъбване
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Материал Заявка за пазаруване Поръчка
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материал Заявка за пазаруване Поръчка
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Върнати т {1} не съществува в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банкови сметки
 ,Bank Reconciliation Statement,Bank помирение резюме
 DocType: Address,Lead Name,Водещ име
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Откриване фондова Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Откриване фондова Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} трябва да се появи само веднъж
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е позволено да прехвърляйте повече {0} от {1} срещу Поръчката {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Листата Разпределен успешно в продължение на {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Листата Разпределен успешно в продължение на {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,"Няма елементи, да се опаковат"
 DocType: Shipping Rule Condition,From Value,От Value
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Производство Количество е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Производство Количество е задължително
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Суми не постъпят по банковата
 DocType: Quality Inspection Reading,Reading 4,Четене 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Искове за сметка на фирмата.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,Свържи Mobile Не
 DocType: Production Planning Tool,Select Sales Orders,Изберете Продажби Поръчки
 ,Material Requests for which Supplier Quotations are not created,Материал Исканията за които не са създадени Доставчик Цитати
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,За да проследите предмети с помощта на баркод. Вие ще бъдете в състояние да влезе елементи в Бележка за доставка и фактурата за продажба чрез сканиране на баркод на артикул.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Маркирай като Доставени
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи оферта
 DocType: Dependent Task,Dependent Task,Зависим Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Опитайте планира операции за Х дни предварително.
 DocType: HR Settings,Stop Birthday Reminders,Stop напомняне за рождени дни
 DocType: SMS Center,Receiver List,Списък Receiver
 DocType: Payment Tool Detail,Payment Amount,Сума За Плащане
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Консумирана Сума
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Изглед
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Изглед
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура Заплата Приспадане
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективно лазерно синтероване
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Внос Успешно!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Разходите за Издадена артикули
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,Default Платим Акаунт
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки за онлайн пазарска количка като правилата за корабоплаване, Ценоразпис т.н."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Начислен
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reserved Количество
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Количество
 DocType: Party Account,Party Account,Party Акаунт
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Човешки Ресурси
 DocType: Lead,Upper Income,Upper подоходно
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Активиране на количката
 DocType: Employee,Permanent Address,Постоянен Адрес
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,"Точка {0} трябва да е услуга, т."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Изплатения аванс срещу {0} {1} не може да бъде по-голям \ от Grand Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Моля изберете код артикул
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Намаляване на приспадане тръгне без Pay (LWP)
 DocType: Territory,Territory Manager,Територия на мениджъра
+DocType: Delivery Note Item,To Warehouse (Optional),За да Warehouse (по избор)
 DocType: Sales Invoice,Paid Amount (Company Currency),Платената сума (Company валути)
 DocType: Purchase Invoice,Additional Discount,Допълнителна отстъпка
 DocType: Selling Settings,Selling Settings,Продаваме Settings
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Минен
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Леене смола
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Група Клиенти съществува със същото име моля, променете името на Клиента или преименувайте Група Клиенти"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Моля изберете {0} на първо място.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Моля изберете {0} на първо място.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},текст {0}
 DocType: Territory,Parent Territory,Родител Territory
 DocType: Quality Inspection Reading,Reading 2,Четене 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,Партиден №
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Оставя множество Продажби Поръчки срещу поръчка на клиента,"
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Основен
 DocType: DocPerm,Delete,Изтривам
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Вариант
-sites/assets/js/desk.min.js +7971,New {0},New {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Вариант
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,"Спряно за да не могат да бъдат отменени. Отпуши, за да отмените."
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Спряно за да не могат да бъдат отменени. Отпуши, за да отмените."
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
 DocType: Employee,Leave Encashed?,Оставете осребряват?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity От поле е задължително
 DocType: Item,Variants,Варианти
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Страна
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреси
 DocType: Communication,Received,Приет
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Against Journal Entry {0} does not have any unmatched {1} entry 
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Against Journal Entry {0} does not have any unmatched {1} entry 
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дублиране Пореден № влезе за позиция {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие за Правило за Доставка
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Артикул не е позволено да има производствена поръчка.
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,Поздрав
 DocType: Communication,Rejected,Отхвърлени
 DocType: Pricing Rule,Brand,Марка
 DocType: Item,Will also apply for variants,Ще се прилага и за варианти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Доставени
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Пакетни позиции в момент на продажба.
 DocType: Sales Order Item,Actual Qty,Действително Количество
 DocType: Sales Invoice Item,References,Препратки
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Срязване
 DocType: Item,Has Variants,Има варианти
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Щракнете върху бутона "Направи фактурата за продажба", за да създадете нов фактурата за продажба."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,"Периода от и периода, за датите задължителни за повтарящи% S"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Опаковка и етикетиране
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месец Дистрибуцията
 DocType: Sales Person,Parent Sales Person,Родител Продажби Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Моля, посочете Default валути в Company магистър и глобални Defaults"
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Повтарящо Invoice
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Управление на Проекти
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Управление на Проекти
 DocType: Supplier,Supplier of Goods or Services.,Доставчик на стоки или услуги.
 DocType: Budget Detail,Fiscal Year,Фискална Година
 DocType: Cost Center,Budget,Бюджет
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Продажба
 DocType: Employee,Salary Information,Заплата
 DocType: Sales Person,Name and Employee ID,Име и Employee ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди да публикувате Дата"
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди да публикувате Дата"
 DocType: Website Item Group,Website Item Group,Website т Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Мита и такси
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Моля, въведете Референтна дата"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0}  записи на плажания не може да се филтрира по  {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Моля, въведете Референтна дата"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}  записи на плажания не може да се филтрира по  {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблица за елемент, който ще бъде показан в Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Приложен Количество
 DocType: Material Request Item,Material Request Item,Материал Заявка Точка
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дърво на 
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се отнесе поредни номера по-голям или равен на текущия брой ред за този тип Charge
 ,Item-wise Purchase History,Точка-мъдър История на покупките
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Червен
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Моля, кликнете върху "Генериране Schedule", за да донесе Пореден № добавя за позиция {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Моля, кликнете върху "Генериране Schedule", за да донесе Пореден № добавя за позиция {0}"
 DocType: Account,Frozen,Замръзнал
 ,Open Production Orders,Отворените нареждания за производство
 DocType: Installation Note,Installation Time,Монтаж на времето
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Цитати Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е вземане под внимание
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Като производствена поръчка може да се направи за тази позиция, той трябва да бъде елемент от склад."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Като производствена поръчка може да се направи за тази позиция, той трябва да бъде елемент от склад."
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Свързване
 DocType: Authorization Rule,Above Value,Над Стойност
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Превръщане Factor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Доставени
+DocType: Purchase Order,Delivered,Доставени
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup входящия сървър за работни места имейл ID. (Например jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Номер на возилото
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Датата, на която повтарящите фактура ще се спре"
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Разпредели т
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} трябва да е от тип ""Дълготраен Актив"" като елемент {1} е Актив,"
 DocType: HR Settings,HR Settings,Настройки на човешките ресурси
 apps/frappe/frappe/config/setup.py +130,Printing,Печатане
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense претенция изчаква одобрение. Само за сметка одобряващ да актуализирате състоянието.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense претенция изчаква одобрение. Само за сметка одобряващ да актуализирате състоянието.
 DocType: Purchase Invoice,Additional Discount Amount,Допълнителна отстъпка сума
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"В деня (и), на която кандидатствате за отпуск са почивка. Не е нужно да подава молба за отпуск."
-sites/assets/js/desk.min.js +7805,and,и
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спортен
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,Цитат
 DocType: Salary Slip,Total Deduction,Общо Приспадане
 DocType: Quotation,Maintenance User,Поддържане на потребителя
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Разходите Обновено
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,"Сигурни ли сте, искате да отпуши"
 DocType: Employee,Date of Birth,Дата на раждане
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Точка {0} вече е върнал
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискална година ** представлява финансова година. Всички счетоводни записвания и други големи сделки се проследяват срещу ** Фискална година **.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следете Продажби кампании. Следете Leads, цитати, продажба Поръчка т.н. от кампании, за да се прецени възвръщаемост на инвестициите."
 DocType: Expense Claim,Approver,Одобряващ
 ,SO Qty,SO Количество
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Стоковите постъпления съществуват срещу складови {0}, затова не можете да ре-зададете или модифицирате Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Стоковите постъпления съществуват срещу складови {0}, затова не можете да ре-зададете или модифицирате Warehouse"
 DocType: Appraisal,Calculate Total Score,Изчислете Общ резултат
 DocType: Supplier Quotation,Manufacturing Manager,Производство на мениджъра
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Пореден № {0} е в гаранция до запълването {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Бележка за доставка в пакети.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Превозите
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip корнизи
+DocType: Purchase Order,To be delivered to customer,За да бъде доставен на клиент
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Log Status трябва да бъдат изпратени.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Пореден № {0} не принадлежи на нито една Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Настройване
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,От Валута
 DocType: DocField,Name,Име
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Продажбите на поръчката изисква за т {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Продажбите на поръчката изисква за т {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Сумите, които не е отразено в системата"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company валути)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Други
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Задай като Спряно
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Не можете да намерите съвпадение на т. Моля изберете някоя друга стойност за {0}.
 DocType: POS Profile,Taxes and Charges,Данъци и такси
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Продукт или Услуга, която се купува, продава, или се съхраняват на склад."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не можете да изберете тип заряд като "На предишния ред Сума" или "На предишния ред Total" за първи ред
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,Изберете DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Грил
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банково дело
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Моля, кликнете върху "Генериране Schedule", за да получите график"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,New Cost Center
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,New Cost Center
 DocType: Bin,Ordered Quantity,Поръчаното количество
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",например "Билд инструменти за строители"
 DocType: Quality Inspection,In Process,В Процес
 DocType: Authorization Rule,Itemwise Discount,Itemwise Отстъпка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} срещу Поръчка за Продажба {1}
+DocType: Purchase Order Item,Reference Document Type,Референтен Document Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} срещу Поръчка за Продажба {1}
 DocType: Account,Fixed Asset,Дълготраен актив
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Сериализирани Инвентаризация
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Сериализирани Инвентаризация
 DocType: Activity Type,Default Billing Rate,Default Billing Курсове
 DocType: Time Log Batch,Total Billing Amount,Общо Billing Сума
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Вземания Акаунт
 ,Stock Balance,Фондова Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Продажбите Поръчка за плащане
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продажбите Поръчка за плащане
 DocType: Expense Claim Detail,Expense Claim Detail,Expense претенция Подробности
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Време Logs създаден:
 DocType: Item,Weight UOM,Тегло мерна единица
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредитът за сметка трябва да бъде Платим акаунт
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
 DocType: Production Order Operation,Completed Qty,Завършен Количество
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитни сметки могат да бъдат свързани с друга кредитна влизане"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Ценоразпис {0} е деактивиран
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитни сметки могат да бъдат свързани с друга кредитна влизане"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ценоразпис {0} е деактивиран
 DocType: Manufacturing Settings,Allow Overtime,Оставя Извънредният
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Продажбите Поръчка {0} е спрян
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} серийни номера, необходими за т {1}. Вие сте предоставили {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Текущата оценка Курсове
 DocType: Item,Customer Item Codes,Customer Елемент кодове
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Заваряване
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New фондова мерна единица се изисква
 DocType: Quality Inspection,Sample Size,Размер на извадката
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Всички елементи вече са фактурирани
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Всички елементи вече са фактурирани
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Моля, посочете валиден "От Case No.""
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Допълнителни разходни центрове могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Допълнителни разходни центрове могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 DocType: Project,External,Външен
 DocType: Features Setup,Item Serial Nos,Позиция серийни номера
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Потребители и разрешения
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,Адрес и контакти
 DocType: SMS Log,Sender Name,Подател Име
 DocType: Page,Title,Заглавие
-sites/assets/js/list.min.js +104,Customize,Персонализирайте
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Персонализирайте
 DocType: POS Profile,[Select],[Избор]
 DocType: SMS Log,Sent To,Изпратени На
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Направи фактурата за продажба
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Края на живота
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Пътуване
 DocType: Leave Block List,Allow Users,Позволяват на потребителите
+DocType: Purchase Order,Customer Mobile No,Customer Mobile Не
 DocType: Sales Invoice,Recurring,Повтарящ се
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Абонирай се за отделни приходи и разходи за вертикали продуктови или подразделения.
 DocType: Rename Tool,Rename Tool,Преименуване на Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Актуализация Cost
 DocType: Item Reorder,Item Reorder,Позиция Пренареждане
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transfer Материал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Материал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
 DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
 DocType: Naming Series,User must always select,Потребителят трябва винаги да изберете
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,Employee
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Внос имейл от
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Покани като Потребител
 DocType: Features Setup,After Sale Installations,Следпродажбени инсталации
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} е напълно таксуван
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} е напълно таксуван
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартни договорни условия за покупко-продажба или покупка.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Група от Ваучер
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,Масовото изпращане
 DocType: Page,Standard,Стандарт
 DocType: Rename Tool,File to Rename,Файл за Преименуване
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},"Purchse номер на поръчката, необходима за т {0}"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Покажи Плащания
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Предвидени BOM {0} не съществува за позиция {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График за поддръжка {0} трябва да се отмени преди анулира тази поръчка за продажба
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График за поддръжка {0} трябва да се отмени преди анулира тази поръчка за продажба
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Размер
 DocType: Notification Control,Expense Claim Approved,Expense претенция Одобрен
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Лекарствена
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,Присъствие към дне
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup входящия сървър за продажби имейл ID. (Например sales@example.com)
 DocType: Warranty Claim,Raised By,Повдигнат от
 DocType: Payment Tool,Payment Account,Разплащателна сметка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
-sites/assets/js/list.min.js +23,Draft,Проект
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Проект
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаторни Off
 DocType: Quality Inspection Reading,Accepted,Приет
 DocType: User,Female,Женски
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Доставка Правило Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Тъй като има съществуващи сделки борсови за тази позиция, \ не можете да промените стойностите на 'има сериен номер "," Има Batch Не "," Трябва ли Фондова т "и" Метод на оценка ""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick вестник Влизане
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
 DocType: Employee,Previous Work Experience,Предишен трудов опит
 DocType: Stock Entry,For Quantity,За Количество
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Моля, въведете Планиран Количество за позиция {0} на ред {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} не е подадена
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Искания за предмети.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} не е подадена
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Искания за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отделно производство цел ще бъде създаден за всеки завършен добра позиция.
 DocType: Purchase Invoice,Terms and Conditions1,Условия и Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Пълна Setup
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter мей
 DocType: Delivery Note,Transporter Name,Превозвач Име
 DocType: Contact,Enter department to which this Contact belongs,"Въведете отдела, в който се свържете с нас принадлежи"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Общо Отсъства
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Точка или склад за ред {0} не съвпада Материал Искане
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Точка или склад за ред {0} не съвпада Материал Искане
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Мерна единица
 DocType: Fiscal Year,Year End Date,Година Крайна дата
 DocType: Task Depends On,Task Depends On,Task зависи от
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Договор Крайна дата трябва да бъде по-голяма от Дата на Присъединяване
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Трето лице дистрибутор / дилър / комисионер / филиал / търговец, който продава на фирми продукти срещу комисионна."
 DocType: Customer Group,Has Child Node,Има Node Child
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} срещу Поръчка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} срещу Поръчка {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Въведете статични параметри на URL тук (Напр. Подател = ERPNext, потребителско име = ERPNext, парола = 1234 и т.н.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} не е в никоя активна фискална година. За повече информация провери {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Това е пример за сайт автоматично генерирано от ERPNext
@@ -2021,11 +2032,9 @@ DocType: Note,Note,Забележка
 DocType: Purchase Receipt Item,Recd Quantity,Recd Количество
 DocType: Email Account,Email Ids,Email документи за самоличност
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече Точка {0} от продажби Поръчка количество {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Задай като отпушат
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Акаунт
 DocType: Tax Rule,Billing City,Billing City
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Този отпуск Application изчаква одобрение. Само Оставете одобряващ да актуализирате състоянието.
 DocType: Global Defaults,Hide Currency Symbol,Скриване на валути Symbol
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","напр Bank, в брой, с кредитна карта"
 DocType: Journal Entry,Credit Note,Кредитно Известие
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Общо (Количе
 DocType: Installation Note Item,Installed Qty,Инсталирана Количество
 DocType: Lead,Fax,Факс
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Изпратено
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Изпратено
 DocType: Salary Structure,Total Earning,Общо Приходи
 DocType: Purchase Receipt,Time at which materials were received,При която бяха получени материали Time
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Моите адреси
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Браншо
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Комунални Разходи
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,Над 90 - 
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Над 90 - 
 DocType: Buying Settings,Default Buying Price List,Default Изкупуването Ценоразпис
 ,Download Backups,Изтегляне на резервни копия
 DocType: Notification Control,Sales Order Message,Продажбите Поръчка Message
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Изберете Служители
 DocType: Bank Reconciliation,To Date,Към Днешна Дата
 DocType: Opportunity,Potential Sales Deal,Потенциални Продажби Deal
-sites/assets/js/form.min.js +308,Details,Детайли
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Детайли
 DocType: Purchase Invoice,Total Taxes and Charges,Общо данъци и такси
 DocType: Employee,Emergency Contact,Контактите При Аварийни Случаи
 DocType: Item,Quality Parameters,Параметри за качество
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,Получени Количество
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Родител Точка
 DocType: Account,Account Type,Сметка Тип
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху "Генериране Schedule""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху "Генериране Schedule""
 ,To Produce,Да Произвежда
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За поредна {0} в {1}. За да {2} включат в курс т, редове {3} трябва да се включат и"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Наименование на пакета за доставка (за печат)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Сплескване
 DocType: Account,Income Account,Дохода
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Формоване
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Current Количество
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Вижте "Курсове на материали на основата на" в Остойностяване Раздел
 DocType: Appraisal Goal,Key Responsibility Area,Key Отговорност Area
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Всички адреси.
 DocType: Company,Stock Settings,Сток Settings
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление Customer Group Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,New Cost Center Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,New Cost Center Име
 DocType: Leave Control Panel,Leave Control Panel,Оставете Control Panel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Не подразбиране Адрес Template намерен. Моля, създайте нов от Setup> Печат и Branding> Адрес Template."
 DocType: Appraisal,HR User,HR потребителя
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Заплащане Tool Подробности
 ,Sales Browser,Продажбите Browser
 DocType: Journal Entry,Total Credit,Общ кредит
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Местен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Местен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредитите и авансите (активи)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Длъжници
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Голям
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Никой служител е открит!
 DocType: C-Form Invoice Detail,Territory,Територия
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Моля, не споменете на посещенията, изисквани"
+DocType: Purchase Order,Customer Address Display,Customer Адрес Display
 DocType: Stock Settings,Default Valuation Method,Метод на оценка Default
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полиране
 DocType: Production Order Operation,Planned Start Time,Планиран Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Разпределен
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Close Баланс и книга печалбата или загубата.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Default мерната единица за т {0} не може да се променя директно, защото \ вас вече са направили някаква сделка (и) с друга мерна единица. За да промените по подразбиране мерна единица, \ употреба "мерна единица Сменете Utility" инструмент по Фондова модул."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Посочете Валутен курс за конвертиране на една валута в друга
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Цитат {0} е отменен
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитат {0} е отменен
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Общият размер
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Служител {0} е бил в отпуск по {1}. Не може да се маркира и обслужване.
 DocType: Sales Partner,Targets,Цели
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Това е корен група клиенти и не може да се редактира.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Моля, настройка на вашия сметкоплан, преди да започнете счетоводни записвания"
 DocType: Purchase Invoice,Ignore Pricing Rule,Игнориране на ценообразуване Правило
-sites/assets/js/list.min.js +24,Cancelled,Отменен
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Отменен
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,От дата в структурата на заплатите не може да бъде по-малка от Employee Присъединявайки Дата.
 DocType: Employee Education,Graduate,Завършвам
 DocType: Leave Block List,Block Days,Блок Days
 DocType: Journal Entry,Excise Entry,Акцизите Влизане
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Внимание: Продажби Поръчка {0} вече съществува срещу поръчка на клиента {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Внимание: Продажби Поръчка {0} вече съществува срещу поръчка на клиента {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,Фондова Получени 
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Брутно възнаграждение + просрочия сума + Инкасо сума - Total Приспадане
 DocType: Monthly Distribution,Distribution Name,Разпределение Име
 DocType: Features Setup,Sales and Purchase,Продажба и покупка
-DocType: Purchase Order Item,Material Request No,Материал Заявка Не
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
+DocType: Supplier Quotation Item,Material Request No,Материал Заявка Не
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Скоростта, с която на клиента валута се превръща в основна валута на компанията"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} е бил отписан успешно от този списък.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company валути)
-apps/frappe/frappe/templates/base.html +132,Added,Добавен
+apps/frappe/frappe/templates/base.html +134,Added,Добавен
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управление Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Фактурата за продажба
 DocType: Journal Entry Account,Party Balance,Party Balance
 DocType: Sales Invoice Item,Time Log Batch,Време Log Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Моля изберете Apply отстъпка от
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Моля изберете Apply отстъпка от
 DocType: Company,Default Receivable Account,Default вземания Акаунт
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Създайте Bank вписване на обща заплата за над избрани критерии
 DocType: Stock Entry,Material Transfer for Manufacture,Материал Transfer за Производство
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Вземете съответ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Счетоводен запис за Складова аличност
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Печели доста
 DocType: Sales Invoice,Sales Team1,Продажбите Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Точка {0} не съществува
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Точка {0} не съществува
 DocType: Sales Invoice,Customer Address,Customer Адрес
 apps/frappe/frappe/desk/query_report.py +136,Total,Общо
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесете Допълнителна отстъпка от
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,Проверка на качес
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спрей формиране
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Сметка {0} е замразена
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Сметка {0} е замразена
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Legal Entity / Дъщерно дружество с отделен сметкоплан, членуващи в организацията."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Храни, напитки и тютюневи"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL или BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Мога само да направи плащане срещу нетаксувано {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Ставка на Комисията не може да бъде по-голяма от 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентаризация Level
 DocType: Stock Entry,Subcontract,Подизпълнение
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Моля, въведете {0} първа"
 DocType: Production Planning Tool,Get Items From Sales Orders,Вземи артикули от продажби Поръчки
 DocType: Production Order Operation,Actual End Time,Actual End Time 
 DocType: Production Planning Tool,Download Materials Required,Свали Необходими материали
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,Планиран
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Моля изберете позиция, където "е Фондова Позиция" е "Не" и "Е-продажба точка" е "Да" и няма друг Bundle продукта"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете месец Distribution да неравномерно разпределяне цели през месеца.
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оценка
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Ценоразпис на валута не е избрана
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ценоразпис на валута не е избрана
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Позиция Row {0}: Покупка Квитанция {1} не съществува в таблицата по-горе "Покупка Приходи"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Служител {0} вече е подал молба за {1} {2} между и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Служител {0} вече е подал молба за {1} {2} между и {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Проект Начална дата
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,До
 DocType: Rename Tool,Rename Log,Преименуване Log
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листните възли са позволени в сделка
 DocType: Expense Claim,Expense Approver,Expense одобряващ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Квитанция приложените аксесоари
-sites/assets/js/erpnext.min.js +48,Pay,Плащане
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Плащане
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Към за дата
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Дневници за поддържане състоянието на доставка SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Стържещ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Свиване опаковане
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Предстоящите дейности
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Предстоящите дейности
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потвърден
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Доставчик> Доставчик Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Моля, въведете облекчаване дата."
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"В
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Издателите на вестници
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изберете фискална година
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Топене
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Вие сте в отпуск одобряващ за този запис. Моля Актуализирайте "Състояние" и спести
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане Level
 DocType: Attendance,Attendance Date,Присъствие Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Заплата раздялата въз основа на доходите и приспадане.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center със съществуващите операции не могат да бъдат превърнати в група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Доставчик (ци)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Невалиден период
 DocType: Customer,Credit Limit,Кредитен лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изберете тип сделка
 DocType: GL Entry,Voucher No,Отрязък №
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Templ
 DocType: Customer,Address and Contact,Адрес и контакти
 DocType: Customer,Last Day of the Next Month,Последен ден на следващия месец
 DocType: Employee,Feedback,Обратна връзка
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Мейнт. Разписание
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Мейнт. Разписание
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивно струйно обработване
 DocType: Stock Settings,Freeze Stock Entries,Фиксиране на вписване в запасите
 DocType: Website Settings,Website Settings,Настройки Сайт
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,Изходящ
 DocType: Material Request,Requested For,Поискана за
 DocType: Quotation Item,Against Doctype,Срещу Вид Документ
 DocType: Delivery Note,Track this Delivery Note against any Project,Абонирай се за тази доставка Note срещу всеки проект
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root сметка не може да бъде изтрита
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root сметка не може да бъде изтрита
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показване на вписване в запасите
 ,Is Primary Address,Дали Основен адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа в прогрес Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Референтен # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Референтен # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управление на адреси
 DocType: Pricing Rule,Item Code,Код
 DocType: Production Planning Tool,Create Production Orders,Създаване на производствени поръчки
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,Потребителят Забележка
 DocType: Lead,Market Segment,Пазарен сегмент
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Служител Вътрешен Work История
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Закриване (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Закриване (Dr)
 DocType: Contact,Passive,Пасивен
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Пореден № {0} не е в наличност
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Данъчна шаблон за продажба сделки.
 DocType: Sales Invoice,Write Off Outstanding Amount,Отпишат дължимата сума
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Проверете дали имате нужда от автоматични периодични фактури. След представянето на каквото и фактура продажби, повтарящо раздел ще се вижда."
 DocType: Account,Accounts Manager,Мениджър Сметки
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Време Log {0} трябва да бъде "Изпратен"
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Време Log {0} трябва да бъде "Изпратен"
 DocType: Stock Settings,Default Stock UOM,Default фондова мерна единица
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Остойностяване процент въз основа на Type активност (на час)
 DocType: Production Planning Tool,Create Material Requests,Създаване на материали Исканията
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Bank помирение
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Получаване на актуализации
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Материал Заявка {0} е отменен или спрян
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Добавяне на няколко примерни записи
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Оставете Management
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставете Management
 DocType: Event,Groups,Групи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Групата от Профил
 DocType: Sales Order,Fully Delivered,Напълно Доставени
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Продажби Екстри
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет за Смтка {1} срещу Разходен Център {2} ще превишава с {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
-DocType: Leave Allocation,Carry Forwarded Leaves,Извършва предаден Leaves
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"От дата" трябва да е след "Към днешна дата"
 ,Stock Projected Qty,Фондова Прогнозно Количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Customer {0} не принадлежи на проекта {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Customer {0} не принадлежи на проекта {1}
 DocType: Sales Order,Customer's Purchase Order,Поръчката на Клиента
 DocType: Warranty Claim,From Company,От Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Стойност или Количество
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Търговец на дребно
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit За сметка трябва да бъде партида Баланс
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всички Видове Доставчик
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Код е задължително, тъй като опция не се номерира автоматично"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Цитат {0} не от типа {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код е задължително, тъй като опция не се номерира автоматично"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитат {0} не от типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График за техническо обслужване Точка
 DocType: Sales Order,%  Delivered,% Доставени
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Овърдрафт Акаунт
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Направи Заплата Slip
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Отварям
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Обезпечени кредити
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Яки Продукти
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,Оценка
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Леене Загубил-пяна
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Чертеж
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата се повтаря
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Оставете одобряващ трябва да бъде един от {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Оставете одобряващ трябва да бъде един от {0}
 DocType: Hub Settings,Seller Email,Продавач Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общата покупна цена на придобиване (чрез покупка на фактура)
 DocType: Workstation Working Hour,Start Time,Начален Час
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нетната сума (Company валути)
 DocType: BOM Operation,Hour Rate,Час Курсове
 DocType: Stock Settings,Item Naming By,"Позиция наименуването им,"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,От цитата
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Друг период Закриване Влизане {0} е направено след {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,От цитата
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Друг период Закриване Влизане {0} е направено след {1}
 DocType: Production Order,Material Transferred for Manufacturing,"Материал, прехвърлен за производство"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Сметка {0} не съществува
 DocType: Purchase Receipt Item,Purchase Order Item No,Поръчка за покупка Позиция №
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,"Инспекция, изискван"
 DocType: Purchase Invoice Item,PR Detail,PR Подробности
 DocType: Sales Order,Fully Billed,Напълно Обявен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Парични средства в брой
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Доставка склад изисква за склад т {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Доставка склад изисква за склад т {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Брутното тегло на опаковката. Обикновено нетно тегло + опаковъчен материал тегло. (За печат)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Потребителите с тази роля е разрешено да задават замразени сметки и да се създаде / модифицира счетоводни записи срещу замразените сметки
 DocType: Serial No,Is Cancelled,Дали Отменен
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Моите пратки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Моите пратки
 DocType: Journal Entry,Bill Date,Бил Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Дори и да има няколко ценови правила с най-висок приоритет, се прилагат след това следните вътрешни приоритети:"
 DocType: Supplier,Supplier Details,Доставчик Детайли
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Банков Превод
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Моля изберете Bank Account
 DocType: Newsletter,Create and Send Newsletters,Създаване и изпращане Бюлетини
-sites/assets/js/report.min.js +107,From Date must be before To Date,От дата трябва да е преди Към днешна дата
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,От дата трябва да е преди Към днешна дата
 DocType: Sales Order,Recurring Order,Повтарящо Поръчка
 DocType: Company,Default Income Account,Account Default подоходно
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / Customer
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Склад за мерна ед
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
 ,Projected,Проектиран
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Пореден № {0} не принадлежи на Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Забележка: Системата няма да се покажат над-доставка и свръх-резервации за позиция {0} като количество или стойност е 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Забележка: Системата няма да се покажат над-доставка и свръх-резервации за позиция {0} като количество или стойност е 0
 DocType: Notification Control,Quotation Message,Цитат на ЛС
 DocType: Issue,Opening Date,Откриване Дата
 DocType: Journal Entry,Remark,Забележка
 DocType: Purchase Receipt Item,Rate and Amount,Процент и размер
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Пробиване
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,От продажби Поръчка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,От продажби Поръчка
 DocType: Blog Category,Parent Website Route,Родител Website Route
 DocType: Sales Order,Not Billed,Не Обявен
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,И двете Warehouse трябва да принадлежи към една и съща фирма
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,"Не са добавени контакти, все още."
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,"Не са добавени контакти, все още."
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Не е активна
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Against Invoice Posting Date 
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Поземлен Cost Ваучер Сума
 DocType: Time Log,Batched for Billing,Дозирани за фактуриране
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Законопроекти, повдигнати от доставчици."
 DocType: POS Profile,Write Off Account,Отпишат Акаунт
-sites/assets/js/erpnext.min.js +26,Discount Amount,Отстъпка Сума
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Отстъпка Сума
 DocType: Purchase Invoice,Return Against Purchase Invoice,Върнете Срещу фактурата за покупка
 DocType: Item,Warranty Period (in days),Гаранционен срок (в дни)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,например ДДС
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Позиция 4
 DocType: Journal Entry Account,Journal Entry Account,Вестник Влизане Акаунт
 DocType: Shopping Cart Settings,Quotation Series,Цитат Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Една статия, съществува със същото име ({0}), моля да промените името на стокова група или преименувате елемента"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Една статия, съществува със същото име ({0}), моля да промените името на стокова група или преименувате елемента"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Формиране Hot метална газ
 DocType: Sales Order Item,Sales Order Date,Продажбите Поръчка Дата
 DocType: Sales Invoice Item,Delivered Qty,Доставени Количество
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Клиент или доставчик Детайли
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Определете
 DocType: Lead,Lead Owner,Lead Собственик
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Се изисква Warehouse
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Се изисква Warehouse
 DocType: Employee,Marital Status,Семейно Положение
 DocType: Stock Settings,Auto Material Request,Auto Материал Искане
 DocType: Time Log,Will be updated when billed.,"Ще бъде актуализиран, когато таксувани."
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Свободно Batch Количество в От Warehouse
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Current BOM и Нова BOM не могат да бъдат едни и същи
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Дата на пенсиониране трябва да е по-голяма от Дата на Присъединяване
 DocType: Sales Invoice,Against Income Account,Срещу Приходна Сметка
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,Актуализация Фондова
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Свръхзаглаждането
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different мерна единица за елементи ще доведе до неправилно (Total) Нетна стойност на теглото. Уверете се, че нетното тегло на всеки артикул е в една и съща мерна единица."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Курсове
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Моля, дръпнете елементи от Delivery Note"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Моля, дръпнете елементи от Delivery Note"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Холни влизания {0} са не-свързани
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Запис на всички съобщения от тип имейл, телефон, чат, посещение и т.н."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Моля, посочете закръглят Cost Center в Company"
 DocType: Purchase Invoice,Terms,Условия
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Създаване на нова
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Създаване на нова
 DocType: Buying Settings,Purchase Order Required,Поръчка за покупка Задължително
 ,Item-wise Sales History,Точка-мъдър Продажби История
 DocType: Expense Claim,Total Sanctioned Amount,Общо санкционирани Сума
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Заплата Slip При
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Бележки
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Изберете група възел на първо място.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цел трябва да бъде един от {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Попълнете формата и да го запишете
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Попълнете формата и да го запишете
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Свали доклад, съдържащ всички суровини с най-новите си статус инвентара"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Облицовка
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Оставете Balance Преди Application
 DocType: SMS Center,Send SMS,Изпратете SMS
 DocType: Company,Default Letter Head,По подразбиране Letter Head
 DocType: Time Log,Billable,Подлежащи на таксуване
 DocType: Authorization Rule,This will be used for setting rule in HR module,Това ще бъде използвано за създаване правило в HR модул
 DocType: Account,Rate at which this tax is applied,"Скоростта, с която се прилага този данък"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Пренареждане Количество
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Пренареждане Количество
 DocType: Company,Stock Adjustment Account,Склад за приспособяване Акаунт
 DocType: Journal Entry,Write Off,Отписвам
 DocType: Time Log,Operation ID,Операция ID
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Отстъпка Fields ще се предлага в Поръчката, Покупка разписка, фактурата за покупка"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Име на нов профил. Забележка: Моля, не създават сметки за клиенти и доставчици"
 DocType: Report,Report Type,Тип на отчета
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Товарене
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Товарене
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Сменете Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Държава мъдър адрес по подразбиране Templates
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Доставчик доставя на Клиента
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Покажи данък разпадането
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Внос и експорт на данни
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Ако включат в производствената активност. Активира т "се произвежда"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Фактура Публикуване Дата
 DocType: Sales Invoice,Rounded Total,Rounded Общо
 DocType: Product Bundle,List items that form the package.,"Списък на елементите, които формират пакета."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процентно разпределение следва да е равна на 100%
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
 DocType: Company,Default Cash Account,Default Cash Акаунт
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (не клиент или доставчик) майстор.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Моля, въведете "Очаквана дата на доставка""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Notes {0} трябва да се отмени преди анулирането този Продажби Поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Моля, въведете "Очаквана дата на доставка""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Notes {0} трябва да се отмени преди анулирането този Продажби Поръчка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Платената сума + отпишат сума не може да бъде по-голяма от Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не е валиден Партиден номер за {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Забележка: Няма достатъчно отпуск баланс за отпуск Тип {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Кол не Свободно в склада {1} на {2} {3}. В наличност Количество: {4}, трансфер Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Позиция 3
+DocType: Purchase Order,Customer Contact Email,Customer Контакт Email
 DocType: Event,Sunday,Неделя
 DocType: Sales Team,Contribution (%),Принос (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от "пари или с банкова сметка" Не е посочено
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Отговорности
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Шаблон
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажби лице Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Моля, въведете поне една фактура в таблицата"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Добави Потребители
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),Действителна Нач
 DocType: Stock Reconciliation Item,Before reconciliation,Преди помирение
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},За да {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Данъци и такси Добавен (Company валути)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
 DocType: Sales Order,Partly Billed,Частично Обявен
 DocType: Item,Default BOM,Default BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общият размер на неизплатените Amt
 DocType: Time Log Batch,Total Hours,Общо Часа
 DocType: Journal Entry,Printing Settings,Настройки за печат
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобилен
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Листата за вид {0} вече разпределена за Employee {1} за фискална година {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Е необходим елемент
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метални шприцоване
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,От Бележка за доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,От Бележка за доставка
 DocType: Time Log,From Time,От време
 DocType: Notification Control,Custom Message,Персонализирано съобщение
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестиционно банкиране
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,A Lead with this emai
 DocType: Stock Entry,From BOM,От BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основен
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Сток сделки преди {0} са замразени
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Моля, кликнете върху "Генериране Schedule""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,"Към днешна дата трябва да бъде една и съща от датата, за половин ден отпуск"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Моля, кликнете върху "Генериране Schedule""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,"Към днешна дата трябва да бъде една и съща от датата, за половин ден отпуск"
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","напр кг, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Референтен Не е задължително, ако сте въвели, Референция Дата"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Референтен Не е задължително, ако сте въвели, Референция Дата"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Дата на Присъединяване трябва да е по-голяма от Дата на раждане
 DocType: Salary Structure,Salary Structure,Структура Заплата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Цена правило съществува с едни и същи критерии, моля решаване \ конфликт чрез възлагане приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авиолиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Материал Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Материал Issue
 DocType: Material Request Item,For Warehouse,За Warehouse
 DocType: Employee,Offer Date,Оферта Дата
 DocType: Hub Settings,Access Token,Access Token
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,Откриване на времето
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и до датите, изисквани"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
 DocType: Shipping Rule,Calculate Based On,Изчислете основава на
+DocType: Delivery Note Item,From Warehouse,От Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Пробиване
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Бластване
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Total
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,Изменен От
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Суров Материал
 DocType: Leave Application,Follow via Email,Следвайте по имейл
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Данъчен сума след Сума Отстъпка
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Предвид Child съществува за този профил. Не можете да изтриете този профил.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Предвид Child съществува за този профил. Не можете да изтриете този профил.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Или целта Количество или целева сума е задължителна
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Не подразбиране BOM съществува за т {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Моля изберете Публикуване Дата първа
-DocType: Leave Allocation,Carry Forward,Пренасяне
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Не подразбиране BOM съществува за т {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Моля изберете Публикуване Дата първа
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Откриване Дата трябва да е преди крайната дата
+DocType: Leave Control Panel,Carry Forward,Пренасяне
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Cost Center със съществуващите операции не могат да бъдат превърнати в Леджър
 DocType: Department,Days for which Holidays are blocked for this department.,Дни за които Holidays са блокирани за този отдел.
 ,Produced,Продуциран
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Общо (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Датата, на която повтарящ цел ще бъде да спре"
 DocType: Quality Inspection,Item Serial No,Позиция Пореден №
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} трябва да се намали с {1} или е необходимо да се увеличи толерантност на препълване 
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} трябва да се намали с {1} или е необходимо да се увеличи толерантност на препълване 
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Общо Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Сериализирани т {0} не може да бъде актуализиран \ използвайки фондова помирение
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Трансфер Материал на доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Трансфер Материал на доставчик
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Не може да има Warehouse. Warehouse трябва да бъде определен от Фондова Влизане или покупка Разписка
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Създаване на цитата
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Всички тези елементи вече са били фактурирани
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Всички тези елементи вече са били фактурирани
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може да бъде одобрен от {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Доставка Правило Условия
 DocType: BOM Replace Tool,The new BOM after replacement,Новият BOM след подмяна
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Операция ID не е зададено
 DocType: Production Order,Planned Start Date,Планирана начална дата
 DocType: Serial No,Creation Document Type,Създаване Type Document
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Мейнт. Посещение
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Мейнт. Посещение
 DocType: Leave Type,Is Encash,Дали инкасира
 DocType: Purchase Invoice,Mobile No,Mobile Не
 DocType: Payment Tool,Make Journal Entry,Направи вестник Влизане
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,Нови листа Отпусн
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project-мъдър данни не е достъпно за оферта
 DocType: Project,Expected End Date,Очаквано Крайна дата
 DocType: Appraisal Template,Appraisal Template Title,Оценка Template Title
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Търговски
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Търговски
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родител т {0} не трябва да бъде фондова Точка
 DocType: Cost Center,Distribution Id,Id Разпределение
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Яки Услуги
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},"Цена Умение {0} трябва да бъде в границите от {1} {2}, за да в инкрементите {3}"
 DocType: Tax Rule,Sales,Търговски
 DocType: Stock Entry Detail,Basic Amount,Основен размер
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Warehouse изисква за склад т {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse изисква за склад т {0}
+DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,По подразбиране вземания Accounts
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Нарязване
 DocType: Tax Rule,Billing State,Billing членка
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламиниране
 DocType: Item Reorder,Transfer,Прехвърляне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
 DocType: Authorization Rule,Applicable To (Employee),Приложими по отношение на (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Поради Дата е задължително
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Увеличаване на Умение {0} не може да бъде 0
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,На дребно
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Customer {0} не съществува
 DocType: Attendance,Absent,Липсващ
 DocType: Product Bundle,Product Bundle,Каталог Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Invalid позоваване {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Смачкване
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Покупка данъци и такси Template
 DocType: Upload Attendance,Download Template,Изтеглете шаблони
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,Забележки
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина Код
 DocType: Journal Entry,Write Off Based On,Отписване на базата на
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Монтаж рекорд за Serial No.
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Монтаж рекорд за Serial No.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Непрекъснато леене
-sites/assets/js/erpnext.min.js +10,Please specify a,"Моля, посочете"
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Моля, посочете"
 DocType: Offer Letter,Awaiting Response,Очаква Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Горе
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold оразмеряване
 DocType: Salary Slip,Earning & Deduction,Приходи & Приспадане
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Сметка {0} не може да бъде Група
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Област
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,"По избор. Тази настройка ще бъде използван, за да филтрирате по различни сделки."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"По избор. Тази настройка ще бъде използван, за да филтрирате по различни сделки."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Отрицателна оценка процент не е позволено
 DocType: Holiday List,Weekly Off,Седмичен Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Защото например 2012, 2012-13"
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Издут
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Леене Evaporative-модел
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Представителни Разходи
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Фактурата за продажба {0} трябва да се отмени преди анулирането този Продажби Поръчка
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Възраст
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Фактурата за продажба {0} трябва да се отмени преди анулирането този Продажби Поръчка
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Възраст
 DocType: Time Log,Billing Amount,Billing Сума
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Невалиден количество, определено за т {0}. Количество трябва да бъде по-голяма от 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Заявленията за отпуск.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Правни разноски
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Денят от месеца, на която автоматично, за да се генерира например 05, 28 и т.н."
 DocType: Sales Invoice,Posting Time,Публикуване на времето
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Вижте това, ако искате да принуди потребителя да избере серия преди да запазите. Няма да има по подразбиране, ако проверите това."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Не позиция с Пореден № {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Отворени Известия
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Отворени Известия
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Преки разходи
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Наистина ли искате да отпуши тази Материал Заявка?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer приходите
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Пътни Разходи
 DocType: Maintenance Visit,Breakdown,Авария
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Както по Дата
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Доизкусурващи
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Изпитание
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,"Default Warehouse е задължително за склад, т."
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,"Default Warehouse е задължително за склад, т."
 DocType: Feed,Full Name,Пълно Име
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Клинч
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Изплащането на заплатите за месец {0} и година {1}
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Добавет
 DocType: Buying Settings,Default Supplier Type,Default доставчик Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Добиване
 DocType: Production Order,Total Operating Cost,Общо оперативни разходи
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Забележка: Точка {0} влезе няколко пъти
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Забележка: Точка {0} влезе няколко пъти
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Всички контакти.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Фирма Съкращение
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цит
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роля за редактиране замразена
 ,Territory Target Variance Item Group-Wise,Територия Target Вариацията т Group-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Всички групи клиенти
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден за {1} {2} да.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден за {1} {2} да.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Данъчна Template е задължително.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Account {0}: Родителска сметка {1} не съществува
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценоразпис Rate (Company валути)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',"{0} {1} състояние е ""Спряно"""
 DocType: Account,Temporary,Временен
 DocType: Address,Preferred Billing Address,Предпочитана Billing Адрес
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процентно разпределение
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Позиция Wise Tax
 DocType: Purchase Order Item,Supplier Quotation,Доставчик оферта
 DocType: Quotation,In Words will be visible once you save the Quotation.,По думите ще бъде видим след като спаси цитата.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Гладене
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} е спрян
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} е спрян
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
 DocType: Lead,Add to calendar on this date,Добави в календара на тази дата
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила за добавяне на транспортни разходи.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Предстоящи събития
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящи събития
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Се изисква Customer
 DocType: Letter Head,Letter Head,Писмо Head
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Бързо Влизане
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} е задължително за Връщане
 DocType: Purchase Order,To Receive,Получавам
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Свиване монтаж
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Поне един склад е задължително
 DocType: Serial No,Out of Warranty,Извън гаранция
 DocType: BOM Replace Tool,Replace,Заменете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,"Моля, въведете подразбиране Мерна единица"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Моля, въведете подразбиране Мерна единица"
 DocType: Purchase Invoice Item,Project Name,Име на проекта
 DocType: Supplier,Mention if non-standard receivable account,"Споменете, ако нестандартно вземане предвид"
 DocType: Workflow State,Edit,Редактирам
 DocType: Journal Entry Account,If Income or Expense,Ако приход или разход
 DocType: Features Setup,Item Batch Nos,Позиция Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Склад за Value Разлика
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Човешки Ресурси
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Човешки Ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Заплащане помирение плащане
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Данъчни активи
 DocType: BOM Item,BOM No,BOM Не
 DocType: Contact Us Settings,Pincode,На пощенския код
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Вестник Влизане {0} не разполага сметка {1} или вече съвпадащи срещу друг ваучер
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Вестник Влизане {0} не разполага сметка {1} или вече съвпадащи срещу друг ваучер
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,The BOM който ще бъде заменен
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New фондова мерна единица трябва да бъде различен от сегашния състав мерна единица
 DocType: Account,Debit,Дебит
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Листата трябва да бъдат разпределени в кратни на 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листата трябва да бъдат разпределени в кратни на 0,5"
 DocType: Production Order,Operation Cost,Операция Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Качване на посещаемостта от .csv файл
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Изключително Amt
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Деф
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","За да зададете този въпрос, използвайте "Assign" бутона в страничната лента."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Запаси по-стари от [Days]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако две или повече ценови правила са открити на базата на горните условия, се прилага приоритет. Приоритет е число между 0 до 20, докато стойността по подразбиране е нула (празно). Висше номер означава, че ще имат предимство, ако има няколко ценови правила с едни и същи условия."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Срещу фактура
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Фискална година: {0} не съществува
 DocType: Currency Exchange,To Currency,За да валути
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Позволете на следните потребители да одобрят Оставете Applications за блокови дни.
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate
 DocType: Stock Entry Detail,Additional Cost,Допълнителна Cost
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Финансова година Крайна дата
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрира по Ваучер Не, ако групирани по Ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Направи Доставчик оферта
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Направи Доставчик оферта
 DocType: Quality Inspection,Incoming,Входящ
 DocType: BOM,Materials Required (Exploded),Необходими материали (разглобен)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),"Намаляване Приходи за да напуснат, без Pay (LWP)"
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Пореден № {1} не съвпада с {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual отпуск
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Забележка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Забележка: {0}
 ,Delivery Note Trends,Бележка за доставка Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Тази Седмица Резюме
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} трябва да бъде Закупен или Подизпълнителен в ред {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} трябва да бъде Закупен или Подизпълнителен в ред {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Сметка: {0} може да се актуализира само чрез Складови трансакции
 DocType: GL Entry,Party,Парти
 DocType: Sales Order,Delivery Date,Дата На Доставка
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Изкупуването Курсове
 DocType: Task,Actual Time (in Hours),Действителното време (в часове)
 DocType: Employee,History In Company,История През Company
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Бюлетини
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Бюлетини
 DocType: Address,Shipping,Кораби
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фондова Ledger Влизане
 DocType: Department,Leave Block List,Оставете Block List
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,Одитор
 DocType: Purchase Order,End date of current order's period,Крайна дата на периода на текущата поръчката
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Направи оферта Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Връщане
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Default мерната единица за Variant трябва да е същото като Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Default мерната единица за Variant трябва да е същото като Template
 DocType: DocField,Fold,Гънка
 DocType: Production Order Operation,Production Order Operation,Производство Поръчка Operation
 DocType: Pricing Rule,Disable,Правя неспособен
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Доклади до
 DocType: SMS Settings,Enter url parameter for receiver nos,Въведете URL параметър за приемник с номера
 DocType: Sales Invoice,Paid Amount,Платената сума
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Закриване на профила {0} трябва да е от тип "Отговорност"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Закриване на профила {0} трябва да е от тип "Отговорност"
 ,Available Stock for Packing Items,"Свободно фондова за артикули, Опаковки"
 DocType: Item Variant,Item Variant,Позиция Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Настройването на тази Адрес Шаблон по подразбиране, тъй като няма друг случай на неизпълнение"
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управление на качеството
 DocType: Production Planning Tool,Filter based on customer,Филтър на базата на клиент
 DocType: Payment Tool Detail,Against Voucher No,Срещу ваучър №
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Моля, въведете количество за т {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Моля, въведете количество за т {0}"
 DocType: Employee External Work History,Employee External Work History,Служител за външна работа
 DocType: Tax Rule,Purchase,Покупка
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Количество
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials","Агрегат група ** артикули **
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Пореден № е задължително за т {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Моля, посочете от / до варира"
-sites/assets/js/desk.min.js +7652,Created By,Създадено От
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Създадено От
 DocType: Serial No,Under AMC,Под AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,"Позиция процент за оценка се преизчислява за това, се приземи ваучер сума на разходите"
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Настройките по подразбиране за продажба на сделки.
 DocType: BOM Replace Tool,Current BOM,Current BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Добави Сериен №
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Добави Сериен №
 DocType: Production Order,Warehouses,Складове
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print и стационарни
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Група Node
 DocType: Payment Reconciliation,Minimum Amount,"Минималната сума,"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Актуализиране на готова продукция
 DocType: Workstation,per hour,на час
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Серия {0} вече се използва в {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Серия {0} вече се използва в {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Account for the warehouse (Perpetual Inventory) will be created under this Account. 
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse не може да се заличи, тъй като съществува влизане фондова книга за този склад."
 DocType: Company,Distribution,Разпределение
-sites/assets/js/erpnext.min.js +50,Amount Paid,"Сума, платена"
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,"Сума, платена"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Ръководител На Проект
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Изпращане
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max отстъпка разрешено за покупка: {0} е {1}%
 DocType: Customer,Default Taxes and Charges,По подразбиране данъци и такси
 DocType: Account,Receivable,За получаване
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Не е позволено да се промени Доставчик като вече съществува поръчка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роля, която е оставена да се представят сделки, които надвишават кредитни лимити, определени."
 DocType: Sales Invoice,Supplier Reference,Доставчик Референтен
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ако е избрано, BOM за скрепление позиции ще се счита за получаване на суровини. В противен случай, всички елементи скрепление ще бъдат третирани като суровина."
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,Добавяне / Премахва
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Сделката не допуска срещу спря производството Поръчка {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","За да зададете тази фискална година, като по подразбиране, щракнете върху "По подразбиране""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup входящия сървър за подкрепа имейл ID. (Например support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Недостиг Количество
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
 DocType: Salary Slip,Salary Slip,Заплата Slip
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полировъчен
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"Към днешна дата" се изисква
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Когато някоя от проверени сделките се "Изпратен", имейл изскачащ автоматично отваря, за да изпратите електронно писмо до свързаната с "контакт" в тази сделка, със сделката като прикачен файл. Потребителят може или не може да изпрати имейл."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 DocType: Employee Education,Employee Education,Служител Образование
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Сметка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Пореден № {0} вече е получил
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,Производство на потребите
 DocType: Purchase Order,Raw Materials Supplied,"Сурови материали, доставени"
 DocType: Purchase Invoice,Recurring Print Format,Повтарящо Print Format
 DocType: Communication,Series,Серия
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Очаквана дата на доставка не може да бъде преди поръчка Дата
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Очаквана дата на доставка не може да бъде преди поръчка Дата
 DocType: Appraisal,Appraisal Template,Оценка Template
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Позиция Класификация
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,Настройки ТРЗ
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Съвпадение без свързана фактури и плащания.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Направи поръчка
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root не може да има център на разходите майка
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Изберете Марка ...
 DocType: Sales Invoice,C-Form Applicable,C-форма приложима
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Операция на времето трябва да е по-голямо от 0 за Operation {0}
 DocType: Supplier,Address and Contacts,Адрес и контакти
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Получи изключително Ваучери
 DocType: Warranty Claim,Resolved By,Разрешен от
 DocType: Appraisal,Start Date,Начална Дата
-sites/assets/js/desk.min.js +7629,Value,Стойност
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Стойност
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Разпределяне на листа за период.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Кликнете тук, за да се провери"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Сметка {0}: Може да се назначи себе си за родителска сметка
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Позволени Dropbox Access
 DocType: Dropbox Backup,Weekly,Седмично
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Напр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Получавам
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Получавам
 DocType: Maintenance Visit,Fully Completed,Завършен до ключ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Завършен
 DocType: Employee,Educational Qualification,Образователно-квалификационна
 DocType: Workstation,Operating Costs,Оперативни разходи
 DocType: Employee Leave Approver,Employee Leave Approver,Служител Оставете одобряващ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} е успешно добавен в нашия Бюлетин.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не може да се декларира като изгубена, защото цитата е направено."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Електронно-лъчево обработване
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Майстор на мениджъра
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Добавяне / Редактиране на цените
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Графика на Разходни центрове
 ,Requested Items To Be Ordered,Желани продукти за да се поръча
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Моите поръчки
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Моите поръчки
 DocType: Price List,Price List Name,Ценоразпис Име
 DocType: Time Log,For Manufacturing,За производство
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Общо
@@ -3471,7 +3489,7 @@ DocType: Account,Income,Доход
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Нещо се обърка!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Фактурата за продажба {0} вече е била подадена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Фактурата за продажба {0} вече е била подадена
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Дата На Завършване
 DocType: Purchase Invoice Item,Amount (Company Currency),Сума (Company валути)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Леене
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Година
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Точка на продажба на профил
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Моля, актуализирайте SMS Settings"
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Време Log {0} вече таксува
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Време Log {0} вече таксува
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Необезпечени кредити
 DocType: Cost Center,Cost Center Name,Стойност Име Center
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Точка {0} със сериен номер {1} вече е инсталиран
 DocType: Maintenance Schedule Detail,Scheduled Date,Предвидена дата
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,"Общата сума, изплатена Amt"
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Съобщения по-големи от 160 знака, ще бъдат разделени на няколко съобщения"
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Получена и при
 ,Serial No Service Contract Expiry,Пореден № Договор за услуги Изтичане
 DocType: Item,Unit of Measure Conversion,Мерна единица на реализациите
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Работникът или служителят не може да се променя
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Вие не можете да кредитни и дебитни същия акаунт в същото време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Вие не можете да кредитни и дебитни същия акаунт в същото време
 DocType: Naming Series,Help HTML,Помощ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Общо weightage определен да бъде 100%. Това е {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Помощи за свръх {0} прекоси за позиция {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Помощи за свръх {0} прекоси за позиция {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Име на лицето или организацията, че този адрес принадлежи."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Вашите доставчици
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се определи като губи като поръчка за продажба е направена.
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,Покръстен
 DocType: Item,Has Serial No,Има сериен номер
 DocType: Employee,Date of Issue,Дата на издаване
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: От {0} за {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Компютър
 DocType: Item,List this Item in multiple groups on the website.,Списък този продукт в няколко групи в сайта.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Позиция: {0} не съществува в системата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Вземи Неизравнени влизания
@@ -3524,14 +3542,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,За да Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},"Сметка {0} е вписана повече от веднъж за фискалната година, {1}"
 ,Average Commission Rate,Средна Комисията Курсове
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"'Има сериен номер' не може да бъде 'Да' за стока, която не на склад"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"'Има сериен номер' не може да бъде 'Да' за стока, която не на склад"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Присъствие не може да бъде маркиран за бъдещи дати
 DocType: Pricing Rule,Pricing Rule Help,Ценообразуване Правило Помощ
 DocType: Purchase Taxes and Charges,Account Head,Главна Сметка
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,"Актуализиране на допълнителни разходи, за да се изчисли приземи разходи за предмети"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Електрически
 DocType: Stock Entry,Total Value Difference (Out - In),Общо Разлика Value (Out - В)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Row {0}: Валутен курс е задължително
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Валутен курс е задължително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID не е конфигуриран за Employee {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,От гаранционен иск
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,Именуване Series
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
 DocType: User,Enabled,Enabled
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Сток Активи
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Наистина ли искате да представи всички Заплата Slip за месец {0} и година {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Наистина ли искате да представи всички Заплата Slip за месец {0} и година {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Вносни Абонати
 DocType: Target Detail,Target Qty,Target Количество
 DocType: Attendance,Present,Настояще
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Бележка за доставка {0} не трябва да бъде представено
 DocType: Notification Control,Sales Invoice Message,Съобщението фактурата за продажба
 DocType: Authorization Rule,Based On,Базиран На
-,Ordered Qty,Поръчано Количество
+DocType: Sales Order Item,Ordered Qty,Поръчано Количество
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Точка {0} е деактивиран
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Период От и периода, за датите задължителни за повтарящи {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Дейността на проект / задача.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Генериране на заплатите фишове
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} не е валиден имейл ID
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Качи Присъствие
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM и производство Количество са задължителни
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Застаряването на населението Range 2
-DocType: Journal Entry Account,Amount,Размер
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Размер
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Занитване
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменя
 ,Sales Analytics,Продажби Analytics
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очаквана дата не може да бъде преди Материал Заявка Дата
 DocType: Contact Us Settings,City,Град
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ултразвукова обработка
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Грешка: Не е валиден документ за самоличност?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Грешка: Не е валиден документ за самоличност?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Точка {0} трябва да бъде Продажби Точка
 DocType: Naming Series,Update Series Number,Актуализация Series Number
 DocType: Account,Equity,Справедливост
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,Действителен
 DocType: Authorization Rule,Customerwise Discount,Customerwise Отстъпка
 DocType: Purchase Invoice,Against Expense Account,Срещу Разходна Сметка
 DocType: Production Order,Production Order,Производство Поръчка
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Монтаж Забележка {0} вече е била подадена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Монтаж Забележка {0} вече е била подадена
 DocType: Quotation Item,Against Docname,Срещу Документ
 DocType: SMS Center,All Employee (Active),All Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Вижте сега
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Разходи за суровини
 DocType: Item,Re-Order Level,Re-Поръчка Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Въведете предмети и планирано Количество, за които искате да се повиши производствените поръчки или да изтеглите суровини за анализ."
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt Chart
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Непълен работен ден
 DocType: Employee,Applicable Holiday List,Приложимо Holiday Списък
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Обновено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип на отчета е задължително
 DocType: Item,Serial Number Series,Сериен номер Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Warehouse е задължително за склад т {0} на ред {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse е задължително за склад т {0} на ред {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & търговия
 DocType: Issue,First Responded On,Първо Отговорили On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Обява на артикул в няколко групи
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,Посещаемост
 DocType: Page,No,Не
 DocType: BOM,Materials,Материали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако не се проверява, списъкът ще трябва да бъдат добавени към всеки отдел, където тя трябва да се приложи."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Публикуване дата и публикуване време е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Публикуване дата и публикуване време е задължително
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Данъчна шаблон за закупуване сделки.
 ,Item Prices,Елемент Цени
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,По думите ще бъде видим след като спаси Поръчката.
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административни разходи
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консултативен
 DocType: Customer Group,Parent Customer Group,Родител Customer Group
-sites/assets/js/erpnext.min.js +50,Change,Промяна
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промяна
 DocType: Purchase Invoice,Contact Email,Контакт Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Поръчка за покупка {0} е "Спряно"
 DocType: Appraisal Goal,Score Earned,Резултат спечелените
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",например "My Company LLC"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Срок На Предизвестие
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,Бруто тегло мерна един
 DocType: Email Digest,Receivables / Payables,Вземания / Задължения
 DocType: Delivery Note Item,Against Sales Invoice,Срещу фактура за продажба
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Щампосване
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Поземлен Cost Точка
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Покажи нулеви стойности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Брой на т получен след производството / препакетиране от дадени количества суровини
 DocType: Payment Reconciliation,Receivable / Payable Account,Вземания / дължими суми Акаунт
 DocType: Delivery Note Item,Against Sales Order Item,Срещу ред от поръчка за продажба
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
 DocType: Item,Default Warehouse,Default Warehouse
 DocType: Task,Actual End Date (via Time Logs),Действителна Крайна дата (чрез Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Бюджетът не може да бъде назначен срещу Group Account {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Общ резултат (от 5)
 DocType: Contact Us Settings,State,Състояние
 DocType: Batch,Batch,Партида
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Общо разход претенция (чрез разход Вземания)
 DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Дебитно известие
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,Блог Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,"Създаване на правила за ограничаване на сделки, основани на ценности."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ако е избрано, Total не. на работните дни ще включва празници, а това ще доведе до намаляване на стойността на Заплата на ден"
 DocType: Purchase Invoice,Total Advance,Общо Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Отпуши Материал Искане
 DocType: Workflow State,User,Потребител
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Обработка на заплати
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Обработка на заплати
 DocType: Opportunity Item,Basic Rate,Basic Курсове
 DocType: GL Entry,Credit Amount,Credit Сума
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Задай като Загубени
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,Кредитните Days въз осно
 DocType: Tax Rule,Tax Rule,Данъчна Правило
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Поддържане и съща ставка През Продажби Cycle
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планирайте времето трупи извън Workstation работно време.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} вече е била подадена
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} вече е била подадена
 ,Items To Be Requested,Предмети трябва да бъдат поискани
 DocType: Purchase Order,Get Last Purchase Rate,Вземи Last Покупка Курсове
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing процент въз основа на Type активност (на час)
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Фирма Email ID не е намерен, следователно не съобщение, изпратено"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Прилагане на средства (активи)
 DocType: Production Planning Tool,Filter based on item,Филтър на базата на т
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debit Акаунт
 DocType: Fiscal Year,Year Start Date,Година Начална дата
 DocType: Attendance,Employee Name,Служител Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Rounded Общо (Company валути)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Глуха
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Доходи на наети лица
 DocType: Sales Invoice,Is POS,Дали POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Опакован количество трябва да е равно количество за т {0} на ред {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Опакован количество трябва да е равно количество за т {0} на ред {1}
 DocType: Production Order,Manufactured Qty,Произведен Количество
 DocType: Purchase Receipt Item,Accepted Quantity,Прието Количество
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не съществува
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,"Законопроекти, повдигнати на клиентите."
 DocType: DocField,Default,Неустойка
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Project
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Добавени {0} абонати
 DocType: Maintenance Schedule,Schedule,Разписание
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Определете бюджета за тази Cost Center. За да зададете бюджет действия, вижте "Company List""
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,Родител Акаунт
 DocType: Quality Inspection Reading,Reading 3,Четене 3
 ,Hub,Главина
 DocType: GL Entry,Voucher Type,Ваучер Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ценова листа не е намерен или инвалиди
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценова листа не е намерен или инвалиди
 DocType: Expense Claim,Approved,Одобрен
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като "Ляв"
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Образование
 DocType: Selling Settings,Campaign Naming By,Задаване на име на кампания
 DocType: Employee,Current Address Is,Current адрес е
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","По избор. Задава валута по подразбиране компания, ако не е посочено."
 DocType: Address,Office,Офис
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартни отчети
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Счетоводни вписвания в дневник.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Моля изберете Record Employee първия.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Сметка не съвпада с {1} / {2} в {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,В наличност Количество в От Warehouse
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Моля изберете Record Employee първия.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Сметка не съвпада с {1} / {2} в {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,За създаване на данъчна сметка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Моля, въведете Expense Account"
 DocType: Account,Stock,Наличност
 DocType: Employee,Current Address,Настоящ Адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако елемент е вариант на друга позиция след това описание, изображение, ценообразуване, данъци и т.н., ще бъдат определени от шаблона, освен ако изрично е посочено"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Детайли
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch Инвентаризация
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Инвентаризация
 DocType: Employee,Contract End Date,Договор Крайна дата
 DocType: Sales Order,Track this Sales Order against any Project,Абонирай се за тази поръчка за продажба срещу всеки проект
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Поръчки за продажба Pull (висящите да достави), основано на горните критерии"
 DocType: DocShare,Document Type,Document Type
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,От Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,От Доставчик оферта
 DocType: Deduction Type,Deduction Type,Приспадане Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Количество
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,За Количество (Произведен Количество) е задължително
 DocType: Stock Entry,Default Target Warehouse,Default Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Общо (Company валути)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Тип и страна е приложима само срещу получаване / плащане акаунт
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Тип и страна е приложима само срещу получаване / плащане акаунт
 DocType: Notification Control,Purchase Receipt Message,Покупка получено съобщение
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Общо отпуснати листа са повече от период
 DocType: Production Order,Actual Start Date,Действителна Начална дата
 DocType: Sales Order,% of materials delivered against this Sales Order,% от материали доставени по тази Поръчка за Продажба
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Запишете движение т.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Запишете движение т.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Списък Subscriber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Дълбаене
 DocType: Email Account,Service,Обслужване
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,С Operations
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Счетоводни записи вече са направени във валута {0} за компанията {1}. Моля изберете вземания или платима сметка с валута {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Счетоводни записи вече са направени във валута {0} за компанията {1}. Моля изберете вземания или платима сметка с валута {0}.
 ,Monthly Salary Register,Месечна заплата Регистрация
-apps/frappe/frappe/website/template.py +123,Next,До
+apps/frappe/frappe/website/template.py +140,Next,До
 DocType: Warranty Claim,If different than customer address,Ако е различен от адреса на клиента
 DocType: BOM Operation,BOM Operation,BOM Operation
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,Следващата дата
 DocType: Employee Education,Major/Optional Subjects,Основни / избираеми предмети
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Моля, въведете данъци и такси"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Механична обработка
+DocType: Sales Invoice Item,Drop Ship,Капка Корабно
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тук можете да поддържат семейните детайли като името и професията на майка, съпруга и деца"
 DocType: Hub Settings,Seller Name,Продавач Име
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),"Данъци и такси, удържани (Company валути)"
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,За получаване и Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Условия Template
 DocType: Serial No,Delivery Details,Детайли за доставка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматично създаване Материал искане, ако количеството падне под това ниво"
 ,Item-wise Purchase Register,Точка-мъдър Покупка Регистрация
 DocType: Batch,Expiry Date,Срок На Годност
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","За да зададете ниво на повторна поръчка, т трябва да бъде покупка или производство Точка Точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","За да зададете ниво на повторна поръчка, т трябва да бъде покупка или производство Точка Точка"
 ,Supplier Addresses and Contacts,Доставчик Адреси и контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Моля, изберете Категория първо"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Майстор Project.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Да не се показва всеки символ като $ и т.н. до валути.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Половин ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Кредитните Days
 DocType: Leave Type,Is Carry Forward,Дали Пренасяне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Получават от BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Получават от BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Време за Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Бил на материали
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Тип и страна се изисква за получаване / плащане сметка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Тип и страна се изисква за получаване / плащане сметка {1}
 DocType: Dropbox Backup,Send Notifications To,Изпращайте известия до
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Дата
 DocType: Employee,Reason for Leaving,Причина за напускане
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционирани Сума
 DocType: GL Entry,Is Opening,Се отваря
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Row {0}: дебитна не може да бъде свързана с {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Сметка {0} не съществува
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: дебитна не може да бъде свързана с {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Сметка {0} не съществува
 DocType: Account,Cash,Пари в брой
 DocType: Employee,Short biography for website and other publications.,Кратка биография на уебсайт и други публикации.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Моля, създайте Заплата структура за служител {0}"
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 5c696e2698..cc96c743f5 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,বেতন মোড
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","আপনি ঋতু উপর ভিত্তি করে ট্র্যাক করতে চান তাহলে, মাসিক ডিস্ট্রিবিউশন নির্বাচন."
 DocType: Employee,Divorced,তালাকপ্রাপ্ত
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,সতর্কতা: একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,সতর্কতা: একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,আইটেম ইতিমধ্যে সিঙ্ক
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,আইটেম একটি লেনদেনের মধ্যে একাধিক বার যুক্ত করা সম্ভব
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,উপাদান যান {0} এই পাটা দাবি বাতিল আগে বাতিল
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,সংকুচন প্লাস sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},মুদ্রাটির মূল্য তালিকা জন্য প্রয়োজন {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* লেনদেনে গণনা করা হবে.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,উপাদান অনুরোধ থেকে
+DocType: Purchase Order,Customer Contact,গ্রাহকের পরিচিতি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,উপাদান অনুরোধ থেকে
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} বৃক্ষ
 DocType: Job Applicant,Job Applicant,কাজ আবেদনকারী
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,কোন ফলাফল.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,ক্রেতার নাম
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","মুদ্রা একক, রূপান্তর হার, রপ্তানি মোট রপ্তানি সর্বোমোট ইত্যাদি সব রপ্তানি সম্পর্কিত ক্ষেত্র হুণ্ডি, পিওএস, উদ্ধৃতি, বিক্রয় চালান, বিক্রয় আদেশ ইত্যাদি পাওয়া যায়"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"প্রধান (বা গ্রুপ), যার বিরুদ্ধে হিসাব থেকে তৈরি করা হয় এবং উদ্বৃত্ত বজায় রাখা হয়."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),বিশিষ্ট {0} হতে পারে না শূন্য কম ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),বিশিষ্ট {0} হতে পারে না শূন্য কম ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 মিনিট ডিফল্ট
 DocType: Leave Type,Leave Type Name,প্রকার নাম ত্যাগ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,সিরিজ সফলভাবে আপডেট
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,একাধিক আইটেম ম
 DocType: SMS Center,All Supplier Contact,সমস্ত সরবরাহকারী যোগাযোগ
 DocType: Quality Inspection Reading,Parameter,স্থিতিমাপ
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,সমাপ্তি প্রত্যাশিত তারিখ প্রত্যাশিত স্টার্ট জন্ম কম হতে পারে না
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,সত্যিই প্রকাশনা অর্ডার দুর করতে চান না:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,সারি # {0}: হার হিসাবে একই হতে হবে {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,নিউ ছুটি আবেদন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,নিউ ছুটি আবেদন
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ব্যাংক খসড়া
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. গ্রাহক জ্ঞানী আইটেমটি কোড বজায় রাখা এবং তাদের কোড ব্যবহার করা এই অপশনটি স্থান উপর ভিত্তি করে এদের অনুসন্ধানযোগ্য করে
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,দেখা
 DocType: Sales Invoice Item,Quantity,পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ঋণ (দায়)
 DocType: Employee Education,Year of Passing,পাসের সন
-sites/assets/js/erpnext.min.js +27,In Stock,স্টক ইন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,শুধুমাত্র যেতে উদ্ভাবনী উপায় বিক্রয় আদেশের বিরুদ্ধে পেমেন্ট করতে পারবেন
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,স্টক ইন
 DocType: Designation,Designation,উপাধি
 DocType: Production Plan Item,Production Plan Item,উৎপাদন পরিকল্পনা আইটেম
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ব্যবহারকারী {0} ইতিমধ্যে কর্মচারী নির্ধারিত হয় {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,নতুন পিওএস প্রোফাইল তৈরি করুন
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,স্বাস্থ্যের যত্ন
 DocType: Purchase Invoice,Monthly,মাসিক
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,চালান
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),পেমেন্ট মধ্যে বিলম্ব (দিন)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,চালান
 DocType: Maintenance Schedule Item,Periodicity,পর্যাবৃত্তি
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ইমেল ঠিকানা
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,প্রতিরক্ষা
 DocType: Company,Abbr,সংক্ষিপ্তকরণ
 DocType: Appraisal Goal,Score (0-5),স্কোর (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,সারি # {0}:
 DocType: Delivery Note,Vehicle No,যানবাহন কোন
-sites/assets/js/erpnext.min.js +55,Please select Price List,মূল্য তালিকা নির্বাচন করুন
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,মূল্য তালিকা নির্বাচন করুন
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,কাঠের
 DocType: Production Order Operation,Work In Progress,কাজ চলছে
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D মুদ্রন
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,মূল বিস্তারিত
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,কেজি
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,একটি কাজের জন্য খোলা.
 DocType: Item Attribute,Increment,বৃদ্ধি
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ওয়ারহাউস নির্বাচন ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,বিজ্ঞাপন
 DocType: Employee,Married,বিবাহিত
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
 DocType: Payment Reconciliation,Reconcile,মিলনসাধন করা
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,মুদিখানা
 DocType: Quality Inspection Reading,Reading 1,1 পঠন
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,ব্যাংক এন্ট্রি করতে
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ব্যাংক এন্ট্রি করতে
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,অবসর বৃত্তি পেনশন ভাতা তহবিল
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,অ্যাকাউন্টের ধরণ ওয়্যারহাউস যদি ওয়্যারহাউস বাধ্যতামূলক
 DocType: SMS Center,All Sales Person,সব বিক্রয় ব্যক্তি
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,খরচ কেন্দ্র ব
 DocType: Warehouse,Warehouse Detail,ওয়ারহাউস বিস্তারিত
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},ক্রেডিট সীমা গ্রাহকের জন্য পার হয়েছে {0} {1} / {2}
 DocType: Tax Rule,Tax Type,ট্যাক্স ধরন
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
 DocType: Item,Item Image (if not slideshow),আইটেম ইমেজ (ছবি না হলে)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,একটি গ্রাহক এই একই নামের
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ঘন্টা হার / 60) * প্রকৃত অপারেশন টাইম
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,অতিথি
 DocType: Quality Inspection,Get Specification Details,স্পেসিফিকেশন বিবরণ পান
 DocType: Lead,Interested,আগ্রহী
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,উপাদান বিল
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,উদ্বোধন
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,উদ্বোধন
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},থেকে {0} থেকে {1}
 DocType: Item,Copy From Item Group,আইটেম গ্রুপ থেকে কপি
 DocType: Journal Entry,Opening Entry,প্রারম্ভিক ভুক্তি
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,পণ্য অনুসন্ধান
 DocType: Standard Reply,Owner,মালিক
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,প্রথম কোম্পানি লিখুন দয়া করে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,প্রথম কোম্পানি নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,প্রথম কোম্পানি নির্বাচন করুন
 DocType: Employee Education,Under Graduate,গ্রাজুয়েট অধীনে
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,টার্গেটের
 DocType: BOM,Total Cost,মোট খরচ
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,উপসর্গ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumable
 DocType: Upload Attendance,Import Log,আমদানি লগ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,পাঠান
+DocType: Sales Invoice Item,Delivered By Supplier,সরবরাহকারী দ্বারা বিতরণ
 DocType: SMS Center,All Contact,সমস্ত যোগাযোগ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,বার্ষিক বেতন
 DocType: Period Closing Voucher,Closing Fiscal Year,ফিস্ক্যাল বছর সমাপ্তি
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,বিরূদ্ধে এণ্ট্র
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,সময় দেখান লগ
 DocType: Journal Entry Account,Credit in Company Currency,কোম্পানি একক ঋণ
 DocType: Delivery Note,Installation Status,ইনস্টলেশনের অবস্থা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty পরিত্যক্ত গৃহীত + আইটেম জন্য গৃহীত পরিমাণ সমান হতে হবে {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty পরিত্যক্ত গৃহীত + আইটেম জন্য গৃহীত পরিমাণ সমান হতে হবে {0}
 DocType: Item,Supply Raw Materials for Purchase,সাপ্লাই কাঁচামালের ক্রয় জন্য
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,আইটেম {0} একটি ক্রয় আইটেমটি হতে হবে
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", টেমপ্লেট ডাউনলোড উপযুক্ত তথ্য পূরণ করুন এবং পরিবর্তিত ফাইল সংযুক্ত. আপনার নির্বাচিত সময়ের মধ্যে সব তারিখগুলি এবং কর্মচারী সমন্বয় বিদ্যমান উপস্থিতি রেকর্ড সঙ্গে, টেমপ্লেট আসবে"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,{0} আইটেম সক্রিয় নয় বা জীবনের শেষ হয়েছে পৌঁছেছেন
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,{0} আইটেম সক্রিয় নয় বা জীবনের শেষ হয়েছে পৌঁছেছেন
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,বিক্রয় চালান জমা হয় পরে আপডেট করা হবে.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
 DocType: SMS Center,SMS Center,এসএমএস কেন্দ্র
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,সোজা
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,বার্তা জন
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,প্রাইসিং এবং ডিসকাউন্ট প্রয়োগের জন্য বিধি.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},সঙ্গে এই সময় কার্যবিবরণী দ্বন্দ্ব {0} জন্য {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,মূল্যতালিকা কেনা বা বিক্রি জন্য প্রযোজ্য হতে হবে
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},ইনস্টলেশনের তারিখ আইটেমের জন্য ডেলিভারি তারিখের আগে হতে পারে না {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},ইনস্টলেশনের তারিখ আইটেমের জন্য ডেলিভারি তারিখের আগে হতে পারে না {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),মূল্য তালিকা রেট বাট্টা (%)
-sites/assets/js/form.min.js +279,Start,শুরু
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,শুরু
 DocType: User,First Name,প্রথম নাম
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,আপনার সেটআপ সম্পূর্ণ. রিফ্রেশ.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,সম্পূর্ণ ছাঁচ কাস্টিং
 DocType: Offer Letter,Select Terms and Conditions,নির্বাচন শর্তাবলী
 DocType: Production Planning Tool,Sales Orders,বিক্রয় আদেশ
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,বিক্রয় চালান আইটেমটি বিরুদ্ধে
 ,Production Orders in Progress,প্রগতি উৎপাদন আদেশ
 DocType: Lead,Address & Contact,ঠিকানা ও যোগাযোগ
+DocType: Leave Allocation,Add unused leaves from previous allocations,আগের বরাদ্দ থেকে অব্যবহৃত পাতার করো
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},পরবর্তী আবর্তক {0} উপর তৈরি করা হবে {1}
 DocType: Newsletter List,Total Subscribers,মোট গ্রাহক
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,যোগাযোগের নাম
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,মুলতুবি Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,উপরে উল্লিখিত মানদণ্ড জন্য বেতন স্লিপ তৈরি করা হয়.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,কেনার জন্য অনুরোধ জানান.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ডাবল হাউজিং
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,তারিখ মুক্তিদান যোগদান তারিখ থেকে বড় হওয়া উচিত
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,প্রতি বছর পত্রাদি
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} সেটআপ> সেটিংস মাধ্যমে> নামকরণ সিরিজ জন্য সিরিজ নামকরণ সেট করুন
 DocType: Time Log,Will be updated when batched.,Batched যখন আপডেট করা হবে.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,সারি {0}: চেক করুন অ্যাকাউন্টের বিরুদ্ধে 'আগাম' {1} এই একটি অগ্রিম এন্ট্রি হয়.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,সারি {0}: চেক করুন অ্যাকাউন্টের বিরুদ্ধে 'আগাম' {1} এই একটি অগ্রিম এন্ট্রি হয়.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},{0} ওয়্যারহাউস কোম্পানি অন্তর্গত নয় {1}
 DocType: Bulk Email,Message,বার্তা
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
 DocType: Dropbox Backup,Dropbox Access Key,ড্রপবক্স অ্যাক্সেস কী
 DocType: Payment Tool,Reference No,রেফারেন্স কোন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ত্যাগ অবরুদ্ধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
 DocType: Stock Entry,Sales Invoice No,বিক্রয় চালান কোন
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,নূন্যতম আদেশ Qty
 DocType: Pricing Rule,Supplier Type,সরবরাহকারী ধরন
 DocType: Item,Publish in Hub,হাব প্রকাশ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
 DocType: Item,Purchase Details,ক্রয় বিবরণ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ক্রয় করার 'কাঁচামাল সরবরাহ করা' টেবিলের মধ্যে পাওয়া আইটেম {0} {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,বিজ্ঞপ্তি 
 DocType: Lead,Suggestions,পরামর্শ
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,এই অঞ্চলের উপর সেট আইটেমটি গ্রুপ-জ্ঞানী বাজেটের. এছাড়াও আপনি বন্টন সেট করে ঋতু অন্তর্ভুক্ত করতে পারে.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},গুদাম উর্ধ্বস্থ অ্যাকাউন্ট গ্রুপ লিখুন দয়া করে {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},বিপরীতে পরিশোধ {0} {1} বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},বিপরীতে পরিশোধ {0} {1} বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {2}
 DocType: Supplier,Address HTML,ঠিকানা এইচটিএমএল
 DocType: Lead,Mobile No.,মোবাইল নাম্বার.
 DocType: Maintenance Schedule,Generate Schedule,সূচি নির্মাণ
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,নতুন শেয়ার
 DocType: Period Closing Voucher,Closing Account Head,অ্যাকাউন্ট হেড সমাপ্তি
 DocType: Employee,External Work History,বাহ্যিক কাজের ইতিহাস
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,সার্কুলার রেফারেন্স ত্রুটি
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,আপনি কি সত্যিই বন্ধ করতে চান
 DocType: Communication,Closed,বন্ধ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,আপনি হুণ্ডি সংরক্ষণ একবার শব্দ (রপ্তানি) দৃশ্যমান হবে.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,আপনি বন্ধ করার ব্যাপারে নিশ্চিত
 DocType: Lead,Industry,শিল্প
 DocType: Employee,Job Profile,চাকরি বৃত্তান্ত
 DocType: Newsletter,Newsletter,নিউজলেটার
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,চালান পত্র
 DocType: Dropbox Backup,Allow Dropbox Access,ড্রপবক্স ব্যবহারের অনুমতি
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,করের আপ সেট
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,এই সপ্তাহে এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Workstation,Rent Cost,ভাড়া খরচ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,মাস এবং বছর নির্বাচন করুন
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"গ্রাহক একক গ্রাহকের বেস কারেন্সি রূপান্তরিত হয়, যা এ হার"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, আদেয়ক, ক্রয় চালান, উত্পাদনের আদেশ, ক্রয় আদেশ, কেনার রসিদ, বিক্রয় চালান, বিক্রয় আদেশ, শেয়ার এন্ট্রি, শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড পাওয়া যায়"
 DocType: Item Tax,Tax Rate,করের হার
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,পছন্দ করো
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,পছন্দ করো
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","আইটেম: {0} ব্যাচ প্রজ্ঞাময়, পরিবর্তে ব্যবহার স্টক এণ্ট্রি \ শেয়ার রিকনসিলিয়েশন ব্যবহার মিলন করা যাবে না পরিচালিত"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ কোন হিসাবে একই হতে হবে {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,অ দলের রূপান্তর
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,কেনার রসিদ দাখিল করতে হবে
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,বর্তমান স
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,একটি আইটেম এর ব্যাচ (অনেক).
 DocType: C-Form Invoice Detail,Invoice Date,চালান তারিখ
 DocType: GL Entry,Debit Amount,ডেবিট পরিমাণ
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,আপনার ইমেইল ঠিকানা
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
 DocType: Purchase Order,% Received,% গৃহীত
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,নির্দেশনা
 DocType: Quality Inspection,Inspected By,পরিদর্শন
 DocType: Maintenance Visit,Maintenance Type,রক্ষণাবেক্ষণ টাইপ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},সিরিয়াল কোন {0} হুণ্ডি অন্তর্গত নয় {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},সিরিয়াল কোন {0} হুণ্ডি অন্তর্গত নয় {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,আইটেম গুণ পরিদর্শন পরামিতি
 DocType: Leave Application,Leave Approver Name,রাজসাক্ষী নাম
 ,Schedule Date,সূচি তারিখ
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,ক্রয় নিবন্ধন
 DocType: Landed Cost Item,Applicable Charges,চার্জ প্রযোজ্য
 DocType: Workstation,Consumable Cost,Consumable খরচ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে 'ছুটি রাজসাক্ষী'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে 'ছুটি রাজসাক্ষী'
 DocType: Purchase Receipt,Vehicle Date,যানবাহন তারিখ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,মেডিকেল
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,হারানোর জন্য কারণ
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% ইনস্টল
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,প্রথম কোম্পানি নাম লিখুন
 DocType: BOM,Item Desription,আইটেম Desription
 DocType: Purchase Invoice,Supplier Name,সরবরাহকারী নাম
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext ম্যানুয়াল পড়ুন
 DocType: Account,Is Group,দলটির
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,স্বয়ংক্রিয়ভাবে FIFO উপর ভিত্তি করে আমরা সিরিয়াল সেট
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,চেক সরবরাহকারী চালান নম্বর স্বতন্ত্রতা
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,সেলস ম
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,সব উত্পাদন প্রক্রিয়া জন্য গ্লোবাল সেটিংস.
 DocType: Accounts Settings,Accounts Frozen Upto,হিমায়িত পর্যন্ত অ্যাকাউন্ট
 DocType: SMS Log,Sent On,পাঠানো
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,হলিডে মাস্টার.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,শেল ঢালাই
 DocType: Material Request Item,Required Date,প্রয়োজনীয় তারিখ
 DocType: Delivery Note,Billing Address,বিলিং ঠিকানা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
 DocType: BOM,Costing,খোয়াতে
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","চেক যদি ইতিমধ্যে প্রিন্ট হার / প্রিন্ট পরিমাণ অন্তর্ভুক্ত হিসাবে, ট্যাক্স পরিমাণ বিবেচনা করা হবে"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,মোট Qty
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),(মিনি
 DocType: Customer,Buyer of Goods and Services.,পণ্য ও সার্ভিসেস ক্রেতা.
 DocType: Journal Entry,Accounts Payable,পরিশোধযোগ্য হিসাব
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,গ্রাহক
-sites/assets/js/erpnext.min.js +5,""" does not exists","বিদ্যমান না
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","বিদ্যমান না
 DocType: Pricing Rule,Valid Upto,বৈধ পর্যন্ত
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,আপনার গ্রাহকদের কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,সরাসরি আয়
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",অ্যাকাউন্ট দ্বারা গ্রুপকৃত তাহলে অ্যাকাউন্ট উপর ভিত্তি করে ফিল্টার করতে পারবে না
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,প্রশাসনিক কর্মকর্তা
 DocType: Payment Tool,Received Or Paid,গৃহীত বা প্রদত্ত
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,কোম্পানি নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,কোম্পানি নির্বাচন করুন
 DocType: Stock Entry,Difference Account,পার্থক্য অ্যাকাউন্ট
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,তার নির্ভরশীল টাস্ক {0} বন্ধ না হয় বন্ধ টাস্ক না পারেন.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
 DocType: Production Order,Additional Operating Cost,অতিরিক্ত অপারেটিং খরচ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,অঙ্গরাগ
 DocType: DocField,Type,শ্রেণী
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
 DocType: Communication,Subject,বিষয়
 DocType: Shipping Rule,Net Weight,প্রকৃত ওজন
 DocType: Employee,Emergency Phone,জরুরী ফোন
 ,Serial No Warranty Expiry,সিরিয়াল কোন পাটা মেয়াদ উত্তীর্ন
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,আপনি কি সত্যিই এই উপাদানের জন্য অনুরোধ বন্ধ করতে চান?
 DocType: Sales Order,To Deliver,প্রদান করা
 DocType: Purchase Invoice Item,Item,আইটেম
 DocType: Journal Entry,Difference (Dr - Cr),পার্থক্য (ডাঃ - CR)
 DocType: Account,Profit and Loss,লাভ এবং ক্ষতি
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,ম্যানেজিং প্রণীত
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,ম্যানেজিং প্রণীত
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,নতুন UOM টাইপ পূর্ণ সংখ্যা অন্তর্ভুক্ত হবেন না হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,আসবাবপত্র ও দ্রব্যাদি
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,হারে যা মূল্যতালিকা মুদ্রার এ কোম্পানির বেস কারেন্সি রূপান্তরিত হয়
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ সম্পাদন
 DocType: Purchase Invoice,Supplier Invoice No,সরবরাহকারী চালান কোন
 DocType: Territory,For reference,অবগতির জন্য
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","মুছে ফেলা যায় না সিরিয়াল কোন {0}, এটা শেয়ার লেনদেনের ক্ষেত্রে ব্যবহার করা হয় যেমন"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),বন্ধ (যোগাযোগ Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),বন্ধ (যোগাযোগ Cr)
 DocType: Serial No,Warranty Period (Days),পাটা কাল (দিন)
 DocType: Installation Note Item,Installation Note Item,ইনস্টলেশন নোট আইটেম
 ,Pending Qty,মুলতুবি Qty
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,বিলিং এবং ব
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,পুনরাবৃত্ত গ্রাহকদের
 DocType: Leave Control Panel,Allocate,বরাদ্দ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,পূর্ববর্তী
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,সেলস প্রত্যাবর্তন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,সেলস প্রত্যাবর্তন
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,আপনি উত্পাদনের আদেশ তৈরি করতে চান যা থেকে বিক্রয় আদেশ নির্বাচন.
+DocType: Item,Delivered by Supplier (Drop Ship),সরবরাহকারীকে বিতরণ (ড্রপ জাহাজ)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,বেতন উপাদান.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,সম্ভাব্য গ্রাহকদের ডাটাবেস.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,গ্রাহক ডাটাবেস.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,গড়াগড়ি
 DocType: Purchase Order Item,Billed Amt,দেখানো হয়েছিল মাসিক
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,শেয়ার এন্ট্রি তৈরি করা হয় যার বিরুদ্ধে একটি লজিক্যাল ওয়্যারহাউস.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},রেফারেন্স কোন ও রেফারেন্স তারিখ জন্য প্রয়োজন বোধ করা হয় {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},রেফারেন্স কোন ও রেফারেন্স তারিখ জন্য প্রয়োজন বোধ করা হয় {0}
 DocType: Event,Wednesday,বুধবার
 DocType: Sales Invoice,Customer's Vendor,গ্রাহকের বিক্রেতার
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,উৎপাদন অর্ডার বাধ্যতামূলক
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,রিসিভার পরামিতি
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,এবং 'গ্রুপ দ্বারা' 'উপর ভিত্তি করে' একই হতে পারে না
 DocType: Sales Person,Sales Person Targets,সেলস পারসন লক্ষ্যমাত্রা
-sites/assets/js/form.min.js +271,To,থেকে
-apps/frappe/frappe/templates/base.html +143,Please enter email address,ইমেল ঠিকানা লিখুন
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,থেকে
+apps/frappe/frappe/templates/base.html +145,Please enter email address,ইমেল ঠিকানা লিখুন
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,গঠন শেষ টিউব
 DocType: Production Order Operation,In minutes,মিনিটের মধ্যে
 DocType: Issue,Resolution Date,রেজোলিউশন তারিখ
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,প্রকল্পের ব্যবহ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,ক্ষয়প্রাপ্ত
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} চালান বিবরণ টেবিল মধ্যে পাওয়া যায়নি
 DocType: Company,Round Off Cost Center,খরচ কেন্দ্র সুসম্পন্ন
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ যান {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ যান {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 DocType: Material Request,Material Transfer,উপাদান স্থানান্তর
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),খোলা (ড)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},পোস্ট টাইমস্ট্যাম্প পরে হবে {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,সেটিংস
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ল্যান্ড খরচ কর ও শুল্ক
 DocType: Production Order Operation,Actual Start Time,প্রকৃত আরম্ভের সময়
 DocType: BOM Operation,Operation Time,অপারেশন টাইম
-sites/assets/js/list.min.js +5,More,অধিক
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,অধিক
 DocType: Pricing Rule,Sales Manager,বিক্রয় ব্যবস্থাপক
-sites/assets/js/desk.min.js +7673,Rename,পুনঃনামকরণ
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,পুনঃনামকরণ
 DocType: Journal Entry,Write Off Amount,পরিমাণ বন্ধ লিখুন
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,নমন
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,অনুমতি
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,স্ট্রেইট গা থেকে লোম ছাঁটা
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,তাদের সিরিয়াল টি উপর ভিত্তি করে বিক্রয় ও ক্রয় নথিতে আইটেম ট্র্যাক করতে. এই প্রোডাক্ট ওয়ারেন্টি বিবরণ ট্র্যাক ব্যবহার করতে পারেন.
 DocType: Purchase Receipt Item Supplied,Current Stock,বর্তমান তহবিল
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,পরিত্যক্ত গুদাম regected আইটেমটি বিরুদ্ধে বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,পরিত্যক্ত গুদাম regected আইটেমটি বিরুদ্ধে বাধ্যতামূলক
 DocType: Account,Expenses Included In Valuation,খরচ মূল্যনির্ধারণ অন্তর্ভুক্ত
 DocType: Employee,Provide email id registered in company,কোম্পানি নিবন্ধিত ইমেইল আইডি প্রদান
 DocType: Hub Settings,Seller City,বিক্রেতা সিটি
 DocType: Email Digest,Next email will be sent on:,পরবর্তী ইমেলে পাঠানো হবে:
 DocType: Offer Letter Term,Offer Letter Term,পত্র টার্ম প্রস্তাব
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,আইটেম ভিন্নতা আছে.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,আইটেম {0} পাওয়া যায়নি
 DocType: Bin,Stock Value,স্টক মূল্য
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,বৃক্ষ ধরন
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,স্বাগত
 DocType: Journal Entry,Credit Card Entry,ক্রেডিট কার্ড এন্ট্রি
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,টাস্ক বিষয়
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,পণ্য সরবরাহকারী থেকে প্রাপ্ত.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,পণ্য সরবরাহকারী থেকে প্রাপ্ত.
 DocType: Communication,Open,খোলা
 DocType: Lead,Campaign Name,প্রচারাভিযান নাম
 ,Reserved,সংরক্ষিত
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,আপনি কি সত্যিই দুর করতে চান
 DocType: Purchase Order,Supply Raw Materials,সাপ্লাই কাঁচামালের
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,পরের চালান তৈরি করা হবে কোন তারিখে. এটি জমা দিতে হবে নির্মাণ করা হয়.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,চলতি সম্পদ
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,গ্রাহকের ক্রয় আদেশ কোন
 DocType: Employee,Cell Number,মোবাইল নম্বর
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,নষ্ট
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম 'জার্নাল এন্ট্রি বিরুদ্ধে' বর্তমান ভাউচার লিখতে পারবেন না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম 'জার্নাল এন্ট্রি বিরুদ্ধে' বর্তমান ভাউচার লিখতে পারবেন না
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,শক্তি
 DocType: Opportunity,Opportunity From,থেকে সুযোগ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,মাসিক বেতন বিবৃতি.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,দায়
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,অনুমোদিত পরিমাণ সারি মধ্যে দাবি করে বেশি পরিমাণে হতে পারে না {0}.
 DocType: Company,Default Cost of Goods Sold Account,জিনিষপত্র বিক্রি অ্যাকাউন্ট ডিফল্ট খরচ
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,মূল্যতালিকা নির্বাচিত না
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,মূল্যতালিকা নির্বাচিত না
 DocType: Employee,Family Background,পারিবারিক ইতিহাস
 DocType: Process Payroll,Send Email,বার্তা পাঠাও
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,অনুমতি নেই
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,আমর
 DocType: Item,Items with higher weightage will be shown higher,উচ্চ গুরুত্ব দিয়ে চলছে উচ্চ দেখানো হবে
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ব্যাংক পুনর্মিলন বিস্তারিত
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,আমার চালান
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,কোন কর্মচারী পাওয়া
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,কোন কর্মচারী পাওয়া
 DocType: Purchase Order,Stopped,বন্ধ
 DocType: Item,If subcontracted to a vendor,একটি বিক্রেতা আউটসোর্স করে
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,শুরু করার জন্য BOM নির্বাচন
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSV ম
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,এখন পাঠান
 ,Support Analytics,সাপোর্ট অ্যানালিটিক্স
 DocType: Item,Website Warehouse,ওয়েবসাইট ওয়্যারহাউস
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,আপনি কি সত্যিই প্রকাশনা অর্ডার বন্ধ করতে চান না:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","অটো চালান 05, 28 ইত্যাদি যেমন তৈরি করা হবে যা মাসের দিন"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,স্কোর 5 থেকে কম বা সমান হবে
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,সি-ফরম রেকর্ড
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,গ
 DocType: Features Setup,"To enable ""Point of Sale"" features","বিক্রয় বিন্দু" বৈশিষ্ট্য সক্রিয় করুন
 DocType: Bin,Moving Average Rate,গড় হার মুভিং
 DocType: Production Planning Tool,Select Items,আইটেম নির্বাচন করুন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
 DocType: Comment,Reference Name,রেফারেন্স নাম
 DocType: Maintenance Visit,Completion Status,শেষ অবস্থা
 DocType: Sales Invoice Item,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
 DocType: Item,Allow over delivery or receipt upto this percent,এই শতাংশ পর্যন্ত বিতরণ বা প্রাপ্তি ধরে মঞ্জুরি
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,প্রত্যাশিত প্রসবের তারিখ বিক্রয় আদেশ তারিখের আগে হতে পারে না
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,প্রত্যাশিত প্রসবের তারিখ বিক্রয় আদেশ তারিখের আগে হতে পারে না
 DocType: Upload Attendance,Import Attendance,আমদানি এ্যাটেনডেন্স
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,সকল আইটেম গ্রুপ
 DocType: Process Payroll,Activity Log,কার্য বিবরণ
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,স্বয়ংক্রিয়ভাবে লেনদেন জমা বার্তা রচনা.
 DocType: Production Order,Item To Manufacture,আইটেম উত্পাদনপ্রণালী
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,স্থায়ী ছাঁচ কাস্টিং
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,পেমেন্ট করার আদেশ ক্রয়
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} অবস্থা {2} হয়
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,পেমেন্ট করার আদেশ ক্রয়
 DocType: Sales Order Item,Projected Qty,অভিক্ষিপ্ত Qty
 DocType: Sales Invoice,Payment Due Date,পরিশোধযোগ্য তারিখ
 DocType: Newsletter,Newsletter Manager,নিউজলেটার ম্যানেজার
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,অনুরোধ করা নাম্ব
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,কর্মক্ষমতা মূল্যায়ন.
 DocType: Sales Invoice Item,Stock Details,স্টক Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,প্রকল্প মূল্য
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,বিক্রয় বিন্দু
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},এগিয়ে বহন করা যাবে না {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,বিক্রয় বিন্দু
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},এগিয়ে বহন করা যাবে না {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ইতিমধ্যে ক্রেডিট অ্যাকাউন্ট ব্যালেন্স, আপনি 'ডেবিট' হিসেবে 'ব্যালেন্স করতে হবে' সেট করার অনুমতি দেওয়া হয় না"
 DocType: Account,Balance must be,ব্যালেন্স থাকতে হবে
 DocType: Hub Settings,Publish Pricing,প্রাইসিং প্রকাশ
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,কেনার রশিদ
 ,Received Items To Be Billed,গৃহীত চলছে বিল তৈরি করা
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ঘষিয়া তুলিয়া ফেলিতে সক্ষম লোকসান
-sites/assets/js/desk.min.js +3938,Ms,শ্রীমতি
+DocType: Employee,Ms,শ্রীমতি
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,মুদ্রা বিনিময় হার মাস্টার.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
 DocType: Production Order,Plan material for sub-assemblies,উপ-সমাহারকে পরিকল্পনা উপাদান
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,পরিসর
 DocType: Supplier,Default Payable Accounts,ডিফল্ট পরিশোধযোগ্য অংশ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
 DocType: Features Setup,Item Barcode,আইটেম বারকোড
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,চালান অগ্রিম ক্রয়
 DocType: Address,Shop,দোকান
 DocType: Hub Settings,Sync Now,সিঙ্ক এখন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},সারি {0}: ক্রেডিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},সারি {0}: ক্রেডিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,এই মোড নির্বাচন করা হলে ডিফল্ট ব্যাঙ্ক / ক্যাশ অ্যাকাউন্ট স্বয়ংক্রিয়ভাবে পিওএস চালান মধ্যে আপডেট করা হবে.
 DocType: Employee,Permanent Address Is,স্থায়ী ঠিকানা
 DocType: Production Order Operation,Operation completed for how many finished goods?,অপারেশন কতগুলি সমাপ্ত পণ্য জন্য সম্পন্ন?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ব্র্যান্ড
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}.
 DocType: Employee,Exit Interview Details,প্রস্থান ইন্টারভিউ এর বর্ণনা
 DocType: Item,Is Purchase Item,ক্রয় আইটেম
 DocType: Journal Entry Account,Purchase Invoice,ক্রয় চালান
 DocType: Stock Ledger Entry,Voucher Detail No,ভাউচার বিস্তারিত কোন
 DocType: Stock Entry,Total Outgoing Value,মোট আউটগোয়িং মূল্য
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,তারিখ এবং শেষ তারিখ খোলার একই অর্থবছরের মধ্যে হওয়া উচিত
 DocType: Lead,Request for Information,তথ্যের জন্য অনুরোধ
 DocType: Payment Tool,Paid,প্রদত্ত
 DocType: Salary Slip,Total in words,কথায় মোট
 DocType: Material Request Item,Lead Time Date,সময় লিড তারিখ
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,আবশ্যক. হয়তো মুদ্রা বিনিময় রেকর্ডের জন্য তৈরি করা হয় না
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},সারি # {0}: আইটেম জন্য কোন সিরিয়াল উল্লেখ করুন {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'পণ্য সমষ্টি' আইটেম, গুদাম, সিরিয়াল না এবং ব্যাচ জন্য কোন 'প্যাকিং তালিকা টেবিল থেকে বিবেচনা করা হবে. ওয়ারহাউস ও ব্যাচ কোন কোন 'পণ্য সমষ্টি' আইটেমের জন্য সব প্যাকিং আইটেম জন্য একই থাকে, যারা মান প্রধান আইটেম টেবিলে সন্নিবেশ করানো যাবে, মান মেজ বোঁচকা তালিকা 'থেকে কপি করা হবে."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,গ্রাহকদের চালানে.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,গ্রাহকদের চালানে.
 DocType: Purchase Invoice Item,Purchase Order Item,আদেশ আইটেম ক্রয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,পরোক্ষ আয়
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,সেট প্রদান পরিমাণ = বকেয়া পরিমাণ
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,ঠিকানা লাইন 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,অনৈক্য
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,কোমপানির নাম
 DocType: SMS Center,Total Message(s),মোট বার্তা (গুলি)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,সব সাহায্য ভিডিওর একটি তালিকা দেখুন
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,চেক জমা ছিল ব্যাংকের নির্বাচন অ্যাকাউন্ট মাথা.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ব্যবহারকারী লেনদেনের মূল্য তালিকা হার সম্পাদন করার অনুমতি প্রদান
 DocType: Pricing Rule,Max Qty,সর্বোচ্চ Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,সারি {0}: সেলস / ক্রয় আদেশের বিরুদ্ধে পেমেন্ট সবসময় অগ্রিম হিসেবে চিহ্নিত করা উচিত
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,সারি {0}: সেলস / ক্রয় আদেশের বিরুদ্ধে পেমেন্ট সবসময় অগ্রিম হিসেবে চিহ্নিত করা উচিত
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,রাসায়নিক
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
 DocType: Process Payroll,Select Payroll Year and Month,বেতনের বছর এবং মাস নির্বাচন করুন
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",উপযুক্ত গ্রুপ (সাধারণত তহবিলের আবেদন> চলতি সম্পদ> ব্যাংক অ্যাকাউন্ট থেকে যান এবং টাইপ) শিশু যোগ উপর ক্লিক করে (একটি নতুন অ্যাকাউন্ট তৈরি করুন "ব্যাংক"
 DocType: Workstation,Electricity Cost,বিদ্যুৎ খরচ
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,স
 DocType: SMS Center,All Lead (Open),সব নেতৃত্ব (ওপেন)
 DocType: Purchase Invoice,Get Advances Paid,উন্নতির প্রদত্ত করুন
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,তোমার ছবি সংযুক্ত
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,করা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,করা
 DocType: Journal Entry,Total Amount in Words,শব্দ মধ্যে মোট পরিমাণ
 DocType: Workflow State,Stop,থামুন
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,সেখানে একটা ভুল ছিল. এক সম্ভাব্য কারণ আপনার ফর্ম সংরক্ষণ করেন নি যে হতে পারে. সমস্যা থেকে গেলে support@erpnext.com সাথে যোগাযোগ করুন.
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,প্যাকিং স্লি
 DocType: POS Profile,Cash/Bank Account,নগদ / ব্যাংক অ্যাকাউন্ট
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Planning Tool,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} নেতিবাচক হতে পারে না
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ফাইলিং
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',টাইম 
 DocType: Project,Internal,অভ্যন্তরীণ
 DocType: Task,Urgent,জরুরী
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},টেবিলের সারি {0} জন্য একটি বৈধ সারি আইডি উল্লেখ করুন {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ডেস্কটপে যান এবং ERPNext ব্যবহার শুরু
 DocType: Item,Manufacturer,উত্পাদক
 DocType: Landed Cost Item,Purchase Receipt Item,কেনার রসিদ আইটেম
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,বিক্রয় আদেশ / সমাপ্ত পণ্য গুদাম সংরক্ষিত ওয়্যারহাউস
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,বিক্রয় পরিমাণ
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,সময় লগসমূহ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,আপনি এই রেকর্ডের জন্য ব্যয় রাজসাক্ষী হয়. ‧- 'status' এবং সংরক্ষণ আপডেট করুন
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,আপনি এই রেকর্ডের জন্য ব্যয় রাজসাক্ষী হয়. ‧- 'status' এবং সংরক্ষণ আপডেট করুন
 DocType: Serial No,Creation Document No,ক্রিয়েশন ডকুমেন্ট
 DocType: Issue,Issue,ইস্যু
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","আইটেম রূপের জন্য আরোপ করা. যেমন, আকার, রঙ ইত্যাদি"
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
 DocType: Opportunity,Contact Info,যোগাযোগের তথ্য
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,শেয়ার দাখিলা তৈরীর
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,শেয়ার দাখিলা তৈরীর
 DocType: Packing Slip,Net Weight UOM,নিট ওজন UOM
 DocType: Item,Default Supplier,ডিফল্ট সরবরাহকারী
 DocType: Manufacturing Settings,Over Production Allowance Percentage,উত্পাদনের ভাতা শতকরা ওভার
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,সাপ্তাহিক ছুটি তারিখগুলি করুন
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,শেষ তারিখ জন্ম কম হতে পারে না
 DocType: Sales Person,Select company name first.,প্রথমটি বেছে নিন কোম্পানির নাম.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,ডাঃ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,ডাঃ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,এবার সরবরাহকারী থেকে প্রাপ্ত.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},করুন {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,সময় লগসমূহ মাধ্যমে আপডেট
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,আপনার অবগতির জন্য কোম্পানি রেজিস্ট্রেশন নম্বর. ট্যাক্স নম্বর ইত্যাদি
 DocType: Sales Partner,Distributor,পরিবেশক
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,শপিং কার্ট শিপিং রুল
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 ,Ordered Items To Be Billed,আদেশ আইটেম বিল তৈরি করা
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,বিন্যাস কম হতে হয়েছে থেকে চেয়ে পরিসীমা
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,সময় লগসমূহ নির্বাচন করুন এবং একটি নতুন বিক্রয় চালান তৈরি জমা দিন.
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ট্
 DocType: Lead,Lead,লিড
 DocType: Email Digest,Payables,Payables
 DocType: Account,Warehouse,গুদাম
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,সারি # {0}: স্টক ক্রয় ফেরত মধ্যে প্রবেশ করা যাবে না প্রত্যাখ্যাত
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,সারি # {0}: স্টক ক্রয় ফেরত মধ্যে প্রবেশ করা যাবে না প্রত্যাখ্যাত
 ,Purchase Order Items To Be Billed,ক্রয় আদেশ আইটেম বিল তৈরি করা
 DocType: Purchase Invoice Item,Net Rate,নিট হার
 DocType: Purchase Invoice Item,Purchase Invoice Item,চালান আইটেম ক্রয়
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,অসমর্প
 DocType: Global Defaults,Current Fiscal Year,চলতি অর্থবছরের
 DocType: Global Defaults,Disable Rounded Total,গোলাকৃতি মোট অক্ষম
 DocType: Lead,Call,কল
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'এন্ট্রি' খালি রাখা যাবে না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'এন্ট্রি' খালি রাখা যাবে না
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},সদৃশ সারিতে {0} একই {1}
 ,Trial Balance,ট্রায়াল ব্যালেন্স
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,এমপ্লয়িজ স্থাপনের
-sites/assets/js/erpnext.min.js +5,"Grid """,গ্রিড "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,এমপ্লয়িজ স্থাপনের
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,গ্রিড "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,গবেষণা
 DocType: Maintenance Visit Purpose,Work Done,কাজ শেষ
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,প্রেরিত
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,দেখুন লেজার
 DocType: File,Lft,এলএফটি
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,পুরনো
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
 DocType: Communication,Delivery Status,ডেলিভারি স্থিতি
 DocType: Production Order,Manufacture against Sales Order,সেলস আদেশের বিরুদ্ধে প্রস্তুত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,বিশ্বের বাকি
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,বিশ্বের বাকি
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
 ,Budget Variance Report,বাজেট ভেদাংক প্রতিবেদন
 DocType: Salary Slip,Gross Pay,গ্রস পে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,লভ্যাংশ দেওয়া
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,অ্যাকাউন্টিং লেজার
 DocType: Stock Reconciliation,Difference Amount,পার্থক্য পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,ধরে রাখা উপার্জন
 DocType: BOM Item,Item Description,পন্নের বর্ণনা
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,সুযোগ আইটেম
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,অস্থায়ী খোলা
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,কর্মচারী ছুটি ভারসাম্য
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},অ্যাকাউন্টের জন্য ব্যালেন্স {0} সবসময় হতে হবে {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},অ্যাকাউন্টের জন্য ব্যালেন্স {0} সবসময় হতে হবে {1}
 DocType: Address,Address Type,ঠিকানা টাইপ করুন
 DocType: Purchase Receipt,Rejected Warehouse,পরিত্যক্ত গুদাম
 DocType: GL Entry,Against Voucher,ভাউচার বিরুদ্ধে
 DocType: Item,Default Buying Cost Center,ডিফল্ট রাজধানীতে খরচ কেন্দ্র
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext শ্রেষ্ঠ আউট পেতে, আমরা আপনার জন্য কিছু সময় লাগতে এবং এইসব সাহায্যের ভিডিও দেখতে যে সুপারিশ."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,আইটেম {0} সেলস পেইজ হতে হবে
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,থেকে
 DocType: Item,Lead Time in days,দিন সময় লিড
 ,Accounts Payable Summary,অ্যাকাউন্ট প্রদেয় সংক্ষিপ্ত
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},হিমায়িত অ্যাকাউন্ট সম্পাদনা করার জন্য অনুমোদিত নয় {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},হিমায়িত অ্যাকাউন্ট সম্পাদনা করার জন্য অনুমোদিত নয় {0}
 DocType: Journal Entry,Get Outstanding Invoices,অসামান্য চালানে পান
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,ঘটনার কেন্দ্রবিন্দু
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,চুক্তি
 DocType: Report,Disabled,অক্ষম
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM জন্য প্রয়োজন UOM coversion ফ্যাক্টর: {0} আইটেম: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM জন্য প্রয়োজন UOM coversion ফ্যাক্টর: {0} আইটেম: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,পরোক্ষ খরচ
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,সারি {0}: Qty বাধ্যতামূলক
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,কৃষি
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,পেমেন্ট মোড
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,এটি একটি root আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
 DocType: Journal Entry Account,Purchase Order,ক্রয় আদেশ
 DocType: Warehouse,Warehouse Contact Info,ওয়ারহাউস যোগাযোগের তথ্য
-sites/assets/js/form.min.js +190,Name is required,নাম প্রয়োজন বোধ করা হয়
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,নাম প্রয়োজন বোধ করা হয়
 DocType: Purchase Invoice,Recurring Type,আবর্তক ধরন
 DocType: Address,City/Town,শহর / টাউন
 DocType: Email Digest,Annual Income,বার্ষিক আয়
 DocType: Serial No,Serial No Details,সিরিয়াল কোন বিবরণ
 DocType: Purchase Invoice Item,Item Tax Rate,আইটেমটি ট্যাক্স হার
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,আইটেম {0} একটি সাব-সংকুচিত আইটেম হতে হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ক্যাপিটাল উপকরণ
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,লক্ষ্য
 DocType: Sales Invoice Item,Edit Description,সম্পাদনা বিবরণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,প্রত্যাশিত প্রসবের তারিখ পরিকল্পনা শুরুর তারিখ তুলনায় কম হয়.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,সরবরাহকারী
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,অ্যাকাউন্ট টাইপ সেটিং লেনদেন এই অ্যাকাউন্টটি নির্বাচন করতে সাহায্য করে.
 DocType: Purchase Invoice,Grand Total (Company Currency),সর্বমোট (কোম্পানি একক)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,মোট আউটগোয়িং
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",শুধুমাত্র "মান" 0 বা জন্য ফাঁকা মান সঙ্গে এক কোটি টাকার রুল শর্ত হতে পারে
 DocType: Authorization Rule,Transaction,লেনদেন
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,উল্লেখ্য: এই খরচ কেন্দ্র একটি গ্রুপ. গ্রুপ বিরুদ্ধে অ্যাকাউন্টিং এন্ট্রি করতে পারবেন না.
-apps/erpnext/erpnext/config/projects.py +43,Tools,সরঞ্জাম
+apps/frappe/frappe/config/desk.py +7,Tools,সরঞ্জাম
 DocType: Item,Website Item Groups,ওয়েবসাইট আইটেম গ্রুপ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,উৎপাদন অর্ডার নম্বর স্টক এন্ট্রি উদ্দেশ্যে প্রস্তুত জন্য বাধ্যতামূলক
 DocType: Purchase Invoice,Total (Company Currency),মোট (কোম্পানি একক)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,ওয়ার্কস্টেশন 
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ডাইজেস্ট ইমেল:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
 DocType: Sales Partner,Target Distribution,উদ্দিষ্ট ডিস্ট্রিবিউশনের
-sites/assets/js/desk.min.js +7652,Comments,মন্তব্য
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,মন্তব্য
 DocType: Salary Slip,Bank Account No.,ব্যাংক একাউন্ট নং
 DocType: Naming Series,This is the number of the last created transaction with this prefix,এই উপসর্গবিশিষ্ট সর্বশেষ নির্মিত লেনদেনের সংখ্যা
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},আইটেম জন্য প্রয়োজন মূল্যনির্ধারণ রেট দিন {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,একটি
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,সুবিধা বাতিল ছুটি
 DocType: Purchase Invoice,Supplier Invoice Date,সরবরাহকারী চালান তারিখ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,আপনি শপিং কার্ট সক্রিয় করতে হবে
-sites/assets/js/form.min.js +212,No Data,কোন ডেটা
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,কোন ডেটা
 DocType: Appraisal Template Goal,Appraisal Template Goal,মূল্যায়ন টেমপ্লেট গোল
 DocType: Salary Slip,Earning,রোজগার
 DocType: Payment Tool,Party Account Currency,পক্ষের অ্যাকাউন্টে একক
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,পক্ষের অ্যাক
 DocType: Purchase Taxes and Charges,Add or Deduct,করো অথবা বিয়োগ
 DocType: Company,If Yearly Budget Exceeded (for expense account),বাত্সরিক বাজেট (ব্যয় অ্যাকাউন্টের জন্য) অতিক্রম করেছে
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,মধ্যে পাওয়া ওভারল্যাপিং শর্ত:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,জার্নাল বিরুদ্ধে এণ্ট্রি {0} ইতিমধ্যে অন্য কিছু ভাউচার বিরুদ্ধে স্থায়ী হয়
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,জার্নাল বিরুদ্ধে এণ্ট্রি {0} ইতিমধ্যে অন্য কিছু ভাউচার বিরুদ্ধে স্থায়ী হয়
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,মোট আদেশ মান
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,খাদ্য
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,বুড়ো রেঞ্জ 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,ভিজিট কোন
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","যোগাযোগ নিউজলেটার, বাড়ে."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},অ্যাকাউন্ট বন্ধ মুদ্রা হতে হবে {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},সব লক্ষ্য জন্য পয়েন্ট সমষ্টি এটা হয় 100 হতে হবে {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,অপারেশনস ফাঁকা রাখা যাবে না.
 ,Delivered Items To Be Billed,বিতরণ আইটেম বিল তৈরি করা
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ওয়ারহাউস সিরিয়াল নং জন্য পরিবর্তন করা যাবে না
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},অবস্থা আপডেট {0}
 DocType: DocField,Description,বিবরণ
 DocType: Authorization Rule,Average Discount,গড় মূল্য ছাড়ের
 DocType: Letter Head,Is Default,ডিফল্ট মান হল
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,আইটেমটি ট্য
 DocType: Item,Maintain Stock,শেয়ার বজায়
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ইতিমধ্যে উৎপাদন অর্ডার নির্মিত শেয়ার সাজপোশাকটি
 DocType: Leave Control Panel,Leave blank if considered for all designations,সব প্রশিক্ষণে জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ 'প্রকৃত' সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ 'প্রকৃত' সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},সর্বোচ্চ: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime থেকে
 DocType: Email Digest,For Company,কোম্পানি জন্য
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,শিপিং ঠিকানা
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,হিসাবরক্ষনের তালিকা
 DocType: Material Request,Terms and Conditions Content,শর্তাবলী কনটেন্ট
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,পাটা / এএমসি স
 DocType: GL Entry,GL Entry,জিএল এণ্ট্রি
 DocType: HR Settings,Employee Settings,কর্মচারী সেটিংস
 ,Batch-Wise Balance History,ব্যাচ প্রজ্ঞাময় বাকি ইতিহাস
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,কি কি করতে হবে
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,কি কি করতে হবে
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,শিক্ষানবিস
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,নেতিবাচক পরিমাণ অনুমোদিত নয়
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,অফিস ভাড়া
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,সেটআপ এসএমএস গেটওয়ে সেটিংস
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,আমদানি ব্যর্থ!
-sites/assets/js/erpnext.min.js +24,No address added yet.,কোনো ঠিকানা এখনো যোগ.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,কোনো ঠিকানা এখনো যোগ.
 DocType: Workstation Working Hour,Workstation Working Hour,ওয়ার্কস্টেশন কাজ ঘন্টা
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,বিশ্লেষক
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা জেভি পরিমাণ সমান নয় {2}
 DocType: Item,Inventory,জায়
 DocType: Features Setup,"To enable ""Point of Sale"" view",দেখুন "বিক্রয় বিন্দু" সচল করুন
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,পেমেন্ট খালি ট্রলি জন্য তৈরি করা যাবে না
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,পেমেন্ট খালি ট্রলি জন্য তৈরি করা যাবে না
 DocType: Item,Sales Details,বিক্রয় বিবরণ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,পিন
 DocType: Opportunity,With Items,জানানোর সঙ্গে
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",পরের চালান তৈরি করা হবে কোন তারিখে. এটি জমা দিতে হবে নির্মাণ করা হয়.
 DocType: Item Attribute,Item Attribute,আইটেম বৈশিষ্ট্য
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,সরকার
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,আইটেম রুপভেদ
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,আইটেম রুপভেদ
 DocType: Company,Services,সেবা
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),মোট ({0})
 DocType: Cost Center,Parent Cost Center,মূল খরচ কেন্দ্র
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,আর্থিক বছরের শুরু তারিখ
 DocType: Employee External Work History,Total Experience,মোট অভিজ্ঞতা
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,মাল ও ফরোয়ার্ডিং চার্জ
 DocType: Material Request Item,Sales Order No,বিক্রয় আদেশ কোন
 DocType: Item Group,Item Group Name,আইটেমটি গ্রুপ নাম
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,ধরা
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ধরা
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,প্রস্তুত জন্য স্থানান্তর সামগ্রী
 DocType: Pricing Rule,For Price List,মূল্য তালিকা জন্য
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,নির্বাহী অনুসন্ধান
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,সূচী
 DocType: Purchase Invoice Item,Net Amount,থোক
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM বিস্তারিত কোন
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),অতিরিক্ত মূল্য ছাড়ের পরিমাণ (কোম্পানি একক)
-DocType: Period Closing Voucher,CoA Help,CoA সাহায্য
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},ত্রুটি: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},ত্রুটি: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,অ্যাকাউন্ট চার্ট থেকে নতুন একাউন্ট তৈরি করুন.
 DocType: Maintenance Visit,Maintenance Visit,রক্ষণাবেক্ষণ পরিদর্শন
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,গ্রাহক> গ্রাহক গ্রুপ> টেরিটরি
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,ল্যান্ড খরচ 
 DocType: Event,Tuesday,মঙ্গলবার
 DocType: Leave Block List,Block Holidays on important days.,গুরুত্বপূর্ণ দিন অবরোধ ছুটির দিন.
 ,Accounts Receivable Summary,গ্রহনযোগ্য অ্যাকাউন্ট সারাংশ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ইতিমধ্যে সময়ের জন্য কর্মচারী {1} জন্য বরাদ্দ টাইপ {0} পাতার জন্য {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,কর্মচারী ভূমিকা সেট একজন কর্মী রেকর্ডে ইউজার আইডি ক্ষেত্রের সেট করুন
 DocType: UOM,UOM Name,UOM নাম
 DocType: Top Bar Item,Target,লক্ষ্য
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,বিক্রয় অংশী
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} জন্য অ্যাকাউন্টিং কেবল প্রবেশ মুদ্রা তৈরি করা যাবে: {1}
 DocType: Pricing Rule,Pricing Rule,প্রাইসিং রুল
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,খাঁজ
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,আদেশ ক্রয় উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,আদেশ ক্রয় উপাদানের জন্য অনুরোধ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},সারি # {0}: Returned আইটেম {1} না মধ্যে উপস্থিত থাকে না {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ব্যাংক হিসাব
 ,Bank Reconciliation Statement,ব্যাংক পুনর্মিলন বিবৃতি
 DocType: Address,Lead Name,লিড নাম
 ,POS,পিওএস
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,খোলা স্টক ব্যালেন্স
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,খোলা স্টক ব্যালেন্স
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} শুধুমাত্র একবার প্রদর্শিত হবে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},আরো tranfer করা অনুমোদিত নয় {0} চেয়ে {1} ক্রয় আদেশের বিরুদ্ধে {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},সাফল্যের বরাদ্দ পাতার {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},সাফল্যের বরাদ্দ পাতার {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,কোনও আইটেম প্যাক
 DocType: Shipping Rule Condition,From Value,মূল্য থেকে
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,উৎপাদন পরিমাণ বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,উৎপাদন পরিমাণ বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,ব্যাংক প্রতিফলিত না পরিমাণে
 DocType: Quality Inspection Reading,Reading 4,4 পঠন
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,কোম্পানি ব্যয় জন্য দাবি করে.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,যোগাযোগ মোবাইল
 DocType: Production Planning Tool,Select Sales Orders,বিক্রয় আদেশ নির্বাচন
 ,Material Requests for which Supplier Quotations are not created,"সরবরাহকারী এবার তৈরি করা যাবে না, যার জন্য উপাদান অনুরোধ"
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,বারকোড ব্যবহার আইটেম ট্র্যাক. আপনি আইটেম এর বারকোড স্ক্যানিং দ্বারা হুণ্ডি এবং বিক্রয় চালান মধ্যে আইটেম প্রবেশ করতে সক্ষম হবে.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,মার্ক হিসাবে বিতরণ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,উদ্ধৃতি করা
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,অগ্রিম এক্স দিনের জন্য অপারেশন পরিকল্পনা চেষ্টা করুন.
 DocType: HR Settings,Stop Birthday Reminders,বন্ধ করুন জন্মদিনের রিমাইন্ডার
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
 DocType: Payment Tool Detail,Payment Amount,পরিশোধিত অর্থ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ক্ষয়প্রাপ্ত পরিমাণ
-sites/assets/js/erpnext.min.js +51,{0} View,{0} দেখুন
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} দেখুন
 DocType: Salary Structure Deduction,Salary Structure Deduction,বেতন কাঠামো সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,সিলেক্টিভ লেজার sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,আমদানি সফল!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,প্রথম প্রকাশ আইটেম খরচ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,ডিফল্ট প্রদেয
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","যেমন গ্রেপ্তার নিয়ম, মূল্যতালিকা ইত্যাদি হিসাবে অনলাইন শপিং কার্ট এর সেটিংস"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,সম্পূর্ণ সেটআপ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% দেখানো হয়েছিল
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,সংরক্ষিত Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,সংরক্ষিত Qty
 DocType: Party Account,Party Account,পক্ষের অ্যাকাউন্টে
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,মানব সম্পদ
 DocType: Lead,Upper Income,আপার আয়
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,শপিং কার্ট সক্রিয়
 DocType: Employee,Permanent Address,স্থায়ী ঠিকানা
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,আইটেম {0} একটি পরিষেবা আইটেম হতে হবে.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",সর্বমোট চেয়ে \ {0} {1} বেশী হতে পারবেন না বিরুদ্ধে পরিশোধিত আগাম {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,আইটেমটি কোড নির্বাচন করুন
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),বিনা বেতনে ছুটি জন্য সিদ্ধান্তগ্রহণ হ্রাস (LWP)
 DocType: Territory,Territory Manager,আঞ্চলিক ব্যবস্থাপক
+DocType: Delivery Note Item,To Warehouse (Optional),গুদাম থেকে (ঐচ্ছিক)
 DocType: Sales Invoice,Paid Amount (Company Currency),প্রদত্ত পরিমাণ (কোম্পানি একক)
 DocType: Purchase Invoice,Additional Discount,অতিরিক্ত ছাড়
 DocType: Selling Settings,Selling Settings,সেটিংস বিক্রি
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,গুরুত্ব
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,খনন
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,রজন
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,{0} প্রথম নির্বাচন করুন.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,{0} প্রথম নির্বাচন করুন.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},টেক্সট {0}
 DocType: Territory,Parent Territory,মূল টেরিটরি
 DocType: Quality Inspection Reading,Reading 2,2 পড়া
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,ব্যাচ নাম্বার
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,একটি গ্রাহকের ক্রয় আদেশের বিরুদ্ধে একাধিক বিক্রয় আদেশ মঞ্জুরি
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,প্রধান
 DocType: DocPerm,Delete,মুছে
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,বৈকল্পিক
-sites/assets/js/desk.min.js +7971,New {0},নতুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,বৈকল্পিক
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},নতুন {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,থামানো অর্ডার বাতিল করা যাবে না. বাতিল করতে দুর.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,থামানো অর্ডার বাতিল করা যাবে না. বাতিল করতে দুর.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
 DocType: Employee,Leave Encashed?,Encashed ত্যাগ করবেন?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ক্ষেত্রের থেকে সুযোগ বাধ্যতামূলক
 DocType: Item,Variants,রুপভেদ
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,দেশ
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,ঠিকানা
 DocType: Communication,Received,গৃহীত
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},সিরিয়াল কোন আইটেম জন্য প্রবেশ সদৃশ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,একটি শিপিং শাসনের জন্য একটি শর্ত
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,আইটেম উৎপাদন অর্ডার আছে অনুমোদিত নয়.
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,অভিবাদন
 DocType: Communication,Rejected,প্রত্যাখ্যাত
 DocType: Pricing Rule,Brand,ব্র্যান্ড
 DocType: Item,Will also apply for variants,এছাড়াও ভিন্নতা জন্য আবেদন করতে হবে
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% বিতরণ
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,বিক্রয়ের সময়ে সমষ্টি জিনিস.
 DocType: Sales Order Item,Actual Qty,প্রকৃত স্টক
 DocType: Sales Invoice Item,References,তথ্যসূত্র
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,গা থেকে লোম ছাঁটা
 DocType: Item,Has Variants,ধরন আছে
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,একটি নতুন বিক্রয় চালান তৈরি করতে 'বিক্রয় চালান করুন' বাটনে ক্লিক করুন.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,থেকে এবং সময়কাল% এর আবৃত্ত জন্য বাধ্যতামূলক তারিখ সময়ের
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,প্যাকেজিং এবং লেবেল
 DocType: Monthly Distribution,Name of the Monthly Distribution,মাসিক বন্টন নাম
 DocType: Sales Person,Parent Sales Person,মূল সেলস পারসন
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,কোম্পানি মাস্টার এবং গ্লোবাল ডিফল্ট মান ডিফল্ট মুদ্রা উল্লেখ করুন
 DocType: Dropbox Backup,Dropbox Access Secret,ড্রপবক্স অ্যাক্সেস গোপন
 DocType: Purchase Invoice,Recurring Invoice,পুনরাবৃত্ত চালান
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,প্রকল্প পরিচালনার
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,প্রকল্প পরিচালনার
 DocType: Supplier,Supplier of Goods or Services.,পণ্য বা সেবার সরবরাহকারী.
 DocType: Budget Detail,Fiscal Year,অর্থবছর
 DocType: Cost Center,Budget,বাজেট
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,বিক্রি
 DocType: Employee,Salary Information,বেতন তথ্য
 DocType: Sales Person,Name and Employee ID,নাম ও কর্মী ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
 DocType: Website Item Group,Website Item Group,ওয়েবসাইট আইটেমটি গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,কর্তব্য এবং কর
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} পেমেন্ট থেকে দ্বারা ফিল্টার করা যাবে না {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} পেমেন্ট থেকে দ্বারা ফিল্টার করা যাবে না {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ওয়েব সাইট এ দেখানো হবে যে আইটেমটি জন্য ছক
 DocType: Purchase Order Item Supplied,Supplied Qty,সরবরাহকৃত Qty
 DocType: Material Request Item,Material Request Item,উপাদানের জন্য অনুরোধ আইটেম
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,আইটেম 
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,এই চার্জ ধরণ জন্য বর্তমান সারির সংখ্যা এর চেয়ে বড় বা সমান সারির সংখ্যা পড়ুন করতে পারবেন না
 ,Item-wise Purchase History,আইটেম-বিজ্ঞ ক্রয় ইতিহাস
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,লাল
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},সিরিয়াল কোন আইটেম জন্য যোগ সংগ্রহ করার 'নির্মাণ সূচি' তে ক্লিক করুন {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},সিরিয়াল কোন আইটেম জন্য যোগ সংগ্রহ করার 'নির্মাণ সূচি' তে ক্লিক করুন {0}
 DocType: Account,Frozen,হিমায়িত
 ,Open Production Orders,ওপেন উত্পাদনের আদেশ
 DocType: Installation Note,Installation Time,ইনস্টলেশনের সময়
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","উৎপাদন অর্ডার এই আইটেমটি জন্য করা যেতে পারে, এটি একটি স্টক আইটেমটি হতে হবে."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","উৎপাদন অর্ডার এই আইটেমটি জন্য করা যেতে পারে, এটি একটি স্টক আইটেমটি হতে হবে."
 DocType: Shipping Rule Condition,Shipping Amount,শিপিং পরিমাণ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,যোগদান
 DocType: Authorization Rule,Above Value,মান উপরে
 ,Pending Amount,অপেক্ষারত পরিমাণ
 DocType: Purchase Invoice Item,Conversion Factor,রূপান্তর ফ্যাক্টর
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,নিষ্কৃত
+DocType: Purchase Order,Delivered,নিষ্কৃত
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),কাজ ইমেল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,গাড়ির সংখ্যা
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,আবর্তক চালান বন্ধ করা হবে কোন তারিখে
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,বিতরণ অভ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,আইটেম {1} একটি অ্যাসেট আইটেম হিসাবে অ্যাকাউন্ট {0} 'স্থায়ী সম্পদ' ধরনের হতে হবে
 DocType: HR Settings,HR Settings,এইচআর সেটিংস
 apps/frappe/frappe/config/setup.py +130,Printing,মুদ্রণ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,ব্যয় দাবি অনুমোদনের জন্য স্থগিত করা হয়. শুধু ব্যয় রাজসাক্ষী স্ট্যাটাস আপডেট করতে পারবেন.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ব্যয় দাবি অনুমোদনের জন্য স্থগিত করা হয়. শুধু ব্যয় রাজসাক্ষী স্ট্যাটাস আপডেট করতে পারবেন.
 DocType: Purchase Invoice,Additional Discount Amount,অতিরিক্ত মূল্য ছাড়ের পরিমাণ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) হলিডে হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
-sites/assets/js/desk.min.js +7805,and,এবং
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,এবং
 DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,স্পোর্টস
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,উদ্ধৃতি
 DocType: Salary Slip,Total Deduction,মোট সিদ্ধান্তগ্রহণ
 DocType: Quotation,Maintenance User,রক্ষণাবেক্ষণ ব্যবহারকারী
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,খরচ আপডেট
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,যদি আপনি দুর করার ব্যাপারে নিশ্চিত
 DocType: Employee,Date of Birth,জন্ম তারিখ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,আইটেম {0} ইতিমধ্যে ফেরত দেয়া হয়েছে
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** অর্থবছরের ** একটি অর্থবছরে প্রতিনিধিত্ব করে. সব হিসাব ভুক্তি এবং অন্যান্য প্রধান লেনদেন ** ** অর্থবছরের বিরুদ্ধে ট্র্যাক করা হয়.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","সেলস প্রচারাভিযান সম্পর্কে অবগত থাকুন. বাড়ে, উদ্ধৃতি সম্পর্কে অবগত থাকুন, বিক্রয় আদেশ ইত্যাদি প্রচারণা থেকে বিনিয়োগ ফিরে মূল্যাবধারণ করা."
 DocType: Expense Claim,Approver,রাজসাক্ষী
 ,SO Qty,তাই Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","শেয়ার এন্ট্রি গুদাম বিরুদ্ধে বিদ্যমান {0}, অত: পর আপনি পুনরায় ধার্য বা গুদাম পরিবর্তন করতে পারেন না"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","শেয়ার এন্ট্রি গুদাম বিরুদ্ধে বিদ্যমান {0}, অত: পর আপনি পুনরায় ধার্য বা গুদাম পরিবর্তন করতে পারেন না"
 DocType: Appraisal,Calculate Total Score,মোট স্কোর গণনা করা
 DocType: Supplier Quotation,Manufacturing Manager,উৎপাদন ম্যানেজার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},সিরিয়াল কোন {0} পর্যন্ত ওয়ারেন্টি বা তার কম বয়সী {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,প্যাকেজ বিভক্ত হুণ্ডি.
 apps/erpnext/erpnext/hooks.py +84,Shipments,চালানে
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,চোবান ছাঁচনির্মাণ
+DocType: Purchase Order,To be delivered to customer,গ্রাহকের মধ্যে বিতরণ করা হবে
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,টাইম ইন স্থিতি জমা িদেত হেব.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,সিরিয়াল কোন {0} কোনো গুদাম অন্তর্গত নয়
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ঠিককরা
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,মুদ্রা থেকে
 DocType: DocField,Name,নাম
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},আইটেম জন্য প্রয়োজন বিক্রয় আদেশ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},আইটেম জন্য প্রয়োজন বিক্রয় আদেশ {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,সিস্টেম প্রতিফলিত না পরিমাণে
 DocType: Purchase Invoice Item,Rate (Company Currency),হার (কোম্পানি একক)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,অন্যরা
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,বন্ধ হিসেবে সেট
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,একটি মিল খুঁজে খুঁজে পাচ্ছেন না. জন্য {0} অন্য কোনো মান নির্বাচন করুন.
 DocType: POS Profile,Taxes and Charges,কর ও শুল্ক
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","একটি পণ্য বা, কেনা বিক্রি বা মজুত রাখা হয় যে একটি সেবা."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,প্রথম সারির 'পূর্ববর্তী সারি মোট' 'পূর্ববর্তী সারি পরিমাণ' হিসেবে অভিযোগ টাইপ নির্বাচন করা বা না করা
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,নির্বাচন DOCTYPE
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,ব্যাংকিং
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,সময়সূচী পেতে 'নির্মাণ সূচি' তে ক্লিক করুন
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,নতুন খরচ কেন্দ্র
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,নতুন খরচ কেন্দ্র
 DocType: Bin,Ordered Quantity,আদেশ পরিমাণ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",যেমন "নির্মাতা জন্য সরঞ্জাম তৈরি করুন"
 DocType: Quality Inspection,In Process,প্রক্রিয়াধীন
 DocType: Authorization Rule,Itemwise Discount,Itemwise ছাড়
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
+DocType: Purchase Order Item,Reference Document Type,রেফারেন্স ডকুমেন্ট টাইপ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
 DocType: Account,Fixed Asset,নির্দিষ্ট সম্পত্তি
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
 DocType: Activity Type,Default Billing Rate,ডিফল্ট বিলিং রেট
 DocType: Time Log Batch,Total Billing Amount,মোট বিলিং পরিমাণ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,গ্রহনযোগ্য অ্যাকাউন্ট
 ,Stock Balance,স্টক ব্যালেন্স
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,অর্থ প্রদান বিক্রয় আদেশ
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,অর্থ প্রদান বিক্রয় আদেশ
 DocType: Expense Claim Detail,Expense Claim Detail,ব্যয় দাবি বিস্তারিত
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,সময় লগসমূহ নির্মিত:
 DocType: Item,Weight UOM,ওজন UOM
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,একাউন্টে ক্রেডিট একটি প্রদেয় অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
 DocType: Production Order Operation,Completed Qty,সমাপ্ত Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","{0}, শুধুমাত্র ডেবিট অ্যাকাউন্ট অন্য ক্রেডিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,মূল্যতালিকা {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, শুধুমাত্র ডেবিট অ্যাকাউন্ট অন্য ক্রেডিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,মূল্যতালিকা {0} নিষ্ক্রিয় করা হয়
 DocType: Manufacturing Settings,Allow Overtime,ওভারটাইম মঞ্জুরি
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,বিক্রয় আদেশ {0} থামানো হয়
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} আইটেম জন্য প্রয়োজন সিরিয়াল নাম্বার {1}. আপনার দেওয়া {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,বর্তমান মূল্যনির্ধারণ হার
 DocType: Item,Customer Item Codes,গ্রাহক আইটেম সঙ্কেত
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ঢালাই
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,নতুন শেয়ার UOM প্রয়োজন বোধ করা হয়
 DocType: Quality Inspection,Sample Size,সাধারন মাপ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.','কেস নং থেকে' একটি বৈধ উল্লেখ করুন
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,অতিরিক্ত খরচ সেন্টার গ্রুপ অধীন করা যেতে পারে কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,অতিরিক্ত খরচ সেন্টার গ্রুপ অধীন করা যেতে পারে কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে
 DocType: Project,External,বহিরাগত
 DocType: Features Setup,Item Serial Nos,আইটেম সিরিয়াল আমরা
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ব্যবহারকারী এবং অনুমতি
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,ঠিকানা ও যোগাযোগ
 DocType: SMS Log,Sender Name,প্রেরকের নাম
 DocType: Page,Title,খেতাব
-sites/assets/js/list.min.js +104,Customize,কাস্টমাইজ করুন
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,কাস্টমাইজ করুন
 DocType: POS Profile,[Select],[নির্বাচন]
 DocType: SMS Log,Sent To,প্রেরিত
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,বিক্রয় চালান করুন
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,জীবনের শেষে
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ভ্রমণ
 DocType: Leave Block List,Allow Users,ব্যবহারকারীদের মঞ্জুরি
+DocType: Purchase Order,Customer Mobile No,গ্রাহক মোবাইল কোন
 DocType: Sales Invoice,Recurring,আবৃত্ত
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,পৃথক আয় সন্ধান এবং পণ্য verticals বা বিভাগের জন্য ব্যয়.
 DocType: Rename Tool,Rename Tool,টুল পুনঃনামকরণ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,আপডেট খরচ
 DocType: Item Reorder,Item Reorder,আইটেম অনুসারে পুনঃক্রম করুন
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,ট্রান্সফার উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,ট্রান্সফার উপাদান
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","অপারেশন, অপারেটিং খরচ উল্লেখ করুন এবং আপনার কাজকর্মকে কোন একটি অনন্য অপারেশন দিতে."
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,কর্মচারী
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,থেকে আমদানি ইমেইল
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,ব্যবহারকারী হিসেবে আমন্ত্রণ
 DocType: Features Setup,After Sale Installations,বিক্রয় ইনস্টলেশনের পরে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল হয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল হয়
 DocType: Workstation Working Hour,End Time,শেষ সময়
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,সেলস বা কেনার জন্য আদর্শ চুক্তি পদ.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ভাউচার দ্বারা গ্রুপ
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,ভর মেইলিং
 DocType: Page,Standard,মান
 DocType: Rename Tool,File to Rename,পুনঃনামকরণ করা ফাইল
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},আইটেম জন্য প্রয়োজন Purchse ক্রম সংখ্যা {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,দেখান পেমেন্টস্
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},আইটেম জন্য বিদ্যমান নয় নির্দিষ্ট BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ সূচি {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ সূচি {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,আয়তন
 DocType: Notification Control,Expense Claim Approved,ব্যয় দাবি অনুমোদিত
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ফার্মাসিউটিক্যাল
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,তারিখ উপস্থি
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),বিক্রয় ইমেইল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন sales@example.com)
 DocType: Warranty Claim,Raised By,দ্বারা উত্থাপিত
 DocType: Payment Tool,Payment Account,টাকা পরিষদের অ্যাকাউন্ট
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
-sites/assets/js/list.min.js +23,Draft,খসড়া
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,খসড়া
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,পূরক অফ
 DocType: Quality Inspection Reading,Accepted,গৃহীত
 DocType: User,Female,মহিলা
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,শিপিং রুল ট্যাগ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
 DocType: Newsletter,Test,পরীক্ষা
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","বিদ্যমান শেয়ার লেনদেন আপনাকে মান পরিবর্তন করতে পারবেন না \ এই আইটেমটি জন্য আছে 'সিরিয়াল কোন হয়েছে', 'ব্যাচ করিয়াছেন', 'স্টক আইটেম' এবং 'মূল্যনির্ধারণ পদ্ধতি'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
 DocType: Employee,Previous Work Experience,আগের কাজের অভিজ্ঞতা
 DocType: Stock Entry,For Quantity,পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},সারিতে আইটেম {0} জন্য পরিকল্পনা Qty লিখুন দয়া করে {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,আইটেম জন্য অনুরোধ.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,আইটেম জন্য অনুরোধ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,পৃথক উত্পাদন যাতে প্রতিটি সমাপ্ত ভাল আইটেমের জন্য তৈরি করা হবে.
 DocType: Purchase Invoice,Terms and Conditions1,শর্তাবলী এবং Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,সম্পূর্ণ সেটআপ
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,নিউজল
 DocType: Delivery Note,Transporter Name,স্থানান্তরকারী নাম
 DocType: Contact,Enter department to which this Contact belongs,এই যোগাযোগ জন্যে যা করার ডিপার্টমেন্ট লিখুন
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,মোট অনুপস্থিত
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,সারি {0} মেলে না উপাদানের জন্য অনুরোধ জন্য আইটেম বা গুদাম
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,সারি {0} মেলে না উপাদানের জন্য অনুরোধ জন্য আইটেম বা গুদাম
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,পরিমাপের একক
 DocType: Fiscal Year,Year End Date,বছর শেষ তারিখ
 DocType: Task Depends On,Task Depends On,কাজের উপর নির্ভর করে
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,একটি কমিশন জন্য কোম্পানি পণ্য বিক্রি একটি তৃতীয় পক্ষের যারা পরিবেশক / ব্যাপারী / কমিশন এজেন্ট / অধিভুক্ত / রিসেলার.
 DocType: Customer Group,Has Child Node,সন্তানের নোড আছে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিরুদ্ধে {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","এখানে স্ট্যাটিক URL পরামিতি লিখুন (যেমন. প্রেরকের = ERPNext, ব্যবহারকারীর নাম = ERPNext, পাসওয়ার্ড = 1234 ইত্যাদি)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} না কোনো সক্রিয় অর্থবছরে. আরো বিস্তারিত জানার জন্য পরীক্ষা {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,এই একটি উদাহরণ ওয়েবসাইট ERPNext থেকে স্বয়ংক্রিয় উত্পন্ন হয়
@@ -2021,11 +2032,9 @@ DocType: Note,Note,বিঃদ্রঃ
 DocType: Purchase Receipt Item,Recd Quantity,Recd পরিমাণ
 DocType: Email Account,Email Ids,ইমেল আইডি
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,মুক্ত হিসাবে সেট করুন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
 DocType: Payment Reconciliation,Bank / Cash Account,ব্যাংক / নগদ অ্যাকাউন্ট
 DocType: Tax Rule,Billing City,বিলিং সিটি
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,এই ছুটি আবেদন অনুমোদনের জন্য স্থগিত করা হয়. শুধু ছুটি রাজসাক্ষী স্ট্যাটাস আপডেট করতে পারবেন.
 DocType: Global Defaults,Hide Currency Symbol,মুদ্রা প্রতীক লুকান
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","যেমন ব্যাংক, ক্যাশ, ক্রেডিট কার্ড"
 DocType: Journal Entry,Credit Note,ক্রেডিট নোট
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),মোট (Qty)
 DocType: Installation Note Item,Installed Qty,ইনস্টল Qty
 DocType: Lead,Fax,ফ্যাক্স
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,উপস্থাপিত
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,উপস্থাপিত
 DocType: Salary Structure,Total Earning,মোট আয়
 DocType: Purchase Receipt,Time at which materials were received,"উপকরণ গৃহীত হয়েছে, যা এ সময়"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,আমার ঠিকানা
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,সংস্
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,বা
 DocType: Sales Order,Billing Status,বিলিং অবস্থা
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ইউটিলিটি খরচ
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-উপরে
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-উপরে
 DocType: Buying Settings,Default Buying Price List,ডিফল্ট ক্রয় মূল্য তালিকা
 ,Download Backups,ডাউনলোড ব্যাকআপ
 DocType: Notification Control,Sales Order Message,বিক্রয় আদেশ পাঠান
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,নির্বাচন এমপ্লয়িজ
 DocType: Bank Reconciliation,To Date,এখন পর্যন্ত
 DocType: Opportunity,Potential Sales Deal,সম্ভাব্য বিক্রয় ডীল
-sites/assets/js/form.min.js +308,Details,বিবরণ
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,বিবরণ
 DocType: Purchase Invoice,Total Taxes and Charges,মোট কর ও শুল্ক
 DocType: Employee,Emergency Contact,জরুরি ভিত্তিতে যোগাযোগ করা
 DocType: Item,Quality Parameters,মানের পরামিতি
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,গৃহীত Qty
 DocType: Stock Entry Detail,Serial No / Batch,সিরিয়াল কোন / ব্যাচ
 DocType: Product Bundle,Parent Item,মূল আইটেমটি
 DocType: Account,Account Type,হিসাবের ধরণ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. 'নির্মাণ সূচি' তে ক্লিক করুন
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. 'নির্মাণ সূচি' তে ক্লিক করুন
 ,To Produce,উৎপাদন করা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","সারিতে জন্য {0} মধ্যে {1}. আইটেম হার {2} অন্তর্ভুক্ত করার জন্য, সারি {3} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
 DocType: Packing Slip,Identification of the package for the delivery (for print),প্রসবের জন্য প্যাকেজের আইডেন্টিফিকেশন (প্রিন্ট জন্য)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,সমরূপতার
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ছাঁচনির্মাণ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,বিলি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,বিলি
 DocType: Stock Reconciliation Item,Current Qty,বর্তমান স্টক
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",দেখুন খোয়াতে বিভাগে "সামগ্রী ভিত্তি করে হার"
 DocType: Appraisal Goal,Key Responsibility Area,কী দায়িত্ব ফোন
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,সব ঠিকানাগুলি.
 DocType: Company,Stock Settings,স্টক সেটিংস
 DocType: User,Bio,বায়ো
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,গ্রাহক গ্রুপ গাছ পরিচালনা.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,নতুন খরচ কেন্দ্রের নাম
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,নতুন খরচ কেন্দ্রের নাম
 DocType: Leave Control Panel,Leave Control Panel,কন্ট্রোল প্যানেল ছেড়ে চলে
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,কোন ডিফল্ট ঠিকানা টেমপ্লেট পাওয়া যায় নি. সেটআপ> ছাপানো ও ব্র্যান্ডিং> ঠিকানা টেমপ্লেট থেকে একটি নতুন তৈরি করুন.
 DocType: Appraisal,HR User,এইচআর ব্যবহারকারী
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,পেমেন্ট টুল বিস্তারিত
 ,Sales Browser,সেলস ব্রাউজার
 DocType: Journal Entry,Total Credit,মোট ক্রেডিট
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,স্থানীয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,স্থানীয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ঋণ ও অগ্রিমের (সম্পদ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ঋণ গ্রহিতা
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,বড়
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,কোন কর্মচারী পাওয়া!
 DocType: C-Form Invoice Detail,Territory,এলাকা
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
+DocType: Purchase Order,Customer Address Display,গ্রাহকের ঠিকানা প্রদর্শন
 DocType: Stock Settings,Default Valuation Method,ডিফল্ট মূল্যনির্ধারণ পদ্ধতি
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,মসৃণতা
 DocType: Production Order Operation,Planned Start Time,পরিকল্পনা শুরুর সময়
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,বরাদ্দ
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,বন্ধ স্থিতিপত্র ও বই লাভ বা ক্ষতি.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন \ কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. ডিফল্ট UOM পরিবর্তন করার জন্য, ব্যবহারের \ শেয়ার মডিউল অধীনে টুল 'UOM ইউটিলিটি র পরিবর্তে'."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,বিনিময় হার অন্য মধ্যে এক মুদ্রা রূপান্তর উল্লেখ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,উদ্ধৃতি {0} বাতিল করা হয়
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,উদ্ধৃতি {0} বাতিল করা হয়
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,মোট বকেয়া পরিমাণ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} কর্মচারী ছুটি ছিল {1}. উপস্থিতির চিহ্নিত করতে পারবেন না.
 DocType: Sales Partner,Targets,লক্ষ্যমাত্রা
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,এটি একটি root গ্রাহক গ্রুপ এবং সম্পাদনা করা যাবে না.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,অ্যাকাউন্টের আপনার চার্ট সেটআপ আপনি হিসাব থেকে শুরু দয়া করে আগে
 DocType: Purchase Invoice,Ignore Pricing Rule,প্রাইসিং বিধি উপেক্ষা
-sites/assets/js/list.min.js +24,Cancelled,বাতিল হয়েছে
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,বাতিল হয়েছে
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,বেতন কাঠামো এ জন্ম থেকে কর্মচারী যোগদান তারিখ তুলনায় কম হতে পারে না.
 DocType: Employee Education,Graduate,স্নাতক
 DocType: Leave Block List,Block Days,ব্লক দিন
 DocType: Journal Entry,Excise Entry,আবগারি এণ্ট্রি
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},সতর্কতা: সেলস অর্ডার {0} ইতিমধ্যে গ্রাহকের ক্রয় আদেশের বিরুদ্ধে বিদ্যমান {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},সতর্কতা: সেলস অর্ডার {0} ইতিমধ্যে গ্রাহকের ক্রয় আদেশের বিরুদ্ধে বিদ্যমান {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,শেয়ার পেয়
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,গ্রস পে 'বকেয়া পরিমাণ + নগদীকরণ পরিমাণ - মোট সিদ্ধান্তগ্রহণ
 DocType: Monthly Distribution,Distribution Name,বন্টন নাম
 DocType: Features Setup,Sales and Purchase,ক্রয় এবং বিক্রয়
-DocType: Purchase Order Item,Material Request No,উপাদানের জন্য অনুরোধ কোন
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
+DocType: Supplier Quotation Item,Material Request No,উপাদানের জন্য অনুরোধ কোন
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,যা গ্রাহকের কারেন্সি হারে কোম্পানির বেস কারেন্সি রূপান্তরিত হয়
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} এই তালিকা থেকে সফলভাবে রদ করা হয়েছে.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),নিট হার (কোম্পানি একক)
-apps/frappe/frappe/templates/base.html +132,Added,যোগ করা
+apps/frappe/frappe/templates/base.html +134,Added,যোগ করা
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,টেরিটরি গাছ পরিচালনা.
 DocType: Journal Entry Account,Sales Invoice,বিক্রয় চালান
 DocType: Journal Entry Account,Party Balance,পার্টি ব্যালেন্স
 DocType: Sales Invoice Item,Time Log Batch,টাইম ইন ব্যাচ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,ডিসকাউন্ট উপর প্রয়োগ নির্বাচন করুন
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,ডিসকাউন্ট উপর প্রয়োগ নির্বাচন করুন
 DocType: Company,Default Receivable Account,ডিফল্ট গ্রহনযোগ্য অ্যাকাউন্ট
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,উপরে নির্বাচিত মানদণ্ডের জন্য প্রদত্ত মোট বেতন জন্য ব্যাংক এনট্রি নির্মাণ
 DocType: Stock Entry,Material Transfer for Manufacture,প্রস্তুত জন্য উপাদান স্থানান্তর
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,প্রাসঙ্গিক
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,সেলস team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
 DocType: Sales Invoice,Customer Address,গ্রাহকের ঠিকানা
 apps/frappe/frappe/desk/query_report.py +136,Total,মোট
 DocType: Purchase Invoice,Apply Additional Discount On,অতিরিক্ত ডিসকাউন্ট উপর প্রয়োগ
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,উচ্চমানের ত
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,অতিরিক্ত ছোট
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,বিরচন স্প্রে
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাকের"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,পিএল বা বঙ্গাব্দের
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,কমিশন হার তার চেয়ে অনেক বেশী 100 হতে পারে না
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,নূন্যতম পরিসংখ্যা শ্রেনী
 DocType: Stock Entry,Subcontract,ঠিকা
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,প্রথম {0} লিখুন দয়া করে
 DocType: Production Planning Tool,Get Items From Sales Orders,সেলস অর্ডার থেকে আইটেম পান
 DocType: Production Order Operation,Actual End Time,প্রকৃত শেষ সময়
 DocType: Production Planning Tool,Download Materials Required,প্রয়োজনীয় সামগ্রী ডাউনলোড
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,তালিকাভুক্ত
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",""না" এবং "বিক্রয় আইটেম" "শেয়ার আইটেম" যেখানে "হ্যাঁ" হয় আইটেম নির্বাচন করুন এবং অন্য কোন পণ্য সমষ্টি নেই, অনুগ্রহ করে"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,অসমান মাস জুড়ে লক্ষ্যমাত্রা বিতরণ মাসিক ডিস্ট্রিবিউশন নির্বাচন.
 DocType: Purchase Invoice Item,Valuation Rate,মূল্যনির্ধারণ হার
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,আইটেম সারি {0}: {1} উপরোক্ত 'ক্রয় রসিদের' টেবিলের অস্তিত্ব নেই কেনার রসিদ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},কর্মচারী {0} ইতিমধ্যে আবেদন করেছেন {1} মধ্যে {2} এবং {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},কর্মচারী {0} ইতিমধ্যে আবেদন করেছেন {1} মধ্যে {2} এবং {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,প্রজেক্ট আরম্ভের তারিখ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,পর্যন্ত
 DocType: Rename Tool,Rename Log,পাসওয়ার্ড ভুলে গেছেন? পুনঃনামকরণ
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,শুধু পাতার নোড লেনদেনের অনুমতি দেওয়া হয়
 DocType: Expense Claim,Expense Approver,ব্যয় রাজসাক্ষী
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,কেনার রসিদ আইটেম সরবরাহ
-sites/assets/js/erpnext.min.js +48,Pay,বেতন
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,বেতন
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime করুন
 DocType: SMS Settings,SMS Gateway URL,এসএমএস গেটওয়ে ইউআরএল
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS বিতরণ অবস্থা বজায় রাখার জন্য লগ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,হয়রান
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,মোড়কে সঙ্কুচিত
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,মুলতুবি কার্যক্রম
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,মুলতুবি কার্যক্রম
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,নিশ্চিতকৃত
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,সরবরাহকারী> সরবরাহকারী ধরন
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ত
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,সংবাদপত্র পাবলিশার্স
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ফিস্ক্যাল বছর নির্বাচন
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ধাতু বিগলন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,আপনি এই রেকর্ডের জন্য ছুটি রাজসাক্ষী হয়. ‧- 'status' এবং সংরক্ষণ আপডেট করুন
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,পুনর্বিন্যাস স্তর
 DocType: Attendance,Attendance Date,এ্যাটেনডেন্স তারিখ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,আদায় এবং সিদ্ধান্তগ্রহণ উপর ভিত্তি করে বেতন ছুটি.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র গ্রুপ রূপান্তরিত করা যাবে না
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,অবচয়
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),সরবরাহকারী (গুলি)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,অকার্যকর সময়ের
 DocType: Customer,Credit Limit,ক্রেডিট সীমা
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,লেনদেনের ধরন নির্বাচন করুন
 DocType: GL Entry,Voucher No,ভাউচার কোন
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,প
 DocType: Customer,Address and Contact,ঠিকানা ও যোগাযোগ
 DocType: Customer,Last Day of the Next Month,পরবর্তী মাসের শেষ দিন
 DocType: Employee,Feedback,প্রতিক্রিয়া
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. সময়সূচি
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. সময়সূচি
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ঘষিয়া তুলিয়া ফেলিতে সক্ষম জেট যন্ত্র
 DocType: Stock Settings,Freeze Stock Entries,ফ্রিজ শেয়ার সাজপোশাকটি
 DocType: Website Settings,Website Settings,ওয়েবসাইট সেটিংস
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,বহির্গামী
 DocType: Material Request,Requested For,জন্য অনুরোধ করা
 DocType: Quotation Item,Against Doctype,Doctype বিরুদ্ধে
 DocType: Delivery Note,Track this Delivery Note against any Project,কোন প্রকল্পের বিরুদ্ধে এই হুণ্ডি সন্ধান
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root অ্যাকাউন্টের মোছা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root অ্যাকাউন্টের মোছা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,দেখান স্টক সাজপোশাকটি
 ,Is Primary Address,প্রাথমিক ঠিকানা
 DocType: Production Order,Work-in-Progress Warehouse,কাজ-অগ্রগতি ওয়্যারহাউস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ঠিকানা ও পরিচালনা
 DocType: Pricing Rule,Item Code,পণ্য সংকেত
 DocType: Production Planning Tool,Create Production Orders,উত্পাদনের আদেশ করুন
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,ব্যবহারকারী মন্
 DocType: Lead,Market Segment,মার্কেটের অংশ
 DocType: Communication,Phone,ফোন
 DocType: Employee Internal Work History,Employee Internal Work History,কর্মচারী অভ্যন্তরীণ কাজের ইতিহাস
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),বন্ধ (ড)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),বন্ধ (ড)
 DocType: Contact,Passive,নিষ্ক্রিয়
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,না মজুত সিরিয়াল কোন {0}
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,লেনদেন বিক্রি জন্য ট্যাক্স টেমপ্লেট.
 DocType: Sales Invoice,Write Off Outstanding Amount,বকেয়া পরিমাণ লিখুন বন্ধ
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","আপনি স্বয়ংক্রিয় আবৃত্ত চালানে প্রয়োজন হলে পরীক্ষা করে দেখুন. কোনো বিক্রয় চালান জমা দেওয়ার পরে, অধ্যায় আবর্তক দৃশ্যমান হবে."
 DocType: Account,Accounts Manager,হিসাবরক্ষক ব্যবস্থাপক
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',টাইম ইন {0} 'লগইন' হতে হবে
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',টাইম ইন {0} 'লগইন' হতে হবে
 DocType: Stock Settings,Default Stock UOM,ডিফল্ট শেয়ার UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),কার্যকলাপ টাইপ উপর ভিত্তি করে হার খোয়াতে (প্রতি ঘন্টায়)
 DocType: Production Planning Tool,Create Material Requests,উপাদান অনুরোধ করুন
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,ব্যাংক পুনর
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,আপডেট পান
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,উপাদানের জন্য অনুরোধ {0} বাতিল বা বন্ধ করা হয়
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,কয়েকটি নমুনা রেকর্ড যোগ
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,ম্যানেজমেন্ট ত্যাগ
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,ম্যানেজমেন্ট ত্যাগ
 DocType: Event,Groups,গ্রুপ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,অ্যাকাউন্ট দ্বারা গ্রুপ
 DocType: Sales Order,Fully Delivered,সম্পূর্ণ বিতরণ
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,সেলস অতিরিক্ত
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} খরচ কেন্দ্র বিরুদ্ধে একাউন্ট {1} জন্য {0} বাজেট অতিক্রম করবে {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,ফরোয়ার্ড পাতার বহন
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','তারিখ থেকে' পরে 'টু' হতে হবে
 ,Stock Projected Qty,স্টক Qty অনুমিত
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
 DocType: Sales Order,Customer's Purchase Order,গ্রাহকের ক্রয় আদেশ
 DocType: Warranty Claim,From Company,কোম্পানীর কাছ থেকে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,মূল্য বা স্টক
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,খুচরা বিক্রেতা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,সমস্ত সরবরাহকারী প্রকারভেদ
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"আইটেম স্বয়ংক্রিয়ভাবে গণনা করা হয়, কারণ আইটেমটি কোড বাধ্যতামূলক"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"আইটেম স্বয়ংক্রিয়ভাবে গণনা করা হয়, কারণ আইটেমটি কোড বাধ্যতামূলক"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,রক্ষণাবেক্ষণ সময়সূচী আইটেমটি
 DocType: Sales Order,%  Delivered,% বিতরণ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ব্যাংক ওভারড্রাফ্ট অ্যাকাউন্ট
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,বেতন স্লিপ করুন
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,মুক্ত করা
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ব্রাউজ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,নিরাপদ ঋণ
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ভয়ঙ্কর পণ্য
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,গুণগ্রাহিতা
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,লস্ট-ফেনা ঢালাই
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,অঙ্কন
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,তারিখ পুনরাবৃত্তি করা হয়
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},এক হতে হবে রাজসাক্ষী ত্যাগ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},এক হতে হবে রাজসাক্ষী ত্যাগ {0}
 DocType: Hub Settings,Seller Email,বিক্রেতা ইমেইল
 DocType: Project,Total Purchase Cost (via Purchase Invoice),মোট ক্রয় খরচ (ক্রয় চালান মাধ্যমে)
 DocType: Workstation Working Hour,Start Time,সময় শুরু
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),থোক (কোম্পানি একক)
 DocType: BOM Operation,Hour Rate,ঘন্টা হার
 DocType: Stock Settings,Item Naming By,দফে নামকরণ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,উদ্ধৃতি থেকে
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},অন্য সময়ের সমাপ্তি এন্ট্রি {0} পরে তৈরি করা হয়েছে {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,উদ্ধৃতি থেকে
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},অন্য সময়ের সমাপ্তি এন্ট্রি {0} পরে তৈরি করা হয়েছে {1}
 DocType: Production Order,Material Transferred for Manufacturing,উপাদান উৎপাদন জন্য বদলিকৃত
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,অ্যাকাউন্ট {0} না বিদ্যমান
 DocType: Purchase Receipt Item,Purchase Order Item No,অর্ডার আইটেমটি কোন ক্রয়
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,ইন্সপেকশন প্রয়ো
 DocType: Purchase Invoice Item,PR Detail,জনসংযোগ বিস্তারিত
 DocType: Sales Order,Fully Billed,সম্পূর্ণ দেখানো হয়েছিল
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,হাতে নগদ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},ডেলিভারি গুদাম স্টক আইটেমটি জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},ডেলিভারি গুদাম স্টক আইটেমটি জন্য প্রয়োজন {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),প্যাকেজের গ্রস ওজন. সাধারণত নেট ওজন + প্যাকেজিং উপাদান ওজন. (প্রিন্ট জন্য)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,এই ব্যবহারকারীরা হিমায়িত অ্যাকাউন্ট বিরুদ্ধে হিসাব থেকে হিমায়িত অ্যাকাউন্ট সেট এবং তৈরি / পরিবর্তন করার অনুমতি দেওয়া হয়
 DocType: Serial No,Is Cancelled,বাতিল করা হয়
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,আমার চালানে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,আমার চালানে
 DocType: Journal Entry,Bill Date,বিল তারিখ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","সর্বোচ্চ অগ্রাধিকার দিয়ে একাধিক প্রাইসিং নিয়ম আছে, এমনকি যদি তারপর নিচের অভ্যন্তরীণ অগ্রাধিকার প্রয়োগ করা হয়:"
 DocType: Supplier,Supplier Details,সরবরাহকারী
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ওয়্যার ট্রান্সফার
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,ব্যাংক অ্যাকাউন্ট নির্বাচন করুন
 DocType: Newsletter,Create and Send Newsletters,তৈরি করুন এবং পাঠান লেটার
-sites/assets/js/report.min.js +107,From Date must be before To Date,জন্ম তারিখ থেকে আগে হওয়া আবশ্যক
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,জন্ম তারিখ থেকে আগে হওয়া আবশ্যক
 DocType: Sales Order,Recurring Order,আবর্তক অর্ডার
 DocType: Company,Default Income Account,ডিফল্ট আয় অ্যাকাউন্ট
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,গ্রাহক গ্রুপ / গ্রাহক
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,শেয়ার UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
 ,Projected,অভিক্ষিপ্ত
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},সিরিয়াল কোন {0} ওয়্যারহাউস অন্তর্গত নয় {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,উল্লেখ্য: {0} পরিমাণ বা পরিমাণ 0 হিসাবে বিতরণ-বহুবার-বুকিং আইটেম জন্য সিস্টেম পরীক্ষা করা হবে না
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,উল্লেখ্য: {0} পরিমাণ বা পরিমাণ 0 হিসাবে বিতরণ-বহুবার-বুকিং আইটেম জন্য সিস্টেম পরীক্ষা করা হবে না
 DocType: Notification Control,Quotation Message,উদ্ধৃতি পাঠান
 DocType: Issue,Opening Date,খোলার তারিখ
 DocType: Journal Entry,Remark,মন্তব্য
 DocType: Purchase Receipt Item,Rate and Amount,হার এবং পরিমাণ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,বিরক্তিকর
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,সেলস অর্ডার থেকে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,সেলস অর্ডার থেকে
 DocType: Blog Category,Parent Website Route,মূল ওয়েবসাইট রুট
 DocType: Sales Order,Not Billed,বিল না
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,উভয় ওয়্যারহাউস একই কোম্পানির অন্তর্গত নয়
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,কোনো পরিচিতি এখনো যোগ.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,কোনো পরিচিতি এখনো যোগ.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,সক্রিয় নয়
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,চালান পোস্টিং তারিখ বিরুদ্ধে
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ল্যান্ড কস্ট ভাউচার পরিমাণ
 DocType: Time Log,Batched for Billing,বিলিং জন্য শ্রেণীবদ্ধ
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,প্রস্তাব উত্থাপিত বিল.
 DocType: POS Profile,Write Off Account,অ্যাকাউন্ট বন্ধ লিখতে
-sites/assets/js/erpnext.min.js +26,Discount Amount,হ্রাসকৃত মুল্য
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,হ্রাসকৃত মুল্য
 DocType: Purchase Invoice,Return Against Purchase Invoice,বিরুদ্ধে ক্রয় চালান আসতে
 DocType: Item,Warranty Period (in days),(দিন) ওয়্যারেন্টি সময়কাল
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,যেমন ভ্যাট
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,আইটেম 4
 DocType: Journal Entry Account,Journal Entry Account,জার্নাল এন্ট্রি অ্যাকাউন্ট
 DocType: Shopping Cart Settings,Quotation Series,উদ্ধৃতি সিরিজের
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","একটি আইটেম একই নামের সঙ্গে বিদ্যমান ({0}), আইটেম গ্রুপের নাম পরিবর্তন বা আইটেম নামান্তর করুন"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","একটি আইটেম একই নামের সঙ্গে বিদ্যমান ({0}), আইটেম গ্রুপের নাম পরিবর্তন বা আইটেম নামান্তর করুন"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,গঠন গরম ধাতু গ্যাস
 DocType: Sales Order Item,Sales Order Date,বিক্রয় আদেশ তারিখ
 DocType: Sales Invoice Item,Delivered Qty,বিতরিত Qty
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,গ্রাহক বা সরবরাহকারী
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,সেট
 DocType: Lead,Lead Owner,লিড মালিক
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,গুদাম প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,গুদাম প্রয়োজন বোধ করা হয়
 DocType: Employee,Marital Status,বৈবাহিক অবস্থা
 DocType: Stock Settings,Auto Material Request,অটো উপাদানের জন্য অনুরোধ
 DocType: Time Log,Will be updated when billed.,বিল যখন আপডেট করা হবে.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ ব্যাচ Qty
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,বর্তমান BOM এবং নতুন BOM একই হতে পারে না
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,অবসর তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Sales Invoice,Against Income Account,আয় অ্যাকাউন্টের বিরুদ্ধে
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,আপডেট শেয়ার
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,আইটেম জন্য বিভিন্ন UOM ভুল (মোট) নিট ওজন মান হতে হবে. প্রতিটি আইটেমের নিট ওজন একই UOM হয় তা নিশ্চিত করুন.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM হার
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,হুণ্ডি থেকে আইটেম টান অনুগ্রহ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,হুণ্ডি থেকে আইটেম টান অনুগ্রহ
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,জার্নাল এন্ট্রি {0}-জাতিসংঘের লিঙ্ক আছে
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","টাইপ ইমেইল, ফোন, চ্যাট, দর্শন, ইত্যাদি সব যোগাযোগের রেকর্ড"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,কোম্পানি এ সুসম্পন্ন খরচ কেন্দ্র উল্লেখ করুন
 DocType: Purchase Invoice,Terms,শর্তাবলী
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,নতুন তৈরি
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,নতুন তৈরি
 DocType: Buying Settings,Purchase Order Required,আদেশ প্রয়োজন ক্রয়
 ,Item-wise Sales History,আইটেম-জ্ঞানী বিক্রয় ইতিহাস
 DocType: Expense Claim,Total Sanctioned Amount,মোট অনুমোদিত পরিমাণ
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,বেতন স্লি
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,নোট
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,প্রথমে একটি গ্রুপ নোড নির্বাচন.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},"উদ্দেশ্য, এক হতে হবে {0}"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,ফর্ম পূরণ করুন এবং এটি সংরক্ষণ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ফর্ম পূরণ করুন এবং এটি সংরক্ষণ
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,তাদের সর্বশেষ জায় অবস্থা সব কাঁচামাল সম্বলিত একটি প্রতিবেদন ডাউনলোড
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,সম্মুখ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,কমিউনিটি ফোরাম
 DocType: Leave Application,Leave Balance Before Application,আবেদন করার আগে ব্যালান্স ত্যাগ
 DocType: SMS Center,Send SMS,এসএমএস পাঠান
 DocType: Company,Default Letter Head,চিঠি মাথা ডিফল্ট
 DocType: Time Log,Billable,বিলযোগ্য
 DocType: Authorization Rule,This will be used for setting rule in HR module,এই এইচআর মডিউলে নিয়ম সেট করার জন্য ব্যবহার করা হবে
 DocType: Account,Rate at which this tax is applied,"এই ট্যাক্স প্রয়োগ করা হয়, যা এ হার"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,রেকর্ডার Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,রেকর্ডার Qty
 DocType: Company,Stock Adjustment Account,শেয়ার সামঞ্জস্য অ্যাকাউন্ট
 DocType: Journal Entry,Write Off,খরচ লেখা
 DocType: Time Log,Operation ID,অপারেশন আইডি
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","ছাড়ের ক্ষেত্র ক্রয় আদেশ, কেনার রসিদ, ক্রয় চালান মধ্যে উপলব্ধ করা হবে"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,নতুন একাউন্টের নাম. উল্লেখ্য: গ্রাহকদের এবং সরবরাহকারী জন্য অ্যাকাউন্ট তৈরি করবেন না দয়া করে
 DocType: Report,Report Type,প্রতিবেদনের প্রকার
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,লোড হচ্ছে
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,লোড হচ্ছে
 DocType: BOM Replace Tool,BOM Replace Tool,BOM টুল প্রতিস্থাপন
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,দেশ অনুযায়ী ডিফল্ট ঠিকানা টেমপ্লেট
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
+DocType: Sales Order Item,Supplier delivers to Customer,সরবরাহকারী গ্রাহক যাও বিতরণ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ডেটা আমদানি ও রপ্তানি
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',আপনি উত্পাদন ক্রিয়াকলাপে জড়িত করে. সক্ষম করে আইটেম 'নির্মিত হয়'
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,চালান পোস্টিং তারিখ
 DocType: Sales Invoice,Rounded Total,গোলাকৃতি মোট
 DocType: Product Bundle,List items that form the package.,বাক্স গঠন করে তালিকা আইটেম.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,শতকরা বরাদ্দ 100% সমান হওয়া উচিত
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
 DocType: Company,Default Cash Account,ডিফল্ট নগদ অ্যাকাউন্ট
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,কোম্পানি (না গ্রাহক বা সরবরাহকারীর) মাস্টার.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date','প্রত্যাশিত প্রসবের তারিখ' দয়া করে প্রবেশ করুন
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','প্রত্যাশিত প্রসবের তারিখ' দয়া করে প্রবেশ করুন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,প্রদত্ত পরিমাণ পরিমাণ সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না বন্ধ লিখুন + +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} আইটেম জন্য একটি বৈধ ব্যাচ নম্বর নয় {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},উল্লেখ্য: ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","সারি {0}: স্টক গুদাম আসা না {1} উপর {2} {3}. প্রাপ্তিসাধ্য Qty: {4}, qty স্থানান্তর: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,আইটেম 3
+DocType: Purchase Order,Customer Contact Email,গ্রাহক যোগাযোগ ইমেইল
 DocType: Event,Sunday,রবিবার
 DocType: Sales Team,Contribution (%),অবদান (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না 'ক্যাশ বা ব্যাংক একাউন্ট' উল্লেখ করা হয়নি
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,দায়িত্ব
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,টেমপ্লেট
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,টেমপ্লেট
 DocType: Sales Person,Sales Person Name,সেলস পারসন নাম
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,টেবিলের অন্তত 1 চালান লিখুন দয়া করে
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,ব্যবহারকারী যুক্ত করুন
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),প্রকৃত আরম্
 DocType: Stock Reconciliation Item,Before reconciliation,পুনর্মিলন আগে
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},করুন {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),কর ও চার্জ যোগ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
 DocType: Sales Order,Partly Billed,আংশিক দেখানো হয়েছিল
 DocType: Item,Default BOM,ডিফল্ট BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,মোট বিশিষ্ট মাসিক
 DocType: Time Log Batch,Total Hours,মোট ঘণ্টা
 DocType: Journal Entry,Printing Settings,মুদ্রণ সেটিংস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,স্বয়ংচালিত
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},ইতিমধ্যে অর্থবছরের জন্য {1} কর্মচারী জন্য বরাদ্দ টাইপ {0} পাতার জন্য {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,আইটেম প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,মেটাল ইনজেকশন ছাঁচনির্মাণ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,ডেলিভারি নোট থেকে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ডেলিভারি নোট থেকে
 DocType: Time Log,From Time,সময় থেকে
 DocType: Notification Control,Custom Message,নিজস্ব বার্তা
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,বিনিয়োগ ব্যাংকিং
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,এই ইমেই
 DocType: Stock Entry,From BOM,BOM থেকে
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,মৌলিক
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} নিথর হয় আগে স্টক লেনদেন
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule','নির্মাণ সূচি' তে ক্লিক করুন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,জন্ম অর্ধদিবস ছুটি তারিখ থেকে একই হতে হবে
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','নির্মাণ সূচি' তে ক্লিক করুন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,জন্ম অর্ধদিবস ছুটি তারিখ থেকে একই হতে হবে
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","যেমন কেজি, ইউনিট, আমরা, এম"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,আপনি রেফারেন্স তারিখ প্রবেশ যদি রেফারেন্স কোন বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,আপনি রেফারেন্স তারিখ প্রবেশ যদি রেফারেন্স কোন বাধ্যতামূলক
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,যোগদান তারিখ জন্ম তারিখ থেকে বড় হওয়া উচিত
 DocType: Salary Structure,Salary Structure,বেতন কাঠামো
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","একাধিক মূল্য রুল একই মানদণ্ডের সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ দ্বারা \ দ্বন্দ্ব সমাধান করুন. দাম বিধি: {0}"
 DocType: Account,Bank,ব্যাংক
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,বিমানসংস্থা
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,ইস্যু উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ইস্যু উপাদান
 DocType: Material Request Item,For Warehouse,গুদাম জন্য
 DocType: Employee,Offer Date,অপরাধ তারিখ
 DocType: Hub Settings,Access Token,অ্যাক্সেস টোকেন
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,খোলার সময়
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,থেকে এবং প্রয়োজনীয় তারিখগুলি
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
+DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,তুরপুন
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ঘা ঢালাই
 DocType: Purchase Taxes and Charges,Valuation and Total,মূল্যনির্ধারণ এবং মোট
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,সংশোধিত
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,কাঁচামাল
 DocType: Leave Application,Follow via Email,ইমেইলের মাধ্যমে অনুসরণ করুন
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,শিশু অ্যাকাউন্ট এই অ্যাকাউন্টের জন্য বিদ্যমান. আপনি এই অ্যাকাউন্ট মুছে ফেলতে পারবেন না.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,শিশু অ্যাকাউন্ট এই অ্যাকাউন্টের জন্য বিদ্যমান. আপনি এই অ্যাকাউন্ট মুছে ফেলতে পারবেন না.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,উভয় ক্ষেত্রেই লক্ষ্য Qty বা টার্গেট পরিমাণ বাধ্যতামূলক
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
-DocType: Leave Allocation,Carry Forward,সামনে আগাও
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,তারিখ খোলার তারিখ বন্ধ করার আগে করা উচিত
+DocType: Leave Control Panel,Carry Forward,সামনে আগাও
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র খতিয়ান রূপান্তরিত করা যাবে না
 DocType: Department,Days for which Holidays are blocked for this department.,"দিন, যার জন্য ছুটির এই বিভাগের জন্য ব্লক করা হয়."
 ,Produced,উত্পাদিত
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),মোট (AMT)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,বিনোদন ও অবকাশ
 DocType: Purchase Order,The date on which recurring order will be stop,আবর্তক অর্ডার বন্ধ করা হবে কোন তারিখে
 DocType: Quality Inspection,Item Serial No,আইটেম সিরিয়াল কোন
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} অথবা আপনি বৃদ্ধি করা উচিত ওভারফ্লো সহনশীলতা হ্রাস করা হবে
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} অথবা আপনি বৃদ্ধি করা উচিত ওভারফ্লো সহনশীলতা হ্রাস করা হবে
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,মোট বর্তমান
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ঘন্টা
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ধারাবাহিকভাবে আইটেম {0} শেয়ার রিকনসিলিয়েশন ব্যবহার \ আপডেট করা যাবে না
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,নতুন সিরিয়াল কোন গুদাম থাকতে পারে না. গুদাম স্টক এন্ট্রি বা কেনার রসিদ দ্বারা নির্ধারণ করা হবে
 DocType: Lead,Lead Type,লিড ধরন
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,উদ্ধৃতি তৈরি
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,এই সব জিনিস ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,এই সব জিনিস ইতিমধ্যে invoiced হয়েছে
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},দ্বারা অনুমোদিত হতে পারে {0}
 DocType: Shipping Rule,Shipping Rule Conditions,শিপিং রুল শর্তাবলী
 DocType: BOM Replace Tool,The new BOM after replacement,প্রতিস্থাপন পরে নতুন BOM
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,সি-ফরম
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,অপারেশন আইডি সেট না
 DocType: Production Order,Planned Start Date,পরিকল্পনা শুরুর তারিখ
 DocType: Serial No,Creation Document Type,ক্রিয়েশন ডকুমেন্ট টাইপ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. দর্শন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. দর্শন
 DocType: Leave Type,Is Encash,ভাঙ্গান হয়
 DocType: Purchase Invoice,Mobile No,মোবাইল নাম্বার
 DocType: Payment Tool,Make Journal Entry,জার্নাল এন্ট্রি করতে
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,নতুন পাতার ব
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,প্রকল্প-ভিত্তিক তথ্য উদ্ধৃতি জন্য উপলব্ধ নয়
 DocType: Project,Expected End Date,সমাপ্তি প্রত্যাশিত তারিখ
 DocType: Appraisal Template,Appraisal Template Title,মূল্যায়ন টেমপ্লেট শিরোনাম
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,ব্যবসায়িক
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ব্যবসায়িক
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,মূল আইটেমটি {0} একটি স্টক আইটেম হবে না
 DocType: Cost Center,Distribution Id,বন্টন আইডি
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,জট্টিল সেবা
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} অ্যাট্রিবিউট জন্য মূল্য পরিসীমা মধ্যে হতে হবে {1} করার {2} এর মধ্যে বাড়তি {3}
 DocType: Tax Rule,Sales,সেলস
 DocType: Stock Entry Detail,Basic Amount,বেসিক পরিমাণ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,CR
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
+DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,গ্রহনযোগ্য অ্যাকাউন্ট ডিফল্ট
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,বিলিং রাজ্য
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ল্যামিনেট
 DocType: Item Reorder,Transfer,হস্তান্তর
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
 DocType: Authorization Rule,Applicable To (Employee),প্রযোজ্য (কর্মচারী)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,খুচরা
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,গ্রাহক {0} অস্তিত্ব নেই
 DocType: Attendance,Absent,অনুপস্থিত
 DocType: Product Bundle,Product Bundle,পণ্য সমষ্টি
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,নিষ্পেষণ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,কর ও শুল্ক টেমপ্লেট ক্রয়
 DocType: Upload Attendance,Download Template,ডাউনলোড টেমপ্লেট
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,মন্তব্য
 DocType: Purchase Order Item Supplied,Raw Material Item Code,কাঁচামাল আইটেম কোড
 DocType: Journal Entry,Write Off Based On,ভিত্তি করে লিখুন বন্ধ
 DocType: Features Setup,POS View,পিওএস দেখুন
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,একটি সিরিয়াল নং জন্য ইনস্টলেশন রেকর্ড
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,একটি সিরিয়াল নং জন্য ইনস্টলেশন রেকর্ড
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,একটানা ভোটদান
-sites/assets/js/erpnext.min.js +10,Please specify a,একটি নির্দিষ্ট করুন
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,একটি নির্দিষ্ট করুন
 DocType: Offer Letter,Awaiting Response,প্রতিক্রিয়ার জন্য অপেক্ষা
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,উপরে
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,কোল্ড নির্ধারন
 DocType: Salary Slip,Earning & Deduction,রোজগার & সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,অ্যাকাউন্ট {0} একটি গ্রুপ হতে পারে না
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,এলাকা
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,ঐচ্ছিক. এই সেটিং বিভিন্ন লেনদেন ফিল্টার ব্যবহার করা হবে.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ঐচ্ছিক. এই সেটিং বিভিন্ন লেনদেন ফিল্টার ব্যবহার করা হবে.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
 DocType: Holiday List,Weekly Off,সাপ্তাহিক ছুটি
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","যেমন 2012, 2012-13 জন্য"
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,স্ফীত
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,বাষ্পীভবনের-প্যাটার্ন ঢালাই
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,আমোদ - প্রমোদ খরচ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,এই সেলস অর্ডার বাতিলের আগে চালান {0} বাতিল করতে হবে বিক্রয়
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,বয়স
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,এই সেলস অর্ডার বাতিলের আগে চালান {0} বাতিল করতে হবে বিক্রয়
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,বয়স
 DocType: Time Log,Billing Amount,বিলিং পরিমাণ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,আইটেম জন্য নির্দিষ্ট অকার্যকর পরিমাণ {0}. পরিমাণ 0 তুলনায় বড় হওয়া উচিত.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,ছুটি জন্য অ্যাপ্লিকেশন.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট মুছে ফেলা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট মুছে ফেলা যাবে না
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,আইনি খরচ
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","অটো ক্রম 05, 28 ইত্যাদি যেমন তৈরি করা হবে যা মাসের দিন"
 DocType: Sales Invoice,Posting Time,পোস্টিং সময়
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,লোগো
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,আপনি সংরক্ষণের আগে একটি সিরিজ নির্বাচন করুন ব্যবহারকারীর বাধ্য করতে চান তাহলে এই পরীক্ষা. আপনি এই পরীক্ষা যদি কোন ডিফল্ট থাকবে.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},সিরিয়াল সঙ্গে কোনো আইটেম {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,খোলা বিজ্ঞপ্তি
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,খোলা বিজ্ঞপ্তি
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,সরাসরি খরচ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,আপনি কি সত্যিই এই উপাদানের জন্য অনুরোধ দুর করতে চান না?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,নতুন গ্রাহক রাজস্ব
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ভ্রমণ খরচ
 DocType: Maintenance Visit,Breakdown,ভাঙ্গন
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,আজকের তারিখে
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,পরীক্ষাকাল
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,ডিফল্ট গুদাম স্টক আইটেম জন্য বাধ্যতামূলক.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,ডিফল্ট গুদাম স্টক আইটেম জন্য বাধ্যতামূলক.
 DocType: Feed,Full Name,পুরো নাম
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,সমর্থন
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},মাসের জন্য বেতন পরিশোধ {0} এবং বছরের {1}
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,হিসাব
 DocType: Buying Settings,Default Supplier Type,ডিফল্ট সরবরাহকারী ধরন
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Quarrying
 DocType: Production Order,Total Operating Cost,মোট অপারেটিং খরচ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,উল্লেখ্য: আইটেম {0} একাধিক বার প্রবেশ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,উল্লেখ্য: আইটেম {0} একাধিক বার প্রবেশ
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,সকল যোগাযোগ.
 DocType: Newsletter,Test Email Id,টেস্ট ইমেইল আইডি
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,কোম্পানি সমাহার
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,বি
 DocType: Stock Settings,Role Allowed to edit frozen stock,ভূমিকা হিমায়িত শেয়ার সম্পাদনা করতে পারবেন
 ,Territory Target Variance Item Group-Wise,টেরিটরি উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,সকল গ্রাহকের গ্রুপ
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,ট্যাক্স টেমপ্লেট বাধ্যতামূলক.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} অস্তিত্ব নেই
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),মূল্যতালিকা হার (কোম্পানি একক)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} অবস্থা হয় 'বন্ধ'
 DocType: Account,Temporary,অস্থায়ী
 DocType: Address,Preferred Billing Address,পছন্দের বিলিং ঠিকানা
 DocType: Monthly Distribution Percentage,Percentage Allocation,শতকরা বরাদ্দ
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,আইটেম অন
 DocType: Purchase Order Item,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
 DocType: Quotation,In Words will be visible once you save the Quotation.,আপনি উধৃতি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Ironing
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} থামানো হয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} থামানো হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
 DocType: Lead,Add to calendar on this date,এই তারিখে ক্যালেন্ডারে যোগ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,শিপিং খরচ যোগ করার জন্য বিধি.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,আসন্ন ঘটনাবলী
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,আসন্ন ঘটনাবলী
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,গ্রাহক প্রয়োজন বোধ করা হয়
 DocType: Letter Head,Letter Head,চিঠি মাথা
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,দ্রুত এন্ট্রি
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ফিরুন বাধ্যতামূলক
 DocType: Purchase Order,To Receive,গ্রহণ করতে
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,ফিটিং সঙ্কুচিত
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
 DocType: Serial No,Out of Warranty,পাটা আউট
 DocType: BOM Replace Tool,Replace,প্রতিস্থাপন করা
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,মেজার ডিফল্ট ইউনিট লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,মেজার ডিফল্ট ইউনিট লিখুন দয়া করে
 DocType: Purchase Invoice Item,Project Name,প্রকল্পের নাম
 DocType: Supplier,Mention if non-standard receivable account,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য তাহলে
 DocType: Workflow State,Edit,সম্পাদন করা
 DocType: Journal Entry Account,If Income or Expense,আয় বা ব্যয় যদি
 DocType: Features Setup,Item Batch Nos,আইটেম ব্যাচ আমরা
 DocType: Stock Ledger Entry,Stock Value Difference,শেয়ার মূল্য পার্থক্য
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,মানব সম্পদ
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,মানব সম্পদ
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,পেমেন্ট পুনর্মিলন পরিশোধের
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ট্যাক্স সম্পদ
 DocType: BOM Item,BOM No,BOM কোন
 DocType: Contact Us Settings,Pincode,পিনকোড
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,জার্নাল এন্ট্রি {0} {1} বা ইতিমধ্যে অন্যান্য ভাউচার বিরুদ্ধে মিলেছে অ্যাকাউন্ট নেই
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,জার্নাল এন্ট্রি {0} {1} বা ইতিমধ্যে অন্যান্য ভাউচার বিরুদ্ধে মিলেছে অ্যাকাউন্ট নেই
 DocType: Item,Moving Average,চলন্ত গড়
 DocType: BOM Replace Tool,The BOM which will be replaced,"প্রতিস্থাপন করা হবে, যা BOM"
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,নতুন শেয়ার UOM বর্তমান স্টক UOM থেকে আলাদা হতে হবে
 DocType: Account,Debit,ডেবিট
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,পাতার 0.5 এর গুণিতক বরাদ্দ করা আবশ্যক
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,পাতার 0.5 এর গুণিতক বরাদ্দ করা আবশ্যক
 DocType: Production Order,Operation Cost,অপারেশন খরচ
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,একটি CSV ফাইল থেকে উপস্থিতি আপলোড
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,বিশিষ্ট মাসিক
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,সে
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","এই ইস্যু বরাদ্দ করতে, সাইডবারে "ধার্য" বাটন ব্যবহার করুন."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ফ্রিজ স্টক চেয়ে পুরোনো [দিন]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","দুই বা ততোধিক দামে উপরোক্ত অবস্থার উপর ভিত্তি করে পাওয়া যায়, অগ্রাধিকার প্রয়োগ করা হয়. ডিফল্ট মান শূন্য (ফাঁকা) যখন অগ্রাধিকার 0 থেকে 20 এর মধ্যে একটি সংখ্যা হয়. উচ্চতর সংখ্যা একই অবস্থার সঙ্গে একাধিক প্রাইসিং নিয়ম আছে যদি তা প্রাধান্য নিতে হবে."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,চালান বিরুদ্ধে
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,অর্থবছরের: {0} না বিদ্যমান
 DocType: Currency Exchange,To Currency,মুদ্রা
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,নিম্নলিখিত ব্যবহারকারীদের ব্লক দিনের জন্য চলে যায় অ্যাপ্লিকেশন অনুমোদন করার অনুমতি দিন.
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),হ
 DocType: Stock Entry Detail,Additional Cost,অতিরিক্ত খরচ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,আর্থিক বছরের শেষ তারিখ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
 DocType: Quality Inspection,Incoming,ইনকামিং
 DocType: BOM,Materials Required (Exploded),উপকরণ (অপ্রমাণিত) প্রয়োজন
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),বিনা বেতনে ছুটি জন্য আদায় হ্রাস (LWP)
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},সারি # {0}: সিরিয়াল কোন {1} সঙ্গে মেলে না {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,নৈমিত্তিক ছুটি
 DocType: Batch,Batch ID,ব্যাচ আইডি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},উল্লেখ্য: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},উল্লেখ্য: {0}
 ,Delivery Note Trends,হুণ্ডি প্রবণতা
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,এই সপ্তাহের সংক্ষিপ্ত
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} সারিতে একটি ক্রয় বা উপ-সংকুচিত আইটেম হতে হবে {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} সারিতে একটি ক্রয় বা উপ-সংকুচিত আইটেম হতে হবে {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,অ্যাকাউন্ট: {0} শুধুমাত্র স্টক লেনদেনের মাধ্যমে আপডেট করা যাবে
 DocType: GL Entry,Party,পার্টি
 DocType: Sales Order,Delivery Date,প্রসবের তারিখ
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,গড়. রাজধানীতে হার
 DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
 DocType: Employee,History In Company,কোম্পানি ইন ইতিহাস
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,নিউজ লেটার
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,নিউজ লেটার
 DocType: Address,Shipping,পরিবহন
 DocType: Stock Ledger Entry,Stock Ledger Entry,স্টক লেজার এণ্ট্রি
 DocType: Department,Leave Block List,ব্লক তালিকা ত্যাগ
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,নিরীক্ষক
 DocType: Purchase Order,End date of current order's period,বর্তমান অর্ডারের সময়ের শেষ তারিখ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,অফার লেটার করুন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,প্রত্যাবর্তন
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট টেমপ্লেট হিসাবে একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট টেমপ্লেট হিসাবে একই হতে হবে
 DocType: DocField,Fold,ভাঁজ
 DocType: Production Order Operation,Production Order Operation,উৎপাদন অর্ডার অপারেশন
 DocType: Pricing Rule,Disable,অক্ষম
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,রিপোর্ট হতে
 DocType: SMS Settings,Enter url parameter for receiver nos,রিসিভার আমরা জন্য URL প্যারামিটার লিখুন
 DocType: Sales Invoice,Paid Amount,দেওয়া পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',অ্যাকাউন্ট {0} সমাপ্তি টাইপ 'দায়' হওয়া আবশ্যক
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',অ্যাকাউন্ট {0} সমাপ্তি টাইপ 'দায়' হওয়া আবশ্যক
 ,Available Stock for Packing Items,প্যাকিং আইটেম জন্য উপলব্ধ স্টক
 DocType: Item Variant,Item Variant,আইটেম ভেরিয়েন্ট
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,অন্য কোন ডিফল্ট আছে হিসাবে ডিফল্ট হিসেবে এই ঠিকানায় টেমপ্লেট সেটিং
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,গুনমান ব্যবস্থাপনা
 DocType: Production Planning Tool,Filter based on customer,ফিল্টার গ্রাহক উপর ভিত্তি করে
 DocType: Payment Tool Detail,Against Voucher No,ভাউচার কোন বিরুদ্ধে
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},আইটেমের জন্য পরিমাণ লিখুন দয়া করে {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},আইটেমের জন্য পরিমাণ লিখুন দয়া করে {0}
 DocType: Employee External Work History,Employee External Work History,কর্মচারী বাহ্যিক কাজের ইতিহাস
 DocType: Tax Rule,Purchase,ক্রয়
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,ব্যালেন্স Qty
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials","অন্য ** আইটেম মধ্যে
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},সিরিয়াল কোন আইটেম জন্য বাধ্যতামূলক {0}
 DocType: Item Variant Attribute,Attribute,গুণ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,পরিসীমা থেকে / উল্লেখ করুন
-sites/assets/js/desk.min.js +7652,Created By,দ্বারা নির্মিত
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,দ্বারা নির্মিত
 DocType: Serial No,Under AMC,এএমসি অধীনে
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,আইটেম মূল্যনির্ধারণ হার অবতরণ খরচ ভাউচার পরিমাণ বিবেচনা পুনঃগণনা করা হয়
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,লেনদেন বিক্রয় জন্য ডিফল্ট সেটিংস.
 DocType: BOM Replace Tool,Current BOM,বর্তমান BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,সিরিয়াল কোন যোগ
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,সিরিয়াল কোন যোগ
 DocType: Production Order,Warehouses,ওয়ারহাউস
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,প্রিন্ট ও নিশ্চল
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,গ্রুপ নোড
 DocType: Payment Reconciliation,Minimum Amount,ন্যূনতম পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,আপডেট সমাপ্ত পণ্য
 DocType: Workstation,per hour,প্রতি ঘণ্টা
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},ইতিমধ্যে ব্যবহৃত সিরিজ {0} {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},ইতিমধ্যে ব্যবহৃত সিরিজ {0} {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,গুদাম (চিরস্থায়ী পরিসংখ্যা) জন্য অ্যাকাউন্ট এই অ্যাকাউন্টের অধীনে তৈরি করা হবে.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না.
 DocType: Company,Distribution,বিতরণ
-sites/assets/js/erpnext.min.js +50,Amount Paid,পরিমাণ অর্থ প্রদান করা
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,পরিমাণ অর্থ প্রদান করা
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,প্রকল্প ব্যবস্থাপক
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,প্রাণবধ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,আইটেম জন্য অনুমোদিত সর্বোচ্চ ছাড়: {0} {1}% হল
 DocType: Customer,Default Taxes and Charges,ডিফল্ট কর ও শুল্ক
 DocType: Account,Receivable,প্রাপ্য
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,সারি # {0}: ক্রয় আদেশ ইতিমধ্যেই বিদ্যমান হিসাবে সরবরাহকারী পরিবর্তন করার অনুমতি নেই
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,সেট ক্রেডিট সীমা অতিক্রম লেনদেন জমা করার অনুমতি দেওয়া হয় যে ভূমিকা.
 DocType: Sales Invoice,Supplier Reference,সরবরাহকারী রেফারেন্স
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","চেক করা থাকলে, উপ-সমাবেশ আইটেম জন্য BOM কাঁচামাল পাওয়ার জন্য বিবেচনা করা হবে. অন্যথা, সব সাব-সমাবেশ জিনিস কাঁচামাল হিসেবে গণ্য করা হবে."
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,প্রাপক Add / Remove
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},লেনদেন বন্ধ উত্পাদনের বিরুদ্ধে অনুমতি না করার {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ডিফল্ট হিসাবে চলতি অর্থবছরেই সেট করতে 'ডিফল্ট হিসাবে সেট করুন' ক্লিক করুন"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),সমর্থন ইমেল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ঘাটতি Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Salary Slip,Salary Slip,বেতন পিছলানো
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'তারিখ' প্রয়োজন বোধ করা হয়
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","চেক লেনদেনের কোনো "জমা" করা হয়, তখন একটি ইমেল পপ-আপ স্বয়ংক্রিয়ভাবে একটি সংযুক্তি হিসাবে লেনদেনের সঙ্গে, যে লেনদেনে যুক্ত "যোগাযোগ" একটি ইমেল পাঠাতে খোলা. ব্যবহারকারী may অথবা ইমেইল পাঠাতে পারে."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,গ্লোবাল সেটিংস
 DocType: Employee Education,Employee Education,কর্মচারী শিক্ষা
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
 DocType: Salary Slip,Net Pay,নেট বেতন
 DocType: Account,Account,হিসাব
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,সিরিয়াল কোন {0} ইতিমধ্যে গৃহীত হয়েছে
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,উৎপাদন ব্যবহারকা
 DocType: Purchase Order,Raw Materials Supplied,কাঁচামালের সরবরাহ
 DocType: Purchase Invoice,Recurring Print Format,পুনরাবৃত্ত মুদ্রণ বিন্যাস
 DocType: Communication,Series,সিরিজ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,প্রত্যাশিত প্রসবের তারিখ ক্রয় আদেশ তারিখের আগে হতে পারে না
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,প্রত্যাশিত প্রসবের তারিখ ক্রয় আদেশ তারিখের আগে হতে পারে না
 DocType: Appraisal,Appraisal Template,মূল্যায়ন টেমপ্লেট
 DocType: Communication,Email,ইমেইল
 DocType: Item Group,Item Classification,আইটেম সাইট
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,বেতনের সেটিংস
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,অ লিঙ্ক চালান এবং পেমেন্টস্ মেলে.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,প্লেস আদেশ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root- র একটি ঊর্ধ্বতন খরচ কেন্দ্র থাকতে পারে না
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,নির্বাচন ব্র্যান্ড ...
 DocType: Sales Invoice,C-Form Applicable,সি-ফরম প্রযোজ্য
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
 DocType: Supplier,Address and Contacts,ঠিকানা এবং পরিচিতি
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,বিশিষ্ট ভাউচার পেতে
 DocType: Warranty Claim,Resolved By,দ্বারা এই সমস্যাগুলি সমাধান
 DocType: Appraisal,Start Date,শুরুর তারিখ
-sites/assets/js/desk.min.js +7629,Value,মূল্য
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,মূল্য
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,একটি নির্দিষ্ট সময়ের জন্য পাতার বরাদ্দ.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,যাচাই করার জন্য এখানে ক্লিক করুন
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,অ্যাকাউন্ট {0}: আপনি অভিভাবক অ্যাকাউন্ট হিসাবে নিজেকে ধার্য করতে পারবেন না
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,ড্রপবক্স অ্যাক্সেস অনুমতি
 DocType: Dropbox Backup,Weekly,সাপ্তাহিক
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,যেমন. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,গ্রহণ করা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,গ্রহণ করা
 DocType: Maintenance Visit,Fully Completed,সম্পূর্ণরূপে সম্পন্ন
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% সমাপ্তি
 DocType: Employee,Educational Qualification,শিক্ষাগত যোগ্যতা
 DocType: Workstation,Operating Costs,অপারেটিং খরচ
 DocType: Employee Leave Approver,Employee Leave Approver,কর্মী ছুটি রাজসাক্ষী
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} সফলভাবে আমাদের নিউজলেটার তালিকায় যুক্ত হয়েছে.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ইলেক্ট্রন মরীচি যন্ত্র
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ক্রয় মাস্টার ম্যানেজার
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,খরচ কেন্দ্র এর চার্ট
 ,Requested Items To Be Ordered,অনুরোধ করা চলছে আদেশ করা
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,আমার আদেশ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,আমার আদেশ
 DocType: Price List,Price List Name,মূল্যতালিকা নাম
 DocType: Time Log,For Manufacturing,উৎপাদনের জন্য
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,সমগ্র
@@ -3471,7 +3489,7 @@ DocType: Account,Income,আয়
 DocType: Industry Type,Industry Type,শিল্প শ্রেণী
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,কিছু ভুল হয়েছে!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,চালান {0} ইতিমধ্যেই জমা দেওয়া হয়েছে বিক্রয়
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,চালান {0} ইতিমধ্যেই জমা দেওয়া হয়েছে বিক্রয়
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,সমাপ্তির তারিখ
 DocType: Purchase Invoice Item,Amount (Company Currency),পরিমাণ (কোম্পানি একক)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,মরা ঢালাই
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,বছর
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,পয়েন্ট অফ বিক্রয় প্রোফাইল
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,এসএমএস সেটিংস আপডেট করুন
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,ইতিমধ্যে বিল টাইম ইন {0}
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,ইতিমধ্যে বিল টাইম ইন {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,জামানতবিহীন ঋণ
 DocType: Cost Center,Cost Center Name,খরচ কেন্দ্র নাম
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,সিরিয়াল সঙ্গে আইটেম {0} {1} ইতিমধ্যেই ইনস্টল করা
 DocType: Maintenance Schedule Detail,Scheduled Date,নির্ধারিত তারিখ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,মোট পরিশোধিত মাসিক
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 অক্ষরের বেশী বেশী বার্তা একাধিক বার্তা বিভক্ত করা হবে
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,গৃহীত হয়
 ,Serial No Service Contract Expiry,সিরিয়াল কোন সার্ভিস চুক্তি মেয়াদ উত্তীর্ন
 DocType: Item,Unit of Measure Conversion,পরিমাপ রূপান্তর ইউনিট
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,কর্মচারী পরিবর্তন করা যাবে না
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
 DocType: Naming Series,Help HTML,হেল্প এইচটিএমএল
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},100% হওয়া উচিত নির্ধারিত মোট গুরুত্ব. এটা হল {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}
 DocType: Address,Name of person or organization that this address belongs to.,এই অঙ্ক জন্যে যে ব্যক্তি বা প্রতিষ্ঠানের নাম.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,আপনার সরবরাহকারীদের
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,ধর্মান্তরিত
 DocType: Item,Has Serial No,সিরিয়াল কোন আছে
 DocType: Employee,Date of Issue,প্রদান এর তারিখ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: থেকে {0} জন্য {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
 DocType: Issue,Content Type,কোন ধরনের
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,কম্পিউটার
 DocType: Item,List this Item in multiple groups on the website.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,আইটেম: {0} সিস্টেমের মধ্যে উপস্থিত না
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
 DocType: Payment Reconciliation,Get Unreconciled Entries,অসমর্পিত এন্ট্রি পেতে
@@ -3524,14 +3542,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,গুদাম থেকে
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},অ্যাকাউন্ট {0} অর্থবছরের জন্য একবারের বেশি প্রবেশ করা হয়েছে {1}
 ,Average Commission Rate,গড় কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'হ্যাঁ' হতে অ স্টক আইটেম জন্য না পারেন 'সিরিয়াল কোন হয়েছে'
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'হ্যাঁ' হতে অ স্টক আইটেম জন্য না পারেন 'সিরিয়াল কোন হয়েছে'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,এ্যাটেনডেন্স ভবিষ্যতে তারিখগুলি জন্য চিহ্নিত করা যাবে না
 DocType: Pricing Rule,Pricing Rule Help,প্রাইসিং শাসন সাহায্য
 DocType: Purchase Taxes and Charges,Account Head,অ্যাকাউন্ট হেড
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,আইটেম অবতরণ খরচ নিরূপণ করার জন্য অতিরিক্ত খরচ আপডেট
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,বৈদ্যুতিক
 DocType: Stock Entry,Total Value Difference (Out - In),মোট মূল্য পার্থক্য (আউট - ইন)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ইউজার আইডি কর্মচারী জন্য নির্ধারণ করে না {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,পাটা দাবি
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,নামকরণ সিরিজ
 DocType: Leave Block List,Leave Block List Name,ব্লক তালিকা নাম
 DocType: User,Enabled,সক্রিয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,স্টক সম্পদ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},আপনি কি সত্যিই মাস {0} এবং বছরের জন্য সমস্ত বেতন স্লিপ জমা দিতে চান {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},আপনি কি সত্যিই মাস {0} এবং বছরের জন্য সমস্ত বেতন স্লিপ জমা দিতে চান {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,আমদানি সদস্যবৃন্দ
 DocType: Target Detail,Target Qty,উদ্দিষ্ট Qty
 DocType: Attendance,Present,বর্তমান
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,হুণ্ডি {0} সম্পন্ন করা সম্ভব নয়
 DocType: Notification Control,Sales Invoice Message,বিক্রয় চালান পাঠান
 DocType: Authorization Rule,Based On,উপর ভিত্তি করে
-,Ordered Qty,আদেশ Qty
+DocType: Sales Order Item,Ordered Qty,আদেশ Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,বেতন Slips নির্মাণ
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} একটি বৈধ ইমেইল আইডি নয়
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,আপলোড এ্যাটেনডেন্স
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ও উৎপাদন পরিমাণ প্রয়োজন হয়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,বুড়ো বিন্যাস 2
-DocType: Journal Entry Account,Amount,পরিমাণ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,পরিমাণ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM প্রতিস্থাপিত
 ,Sales Analytics,বিক্রয় বিশ্লেষণ
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,প্রত্যাশিত তারিখ উপাদান অনুরোধ তারিখের আগে হতে পারে না
 DocType: Contact Us Settings,City,শহর
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,শ্রুতির যন্ত্র
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,ত্রুটি: একটি বৈধ আইডি?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,ত্রুটি: একটি বৈধ আইডি?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,আইটেম {0} একটি সেলস পেইজ হতে হবে
 DocType: Naming Series,Update Series Number,আপডেট সিরিজ সংখ্যা
 DocType: Account,Equity,ন্যায়
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,আসল
 DocType: Authorization Rule,Customerwise Discount,Customerwise ছাড়
 DocType: Purchase Invoice,Against Expense Account,ব্যয় অ্যাকাউন্টের বিরুদ্ধে
 DocType: Production Order,Production Order,উৎপাদন অর্ডার
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,ইনস্টলেশন উল্লেখ্য {0} ইতিমধ্যেই জমা দেওয়া হয়েছে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,ইনস্টলেশন উল্লেখ্য {0} ইতিমধ্যেই জমা দেওয়া হয়েছে
 DocType: Quotation Item,Against Docname,Docname বিরুদ্ধে
 DocType: SMS Center,All Employee (Active),সকল কর্মচারী (অনলাইনে)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,এখন দেখুন
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,কাঁচামাল খরচ
 DocType: Item,Re-Order Level,পুনর্বিন্যাস স্তর
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"আপনি প্রকাশনা আদেশ বাড়াতে বা বিশ্লেষণের জন্য কাঁচামাল ডাউনলোড করতে চান, যার জন্য জিনিস এবং পরিকল্পনা Qty লিখুন."
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt চার্ট
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt চার্ট
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,খন্ডকালীন
 DocType: Employee,Applicable Holiday List,প্রযোজ্য ছুটির তালিকা
 DocType: Employee,Cheque,চেক
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,সিরিজ আপডেট
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,প্রতিবেদন প্রকার বাধ্যতামূলক
 DocType: Item,Serial Number Series,ক্রমিক সংখ্যা সিরিজ
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},ওয়্যারহাউস সারিতে স্টক আইটেম {0} জন্য বাধ্যতামূলক {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ওয়্যারহাউস সারিতে স্টক আইটেম {0} জন্য বাধ্যতামূলক {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,খুচরা পাইকারি
 DocType: Issue,First Responded On,প্রথম প্রতিক্রিয়া
 DocType: Website Item Group,Cross Listing of Item in multiple groups,একাধিক গ্রুপ আইটেমের ক্রস তালিকা
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,উপস্থিতি
 DocType: Page,No,না
 DocType: BOM,Materials,উপকরণ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","সংযত না হলে, তালিকা থেকে এটি প্রয়োগ করা হয়েছে যেখানে প্রতিটি ডিপার্টমেন্ট যোগ করা হবে."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,তারিখ পোস্টিং এবং সময় পোস্ট বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,তারিখ পোস্টিং এবং সময় পোস্ট বাধ্যতামূলক
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,লেনদেন কেনার জন্য ট্যাক্স টেমপ্লেট.
 ,Item Prices,আইটেমটি মূল্য
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,আপনি ক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,প্রশাসনিক খরচ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,পরামর্শকারী
 DocType: Customer Group,Parent Customer Group,মূল ক্রেতা গ্রুপ
-sites/assets/js/erpnext.min.js +50,Change,পরিবর্তন
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,পরিবর্তন
 DocType: Purchase Invoice,Contact Email,যোগাযোগের ই - মেইল
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',ক্রয় আদেশ {0} 'বন্ধ' করা হয়
 DocType: Appraisal Goal,Score Earned,স্কোর অর্জিত
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",যেমন "আমার কোম্পানি এলএলসি"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,বিজ্ঞপ্তি সময়কাল
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,গ্রস ওজন UOM
 DocType: Email Digest,Receivables / Payables,সম্ভাব্য / Payables
 DocType: Delivery Note Item,Against Sales Invoice,বিক্রয় চালান বিরুদ্ধে
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,মুদ্রাঙ্কন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,ক্রেডিট অ্যাকাউন্ট
 DocType: Landed Cost Item,Landed Cost Item,ল্যান্ড খরচ আইটেমটি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,শূন্য মান দেখাও
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,আইটেমের পরিমাণ কাঁচামাল দেওয়া পরিমাণে থেকে repacking / উত্পাদন পরে প্রাপ্ত
 DocType: Payment Reconciliation,Receivable / Payable Account,গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট
 DocType: Delivery Note Item,Against Sales Order Item,বিক্রয় আদেশ আইটেমটি বিরুদ্ধে
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
 DocType: Item,Default Warehouse,ডিফল্ট ওয়্যারহাউস
 DocType: Task,Actual End Date (via Time Logs),প্রকৃত শেষ তারিখ (সময় লগসমূহ মাধ্যমে)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},বাজেট গ্রুপ অ্যাকাউন্ট বিরুদ্ধে নিয়োগ করা যাবে না {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,দলকে সমর্থন
 DocType: Appraisal,Total Score (Out of 5),(5 এর মধ্যে) মোট স্কোর
 DocType: Contact Us Settings,State,রাষ্ট্র
 DocType: Batch,Batch,ব্যাচ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,ভারসাম্য
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,ভারসাম্য
 DocType: Project,Total Expense Claim (via Expense Claims),মোট ব্যয় দাবি (ব্যয় দাবি মাধ্যমে)
 DocType: User,Gender,লিঙ্গ
 DocType: Journal Entry,Debit Note,ডেবিট নোট
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,ব্লগ গ্রাহক
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,মান উপর ভিত্তি করে লেনদেনের সীমিত করার নিয়ম তৈরি করুন.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","চেক করা থাকলে, মোট কোন. কার্যদিবসের ছুটির অন্তর্ভুক্ত করা হবে, এবং এই বেতন প্রতি দিন মূল্য কমাতে হবে"
 DocType: Purchase Invoice,Total Advance,মোট অগ্রিম
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,দুর উপাদানের জন্য অনুরোধ
 DocType: Workflow State,User,ব্যবহারকারী
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,প্রসেসিং বেতনের
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,প্রসেসিং বেতনের
 DocType: Opportunity Item,Basic Rate,মৌলিক হার
 DocType: GL Entry,Credit Amount,ক্রেডিট পরিমাণ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,লস্ট হিসেবে সেট
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,ক্রেডিট দিনের উ
 DocType: Tax Rule,Tax Rule,ট্যাক্স রুল
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,বিক্রয় চক্র সর্বত্র একই হার বজায় রাখা
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ওয়ার্কস্টেশন ওয়ার্কিং সময়ের বাইরে সময় লগ পরিকল্পনা করুন.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} ইতিমধ্যেই জমা দেওয়া হয়েছে
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ইতিমধ্যেই জমা দেওয়া হয়েছে
 ,Items To Be Requested,চলছে অনুরোধ করা
 DocType: Purchase Order,Get Last Purchase Rate,শেষ কেনার হার পেতে
 DocType: Time Log,Billing Rate based on Activity Type (per hour),কার্যকলাপ টাইপ উপর ভিত্তি করে বিলিং হার (প্রতি ঘন্টায়)
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","কোম্পানি ইমেইল আইডি পাওয়া যায়নি, তাই পাঠানো না mail"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ফান্ডস (সম্পদ) এর আবেদন
 DocType: Production Planning Tool,Filter based on item,ফিল্টার আইটেম উপর ভিত্তি করে
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,ডেবিট অ্যাকাউন্ট
 DocType: Fiscal Year,Year Start Date,বছরের শুরু তারিখ
 DocType: Attendance,Employee Name,কর্মকর্তার নাম
 DocType: Sales Invoice,Rounded Total (Company Currency),গোলাকৃতি মোট (কোম্পানি একক)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,কর্মচারীর সুবিধা
 DocType: Sales Invoice,Is POS,পিওএস
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
 DocType: Production Order,Manufactured Qty,শিল্পজাত Qty
 DocType: Purchase Receipt Item,Accepted Quantity,গৃহীত পরিমাণ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} না বিদ্যমান
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,গ্রাহকরা উত্থাপিত বিল.
 DocType: DocField,Default,ডিফল্ট
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,প্রকল্প আইডি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} গ্রাহকদের যোগ
 DocType: Maintenance Schedule,Schedule,সময়সূচি
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","এই খরচ কেন্দ্র বাজেট নির্ধারণ করুন. বাজেটের কর্ম নির্ধারণ করার জন্য, দেখুন "কোম্পানি তালিকা""
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,মূল অ্যাকাউন্ট
 DocType: Quality Inspection Reading,Reading 3,3 পড়া
 ,Hub,হাব
 DocType: GL Entry,Voucher Type,ভাউচার ধরন
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
 DocType: Expense Claim,Approved,অনুমোদিত
 DocType: Pricing Rule,Price,মূল্য
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী 'বাম' হিসাবে
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,শিক্ষা
 DocType: Selling Settings,Campaign Naming By,প্রচারে নেমিং
 DocType: Employee,Current Address Is,বর্তমান ঠিকানা
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",ঐচ্ছিক. নির্ধারিত না হলে কোম্পানির ডিফল্ট মুদ্রা সেট.
 DocType: Address,Office,অফিস
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,স্ট্যান্ডার্ড প্রতিবেদন
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,অ্যাকাউন্টিং জার্নাল এন্ট্রি.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},সারি {0}: পার্টি / অ্যাকাউন্টের সাথে মেলে না {1} / {2} এ {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ Qty
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},সারি {0}: পার্টি / অ্যাকাউন্টের সাথে মেলে না {1} / {2} এ {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,একটি ট্যাক্স অ্যাকাউন্ট তৈরি করতে
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
 DocType: Account,Stock,স্টক
 DocType: Employee,Current Address,বর্তমান ঠিকানা
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","স্পষ্টভাবে উল্লেখ তবে আইটেমটি তারপর বর্ণনা, চিত্র, প্রাইসিং, করের টেমপ্লেট থেকে নির্ধারণ করা হবে ইত্যাদি অন্য আইটেম একটি বৈকল্পিক যদি"
 DocType: Serial No,Purchase / Manufacture Details,ক্রয় / প্রস্তুত বিস্তারিত
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,ব্যাচ পরিসংখ্যা
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,ব্যাচ পরিসংখ্যা
 DocType: Employee,Contract End Date,চুক্তি শেষ তারিখ
 DocType: Sales Order,Track this Sales Order against any Project,কোন প্রকল্পের বিরুদ্ধে এই বিক্রয় আদেশ ট্র্যাক
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,টানুন বিক্রয় আদেশ উপরে মাপকাঠির ভিত্তিতে (বিলি মুলতুবি)
 DocType: DocShare,Document Type,নথিপত্র ধরণ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,সরবরাহকারী উদ্ধৃতি থেকে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,সরবরাহকারী উদ্ধৃতি থেকে
 DocType: Deduction Type,Deduction Type,সিদ্ধান্তগ্রহণ ধরন
 DocType: Attendance,Half Day,অর্ধদিবস
 DocType: Pricing Rule,Min Qty,ন্যূনতম Qty
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,পরিমাণ (Qty শিল্পজাত) বাধ্যতামূলক
 DocType: Stock Entry,Default Target Warehouse,ডিফল্ট উদ্দিষ্ট ওয়্যারহাউস
 DocType: Purchase Invoice,Net Total (Company Currency),একুন (কোম্পানি একক)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট বিরুদ্ধে শুধুমাত্র প্রযোজ্য
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট বিরুদ্ধে শুধুমাত্র প্রযোজ্য
 DocType: Notification Control,Purchase Receipt Message,কেনার রসিদ পাঠান
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,সর্বমোট পাতার সময়ের চেয়ে বেশি হয়
 DocType: Production Order,Actual Start Date,প্রকৃত আরম্ভের তারিখ
 DocType: Sales Order,% of materials delivered against this Sales Order,উপকরণ% এই বিক্রয় আদেশের বিরুদ্ধে বিতরণ
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,রেকর্ড আইটেমটি আন্দোলন.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,রেকর্ড আইটেমটি আন্দোলন.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,নিউজলেটার তালিকা গ্রাহক
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,সেবা
 DocType: Hub Settings,Hub Settings,হাব সেটিংস
 DocType: Project,Gross Margin %,গ্রস মার্জিন%
 DocType: BOM,With Operations,অপারেশন সঙ্গে
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,হিসাব থেকে ইতিমধ্যে মুদ্রা তৈরি করা হয়েছে {0} কোম্পানির জন্য {1}. মুদ্রা একক সঙ্গে একটি প্রাপ্য বা প্রদেয় অ্যাকাউন্ট নির্বাচন করুন {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,হিসাব থেকে ইতিমধ্যে মুদ্রা তৈরি করা হয়েছে {0} কোম্পানির জন্য {1}. মুদ্রা একক সঙ্গে একটি প্রাপ্য বা প্রদেয় অ্যাকাউন্ট নির্বাচন করুন {0}.
 ,Monthly Salary Register,মাসিক বেতন নিবন্ধন
-apps/frappe/frappe/website/template.py +123,Next,পরবর্তী
+apps/frappe/frappe/website/template.py +140,Next,পরবর্তী
 DocType: Warranty Claim,If different than customer address,গ্রাহক অঙ্ক চেয়ে ভিন্ন যদি
 DocType: BOM Operation,BOM Operation,BOM অপারেশন
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,পরবর্তী তারিখ
 DocType: Employee Education,Major/Optional Subjects,মেজর / ঐচ্ছিক বিষয়াবলী
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,কর ও চার্জ লিখুন দয়া করে
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,যন্ত্র
+DocType: Sales Invoice Item,Drop Ship,ড্রপ জাহাজ
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","এখানে আপনি নামের এবং পিতা বা মাতা, স্ত্রী ও সন্তানদের বৃত্তি মত পরিবার বিবরণ স্থাপন করতে পারে"
 DocType: Hub Settings,Seller Name,বিক্রেতা নাম
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),কর ও শুল্ক বাদ (কোম্পানি একক)
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,জখন এবং বিল থে
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,ডিজাইনার
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,শর্তাবলী টেমপ্লেট
 DocType: Serial No,Delivery Details,প্রসবের বিবরণ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,পরিমাণ এই সীমার নিচে পড়ে তাহলে স্বয়ংক্রিয়ভাবে উপাদান অনুরোধ করুন
 ,Item-wise Purchase Register,আইটেম-বিজ্ঞ ক্রয় নিবন্ধন
 DocType: Batch,Expiry Date,মেয়াদ শেষ হওয়ার তারিখ
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","পুনর্বিন্যাস স্তর সেট করতে, আইটেমটি একটি ক্রয় আইটেম বা উৎপাদন আইটেম হতে হবে"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","পুনর্বিন্যাস স্তর সেট করতে, আইটেমটি একটি ক্রয় আইটেম বা উৎপাদন আইটেম হতে হবে"
 ,Supplier Addresses and Contacts,সরবরাহকারী ঠিকানা এবং পরিচিতি
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,প্রথম শ্রেণী নির্বাচন করুন
 apps/erpnext/erpnext/config/projects.py +18,Project master.,প্রকল্প মাস্টার.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,মুদ্রা ইত্যাদি $ মত কোন প্রতীক পরের প্রদর্শন না.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(অর্ধদিবস)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM থেকে জানানোর পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM থেকে জানানোর পান
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,সময় দিন লিড
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,উপকরণ বিল
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {1}
 DocType: Dropbox Backup,Send Notifications To,বিজ্ঞপ্তি পাঠান
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,সুত্র তারিখ
 DocType: Employee,Reason for Leaving,ত্যাগ করার জন্য কারণ
 DocType: Expense Claim Detail,Sanctioned Amount,অনুমোদিত পরিমাণ
 DocType: GL Entry,Is Opening,খোলার
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},সারি {0}: ডেবিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},সারি {0}: ডেবিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
 DocType: Account,Cash,নগদ
 DocType: Employee,Short biography for website and other publications.,ওয়েবসাইট ও অন্যান্য প্রকাশনা সংক্ষিপ্ত জীবনী.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},কর্মচারীর জন্য বেতন কাঠামো তৈরি করুন {0}
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 84b66f7f19..28ccdc48a1 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Plaća način
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Odaberite Mjesečna distribucija, ako želite pratiti na osnovu sezonski."
 DocType: Employee,Divorced,Rastavljen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Upozorenje: Ista stavka je ušao više puta.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozorenje: Ista stavka je ušao više puta.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Predmeti već sinhronizovani
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dozvolite Stavka treba dodati više puta u transakciji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal {0} Posjeti prije otkazivanja ova garancija potraživanje
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zbijanja plus sinteriranje
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potreban za Cjenovnik {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Hoće li biti izračunata u transakciji.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Od materijala zahtjev
+DocType: Purchase Order,Customer Contact,Customer Contact
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od materijala zahtjev
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Naziv klijenta
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Sve izvoz srodnih područja poput valute , stopa pretvorbe , izvoz ukupno , izvoz sveukupnom itd su dostupni u Dostavnica, POS , ponude, prodaje fakture , prodajnog naloga i sl."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (ili grupe) protiv kojih Računovodstvo unosi se izrađuju i sredstva se održavaju.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Uobičajeno 10 min
 DocType: Leave Type,Leave Type Name,Ostavite ime tipa
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija Updated uspješno
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Više cijene stavke.
 DocType: SMS Center,All Supplier Contact,Svi kontakti dobavljača
 DocType: Quality Inspection Reading,Parameter,Parametar
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Očekivani Završni datum ne može biti manji od očekivanog datuma Početak
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Da stvarno želite da odčepiti proizvodnju kako bi:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rate moraju biti isti kao {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Novi dopust Primjena
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati ​​na temelju svog koda koristiti ovu opciju
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Show Varijante
 DocType: Sales Invoice Item,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Tekuća godina
-sites/assets/js/erpnext.min.js +27,In Stock,U Stock
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Mogu samo napraviti uplatu protiv nenaplaćenu prodajni nalog
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,U Stock
 DocType: Designation,Designation,Oznaka
 DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Napravite novi POS profil
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Zdravstvena zaštita
 DocType: Purchase Invoice,Monthly,Mjesečno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faktura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kašnjenje u plaćanju (Dani)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail adresa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Skraćeni naziv
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Ne vozila
-sites/assets/js/erpnext.min.js +55,Please select Price List,Molimo odaberite Cjenik
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Molimo odaberite Cjenik
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Obradu
 DocType: Production Order Operation,Work In Progress,Radovi u toku
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ispis
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Roditelj Detalj docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otvaranje za posao.
 DocType: Item Attribute,Increment,Prirast
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Odaberite Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Oglašavanje
 DocType: Employee,Married,Oženjen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 DocType: Payment Reconciliation,Reconcile,pomiriti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Make Bank Entry
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank Entry
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,mirovinskim fondovima
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je tip naloga Skladište
 DocType: SMS Center,All Sales Person,Svi prodavači
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Otpis troška
 DocType: Warehouse,Warehouse Detail,Detalji o skladištu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešla za kupca {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Vrste poreza
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Niste ovlašteni za dodati ili ažurirati unose prije {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Niste ovlašteni za dodati ili ažurirati unose prije {0}
 DocType: Item,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kupac postoji s istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Rate / 60) * Puna vrijeme rada
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Gost
 DocType: Quality Inspection,Get Specification Details,Kreiraj detalje specifikacija
 DocType: Lead,Interested,Zainteresiran
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Sastavnica
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvaranje
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvaranje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Primjerak iz točke Group
 DocType: Journal Entry,Opening Entry,Otvaranje unos
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Na upit
 DocType: Standard Reply,Owner,vlasnik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Unesite tvrtka prva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Molimo najprije odaberite Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Molimo najprije odaberite Company
 DocType: Employee Education,Under Graduate,Pod diplomski
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefiks
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Potrošni
 DocType: Upload Attendance,Import Log,Uvoz Prijavite
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Poslati
+DocType: Sales Invoice Item,Delivered By Supplier,Isporučuje dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Godišnja zarada
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show time Dnevnici
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company valuta
 DocType: Delivery Note,Installation Status,Status instalacije
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply sirovine za kupovinu
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Stavka {0} mora bitikupnja artikla
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite Template, popunite odgovarajuće podatke i priložite modifikovani datoteku.
  Svi datumi i zaposlenog kombinacija u odabranom periodu doći će u predlošku, sa postojećim pohađanje evidencije"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Stavka {0} nije aktivan ili kraj života je postignut
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Stavka {0} nije aktivan ili kraj života je postignut
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Hoće li se obnavljaju nakon prodaje fakture je Prijavljen.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Podešavanja modula ljudskih resursa
 DocType: SMS Center,SMS Center,SMS centar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ispravljanje
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Unesite URL parametar za p
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Pravila za primjenu cijene i popust .
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Ovaj put Log sukoba sa {0} za {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na cijenu List stopa (%)
-sites/assets/js/form.min.js +279,Start,početak
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,početak
 DocType: User,First Name,Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Vaša Podešavanje je dovršeno. Osvježavajući.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-kalupa casting
 DocType: Offer Letter,Select Terms and Conditions,Odaberite uvjeti
 DocType: Production Planning Tool,Sales Orders,Sales Orders
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje fakture Item
 ,Production Orders in Progress,Radni nalozi u tijeku
 DocType: Lead,Address & Contact,Adresa i kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorišteni lišće iz prethodnog izdvajanja
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Sljedeća Ponavljajući {0} će biti kreiran na {1}
 DocType: Newsletter List,Total Subscribers,Ukupno Pretplatnici
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt ime
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO čekanju Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zahtjev za kupnju.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double stanovanje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ostavlja per Godina
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Molimo podesite Imenovanje serije za {0} preko Podešavanje> Settings> Imenovanje serije
 DocType: Time Log,Will be updated when batched.,Hoće li biti ažurirani kada izmiješane.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Molimo provjerite 'Je li Advance ""protiv Account {1} ako je to unaprijed unos."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Molimo provjerite 'Je li Advance ""protiv Account {1} ako je to unaprijed unos."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
 DocType: Bulk Email,Message,Poruka
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice artikla
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox pristupni ključ
 DocType: Payment Tool,Reference No,Poziv na broj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Ostavite blokirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
 DocType: Stock Entry,Sales Invoice No,Faktura prodaje br
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Minimalna količina za naručiti
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Item,Publish in Hub,Objavite u Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Artikal {0} je otkazan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Materijal zahtjev
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u 'sirovine Isporučuje' sto u narudžbenice {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Obavijest kontrola
 DocType: Lead,Suggestions,Prijedlozi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Postavite Stavka Grupa-mudre proračune na ovom području. Također možete uključiti sezonalnost postavljanjem Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Unesite roditelja grupe računa za skladište {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veći od preostalog iznosa {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veći od preostalog iznosa {2}
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel broj
 DocType: Maintenance Schedule,Generate Schedule,Generiranje Raspored
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Novi kataloški UOM
 DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa
 DocType: Employee,External Work History,Vanjski History Work
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kružna Reference Error
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Da li stvarno želite zaustaviti
 DocType: Communication,Closed,Zatvoreno
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Jeste li sigurni da želite zaustaviti
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,posao Profile
 DocType: Newsletter,Newsletter,Bilten
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Otpremnica
 DocType: Dropbox Backup,Allow Dropbox Access,Dopusti pristup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Plaćanje Entry je izmijenjena nakon što ste ga izvukao. Molimo vas da se ponovo povucite.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Pregled za ovaj tjedan i aktivnostima na čekanju
 DocType: Workstation,Rent Cost,Rent cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Molimo odaberite mjesec i godinu
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostupno u sastavnicama, otpremnicama, računu kupnje, nalogu za proizvodnju, narudžbi kupnje, primci, prodajnom računu, narudžbi kupca, ulaznog naloga i kontrolnoj kartici"
 DocType: Item Tax,Tax Rate,Porezna stopa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Odaberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Odaberite Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Detaljnije: {0} uspio batch-mudar, ne može se pomiriti koristeći \
  Stock pomirenje, umjesto koristi Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: serijski br mora biti isti kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Pretvoriti u non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kupovina Prijem mora biti dostavljena
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Trenutni kataloški UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum fakture
 DocType: GL Entry,Debit Amount,Debit Iznos
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po kompanije u {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po kompanije u {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaša e-mail adresa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Pozicija
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Provjereno od strane
 DocType: Maintenance Visit,Maintenance Type,Održavanje Tip
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametar provjere kvalitete artikala
 DocType: Leave Application,Leave Approver Name,Ostavite Approver Ime
 ,Schedule Date,Raspored Datum
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Kupnja Registracija
 DocType: Landed Cost Item,Applicable Charges,Mjerodavno Optužbe
 DocType: Workstation,Consumable Cost,potrošni cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imati ulogu 'Leave Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imati ulogu 'Leave Approver'
 DocType: Purchase Receipt,Vehicle Date,Vozilo Datum
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,liječnički
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog za gubljenje
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,Instalirani%
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Unesite ime tvrtke prvi
 DocType: BOM,Item Desription,Opis artikla
 DocType: Purchase Invoice,Supplier Name,Dobavljač Ime
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Pročitajte ERPNext Manual
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatski se postavlja rednim brojevima na osnovu FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Dobavljač Faktura Broj Jedinstvenost
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Manager Mas
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Global postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslano na adresu
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Majstor za odmor .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell lajsne
 DocType: Material Request Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ako je označeno, iznos poreza će se smatrati već uključena u Print Rate / Ispis Iznos"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupno Qty
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme izmeđ
 DocType: Customer,Buyer of Goods and Services.,Kupac robe i usluga.
 DocType: Journal Entry,Accounts Payable,Naplativa konta
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj Pretplatnici
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" Ne postoji"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Ne postoji"
 DocType: Pricing Rule,Valid Upto,Vrijedi Upto
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direktni prihodi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa , ako grupirani po računu"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativni službenik
 DocType: Payment Tool,Received Or Paid,Primi ili isplati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Molimo odaberite Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Molimo odaberite Company
 DocType: Stock Entry,Difference Account,Konto razlike
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Ne možete zatvoriti zadatak kao zavisne zadatak {0} nije zatvoren.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni operativnih troškova
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,kozmetika
 DocType: DocField,Type,Vrsta
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Communication,Subject,Predmet
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Hitna Telefon
 ,Serial No Warranty Expiry,Serijski Nema jamstva isteka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Želite li stvarno stopirati ovaj zahtjev za materijalom?
 DocType: Sales Order,To Deliver,Dostaviti
 DocType: Purchase Invoice Item,Item,Artikl
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Upravljanje Subcontracting
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Upravljanje Subcontracting
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Novi UOM ne mora biti tipa cijeli broj
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Namještaj i susret
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stopa po kojoj Cjenik valute se pretvaraju u tvrtke bazne valute
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi poreze i tr
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati serijski broj {0}, koji se koristi u prodaji transakcije"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Zatvaranje (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zatvaranje (Cr)
 DocType: Serial No,Warranty Period (Days),Jamstveni period (dani)
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 ,Pending Qty,U očekivanju Količina
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,Obračun i Status isporuke
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Kupci
 DocType: Leave Control Panel,Allocate,Dodijeli
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,prijašnji
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Povrat robe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Povrat robe
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Odaberite narudžbe iz kojih želite stvoriti radne naloge.
+DocType: Item,Delivered by Supplier (Drop Ship),Isporučuje Dobavljač (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Plaća komponente.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Šifarnik kupaca
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Gimnastika
 DocType: Purchase Order Item,Billed Amt,Naplaćeni izn
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logično Skladište protiv kojih su napravljeni unosa zaliha.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
 DocType: Event,Wednesday,Srijeda
 DocType: Sales Invoice,Customer's Vendor,Kupca Prodavatelj
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodnja Order je obavezna
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' Temelji se na' i 'Grupiranje po ' ne mogu biti isti
 DocType: Sales Person,Sales Person Targets,Prodaje osobi Mete
-sites/assets/js/form.min.js +271,To,u
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Molimo unesite e-mail adresu
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,u
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Molimo unesite e-mail adresu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Kraj cijevi formiranje
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,Projekti korisnika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumed
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
 DocType: Company,Round Off Cost Center,Zaokružimo troškova Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 DocType: Material Request,Material Transfer,Materijal transfera
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Otvaranje ( DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Objavljivanje timestamp mora biti poslije {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Podešavanja
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Sleteo Troškovi poreza i naknada
 DocType: Production Order Operation,Actual Start Time,Stvarni Start Time
 DocType: BOM Operation,Operation Time,Operacija Time
-sites/assets/js/list.min.js +5,More,Više
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Više
 DocType: Pricing Rule,Sales Manager,Sales Manager
-sites/assets/js/desk.min.js +7673,Rename,preimenovati
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,preimenovati
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Savijanje
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Dopusti korisnika
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,m
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight smicanje
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Za praćenje stavke u prodaji i kupnji dokumenata na temelju njihovih serijskih br. To je također može koristiti za praćenje jamstvene podatke o proizvodu.
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutni Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 DocType: Employee,Provide email id registered in company,Osigurati e id registriran u tvrtki
 DocType: Hub Settings,Seller City,Prodavač City
 DocType: Email Digest,Next email will be sent on:,Sljedeća e-mail će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda Pismo Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Dobrodošli
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Zadatak Tema
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Roba dobijena od dobavljača.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Roba dobijena od dobavljača.
 DocType: Communication,Open,Otvoreno
 DocType: Lead,Campaign Name,Naziv kampanje
 ,Reserved,Rezervirano
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Želite li zaista da odčepiti
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datuma na koji će biti generiran pored fakture. Ona se stvara na dostavi.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Dugotrajna imovina
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Employee,Cell Number,Mobitel Broj
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Journal Entry' koloni
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Journal Entry' koloni
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mjesečna plaća izjava.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionisano Iznos ne može biti veći od potraživanja Iznos u nizu {0}.
 DocType: Company,Default Cost of Goods Sold Account,Uobičajeno Nabavna vrednost prodate robe računa
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Popis Cijena ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Process Payroll,Send Email,Pošaljite e-mail
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Bez dozvole
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Predmeti sa višim weightage će biti prikazan veći
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moj Fakture
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Niti jedan zaposlenik pronađena
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Niti jedan zaposlenik pronađena
 DocType: Purchase Order,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Odaberite BOM za početak
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Prenesi d
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošalji odmah
 ,Support Analytics,Analitike podrške
 DocType: Item,Website Warehouse,Web stranica galerije
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Da li stvarno želite zaustaviti proizvodnju kako bi:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Na dan u mjesecu na kojima auto faktura će biti generiran npr 05, 28 itd"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Ocjena mora biti manja od ili jednaka 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C - Form zapisi
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Upiti
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da biste omogućili "Point of Sale" karakteristika
 DocType: Bin,Moving Average Rate,Premještanje prosječna stopa
 DocType: Production Planning Tool,Select Items,Odaberite artikle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} {1} protiv Bill od {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} {1} protiv Bill od {2}
 DocType: Comment,Reference Name,Referenca Ime
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljana galerija
 DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite preko isporuke ili primitka upto ovu posto
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Očekuje se dostava Datum ne može biti prije prodajnog naloga Datum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Očekuje se dostava Datum ne može biti prije prodajnog naloga Datum
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Sve grupe artikala
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatski nova poruka na podnošenje transakcija .
 DocType: Production Order,Item To Manufacture,Artikal za proizvodnju
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Stalni kalupa casting
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Purchase Order na isplatu
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} status
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Purchase Order na isplatu
 DocType: Sales Order Item,Projected Qty,Predviđen Kol
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,Traženi brojevi
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Ocjenjivanje.
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Vrijednost
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Point-of-prodaju
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Ne mogu prenositi {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-prodaju
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Ne mogu prenositi {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 DocType: Account,Balance must be,Bilans mora biti
 DocType: Hub Settings,Publish Pricing,Objavite Pricing
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Račun kupnje
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Pjeskarenje
-sites/assets/js/desk.min.js +3938,Ms,G-đa
+DocType: Employee,Ms,G-đa
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Majstor valute .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},U nemogućnosti da pronađe termin u narednih {0} dana za operaciju {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materijal za podsklopove
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,Domet
 DocType: Supplier,Default Payable Accounts,Uobičajeno Računi dobavljača
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Features Setup,Item Barcode,Barkod artikla
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kupnja fakture Predujam
 DocType: Address,Shop,Prodavnica
 DocType: Hub Settings,Sync Now,Sync Sada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Row {0}: Kredit stavka ne može se povezati sa {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: Kredit stavka ne može se povezati sa {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
 DocType: Employee,Permanent Address Is,Stalna adresa je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacija završena za koliko gotovih proizvoda?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,The Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
 DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
 DocType: Journal Entry Account,Purchase Invoice,Kupnja fakture
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detalj Ne
 DocType: Stock Entry,Total Outgoing Value,Ukupna vrijednost Odlazni
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Datum otvaranja i zatvaranja datum bi trebao biti u istoj fiskalnoj godini
 DocType: Lead,Request for Information,Zahtjev za informacije
 DocType: Payment Tool,Paid,Plaćen
 DocType: Salary Slip,Total in words,Ukupno je u riječima
 DocType: Material Request Item,Lead Time Date,Potencijalni kupac - datum
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je obavezno. Možda Mjenjačnica zapis nije stvoren za
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Za 'proizvoda Bundle' stavki, Magacin, serijski broj i serijski broj smatrat će se iz 'Pakiranje List' stol. Ako Skladište i serijski broj su isti za sve pakovanje stavke za bilo 'Bundle proizvoda' stavku, te vrijednosti mogu se unijeti u glavnom Stavka stola, vrijednosti će se kopirati u 'Pakiranje List' stol."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Isporuke kupcima.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Isporuke kupcima.
 DocType: Purchase Invoice Item,Purchase Order Item,Narudžbenica predmet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Neizravni dohodak
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set iznos uplate = preostali iznos
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,Adresa - linija 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varijacija
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Naziv preduzeća
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pogledaj listu svih snimke Pomoć
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopustite korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Max kol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Plaćanje protiv Prodaja / narudžbenice treba uvijek biti označeni kao unaprijed
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Plaćanje protiv Prodaja / narudžbenice treba uvijek biti označeni kao unaprijed
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Hemijski
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
 DocType: Process Payroll,Select Payroll Year and Month,Odaberite plata i godina Mjesec
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idi na odgovarajuću grupu (obično Primjena sredstava> Kratkotrajna imovina> bankovnih računa i stvoriti novi račun (klikom na Dodaj djeteta) tipa "Banka"
 DocType: Workstation,Electricity Cost,Troškovi struje
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bije
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Priložite svoju sliku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Napraviti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Napraviti
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 DocType: Workflow State,Stop,zaustaviti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi .
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,Odreskom predmet
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Ukloniti stavke bez promjene u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Atribut sto je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne može biti negativna
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podnošenje
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Će se ažurira
 DocType: Project,Internal,Interni
 DocType: Task,Urgent,Hitan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Molimo navedite važeću Row ID za redom {0} {1} u tabeli
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Idite na radnu površinu i početi koristiti ERPNext
 DocType: Item,Manufacturer,Proizvođač
 DocType: Landed Cost Item,Purchase Receipt Item,Kupnja Potvrda predmet
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Prodaja Iznos
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Dnevnici
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Vi steRashodi Odobritelj za ovaj rekord . Molimo Ažuriranje "" status"" i Save"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Vi steRashodi Odobritelj za ovaj rekord . Molimo Ažuriranje "" status"" i Save"
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
 DocType: Issue,Issue,Izdanje
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Osobine Stavka Varijante. npr veličina, boja i sl"
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Prodajnog naloga {0} je {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Izrada Stock unosi
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Izrada Stock unosi
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
 DocType: Item,Default Supplier,Glavni dobavljač
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjom Ispravka Procenat
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Nabavite Tjedno Off datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv preduzeća.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Doktor
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Doktor
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobijene od dobavljača.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Za {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,ažurirani preko Time Dnevnici
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Tvrtka registracijski brojevi za svoju referencu. Porezni brojevi itd.
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Shipping pravilo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja Red {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja Red {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 ,Ordered Items To Be Billed,Naručeni artikli za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od opseg mora biti manji od u rasponu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Odaberite vrijeme Evidencije i slanje stvoriti novi prodajni fakture.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Porez i
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Obveze
 DocType: Account,Warehouse,Skladište
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 DocType: Purchase Invoice Item,Purchase Invoice Item,Kupnja fakture predmet
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Nesaglašen Detalji
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
 DocType: Lead,Call,Poziv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,' Prijave ' ne može biti prazno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' Prijave ' ne može biti prazno
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Postavljanje Zaposleni
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavljanje Zaposleni
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Odaberite prefiks prvi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,istraživanje
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,Poslano
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Pogledaj Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 DocType: Communication,Delivery Status,Status isporuke
 DocType: Production Order,Manufacture against Sales Order,Proizvodnja protiv prodaje Reda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Batch
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Isplaćene dividende
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Računovodstvo Ledger
 DocType: Stock Reconciliation,Difference Amount,Razlika Iznos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Zadržana dobit
 DocType: BOM Item,Item Description,Opis artikla
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,Prilika artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Privremeni Otvaranje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaposlenik napuste balans
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Bilans konta {0} uvijek mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilans konta {0} uvijek mora biti {1}
 DocType: Address,Address Type,Tip adrese
 DocType: Purchase Receipt,Rejected Warehouse,Odbijen galerija
 DocType: GL Entry,Against Voucher,Protiv Voucheru
 DocType: Item,Default Buying Cost Center,Zadani trošak kupnje
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Da biste dobili najbolje iz ERPNext, preporučujemo vam da malo vremena i gledati ove snimke pomoć."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Stavka {0} mora biti Prodaja artikla
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,do
 DocType: Item,Lead Time in days,Olovo Vrijeme u danima
 ,Accounts Payable Summary,Računi se plaćaju Sažetak
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Nije ovlašten za uređivanje smrznute račun {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Nije ovlašten za uređivanje smrznute račun {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Mjesto izdavanja
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ugovor
 DocType: Report,Disabled,Ugašeno
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Poljoprivreda
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,Način plaćanja
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
-sites/assets/js/form.min.js +190,Name is required,Ime je potrebno
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Ime je potrebno
 DocType: Purchase Invoice,Recurring Type,Ponavljajući Tip
 DocType: Address,City/Town,Grad / Mjesto
 DocType: Email Digest,Annual Income,Godišnji prihod
 DocType: Serial No,Serial No Details,Serijski nema podataka
 DocType: Purchase Invoice Item,Item Tax Rate,Poreska stopa artikla
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kredit računa može biti povezan protiv drugog ulaska debit"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kredit računa može biti povezan protiv drugog ulaska debit"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalni oprema
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekivani datum isporuke je manje nego što je planirano Ozljede Datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Ukupno Odlazni
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tu može biti samo jedan Dostava Pravilo Stanje sa 0 ili prazni vrijednost za "" Da Value """
 DocType: Authorization Rule,Transaction,Transakcija
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Napomena : Ovaj troška jegrupa . Ne mogu napraviti računovodstvenih unosa protiv skupine .
-apps/erpnext/erpnext/config/projects.py +43,Tools,Alati
+apps/frappe/frappe/config/desk.py +7,Tools,Alati
 DocType: Item,Website Item Groups,Website Stavka Grupe
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Broj Proizvodnja kako je obavezna za unos zaliha svrhu proizvodnje
 DocType: Purchase Invoice,Total (Company Currency),Ukupno (Company valuta)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,Ime Workstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
-sites/assets/js/desk.min.js +7652,Comments,Komentari
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentari
 DocType: Salary Slip,Bank Account No.,Žiro račun broj
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je broj zadnjeg stvorio transakcije s ovim prefiksom
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Vrednovanje stopa potrebna za točke {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Molimo odabe
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Trebate omogućiti Košarica
-sites/assets/js/form.min.js +212,No Data,Nema podataka
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nema podataka
 DocType: Appraisal Template Goal,Appraisal Template Goal,Procjena Predložak cilja
 DocType: Salary Slip,Earning,Zarada
 DocType: Payment Tool,Party Account Currency,Party računa valuta
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,Party računa valuta
 DocType: Purchase Taxes and Charges,Add or Deduct,Zbrajanje ili oduzimanje
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ako Godišnji budžet prekoračena (za trošak računa)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Preklapanje uvjeti nalaze između :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Journal Entry {0} je već prilagođen protiv nekih drugih vaučer
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Journal Entry {0} je već prilagođen protiv nekih drugih vaučer
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Ukupna vrijednost Order
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Range 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Bez pregleda
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Brošure za kontakte, vodi."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zatvaranja računa mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Zbir bodova za sve ciljeve bi trebao biti 100. To je {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacije se ne može ostati prazno.
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status obnovljeno za {0}
 DocType: DocField,Description,Opis
 DocType: Authorization Rule,Average Discount,Prosječni popust
 DocType: Letter Head,Is Default,Je podrazumjevani
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Iznos poreza artikla
 DocType: Item,Maintain Stock,Održavati Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock unosi već stvorene za proizvodnju Order
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako smatra za sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datuma i vremena
 DocType: Email Digest,For Company,Za tvrtke
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,Dostava adresa Ime
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Šifarnik konta
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Ovisi o neplaćeni odmor
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Jamstveni / AMC Status
 DocType: GL Entry,GL Entry,GL ulaz
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 ,Batch-Wise Balance History,Batch-Wise bilanca Povijest
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Popis podsjetnika
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Popis podsjetnika
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,šegrt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativna količina nije dopuštena
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,najam ureda
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Postavke Setup SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio!
-sites/assets/js/erpnext.min.js +24,No address added yet.,No adresu dodao još.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No adresu dodao još.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analitičar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak JV iznos {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili "Point of Sale" pogled
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
 DocType: Item,Sales Details,Prodajni detalji
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Prikačuju
 DocType: Opportunity,With Items,Sa stavkama
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",Datuma na koji će biti generiran pored fakture. Ona se stvara na dostavi.
 DocType: Item Attribute,Item Attribute,Stavka Atributi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vlada
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Stavka Varijante
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Ukupno ({0})
 DocType: Cost Center,Parent Cost Center,Roditelj troška
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Financijska godina Start Date
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Upuštanje
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Material Request Item,Sales Order No,Narudžba kupca br
 DocType: Item Group,Item Group Name,Naziv grupe artikla
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materijali za Proizvodnja
 DocType: Pricing Rule,For Price List,Za Cjeniku
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,Rasporedi
 DocType: Purchase Invoice Item,Net Amount,Neto iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (Company valuta)
-DocType: Period Closing Voucher,CoA Help,CoA Pomoć
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Pogreška : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Pogreška : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kupac> Korisnička Group> Regija
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Sleteo Cost Pomoć
 DocType: Event,Tuesday,Utorak
 DocType: Leave Block List,Block Holidays on important days.,Blok Holidays o važnim dana.
 ,Accounts Receivable Summary,Potraživanja Pregled
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Ostavlja za tip {0} već izdvojeno za zaposlenog {1} {2} za razdoblje - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisniku ID polja u rekord zaposlenog da postavite uloga zaposlenih
 DocType: UOM,UOM Name,UOM Ime
 DocType: Top Bar Item,Target,Meta
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,Prodaja partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: knjiženju za {0} može se vršiti samo u valuti
 DocType: Pricing Rule,Pricing Rule,cijene Pravilo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Zaseka
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materijal Zahtjev za narudžbenice
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materijal Zahtjev za narudžbenice
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: {1} Returned Stavka ne postoji u {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovni računi
 ,Bank Reconciliation Statement,Izjava banka pomirenja
 DocType: Address,Lead Name,Ime potencijalnog kupca
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otvaranje Stock Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Otvaranje Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mora pojaviti samo jednom
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nije dozvoljeno da se više tranfer {0} od {1} protiv narudžbenice {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Lišće Dodijeljeni uspješno za {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Lišće Dodijeljeni uspješno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nema stavki za omot
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Iznosi ne ogleda u banci
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Potraživanja za tvrtke trošak.
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,Kontak GSM
 DocType: Production Planning Tool,Select Sales Orders,Odaberite narudžbe kupca
 ,Material Requests for which Supplier Quotations are not created,Materijalni Zahtjevi za koje Supplier Citati nisu stvorene
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za praćenje stavki pomoću barkod. Vi ćete biti u mogućnosti da unesete stavke u otpremnici i prodaje Računa skeniranjem barkod stavke.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark kao Isporučena
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make ponudu
 DocType: Dependent Task,Dependent Task,Zavisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planiraju operacije za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 DocType: SMS Center,Receiver List,Prijemnik Popis
 DocType: Payment Tool Detail,Payment Amount,Plaćanje Iznos
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumed Iznos
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Pogledaj
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogledaj
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivno lasersko sinteriranje
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Uvoz uspješan!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Troškovi Izdata Predmeti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne smije biti više od {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,Uobičajeno računa se plaća
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Postavke za online kupovinu košaricu poput shipping pravila, cjenik i sl"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Podešavanje je okončano
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturisana
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Rezervirano Kol
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Party račun
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
 DocType: Lead,Upper Income,Gornja Prihodi
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Enable Košarica
 DocType: Employee,Permanent Address,Stalna adresa
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Stavka {0} mora bitiusluga artikla .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Unaprijed plaćeni protiv {0} {1} ne može biti veći \ od Grand Ukupno {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Odaberite Šifra
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Smanjite odbitak za ostaviti bez plaća (lwp)
 DocType: Territory,Territory Manager,Teritorij Manager
+DocType: Delivery Note Item,To Warehouse (Optional),Da Warehouse (Opcionalno)
 DocType: Sales Invoice,Paid Amount (Company Currency),Uplaćeni iznos (poduzeća Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Podešavanja prodaje
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Smola casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa kupaca sa istim nazivom već postoji. Promijenite naziv kupca ili promijenite naziv grupe kupaca.
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Odaberite {0} na prvom mjestu.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Odaberite {0} na prvom mjestu.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Roditelj Regija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,Broj serije
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopustite više prodajnih naloga protiv narudžbenicu Kupca
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Glavni
 DocType: DocPerm,Delete,Izbrisati
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Varijanta
-sites/assets/js/desk.min.js +7971,New {0},Nova {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varijanta
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
 DocType: Employee,Leave Encashed?,Ostavite Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Od polje je obavezno
 DocType: Item,Variants,Varijante
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Zemlja
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adrese
 DocType: Communication,Received,primljen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupli serijski broj je unešen za artikl {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A uvjet za Shipping Pravilo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Stavka nije dozvoljeno da ima proizvodni Order.
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,Pozdrav
 DocType: Communication,Rejected,Odbijen
 DocType: Pricing Rule,Brand,Brend
 DocType: Item,Will also apply for variants,Primjenjivat će se i za varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% isporučeno
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bala stavke na vrijeme prodaje.
 DocType: Sales Order Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,P
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Smicanje
 DocType: Item,Has Variants,Ima Varijante
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Kliknite na "Make prodaje Račun 'gumb za stvaranje nove prodaje fakture.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Period Od i Period datumima obavezna za ponavljanje% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakiranje i označavanje
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv Mjesečni distribucije
 DocType: Sales Person,Parent Sales Person,Roditelj Prodaja Osoba
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Navedite zadanu valutu u tvrtki Global Master i zadane
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox tajni pristup
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Upravljanje projektima
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Upravljanje projektima
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač robe ili usluga.
 DocType: Budget Detail,Fiscal Year,Fiskalna godina
 DocType: Cost Center,Budget,Budžet
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Prodaja
 DocType: Employee,Salary Information,Plaća informacije
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Web stranica artikla Grupa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Carine i porezi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Unesite Referentni datum
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} unosa isplate ne može biti filtrirani po {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Unesite Referentni datum
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} unosa isplate ne može biti filtrirani po {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Sto za stavku koja će se prikazati u Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučeni Količina
 DocType: Material Request Item,Material Request Item,Materijal Zahtjev artikla
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree stavke skupi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
 ,Item-wise Purchase History,Stavka-mudar Kupnja Povijest
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Crven
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
 DocType: Account,Frozen,Zaleđeni
 ,Open Production Orders,Otvoreni radni nalozi
 DocType: Installation Note,Installation Time,Vrijeme instalacije
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Trendovi ponude
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Stavka artikla se ne spominje u master artiklu za artikal {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Kao Production Order može biti za tu stavku , to mora bitipredmet dionica ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Kao Production Order može biti za tu stavku , to mora bitipredmet dionica ."
 DocType: Shipping Rule Condition,Shipping Amount,Iznos transporta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spajanje
 DocType: Authorization Rule,Above Value,Iznad vrijednosti
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Isporučeno
+DocType: Purchase Order,Delivered,Isporučeno
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Postavljanje dolazni poslužitelj za poslove e-ID . ( npr. jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Podijelite Optužbe na
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} mora biti tipa 'Nepokretne imovine' jer je proizvod {1} imovina proizvoda
 DocType: HR Settings,HR Settings,Podešavanja ljudskih resursa
 apps/frappe/frappe/config/setup.py +130,Printing,Štampanje
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Rashodi Tužba se čeka odobrenje . SamoRashodi Odobritelj može ažurirati status .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Rashodi Tužba se čeka odobrenje . SamoRashodi Odobritelj može ažurirati status .
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dan (a ) na koji se prijavljujete za dopust su odmor . Ne trebaju podnijeti zahtjev za dopust .
-sites/assets/js/desk.min.js +7805,and,i
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportovi
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,Ponude
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 DocType: Quotation,Maintenance User,Održavanje korisnika
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Troškova Ažurirano
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Jeste li sigurni da želite da odčepiti
 DocType: Employee,Date of Birth,Datum rođenja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Artikal {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalna godina ** predstavlja finansijske godine. Svi računovodstvene stavke i drugih većih transakcija se prate protiv ** Fiskalna godina **.
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite prodajne akcije. Pratite Leads, Citati, naloga prodaje itd iz Kampanje procijeniti povrat investicije. "
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovo dodijeliti ili mijenjati Skladište"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovo dodijeliti ili mijenjati Skladište"
 DocType: Appraisal,Calculate Total Score,Izračunaj ukupan rezultat
 DocType: Supplier Quotation,Manufacturing Manager,Proizvodnja Manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split otpremnici u paketima.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Pošiljke
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip lajsne
+DocType: Purchase Order,To be delivered to customer,Dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Vrijeme Log Status moraju biti dostavljeni.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada nijednoj Skladište
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Postavljanje
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Od novca
 DocType: DocField,Name,Ime
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Molimo odaberite Izdvojena količina, vrsta fakture i fakture Broj u atleast jednom redu"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Iznosi ne ogleda u sustav
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Drugi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Postavi kao Zaustavljen
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći stavku koja se podudara. Molimo odaberite neki drugi vrijednost za {0}.
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Proizvoda ili usluge koja je kupio, prodati ili držati u čoporu."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,Odaberite DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Provlačenje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankarstvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Novi trošak
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novi trošak
 DocType: Bin,Ordered Quantity,Naručena količina
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
 DocType: Quality Inspection,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
+DocType: Purchase Order Item,Reference Document Type,Referentni dokument Tip
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
 DocType: Account,Fixed Asset,Dugotrajne imovine
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serijalizovanoj zaliha
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serijalizovanoj zaliha
 DocType: Activity Type,Default Billing Rate,Uobičajeno Billing Rate
 DocType: Time Log Batch,Total Billing Amount,Ukupan iznos naplate
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Potraživanja račun
 ,Stock Balance,Kataloški bilanca
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Naloga prodaje na isplatu
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Naloga prodaje na isplatu
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time logova:
 DocType: Item,Weight UOM,Težina UOM
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit na račun mora biti računa se plaćaju
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
 DocType: Production Order Operation,Completed Qty,Završen Kol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne račune mogu povezati protiv druge kreditne unos"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Cjenik {0} je onemogućen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne račune mogu povezati protiv druge kreditne unos"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Cjenik {0} je onemogućen
 DocType: Manufacturing Settings,Allow Overtime,Omogućiti Prekovremeni rad
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Prodajnog naloga {0} je zaustavljen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za Stavka {1}. Ste dali za {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Rate
 DocType: Item,Customer Item Codes,Customer Stavka Codes
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Zavarivanje
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novi Stock UOM je potrebno
 DocType: Quality Inspection,Sample Size,Veličina uzorka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Svi artikli su već fakturisani
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Svi artikli su već fakturisani
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Navedite važeću 'iz Predmet br'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Dalje troška mogu biti pod Grupe, ali unosa može biti protiv ne-Grupe"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Dalje troška mogu biti pod Grupe, ali unosa može biti protiv ne-Grupe"
 DocType: Project,External,Vanjski
 DocType: Features Setup,Item Serial Nos,Serijski br artikla
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,U
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
 DocType: SMS Log,Sender Name,Ime / Naziv pošiljaoca
 DocType: Page,Title,Naslov
-sites/assets/js/list.min.js +104,Customize,Prilagodite
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Prilagodite
 DocType: POS Profile,[Select],[ Select ]
 DocType: SMS Log,Sent To,Poslati
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Ostvariti prodaju fakturu
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Kraj života
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,putovanje
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
+DocType: Purchase Order,Customer Mobile No,Customer mobilnom Ne
 DocType: Sales Invoice,Recurring,Ponavlja
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Pratite odvojene prihoda i rashoda za vertikala proizvod ili podjele.
 DocType: Rename Tool,Rename Tool,Preimenovanje alat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba artikla
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Prijenos materijala
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 DocType: Purchase Invoice,Price List Currency,Cjenik valuta
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,Zaposlenik
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz e-mail od
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Pozovi kao korisnika
 DocType: Features Setup,After Sale Installations,Nakon prodaje postrojenja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} je u potpunosti naplaćeno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je u potpunosti naplaćeno
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni uvjeti ugovora za prodaju ili kupnju.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupa po jamcu
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,Misa mailing
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,File da biste preimenovali
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Broj Purchse Order potrebno za točke {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaži Plaćanja
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Navedene BOM {0} ne postoji za Stavka {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Raspored održavanja {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Raspored održavanja {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Veličina
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutski
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,Gledatelja do danas
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Postavljanje dolazni poslužitelj za id prodaja e-mail . ( npr. sales@example.com )
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Tool,Payment Account,Plaćanje računa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Navedite Tvrtka postupiti
-sites/assets/js/list.min.js +23,Draft,Nepotvrđeno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Nepotvrđeno
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,Accepted,Prihvaćeno
 DocType: User,Female,Ženski
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Naziv pravila transporta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kao što postoje postojećih zaliha transakcije za ovu stavku, \ ne možete promijeniti vrijednosti 'Ima Serial Ne', 'Ima serijski br', 'Je li Stock Stavka' i 'Vrednovanje metoda'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Brzi unos u dnevniku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
 DocType: Employee,Previous Work Experience,Radnog iskustva
 DocType: Stock Entry,For Quantity,Za količina
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} nije podnesen
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Zahtjevi za stavke.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} nije podnesen
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zahtjevi za stavke.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Poseban proizvodnja kako će biti izrađen za svakog gotovog dobrom stavke.
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,kompletan Setup
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailin
 DocType: Delivery Note,Transporter Name,Transporter Ime
 DocType: Contact,Enter department to which this Contact belongs,Unesite odjel na koji se ovaj Kontakt pripada
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Ukupno Odsutan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artikal ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artikal ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Jedinica mjere
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,A treće strane distributera / trgovca / komisije agent / affiliate / prodavače koji prodaje kompanije proizvoda za proviziju.
 DocType: Customer Group,Has Child Node,Je li čvor dijete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} protiv narudžbenicu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} protiv narudžbenicu {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ni na koji aktivno fiskalne godine. Za više detalja provjerite {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
@@ -2067,11 +2078,9 @@ DocType: Note,Note,Primijetiti
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 DocType: Email Account,Email Ids,E-mail Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Postavi kao Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 DocType: Tax Rule,Billing City,Billing Grad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Ovaj Ostaviti Aplikacija je čeka odobrenje. Samo Ostaviti Approver može ažurirati status.
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
 DocType: Journal Entry,Credit Note,Kreditne Napomena
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Qty)
 DocType: Installation Note Item,Installed Qty,Instalirana kol
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Potvrđeno
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Potvrđeno
 DocType: Salary Structure,Total Earning,Ukupna zarada
 DocType: Purchase Receipt,Time at which materials were received,Vrijeme u kojem su materijali primili
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moj Adrese
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizacija
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,komunalna Troškovi
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Above
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
 DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje
 ,Download Backups,Download Backup
 DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Odaberite Zaposleni
 DocType: Bank Reconciliation,To Date,Za datum
 DocType: Opportunity,Potential Sales Deal,Potencijalni Sales Deal
-sites/assets/js/form.min.js +308,Details,Detalji
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalji
 DocType: Purchase Invoice,Total Taxes and Charges,Ukupno Porezi i naknade
 DocType: Employee,Emergency Contact,Hitni kontakt
 DocType: Item,Quality Parameters,Parametara kvaliteta
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,Pozicija Kol
 DocType: Stock Entry Detail,Serial No / Batch,Serijski Ne / Batch
 DocType: Product Bundle,Parent Item,Roditelj artikla
 DocType: Account,Account Type,Vrsta konta
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Raspored održavanja ne stvara za sve stavke . Molimo kliknite na ""Generiraj raspored '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Raspored održavanja ne stvara za sve stavke . Molimo kliknite na ""Generiraj raspored '"
 ,To Produce,proizvoditi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} u {1}. Uključiti {2} u tačka stope, redova {3} mora biti uključena"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketa za dostavu (za tisak)
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Ravnanje
 DocType: Account,Income Account,Konto prihoda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Oblikovanje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Količina
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte "stopa materijali na temelju troškova" u odjeljak
 DocType: Appraisal Goal,Key Responsibility Area,Područje odgovornosti
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Stock Postavke
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeće osobine su iste u oba zapisa. Grupa je, Root Tip, Društvo"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeće osobine su iste u oba zapisa. Grupa je, Root Tip, Društvo"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Upravljanje grupi kupaca stablo .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Novi troška Naziv
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Novi troška Naziv
 DocType: Leave Control Panel,Leave Control Panel,Ostavite Upravljačka ploča
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ne zadana adresa Predložak pronađena. Molimo stvoriti novu s Setup> Tisak i Branding> adresu predložak.
 DocType: Appraisal,HR User,HR korisnika
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Alat plaćanja Detail
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Veliki
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Niti jedan zaposlenik našao !
 DocType: C-Form Invoice Detail,Territory,Teritorija
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
+DocType: Purchase Order,Customer Address Display,Customer Adresa Display
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poliranje
 DocType: Production Order Operation,Planned Start Time,Planirani Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Izdvojena
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Uobičajeno mjerna jedinica za artikl {0} se ne može mijenjati, jer direktno \ ste već napravili neke transakcije (e) sa drugim UOM. Da biste promijenili zadani UOM, \ upotreba 'UOM Zamijenite Utility "alata pod Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Odredite Exchange Rate pretvoriti jedne valute u drugu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Ponuda {0} je otkazana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Ponuda {0} je otkazana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Ukupno preostali iznos
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaposlenik {0} je bio na odmoru na {1} . Ne možete označiti dolazak .
 DocType: Sales Partner,Targets,Mete
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,To jekorijen skupini kupaca i ne može se mijenjati .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Molim postaviti svoj kontni plan prije nego što počnete računovodstvenih unosa
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorirajte Cijene pravilo
-sites/assets/js/list.min.js +24,Cancelled,Otkazano
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Otkazano
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od dana u strukturi zarada ne može biti manja od zaposlenih Spajanje Registracija.
 DocType: Employee Education,Graduate,Diplomski
 DocType: Leave Block List,Block Days,Blok Dani
 DocType: Journal Entry,Excise Entry,Akcizama Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozorenje: prodajnog naloga {0} već postoji protiv narudžbenice kupca {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozorenje: prodajnog naloga {0} već postoji protiv narudžbenice kupca {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,Stock primljeni Ali ne Naplaćeno
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plaće + + zaostatak Iznos Iznos Encashment - Ukupno Odbitak
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 DocType: Features Setup,Sales and Purchase,Prodaja i nabavka
-DocType: Purchase Order Item,Material Request No,Materijal Zahtjev Ne
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
+DocType: Supplier Quotation Item,Material Request No,Materijal Zahtjev Ne
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stopa po kojoj se valuta klijenta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} uspješno je odjavljen sa ove liste.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Neto stopa (Company valuta)
-apps/frappe/frappe/templates/base.html +132,Added,Dodano
+apps/frappe/frappe/templates/base.html +134,Added,Dodano
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Upravljanje teritorij stablo .
 DocType: Journal Entry Account,Sales Invoice,Faktura prodaje
 DocType: Journal Entry Account,Party Balance,Party Balance
 DocType: Sales Invoice Item,Time Log Batch,Vrijeme Log Hrpa
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Molimo odaberite Apply popusta na
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Molimo odaberite Apply popusta na
 DocType: Company,Default Receivable Account,Uobičajeno Potraživanja račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Kreirajte banke unos za ukupne zarade isplaćene za gore odabrane kriterije
 DocType: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Kreiraj relevantne ulaze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Računovodstvo Entry za Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Kovanja
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Artikal {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Artikal {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 apps/frappe/frappe/desk/query_report.py +136,Total,Ukupno
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formiranje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Konto {0} je zamrznut
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna osoba / Podružnica sa zasebnim kontnom pripadaju Organizacije.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ili BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventar Level
 DocType: Stock Entry,Subcontract,Podugovor
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Unesite {0} prvi
 DocType: Production Planning Tool,Get Items From Sales Orders,Kreiraj proizvode iz narudžbe
 DocType: Production Order Operation,Actual End Time,Stvarni End Time
 DocType: Production Planning Tool,Download Materials Required,Preuzmite - Potrebni materijali
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,Planirano
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Molimo odaberite Stavka u kojoj "Je Stock Stavka" je "ne" i "Da li je prodaja Stavka" je "Da", a nema drugog Bundle proizvoda"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite Mjesečni Distribucija nejednako distribuirati mete širom mjeseci.
 DocType: Purchase Invoice Item,Valuation Rate,Vrednovanje Stopa
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Cjenik valuta ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cjenik valuta ne bira
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Stavka Row {0}: {1} Kupovina Prijem ne postoji u gore 'Kupovina Primici' stol
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt datum početka
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijavite
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
-sites/assets/js/erpnext.min.js +48,Pay,Platiti
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Platiti
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To datuma i vremena
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevnici za održavanje sms statusa isporuke
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Mljevenje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink umotavanja
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Aktivnostima na čekanju
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivnostima na čekanju
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrđen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavljač> proizvođač tip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Unesite olakšavanja datum .
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Un
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,novinski izdavači
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Odaberite Fiskalna godina
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Topljenje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Vi steOstavite Odobritelj za ovaj rekord . Molimo Ažuriranje "" status"" i Save"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ponovno red Level
 DocType: Attendance,Attendance Date,Gledatelja Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati ​​i odbitka.
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Invalid period
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite vrstu transakcije
 DocType: GL Entry,Voucher No,Bon Ne
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Predl
 DocType: Customer,Address and Contact,Adresa i kontakt
 DocType: Customer,Last Day of the Next Month,Zadnji dan narednog mjeseca
 DocType: Employee,Feedback,Povratna veza
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Raspored
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Raspored
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazivne jet mašinsku obradu
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
 DocType: Website Settings,Website Settings,Website Postavke
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,Društven
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu isporuke protiv bilo Projekta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Korijen račun ne može biti izbrisan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Korijen račun ne može biti izbrisan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show Stock unosi
 ,Is Primary Address,Je primarna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Reference # {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje Adrese
 DocType: Pricing Rule,Item Code,Šifra artikla
 DocType: Production Planning Tool,Create Production Orders,Stvaranje radne naloge
@@ -2460,14 +2471,14 @@ DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenik Unutarnji Rad Povijest
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Zatvaranje (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zatvaranje (Dr)
 DocType: Contact,Passive,Pasiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijski Ne {0} nije u dioničko
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Porezna predložak za prodaju transakcije .
 DocType: Sales Invoice,Write Off Outstanding Amount,Otpisati preostali iznos
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Provjerite ako trebate automatske ponavljajuće fakture. Nakon odavanja prodaje fakturu, ponavljajućih sekcija će biti vidljiv."
 DocType: Account,Accounts Manager,Računi Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',"Vrijeme Log {0} mora biti "" Postavio '"
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Vrijeme Log {0} mora biti "" Postavio '"
 DocType: Stock Settings,Default Stock UOM,Zadana kataloška mjerna jedinica
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Košta brzine na osnovu aktivnosti Tip (po satu)
 DocType: Production Planning Tool,Create Material Requests,Stvaranje materijalni zahtijevi
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get Updates
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodati nekoliko uzorku zapisa
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Ostavite Management
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Ostavite Management
 DocType: Event,Groups,Grupe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa po računu
 DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Prodajni dodaci
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} od troška {2} premašit će po {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Nosi proslijeđen lišće
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"' Od datuma ' mora biti poslije ' To Date """
 ,Stock Projected Qty,Stock Projekcija Kol
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Sales Order,Customer's Purchase Order,Narudžbenica kupca
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,"Vrijednost, ili kol"
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Prodavač na malo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit na račun mora biti bilans stanja računa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Sve vrste dobavljača
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Kod artikla je obvezan jer artikli nisu automatski numerirani
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kod artikla je obvezan jer artikli nisu automatski numerirani
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Održavanje Raspored predmeta
 DocType: Sales Order,%  Delivered,Isporučena%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Prekoračenje računa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Provjerite plaće slip
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,otpušiti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,osigurani krediti
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Nevjerovatni proizvodi
@@ -2523,7 +2532,7 @@ DocType: Appraisal,Appraisal,Procjena
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-pjene casting
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Crtanje
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponavlja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
 DocType: Hub Settings,Seller Email,Prodavač-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno TROŠKA (preko fakturi)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2537,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Company valuta)
 DocType: BOM Operation,Hour Rate,Cijena sata
 DocType: Stock Settings,Item Naming By,Artikal imenovan po
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,od kotaciju
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,od kotaciju
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materijal Prebačen za izradu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Račun {0} ne postoji
 DocType: Purchase Receipt Item,Purchase Order Item No,Narudžbenica Br.
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,Inspekcija Obvezno
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Novac u blagajni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za zaliha stavku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za zaliha stavku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 DocType: Serial No,Is Cancelled,Je otkazan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Moj Pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moj Pošiljke
 DocType: Journal Entry,Bill Date,Datum računa
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Čak i ako postoji više Cijene pravila s najvišim prioritetom, onda sljedeći interni prioriteti primjenjuje se:"
 DocType: Supplier,Supplier Details,Dobavljač Detalji
@@ -2568,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Odaberite bankovni račun
 DocType: Newsletter,Create and Send Newsletters,Kreiranje i slanje newsletter
-sites/assets/js/report.min.js +107,From Date must be before To Date,Od datuma mora biti prije do danas
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Od datuma mora biti prije do danas
 DocType: Sales Order,Recurring Order,Ponavljajući Order
 DocType: Company,Default Income Account,Zadani račun prihoda
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kupac Group / kupaca
@@ -2583,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
 ,Projected,projektiran
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
 DocType: Issue,Opening Date,Otvaranje Datum
 DocType: Journal Entry,Remark,Primjedba
 DocType: Purchase Receipt Item,Rate and Amount,Kamatna stopa i iznos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Dosadan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Od prodajnog naloga
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od prodajnog naloga
 DocType: Blog Category,Parent Website Route,Roditelj Web Route
 DocType: Sales Order,Not Billed,Ne Naplaćeno
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istom preduzeću
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Nema kontakata dodao još.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nema kontakata dodao još.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ne aktivna
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Protiv Faktura Datum knjiženja
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Sleteo Cost vaučera Iznos
 DocType: Time Log,Batched for Billing,Izmiješane za naplatu
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Mjenice podigao dobavljače.
 DocType: POS Profile,Write Off Account,Napišite Off račun
-sites/assets/js/erpnext.min.js +26,Discount Amount,Iznos rabata
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Iznos rabata
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vratiti protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
 DocType: Shopping Cart Settings,Quotation Series,Citat serije
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal plina oblikovanje
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe kupca
 DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
@@ -2639,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Kupca ili dobavljača Detalji
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Vlasnik potencijalnog kupca
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Je potrebno skladište
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Je potrebno skladište
 DocType: Employee,Marital Status,Bračni status
 DocType: Stock Settings,Auto Material Request,Auto Materijal Zahtjev
 DocType: Time Log,Will be updated when billed.,Hoće li biti promjena kada je naplaćeno.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostupno Batch Količina na Od Skladište
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,Ažurirajte Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Plazmom
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journal unosi {0} su un-povezani
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Rekord svih komunikacija tipa e-mail, telefon, chat, posjete, itd"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Navedite zaokružimo troškova centar u Company
 DocType: Purchase Invoice,Terms,Uvjeti
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Stvori novo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Stvori novo
 DocType: Buying Settings,Purchase Order Required,Narudžbenica kupnje je obavezna
 ,Item-wise Sales History,Stavka-mudar Prodaja Povijest
 DocType: Expense Claim,Total Sanctioned Amount,Ukupno kažnjeni Iznos
@@ -2681,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Plaća proklizavanja Odbita
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Bilješke
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Odaberite grupu čvora prvi.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Svrha mora biti jedan od {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Ispunite obrazac i spremite ga
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ispunite obrazac i spremite ga
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Preuzmite izvješće koje sadrži sve sirovine sa svojim najnovijim statusom inventara
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Suočavanje
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Ostavite Balance Prije primjene
 DocType: SMS Center,Send SMS,Pošalji SMS
 DocType: Company,Default Letter Head,Uobičajeno Letter Head
 DocType: Time Log,Billable,Naplativo
 DocType: Authorization Rule,This will be used for setting rule in HR module,To će se koristiti za postavljanje pravilu u HR modula
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Ponovno red Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Ponovno red Qty
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
 DocType: Journal Entry,Write Off,Otpisati
 DocType: Time Log,Operation ID,Operacija ID
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Popust polja će biti dostupna u narudžbenici, primci i računu kupnje"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Ime novog računa. Napomena: Molimo vas da ne stvaraju račune za kupcima i dobavljačima
 DocType: Report,Report Type,Prijavi Vid
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Utovar
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Utovar
 DocType: BOM Replace Tool,BOM Replace Tool,BOM zamijeni alat
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država mudar zadana adresa predlošci
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja kupaca
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Pokaži porez break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Podataka uvoz i izvoz
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Ako uključiti u proizvodnom djelatnošću . Omogućuje stavci je proizveden '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Račun Datum knjiženja
 DocType: Sales Invoice,Rounded Total,Zaokruženi iznos
 DocType: Product Bundle,List items that form the package.,Popis stavki koje čine paket.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Postotak izdvajanja trebala bi biti jednaka 100 %
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte za korisnike koji imaju Sales Manager Master {0} ulogu
 DocType: Company,Default Cash Account,Zadani novčani račun
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
@@ -2739,11 +2752,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Red {0}: Količina nije avalable u skladištu {1} {2} na {3}. Dostupno Količina: {4}, transfera Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
+DocType: Purchase Order,Customer Contact Email,Customer Contact mail
 DocType: Event,Sunday,Nedjelja
 DocType: Sales Team,Contribution (%),Doprinos (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Predložak
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime referenta prodaje
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Unesite atleast jedan račun u tablici
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj Korisnici
@@ -2752,7 +2766,7 @@ DocType: Task,Actual Start Date (via Time Logs),Stvarni datum Start (putem Time
 DocType: Stock Reconciliation Item,Before reconciliation,Prije nego pomirenje
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično Naplaćeno
 DocType: Item,Default BOM,Zadani BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2760,12 +2774,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Ukupno Outstanding Amt
 DocType: Time Log Batch,Total Hours,Ukupno vrijeme
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilska industrija
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Ostavlja za vrstu {0} već dodijeljeno za zaposlenika {1} za fiskalnu godinu {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Artikal je potreban
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal brizganje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Od otpremnici
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od otpremnici
 DocType: Time Log,From Time,S vremena
 DocType: Notification Control,Custom Message,Prilagođena poruka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
@@ -2781,10 +2794,10 @@ DocType: Newsletter,A Lead with this email id should exist,Kontakt sa ovim e-mai
 DocType: Stock Entry,From BOM,Iz BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Za datum bi trebao biti isti kao i od datuma za poludnevni dopust
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Za datum bi trebao biti isti kao i od datuma za poludnevni dopust
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","npr. kg, Jedinica, br, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
 DocType: Salary Structure,Salary Structure,Plaća Struktura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2792,7 +2805,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Izdanje materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Izdanje materijala
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,ponuda Datum
 DocType: Hub Settings,Access Token,Access Token
@@ -2815,6 +2828,7 @@ DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
+DocType: Delivery Note Item,From Warehouse,Od Skladište
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Bušenje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Duvanjem
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
@@ -2836,11 +2850,12 @@ DocType: C-Form,Amended From,Izmijenjena Od
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ili meta Količina ili ciljani iznos je obvezna
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
-DocType: Leave Allocation,Carry Forward,Prenijeti
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije zatvaranja datum
+DocType: Leave Control Panel,Carry Forward,Prenijeti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Troška s postojećim transakcija ne može pretvoriti u knjizi
 DocType: Department,Days for which Holidays are blocked for this department.,Dani za koje su praznici blokirani za ovaj odjel.
 ,Produced,Proizvedeno
@@ -2861,17 +2876,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Purchase Order,The date on which recurring order will be stop,Datum na koji se ponavlja kako će se zaustaviti
 DocType: Quality Inspection,Item Serial No,Serijski broj artikla
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Ukupno Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Sat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijalizovani Stavka {0} ne može se ažurirati \
  koristeći Stock pomirenje"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transfera Materijal dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfera Materijal dobavljaču
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može imati skladište. Skladište mora biti postavljen od strane burze upisu ili kupiti primitka
 DocType: Lead,Lead Type,Tip potencijalnog kupca
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,stvaranje citata
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Svi ovi artikli su već fakturisani
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Svi ovi artikli su već fakturisani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Uslovi pravila transporta
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
@@ -2919,7 +2934,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacija ID nije postavljen
 DocType: Production Order,Planned Start Date,Planirani Ozljede Datum
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Posjeti
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Posjeti
 DocType: Leave Type,Is Encash,Je li unovčiti
 DocType: Purchase Invoice,Mobile No,Mobitel Nema
 DocType: Payment Tool,Make Journal Entry,Make Journal Entry
@@ -2927,7 +2942,7 @@ DocType: Leave Allocation,New Leaves Allocated,Novi Leaves Dodijeljeni
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,trgovački
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,trgovački
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti Stock Item
 DocType: Cost Center,Distribution Id,ID distribucije
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Nevjerovatne usluge
@@ -2943,14 +2958,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrijednost za Atributi {0} mora biti u rasponu od {1} {2} da u koracima od {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Uobičajeno Potraživanja Računi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Testerisanje
 DocType: Tax Rule,Billing State,State billing
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Kaširanje
 DocType: Item Reorder,Transfer,Prijenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
@@ -2966,6 +2982,7 @@ DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
 DocType: Product Bundle,Product Bundle,Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Red {0}: Invalid referentni {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Porazan
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupiti poreza i naknada Template
 DocType: Upload Attendance,Download Template,Preuzmite predložak
@@ -2973,16 +2990,16 @@ DocType: GL Entry,Remarks,Primjedbe
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 DocType: Features Setup,POS View,POS Pogledaj
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Instalacijski zapis za serijski broj
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalacijski zapis za serijski broj
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuirano lijevanje
-sites/assets/js/erpnext.min.js +10,Please specify a,Navedite
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Navedite
 DocType: Offer Letter,Awaiting Response,Čeka se odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Iznad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold Sizing
 DocType: Salary Slip,Earning & Deduction,Zarada & Odbitak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} ne može biti grupa konta
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regija
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
 DocType: Holiday List,Weekly Off,Tjedni Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za npr. 2012, 2012-13"
@@ -3026,12 +3043,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Ispupčen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativni-obrazac casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Troškovi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Starost
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Starost
 DocType: Time Log,Billing Amount,Billing Iznos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Navedena je pogrešna količina za proizvod {0}. Količina treba biti veći od 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Prijave za odsustvo.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Konto sa postojećim transakcijama se ne može izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto sa postojećim transakcijama se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Pravni troškovi
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Na dan u mjesecu na kojima auto kako će biti generiran npr 05, 28 itd"
 DocType: Sales Invoice,Posting Time,Objavljivanje Vrijeme
@@ -3040,9 +3057,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},No Stavka s rednim brojem {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Open Obavijesti
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Open Obavijesti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direktni troškovi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Želite li stvarno ponovno pokrenuti ovaj zahtjev za materijalom?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer prihoda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
@@ -3053,7 +3069,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honovanje
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probni rad
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
 DocType: Feed,Full Name,Ime i prezime
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Vrstog
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
@@ -3076,7 +3092,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Dodaj redak za
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Vađenje
 DocType: Production Order,Total Operating Cost,Ukupni trošak
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Napomena : Stavka {0} upisan je više puta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Napomena : Stavka {0} upisan je više puta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Svi kontakti.
 DocType: Newsletter,Test Email Id,Test E-mail ID
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Skraćeni naziv preduzeća
@@ -3100,11 +3116,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponude
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
 ,Territory Target Variance Item Group-Wise,Teritorij Target varijance artikla Group - Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Porez Template je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Nadređeni konto {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} status ' Zaustavljen '
 DocType: Account,Temporary,Privremen
 DocType: Address,Preferred Billing Address,Željena adresa za naplatu
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak Raspodjela
@@ -3122,13 +3137,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Porezna Det
 DocType: Purchase Order Item,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Peglanje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} je zaustavljen
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zaustavljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
 DocType: Lead,Add to calendar on this date,Dodaj u kalendar na ovaj datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodavanjem troškove prijevoza .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Najave događaja
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Najave događaja
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je dužan
 DocType: Letter Head,Letter Head,Zaglavlje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Brzo uvođenje
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obavezno za povratak
 DocType: Purchase Order,To Receive,Da Primite
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montažu
@@ -3152,25 +3168,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
 DocType: Purchase Invoice Item,Project Name,Naziv projekta
 DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
 DocType: Workflow State,Edit,Uredi
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
 DocType: Features Setup,Item Batch Nos,Broj serije artikla
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Human Resource
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Human Resource
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pomirenje Plaćanje Plaćanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,porezna imovina
 DocType: BOM Item,BOM No,BOM br.
 DocType: Contact Us Settings,Pincode,Poštanski broj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nema obzir {1} ili su već usklađene protiv drugih vaučer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nema obzir {1} ili su već usklađene protiv drugih vaučer
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novi Stock UOM mora biti različita od trenutne zalihe UOM
 DocType: Account,Debit,Zaduženje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Listovi moraju biti dodijeljeno u COMBI 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Listovi moraju biti dodijeljeno u COMBI 0,5"
 DocType: Production Order,Operation Cost,Operacija Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Prenesi dolazak iz. Csv datoteku
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izvanredna Amt
@@ -3178,7 +3194,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set cil
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Za dodjelu taj problem, koristite "dodijeliti" gumb u sidebar."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Dionice stariji od [ dana ]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ako su dva ili više Pravila cijene se nalaze na osnovu gore uvjetima, Prioritet se primjenjuje. Prioritet je broj od 0 do 20, a zadana vrijednost je nula (prazno). Veći broj znači da će imati prednost, ako postoji više pravila cijenama s istim uslovima."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Protiv fakture
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskalna godina: {0} ne postoji
 DocType: Currency Exchange,To Currency,Valutno
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Dopusti sljedeći korisnici odobriti ostavite aplikacije za blok dana.
@@ -3207,7 +3222,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stopa
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Financijska godina End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Provjerite Supplier kotaciji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Provjerite Supplier kotaciji
 DocType: Quality Inspection,Incoming,Dolazni
 DocType: BOM,Materials Required (Exploded),Materijali Obavezno (eksplodirala)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Smanjenje plaća za ostaviti bez plaće (lwp)
@@ -3215,10 +3230,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: {1} Serial No ne odgovara {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
 DocType: Batch,Batch ID,ID serije
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Napomena : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Napomena : {0}
 ,Delivery Note Trends,Trendovi otpremnica
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ovonedeljnom Pregled
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora bitikupljen ili pod-ugovori stavka u nizu {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora bitikupljen ili pod-ugovori stavka u nizu {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Račun: {0} može ažurirati samo preko Stock Transakcije
 DocType: GL Entry,Party,Stranka
 DocType: Sales Order,Delivery Date,Datum isporuke
@@ -3231,7 +3246,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,r
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Prosj. Buying Rate
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Newsletteri
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletteri
 DocType: Address,Shipping,Transport
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Stupanje
 DocType: Department,Leave Block List,Ostavite Block List
@@ -3250,7 +3265,7 @@ DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Datum završetka perioda trenutne Reda
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Make Ponuda Pismo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Povratak
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Uobičajeno mjerna jedinica za varijantu mora biti isti kao predložak
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Uobičajeno mjerna jedinica za varijantu mora biti isti kao predložak
 DocType: DocField,Fold,Saviti
 DocType: Production Order Operation,Production Order Operation,Proizvodnja Order Operation
 DocType: Pricing Rule,Disable,Ugasiti
@@ -3282,7 +3297,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Izvješća
 DocType: SMS Settings,Enter url parameter for receiver nos,Unesite URL parametar za prijemnike br
 DocType: Sales Invoice,Paid Amount,Plaćeni iznos
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Zatvaranje računa {0} mora biti tipa ' odgovornosti '
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Zatvaranje računa {0} mora biti tipa ' odgovornosti '
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
@@ -3290,7 +3305,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,upravljanja kvalitetom
 DocType: Production Planning Tool,Filter based on customer,Filter temelji se na kupca
 DocType: Payment Tool Detail,Against Voucher No,Protiv vaučera Nema
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Employee External Work History,Employee External Work History,Zaposlenik Vanjski Rad Povijest
 DocType: Tax Rule,Purchase,Kupiti
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilans kol
@@ -3327,28 +3342,29 @@ Note: BOM = Bill of Materials","Agregat grupa ** Predmeti ** u drugu ** Stavka *
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serijski Nema je obvezna za točke {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Molimo navedite iz / u rasponu
-sites/assets/js/desk.min.js +7652,Created By,Stvorio
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Stvorio
 DocType: Serial No,Under AMC,Pod AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Stavka stopa vrednovanja izračunava se razmatra sletio troškova voucher iznosu
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Zadane postavke za transakciju prodaje.
 DocType: BOM Replace Tool,Current BOM,Trenutni BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Dodaj serijski broj
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Dodaj serijski broj
 DocType: Production Order,Warehouses,Skladišta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Ispis i stacionarnih
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
 DocType: Payment Reconciliation,Minimum Amount,Minimalni iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update gotovih proizvoda
 DocType: Workstation,per hour,na sat
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serija {0} već koristi u {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serija {0} već koristi u {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto za skladište (stalni inventar) stvorit će se na osnovu ovog konta .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladište se ne može izbrisati , kao entry stock knjiga postoji za to skladište ."
 DocType: Company,Distribution,Distribucija
-sites/assets/js/erpnext.min.js +50,Amount Paid,Plaćeni iznos
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plaćeni iznos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni popust dopušteno za predmet: {0} je {1}%
 DocType: Customer,Default Taxes and Charges,Uobičajeno Porezi i naknadama
 DocType: Account,Receivable,potraživanja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nije dozvoljeno da se promijeniti dobavljača kao narudžbenicu već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
 DocType: Sales Invoice,Supplier Reference,Dobavljač Referenca
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ako je označeno, BOM za pod-zbor stavke će biti uzeti u obzir za dobivanje sirovine. Inače, sve pod-montaža stavke će biti tretirani kao sirovinu."
@@ -3385,8 +3401,8 @@ DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primaoce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Postavljanje dolazni poslužitelj za podršku e-mail ID . ( npr. support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Nedostatak Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatak Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Satiniranje
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' To Date ' je potrebno
@@ -3399,6 +3415,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kada bilo koji od provjerenih transakcija "Postavio", e-mail pop-up automatski otvorio poslati e-mail na povezane "Kontakt" u toj transakciji, s transakcijom u privitku. Korisnik može ili ne može poslati e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalne postavke
 DocType: Employee Education,Employee Education,Zaposlenik Obrazovanje
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
 DocType: Salary Slip,Net Pay,Neto plaća
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijski Ne {0} već je primila
@@ -3431,7 +3448,7 @@ DocType: BOM,Manufacturing User,Proizvodnja korisnika
 DocType: Purchase Order,Raw Materials Supplied,Sirovine nabavlja
 DocType: Purchase Invoice,Recurring Print Format,Ponavlja Format
 DocType: Communication,Series,serija
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Očekuje se dostava Datum ne može biti prije narudžbenice Datum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Očekuje se dostava Datum ne može biti prije narudžbenice Datum
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Stavka Klasifikacija
@@ -3487,6 +3504,7 @@ DocType: HR Settings,Payroll Settings,Postavke plaće
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Place Order
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Korijen ne mogu imati središte troškova roditelj
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Odaberite Marka ...
 DocType: Sales Invoice,C-Form Applicable,C-obrascu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
 DocType: Supplier,Address and Contacts,Adresa i kontakti
@@ -3497,7 +3515,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Get Outstanding Vaučeri
 DocType: Warranty Claim,Resolved By,Riješen Do
 DocType: Appraisal,Start Date,Datum početka
-sites/assets/js/desk.min.js +7629,Value,Vrijednost
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Vrijednost
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Dodijeli odsustva za period.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliknite ovdje za provjeru
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Ne može se označiti kao nadređeni konto samom sebi
@@ -3513,14 +3531,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dozvoljen pristup Dropboxu
 DocType: Dropbox Backup,Weekly,Tjedni
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Primiti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Primiti
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je uspješno dodan u newsletter listu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron obradni zrak
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupovina Master Manager
@@ -3533,7 +3551,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Dodaj / Uredi cijene
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon troškovnih centara
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Moje narudžbe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje narudžbe
 DocType: Price List,Price List Name,Cjenik Ime
 DocType: Time Log,For Manufacturing,Za proizvodnju
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Ukupan rezultat
@@ -3544,7 +3562,7 @@ DocType: Account,Income,Prihod
 DocType: Industry Type,Industry Type,Industrija Tip
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nešto nije bilo u redu!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Završetak Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Iznos (valuta preduzeća)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die casting
@@ -3558,10 +3576,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Godina
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-prodaju profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Obnovite SMS Settings
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Time Log {0} već naplaćuju
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} već naplaćuju
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Stavka {0} s rednim brojem {1} već instaliran
 DocType: Maintenance Schedule Detail,Scheduled Date,Planski datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Ukupno Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Poruka veća od 160 karaktera će biti split u više mesage
@@ -3569,10 +3586,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Primljeni i prihvaćeni
 ,Serial No Service Contract Expiry,Serijski Bez isteka Ugovor o pružanju usluga
 DocType: Item,Unit of Measure Conversion,Jedinica mjere pretvorbe
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaposleni se ne može mijenjati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
 DocType: Naming Series,Help HTML,HTML pomoć
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
 DocType: Address,Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši dobavljači
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
@@ -3586,7 +3603,7 @@ apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0}
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Računar
 DocType: Item,List this Item in multiple groups on the website.,Popis ovaj predmet u više grupa na web stranici.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite Multi opciju valuta kako bi se omogućilo račune sa drugoj valuti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite Multi opciju valuta kako bi se omogućilo račune sa drugoj valuti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Detaljnije: {0} ne postoji u sustavu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje Frozen vrijednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
@@ -3597,14 +3614,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Za skladište
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} je upisan više od jednom za fiskalnu godinu {1}
 ,Average Commission Rate,Prosječna stopa komisija
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,' Je rednim brojem ' ne može biti ' Da ' za ne - stock stavke
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,' Je rednim brojem ' ne može biti ' Da ' za ne - stock stavke
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Cijene Pravilo Pomoć
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje konta
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Update dodatne troškove za izračun troškova spustio stavki
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Električna
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost Razlika (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Red {0}: kursa obavezna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Red {0}: kursa obavezna
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Korisnik ID nije postavljen za zaposlenika {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Utiskivanje
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od garantnom roku
@@ -3618,15 +3635,17 @@ DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
 DocType: User,Enabled,Omogućeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Želite li zaista podnijeti sve klizne plaće za mjesec {0} i godinu {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Želite li zaista podnijeti sve klizne plaće za mjesec {0} i godinu {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Uvoz Pretplatnici
 DocType: Target Detail,Target Qty,Ciljana Kol
 DocType: Attendance,Present,Sadašnje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
 DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
 DocType: Authorization Rule,Based On,Na osnovu
-,Ordered Qty,Naručena kol
+DocType: Sales Order Item,Ordered Qty,Naručena kol
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Stavka {0} je onemogućeno
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Period od perioda i datumima obavezno ponavljaju {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt aktivnost / zadatak.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generiranje plaće gaćice
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nije ispravan id e-mail
@@ -3666,7 +3685,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Upload Attendance
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina su potrebne
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Range 2
-DocType: Journal Entry Account,Amount,Iznos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Iznos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Zakivanje
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
 ,Sales Analytics,Prodajna analitika
@@ -3693,7 +3712,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekivani datum ne može biti prije Materijal Zahtjev Datum
 DocType: Contact Us Settings,City,Grad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvučno mašinsku obradu
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Greška: Ne važeći id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Greška: Ne važeći id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Stavka {0} mora bitiProdaja artikla
 DocType: Naming Series,Update Series Number,Update serije Broj
 DocType: Account,Equity,pravičnost
@@ -3708,7 +3727,7 @@ DocType: Purchase Taxes and Charges,Actual,Stvaran
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Protiv Rashodi račun
 DocType: Production Order,Production Order,Proizvodnja Red
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
 DocType: Quotation Item,Against Docname,Protiv Docname
 DocType: SMS Center,All Employee (Active),Svi zaposleni (aktivni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pregled Sada
@@ -3716,14 +3735,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Troškovi sirovina
 DocType: Item,Re-Order Level,Re-order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
-sites/assets/js/list.min.js +174,Gantt Chart,Gantogram
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantogram
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part - time
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvo Odgovorili Na
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Oglas tačke u više grupa
@@ -3738,7 +3757,7 @@ DocType: Attendance,Attendance,Pohađanje
 DocType: Page,No,Ne
 DocType: BOM,Materials,Materijali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ako nije označeno, popis će biti dodan u svakom odjela gdje se mora primjenjivati."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
 ,Item Prices,Cijene artikala
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,U riječi će biti vidljiv nakon što spremite narudžbenice.
@@ -3758,9 +3777,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni troškovi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Roditelj Kupac Grupa
-sites/assets/js/erpnext.min.js +50,Change,Promjena
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Narudžbenica {0} je ' zaustavljena '
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Otkazni rok
@@ -3770,12 +3788,13 @@ DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
 DocType: Email Digest,Receivables / Payables,Potraživanja / obveze
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Žigosanje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Sletio Troškovi artikla
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokazati nultu vrijednosti
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina predmeta dobije nakon proizvodnju / pakiranje od navedenih količina sirovina
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Account plaćaju
 DocType: Delivery Note Item,Against Sales Order Item,Protiv naloga prodaje Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 DocType: Task,Actual End Date (via Time Logs),Stvarni Završni datum (via vrijeme Dnevnici)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budžet se ne može dodijeliti protiv grupe računa {0}
@@ -3789,7 +3808,7 @@ DocType: Issue,Support Team,Tim za podršku
 DocType: Appraisal,Total Score (Out of 5),Ukupna ocjena (od 5)
 DocType: Contact Us Settings,State,Država
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Ravnoteža
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Ravnoteža
 DocType: Project,Total Expense Claim (via Expense Claims),Ukupni rashodi potraživanja (preko rashodi potraživanja)
 DocType: User,Gender,Rod
 DocType: Journal Entry,Debit Note,Rashodi - napomena
@@ -3805,9 +3824,8 @@ DocType: Lead,Blog Subscriber,Blog pretplatnik
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Stvaranje pravila za ograničavanje prometa na temelju vrijednosti .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ako je označeno, Ukupan broj. radnih dana će uključiti odmor, a to će smanjiti vrijednost plaća po danu"
 DocType: Purchase Invoice,Total Advance,Ukupno predujma
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Otpušiti Materijal Zahtjev
 DocType: Workflow State,User,Korisnik
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Obrada Payroll
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Obrada Payroll
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Iznos kredita
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Postavi kao Lost
@@ -3815,7 +3833,7 @@ DocType: Customer,Credit Days Based On,Credit Dani Na osnovu
 DocType: Tax Rule,Tax Rule,Porez pravilo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Održavati ista stopa Tijekom cijele prodajni ciklus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planirajte vrijeme za rezanje izvan Workstation Radno vrijeme.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} je već poslan
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} je već poslan
 ,Items To Be Requested,Potraživani artikli
 DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing brzine na osnovu aktivnosti Tip (po satu)
@@ -3824,6 +3842,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","E-mail nije poslan, preduzeće nema definisan e-mail"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 DocType: Production Planning Tool,Filter based on item,Filtrirati na temelju točki
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Zaduži račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Zaposlenik Ime
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
@@ -3835,14 +3854,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Slepi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
 DocType: Production Order,Manufactured Qty,Proizvedeno Kol
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne postoji
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Mjenice podignuta na kupce.
 DocType: DocField,Default,Podrazumjevano
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pretplatnika dodao
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definirati budžeta za ovu troškova Centra. Za postavljanje budžet akciju, pogledajte "Lista preduzeća""
@@ -3850,7 +3869,7 @@ DocType: Account,Parent Account,Roditelj račun
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Čvor
 DocType: GL Entry,Voucher Type,Bon Tip
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cijena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
@@ -3859,23 +3878,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Obrazovanje
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcionalno. Postavlja kompanije Zadana valuta, ako nije navedeno."
 DocType: Address,Office,Ured
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardni Izvješća
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Računovodstvene stavke
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: Party / računa ne odgovara {1} / {2} u {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina na Od Skladište
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: Party / računa ne odgovara {1} / {2} u {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Za stvaranje porezno
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Zaliha
 DocType: Employee,Current Address,Trenutna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako proizvod varijanta druge stavke onda opis, slike, cijene, poreze itd će biti postavljena iz predloška, ​​osim ako izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Kupnja / Proizvodnja Detalji
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch zaliha
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch zaliha
 DocType: Employee,Contract End Date,Ugovor Datum završetka
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Povucite prodajne naloge (na čekanju za isporuku) na temelju navedenih kriterija
 DocType: DocShare,Document Type,Tip dokumenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Od dobavljača kotaciju
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od dobavljača kotaciju
 DocType: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
 DocType: Pricing Rule,Min Qty,Min kol
@@ -3886,20 +3907,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Qty) je obavezno
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Ukupno (Društvo valuta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Party Tip i stranka je primjenjiv samo protiv potraživanja / računa dobavljača
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Party Tip i stranka je primjenjiv samo protiv potraživanja / računa dobavljača
 DocType: Notification Control,Purchase Receipt Message,Poruka primke
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Ukupno izdvojene Listovi su više nego razdoblje
 DocType: Production Order,Actual Start Date,Stvarni datum početka
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materijala dostavljenih od ovog prodajnog naloga
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Zabilježite stavku pokret.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Zabilježite stavku pokret.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Lista pretplatnika
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dubljenje
 DocType: Email Account,Service,Usluga
 DocType: Hub Settings,Hub Settings,Hub Settings
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvo stavke su već učinjeni u valuti {0} {1} za firmu. Molimo odaberite potraživanja ili platiti račun s valutnom {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvo stavke su već učinjeni u valuti {0} {1} za firmu. Molimo odaberite potraživanja ili platiti račun s valutnom {0}.
 ,Monthly Salary Register,Mjesečna plaća Registracija
-apps/frappe/frappe/website/template.py +123,Next,Sljedeći
+apps/frappe/frappe/website/template.py +140,Next,Sljedeći
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
 DocType: BOM Operation,BOM Operation,BOM operacija
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektromaterijal
@@ -3930,6 +3952,7 @@ DocType: Purchase Invoice,Next Date,Sljedeći datum
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Unesite poreza i naknada
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Strojna obrada
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
 DocType: Hub Settings,Seller Name,Ime Prodavač
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Porezi i naknade Umanjenja (Društvo valuta)
@@ -3956,29 +3979,29 @@ DocType: Purchase Order,To Receive and Bill,Da primi i Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Uvjeti predloška
 DocType: Serial No,Delivery Details,Detalji isporuke
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatski kreirati Materijal Zahtjev ako količina padne ispod tog nivoa
 ,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
 DocType: Batch,Expiry Date,Datum isteka
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Da biste postavili Ponovno redj nivo, stavka mora biti kupovine stavke ili Proizvodnja artikla"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Da biste postavili Ponovno redj nivo, stavka mora biti kupovine stavke ili Proizvodnja artikla"
 ,Supplier Addresses and Contacts,Supplier Adrese i kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt majstor.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol poput $ iza valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Party Tip i stranka je potreban za potraživanja / računa plaćaju {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Party Tip i stranka je potreban za potraživanja / računa plaćaju {1}
 DocType: Dropbox Backup,Send Notifications To,Pošalji obavještenje na adresu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref: Datum
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debitne stavka ne može se povezati sa {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Konto {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debitne stavka ne može se povezati sa {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} ne postoji
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i druge publikacije.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Molimo stvoriti Plaća Struktura za zaposlenika {0}
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 8884d29561..835658bb6f 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Salary Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccioneu Distribució mensual, si voleu fer un seguiment basat en l'estacionalitat."
 DocType: Employee,Divorced,Divorciat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Advertència: El mateix article s'ha introduït diverses vegades.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advertència: El mateix article s'ha introduït diverses vegades.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productes ja sincronitzen
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetre article a afegir diverses vegades en una transacció
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel·la material Visita {0} abans de cancel·lar aquest reclam de garantia
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactació més sinterització
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Es calcularà en la transacció.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,De Sol·licituds de materials
+DocType: Purchase Order,Customer Contact,Client Contacte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,De Sol·licituds de materials
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Job Applicant
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hi ha més resultats.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Nom del client
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Tots els camps relacionats amb l'exportació, com la moneda, taxa de conversió, el total de les exportacions, els totals de les exportacions etc estan disponibles a notes de lliurament, TPV, ofertes, factura de venda, ordre de venda, etc."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Capçaleres (o grups) contra els quals es mantenen els assentaments comptables i els saldos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Excedent per {0} no pot ser menor que zero ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Excedent per {0} no pot ser menor que zero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Per defecte 10 minuts
 DocType: Leave Type,Leave Type Name,Deixa Tipus Nom
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Sèrie actualitzat correctament
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Múltiples Preus d'articles
 DocType: SMS Center,All Supplier Contact,Contacte de Tot el Proveïdor
 DocType: Quality Inspection Reading,Parameter,Paràmetre
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d'inici
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,No realment vol destapar ordre de producció: 
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa ha de ser el mateix que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Nova aplicació Deixar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nova aplicació Deixar
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Lletra bancària
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Utilitza aquesta opció per mantenir el codi de l'article del client i incloure'l en les cerques en base al seu codi
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostra variant
 DocType: Sales Invoice Item,Quantity,Quantitat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstecs (passius)
 DocType: Employee Education,Year of Passing,Any de defunció
-sites/assets/js/erpnext.min.js +27,In Stock,En estoc
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Només es pot fer el pagament en contra no facturada d'ordres de venda
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En estoc
 DocType: Designation,Designation,Designació
 DocType: Production Plan Item,Production Plan Item,Pla de Producció d'articles
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},L'usuari {0} ja està assignat a l'Empleat {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Fes el teu nou perfil de POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sanitari
 DocType: Purchase Invoice,Monthly,Mensual
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Factura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retard en el pagament (dies)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adreça de correu electrònic
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Puntuació (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}: 
 DocType: Delivery Note,Vehicle No,Vehicle n
-sites/assets/js/erpnext.min.js +55,Please select Price List,Seleccionla llista de preus
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Seleccionla llista de preus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tractament de la fusta
 DocType: Production Order Operation,Work In Progress,Treball en curs
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,La impressió 3D
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Docname Detall de Pares
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,L'obertura per a una ocupació.
 DocType: Item Attribute,Increment,Increment
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Seleccioneu Magatzem ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicitat
 DocType: Employee,Married,Casat
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Botiga
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Feu entrada del banc
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Feu entrada del banc
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fons de Pensions
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse és obligatori si el tipus de compte és Magatzem
 DocType: SMS Center,All Sales Person,Tot el personal de vendes
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Escriu Off Centre de Cost
 DocType: Warehouse,Warehouse Detail,Detall Magatzem
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Límit de crèdit s'ha creuat pel client {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Tipus d'Impostos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},No té permisos per afegir o actualitzar les entrades abans de {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},No té permisos per afegir o actualitzar les entrades abans de {0}
 DocType: Item,Item Image (if not slideshow),Imatge de l'article (si no hi ha presentació de diapositives)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Hi ha un client amb el mateix nom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Tarifa / 60) * Temps real de l'Operació
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Convidat
 DocType: Quality Inspection,Get Specification Details,Obtenir Detalls d'Especificacions
 DocType: Lead,Interested,Interessat
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Llista de materials (BOM)
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Obertura
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Obertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Des {0} a {1}
 DocType: Item,Copy From Item Group,Copiar del Grup d'Articles
 DocType: Journal Entry,Opening Entry,Entrada Obertura
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Consulta de producte
 DocType: Standard Reply,Owner,Propietari
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Si us plau ingressi empresa primer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Si us plau seleccioneu l'empresa primer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Si us plau seleccioneu l'empresa primer
 DocType: Employee Education,Under Graduate,Baix de Postgrau
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Cost total
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumible
 DocType: Upload Attendance,Import Log,Importa registre
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
+DocType: Sales Invoice Item,Delivered By Supplier,Lliurat per proveïdor
 DocType: SMS Center,All Contact,Tots els contactes
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salari Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Tancant l'Any Fiscal
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Entrada Contra
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar Registres Temps
 DocType: Journal Entry Account,Credit in Company Currency,Crèdit en moneda Companyia
 DocType: Delivery Note,Installation Status,Estat d'instal·lació
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Acceptat Rebutjat Quantitat ha de ser igual a la quantitat rebuda per article {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Acceptat Rebutjat Quantitat ha de ser igual a la quantitat rebuda per article {0}
 DocType: Item,Supply Raw Materials for Purchase,Materials Subministrament primeres per a la Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,L'Article {0} ha de ser un article de compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descarregueu la plantilla, omplir les dades adequades i adjuntar l'arxiu modificat.
  Totes les dates i empleat combinació en el període seleccionat vindrà a la plantilla, amb els registres d'assistència existents"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,L'article {0} no està actiu o ha arribat al final de la seva vida
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,L'article {0} no està actiu o ha arribat al final de la seva vida
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,S'actualitzarà després de la presentació de la factura de venda.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
 DocType: SMS Center,SMS Center,Centre d'SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Redreçar
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Introdueixi paràmetre url
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regles per a l'aplicació de preus i descomptes.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Conflictes Sessió aquesta vegada amb {0} de {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Llista de preus ha de ser aplicable per comprar o vendre
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Data d'instal·lació no pot ser abans de la data de lliurament d'article {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data d'instal·lació no pot ser abans de la data de lliurament d'article {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Descompte Preu de llista Taxa (%)
-sites/assets/js/form.min.js +279,Start,Començar
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Començar
 DocType: User,First Name,Nom De Pila
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,La seva configuració s'ha completat. Refrescant.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fosa de motlle complet
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Termes i Condicions
 DocType: Production Planning Tool,Sales Orders,Ordres de venda
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venda d'articles
 ,Production Orders in Progress,Ordres de producció en Construcció
 DocType: Lead,Address & Contact,Direcció i Contacte
+DocType: Leave Allocation,Add unused leaves from previous allocations,Afegir les fulles no utilitzats de les assignacions anteriors
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
 DocType: Newsletter List,Total Subscribers,Els subscriptors totals
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nom de Contacte
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Pendent Quantitat
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nòmina per als criteris abans esmentats.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Sol·licitud de venda.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Habitatge Doble
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Deixa per any
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Si us plau, estableix Naming Sèries per {0} a través de Configuració> Configuració> Sèrie Naming"
 DocType: Time Log,Will be updated when batched.,Will be updated when batched.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Si us plau, vegeu ""És Avanç 'contra el Compte {1} si es tracta d'una entrada amb antelació."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Si us plau, vegeu ""És Avanç 'contra el Compte {1} si es tracta d'una entrada amb antelació."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
 DocType: Bulk Email,Message,Missatge
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referència número
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Absència bloquejada
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
 DocType: Stock Entry,Sales Invoice No,Factura No
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Quantitat de comanda mínima
 DocType: Pricing Rule,Supplier Type,Tipus de Proveïdor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
 DocType: Item,Purchase Details,Informació de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} no es troba en 'matèries primeres subministrades' taula en l'Ordre de Compra {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Control de Notificació
 DocType: Lead,Suggestions,Suggeriments
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Pressupostos Set-Group savi article sobre aquest territori. També pot incloure l'estacionalitat mitjançant l'establiment de la Distribució.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Si us plau ingressi grup de comptes dels pares per al magatzem {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagament contra {0} {1} no pot ser més gran que Destacat Suma {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagament contra {0} {1} no pot ser més gran que Destacat Suma {2}
 DocType: Supplier,Address HTML,Adreça HTML
 DocType: Lead,Mobile No.,No mòbil
 DocType: Maintenance Schedule,Generate Schedule,Generar Calendari
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nova UDM d'existències
 DocType: Period Closing Voucher,Closing Account Head,Tancant el Compte principal
 DocType: Employee,External Work History,Historial de treball extern
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referència Circular Error
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,De debò vols a STOP 
 DocType: Communication,Closed,Tancat
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En paraules (exportació) seran visibles quan es desi l'albarà de lliurament.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Segur que vols deixar de 
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil Laboral
 DocType: Newsletter,Newsletter,Newsletter
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Nota de lliurament
 DocType: Dropbox Backup,Allow Dropbox Access,Allow Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuració d'Impostos
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagament ha estat modificat després es va tirar d'ell. Si us plau, tiri d'ella de nou."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
 DocType: Workstation,Rent Cost,Cost de lloguer
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecciona el mes i l'any
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Canvi al qual la divisa del client es converteix la moneda base del client
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible a la llista de materials, nota de lliurament, factura de compra, ordre de producció, ordres de compra, rebut de compra, factura de venda, ordres de venda, entrada d'estoc, fulla d'hores"
 DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleccioneu Producte
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Article: {0} gestionat per lots, no pot conciliar l'ús \
  Stock Reconciliació, en lloc d'utilitzar l'entrada Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lot No ha de ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir la no-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Rebut de compra s'ha de presentar
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Estoc actual UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lots (lot) d'un element.
 DocType: C-Form Invoice Detail,Invoice Date,Data de la factura
 DocType: GL Entry,Debit Amount,Suma Dèbit
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l'empresa en {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l'empresa en {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,La seva adreça de correu electrònic
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instruccions
 DocType: Quality Inspection,Inspected By,Inspeccionat per
 DocType: Maintenance Visit,Maintenance Type,Tipus de Manteniment
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},El número de sèrie {0} no pertany a la nota de lliurament {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},El número de sèrie {0} no pertany a la nota de lliurament {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Article de qualitat de paràmetres d'Inspecció
 DocType: Leave Application,Leave Approver Name,Nom de l'aprovador d'absències
 ,Schedule Date,Horari Data
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Compra de Registre
 DocType: Landed Cost Item,Applicable Charges,Càrrecs aplicables
 DocType: Workstation,Consumable Cost,Cost de consumibles
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir paper 'Deixar aprovador'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir paper 'Deixar aprovador'
 DocType: Purchase Receipt,Vehicle Date,Data de Vehicles
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Metge
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiu de pèrdua
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% Instal·lat
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Si us plau introdueix el nom de l'empresa primer
 DocType: BOM,Item Desription,Desripció de l'article
 DocType: Purchase Invoice,Supplier Name,Nom del proveïdor
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Llegiu el Manual ERPNext
 DocType: Account,Is Group,És el Grup
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automàticament els números de sèrie basat en FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprovar Proveïdor Nombre de factura Singularitat
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerent de vendes
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,La configuració global per a tots els processos de fabricació.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes bloquejats fins a
 DocType: SMS Log,Sent On,Enviar on
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mestre de vacances.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Emmotllament Shell
 DocType: Material Request Item,Required Date,Data Requerit
 DocType: Delivery Note,Billing Address,Direcció De Enviament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
 DocType: BOM,Costing,Costejament
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantitat total
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre op
 DocType: Customer,Buyer of Goods and Services.,Compradors de Productes i Serveis.
 DocType: Journal Entry,Accounts Payable,Comptes Per Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Afegir Subscriptors
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" no existeix"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" no existeix"
 DocType: Pricing Rule,Valid Upto,Vàlid Fins
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingrés Directe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","No es pot filtrar en funció del compte, si agrupats per Compte"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administratiu
 DocType: Payment Tool,Received Or Paid,Rebut o pagat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Seleccioneu de l'empresa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Seleccioneu de l'empresa
 DocType: Stock Entry,Difference Account,Compte de diferències
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No es pot tancar tasca com no tanca la seva tasca depèn {0}.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
 DocType: Production Order,Additional Operating Cost,Cost addicional de funcionament
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productes cosmètics
 DocType: DocField,Type,Tipus
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
 DocType: Communication,Subject,Subjecte
 DocType: Shipping Rule,Net Weight,Pes Net
 DocType: Employee,Emergency Phone,Telèfon d'Emergència
 ,Serial No Warranty Expiry,Venciment de la garantia del número de sèrie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,De veritat vol deixar d'aquesta demanda de materials?
 DocType: Sales Order,To Deliver,Per Lliurar
 DocType: Purchase Invoice Item,Item,Article
 DocType: Journal Entry,Difference (Dr - Cr),Diferència (Dr - Cr)
 DocType: Account,Profit and Loss,Pèrdues i Guanys
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Subcontractació Gestió
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Subcontractació Gestió
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nova UDM no pot ser de tipus Número sencer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobles
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Valor pel qual la divisa de la llista de preus es converteix a la moneda base de la companyia
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Afegeix / Edita les taxes
 DocType: Purchase Invoice,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","No es pot eliminar de sèrie n {0}, ja que s'utilitza en les transaccions de valors"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Tancament (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Tancament (Cr)
 DocType: Serial No,Warranty Period (Days),Període de garantia (Dies)
 DocType: Installation Note Item,Installation Note Item,Nota d'instal·lació de l'article
 ,Pending Qty,Pendent Quantitat
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,Facturació i Lliurament Estat
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repetiu els Clients
 DocType: Leave Control Panel,Allocate,Assignar
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Devolucions de vendes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Devolucions de vendes
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccioneu ordres de venda a partir del qual vol crear ordres de producció.
+DocType: Item,Delivered by Supplier (Drop Ship),Lliurat pel proveïdor (nau)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Components salarials.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de dades de clients potencials.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de dades de clients.
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Magatzem lògic contra el qual es fan les entrades en existències.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
 DocType: Event,Wednesday,Dimecres
 DocType: Sales Invoice,Customer's Vendor,Venedor del Client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordre de Producció és obligatori
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Paràmetre de Receptor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basat En' i 'Agrupar Per' no pot ser el mateix
 DocType: Sales Person,Sales Person Targets,Objectius persona de vendes
-sites/assets/js/form.min.js +271,To,A
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Introduïu l'adreça de correu electrònic
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,A
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Introduïu l'adreça de correu electrònic
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fi tub formant
 DocType: Production Order Operation,In minutes,En qüestió de minuts
 DocType: Issue,Resolution Date,Resolució Data
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,Usuari de Projectes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumit
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} no es troba a Detalls de la factura taula
 DocType: Company,Round Off Cost Center,Completen centres de cost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manteniment Visita {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manteniment Visita {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 DocType: Material Request,Material Transfer,Transferència de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Obertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Data i hora d'enviament ha de ser posterior a {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Ajustos
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos i Càrrecs Landed Cost
 DocType: Production Order Operation,Actual Start Time,Temps real d'inici
 DocType: BOM Operation,Operation Time,Temps de funcionament
-sites/assets/js/list.min.js +5,More,Més
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Més
 DocType: Pricing Rule,Sales Manager,Gerent De Vendes
-sites/assets/js/desk.min.js +7673,Rename,Canviar el nom
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Canviar el nom
 DocType: Journal Entry,Write Off Amount,Anota la quantitat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Doblegat
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permetre a l'usuari
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Esquila Recta
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Per realitzar el seguiment de l'article en vendes i documents de compra en base als seus números de sèrie. Aquest és també pugui utilitzat per rastrejar informació sobre la garantia del producte.
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoc actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Cal indicar el magatzem de no conformitats per la partida rebutjada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Cal indicar el magatzem de no conformitats per la partida rebutjada
 DocType: Account,Expenses Included In Valuation,Despeses incloses en la valoració
 DocType: Employee,Provide email id registered in company,Provide email id registered in company
 DocType: Hub Settings,Seller City,Ciutat del venedor
 DocType: Email Digest,Next email will be sent on:,El següent correu electrònic s'enviarà a:
 DocType: Offer Letter Term,Offer Letter Term,Present Carta Termini
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,L'article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,L'article té variants.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} no trobat
 DocType: Bin,Stock Value,Estoc Valor
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipus Arbre
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Benvinguda
 DocType: Journal Entry,Credit Card Entry,Introducció d'una targeta de crèdit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tasca Assumpte
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Productes rebuts de proveïdors.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Productes rebuts de proveïdors.
 DocType: Communication,Open,Obert
 DocType: Lead,Campaign Name,Nom de la campanya
 ,Reserved,Reservat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Realment vols unstop 
 DocType: Purchase Order,Supply Raw Materials,Subministrament de Matèries Primeres
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La data en què es genera la següent factura. Es genera a enviar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actiu Corrent
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Del client Ordre de Compra No
 DocType: Employee,Cell Number,Número de cel·la
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Oportunitat De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nòmina mensual.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Responsabilitat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.
 DocType: Company,Default Cost of Goods Sold Account,Cost per defecte del compte mercaderies venudes
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Llista de preus no seleccionat
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Llista de preus no seleccionat
 DocType: Employee,Family Background,Antecedents de família
 DocType: Process Payroll,Send Email,Enviar per correu electrònic
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,No permission
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Ens
 DocType: Item,Items with higher weightage will be shown higher,Els productes amb major coeficient de ponderació se li apareixen més alta
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detall Conciliació Bancària
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Els meus Factures
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,No s'ha trobat cap empeat
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,No s'ha trobat cap empeat
 DocType: Purchase Order,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Seleccioneu la llista de materials per començar
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Puja sald
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ara
 ,Support Analytics,Suport Analytics
 DocType: Item,Website Warehouse,Lloc Web del magatzem
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,De veritat vol deixar d'ordre de producció: 
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El dia del mes en què es generarà factura acte per exemple 05, 28, etc. "
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score ha de ser menor que o igual a 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registres C-Form
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Consu
 DocType: Features Setup,"To enable ""Point of Sale"" features",Per habilitar les característiques de "Punt de Venda"
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Seleccionar elements
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} contra Bill {1} ​​{2} de data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra Bill {1} ​​{2} de data
 DocType: Comment,Reference Name,Referència Nom
 DocType: Maintenance Visit,Completion Status,Estat de finalització
 DocType: Sales Invoice Item,Target Warehouse,Magatzem destí
 DocType: Item,Allow over delivery or receipt upto this percent,Permetre sobre el lliurament o recepció fins aquest percentatge
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Data prevista de lliurament no pot ser abans de la data de l'ordres de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Data prevista de lliurament no pot ser abans de la data de l'ordres de venda
 DocType: Upload Attendance,Import Attendance,Importa Assistència
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tots els grups d'articles
 DocType: Process Payroll,Activity Log,Registre d'activitat
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
 DocType: Production Order,Item To Manufacture,Article a fabricar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Fosa de motlle permanent
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Ordre de compra de Pagament
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Estat és {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordre de compra de Pagament
 DocType: Sales Order Item,Projected Qty,Quantitat projectada
 DocType: Sales Invoice,Payment Due Date,Data de pagament
 DocType: Newsletter,Newsletter Manager,Butlletí Administrador
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,Números sol·licitats
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,L'avaluació de l'acompliment.
 DocType: Sales Invoice Item,Stock Details,Estoc detalls
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor de Projecte
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Punt de venda
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},No es pot tirar endavant {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punt de venda
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},No es pot tirar endavant {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","El saldo del compte ja està en crèdit, no tens permisos per establir-lo com 'El balanç ha de ser ""com ""Dèbit """
 DocType: Account,Balance must be,El balanç ha de ser
 DocType: Hub Settings,Publish Pricing,Publicar preus
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Albarà de compra
 ,Received Items To Be Billed,Articles rebuts per a facturar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sorrejat abrasiu
-sites/assets/js/desk.min.js +3938,Ms,Sra
+DocType: Employee,Ms,Sra
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Tipus de canvi principal.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l'operació {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Pla de subconjunts
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,Abast
 DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Features Setup,Item Barcode,Codi de barres d'article
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Article Variants {0} actualitza
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Botiga
 DocType: Hub Settings,Sync Now,Sincronitza ara
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Fila {0}: entrada de crèdit no pot vincular amb un {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Fila {0}: entrada de crèdit no pot vincular amb un {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,El compte bancs/efectiu predeterminat s'actualitzarà automàticament a les factures de TPV quan es selecciona aquest.
 DocType: Employee,Permanent Address Is,Adreça permanent
 DocType: Production Order Operation,Operation completed for how many finished goods?,L'operació es va realitzar per la quantitat de productes acabats?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Provisió per superar {0} creuat per Punt {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Provisió per superar {0} creuat per Punt {1}.
 DocType: Employee,Exit Interview Details,Detalls de l'entrevista final
 DocType: Item,Is Purchase Item,És Compra d'articles
 DocType: Journal Entry Account,Purchase Invoice,Factura de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Número de detall del comprovant
 DocType: Stock Entry,Total Outgoing Value,Valor Total sortint
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Data i Data de Tancament d'obertura ha de ser dins el mateix any fiscal
 DocType: Lead,Request for Information,Sol·licitud d'Informació
 DocType: Payment Tool,Paid,Pagat
 DocType: Salary Slip,Total in words,Total en paraules
 DocType: Material Request Item,Lead Time Date,Termini d'execució Data
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,és obligatori. Potser no es crea registre de canvi de divisa per
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Fila #{0}: Si us plau especifica el número de sèrie per l'article {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pels articles 'Producte Bundle', Magatzem, Serial No i lots No serà considerat en el quadre 'Packing List'. Si Warehouse i lots No són les mateixes per a tots els elements d'embalatge per a qualsevol element 'Producte Bundle', aquests valors es poden introduir a la taula principal de l'article, els valors es copiaran a la taula "Packing List '."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Enviaments a clients.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Enviaments a clients.
 DocType: Purchase Invoice Item,Purchase Order Item,Ordre de compra d'articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingressos Indirectes
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establir Import Pagament = Suma Pendent
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,Adreça Línia 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Desacord
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nom de l'Empresa
 DocType: SMS Center,Total Message(s),Total Missatge(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veure una llista de tots els vídeos d'ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccioneu cap compte del banc on xec va ser dipositat.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permetre a l'usuari editar la Llista de Preus de Tarifa en transaccions
 DocType: Pricing Rule,Max Qty,Quantitat màxima
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pagament contra Vendes / Ordre de Compra sempre ha d'estar marcat com a pagamet anticipat (bestreta)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pagament contra Vendes / Ordre de Compra sempre ha d'estar marcat com a pagamet anticipat (bestreta)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químic
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
 DocType: Process Payroll,Select Payroll Year and Month,Seleccioneu nòmina Any i Mes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Anar al grup apropiat (generalment Aplicació de Fons> Actiu Circulant> Comptes Bancàries i crear un nou compte (fent clic a Afegeix nen) de tipus "Banc"
 DocType: Workstation,Electricity Cost,Cost d'electricitat
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blan
 DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
 DocType: Purchase Invoice,Get Advances Paid,Obtenir bestretes pagades
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunta la teva imatge
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Fer 
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fer 
 DocType: Journal Entry,Total Amount in Words,Suma total en Paraules
 DocType: Workflow State,Stop,Aturi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"S'ha produït un error. Una raó probable podria ser que no ha guardat el formulari. Si us plau, poseu-vos en contacte amb support@erpnext.com si el problema persisteix."
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,Albarà d'article
 DocType: POS Profile,Cash/Bank Account,Compte de Caixa / Banc
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
 DocType: Delivery Note,Delivery To,Lliurar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Taula d'atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Taula d'atributs és obligatori
 DocType: Production Planning Tool,Get Sales Orders,Rep ordres de venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no pot ser negatiu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Presentació
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',S'actualitz
 DocType: Project,Internal,Interna
 DocType: Task,Urgent,Urgent
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Si us plau, especifiqueu un ID de fila vàlida per a la fila {0} a la taula {1}"
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Aneu a l'escriptori i començar a utilitzar ERPNext
 DocType: Item,Manufacturer,Fabricant
 DocType: Landed Cost Item,Purchase Receipt Item,Rebut de compra d'articles
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Magatzem Reservat a Ordres de venda / Magatzem de productes acabats
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Quantitat de Venda
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Registres de temps
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Ets l'aprovador de despeses per a aquest registre. Actualitza l '""Estat"" i Desa"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Ets l'aprovador de despeses per a aquest registre. Actualitza l '""Estat"" i Desa"
 DocType: Serial No,Creation Document No,Creació document nº
 DocType: Issue,Issue,Incidència
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributs per Punt variants. per exemple, mida, color, etc."
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Per defecte Centre de Cost de Venda
 DocType: Sales Partner,Implementation Partner,Soci d'Aplicació
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
 DocType: Opportunity,Contact Info,Informació de Contacte
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Fer comentaris Imatges
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Fer comentaris Imatges
 DocType: Packing Slip,Net Weight UOM,Pes net UOM
 DocType: Item,Default Supplier,Per defecte Proveïdor
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Sobre Producció Assignació Percentatge
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Get Weekly Off Dates
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data de finalització no pot ser inferior a data d'inici
 DocType: Sales Person,Select company name first.,Seleccioneu el nom de l'empresa en primer lloc.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ofertes rebudes dels proveïdors.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Per {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,actualitzada a través dels registres de temps
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Els números de registre de l'empresa per la seva referència. Nombres d'impostos, etc."
 DocType: Sales Partner,Distributor,Distribuïdor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regles d'enviament de la cistella de lacompra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 ,Ordered Items To Be Billed,Els articles comandes a facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecciona Registres de temps i Presenta per a crear una nova factura de venda.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impostos
 DocType: Lead,Lead,Client potencial
 DocType: Email Digest,Payables,Comptes per Pagar
 DocType: Account,Warehouse,Magatzem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
 ,Purchase Order Items To Be Billed,Ordre de Compra articles a facturar
 DocType: Purchase Invoice Item,Net Rate,Taxa neta
 DocType: Purchase Invoice Item,Purchase Invoice Item,Compra Factura article
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Detalls de Pagament
 DocType: Global Defaults,Current Fiscal Year,Any fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar total arrodonit
 DocType: Lead,Call,Truca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Entrades' no pot estar buit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entrades' no pot estar buit
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
 ,Trial Balance,Balanç provisional
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Configuració d'Empleats
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuració d'Empleats
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Seleccioneu el prefix primer
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Recerca
 DocType: Maintenance Visit Purpose,Work Done,Treballs Realitzats
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,Enviat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Veure Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
 DocType: Communication,Delivery Status,Estat de l'enviament
 DocType: Production Order,Manufacture against Sales Order,Fabricació contra ordre de vendes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resta del món
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resta del món
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'article {0} no pot tenir per lots
 ,Budget Variance Report,Pressupost Variància Reportar
 DocType: Salary Slip,Gross Pay,Sou brut
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividends pagats
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Comptabilitat principal
 DocType: Stock Reconciliation,Difference Amount,Diferència Monto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Guanys Retingudes
 DocType: BOM Item,Item Description,Descripció de l'Article
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,Opportunity Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Obertura Temporal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balanç d'absències d'empleat
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Balanç per compte {0} ha de ser sempre {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balanç per compte {0} ha de ser sempre {1}
 DocType: Address,Address Type,Tipus d'adreça
 DocType: Purchase Receipt,Rejected Warehouse,Magatzem no conformitats
 DocType: GL Entry,Against Voucher,Contra justificant
 DocType: Item,Default Buying Cost Center,Centres de cost de compres predeterminat
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Per obtenir el millor de ERPNext, us recomanem que es prengui un temps i veure aquests vídeos d'ajuda."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,L'Article {0} ha de ser article de Vendes
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,a
 DocType: Item,Lead Time in days,Termini d'execució en dies
 ,Accounts Payable Summary,Comptes per Pagar Resum
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},No autoritzat per editar el compte bloquejat {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},No autoritzat per editar el compte bloquejat {0}
 DocType: Journal Entry,Get Outstanding Invoices,Rep les factures pendents
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Lloc de la incidència
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contracte
 DocType: Report,Disabled,Deshabilitat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despeses Indirectes
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Fila {0}: Quantitat és obligatori
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,Forma de pagament
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
 DocType: Journal Entry Account,Purchase Order,Ordre De Compra
 DocType: Warehouse,Warehouse Contact Info,Informació del contacte del magatzem
-sites/assets/js/form.min.js +190,Name is required,El nom és necessari
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,El nom és necessari
 DocType: Purchase Invoice,Recurring Type,Tipus Recurrent
 DocType: Address,City/Town,Ciutat / Poble
 DocType: Email Digest,Annual Income,Renda anual
 DocType: Serial No,Serial No Details,Serial No Detalls
 DocType: Purchase Invoice Item,Item Tax Rate,Element Tipus impositiu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Equipments
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Descripció
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data prevista de lliurament és menor que la data d'inici prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Per Proveïdor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Configurar el Tipus de compte ajuda en la selecció d'aquest compte en les transaccions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (En la moneda de la companyia)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortint total
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Només pot haver-hi una Enviament Condició de regla amb 0 o valor en blanc de ""valor"""
 DocType: Authorization Rule,Transaction,Transacció
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: aquest centre de costos és un Grup. No es poden fer anotacions en compte als grups.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Instruments
+apps/frappe/frappe/config/desk.py +7,Tools,Instruments
 DocType: Item,Website Item Groups,Grups d'article del Web
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,El Número d'ordre de producció és obligatori per a les entrades d'estoc de fabricació
 DocType: Purchase Invoice,Total (Company Currency),Total (Companyia moneda)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,Nom de l'Estació de treball
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Digest: 
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-sites/assets/js/desk.min.js +7652,Comments,Comentaris
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentaris
 DocType: Salary Slip,Bank Account No.,Compte Bancari No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Aquest és el nombre de l'última transacció creat amb aquest prefix
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Es necessita tarifa de valoració per l'article {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleccioneu
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Data Factura Proveïdor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Has d'habilitar el carro de la compra
-sites/assets/js/form.min.js +212,No Data,No hi ha dades
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No hi ha dades
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta Plantilla Appraisal
 DocType: Salary Slip,Earning,Guany
 DocType: Payment Tool,Party Account Currency,Compte Partit moneda
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,Compte Partit moneda
 DocType: Purchase Taxes and Charges,Add or Deduct,Afegir o Deduir
 DocType: Company,If Yearly Budget Exceeded (for expense account),Si el pressupost anual excedit (per compte de despeses)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,La superposició de les condicions trobades entre:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diari entrada {0} ja s'ajusta contra algun altre bo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diari entrada {0} ja s'ajusta contra algun altre bo
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total de la comanda
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Menjar
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rang 3 Envelliment
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Número de Visites
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletters a contactes, clients potencials."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Divisa del compte de clausura ha de ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de punts per a totes les metes ha de ser 100. És {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Les operacions no es poden deixar en blanc.
 ,Delivered Items To Be Billed,Articles lliurats pendents de facturar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magatzem no pot ser canviat pel Nº de Sèrie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Estat actualitzat a {0}
 DocType: DocField,Description,Descripció
 DocType: Authorization Rule,Average Discount,Descompte Mig
 DocType: Letter Head,Is Default,És per defecte
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Suma d'impostos d'articles
 DocType: Item,Maintain Stock,Mantenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció 
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixar en blanc si es considera per a totes les designacions
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de data i hora
 DocType: Email Digest,For Company,Per a l'empresa
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,Nom de l'Adreça d'enviament
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Pla General de Comptabilitat
 DocType: Material Request,Terms and Conditions Content,Contingut de Termes i Condicions
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Article {0} no és un article d'estoc
 DocType: Maintenance Visit,Unscheduled,No programada
 DocType: Employee,Owned,Propietat de
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depèn de la llicència sense sou
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estat de l'AMC
 DocType: GL Entry,GL Entry,Entrada GL
 DocType: HR Settings,Employee Settings,Configuració dels empleats
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Per fer la llista
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Per fer la llista
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprenent
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,No s'admenten quantitats negatives
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,lloguer de l'oficina
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Error en importar!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Sense direcció no afegeix encara.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Sense direcció no afegeix encara.
 DocType: Workstation Working Hour,Workstation Working Hour,Estació de treball Hores de Treball
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2}
 DocType: Item,Inventory,Inventari
 DocType: Features Setup,"To enable ""Point of Sale"" view",Per habilitar "Punt de Venda" vista
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,El pagament no es pot fer per al carro buit
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,El pagament no es pot fer per al carro buit
 DocType: Item,Sales Details,Detalls de venda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixació
 DocType: Opportunity,With Items,Amb articles
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",La data en què es generarà propera factura. Es genera en enviar.
 DocType: Item Attribute,Item Attribute,Element Atribut
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Govern
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Variants de l'article
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variants de l'article
 DocType: Company,Services,Serveis
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de Cost de Pares
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
 DocType: Employee External Work History,Total Experience,Experiència total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight and Forwarding Charges
 DocType: Material Request Item,Sales Order No,Ordre de Venda No
 DocType: Item Group,Item Group Name,Nom del Grup d'Articles
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Pres
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Pres
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materials de transferència per Fabricació
 DocType: Pricing Rule,For Price List,Per Preu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Cerca d'Executius
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,Horaris
 DocType: Purchase Invoice Item,Net Amount,Import Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Detall del BOM No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Import addicional de descompte (moneda Company)
-DocType: Period Closing Voucher,CoA Help,CoA Help
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Error: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Error: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Si us plau, creu un nou compte de Pla de Comptes."
 DocType: Maintenance Visit,Maintenance Visit,Manteniment Visita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Grup de Clients> Territori
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
 DocType: Event,Tuesday,Dimarts
 DocType: Leave Block List,Block Holidays on important days.,Vacances de Bloc en dies importants.
 ,Accounts Receivable Summary,Comptes per Cobrar Resum
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Fulles per al tipus {0} ja assignat per Empleat {1} per al període {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Si us plau, estableix camp ID d'usuari en un registre d'empleat per establir Rol d'empleat"
 DocType: UOM,UOM Name,Nom UDM
 DocType: Top Bar Item,Target,Objectiu
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada de Comptabilitat per a {0} només es pot fer en moneda: {1}
 DocType: Pricing Rule,Pricing Rule,Regla preus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Osques
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Sol·licitud de materials d'Ordre de Compra
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Sol·licitud de materials d'Ordre de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: L'article tornat {1} no existeix en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes bancaris
 ,Bank Reconciliation Statement,Declaració de Conciliació Bancària
 DocType: Address,Lead Name,Nom Plom
 ,POS,TPV
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Obertura de la balança
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Obertura de la balança
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ha d'aparèixer només una vegada
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No es permet Tranfer més {0} de {1} contra l'Ordre de Compra {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Les fulles Numerat amb èxit per {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Les fulles Numerat amb èxit per {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hi ha articles per embalar
 DocType: Shipping Rule Condition,From Value,De Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Les quantitats no es reflecteixen en el banc
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Les reclamacions per compte de l'empresa.
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,Contacte Mòbil No
 DocType: Production Planning Tool,Select Sales Orders,Seleccionar comandes de client
 ,Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Per realitzar un seguiment d'elements mitjançant codi de barres. Vostè serà capaç d'entrar en els elements de la nota de lliurament i la factura de venda mitjançant l'escaneig de codi de barres de l'article.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar com Lliurat
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Fer Cita
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Intenta operacions per a la planificació de X dies d'antelació.
 DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
 DocType: SMS Center,Receiver List,Llista de receptors
 DocType: Payment Tool Detail,Payment Amount,Quantitat de pagament
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantitat consumida
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Veure
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Veure
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salary Structure Deduction
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterització selectiva per làser
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importació correcta!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,Compte per Pagar per defecte
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustaments per a la compra en línia, com les normes d'enviament, llista de preus, etc."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Instal·lació completa
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Anunciat
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reservats Quantitat
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reservats Quantitat
 DocType: Party Account,Party Account,Compte Partit
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humans
 DocType: Lead,Upper Income,Ingrés Alt
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilita Compres
 DocType: Employee,Permanent Address,Adreça Permanent
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Article {0} ha de ser un element de servei.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Avançament pagat contra {0} {1} no pot ser major \ de Gran Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Seleccioneu el codi de l'article
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduir Deducció per absències sense sou (LWP)
 DocType: Territory,Territory Manager,Gerent de Territory
+DocType: Delivery Note Item,To Warehouse (Optional),Per magatzems (Opcional)
 DocType: Sales Invoice,Paid Amount (Company Currency),Suma Pagat (Companyia moneda)
 DocType: Purchase Invoice,Additional Discount,Descompte addicional
 DocType: Selling Settings,Selling Settings,La venda d'Ajustaments
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineria
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Hi ha un grup de clients amb el mateix nom, si us plau canvia el nom del client o el nom del Grup de Clients"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Seleccioneu {0} primer.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Seleccioneu {0} primer.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,Lot número
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permetre diverses ordres de venda en contra d'un client Ordre de Compra
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Inici
 DocType: DocPerm,Delete,Esborrar
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variant
-sites/assets/js/desk.min.js +7971,New {0},Nova {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Detingut ordre no es pot cancel·lar. Unstop per cancel·lar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d'estar actiu per aquest material o la seva plantilla
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Detingut ordre no es pot cancel·lar. Unstop per cancel·lar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d'estar actiu per aquest material o la seva plantilla
 DocType: Employee,Leave Encashed?,Leave Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitat de camp és obligatori
 DocType: Item,Variants,Variants
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,País
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Direccions
 DocType: Communication,Received,Rebut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Número de sèrie duplicat per l'article {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condició per a una regla d'enviament
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,L'article no se li permet tenir ordre de producció.
@@ -1533,8 +1543,6 @@ DocType: Employee,Salutation,Salutació
 DocType: Communication,Rejected,Rebutjat
 DocType: Pricing Rule,Brand,Marca comercial
 DocType: Item,Will also apply for variants,També s'aplicarà per a les variants
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Lliurat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Lliurat
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Articles agrupats en el moment de la venda.
 DocType: Sales Order Item,Actual Qty,Actual Quantitat
 DocType: Sales Invoice Item,References,Referències
@@ -1572,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,F
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Cisallament
 DocType: Item,Has Variants,Té variants
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Feu clic al botó 'Make factura de venda ""per crear una nova factura de venda."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Període Des de i Període Fins a obligatoris per recurrent %s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Envasament i etiquetatge
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Si us plau, especifiqui Moneda per defecte a l'empresa Mestre i predeterminats globals"
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Factura Recurrent
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Gestió de Projectes
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gestió de Projectes
 DocType: Supplier,Supplier of Goods or Services.,Proveïdor de productes o serveis.
 DocType: Budget Detail,Fiscal Year,Any Fiscal
 DocType: Cost Center,Budget,Pressupost
@@ -1608,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Vendes
 DocType: Employee,Salary Information,Informació sobre sous
 DocType: Sales Person,Name and Employee ID,Nom i ID d'empleat
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
 DocType: Website Item Group,Website Item Group,Lloc web Grup d'articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Taxes i impostos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Si us plau, introduïu la data de referència"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} entrades de pagament no es poden filtrar per {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Si us plau, introduïu la data de referència"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entrades de pagament no es poden filtrar per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Taula d'article que es mostra en el lloc web
 DocType: Purchase Order Item Supplied,Supplied Qty,Subministrat Quantitat
 DocType: Material Request Item,Material Request Item,Material Request Item
@@ -1620,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Arbre dels grups
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,No es pot fer referència número de la fila superior o igual al nombre de fila actual d'aquest tipus de càrrega
 ,Item-wise Purchase History,Historial de compres d'articles
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Vermell
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Si us plau, feu clic a ""Generar Planificació 'per reservar números de sèrie per l'article {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Si us plau, feu clic a ""Generar Planificació 'per reservar números de sèrie per l'article {0}"
 DocType: Account,Frozen,Bloquejat
 ,Open Production Orders,Obertes les ordres de producció
 DocType: Installation Note,Installation Time,Temps d'instal·lació
@@ -1664,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grup L'article no esmenta en mestre d'articles per a l'article {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",Per a poder fer aquest article Ordre de Producció cal designar-lo com a article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",Per a poder fer aquest article Ordre de Producció cal designar-lo com a article d'estoc
 DocType: Shipping Rule Condition,Shipping Amount,Total de l'enviament
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unió
 DocType: Authorization Rule,Above Value,Per sobre de Valor
 ,Pending Amount,A l'espera de l'Import
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Alliberat
+DocType: Purchase Order,Delivered,Alliberat
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup incoming server for jobs email id. (e.g. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Nombre de vehicles
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data en què s'atura la factura recurrent
@@ -1687,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir els càrrecs
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,El compte {0} ha de ser del tipus 'd'actius fixos' perquè l'article {1} és un element d'actiu
 DocType: HR Settings,HR Settings,Configuració de recursos humans
 apps/frappe/frappe/config/setup.py +130,Printing,Impressió
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,El compte de despeses està pendent d'aprovació. Només l'aprovador de despeses pot actualitzar l'estat.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El compte de despeses està pendent d'aprovació. Només l'aprovador de despeses pot actualitzar l'estat.
 DocType: Purchase Invoice,Additional Discount Amount,Import addicional de descompte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,El dia (s) en el qual està sol·licitant el permís són vacances. Vostè no necessita sol·licitar l'excedència.
-sites/assets/js/desk.min.js +7805,and,i
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr no pot estar en blanc o l'espai
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Esports
@@ -1727,7 +1734,6 @@ DocType: Opportunity,Quotation,Oferta
 DocType: Salary Slip,Total Deduction,Deducció total
 DocType: Quotation,Maintenance User,Usuari de Manteniment
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Cost Actualitzat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Segur que vols unstop 
 DocType: Employee,Date of Birth,Data de naixement
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Article {0} ja s'ha tornat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Any Fiscal ** representa un exercici financer. Els assentaments comptables i altres transaccions importants es segueixen contra ** Any Fiscal **.
@@ -1743,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Porteu un registre de les campanyes de venda. Porteu un registre de conductors, Cites, comandes de venda, etc de Campanyes per mesurar retorn de la inversió. "
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Hi entrades Imatges contra magatzem de {0}, per tant, no es pot tornar a assignar o modificar Magatzem"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Hi entrades Imatges contra magatzem de {0}, per tant, no es pot tornar a assignar o modificar Magatzem"
 DocType: Appraisal,Calculate Total Score,Calcular Puntuació total
 DocType: Supplier Quotation,Manufacturing Manager,Gerent de Fàbrica
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},El número de sèrie {0} està en garantia fins {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Els enviaments
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Emmotllament per immersió
+DocType: Purchase Order,To be delivered to customer,Per ser lliurat al client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Hora de registre d'estat ha de ser presentada.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Número de sèrie {0} no pertany a cap magatzem
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuració
@@ -1774,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,De la divisa
 DocType: DocField,Name,Nom
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Les quantitats no es reflecteix en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Companyia moneda)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altres
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Establir com Stopped
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Si no troba un article a joc. Si us plau seleccioni un altre valor per {0}.
 DocType: POS Profile,Taxes and Charges,Impostos i càrrecs
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producte o un servei que es compra, es ven o es manté en estoc."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No es pot seleccionar el tipus de càrrega com 'Suma de la fila anterior' o 'Total de la fila anterior' per la primera fila
@@ -1787,19 +1794,20 @@ DocType: Web Form,Select DocType,Seleccioneu doctype
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brotxatge
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Si us plau, feu clic a ""Generar la Llista d'aconseguir horari"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nou Centre de Cost
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nou Centre de Cost
 DocType: Bin,Ordered Quantity,Quantitat demanada
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
 DocType: Quality Inspection,In Process,En procés
 DocType: Authorization Rule,Itemwise Discount,Descompte d'articles
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
+DocType: Purchase Order Item,Reference Document Type,Referència Tipus de document
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
 DocType: Account,Fixed Asset,Actius Fixos
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Inventari serialitzat
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventari serialitzat
 DocType: Activity Type,Default Billing Rate,Per defecte Facturació Tarifa
 DocType: Time Log Batch,Total Billing Amount,Suma total de facturació
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Compte per Cobrar
 ,Stock Balance,Saldos d'estoc
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Ordres de venda al Pagament
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Ordres de venda al Pagament
 DocType: Expense Claim Detail,Expense Claim Detail,Reclamació de detall de despesa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Registres de temps de creació:
 DocType: Item,Weight UOM,UDM del pes
@@ -1835,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crèdit al compte ha de ser un compte per pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
 DocType: Production Order Operation,Completed Qty,Quantitat completada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, només els comptes de dèbit poden ser enllaçats amb una altra entrada de crèdit"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,La llista de preus {0} està deshabilitada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, només els comptes de dèbit poden ser enllaçats amb una altra entrada de crèdit"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,La llista de preus {0} està deshabilitada
 DocType: Manufacturing Settings,Allow Overtime,Permetre Overtime
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Vendes Sol·licitar {0} s'atura
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Números de sèrie necessaris per Punt {1}. Vostè ha proporcionat {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Valoració actual Taxa
 DocType: Item,Customer Item Codes,Codis dels clients
@@ -1847,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Es requereix nou Stock UOM
 DocType: Quality Inspection,Sample Size,Mida de la mostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,S'han facturat tots els articles
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,S'han facturat tots els articles
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Si us plau, especifica un 'Des del Cas Número' vàlid"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centres de costos addicionals es poden fer en grups, però les entrades es poden fer contra els no Grups"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centres de costos addicionals es poden fer en grups, però les entrades es poden fer contra els no Grups"
 DocType: Project,External,Extern
 DocType: Features Setup,Item Serial Nos,Article Nº de Sèrie
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuaris i permisos
@@ -1876,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Direcció i contactes
 DocType: SMS Log,Sender Name,Nom del remitent
 DocType: Page,Title,Títol
-sites/assets/js/list.min.js +104,Customize,Personalitza
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalitza
 DocType: POS Profile,[Select],[Select]
 DocType: SMS Log,Sent To,Enviat A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Fer Factura Vendes
@@ -1901,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Final de la Vida
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viatges
 DocType: Leave Block List,Allow Users,Permetre que usuaris
+DocType: Purchase Order,Customer Mobile No,Client Mòbil No
 DocType: Sales Invoice,Recurring,Periódico
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguiment d'Ingressos i Despeses per separat per a les verticals de productes o divisions.
 DocType: Rename Tool,Rename Tool,Eina de canvi de nom
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualització de Costos
 DocType: Item Reorder,Item Reorder,Punt de reorden
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transferir material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transferir material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifiqueu les operacions, el cost d'operació i dona una número d'operació únic a les operacions."
 DocType: Purchase Invoice,Price List Currency,Price List Currency
 DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
@@ -1929,7 +1937,7 @@ DocType: Appraisal,Employee,Empleat
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importació de correu electrònic De
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Convida com usuari
 DocType: Features Setup,After Sale Installations,Instal·lacions després de venda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} està totalment facturat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} està totalment facturat
 DocType: Workstation Working Hour,End Time,Hora de finalització
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condicions contractuals estàndard per Vendes o la compra.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupa per comprovants
@@ -1938,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Page,Standard,Estàndard
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Nombre de comanda purchse requerit per Punt {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagaments
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de manteniment {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de manteniment {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Mida
 DocType: Notification Control,Expense Claim Approved,Compte de despeses Aprovat
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacèutic
@@ -1958,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,Assistència fins a la Data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuració del servidor d'entrada de correu electrònic d'identificació de les vendes. (Per exemple sales@example.com)
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Compte de Pagament
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
-sites/assets/js/list.min.js +23,Draft,Esborrany
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Esborrany
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatori
 DocType: Quality Inspection Reading,Accepted,Acceptat
 DocType: User,Female,Dona
@@ -1972,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta d'enviament
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Com que hi ha transaccions d'accions existents per aquest concepte, \ no pot canviar els valors de 'no té de sèrie', 'Té lot n', 'És de la Element "i" Mètode de valoració'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No es pot canviar la tarifa si el BOM va cap a un article
 DocType: Employee,Previous Work Experience,Experiència laboral anterior
 DocType: Stock Entry,For Quantity,Per Quantitat
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Si us plau entra la quantitat Planificada per l'article {0} a la fila {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} no es presenta
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Sol·licituds d'articles.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} no es presenta
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Sol·licituds d'articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Per a la producció per separat es crearà per a cada bon article acabat.
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instal·lació completa
@@ -1991,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Butlletí de la l
 DocType: Delivery Note,Transporter Name,Nom Transportista
 DocType: Contact,Enter department to which this Contact belongs,Introduïu departament al qual pertany aquest contacte
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unitat de mesura
 DocType: Fiscal Year,Year End Date,Any Data de finalització
 DocType: Task Depends On,Task Depends On,Tasca Depèn de
@@ -2017,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuïdor de tercers / distribuïdor / comissió de l'agent / de la filial / distribuïdor que ven els productes de les empreses d'una comissió.
 DocType: Customer Group,Has Child Node,Té Node Nen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduïu els paràmetres d'URL estàtiques aquí (Ex. Remitent = ERPNext, nom d'usuari = ERPNext, password = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no en qualsevol any fiscal activa. Per a més detalls de verificació {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
@@ -2068,11 +2078,9 @@ DocType: Note,Note,Nota
 DocType: Purchase Receipt Item,Recd Quantity,Recd Quantitat
 DocType: Email Account,Email Ids,E-mail Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No es pot produir més Article {0} que en la quantitat de comandes de client {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Establir com destapats
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancari / Efectiu
 DocType: Tax Rule,Billing City,Facturació Ciutat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Aquesta sol·licitud d'autorització està pendent d'aprovació. Només el Deixar aprovador pot actualitzar l'estat.
 DocType: Global Defaults,Hide Currency Symbol,Amaga Símbol de moneda
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","per exemple bancària, Efectiu, Targeta de crèdit"
 DocType: Journal Entry,Credit Note,Nota de Crèdit
@@ -2093,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantitat)
 DocType: Installation Note Item,Installed Qty,Quantitat instal·lada
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-sites/assets/js/list.min.js +26,Submitted,Enviat
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Enviat
 DocType: Salary Structure,Total Earning,Benefici total
 DocType: Purchase Receipt,Time at which materials were received,Moment en què es van rebre els materials
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Els meus Direccions
@@ -2102,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organization
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,o
 DocType: Sales Order,Billing Status,Estat de facturació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despeses de serveis públics
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,Per sobre de 90-
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Per sobre de 90-
 DocType: Buying Settings,Default Buying Price List,Llista de preus per defecte
 ,Download Backups,Descàrrega Backups
 DocType: Notification Control,Sales Order Message,Sol·licitar Sales Missatge
@@ -2111,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Seleccioneu Empleats
 DocType: Bank Reconciliation,To Date,Fins La Data
 DocType: Opportunity,Potential Sales Deal,Tracte de vendes potencials
-sites/assets/js/form.min.js +308,Details,Detalls
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalls
 DocType: Purchase Invoice,Total Taxes and Charges,Total d'impostos i càrrecs
 DocType: Employee,Emergency Contact,Contacte d'Emergència
 DocType: Item,Quality Parameters,Paràmetres de Qualitat
@@ -2126,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,Quantitat rebuda
 DocType: Stock Entry Detail,Serial No / Batch,Número de sèrie / lot
 DocType: Product Bundle,Parent Item,Article Pare
 DocType: Account,Account Type,Tipus de compte
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de manteniment no es genera per a tots els articles Si us plau, feu clic a ""Generar Planificació"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de manteniment no es genera per a tots els articles Si us plau, feu clic a ""Generar Planificació"""
 ,To Produce,Per a Produir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per a la fila {0} a {1}. Per incloure {2} en la taxa d'article, files {3} també han de ser inclosos"
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificació del paquet per al lliurament (per imprimir)
@@ -2137,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aixafament
 DocType: Account,Income Account,Compte d'ingressos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Motllura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Lliurament
 DocType: Stock Reconciliation Item,Current Qty,Quantitat actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Vegeu ""Taxa de materials basats en"" a la Secció Costea"
 DocType: Appraisal Goal,Key Responsibility Area,Àrea de Responsabilitat clau
@@ -2168,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Totes les direccions.
 DocType: Company,Stock Settings,Ajustaments d'estocs
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusió només és possible si les propietats són les mateixes en tots dos registres. És el Grup, Tipus Arrel, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusió només és possible si les propietats són les mateixes en tots dos registres. És el Grup, Tipus Arrel, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar grup Client arbre.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nou nom de centres de cost
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nou nom de centres de cost
 DocType: Leave Control Panel,Leave Control Panel,Deixa Panell de control
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No hi ha adreça predeterminada. Si us plau, crea'n una de nova a Configuració> Premsa i Branding> plantilla d'adreça."
 DocType: Appraisal,HR User,HR User
@@ -2189,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Detall mitjà de Pagament
 ,Sales Browser,Analista de Vendes
 DocType: Journal Entry,Total Credit,Crèdit Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l'entrada de població {2}: Són els
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l'entrada de població {2}: Són els
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstecs i bestretes (Actius)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deutors
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Gran
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,No s'ha trobat cap empleat!
 DocType: C-Form Invoice Detail,Territory,Territori
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Si us plau, no de visites requerides"
+DocType: Purchase Order,Customer Address Display,Direcció del client Pantalla
 DocType: Stock Settings,Default Valuation Method,Mètode de valoració predeterminat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polit
 DocType: Production Order Operation,Planned Start Time,Planificació de l'hora d'inici
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Situat
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Tancar Balanç i llibre Guany o Pèrdua.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unitat de mesura per defecte per a l'article {0} no es pot canviar directament perquè \ ja ha realitzat alguna transacció (s) amb una altra UOM. Per canviar UOM defecte, \ ús 'UOM Substituir Utilitat' eina de baix mòdul d'Stock."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipus de canvi per convertir una moneda en una altra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendent
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empleat {0} estava de llicència a {1}. No es pot marcar l'assistència.
 DocType: Sales Partner,Targets,Blancs
@@ -2221,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Es tracta d'un grup de clients de l'arrel i no es pot editar.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Si us plau, configura el teu pla de comptes abans de començar els assentaments comptables"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar Regla preus
-sites/assets/js/list.min.js +24,Cancelled,Cancel·lat
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Cancel·lat
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,A partir de la data en l'estructura salarial no pot ser menor que l'empleat Data Unir-se.
 DocType: Employee Education,Graduate,Graduat
 DocType: Leave Block List,Block Days,Bloc de Dies
 DocType: Journal Entry,Excise Entry,Entrada impostos especials
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Són els Vendes Sol·licitar {0} ja existeix en contra del client Ordre de Compra {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Són els Vendes Sol·licitar {0} ja existeix en contra del client Ordre de Compra {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2283,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,Estoc Rebudes però no facturats
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salari brut + arriar Quantitat + Cobrament Suma - Deducció total
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 DocType: Features Setup,Sales and Purchase,Compra i Venda
-DocType: Purchase Order Item,Material Request No,Número de sol·licitud de Material
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
+DocType: Supplier Quotation Item,Material Request No,Número de sol·licitud de Material
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rati a la qual es converteix la divisa del client es converteix en la moneda base de la companyia
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ha estat èxit de baixa d'aquesta llista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa neta (Companyia moneda)
-apps/frappe/frappe/templates/base.html +132,Added,Afegit
+apps/frappe/frappe/templates/base.html +134,Added,Afegit
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrar Territori arbre.
 DocType: Journal Entry Account,Sales Invoice,Factura de vendes
 DocType: Journal Entry Account,Party Balance,Equilibri Partit
 DocType: Sales Invoice Item,Time Log Batch,Registre de temps
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
 DocType: Company,Default Receivable Account,Predeterminat Compte per Cobrar
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banc per al sou total pagat pels criteris anteriorment seleccionats
 DocType: Stock Entry,Material Transfer for Manufacture,Transferència de material per a la fabricació
@@ -2304,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Obtenir assentaments correspon
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entrada Comptabilitat de Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Encunyant
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar addicional de descompte en les
@@ -2319,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,Inspecció de Qualitat
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Petit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Ruixeu la formació
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,El compte {0} està bloquejat
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,El compte {0} està bloquejat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitat Legal / Subsidiari amb un gràfic separat de comptes que pertanyen a l'Organització.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivell d'inventari mínim
 DocType: Stock Entry,Subcontract,Subcontracte
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Si us plau, introdueixi {0} primer"
 DocType: Production Planning Tool,Get Items From Sales Orders,Obtenir els articles des de les comandes de client
 DocType: Production Order Operation,Actual End Time,Actual Hora de finalització
 DocType: Production Planning Tool,Download Materials Required,Es requereix descàrrega de materials
@@ -2342,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,Programat
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Seleccioneu l'ítem on "És de la Element" és "No" i "És d'articles de venda" és "Sí", i no hi ha un altre paquet de producte"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccioneu Distribució Mensual de distribuir de manera desigual a través d'objectius mesos.
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Article Fila {0}: Compra de Recepció {1} no existeix a la taulat 'Rebuts de compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},L'Empleat {0} ja ha sol·licitat {1} entre {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},L'Empleat {0} ja ha sol·licitat {1} entre {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projecte Data d'Inici
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Fins
 DocType: Rename Tool,Rename Log,Canviar el nom de registre
@@ -2371,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Només els nodes fulla es permet l'entrada de transaccions
 DocType: Expense Claim,Expense Approver,Aprovador de despeses
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rebut de compra dels articles subministrats
-sites/assets/js/erpnext.min.js +48,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Registres per mantenir l'estat de lliurament de sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Mòlta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retractilat
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Activitats pendents
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activitats pendents
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveïdor > Tipus Proveïdor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Please enter relieving date.
@@ -2388,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Int
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editors de Newspapers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccioneu l'any fiscal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fosa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Vostè és el aprovador Deixar a aquest títol. Actualitza l '""Estat"" i Desa"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivell de Reabastecimiento
 DocType: Attendance,Attendance Date,Assistència Data
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salary breakup based on Earning and Deduction.
@@ -2424,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Un Centre de costos amb transaccions existents no es pot convertir en grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciació
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveïdor (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Període invàlid
 DocType: Customer,Credit Limit,Límit de Crèdit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccioneu el tipus de transacció
 DocType: GL Entry,Voucher No,Número de comprovant
@@ -2433,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Plant
 DocType: Customer,Address and Contact,Direcció i Contacte
 DocType: Customer,Last Day of the Next Month,Últim dia del mes
 DocType: Employee,Feedback,Resposta
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Horari
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Horari
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Mecanitzat per raig abrasiu
 DocType: Stock Settings,Freeze Stock Entries,Freeze Imatges entrades
 DocType: Website Settings,Website Settings,Configuració del lloc web
@@ -2448,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,Extravertida
 DocType: Material Request,Requested For,Requerida Per
 DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir aquesta nota de lliurament contra qualsevol projecte
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Compte root no es pot esborrar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Compte root no es pot esborrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostra Imatges d'entrades
 ,Is Primary Address,És Direcció Primària
 DocType: Production Order,Work-in-Progress Warehouse,Magatzem de treballs en procés
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referència #{0} amb data {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referència #{0} amb data {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar Direccions
 DocType: Pricing Rule,Item Code,Codi de l'article
 DocType: Production Planning Tool,Create Production Orders,Crear ordres de producció
@@ -2461,14 +2471,14 @@ DocType: Journal Entry,User Remark,Observació de l'usuari
 DocType: Lead,Market Segment,Sector de mercat
 DocType: Communication,Phone,Telèfon
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de treball intern de l'empleat
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Tancament (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Tancament (Dr)
 DocType: Contact,Passive,Passiu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de sèrie {0} no està en estoc
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla d'Impostos per a la venda de les transaccions.
 DocType: Sales Invoice,Write Off Outstanding Amount,Write Off Outstanding Amount
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Comproveu si necessita factures recurrents automàtiques. Després de Presentar qualsevol factura de venda, la secció recurrent serà visible."
 DocType: Account,Accounts Manager,Gerent de Comptes
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Hora de registre {0} ha de ser 'Enviat'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Hora de registre {0} ha de ser 'Enviat'
 DocType: Stock Settings,Default Stock UOM,UDM d'estoc predeterminat
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Costea Taxa basada en Tipus d'activitat (per hora)
 DocType: Production Planning Tool,Create Material Requests,Crear sol·licituds de materials
@@ -2479,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Conciliació bancària
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtenir actualitzacions
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Afegir uns registres d'exemple
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Deixa Gestió
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixa Gestió
 DocType: Event,Groups,Grups
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupa Per Comptes
 DocType: Sales Order,Fully Delivered,Totalment Lliurat
@@ -2491,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Extres de venda
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} pressupost per al compte {1} contra Centre de Cost {2} superarà per {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d'Actius / Passius, ja que aquest arxiu reconciliació és una entrada d'Obertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Portar Fulles reenviats
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Des de la data' ha de ser després de 'A data'
 ,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
 DocType: Sales Order,Customer's Purchase Order,Àrea de clients Ordre de Compra
 DocType: Warranty Claim,From Company,Des de l'empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Quantitat
@@ -2508,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tots els tipus de proveïdors
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,El codi de l'article és obligatori perquè no s'havia numerat automàticament
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Cita {0} no del tipus {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,El codi de l'article és obligatori perquè no s'havia numerat automàticament
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cita {0} no del tipus {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de manteniment d'articles
 DocType: Sales Order,%  Delivered,% Lliurat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Overdraft Account
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Feu nòmina
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Desencallar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar per llista de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstecs Garantits
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productes impressionants
@@ -2524,7 +2532,7 @@ DocType: Appraisal,Appraisal,Avaluació
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Fosa a l'escuma perduda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dibuix
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data repetida
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
 DocType: Hub Settings,Seller Email,Electrònic
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant compra de la factura)
 DocType: Workstation Working Hour,Start Time,Hora d'inici
@@ -2538,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Import net (Companyia moneda)
 DocType: BOM Operation,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Article Naming Per
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Des de l'oferta
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Una altra entrada Període de Tancament {0} s'ha fet després de {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Des de l'oferta
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Una altra entrada Període de Tancament {0} s'ha fet després de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferit per a la Fabricació
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,{0} no existeix Compte
 DocType: Purchase Receipt Item,Purchase Order Item No,Ordre de Compra No. l'article
@@ -2552,11 +2560,11 @@ DocType: Item,Inspection Required,Inspecció requerida
 DocType: Purchase Invoice Item,PR Detail,Detall PR
 DocType: Sales Order,Fully Billed,Totalment Anunciat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectiu disponible
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Magatzem de lliurament requerit per tema de valors {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Magatzem de lliurament requerit per tema de valors {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"El pes brut del paquet. En general, el pes net + embalatge pes del material. (Per imprimir)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Els usuaris amb aquest rol poden establir comptes bloquejats i crear/modificar els assentaments comptables contra els comptes bloquejats
 DocType: Serial No,Is Cancelled,Està cancel·lat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Els meus enviaments
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Els meus enviaments
 DocType: Journal Entry,Bill Date,Data de la factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Fins i tot si hi ha diverses regles de preus amb major prioritat, s'apliquen prioritats internes:"
 DocType: Supplier,Supplier Details,Detalls del proveïdor
@@ -2569,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferència Bancària
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Seleccioneu el compte bancari
 DocType: Newsletter,Create and Send Newsletters,Crear i enviar butlletins de notícies
-sites/assets/js/report.min.js +107,From Date must be before To Date,A partir de la data ha de ser abans Per Data
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,A partir de la data ha de ser abans Per Data
 DocType: Sales Order,Recurring Order,Ordre Recurrent
 DocType: Company,Default Income Account,Compte d'Ingressos predeterminat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup de Clients / Client
@@ -2584,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,UDM de l'Estoc
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
 ,Projected,Projectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} no pertany al Magatzem {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
 DocType: Notification Control,Quotation Message,Cita Missatge
 DocType: Issue,Opening Date,Data d'obertura
 DocType: Journal Entry,Remark,Observació
 DocType: Purchase Receipt Item,Rate and Amount,Taxa i Quantitat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Avorrit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,A partir d'ordres de venda
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,A partir d'ordres de venda
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,No Anunciat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Tant Magatzem ha de pertànyer al mateix Company
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Encara no hi ha contactes.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Encara no hi ha contactes.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,No actiu
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Against Invoice Posting Date
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Monto Voucher
 DocType: Time Log,Batched for Billing,Agrupat per a la Facturació
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills plantejades pels proveïdors.
 DocType: POS Profile,Write Off Account,Escriu Off Compte
-sites/assets/js/erpnext.min.js +26,Discount Amount,Quantitat de Descompte
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Quantitat de Descompte
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retorn Contra Compra Factura
 DocType: Item,Warranty Period (in days),Període de garantia (en dies)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"per exemple, l'IVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
 DocType: Journal Entry Account,Journal Entry Account,Compte entrada de diari
 DocType: Shopping Cart Settings,Quotation Series,Sèrie Cotització
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Hi ha un element amb el mateix nom ({0}), canvieu el nom de grup d'articles o canviar el nom de l'element"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Hi ha un element amb el mateix nom ({0}), canvieu el nom de grup d'articles o canviar el nom de l'element"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formant gas de metall calent
 DocType: Sales Order Item,Sales Order Date,Sol·licitar Sales Data
 DocType: Sales Invoice Item,Delivered Qty,Quantitat lliurada
@@ -2640,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Client o proveïdor Detalls
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Setembre
 DocType: Lead,Lead Owner,Responsable del client potencial
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Es requereix Magatzem
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Es requereix Magatzem
 DocType: Employee,Marital Status,Estat Civil
 DocType: Stock Settings,Auto Material Request,Sol·licitud de material automàtica
 DocType: Time Log,Will be updated when billed.,S'actualitzarà quan es facturi.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Quantitat de lots disponibles a De Magatzem
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,El BOM actual i el nou no poden ser el mateix
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
 DocType: Sales Invoice,Against Income Account,Contra el Compte d'Ingressos
@@ -2660,12 +2668,12 @@ DocType: POS Profile,Update Stock,Actualització de Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDMs diferents per als articles provocarà pesos nets (Total) erronis. Assegureu-vos que pes net de cada article és de la mateixa UDM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Si us plau, tiri d'articles de lliurament Nota"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Si us plau, tiri d'articles de lliurament Nota"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Entrades de diari {0} són no enllaçat
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registre de totes les comunicacions de tipus de correu electrònic, telèfon, xat, visita, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Si us plau, Ronda Off de centres de cost en l'empresa"
 DocType: Purchase Invoice,Terms,Condicions
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Crear nou
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Crear nou
 DocType: Buying Settings,Purchase Order Required,Ordre de Compra Obligatori
 ,Item-wise Sales History,Història Sales Item-savi
 DocType: Expense Claim,Total Sanctioned Amount,Suma total Sancionat
@@ -2682,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Deducció de la fulla de n
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Seleccioneu un node de grup primer.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propòsit ha de ser un de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Ompliu el formulari i deseu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ompliu el formulari i deseu
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descarrega un informe amb totes les matèries primeres amb el seu estat últim inventari
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Davant
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fòrum de la comunitat
 DocType: Leave Application,Leave Balance Before Application,Leave Balance Before Application
 DocType: SMS Center,Send SMS,Enviar SMS
 DocType: Company,Default Letter Head,Per defecte Cap de la lletra
 DocType: Time Log,Billable,Facturable
 DocType: Authorization Rule,This will be used for setting rule in HR module,Això s'utilitza per ajustar la regla en el mòdul HR
 DocType: Account,Rate at which this tax is applied,Rati a la qual s'aplica aquest impost
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Quantitat per a generar comanda
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Quantitat per a generar comanda
 DocType: Company,Stock Adjustment Account,Compte d'Ajust d'estocs
 DocType: Journal Entry,Write Off,Cancel
 DocType: Time Log,Operation ID,Operació ID
@@ -2702,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Els camps de descompte estaran disponible a l'ordre de compra, rebut de compra, factura de compra"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom del nou compte. Nota: Si us plau no crear comptes de clients i proveïdors
 DocType: Report,Report Type,Tipus d'informe
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Carregant
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Carregant
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Replace Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,País savi defecte Plantilles de direcció
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Proveïdor lliura al Client
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mostrar impostos ruptura
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Les dades d'importació i exportació
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Si s'involucra en alguna fabricació. Activa 'es fabrica'
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Data de la factura d'enviament
 DocType: Sales Invoice,Rounded Total,Total Arrodonit
 DocType: Product Bundle,List items that form the package.,Llista d'articles que formen el paquet.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentatge d'assignació ha de ser igual a 100%
@@ -2718,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
 DocType: Company,Default Cash Account,Compte de Tresoreria predeterminat
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Quantitat pagada + s'amortitza La quantitat no pot ser més gran que la Gran Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no és un nombre de lot vàlida per Punt {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
@@ -2741,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Fila {0}: Quantitat no avalable a magatzem {1} del {2} {3}.
  Disponible Quantitat: {4}, Transfer Quantitat: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Article 3
+DocType: Purchase Order,Customer Contact Email,Client de correu electrònic de contacte
 DocType: Event,Sunday,Diumenge
 DocType: Sales Team,Contribution (%),Contribució (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: L'entrada de pagament no es crearà perquè no s'ha especificat 'Caixa o compte bancari"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitats
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Plantilla
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nom del venedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Si us plau, introdueixi almenys 1 factura a la taula"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Afegir usuaris
@@ -2754,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),Data d'inici real (a través
 DocType: Stock Reconciliation Item,Before reconciliation,Abans de la reconciliació
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos i Càrrecs Afegits (Divisa de la Companyia)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
 DocType: Sales Order,Partly Billed,Parcialment Facturat
 DocType: Item,Default BOM,BOM predeterminat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2762,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Viu total Amt
 DocType: Time Log Batch,Total Hours,Total d'hores
 DocType: Journal Entry,Printing Settings,Paràmetres d'impressió
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automòbil
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Les absències per al tipus {0} ja han estat assignades per Empleat {1} per a l'Any Fiscal {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Es requereix un article
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Emmotllament per injecció de metall
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,De la nota de lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De la nota de lliurament
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Missatge personalitzat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca d'Inversió
@@ -2784,10 +2796,10 @@ DocType: Newsletter,A Lead with this email id should exist,Hauria d'haver-hi un
 DocType: Stock Entry,From BOM,A partir de la llista de materials
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Bàsic
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operacions borsàries abans de {0} es congelen
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Per a la data ha de ser igual a partir de la data d'autorització de Medi Dia
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Per a la data ha de ser igual a partir de la data d'autorització de Medi Dia
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","per exemple kg, unitat, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data d'ingrés ha de ser major que la data de naixement
 DocType: Salary Structure,Salary Structure,Estructura salarial
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2795,7 +2807,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  conflicte mitjançant l'assignació de prioritat. Regles Preu: {0}"
 DocType: Account,Bank,Banc
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aerolínia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Per Magatzem
 DocType: Employee,Offer Date,Data d'Oferta
 DocType: Hub Settings,Access Token,Token d'accés
@@ -2818,6 +2830,7 @@ DocType: Issue,Opening Time,Temps d'obertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Des i Fins a la data sol·licitada
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
+DocType: Delivery Note Item,From Warehouse,De Magatzem
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforació
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,L'emmotllament per bufat
 DocType: Purchase Taxes and Charges,Valuation and Total,Valoració i total
@@ -2839,11 +2852,12 @@ DocType: C-Form,Amended From,Modificada Des de
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matèria Primera
 DocType: Leave Application,Follow via Email,Seguiu per correu electrònic
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma d'impostos Després del Descompte
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Compte Nen existeix per aquest compte. No es pot eliminar aquest compte.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Compte Nen existeix per aquest compte. No es pot eliminar aquest compte.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cal la Quantitat destí i la origen
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},No hi ha una llista de materials per defecte d'article {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Seleccioneu Data de comptabilització primer
-DocType: Leave Allocation,Carry Forward,Portar endavant
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No hi ha una llista de materials per defecte d'article {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Seleccioneu Data de comptabilització primer
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data d'obertura ha de ser abans de la data de Tancament
+DocType: Leave Control Panel,Carry Forward,Portar endavant
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centre de costos de les transaccions existents no es pot convertir en llibre major
 DocType: Department,Days for which Holidays are blocked for this department.,Dies de festa que estan bloquejats per aquest departament.
 ,Produced,Produït
@@ -2864,17 +2878,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
 DocType: Purchase Order,The date on which recurring order will be stop,La data en què s'aturarà la comanda recurrent
 DocType: Quality Inspection,Item Serial No,Número de sèrie d'article
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} ha de ser reduït per {1} o s'ha d'augmentar la tolerància de desbordament
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} ha de ser reduït per {1} o s'ha d'augmentar la tolerància de desbordament
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Present total
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialitzat article {0} no es pot actualitzar utilitzant \
  Stock Reconciliació"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transferència de material a proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferència de material a proveïdor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nou Nombre de sèrie no pot tenir Warehouse. Magatzem ha de ser ajustat per Stock entrada o rebut de compra
 DocType: Lead,Lead Type,Tipus de client potencial
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotització
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Tots aquests elements ja s'han facturat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tots aquests elements ja s'han facturat
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pot ser aprovat per {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condicions d'enviament
 DocType: BOM Replace Tool,The new BOM after replacement,La nova llista de materials després del reemplaçament
@@ -2922,7 +2936,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID Operació no estableix
 DocType: Production Order,Planned Start Date,Data d'inici prevista
 DocType: Serial No,Creation Document Type,Creació de tipus de document
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Visita
 DocType: Leave Type,Is Encash,És convertirà en efectiu
 DocType: Purchase Invoice,Mobile No,Número de Mòbil
 DocType: Payment Tool,Make Journal Entry,Feu entrada de diari
@@ -2930,7 +2944,7 @@ DocType: Leave Allocation,New Leaves Allocated,Noves absències Assignades
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
 DocType: Project,Expected End Date,Esperat Data de finalització
 DocType: Appraisal Template,Appraisal Template Title,Títol de plantilla d'avaluació
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Comercial
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Article Pare {0} no ha de ser un arxiu d'articles
 DocType: Cost Center,Distribution Id,ID de Distribució
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
@@ -2946,14 +2960,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor de l'atribut {0} ha d'estar dins del rang de {1} a {2} en els increments de {3}
 DocType: Tax Rule,Sales,Venda
 DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
+DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Per defecte Comptes per cobrar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Estat de facturació
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminació
 DocType: Item Reorder,Transfer,Transferència
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a (Empleat)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
@@ -2969,6 +2984,7 @@ DocType: Company,Retail,Venda al detall
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,El client {0} no existeix
 DocType: Attendance,Absent,Absent
 DocType: Product Bundle,Product Bundle,Bundle Producte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Aclaparadora
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Compra les taxes i càrrecs Plantilla
 DocType: Upload Attendance,Download Template,Descarregar plantilla
@@ -2976,16 +2992,16 @@ DocType: GL Entry,Remarks,Observacions
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Matèria Prima Codi de l'article
 DocType: Journal Entry,Write Off Based On,Anotació basada en
 DocType: Features Setup,POS View,POS Veure
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Registre d'instal·lació per a un nº de sèrie
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Registre d'instal·lació per a un nº de sèrie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,La colada contínua
-sites/assets/js/erpnext.min.js +10,Please specify a,"Si us plau, especifiqueu un"
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Si us plau, especifiqueu un"
 DocType: Offer Letter,Awaiting Response,Espera de la resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Per sobre de
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionament Freda
 DocType: Salary Slip,Earning & Deduction,Guanyar i Deducció
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,El Compte {0} no pot ser un grup
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regió
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
 DocType: Holiday List,Weekly Off,Setmanal Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per exemple, 2012, 2012-13"
@@ -3029,12 +3045,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Voluminós
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporatiu-model de fosa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Despeses d'Entreteniment
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} ha de ser cancel·lada abans de cancel·lar aquesta comanda de vendes
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Edat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} ha de ser cancel·lada abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Edat
 DocType: Time Log,Billing Amount,Facturació Monto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantitat no vàlid per a l'aricle {0}. Quantitat ha de ser major que 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Les sol·licituds de llicència.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Despeses legals
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El dia del mes en el qual l'ordre automàtic es generarà per exemple 05, 28, etc. "
 DocType: Sales Invoice,Posting Time,Temps d'enviament
@@ -3043,9 +3059,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccioneu aquesta opció si voleu obligar l'usuari a seleccionar una sèrie abans de desar. No hi haurà cap valor per defecte si marca aquesta.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},No Element amb Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Obrir Notificacions
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Obrir Notificacions
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Despeses directes
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,De veritat vol destapar aquesta Sol·licitud de material?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nous ingressos al Client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Despeses de viatge
 DocType: Maintenance Visit,Breakdown,Breakdown
@@ -3056,7 +3071,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Com en la data
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Esmolant
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
 DocType: Feed,Full Name,Nom complet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Reblat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
@@ -3079,7 +3094,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Afegir files pe
 DocType: Buying Settings,Default Supplier Type,Tipus predeterminat de Proveïdor
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracció
 DocType: Production Order,Total Operating Cost,Cost total de funcionament
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tots els contactes.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de l'empresa
@@ -3103,11 +3118,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotitza
 DocType: Stock Settings,Role Allowed to edit frozen stock,Paper animals d'editar estoc congelat
 ,Territory Target Variance Item Group-Wise,Territori de destinació Variància element de grup-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tots els Grups de clients
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Plantilla d'impostos és obligatori.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de preus (en la moneda de la companyia)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',"{0} {1} L'Estat és ""Aturat '"
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Preferit Direcció de facturació
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentatge d'Assignació
@@ -3125,13 +3139,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detall d'impostos de to
 DocType: Purchase Order Item,Supplier Quotation,Cita Proveïdor
 DocType: Quotation,In Words will be visible once you save the Quotation.,En paraules seran visibles un cop que es guarda la Cotització.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planxat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} està aturat
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} està aturat
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
 DocType: Lead,Add to calendar on this date,Afegir al calendari en aquesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regles per afegir les despeses d'enviament.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Pròxims esdeveniments
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pròxims esdeveniments
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Es requereix client
 DocType: Letter Head,Letter Head,Capçalera de la carta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada ràpida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} és obligatori per a la Tornada
 DocType: Purchase Order,To Receive,Rebre
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink apropiat
@@ -3155,25 +3170,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
 DocType: Serial No,Out of Warranty,Fora de la Garantia
 DocType: BOM Replace Tool,Replace,Reemplaçar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Si us plau ingressi Unitat de mesura per defecte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Si us plau ingressi Unitat de mesura per defecte
 DocType: Purchase Invoice Item,Project Name,Nom del projecte
 DocType: Supplier,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
 DocType: Workflow State,Edit,Edita
 DocType: Journal Entry Account,If Income or Expense,Si ingressos o despeses
 DocType: Features Setup,Item Batch Nos,Números de Lot d'articles
 DocType: Stock Ledger Entry,Stock Value Difference,Diferència del valor d'estoc
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Recursos Humans
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Recursos Humans
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Payment Reconciliation Payment
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Actius per impostos
 DocType: BOM Item,BOM No,No BOM
 DocType: Contact Us Settings,Pincode,Codi PIN
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Seient {0} no té compte {1} o ja compara amb un altre bo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Seient {0} no té compte {1} o ja compara amb un altre bo
 DocType: Item,Moving Average,Mitjana Mòbil
 DocType: BOM Replace Tool,The BOM which will be replaced,Llista de materials que serà substituïda
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nou Stock UOM ha de ser diferent de l'actual de les accions UOM
 DocType: Account,Debit,Dèbit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Les fulles han de ser assignats en múltiples de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Les fulles han de ser assignats en múltiples de 0,5"
 DocType: Production Order,Operation Cost,Cost d'operació
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Puja l'assistència d'un arxiu .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Excel·lent Amt
@@ -3181,7 +3196,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establi
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Per assignar aquest problema, utilitzeu el botó ""Assignar"" a la barra lateral."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congela els estocs més vells de [dies]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o més regles de preus es troben basats en les condicions anteriors, s'aplica Prioritat. La prioritat és un nombre entre 0 a 20 mentre que el valor per defecte és zero (en blanc). Un nombre més alt significa que va a prevaler si hi ha diverses regles de preus amb mateixes condicions."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Contra Factura
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Any fiscal: {0} no existeix
 DocType: Currency Exchange,To Currency,Per moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Deixi els següents usuaris per aprovar sol·licituds de llicència per a diversos dies de bloc.
@@ -3210,7 +3224,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tarif
 DocType: Stock Entry Detail,Additional Cost,Cost addicional
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data de finalització de l'exercici fiscal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Fer Oferta de Proveïdor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Fer Oferta de Proveïdor
 DocType: Quality Inspection,Incoming,Entrant
 DocType: BOM,Materials Required (Exploded),Materials necessaris (explotat)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduir el guany per absències sense sou (LWP)
@@ -3218,10 +3232,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: Nombre de sèrie {1} no coincideix amb {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Deixar Casual
 DocType: Batch,Batch ID,Identificació de lots
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota: {0}
 ,Delivery Note Trends,Nota de lliurament Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resum de la setmana
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ha de ser un article de compra o de subcontractació a la fila {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ha de ser un article de compra o de subcontractació a la fila {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,El compte: {0} només pot ser actualitzat a través de transaccions d'estoc
 DocType: GL Entry,Party,Party
 DocType: Sales Order,Delivery Date,Data De Lliurament
@@ -3234,7 +3248,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,T
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Quota de compra mitja
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
 DocType: Employee,History In Company,Història a la Companyia
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Butlletins
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Butlletins
 DocType: Address,Shipping,Enviament
 DocType: Stock Ledger Entry,Stock Ledger Entry,Ledger entrada Stock
 DocType: Department,Leave Block List,Deixa Llista de bloqueig
@@ -3253,7 +3267,7 @@ DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Data de finalització del període de l'ordre actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Fer una Oferta Carta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorn
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Unitat de mesura per defecte per a la variant ha de ser la mateixa que la plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unitat de mesura per defecte per a la variant ha de ser la mateixa que la plantilla
 DocType: DocField,Fold,fold
 DocType: Production Order Operation,Production Order Operation,Ordre de Producció Operació
 DocType: Pricing Rule,Disable,Desactiva
@@ -3285,7 +3299,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Informes a
 DocType: SMS Settings,Enter url parameter for receiver nos,Introdueix els paràmetres URL per als receptors
 DocType: Sales Invoice,Paid Amount,Quantitat pagada
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',El Compte de tancament {0} ha de ser del tipus 'responsabilitat'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',El Compte de tancament {0} ha de ser del tipus 'responsabilitat'
 ,Available Stock for Packing Items,Estoc disponible per articles d'embalatge
 DocType: Item Variant,Item Variant,Article Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,En establir aquesta plantilla de direcció per defecte ja que no hi ha altre defecte
@@ -3293,7 +3307,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestió de la Qualitat
 DocType: Production Planning Tool,Filter based on customer,Filtre basat en el client
 DocType: Payment Tool Detail,Against Voucher No,Contra el comprovant número
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0}
 DocType: Employee External Work History,Employee External Work History,Historial de treball d'Empleat extern
 DocType: Tax Rule,Purchase,Compra
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Saldo Quantitat
@@ -3330,28 +3344,29 @@ Note: BOM = Bill of Materials","Grup Global de l'** ** Els productes que en
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Nombre de sèrie és obligatòria per Punt {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Si us plau, especifiqui des de / fins oscil·lar"
-sites/assets/js/desk.min.js +7652,Created By,Creat per
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creat per
 DocType: Serial No,Under AMC,Sota AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,La taxa de valorització de l'article es torna a calcular tenint en compte landed cost voucher amount
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Ajustos predeterminats per a les transaccions de venda
 DocType: BOM Replace Tool,Current BOM,BOM actual
-sites/assets/js/erpnext.min.js +8,Add Serial No,Afegir Número de sèrie
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Afegir Número de sèrie
 DocType: Production Order,Warehouses,Magatzems
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimir i Papereria
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
 DocType: Payment Reconciliation,Minimum Amount,Quantitat mínima
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualitzar Productes Acabats
 DocType: Workstation,per hour,per hores
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},La sèrie {0} ja s'utilitza a {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},La sèrie {0} ja s'utilitza a {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Es crearà un Compte per al magatzem (Inventari Permanent) en aquest Compte
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,El Magatzem no es pot eliminar perquè hi ha entrades al llibre major d'existències d'aquest magatzem.
 DocType: Company,Distribution,Distribució
-sites/assets/js/erpnext.min.js +50,Amount Paid,Quantitat pagada
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Quantitat pagada
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despatx
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}%
 DocType: Customer,Default Taxes and Charges,Impostos i Càrrecs per defecte
 DocType: Account,Receivable,Compte per cobrar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No es permet canviar de proveïdors com l'Ordre de Compra ja existeix
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol al que es permet presentar les transaccions que excedeixin els límits de crèdit establerts.
 DocType: Sales Invoice,Supplier Reference,Referència Proveïdor
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material."
@@ -3388,8 +3403,8 @@ DocType: Email Digest,Add/Remove Recipients,Afegir / Treure Destinataris
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},No es permet la transacció cap a l'ordre de producció aturada {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per establir aquest any fiscal predeterminat, feu clic a ""Estableix com a predeterminat"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuració del servidor d'entrada per l'id de suport per correu electrònic. (Per exemple support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Hi ha la variant d'article {0} amb mateixos atributs
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Quantitat escassetat
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Hi ha la variant d'article {0} amb mateixos atributs
 DocType: Salary Slip,Salary Slip,Slip Salari
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunyit
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Per Dóna't' es requereix
@@ -3402,6 +3417,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quan es ""Presenta"" alguna de les operacions marcades, s'obre automàticament un correu electrònic emergent per enviar un correu electrònic al ""Contacte"" associat a aquesta transacció, amb la transacció com un arxiu adjunt. L'usuari pot decidir enviar, o no, el correu electrònic."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuració global
 DocType: Employee Education,Employee Education,Formació Empleat
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l'article.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Compte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Nombre de sèrie {0} ja s'ha rebut
@@ -3434,7 +3450,7 @@ DocType: BOM,Manufacturing User,Usuari de fabricació
 DocType: Purchase Order,Raw Materials Supplied,Matèries primeres subministrades
 DocType: Purchase Invoice,Recurring Print Format,Recurrent Format d'impressió
 DocType: Communication,Series,Sèrie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Data prevista de lliurament no pot ser anterior a l'Ordre de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Data prevista de lliurament no pot ser anterior a l'Ordre de Compra
 DocType: Appraisal,Appraisal Template,Plantilla d'Avaluació
 DocType: Communication,Email,Correu electrònic
 DocType: Item Group,Item Classification,Classificació d'articles
@@ -3490,6 +3506,7 @@ DocType: HR Settings,Payroll Settings,Ajustaments de Nòmines
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Coincideixen amb les factures i pagaments no vinculats.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Poseu l'ordre
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root no pot tenir un centre de costos pares
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Seleccioneu una marca ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Temps de funcionament ha de ser major que 0 per a l'operació {0}
 DocType: Supplier,Address and Contacts,Direcció i contactes
@@ -3500,7 +3517,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Get Outstanding Vouchers
 DocType: Warranty Claim,Resolved By,Resolta Per
 DocType: Appraisal,Start Date,Data De Inici
-sites/assets/js/desk.min.js +7629,Value,Valor
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Assignar absències per un període.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Fes clic aquí per verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Compte {0}: No es pot assignar com compte principal
@@ -3516,14 +3533,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Access Allowed
 DocType: Dropbox Backup,Weekly,Setmanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Rebre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Rebre
 DocType: Maintenance Visit,Fully Completed,Totalment Acabat
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complet
 DocType: Employee,Educational Qualification,Capacitació per a l'Educació
 DocType: Workstation,Operating Costs,Costos Operatius
 DocType: Employee Leave Approver,Employee Leave Approver,Empleat Deixar aprovador
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha estat afegit amb èxit al llistat de Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanitzat per feix d'electrons
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Administraodr principal de compres
@@ -3536,7 +3553,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Afegeix / Edita Preus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Gràfic de centres de cost
 ,Requested Items To Be Ordered,Articles sol·licitats serà condemnada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Les meves comandes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Les meves comandes
 DocType: Price List,Price List Name,nom de la llista de preus
 DocType: Time Log,For Manufacturing,Per Manufactura
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totals
@@ -3547,7 +3564,7 @@ DocType: Account,Income,Ingressos
 DocType: Industry Type,Industry Type,Tipus d'Indústria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Quelcom ha fallat!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data d'acabament
 DocType: Purchase Invoice Item,Amount (Company Currency),Import (Companyia moneda)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fosa a pressió
@@ -3561,10 +3578,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Any
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Punt de Venda Perfil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Actualitza Ajustaments SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Hora de registre {0} ja facturat
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Hora de registre {0} ja facturat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Préstecs sense garantia
 DocType: Cost Center,Cost Center Name,Nom del centre de cost
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,L'article {0} amb número de sèrie {1} ja està instal·lat
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Prevista
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total pagat Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Els missatges de més de 160 caràcters es divideixen en diversos missatges
@@ -3572,10 +3588,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Rebut i acceptat
 ,Serial No Service Contract Expiry,Número de sèrie del contracte de venciment del servei
 DocType: Item,Unit of Measure Conversion,Unitat de conversió de la mesura
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleat no es pot canviar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Permissió de superació {0} superat per l'article {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Permissió de superació {0} superat per l'article {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nom de la persona o organització a la que pertany aquesta direcció.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Els seus Proveïdors
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
@@ -3586,10 +3602,11 @@ DocType: Lead,Converted,Convertit
 DocType: Item,Has Serial No,No té de sèrie
 DocType: Employee,Date of Issue,Data d'emissió
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Des {0} de {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l'element {1}
 DocType: Issue,Content Type,Tipus de Contingut
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Ordinador
 DocType: Item,List this Item in multiple groups on the website.,Fes una llista d'articles en diversos grups en el lloc web.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l'opció Multi moneda per permetre comptes amb una altra moneda"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l'opció Multi moneda per permetre comptes amb una altra moneda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Aconsegueix entrades no reconciliades
@@ -3600,14 +3617,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Magatzem destí
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Compte {0} s'ha introduït més d'una vegada per a l'any fiscal {1}
 ,Average Commission Rate,Comissió de Tarifes mitjana
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
 DocType: Pricing Rule,Pricing Rule Help,Ajuda de la Regla de preus
 DocType: Purchase Taxes and Charges,Account Head,Cap Compte
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualització dels costos addicionals per al càlcul del preu al desembarcament d'articles
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elèctric
 DocType: Stock Entry,Total Value Difference (Out - In),Diferència Total Valor (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID d'usuari no entrat per l'Empleat {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De reclam de garantia
@@ -3621,15 +3638,17 @@ DocType: Buying Settings,Naming Series,Sèrie de nomenclatura
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
 DocType: User,Enabled,Activat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actius
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Realment vols presentar totes les nòmines del mes {0} i any {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Realment vols presentar totes les nòmines del mes {0} i any {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Els subscriptors d'importació
 DocType: Target Detail,Target Qty,Objectiu Quantitat
 DocType: Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La Nota de lliurament {0} no es pot presentar
 DocType: Notification Control,Sales Invoice Message,Missatge de Factura de vendes
 DocType: Authorization Rule,Based On,Basat en
-,Ordered Qty,Quantitat demanada
+DocType: Sales Order Item,Ordered Qty,Quantitat demanada
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Article {0} està deshabilitat
 DocType: Stock Settings,Stock Frozen Upto,Estoc bloquejat fins a
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Període Des i Període Per dates obligatòries per als recurrents {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitat del projecte / tasca.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generar Salari Slips
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} no és un correu electrònicvàlid
@@ -3669,7 +3688,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Pujar Assistència
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Llista de materials i de fabricació es requereixen Quantitat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rang 2 Envelliment
-DocType: Journal Entry Account,Amount,Quantitat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Quantitat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Reblat
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM reemplaçat
 ,Sales Analytics,Analytics de venda
@@ -3696,7 +3715,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista no pot ser anterior material Data de sol·licitud
 DocType: Contact Us Settings,City,Ciutat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Mecanitzat per ultrasons
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Error: No és un document d'identitat vàlid?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Error: No és un document d'identitat vàlid?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,L'Article {0} ha de ser un article de Vendes
 DocType: Naming Series,Update Series Number,Actualització Nombre Sèries
 DocType: Account,Equity,Equitat
@@ -3711,7 +3730,7 @@ DocType: Purchase Taxes and Charges,Actual,Reial
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descompte
 DocType: Purchase Invoice,Against Expense Account,Contra el Compte de Despeses
 DocType: Production Order,Production Order,Ordre de Producció
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
 DocType: Quotation Item,Against Docname,Contra DocName
 DocType: SMS Center,All Employee (Active),Tot Empleat (Actiu)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Veure ara
@@ -3719,14 +3738,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Matèria primera Cost
 DocType: Item,Re-Order Level,Re-Order Nivell
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduïu articles i Quantitat prevista per a les que desitja elevar les ordres de producció o descàrrega de matèries primeres per a la seva anàlisi.
-sites/assets/js/list.min.js +174,Gantt Chart,Diagrama de Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama de Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Temps parcial
 DocType: Employee,Applicable Holiday List,Llista de vacances aplicable
 DocType: Employee,Cheque,Xec
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sèries Actualitzat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipus d'informe és obligatori
 DocType: Item,Serial Number Series,Nombre de sèrie de la sèrie
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},El magatzem és obligatòria per l'article d'estoc {0} a la fila {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El magatzem és obligatòria per l'article d'estoc {0} a la fila {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
 DocType: Issue,First Responded On,Primer respost el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Creu Fitxa d'article en diversos grups
@@ -3741,7 +3760,7 @@ DocType: Attendance,Attendance,Assistència
 DocType: Page,No,No
 DocType: BOM,Materials,Materials
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no està habilitada, la llista haurà de ser afegit a cada departament en què s'ha d'aplicar."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Plantilla d'Impostos per a les transaccions de compres
 ,Item Prices,Preus de l'article
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,En paraules seran visibles un cop que es guardi l'ordre de compra.
@@ -3761,9 +3780,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despeses d'Administració
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Pares Grup de Clients
-sites/assets/js/erpnext.min.js +50,Change,Canvi
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Canvi
 DocType: Purchase Invoice,Contact Email,Correu electrònic de contacte
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',"Ordre de Compra {0} està ""Detingut '"
 DocType: Appraisal Goal,Score Earned,Score Earned
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","per exemple ""El meu Company LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Període de Notificació
@@ -3773,12 +3791,13 @@ DocType: Packing Slip,Gross Weight UOM,Pes brut UDM
 DocType: Email Digest,Receivables / Payables,Cobrar / pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Compte de Crèdit
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost article
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostra valors zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantitat de punt obtingut després de la fabricació / reempaque de determinades quantitats de matèries primeres
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte de cobrament / pagament
 DocType: Delivery Note Item,Against Sales Order Item,Contra l'Ordre de Venda d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l'atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l'atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 DocType: Task,Actual End Date (via Time Logs),Actual Data de finalització (a través dels registres de temps)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
@@ -3792,7 +3811,7 @@ DocType: Issue,Support Team,Equip de suport
 DocType: Appraisal,Total Score (Out of 5),Puntuació total (de 5)
 DocType: Contact Us Settings,State,Estat
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Equilibri
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Equilibri
 DocType: Project,Total Expense Claim (via Expense Claims),Reclamació de Despeses totals (a través de reclamacions de despeses)
 DocType: User,Gender,Gènere
 DocType: Journal Entry,Debit Note,Nota de Dèbit
@@ -3808,9 +3827,8 @@ DocType: Lead,Blog Subscriber,Bloc subscriptor
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear regles per restringir les transaccions basades en valors.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si es marca, número total. de dies de treball s'inclouran els festius, i això reduirà el valor de Salari per dia"
 DocType: Purchase Invoice,Total Advance,Avanç total
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Desbloqueja la sol·licitud material
 DocType: Workflow State,User,Usuari
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Processament de Nòmina
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processament de Nòmina
 DocType: Opportunity Item,Basic Rate,Tarifa Bàsica
 DocType: GL Entry,Credit Amount,Suma de crèdit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Establir com a Perdut
@@ -3818,7 +3836,7 @@ DocType: Customer,Credit Days Based On,Dies crèdit basat en
 DocType: Tax Rule,Tax Rule,Regla Fiscal
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantenir la mateixa tarifa durant tot el cicle de vendes
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planegi registres de temps fora de les hores de treball Estació de treball.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} ja s'ha presentat
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ja s'ha presentat
 ,Items To Be Requested,Articles que s'han de demanar
 DocType: Purchase Order,Get Last Purchase Rate,Obtenir Darrera Tarifa de compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Facturació Tarifa basada en Tipus d'activitat (per hora)
@@ -3827,6 +3845,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID de correu electrònic de l'empresa no trobat, per tant, no s'ha enviat el correu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicació de Fons (Actius)
 DocType: Production Planning Tool,Filter based on item,Filtre basada en l'apartat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Compte Dèbit
 DocType: Fiscal Year,Year Start Date,Any Data d'Inici
 DocType: Attendance,Employee Name,Nom de l'Empleat
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arrodonit (en la divisa de la companyia)
@@ -3838,14 +3857,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supressió
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficis als empleats
 DocType: Sales Invoice,Is POS,És TPV
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
 DocType: Production Order,Manufactured Qty,Quantitat fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantitat Acceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existeix
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factures enviades als clients.
 DocType: DocField,Default,Defecte
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificació del projecte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l'espera Monto al Compte de despeses de {1}. A l'espera de Monto és {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l'espera Monto al Compte de despeses de {1}. A l'espera de Monto és {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonats afegir
 DocType: Maintenance Schedule,Schedule,Horari
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir Pressupost per a aquest centre de cost. Per configurar l'acció de pressupost, vegeu "Llista de l'Empresa""
@@ -3853,7 +3872,7 @@ DocType: Account,Parent Account,Compte primària
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Cub
 DocType: GL Entry,Voucher Type,Tipus de Vals
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
 DocType: Expense Claim,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
@@ -3862,23 +3881,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Educació
 DocType: Selling Settings,Campaign Naming By,Naming de Campanya Per
 DocType: Employee,Current Address Is,L'adreça actual és
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcional. Estableix moneda per defecte de l'empresa, si no s'especifica."
 DocType: Address,Office,Oficina
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes estàndard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entrades de diari de Comptabilitat.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Seleccioneu Employee Record primer.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Fila {0}: Festa / Compte no coincideix amb {1} / {2} en {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantitat a partir de Magatzem
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Seleccioneu Employee Record primer.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Fila {0}: Festa / Compte no coincideix amb {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Per crear un compte d'impostos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Si us plau ingressi Compte de Despeses
 DocType: Account,Stock,Estoc
 DocType: Employee,Current Address,Adreça actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article és una variant d'un altre article llavors descripció, imatges, preus, impostos etc s'establirà a partir de la plantilla a menys que s'especifiqui explícitament"
 DocType: Serial No,Purchase / Manufacture Details,Compra / Detalls de Fabricació
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Inventari de lots
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inventari de lots
 DocType: Employee,Contract End Date,Data de finalització de contracte
 DocType: Sales Order,Track this Sales Order against any Project,Seguir aquesta Ordre Vendes cap algun projecte
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Ordres de venda i halar (pendent d'entregar) basat en els criteris anteriors
 DocType: DocShare,Document Type,Tipus de document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Oferta de Proveïdor
 DocType: Deduction Type,Deduction Type,Tipus Deducció
 DocType: Attendance,Half Day,Medi Dia
 DocType: Pricing Rule,Min Qty,Quantitat mínima
@@ -3889,20 +3910,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Per Quantitat (Fabricat Quantitat) és obligatori
 DocType: Stock Entry,Default Target Warehouse,Magatzem de destí predeterminat
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (En la moneda de la Companyia)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: Partit Tipus i Partit és aplicable únicament contra el compte de cobrament / pagament
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: Partit Tipus i Partit és aplicable únicament contra el compte de cobrament / pagament
 DocType: Notification Control,Purchase Receipt Message,Rebut de Compra Missatge
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de fulles assignats més de període
 DocType: Production Order,Actual Start Date,Data d'inici real
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materials lliurats d'aquesta Ordre de Venda
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Desa el Moviment d'article
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Desa el Moviment d'article
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Llista de subscriptors al butlletí
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar
 DocType: Email Account,Service,Servei
 DocType: Hub Settings,Hub Settings,Ajustaments Hub
 DocType: Project,Gross Margin %,Marge Brut%
 DocType: BOM,With Operations,Amb Operacions
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s'han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s'han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
 ,Monthly Salary Register,Registre de Salari mensual
-apps/frappe/frappe/website/template.py +123,Next,Següent
+apps/frappe/frappe/website/template.py +140,Next,Següent
 DocType: Warranty Claim,If different than customer address,Si és diferent de la direcció del client
 DocType: BOM Operation,BOM Operation,BOM Operació
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,El electropolit
@@ -3933,6 +3955,7 @@ DocType: Purchase Invoice,Next Date,Següent Data
 DocType: Employee Education,Major/Optional Subjects,Major/Optional Subjects
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Entra les taxes i càrrecs
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Conreu
+DocType: Sales Invoice Item,Drop Ship,Nau de la gota
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí pot mantenir els detalls de la família com el nom i ocupació dels pares, cònjuge i fills"
 DocType: Hub Settings,Seller Name,Nom del venedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos i despeses deduïdes (Companyia moneda)
@@ -3959,29 +3982,29 @@ DocType: Purchase Order,To Receive and Bill,Per Rebre i Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Dissenyador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantilla de Termes i Condicions
 DocType: Serial No,Delivery Details,Detalls del lliurament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Creació automàtica de sol·licitud de materials si la quantitat és inferior a aquest nivell
 ,Item-wise Purchase Register,Registre de compra d'articles
 DocType: Batch,Expiry Date,Data De Caducitat
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per establir el nivell de comanda, article ha de ser un article de compra o fabricació d'articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per establir el nivell de comanda, article ha de ser un article de compra o fabricació d'articles"
 ,Supplier Addresses and Contacts,Adreces i contactes dels proveïdors
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Si us plau, Selecciona primer la Categoria"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projecte mestre.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No mostrar qualsevol símbol com $ etc costat de monedes.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Mig dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Mig dia)
 DocType: Supplier,Credit Days,Dies de Crèdit
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtenir elements de la llista de materials
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Temps de Lliurament Dies
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Llista de materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partit Tipus i Partit es requereix per al compte per cobrar / pagar {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partit Tipus i Partit es requereix per al compte per cobrar / pagar {1}
 DocType: Dropbox Backup,Send Notifications To,Enviar notificacions a
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Raons per deixar el
 DocType: Expense Claim Detail,Sanctioned Amount,Sanctioned Amount
 DocType: GL Entry,Is Opening,Està obrint
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,El compte {0} no existeix
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,El compte {0} no existeix
 DocType: Account,Cash,Efectiu
 DocType: Employee,Short biography for website and other publications.,Breu biografia de la pàgina web i altres publicacions.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Si us plau, creu Estructura salarial per als empleats {0}"
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 7afd1b3688..419cb24279 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Mode Plat
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vyberte měsíční výplatou, pokud chcete sledovat na základě sezónnosti."
 DocType: Employee,Divorced,Rozvedený
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Upozornění: Stejné položky byl zadán vícekrát.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozornění: Stejné položky byl zadán vícekrát.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Položky již synchronizovat
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povolit položky, které se přidávají vícekrát v transakci"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zhutňování a spékání
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Z materiálu Poptávka
+DocType: Purchase Order,Customer Contact,Kontakt se zákazníky
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Z materiálu Poptávka
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Jméno zákazníka
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Všech oblastech souvisejících vývozní jako měnu, přepočítacího koeficientu, export celkem, export celkovém součtu etc jsou k dispozici v dodací list, POS, citace, prodejní faktury, prodejní objednávky atd"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (nebo skupiny), proti nimž účetní zápisy jsou vyrobeny a stav je veden."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
 DocType: Manufacturing Settings,Default 10 mins,Výchozí 10 min
 DocType: Leave Type,Leave Type Name,Jméno typu absence
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Řada Aktualizováno Úspěšně
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Více ceny položku.
 DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
 DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Očekávané Datum ukončení nemůže být nižší, než se očekávalo data zahájení"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Opravdu chcete uvolnit výrobní zakázky: 
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Řádek # {0}: Cena musí být stejné, jako {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,New Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Leave Application
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Zobrazit Varia
 DocType: Sales Invoice Item,Quantity,Množství
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
-sites/assets/js/erpnext.min.js +27,In Stock,Na skladě
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Lze provést pouze platbu proti nevyfakturované zakázky odběratele
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na skladě
 DocType: Designation,Designation,Označení
 DocType: Production Plan Item,Production Plan Item,Výrobní program Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Proveďte nové POS profil
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Péče o zdraví
 DocType: Purchase Invoice,Monthly,Měsíčně
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faktura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zpoždění s platbou (dny)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mailová adresa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Řádek č. {0}:
 DocType: Delivery Note,Vehicle No,Vozidle
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Prosím, vyberte Ceník"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Prosím, vyberte Ceník"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Zpracování dřeva
 DocType: Production Order Operation,Work In Progress,Work in Progress
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D tisk
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otevření o zaměstnání.
 DocType: Item Attribute,Increment,Přírůstek
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Vyberte Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklama
 DocType: Employee,Married,Ženatý
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 DocType: Payment Reconciliation,Reconcile,Srovnat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Proveďte Bank Vstup
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Proveďte Bank Vstup
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Penzijní fondy
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Odepsat nákladové středisko
 DocType: Warehouse,Warehouse Detail,Sklad Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Daňové Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
 DocType: Item,Item Image (if not slideshow),Item Image (ne-li slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Zákazník existuje se stejným názvem
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodina Rate / 60) * Skutečná Provozní doba
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Host
 DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
 DocType: Lead,Interested,Zájemci
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of materiálu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvor
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopírovat z bodu Group
 DocType: Journal Entry,Opening Entry,Otevření Entry
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Dotaz Product
 DocType: Standard Reply,Owner,Majitel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosím, nejprave zadejte společnost"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Prosím, vyberte první firma"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Prosím, vyberte první firma"
 DocType: Employee Education,Under Graduate,Za absolventa
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Spotřební
 DocType: Upload Attendance,Import Log,Záznam importu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Odeslat
+DocType: Sales Invoice Item,Delivered By Supplier,Dodává se podle dodavatele
 DocType: SMS Center,All Contact,Vše Kontakt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Roční Plat
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Záznamy
 DocType: Journal Entry Account,Credit in Company Currency,Úvěrové společnosti v měně
 DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
 DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pro nákup
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Bod {0} musí být Nákup položky
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
  Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bude aktualizováno po odeslání faktury.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavení pro HR modul
 DocType: SMS Center,SMS Center,SMS centrum
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rovnací
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Zadejte url parametr zprá
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Pravidla pro používání cen a slevy.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Tentokrát se Přihlásit konflikty s {0} na {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Sleva na Ceník Rate (%)
-sites/assets/js/form.min.js +279,Start,Start
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Křestní jméno
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Nastavení je dokončeno. Aktualizuji.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Lití Full-forma
 DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmínky
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
 DocType: Lead,Address & Contact,Adresa a kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,Přidat nevyužité listy z předchozích přídělů
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
 DocType: Newsletter List,Total Subscribers,Celkem Odběratelé
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Jméno
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Pending Množství
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double bydlení
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Listy za rok
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Prosím nastavte Pojmenování Series pro {0} přes Nastavení> Nastavení> Naming Série
 DocType: Time Log,Will be updated when batched.,Bude aktualizována při dávkově.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
 DocType: Bulk Email,Message,Zpráva
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Absence blokována
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Item,Publish in Hub,Publikovat v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebyl nalezen v "suroviny dodané" tabulky v objednávce {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Oznámení Control
 DocType: Lead,Suggestions,Návrhy
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Položka Skupina-moudrý rozpočty na tomto území. Můžete také sezónnosti nastavením distribuce.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Prosím, zadejte mateřskou skupinu účtu pro sklad {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemůže být větší než dlužné částky {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemůže být větší než dlužné částky {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generování plán
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nových akcií UOM
 DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
 DocType: Employee,External Work History,Vnější práce History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kruhové Referenční Chyba
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,"Opravdu chcete, aby STOP "
 DocType: Communication,Closed,Zavřeno
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Jste si jisti, že chcete zastavit"
 DocType: Lead,Industry,Průmysl
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Newsletter
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Dodací list
 DocType: Dropbox Backup,Allow Dropbox Access,Povolit přístup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Nastavení Daně
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Shrnutí pro tento týden a probíhajícím činnostem
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vyberte měsíc a rok
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu zákazníka"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","K dispozici v BOM, dodací list, fakturu, výrobní zakázky, objednávky, doklad o koupi, prodejní faktury odběratele, Stock vstupu, časový rozvrh"
 DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Select Položka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Select Položka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
  Stock usmíření, použijte Reklamní Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí být stejné, jako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Převést na non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Příjmka musí být odeslána
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Current Reklamní UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (lot) položky.
 DocType: C-Form Invoice Detail,Invoice Date,Datum Fakturace
 DocType: GL Entry,Debit Amount,Debetní Částka
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Tam může být pouze 1 účet na společnosti v {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tam může být pouze 1 účet na společnosti v {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaše e-mailová adresa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Přijaté
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
 DocType: Maintenance Visit,Maintenance Type,Typ Maintenance
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Položka Kontrola jakosti Parametr
 DocType: Leave Application,Leave Approver Name,Jméno schvalovatele absence
 ,Schedule Date,Plán Datum
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Nákup Register
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
 DocType: Workstation,Consumable Cost,Spotřební Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
 DocType: Purchase Receipt,Vehicle Date,Datum Vehicle
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Lékařský
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Důvod ztráty
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% Instalováno
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Prosím, zadejte nejprve název společnosti"
 DocType: BOM,Item Desription,Položka Desription
 DocType: Purchase Invoice,Supplier Name,Dodavatel Name
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Přečtěte si ERPNext Manuál
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaticky nastavit sériových čísel na základě FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Zkontrolujte, zda dodavatelské faktury Počet Jedinečnost"
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales manažer ve
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday master.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell lití
 DocType: Material Request Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Doba mezi oper
 DocType: Customer,Buyer of Goods and Services.,Kupující zboží a služeb.
 DocType: Journal Entry,Accounts Payable,Účty za úplatu
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Přidat předplatitelé
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" Neexistuje"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Neexistuje"
 DocType: Pricing Rule,Valid Upto,Valid aľ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Přímý příjmů
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Správní ředitel
 DocType: Payment Tool,Received Or Paid,Přijaté nebo placené
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Prosím, vyberte Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Prosím, vyberte Company"
 DocType: Stock Entry,Difference Account,Rozdíl účtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nelze zavřít úkol, jak jeho závislý úkol {0} není uzavřen."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
 DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Communication,Subject,Předmět
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 ,Serial No Warranty Expiry,Pořadové č záruční lhůty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Opravdu chcete zastavit tento materiál požadavek?
 DocType: Sales Order,To Deliver,Dodat
 DocType: Purchase Invoice Item,Item,Položka
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Správa Subdodávky
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Správa Subdodávky
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM NESMÍ být typu celé číslo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Nábytek
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou je ceníková měna převedena na základní měnu společnosti "
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a
 DocType: Purchase Invoice,Supplier Invoice No,Dodavatelské faktury č
 DocType: Territory,For reference,Pro srovnání
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nelze odstranit Pořadové číslo {0}, který se používá na skladě transakcích"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Uzavření (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Uzavření (Cr)
 DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 ,Pending Qty,Čekající Množství
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,Fakturace a Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Předchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vyberte prodejní objednávky, ze kterého chcete vytvořit výrobní zakázky."
+DocType: Item,Delivered by Supplier (Drop Ship),Dodává Dodavatelem (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Mzdové složky.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Databáze zákazníků.
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
 DocType: Event,Wednesday,Středa
 DocType: Sales Invoice,Customer's Vendor,Prodejce zákazníka
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Výrobní zakázka je povinné
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založeno Na"" a ""Seskupeno Podle"", nemůže být stejné"
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
-sites/assets/js/form.min.js +271,To,na
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Zadejte e-mailovou adresu
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,na
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Zadejte e-mailovou adresu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Konec trubice tvořící
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,Projekty uživatele
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Spotřeba
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
 DocType: Company,Round Off Cost Center,Zaokrouhlovací nákladové středisko
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Material Request,Material Transfer,Přesun materiálu
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Časová značka zadání musí být po {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Nastavení
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky
 DocType: Production Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Provozní doba
-sites/assets/js/list.min.js +5,More,Více
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Více
 DocType: Pricing Rule,Sales Manager,Manažer prodeje
-sites/assets/js/desk.min.js +7673,Rename,Přejmenovat
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Přejmenovat
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Ohýbání
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Umožňuje uživateli
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight stříhání
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumentů na základě jejich sériových čísel. To je možné také použít ke sledování detailů produktu záruční.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 DocType: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
 DocType: Hub Settings,Seller City,Prodejce City
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Nabídka Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Reklamní Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Vítejte
 DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Úkol Předmět
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Zboží od dodavatelů.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Zboží od dodavatelů.
 DocType: Communication,Open,Otevřít
 DocType: Lead,Campaign Name,Název kampaně
 ,Reserved,Rezervováno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,"Opravdu chcete, aby uvolnit"
 DocType: Purchase Order,Supply Raw Materials,Dodávek surovin
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Oběžná aktiva
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Employee,Cell Number,Číslo buňky
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Měsíční plat prohlášení.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Odpovědnost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.
 DocType: Company,Default Cost of Goods Sold Account,Výchozí Náklady na prodané zboží účtu
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Ceník není zvolen
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Process Payroll,Send Email,Odeslat email
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemáte oprávnění
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budou zobrazeny vyšší
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moje Faktury
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Žádný zaměstnanec nalezeno
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Žádný zaměstnanec nalezeno
 DocType: Purchase Order,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Vyberte BOM na začátek
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Nahrát n
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Odeslat nyní
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Sklad pro web
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Opravdu chcete zastavit výrobní zakázky: 
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form záznamy
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Podpo
 DocType: Features Setup,"To enable ""Point of Sale"" features",Chcete-li povolit "Point of Sale" představuje
 DocType: Bin,Moving Average Rate,Klouzavý průměr
 DocType: Production Planning Tool,Select Items,Vyberte položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} proti účtu {1} ze dne {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} proti účtu {1} ze dne {2}
 DocType: Comment,Reference Name,Název reference
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Nechte přes dodávku nebo příjem aľ tohoto procenta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
 DocType: Production Order,Item To Manufacture,Bod K výrobě
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Trvalé odlévání forem
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Objednávka na platební
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} je stav {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Objednávka na platební
 DocType: Sales Order Item,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
 DocType: Newsletter,Newsletter Manager,Newsletter Manažer
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,Požadované Čísla
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Hodnocení výkonu.
 DocType: Sales Invoice Item,Stock Details,Sklad Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Místě prodeje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Nelze převést {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Místě prodeje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nelze převést {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
 DocType: Account,Balance must be,Zůstatek musí být
 DocType: Hub Settings,Publish Pricing,Publikovat Ceník
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrazivní tryskání
-sites/assets/js/desk.min.js +3938,Ms,Paní
+DocType: Employee,Ms,Paní
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizový kurz master.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
 DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,Rozsah
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Features Setup,Item Barcode,Položka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Bod Varianty {0} aktualizováno
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 DocType: Address,Shop,Obchod
 DocType: Hub Settings,Sync Now,Sync teď
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
 DocType: Employee,Permanent Address Is,Trvalé bydliště je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
 DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
 DocType: Item,Is Purchase Item,je Nákupní Položka
 DocType: Journal Entry Account,Purchase Invoice,Přijatá faktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
 DocType: Stock Entry,Total Outgoing Value,Celková hodnota Odchozí
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Datum zahájení a datem ukončení by mělo být v rámci stejného fiskální rok
 DocType: Lead,Request for Information,Žádost o informace
 DocType: Payment Tool,Paid,Placený
 DocType: Salary Slip,Total in words,Celkem slovy
 DocType: Material Request Item,Lead Time Date,Datum a čas Leadu
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,"je povinné. Možná, Směnárna záznam není vytvořena pro"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pro "produktem Bundle předměty, sklad, sériové číslo a dávkové No bude považována ze" Balení seznam 'tabulky. Pokud Warehouse a Batch No jsou stejné pro všechny balení položky pro jakoukoli "Výrobek balík" položky, tyto hodnoty mohou být zapsány do hlavní tabulky položky, budou hodnoty zkopírovány do "Balení seznam" tabulku."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Zásilky zákazníkům.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Zásilky zákazníkům.
 DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Nepřímé příjmy
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Částka platby = dlužné částky
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,Adresní řádek 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Odchylka
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Název společnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobrazit seznam všech nápovědy videí
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
 DocType: Pricing Rule,Max Qty,Max Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemický
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 DocType: Process Payroll,Select Payroll Year and Month,Vyberte Payroll rok a měsíc
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Přejděte na příslušné skupiny (obvykle využití finančních prostředků> oběžných aktiv> bankovních účtů a vytvořit nový účet (kliknutím na Přidat dítě) typu "Bank"
 DocType: Workstation,Electricity Cost,Cena elektřiny
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bíl
 DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny)
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Připojit svůj obrázek
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Dělat 
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Dělat 
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
 DocType: Workflow State,Stop,Stop
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává."
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,Balení Slip Item
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Atribut tabulka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nemůže být negativní
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podání
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"Bude aktualizo
 DocType: Project,Internal,Interní
 DocType: Task,Urgent,Naléhavý
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Zadejte prosím platný řádek ID řádku tabulky {0} {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Přejděte na plochu a začít používat ERPNext
 DocType: Item,Manufacturer,Výrobce
 DocType: Landed Cost Item,Purchase Receipt Item,Položka příjemky
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Prodejní Částka
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Čas Záznamy
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
 DocType: Serial No,Creation Document No,Tvorba dokument č
 DocType: Issue,Issue,Problém
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Prodejní objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Tvorba přírůstků zásob
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Tvorba přírůstků zásob
 DocType: Packing Slip,Net Weight UOM,Hmotnost UOM
 DocType: Item,Default Supplier,Výchozí Dodavatel
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad výrobou Procento příspěvcích
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
 DocType: Sales Person,Select company name first.,Vyberte název společnosti jako první.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Chcete-li {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,aktualizovat přes čas Záznamy
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registrace firmy čísla pro váš odkaz. Daňové čísla atd
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Z rozsahu, musí být nižší než na Range"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vyberte Time protokolů a předložit k vytvoření nové prodejní faktury.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Daňové
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Závazky
 DocType: Account,Warehouse,Sklad
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá míra
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Smířit platbě
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
 DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"""Položky"" nemůžou být prázdné"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Položky"" nemůžou být prázdné"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Nastavení Zaměstnanci
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Nastavení Zaměstnanci
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosím, vyberte první prefix"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Výzkum
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,Odesláno
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 DocType: Communication,Delivery Status,Delivery Status
 DocType: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendy placené
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Účetní Ledger
 DocType: Stock Reconciliation,Difference Amount,Rozdíl Částka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Nerozdělený zisk
 DocType: BOM Item,Item Description,Položka Popis
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Dočasné Otevření
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaměstnanec Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
 DocType: Address,Address Type,Typ adresy
 DocType: Purchase Receipt,Rejected Warehouse,Zamítnuto Warehouse
 DocType: GL Entry,Against Voucher,Proti poukazu
 DocType: Item,Default Buying Cost Center,Výchozí Center Nákup Cost
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Chcete-li získat to nejlepší z ERPNext, doporučujeme vám nějaký čas trvat, a sledovat tyto nápovědy videa."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Položka {0} musí být Sales Item
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,na
 DocType: Item,Lead Time in days,Čas leadu ve dnech
 ,Accounts Payable Summary,Splatné účty Shrnutí
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Místo vydání
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Smlouva
 DocType: Report,Disabled,Vypnuto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Zemědělství
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,Způsob platby
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
-sites/assets/js/form.min.js +190,Name is required,Jméno je vyžadováno
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Jméno je vyžadováno
 DocType: Purchase Invoice,Recurring Type,Opakující se Typ
 DocType: Address,City/Town,Město / Město
 DocType: Email Digest,Annual Income,Roční příjem
 DocType: Serial No,Serial No Details,Serial No Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitálové Vybavení
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Cíl
 DocType: Sales Invoice Item,Edit Description,Upravit popis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekávané datum dodání je menší než plánované datum zahájení.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Celkem Odchozí
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tam může být pouze jeden Shipping Rule Podmínka s 0 nebo prázdnou hodnotu pro ""na hodnotu"""
 DocType: Authorization Rule,Transaction,Transakce
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Poznámka: Tento Nákladové středisko je Group. Nelze vytvořit účetní zápisy proti skupinám.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Nástroje
+apps/frappe/frappe/config/desk.py +7,Tools,Nástroje
 DocType: Item,Website Item Groups,Webové stránky skupiny položek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Výrobní číslo objednávky je povinná pro legální vstup účelem výroby
 DocType: Purchase Invoice,Total (Company Currency),Total (Company měny)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,Meno pracovnej stanice
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-sites/assets/js/desk.min.js +7652,Comments,Komentáře
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentáře
 DocType: Salary Slip,Bank Account No.,Bankovní účet č.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Ocenění Rate potřebný k bodu {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vyberte spol
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dodavatelské faktury Datum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Musíte povolit Nákupní košík
-sites/assets/js/form.min.js +212,No Data,No Data
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Posouzení Template Goal
 DocType: Salary Slip,Earning,Získávání
 DocType: Payment Tool,Party Account Currency,Party Měna účtu
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,Party Měna účtu
 DocType: Purchase Taxes and Charges,Add or Deduct,Přidat nebo Odečíst
 DocType: Company,If Yearly Budget Exceeded (for expense account),Pokud Roční rozpočet překročen (pro výdajového účtu)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Celková hodnota objednávky
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Zpravodaje ke kontaktům, vede."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},"Měna závěrečného účtu, musí být {0}"
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Součet bodů za všech cílů by mělo být 100. Je {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operace nemůže být prázdné.
 ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status aktualizován na {0}
 DocType: DocField,Description,Popis
 DocType: Authorization Rule,Average Discount,Průměrná sleva
 DocType: Letter Head,Is Default,Je Výchozí
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky
 DocType: Item,Maintain Stock,Udržovat Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pro Společnost
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,Přepravní Adresa Název
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Diagram účtů
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Závisí na dovolené bez nároku na mzdu
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Záruka / AMC Status
 DocType: GL Entry,GL Entry,Vstup GL
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Do List
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Do List
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Učeň
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativní množství není dovoleno
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavení Nastavení SMS brána
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Žádná adresa přidán dosud.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytik
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
 DocType: Item,Inventory,Inventář
 DocType: Features Setup,"To enable ""Point of Sale"" view",Chcete-li povolit "Point of Sale" pohledu
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
 DocType: Item,Sales Details,Prodejní Podrobnosti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Připne
 DocType: Opportunity,With Items,S položkami
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
 DocType: Item Attribute,Item Attribute,Položka Atribut
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vláda
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Položka Varianty
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Položka Varianty
 DocType: Company,Services,Služby
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Celkem ({0})
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Zahlubování
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Material Request Item,Sales Order No,Prodejní objednávky No
 DocType: Item Group,Item Group Name,Položka Název skupiny
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Zaujatý
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Zaujatý
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
 DocType: Pricing Rule,For Price List,Pro Ceník
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá částka
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatečná sleva Částka (Měna Company)
-DocType: Period Closing Voucher,CoA Help,CoA Help
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Chyba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Chyba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
 DocType: Event,Tuesday,Úterý
 DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
 ,Accounts Receivable Summary,Pohledávky Shrnutí
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Listy typu {0} již přidělené pro zaměstnance {1} na dobu {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
 DocType: UOM,UOM Name,UOM Name
 DocType: Top Bar Item,Target,Cíl
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Účetní záznam pro {0} lze provádět pouze v měně: {1}
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Vystřihování
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materiál Žádost o příkazu k nákupu
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiál Žádost o příkazu k nákupu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Řádek # {0}: vrácené položky {1} neexistuje v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovní účty
 ,Bank Reconciliation Statement,Bank Odsouhlasení prohlášení
 DocType: Address,Lead Name,Jméno leadu
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otevření Sklad Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Otevření Sklad Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} musí být uvedeny pouze jednou
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Není povoleno, aby transfer více {0} než {1} proti Objednávky {2}"
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Žádné položky k balení
 DocType: Shipping Rule Condition,From Value,Od hodnoty
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Výrobní množství je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Výrobní množství je povinné
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Částky nezohledněny v bance
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Nároky na náklady firmy.
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 DocType: Production Planning Tool,Select Sales Orders,Vyberte Prodejní objednávky
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označit jako Dodává
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Vytvořit nabídku
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Zkuste plánování operací pro X dní předem.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 DocType: SMS Center,Receiver List,Přijímač Seznam
 DocType: Payment Tool Detail,Payment Amount,Částka platby
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Zobrazit
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobrazit
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivní laserové spékání
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import byl úspěšný!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Množství nesmí být větší než {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Účtovaný
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reserved Množství
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
 DocType: Lead,Upper Income,Horní příjmů
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Povolit Nákupní košík
 DocType: Employee,Permanent Address,Trvalé bydliště
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Položka {0} musí být služba položky.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Vyplacena záloha proti {0} {1} nemůže být větší \ než Grand Celkem {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Prosím, vyberte položku kód"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Snížit Odpočet o dovolenou bez nároku na odměnu (LWP)
 DocType: Territory,Territory Manager,Oblastní manažer
+DocType: Delivery Note Item,To Warehouse (Optional),Warehouse (volitelné)
 DocType: Sales Invoice,Paid Amount (Company Currency),Zaplacená částka (Company měny)
 DocType: Purchase Invoice,Additional Discount,Další slevy
 DocType: Selling Settings,Selling Settings,Prodejní Nastavení
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Hornictví
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin lití
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Prosím, vyberte {0} jako první."
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosím, vyberte {0} jako první."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,Č. šarže
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povolit více Prodejní objednávky proti Zákazníka Objednávky
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hlavní
 DocType: DocPerm,Delete,Smazat
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Varianta
-sites/assets/js/desk.min.js +7971,New {0},Nový: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varianta
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nový: {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
 DocType: Employee,Leave Encashed?,Ponechte zpeněžení?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Item,Variants,Varianty
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Země
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresy
 DocType: Communication,Received,Přijato
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Položka nesmí mít výrobní zakázky.
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,Oslovení
 DocType: Communication,Rejected,Zamítnuto
 DocType: Pricing Rule,Brand,Značka
 DocType: Item,Will also apply for variants,Bude platit i pro varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Dodáno
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
 DocType: Sales Order Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Reference
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,P
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Stříhání
 DocType: Item,Has Variants,Má varianty
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klikněte na tlačítko "", aby se prodej na faktuře"" vytvořit nový prodejní faktury."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,"Období od a období, na termíny povinných opakujících% s"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Balení a označování
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Uveďte prosím výchozí měnu, ve společnosti Master and Global výchozí"
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Správa projektů
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Správa projektů
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
 DocType: Budget Detail,Fiscal Year,Fiskální rok
 DocType: Cost Center,Budget,Rozpočet
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Prodejní
 DocType: Employee,Salary Information,Vyjednávání o platu
 DocType: Sales Person,Name and Employee ID,Jméno a ID zaměstnance
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Odvody a daně
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Prosím, zadejte Referenční den"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} platební položky mohou není možné filtrovat {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Prosím, zadejte Referenční den"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platební položky mohou není možné filtrovat {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množství
 DocType: Material Request Item,Material Request Item,Materiál Žádost o bod
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Strom skupiny pol
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Červená
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
 DocType: Installation Note,Installation Time,Instalace Time
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Uvozovky Trendy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Jako výrobní objednávce lze provést za tuto položku, musí být skladem."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Jako výrobní objednávce lze provést za tuto položku, musí být skladem."
 DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spojování
 DocType: Authorization Rule,Above Value,Výše uvedená hodnota
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Dodává
+DocType: Purchase Order,Delivered,Dodává
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Nastavení příchozí server pro úlohy e-mailovou id. (Např jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuovat poplatků
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka"
 DocType: HR Settings,HR Settings,Nastavení HR
 apps/frappe/frappe/config/setup.py +130,Printing,Tisk
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatečná sleva Částka
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den (y), na které žádáte o dovolené jsou dovolenou. Potřebujete nevztahuje na dovolenou."
-sites/assets/js/desk.min.js +7805,and,a
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,a
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sportovní
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,Nabídka
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 DocType: Quotation,Maintenance User,Údržba uživatele
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Náklady Aktualizováno
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,"Jste si jisti, že chcete ODZASTAVIT"
 DocType: Employee,Date of Birth,Datum narození
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic. "
 DocType: Expense Claim,Approver,Schvalovatel
 ,SO Qty,SO Množství
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
 DocType: Appraisal,Calculate Total Score,Vypočítat Celková skóre
 DocType: Supplier Quotation,Manufacturing Manager,Výrobní ředitel
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Zásilky
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip lití
+DocType: Purchase Order,To be delivered to customer,Chcete-li být doručeno zákazníkovi
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Pořadové číslo {0} nepatří do skladu,"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavení
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Od Měny
 DocType: DocField,Name,Jméno
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Částky nejsou zohledněny v systému
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Ostatní
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Nastavit jako Zastaveno
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nelze najít odpovídající položku. Vyberte nějakou jinou hodnotu pro {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,Zvolte DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Protahování
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankovnictví
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nové Nákladové Středisko
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nové Nákladové Středisko
 DocType: Bin,Ordered Quantity,Objednané množství
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
 DocType: Quality Inspection,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} proti Prodejní Objednávce {1}
+DocType: Purchase Order Item,Reference Document Type,Referenční Typ dokumentu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} proti Prodejní Objednávce {1}
 DocType: Account,Fixed Asset,Základní Jmění
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serialized Zásoby
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Zásoby
 DocType: Activity Type,Default Billing Rate,Výchozí fakturace Rate
 DocType: Time Log Batch,Total Billing Amount,Celková částka fakturace
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Účet pohledávky
 ,Stock Balance,Reklamní Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Prodejní objednávky na platby
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Prodejní objednávky na platby
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Čas Záznamy vytvořil:
 DocType: Item,Weight UOM,Hmotnostní jedn.
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Ceník {0} je zakázána
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ceník {0} je zakázána
 DocType: Manufacturing Settings,Allow Overtime,Povolit Přesčasy
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Prodejní objednávky {0} je zastaven
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériová čísla požadované pro položky {1}. Poskytli jste {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuální ocenění Rate
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svařování
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Je zapotřebí nové Reklamní UOM
 DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Všechny položky již byly fakturovány
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin"
 DocType: Project,External,Externí
 DocType: Features Setup,Item Serial Nos,Položka sériových čísel
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,D
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
 DocType: SMS Log,Sender Name,Jméno odesílatele
 DocType: Page,Title,Titulek
-sites/assets/js/list.min.js +104,Customize,Přizpůsobit
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Přizpůsobit
 DocType: POS Profile,[Select],[Vybrat]
 DocType: SMS Log,Sent To,Odeslána
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Proveďte prodejní faktuře
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Konec životnosti
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Cestování
 DocType: Leave Block List,Allow Users,Povolit uživatele
+DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žádné
 DocType: Sales Invoice,Recurring,Opakující se
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledovat samostatné výnosy a náklady pro vertikál produktu nebo divizí.
 DocType: Rename Tool,Rename Tool,Přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Přenos materiálu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,Zaměstnanec
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importovat e-maily z
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Pozvat jako Uživatel
 DocType: Features Setup,After Sale Installations,Po prodeji instalací
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} je plně fakturováno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je plně fakturováno
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardní smluvní podmínky pro prodej nebo koupi.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Seskupit podle Poukazu
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,Hromadné emaily
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Soubor přejmenovat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zobrazit Platby
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Velikost
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,Účast na data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Nastavení příchozí server pro prodej e-mailovou id. (Např sales@example.com)
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Tool,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Uveďte prosím společnost pokračovat
-sites/assets/js/list.min.js +23,Draft,Návrh
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Návrh
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,Accepted,Přijato
 DocType: User,Female,Žena
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Jak tam jsou stávající skladové transakce pro tuto položku, \ nemůžete změnit hodnoty "Má sériové číslo", "má Batch Ne", "Je skladem" a "ocenění Method""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Rychlý vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
 DocType: Stock Entry,For Quantity,Pro Množství
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} není odesláno
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Žádosti o položky.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} není odesláno
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Žádosti o položky.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kompletní nastavení
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter adres
 DocType: Delivery Note,Transporter Name,Přepravce Název
 DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Celkem Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Měrná jednotka
 DocType: Fiscal Year,Year End Date,Datum Konce Roku
 DocType: Task Depends On,Task Depends On,Úkol je závislá na
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
 DocType: Customer Group,Has Child Node,Má děti Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} proti Nákupní Objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} proti Nákupní Objednávce {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} není v žádném aktivním fiskální rok. Pro zjistit více informací {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
@@ -2067,11 +2078,9 @@ DocType: Note,Note,Poznámka
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 DocType: Email Account,Email Ids,Email IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Nastavit jako nezastavěnou
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 DocType: Tax Rule,Billing City,Fakturace City
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,To Leave Aplikace je čeká na schválení. Pouze Leave schvalovač aktualizovat stav.
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","např. banka, hotovost, kreditní karty"
 DocType: Journal Entry,Credit Note,Dobropis
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Installation Note Item,Installed Qty,Instalované množství
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Vloženo
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Vloženo
 DocType: Salary Structure,Total Earning,Celkem Zisk
 DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje Adresy
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizace v
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,nebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Náklady
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 Nad
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Nad
 DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
 ,Download Backups,Ke stažení Zálohy
 DocType: Notification Control,Sales Order Message,Prodejní objednávky Message
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Vybrat Zaměstnanci
 DocType: Bank Reconciliation,To Date,To Date
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
-sites/assets/js/form.min.js +308,Details,Podrobnosti
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Podrobnosti
 DocType: Purchase Invoice,Total Taxes and Charges,Celkem Daně a poplatky
 DocType: Employee,Emergency Contact,Kontakt v nouzi
 DocType: Item,Quality Parameters,Parametry kvality
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,Přijaté Množství
 DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
 DocType: Product Bundle,Parent Item,Nadřazená položka
 DocType: Account,Account Type,Typ účtu
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pro řádek {0} v {1}. Chcete-li v rychlosti položku jsou {2}, řádky {3} musí být také zahrnuty"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Zploštění
 DocType: Account,Income Account,Účet příjmů
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Lití
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuální Množství
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Stock Nastavení
 DocType: User,Bio,Biografie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Jméno Nového Nákladového Střediska
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Jméno Nového Nákladového Střediska
 DocType: Leave Control Panel,Leave Control Panel,Nechte Ovládací panely
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No default šablony adresy nalezeno. Prosím, vytvořte nový z Nastavení> Tisk a značky> Adresa šablonu."
 DocType: Appraisal,HR User,HR User
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Detail platební nástroj
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěrů a půjček (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Velký
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Žádný zaměstnanec našel!
 DocType: C-Form Invoice Detail,Territory,Území
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
+DocType: Purchase Order,Customer Address Display,Customer Address Display
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Leštění
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Přidělené
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože \ jste již nějaké transakce (y) s jiným nerozpuštěných. Chcete-li změnit výchozí UOM, \ používání "UOM Nahraďte Utility" nástroj pod Stock modulu."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Nabídka {0} je zrušena
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Nabídka {0} je zrušena
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Celková dlužná částka
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaměstnanec {0} byl na dovolené na {1}. Nelze označit účast.
 DocType: Sales Partner,Targets,Cíle
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosím, nastavit svůj účtový rozvrh, než začnete účetních zápisů"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorovat Ceny pravidlo
-sites/assets/js/list.min.js +24,Cancelled,Zrušeno
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Zrušeno
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od datum ve platovou strukturu nemůže být menší než zaměstnanců Spojování Date.
 DocType: Employee Education,Graduate,Absolvent
 DocType: Leave Block List,Block Days,Blokové dny
 DocType: Journal Entry,Excise Entry,Spotřební Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozornění: prodejní objednávky {0} již existuje proti Zákazníka Objednávky {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozornění: prodejní objednávky {0} již existuje proti Zákazníka Objednávky {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,Sklad nepřijali Účtovaný
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + nedoplatek Částka + Inkaso Částka - Total Odpočet
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
 DocType: Features Setup,Sales and Purchase,Prodej a nákup
-DocType: Purchase Order Item,Material Request No,Materiál Poptávka No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+DocType: Supplier Quotation Item,Material Request No,Materiál Poptávka No
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu společnosti"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} byl úspěšně odhlášen z tohoto seznamu.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Čistý Rate (Company měny)
-apps/frappe/frappe/templates/base.html +132,Added,Přidáno
+apps/frappe/frappe/templates/base.html +134,Added,Přidáno
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Správa Territory strom.
 DocType: Journal Entry Account,Sales Invoice,Prodejní faktury
 DocType: Journal Entry Account,Party Balance,Balance Party
 DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
 DocType: Company,Default Receivable Account,Výchozí pohledávek účtu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Vytvoření bankovní položka pro celkové vyplacené mzdy za výše zvolených kritérií
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Účetní položka na skladě
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Ražení
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 apps/frappe/frappe/desk/query_report.py +136,Total,Celkem
 DocType: Purchase Invoice,Apply Additional Discount On,Použít dodatečné Sleva na
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,Kontrola kvality
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray tváření
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Účet {0} je zmrazen
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL nebo BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimální úroveň zásob
 DocType: Stock Entry,Subcontract,Subdodávka
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Prosím, zadejte {0} jako první"
 DocType: Production Planning Tool,Get Items From Sales Orders,Získat položky z Prodejní Objednávky
 DocType: Production Order Operation,Actual End Time,Aktuální End Time
 DocType: Production Planning Tool,Download Materials Required,Ke stažení potřebné materiály:
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,Plánované
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosím, vyberte položku, kde "Je skladem," je "Ne" a "je Sales Item" "Ano" a není tam žádný jiný produkt Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Ceníková Měna není zvolena
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ceníková Měna není zvolena
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Bod Row {0}: doklad o koupi, {1} neexistuje v tabulce ""kupní příjmy"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Dokud
 DocType: Rename Tool,Rename Log,Přejmenovat Přihlásit
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
-sites/assets/js/erpnext.min.js +48,Pay,Platit
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Platit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokoly pro udržení stavu doručení sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Broušení
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Zmenšit balení
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Nevyřízené Aktivity
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Nevyřízené Aktivity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrzeno
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dodavatel> Dodavatel Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Zadejte zmírnění datum.
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Za
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vyberte Fiskální rok
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Tavba rudy
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Jste Leave schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Attendance,Attendance Date,Účast Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Neplatné období
 DocType: Customer,Credit Limit,Úvěrový limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vyberte typ transakce
 DocType: GL Entry,Voucher No,Voucher No
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Šabl
 DocType: Customer,Address and Contact,Adresa a Kontakt
 DocType: Customer,Last Day of the Next Month,Poslední den následujícího měsíce
 DocType: Employee,Feedback,Zpětná vazba
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Časový plán
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Časový plán
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Brusné jet obrábění
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
 DocType: Website Settings,Website Settings,Nastavení www stránky
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,Vycházející
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root účet nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root účet nemůže být smazán
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Zobrazit Stock Příspěvky
 ,Is Primary Address,Je Hlavní adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Reference # {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Správa adres
 DocType: Pricing Rule,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
@@ -2460,14 +2471,14 @@ DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Uzavření (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Uzavření (Dr)
 DocType: Contact,Passive,Pasivní
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Pořadové číslo {0} není skladem
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Daňové šablona na prodej transakce.
 DocType: Sales Invoice,Write Off Outstanding Amount,Odepsat dlužné částky
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Zkontrolujte, zda potřebujete automatické opakující faktury. Po odeslání jakékoliv prodejní fakturu, opakující se část bude viditelný."
 DocType: Account,Accounts Manager,Accounts Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',"Time Log {0} musí být ""Odesláno"""
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Time Log {0} musí být ""Odesláno"""
 DocType: Stock Settings,Default Stock UOM,Výchozí Skladem UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Kalkulace Hodnotit založené na typ aktivity (za hodinu)
 DocType: Production Planning Tool,Create Material Requests,Vytvořit Žádosti materiálu
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Získat aktualizace
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Přidat několik ukázkových záznamů
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Správa absencí
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Správa absencí
 DocType: Event,Groups,Skupiny
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Seskupit podle účtu
 DocType: Sales Order,Fully Delivered,Plně Dodáno
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Prodejní Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočt na účet {1} proti nákladovému středisku {2} bude vyšší o {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Předáno listy
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD"""
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Hodnota nebo Množství
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Maloobchodník
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Připsat na účet musí být účtu Rozvaha
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Všechny typy Dodavatele
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Nabídka {0} není typu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Nabídka {0} není typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodáno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kontokorentní úvěr na účtu
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Vytvořit výplatní pásku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Uvolnit
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Procházet BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zajištěné úvěry
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
@@ -2523,7 +2532,7 @@ DocType: Appraisal,Appraisal,Ocenění
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-pěna lití
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Výkres
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se opakuje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Schvalovatel absence musí být jedním z {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Schvalovatel absence musí být jedním z {0}
 DocType: Hub Settings,Seller Email,Prodávající E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové pořizovací náklady (přes nákupní faktury)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2537,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá částka (Company Měna)
 DocType: BOM Operation,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Položka Pojmenování By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Z nabídky
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Z nabídky
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiál Přenesená pro výrobu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Účet {0} neexistuje
 DocType: Purchase Receipt Item,Purchase Order Item No,Číslo položky vydané objednávky
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,Kontrola Povinné
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Pokladní hotovost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Dodávka sklad potřebný pro živočišnou položku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dodávka sklad potřebný pro živočišnou položku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 DocType: Serial No,Is Cancelled,Je Zrušeno
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Moje dodávky
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje dodávky
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
@@ -2568,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Prosím, vyberte bankovní účet"
 DocType: Newsletter,Create and Send Newsletters,Vytvoření a odeslání Zpravodaje
-sites/assets/js/report.min.js +107,From Date must be before To Date,Datum od musí být dříve než datum do
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Datum od musí být dříve než datum do
 DocType: Sales Order,Recurring Order,Opakující se objednávky
 DocType: Company,Default Income Account,Účet Default příjmů
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
@@ -2583,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Reklamní UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
 ,Projected,Plánovaná
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
 DocType: Notification Control,Quotation Message,Zpráva Nabídky
 DocType: Issue,Opening Date,Datum otevření
 DocType: Journal Entry,Remark,Poznámka
 DocType: Purchase Receipt Item,Rate and Amount,Cena a částka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Nudný
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Z přijaté objednávky
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Z přijaté objednávky
 DocType: Blog Category,Parent Website Route,nadřazená cesta internetové stránky
 DocType: Sales Order,Not Billed,Ne Účtovaný
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Žádné kontakty přidán dosud.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Žádné kontakty přidán dosud.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Neaktivní
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Proti faktury Datum zveřejnění
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
 DocType: Time Log,Batched for Billing,Zarazeno pro fakturaci
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Směnky vznesené dodavately
 DocType: POS Profile,Write Off Account,Odepsat účet
-sites/assets/js/erpnext.min.js +26,Discount Amount,Částka slevy
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupní faktury
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,např. DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
 DocType: Shopping Cart Settings,Quotation Series,Číselná řada nabídek
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Tváření Hot metal plyn
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
 DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
@@ -2639,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Zákazníka nebo dodavatele Podrobnosti
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Nastavit
 DocType: Lead,Lead Owner,Majitel leadu
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Sklad je vyžadován
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Sklad je vyžadován
 DocType: Employee,Marital Status,Rodinný stav
 DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka
 DocType: Time Log,Will be updated when billed.,Bude aktualizována při účtovány.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,K dispozici šarže Množství na Od Warehouse
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuální BOM a New BOM nemůže být stejné
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,Aktualizace skladem
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinišování
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Záznam všech sdělení typu e-mail, telefon, chat, návštěvy, atd"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Prosím, uveďte zaokrouhlit nákladové středisko ve společnosti"
 DocType: Purchase Invoice,Terms,Podmínky
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Vytvořit nový
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Vytvořit nový
 DocType: Buying Settings,Purchase Order Required,Vydaná objednávka je vyžadována
 ,Item-wise Sales History,Item-moudrý Sales History
 DocType: Expense Claim,Total Sanctioned Amount,Celková částka potrestána
@@ -2681,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Plat Slip Odpočet
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Poznámky
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vyberte první uzel skupinu.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cíl musí být jedním z {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Vyplňte formulář a uložte jej
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vyplňte formulář a uložte jej
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Stáhněte si zprávu, která obsahuje všechny suroviny s jejich aktuální stav zásob"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Obložení
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 DocType: Leave Application,Leave Balance Before Application,Stav absencí před požadavkem
 DocType: SMS Center,Send SMS,Pošlete SMS
 DocType: Company,Default Letter Head,Výchozí hlavičkový
 DocType: Time Log,Billable,Zúčtovatelná
 DocType: Authorization Rule,This will be used for setting rule in HR module,Tato adresa bude použita pro nastavení pravidlo HR modul
 DocType: Account,Rate at which this tax is applied,"Sazba, při které se používá tato daň"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Změna pořadí Množství
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Změna pořadí Množství
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
 DocType: Journal Entry,Write Off,Odepsat
 DocType: Time Log,Operation ID,Provoz ID
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Sleva Pole bude k dispozici v objednávce, doklad o koupi, nákupní faktury"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Název nového účtu. Poznámka: Prosím, vytvářet účty pro zákazníky a dodavateli"
 DocType: Report,Report Type,Typ výpisu
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Nahrávám
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Nahrávám
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Nahradit Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Země moudrý výchozí adresa Templates
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Dodavatel doručí zákazníkovi
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import dat a export
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Pokud se zapojit do výrobní činnosti. Umožňuje Položka ""se vyrábí"""
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktura Datum zveřejnění
 DocType: Sales Invoice,Rounded Total,Celkem zaokrouhleno
 DocType: Product Bundle,List items that form the package.,"Seznam položek, které tvoří balíček."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
 DocType: Company,Default Cash Account,Výchozí Peněžní účet
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
@@ -2740,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Množství nejsou dostupné iv skladu {1} na {2} {3}.
  Dispozici Množství: {4}, transfer Množství: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
+DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktní e-mail
 DocType: Event,Sunday,Neděle
 DocType: Sales Team,Contribution (%),Příspěvek (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odpovědnost
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Šablona
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Přidat uživatele
@@ -2753,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),Skutečné datum Start (přes Ti
 DocType: Stock Reconciliation Item,Before reconciliation,Před smíření
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
 DocType: Item,Default BOM,Výchozí BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2761,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Time Log Batch,Total Hours,Celkem hodin
 DocType: Journal Entry,Printing Settings,Tisk Nastavení
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilový
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Listy typu {0} již přidělené pro zaměstnance {1} pro fiskální rok {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Položka je povinná
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Kovové vstřikování
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Z Dodacího Listu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Z Dodacího Listu
 DocType: Time Log,From Time,Času od
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investiční bankovnictví
@@ -2782,10 +2795,10 @@ DocType: Newsletter,A Lead with this email id should exist,Lead s touto e-mailov
 DocType: Stock Entry,From BOM,Od BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Základní
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","např Kg, ks, č, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
 DocType: Salary Structure,Salary Structure,Plat struktura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,7 +2806,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  konflikt přiřazením prioritu. Cena Pravidla: {0}"
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Nabídka Date
 DocType: Hub Settings,Access Token,Přístupový Token
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
+DocType: Delivery Note Item,From Warehouse,Ze skladu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Vrtání
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Vyfukování
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
@@ -2837,11 +2851,12 @@ DocType: C-Form,Amended From,Platném znění
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Buď cílové množství nebo cílová částka je povinná
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
-DocType: Leave Allocation,Carry Forward,Převádět
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Datum zahájení by měla být před uzávěrky
+DocType: Leave Control Panel,Carry Forward,Převádět
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Nákladové středisko se stávajícími transakcemi nelze převést na hlavní účetní knihy
 DocType: Department,Days for which Holidays are blocked for this department.,"Dnů, po které Prázdniny jsou blokovány pro toto oddělení."
 ,Produced,Produkoval
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, ke kterému se opakující objednávka bude zastaví"
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Celkem Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hodina
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Přeneste materiál Dodavateli
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Přeneste materiál Dodavateli
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Typ leadu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Vytvořit Citace
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Provoz ID není nastaveno
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Návštěva
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Návštěva
 DocType: Leave Type,Is Encash,Je inkasovat
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Proveďte položka deníku
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Obchodní
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Obchodní
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmí být skladem
 DocType: Cost Center,Distribution Id,Distribuce Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Poměr atribut {0} musí být v rozmezí od {1} až {2} v krocích po {3}
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základní částka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+DocType: Leave Allocation,Unused leaves,Nepoužité listy
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Řezání
 DocType: Tax Rule,Billing State,Fakturace State
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminování
 DocType: Item Reorder,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,Maloobchodní
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Zákazník {0} neexistuje
 DocType: Attendance,Absent,Nepřítomný
 DocType: Product Bundle,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Řádek {0}: Neplatná reference {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zdrcující
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupte Daně a poplatky šablony
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,Poznámky
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 DocType: Features Setup,POS View,Zobrazení POS
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Instalace rekord pro sériové číslo
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalace rekord pro sériové číslo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuální lití
-sites/assets/js/erpnext.min.js +10,Please specify a,Uveďte prosím
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Uveďte prosím
 DocType: Offer Letter,Awaiting Response,Čeká odpověď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Výše
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold velikosti
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Účet {0} nemůže být skupina
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Kraj
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Vyboulený
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Lití Evaporative-pattern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Výdaje na reprezentaci
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Věk
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Věk
 DocType: Time Log,Billing Amount,Fakturace Částka
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Výdaje na právní služby
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto objednávka bude generován například 05, 28 atd"
 DocType: Sales Invoice,Posting Time,Čas zadání
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},No Položka s Serial č {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Otevřené Oznámení
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otevřené Oznámení
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Přímé náklady
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Opravdu chcete uvolnit tento materiál požadavek?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Stejně jako u Date
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honování
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
 DocType: Feed,Full Name,Celé jméno/název
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Přidat řádky
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Těžba
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Všechny kontakty.
 DocType: Newsletter,Test Email Id,Testovací Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Zkratka Company
@@ -3101,11 +3117,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Nabídk
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen Měnový Směnný záznam pro {1} až {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen Měnový Směnný záznam pro {1} až {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Daňová šablona je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',"{0} {1} status je ""Zastaveno"""
 DocType: Account,Temporary,Dočasný
 DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
@@ -3123,13 +3138,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detai
 DocType: Purchase Order Item,Supplier Quotation,Dodavatel Nabídka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Žehlení
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} je zastaven
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zastaven
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Připravované akce
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Připravované akce
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je nutná zákazník
 DocType: Letter Head,Letter Head,Záhlaví
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Rychlý vstup
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je povinné pro návrat
 DocType: Purchase Order,To Receive,Obdržet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Zmenšit kování
@@ -3153,25 +3169,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} na Prodejní Faktuře {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} na Prodejní Faktuře {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
 DocType: Purchase Invoice Item,Project Name,Název projektu
 DocType: Supplier,Mention if non-standard receivable account,Zmínka v případě nestandardní pohledávky účet
 DocType: Workflow State,Edit,Upravit
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
 DocType: Features Setup,Item Batch Nos,Položka Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Lidské Zdroje
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Lidské Zdroje
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Daňové Aktiva
 DocType: BOM Item,BOM No,BOM No
 DocType: Contact Us Settings,Pincode,PSČ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Sklad UOM musí být odlišný od běžného akciové nerozpuštěných
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
 DocType: Production Order,Operation Cost,Provozní náklady
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Nahrajte účast ze souboru CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Vynikající Amt
@@ -3179,7 +3195,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nastavi
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Chcete-li přiřadit tento problém vyřešit, použijte tlačítko ""Přiřadit"" v postranním panelu."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zásoby Starší než [dny]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Na základě faktury
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskální rok: {0} neexistuje
 DocType: Currency Exchange,To Currency,Chcete-li měny
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Nechte následující uživatelé schválit Žádost o dovolenou.
@@ -3208,7 +3223,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate
 DocType: Stock Entry Detail,Additional Cost,Dodatečné náklady
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Finanční rok Datum ukončení
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Vytvořit nabídku dodavatele
 DocType: Quality Inspection,Incoming,Přicházející
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Snížit Zisk na vstup bez nároku na mzdu (LWP)
@@ -3216,10 +3231,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Řádek # {0}: Výrobní číslo {1} neodpovídá {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Poznámka: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tento týden Shrnutí
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
 DocType: GL Entry,Party,Strana
 DocType: Sales Order,Delivery Date,Dodávka Datum
@@ -3232,7 +3247,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Zpravodaje
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Zpravodaje
 DocType: Address,Shipping,Lodní
 DocType: Stock Ledger Entry,Stock Ledger Entry,Reklamní Ledger Entry
 DocType: Department,Leave Block List,Nechte Block List
@@ -3251,7 +3266,7 @@ DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Datum ukončení doby aktuální objednávky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Vytvořte nabídku Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zpáteční
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Výchozí měrná jednotka varianty musí být stejné jako šablonu
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Výchozí měrná jednotka varianty musí být stejné jako šablonu
 DocType: DocField,Fold,Fold
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
@@ -3283,7 +3298,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Zprávy
 DocType: SMS Settings,Enter url parameter for receiver nos,Zadejte url parametr pro přijímače nos
 DocType: Sales Invoice,Paid Amount,Uhrazené částky
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',"Závěrečný účet {0} musí být typu ""odpovědnosti"""
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Závěrečný účet {0} musí být typu ""odpovědnosti"""
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Položka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
@@ -3291,7 +3306,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
 DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
 DocType: Payment Tool Detail,Against Voucher No,Proti poukaz č
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
 DocType: Tax Rule,Purchase,Nákup
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Zůstatek Množství
@@ -3328,28 +3343,29 @@ Note: BOM = Bill of Materials","Souhrnný skupina ** položek ** do jiného ** P
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Pořadové číslo je povinná k bodu {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Uveďte prosím z / do rozmezí
-sites/assets/js/desk.min.js +7652,Created By,Vytvořeno (kým)
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Vytvořeno (kým)
 DocType: Serial No,Under AMC,Podle AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Bod míra ocenění je přepočítána zvažuje přistál nákladů částku poukazu
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
 DocType: BOM Replace Tool,Current BOM,Aktuální BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Přidat Sériové číslo
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Přidat Sériové číslo
 DocType: Production Order,Warehouses,Sklady
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print a Stacionární
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
 DocType: Payment Reconciliation,Minimum Amount,Minimální částka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Dokončení aktualizace zboží
 DocType: Workstation,per hour,za hodinu
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Série {0} jsou již použity v {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Série {0} jsou již použity v {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribuce
-sites/assets/js/erpnext.min.js +50,Amount Paid,Zaplacené částky
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zaplacené částky
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Výchozí Daně a poplatky
 DocType: Account,Receivable,Pohledávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Řádek # {0}: Není povoleno měnit dodavatele, objednávky již existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
 DocType: Sales Invoice,Supplier Reference,Dodavatel Označení
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Je-li zaškrtnuto, bude BOM pro sub-montážní položky považují pro získání surovin. V opačném případě budou všechny sub-montážní položky být zacházeno jako surovinu."
@@ -3386,8 +3402,8 @@ DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavení příchozí server pro podporu e-mailovou id. (Např support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatek Množství
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
 DocType: Salary Slip,Salary Slip,Plat Slip
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Leštění
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Datum DO"" je povinné"
@@ -3400,6 +3416,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globální nastavení
 DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Účet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
@@ -3432,7 +3449,7 @@ DocType: BOM,Manufacturing User,Výroba Uživatel
 DocType: Purchase Order,Raw Materials Supplied,Dodává suroviny
 DocType: Purchase Invoice,Recurring Print Format,Opakující Print Format
 DocType: Communication,Series,Série
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,"Očekávané datum dodání, nemůže být před zakoupením pořadí Datum"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Očekávané datum dodání, nemůže být před zakoupením pořadí Datum"
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Položka Klasifikace
@@ -3488,6 +3505,7 @@ DocType: HR Settings,Payroll Settings,Nastavení Mzdové
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Objednat
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nemůže mít rodič nákladové středisko
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Select Brand ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Provozní doba musí být větší než 0 pro provoz {0}
 DocType: Supplier,Address and Contacts,Adresa a kontakty
@@ -3498,7 +3516,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Získejte Vynikající poukazy
 DocType: Warranty Claim,Resolved By,Vyřešena
 DocType: Appraisal,Start Date,Datum zahájení
-sites/assets/js/desk.min.js +7629,Value,Hodnota
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Hodnota
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Přidělit listy dobu.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klikněte zde pro ověření
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
@@ -3514,14 +3532,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Přístup povolen
 DocType: Dropbox Backup,Weekly,Týdenní
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Příjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Příjem
 DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Hotovo
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} byl úspěšně přidán do našeho seznamu novinek.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Paprsek obrábění Electron
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
@@ -3534,7 +3552,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Přidat / Upravit ceny
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram nákladových středisek
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Moje objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje objednávky
 DocType: Price List,Price List Name,Ceník Jméno
 DocType: Time Log,For Manufacturing,Pro výrobu
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Součty
@@ -3545,7 +3563,7 @@ DocType: Account,Income,Příjem
 DocType: Industry Type,Industry Type,Typ Průmyslu
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Něco se pokazilo!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die lití
@@ -3559,10 +3577,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Rok
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Time Log {0} již účtoval
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} již účtoval
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Jméno nákladového střediska
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Položka {0} s Serial č {1} je již nainstalován
 DocType: Maintenance Schedule Detail,Scheduled Date,Plánované datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Celkem uhrazeno Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Zprávy větší než 160 znaků bude rozdělena do více zpráv
@@ -3570,10 +3587,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Obdrženo a přijato
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
 DocType: Item,Unit of Measure Conversion,Jednotka míry konverze
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaměstnanec nemůže být změněn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
 DocType: Naming Series,Help HTML,Nápověda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Jméno osoby nebo organizace, která tato adresa patří."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši Dodavatelé
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
@@ -3584,10 +3601,11 @@ DocType: Lead,Converted,Převedené
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} do {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Prosím, zkontrolujte více měn možnost povolit účty s jinou měnu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Prosím, zkontrolujte více měn možnost povolit účty s jinou měnu"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
@@ -3598,14 +3616,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Do skladu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Účet {0} byl zadán více než jednou za fiskální rok {1}
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""ano"" pro neskladové zboží"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""ano"" pro neskladové zboží"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od reklamačnímu
@@ -3619,15 +3637,17 @@ DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 DocType: User,Enabled,Zapnuto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},"Opravdu chcete, aby předložila všechny výplatní pásce za měsíc {0} a rok {1}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Opravdu chcete, aby předložila všechny výplatní pásce za měsíc {0} a rok {1}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importovat Odběratelé
 DocType: Target Detail,Target Qty,Target Množství
 DocType: Attendance,Present,Současnost
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
 DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
 DocType: Authorization Rule,Based On,Založeno na
-,Ordered Qty,Objednáno Množství
+DocType: Sales Order Item,Ordered Qty,Objednáno Množství
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Položka {0} je zakázána
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Období od a období, k datům povinné pro opakované {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektová činnost / úkol.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generování výplatních páskách
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} není platné id emailu
@@ -3667,7 +3687,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Nahrát Návštěvnost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM a výroba množství jsou povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
-DocType: Journal Entry Account,Amount,Částka
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Částka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nýtování
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
 ,Sales Analytics,Prodejní Analytics
@@ -3694,7 +3714,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
 DocType: Contact Us Settings,City,Město
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvukové obrábění
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Chyba: Není platný id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Chyba: Není platný id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Bod {0} musí být prodejní položky
 DocType: Naming Series,Update Series Number,Aktualizace Series Number
 DocType: Account,Equity,Hodnota majetku
@@ -3709,7 +3729,7 @@ DocType: Purchase Taxes and Charges,Actual,Aktuální
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
 DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
 DocType: Production Order,Production Order,Výrobní Objednávka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
@@ -3717,14 +3737,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Cena surovin
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
-sites/assets/js/list.min.js +174,Gantt Chart,Pruhový diagram
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Pruhový diagram
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Řada Aktualizováno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
@@ -3739,7 +3759,7 @@ DocType: Attendance,Attendance,Účast
 DocType: Page,No,Ne
 DocType: BOM,Materials,Materiály
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Datum a čas zadání je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Datum a čas zadání je povinný
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
 ,Item Prices,Ceny Položek
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Ve slovech budou viditelné, jakmile uložíte objednávce."
@@ -3759,9 +3779,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
-sites/assets/js/erpnext.min.js +50,Change,Změna
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Změna
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Vydaná objednávka {0} je 'Zastavena'
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","např ""My Company LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Výpovědní Lhůta
@@ -3771,12 +3790,13 @@ DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnost UOM
 DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Lisování
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Úvěrový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Ukázat nulové hodnoty
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 DocType: Task,Actual End Date (via Time Logs),Skutečné Datum ukončení (přes Time Záznamy)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Rozpočet nemůže být přiřazena na skupinový účet {0}
@@ -3790,7 +3810,7 @@ DocType: Issue,Support Team,Tým podpory
 DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
 DocType: Contact Us Settings,State,Stav
 DocType: Batch,Batch,Šarže
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Zůstatek
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Zůstatek
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nároků)
 DocType: User,Gender,Pohlaví
 DocType: Journal Entry,Debit Note,Debit Note
@@ -3806,9 +3826,8 @@ DocType: Lead,Blog Subscriber,Blog Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Vytvoření pravidla pro omezení transakce na základě hodnot.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Pokud je zaškrtnuto, Total no. pracovních dnů bude zahrnovat dovolenou, a to sníží hodnotu platu za každý den"
 DocType: Purchase Invoice,Total Advance,Total Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Uvolnit materiálu Poptávka
 DocType: Workflow State,User,Uživatel
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Zpracování mezd
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Zpracování mezd
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Výše úvěru
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Nastavit jako Lost
@@ -3816,7 +3835,7 @@ DocType: Customer,Credit Days Based On,Úvěrové Dny Based On
 DocType: Tax Rule,Tax Rule,Daňové Pravidlo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Udržovat stejná sazba po celou dobu prodejního cyklu
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Naplánujte čas protokoly mimo Workstation pracovních hodin.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} již byla odeslána
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} již byla odeslána
 ,Items To Be Requested,Položky se budou vyžadovat
 DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Účtovaná sazba založená na typ aktivity (za hodinu)
@@ -3825,6 +3844,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 DocType: Production Planning Tool,Filter based on item,Filtr dle položek
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debetní účet
 DocType: Fiscal Year,Year Start Date,Datum Zahájení Roku
 DocType: Attendance,Employee Name,Jméno zaměstnance
 DocType: Sales Invoice,Rounded Total (Company Currency),Celkem zaokrouhleno (měna solečnosti)
@@ -3836,14 +3856,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Zaclonění
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaměstnanecké benefity
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Směnky vznesené zákazníkům.
 DocType: DocField,Default,Výchozí
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} odběratelé z přidané
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definovat rozpočtu pro tento nákladového střediska. Chcete-li nastavit rozpočet akce, viz "Seznam firem""
@@ -3851,7 +3871,7 @@ DocType: Account,Parent Account,Nadřazený účet
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
@@ -3860,23 +3880,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Vzdělání
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Volitelné. Nastaví výchozí měně společnosti, není-li uvedeno."
 DocType: Address,Office,Kancelář
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardní výpisy
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Řádek {0}: Party / Account neshoduje s {1} / {2} do {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozici Množství na Od Warehouse
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Řádek {0}: Party / Account neshoduje s {1} / {2} do {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Chcete-li vytvořit daňovém účtu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
 DocType: Employee,Current Address,Aktuální adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch Zásoby
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Zásoby
 DocType: Employee,Contract End Date,Smlouva Datum ukončení
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
 DocType: DocShare,Document Type,Typ dokumentu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Z nabídky dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Z nabídky dodavatele
 DocType: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Půl den
 DocType: Pricing Rule,Min Qty,Min Množství
@@ -3887,20 +3909,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pro Množství (Vyrobeno ks) je povinné
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Řádek {0}: Typ Party Party a je použitelná pouze proti pohledávky / závazky účtu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Řádek {0}: Typ Party Party a je použitelná pouze proti pohledávky / závazky účtu
 DocType: Notification Control,Purchase Receipt Message,Zpráva příjemky
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Celkem přidělené listy jsou více než období
 DocType: Production Order,Actual Start Date,Skutečné datum zahájení
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materiálů doručeno proti tomuto odběrateli
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Záznam pohybu položka.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Záznam pohybu položka.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter seznamu účastníků
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dlabačky
 DocType: Email Account,Service,Služba
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marže %
 DocType: BOM,With Operations,S operacemi
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účetnictví již byly provedeny v měně, {0} pro firmu {1}. Vyberte pohledávky a závazku účet s měnou {0}."
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účetnictví již byly provedeny v měně, {0} pro firmu {1}. Vyberte pohledávky a závazku účet s měnou {0}."
 ,Monthly Salary Register,Měsíční plat Register
-apps/frappe/frappe/website/template.py +123,Next,Další
+apps/frappe/frappe/website/template.py +140,Next,Další
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
 DocType: BOM Operation,BOM Operation,BOM Operation
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrolytické
@@ -3931,6 +3954,7 @@ DocType: Purchase Invoice,Next Date,Další data
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Prosím, zadejte Daně a poplatky"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Obrábění
+DocType: Sales Invoice Item,Drop Ship,Drop Loď
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
 DocType: Hub Settings,Seller Name,Prodejce Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Daně a poplatky odečteny (Company měna)
@@ -3957,29 +3981,29 @@ DocType: Purchase Order,To Receive and Bill,Přijímat a Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatické vytvoření Materiál žádosti, pokud množství klesne pod tuto úroveň"
 ,Item-wise Purchase Register,Item-moudrý Nákup Register
 DocType: Batch,Expiry Date,Datum vypršení platnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Chcete-li nastavit úroveň objednací, položka musí být Nákup položka nebo výrobní položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Chcete-li nastavit úroveň objednací, položka musí být Nákup položka nebo výrobní položky"
 ,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(půlden)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(půlden)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Získat předměty z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dodací lhůta dny
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kusovník
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Řádek {0}: Typ Party Party a je nutné pro pohledávky / závazky na účtu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Řádek {0}: Typ Party Party a je nutné pro pohledávky / závazky na účtu {1}
 DocType: Dropbox Backup,Send Notifications To,Odeslat upozornění
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Účet {0} neexistuje
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Prosím vytvořte platovou strukturu pro zaměstnance {0}
diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
index 8597050cd4..259749843c 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -1,637 +1,77 @@
-DocType: Employee,Salary Mode,Løn-tilstand
-DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vælg Månedlig Distribution, hvis du ønsker at spore baseret på sæsonudsving."
-DocType: Employee,Divorced,Skilt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Varer allerede synkroniseret
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Forbrugerprodukter
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
-DocType: Item,Customer Items,Kunde Varer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
-DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail-meddelelser
-DocType: Item,Default Unit of Measure,Standard Måleenhed
-DocType: SMS Center,All Sales Partner Contact,Alle Sales Partner Kontakt
-DocType: Employee,Leave Approvers,Lad godkendere
-DocType: Sales Partner,Dealer,Forhandler
-DocType: Employee,Rented,Lejet
-DocType: About Us Settings,Website,Websted
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Komprimering plus sintring
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Fra Material Request
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
-DocType: Job Applicant,Job Applicant,Job Ansøger
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridisk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i Item sats i række {0}"
-DocType: C-Form,Customer,Kunde
-DocType: Purchase Receipt Item,Required By,Kræves By
-DocType: Delivery Note,Return Against Delivery Note,Retur Against følgeseddel
-DocType: Department,Department,Afdeling
-DocType: Purchase Order,% Billed,% Billed
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate skal være samme som {0} {1} ({2})
-DocType: Sales Invoice,Customer Name,Customer Name
-DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle eksport relaterede områder som valuta, konverteringsfrekvens, eksport i alt, eksport grand total etc er tilgængelige i Delivery Note, POS, Citat, Sales Invoice, Sales Order etc."
-DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoveder (eller grupper) mod hvilken regnskabsposter er lavet og balancer opretholdes.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
-DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
-DocType: Leave Type,Leave Type Name,Lad Type Navn
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series opdateret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Syning
-DocType: Pricing Rule,Apply On,Påfør On
-DocType: Item Price,Multiple Item prices.,Flere Item priser.
-,Purchase Order Items To Be Received,"Købsordre, der modtages"
-DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
-DocType: Quality Inspection Reading,Parameter,Parameter
-apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Slutdato kan ikke være mindre end forventet startdato
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Må virkelig ønsker at unstop produktionsordre:
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Ny Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
-DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
-apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter
-DocType: Sales Invoice Item,Quantity,Mængde
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
-DocType: Employee Education,Year of Passing,År for Passing
-sites/assets/js/erpnext.min.js +27,In Stock,På lager
-DocType: Designation,Designation,Betegnelse
-DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Health Care
-DocType: Purchase Invoice,Monthly,Månedlig
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faktura
-DocType: Maintenance Schedule Item,Periodicity,Hyppighed
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail-adresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Forsvar
-DocType: Company,Abbr,Fork
-DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
-DocType: Delivery Note,Vehicle No,Vehicle Ingen
-sites/assets/js/erpnext.min.js +55,Please select Price List,Vælg venligst prislisten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Træbearbejdning
-DocType: Production Order Operation,Work In Progress,Work In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-print
-DocType: Employee,Holiday List,Holiday List
-DocType: Time Log,Time Log,Time Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Revisor
-DocType: Cost Center,Stock User,Stock Bruger
-DocType: Company,Phone No,Telefon Nej
-DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log af aktiviteter udført af brugere mod Opgaver, der kan bruges til sporing af tid, fakturering."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Ny {0}: # {1}
-,Sales Partners Commission,Salg Partners Kommissionen
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
-DocType: Print Settings,Classic,Klassisk
-apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dette er en rod-konto og kan ikke redigeres.
-DocType: BOM,Operations,Operationer
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sætte godkendelse på grundlag af Rabat for {0}
-DocType: Bin,Quantity Requested for Purchase,"Mængde, der ansøges for Indkøb"
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
-DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
-apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åbning for et job.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklame
-DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
-DocType: Payment Reconciliation,Reconcile,Forene
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Købmand
-DocType: Quality Inspection Reading,Reading 1,Læsning 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Make Bank indtastning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionskasserne
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
-DocType: SMS Center,All Sales Person,Alle Sales Person
-DocType: Lead,Person Name,Person Name
-DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende orden, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
-DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Vare
-DocType: Account,Credit,Credit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,Venligst setup Medarbejder navnesystem i Human Resource> HR-indstillinger
-DocType: POS Profile,Write Off Cost Center,Skriv Off Cost center
-DocType: Warehouse,Warehouse Detail,Warehouse Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Du er ikke autoriseret til at tilføje eller opdatere poster før {0}
-DocType: Item,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunden eksisterer med samme navn
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
-DocType: SMS Log,SMS Log,SMS Log
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
-DocType: Blog Post,Guest,Gæst
-DocType: Quality Inspection,Get Specification Details,Få Specifikation Detaljer
-DocType: Lead,Interested,Interesseret
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åbning
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
-DocType: Item,Copy From Item Group,Kopier fra Item Group
-DocType: Journal Entry,Opening Entry,Åbning indtastning
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} er obligatorisk
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
-DocType: Lead,Product Enquiry,Produkt Forespørgsel
-DocType: Standard Reply,Owner,Ejer
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Indtast venligst selskab først
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Vælg venligst Company først
-DocType: Employee Education,Under Graduate,Under Graduate
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
-DocType: BOM,Total Cost,Total Cost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Rivning
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoudtog
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Lægemidler
-DocType: Expense Claim Detail,Claim Amount,Krav Beløb
-DocType: Employee,Mr,Hr
-DocType: Custom Script,Client,Klient
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
-DocType: Naming Series,Prefix,Præfiks
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Forbrugsmaterialer
-DocType: Upload Attendance,Import Log,Import Log
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
-DocType: SMS Center,All Contact,Alle Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
-DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Udgifter
-DocType: Newsletter,Email Sent?,E-mail Sendt?
-DocType: Journal Entry,Contra Entry,Contra indtastning
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Vis Time Logs
-DocType: Delivery Note,Installation Status,Installation status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
-DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
-apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
-DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af ​​livet er nået
-DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
-apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for HR modul
-DocType: SMS Center,SMS Center,SMS-center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Opretning
-DocType: BOM Replace Tool,New BOM,Ny BOM
-apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs for fakturering.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity støbning
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhedsbrev er allerede blevet sendt
-DocType: Lead,Request Type,Anmodning Type
-DocType: Leave Application,Reason,Årsag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Udførelse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Den første bruger bliver System Manager (du kan ændre dette senere).
-apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
-DocType: Serial No,Maintenance Status,Vedligeholdelse status
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Varer og Priser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
-DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vælg Medarbejder, for hvem du opretter Vurdering."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
-DocType: Customer,Individual,Individuel
-apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan for vedligeholdelse besøg.
-DocType: SMS Settings,Enter url parameter for message,Indtast url parameter for besked
-apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regler for anvendelse af priser og rabat.
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Denne tidslog konflikter med {0} for {1} {2}
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
-DocType: Pricing Rule,Discount on Price List Rate (%),Rabat på prisliste Rate (%)
-sites/assets/js/form.min.js +279,Start,Start
-DocType: User,First Name,Fornavn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Din opsætning er færdig. Forfriskende.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fuld formstøbning
-DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
-DocType: Production Planning Tool,Sales Orders,Salgsordrer
-DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Indstil som standard
-,Purchase Order Trends,Indkøbsordre Trends
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Afsætte blade for året.
-DocType: Earning Type,Earning Type,Optjening Type
-DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deaktiver kapacitetsplanlægning og tidsregistrering
-DocType: Bank Reconciliation,Bank Account,Bankkonto
-DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
-DocType: Selling Settings,Default Territory,Standard Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Fjernsyn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
-DocType: Production Order Operation,Updated via 'Time Log',Opdateret via 'Time Log'
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
-DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
-DocType: Sales Invoice,Is Opening Entry,Åbner post
-DocType: Customer Group,Mention if non-standard receivable account applicable,"Nævne, hvis ikke-standard tilgodehavende konto gældende"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
-DocType: Sales Partner,Reseller,Forhandler
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Indtast Company
-DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice Item
-,Production Orders in Progress,Produktionsordrer i Progress
-DocType: Lead,Address & Contact,Adresse og kontakt
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
-DocType: Newsletter List,Total Subscribers,Total Abonnenter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Navn
-DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
-DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
-apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dobbelt hus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Du indstille Navngivning Series for {0} via Opsætning> Indstillinger> Navngivning Series
-DocType: Time Log,Will be updated when batched.,"Vil blive opdateret, når batched."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst "Er Advance 'mod konto {1}, hvis dette er et forskud post."
-apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} ikke hører til virksomheden {1}
-DocType: Bulk Email,Message,Besked
-DocType: Item Website Specification,Item Website Specification,Item Website Specification
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox adgangsnøgle
-DocType: Payment Tool,Reference No,Referencenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af ​​sin levetid på {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årligt
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
-DocType: Stock Entry,Sales Invoice No,Salg faktura nr
-DocType: Material Request Item,Min Order Qty,Min prisen evt
-DocType: Lead,Do Not Contact,Må ikke komme i kontakt
-DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
-DocType: Item,Minimum Order Qty,Minimum Antal
-DocType: Pricing Rule,Supplier Type,Leverandør Type
-DocType: Item,Publish in Hub,Offentliggør i Hub
-,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Materiale Request
-DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
-DocType: Item,Purchase Details,Køb Detaljer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i "Raw Materials Leveres 'bord i Indkøbsordre {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Stålbørstning
-DocType: Employee,Relation,Relation
-apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
-DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
-DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Felt fås i Delivery Note, Citat, Sales Invoice, Sales Order"
-DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Er Primær Kontaktperson
-DocType: Notification Control,Notification Control,Meddelelse Kontrol
-DocType: Lead,Suggestions,Forslag
-DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-wise budgetter på denne Territory. Du kan også medtage sæsonudsving ved at indstille Distribution.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Indtast venligst forælder konto gruppe for lager {0}
-DocType: Supplier,Address HTML,Adresse HTML
-DocType: Lead,Mobile No.,Mobil No.
-DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Sænksmedning
-DocType: Purchase Invoice Item,Expense Head,Expense Hoved
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vælg Charge Type først
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 tegn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Vælg dit sprog
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første Lad Godkender i listen, vil blive indstillet som standard Forlad Godkender"
-DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
-Operations shall not be tracked against Production Order",Deaktiverer oprettelsen af ​​tid logs mod produktionsordrer. Operationer må ikke spores mod produktionsordre
-DocType: Accounts Settings,Settings for Accounts,Indstillinger for konti
-apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrer Sales Person Tree.
-DocType: Item,Synced With Hub,Synkroniseret med Hub
-apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Forkert Adgangskode
-DocType: Item,Variant Of,Variant af
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Vare {0} skal være service Item
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end 'antal til Fremstilling'
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserboring
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
-DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
-DocType: Employee,External Work History,Ekstern Work History
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Vil du virkelig ønsker at stoppe
-DocType: Communication,Closed,Lukket
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Er du sikker på du vil STOP
-DocType: Lead,Industry,Industri
-DocType: Employee,Job Profile,Job profil
-DocType: Newsletter,Newsletter,Nyhedsbrev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Element er opdateret
-DocType: Async Task,System Manager,System Manager
-DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
-DocType: Sales Invoice Item,Delivery Note,Følgeseddel
-DocType: Dropbox Backup,Allow Dropbox Access,Tillad Dropbox Access
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
-DocType: Workstation,Rent Cost,Leje Omkostninger
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
-DocType: Employee,Company Email,Firma Email
-DocType: Workflow State,Refresh,Opdater
-DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle import- relaterede områder som valuta, konverteringsfrekvens, samlede import, import grand total etc er tilgængelige i købskvittering, leverandør Citat, købsfaktura, Indkøbsordre etc."
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre 'Ingen Copy "er indstillet"
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Samlet Order Anses
-apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Indtast 'Gentag på dag i måneden »felt værdi
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
-DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
-DocType: Item Tax,Tax Rate,Skat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Vælg Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
-					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
-apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
-DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuel Stock UOM
-apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) af et element.
-DocType: C-Form Invoice Detail,Invoice Date,Faktura Dato
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-mail-adresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Se venligst vedhæftede
-DocType: Purchase Order,% Received,% Modtaget
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vandstråleskæring
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Opsætning Allerede Complete !!
-,Finished Goods,Færdigvarer
-DocType: Delivery Note,Instructions,Instruktioner
-DocType: Quality Inspection,Inspected By,Inspiceres af
-DocType: Maintenance Visit,Maintenance Type,Vedligeholdelse Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
-DocType: Leave Application,Leave Approver Name,Lad Godkender Navn
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Pris List Valuta ikke valgt
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Række {0}: Betaling Beløb kan ikke være større end udestående beløb
+DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
 ,Schedule Date,Tidsplan Dato
-DocType: Packed Item,Packed Item,Pakket Vare
-apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardindstillinger for at købe transaktioner.
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitet Omkostninger eksisterer for Medarbejder {0} mod Activity Type - {1}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Tøv ikke oprette konti for kunder og leverandører. De er skabt direkte fra kunden / Leverandør mestre.
-DocType: Currency Exchange,Currency Exchange,Valutaveksling
-DocType: Purchase Invoice Item,Item Name,Item Name
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
-DocType: Employee,Widowed,Enke
-DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Varer der skal ansøges som er "på lager" i betragtning af alle lagre baseret på forventede qty og mindste bestilling qty
-DocType: Workstation,Working Hours,Arbejdstider
-DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
-,Purchase Register,Indkøb Register
-DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
-DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Årsag til at miste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
-DocType: Employee,Single,Enkeltværelse
-DocType: Issue,Attachment,Attachment
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan ikke indstilles for gruppe Cost center
-DocType: Account,Cost of Goods Sold,Vareforbrug
-DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Indtast Cost center
-DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Gns. Salgskurs
-DocType: Purchase Order,Start date of current order's period,Startdato for nuværende ordres periode
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Mængde kan ikke være en del i række {0}
-DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
-DocType: Delivery Note,% Installed,% Installeret
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Indtast venligst firmanavn først
-DocType: BOM,Item Desription,Item desription
-DocType: Purchase Invoice,Supplier Name,Leverandør Navn
-DocType: Account,Is Group,Is Group
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Langskæring
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sag nr.' kan ikke være mindre end 'Fra sag nr.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ikke i gang
-DocType: Lead,Channel Partner,Channel Partner
-DocType: Account,Old Parent,Gammel Parent
-DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tilpas den indledende tekst, der går som en del af denne e-mail. Hver transaktion har en separat indledende tekst."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Salg Master manager
-apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
-DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
-DocType: SMS Log,Sent On,Sendt On
-DocType: Sales Order,Not Applicable,Gælder ikke
-apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Skalstøbning
-DocType: Material Request Item,Required Date,Nødvendig Dato
-DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Indtast venligst Item Code.
-DocType: BOM,Costing,Koster
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
-DocType: Employee,Health Concerns,Sundhedsmæssige betænkeligheder
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Ulønnet
-DocType: Packing Slip,From Package No.,Fra pakken No.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
-DocType: Features Setup,Imports,Import
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Limning
-DocType: Job Opening,Description of a Job Opening,Beskrivelse af et job Åbning
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Fremmøde rekord.
-DocType: Bank Reconciliation,Journal Entries,Journaloptegnelser
-DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
-DocType: System Settings,Loading...,Indlæser ...
-DocType: DocField,Password,Adgangskode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused deposition modeling
-DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
-DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
-DocType: Journal Entry,Accounts Payable,Kreditor
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tilføj Abonnenter
-sites/assets/js/erpnext.min.js +5,""" does not exists",' findes ikke
-DocType: Pricing Rule,Valid Upto,Gyldig Op
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Indkomst
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
-DocType: Payment Tool,Received Or Paid,Modtaget eller betalt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Vælg Firma
-DocType: Stock Entry,Difference Account,Forskel konto
-apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke opgave som sin afhængige opgave {0} ikke er lukket.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
-DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetik
-DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
-DocType: Communication,Subject,Emne
-DocType: Shipping Rule,Net Weight,Vægt
-DocType: Employee,Emergency Phone,Emergency Phone
-,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Vil du virkelig ønsker at stoppe denne Material Request?
-DocType: Sales Order,To Deliver,Til at levere
-DocType: Purchase Invoice Item,Item,Vare
-DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
-DocType: Account,Profit and Loss,Resultatopgørelse
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Ny UOM må IKKE være af typen heltal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og Fixture
-DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
-DocType: Selling Settings,Default Customer Group,Standard Customer Group
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, 'Afrundet Total' felt, vil ikke være synlig i enhver transaktion"
-DocType: BOM,Operating Cost,Driftsomkostninger
-,Gross Profit,Gross Profit
-DocType: Production Planning Tool,Material Requirement,Material Requirement
-DocType: Company,Delete Company Transactions,Slet Company Transaktioner
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
-					Email Address'","{0} er en ugyldig e-mail-adresse i ""Notification \ e-mail adresse'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Samlet fakturering Dette år:
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
-DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
-DocType: Territory,For reference,For reference
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Lukning (Cr)
-DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
-DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
-DocType: Job Applicant,Thread HTML,Tråd HTML
-DocType: Company,Ignore,Ignorer
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
-DocType: Pricing Rule,Valid From,Gyldig fra
-DocType: Sales Invoice,Total Commission,Samlet Kommissionen
-DocType: Pricing Rule,Sales Partner,Salg Partner
-DocType: Buying Settings,Purchase Receipt Required,Kvittering Nødvendig
-DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
-
-To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjælper du distribuerer dit budget tværs måneder, hvis du har sæsonudsving i din virksomhed. At distribuere et budget ved hjælp af denne fordeling, skal du indstille dette ** Månedlig Distribution ** i ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ingen resultater i Invoice tabellen
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vælg Company og Party Type først
-apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiel / regnskabsår.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Make kundeordre
-DocType: Project Task,Project Task,Project Task
-,Lead Id,Bly Id
-DocType: C-Form Invoice Detail,Grand Total,Grand Total
-DocType: About Us Settings,Website Manager,Website manager
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
-DocType: Warranty Claim,Resolution,Opløsning
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
-DocType: Leave Control Panel,Allocate,Tildele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Salg Return
-DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vælg salgsordrer, som du ønsker at skabe produktionsordrer."
-apps/erpnext/erpnext/config/hr.py +120,Salary components.,Løn komponenter.
-apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
-apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
-DocType: Quotation,Quotation To,Citat Til
-DocType: Lead,Middle Income,Midterste indkomst
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
-DocType: Purchase Order Item,Billed Amt,Billed Amt
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referencenummer & Reference Dato er nødvendig for {0}
-DocType: Event,Wednesday,Onsdag
-DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden Sales Person {0} eksisterer med samme Medarbejder id
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
-DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
-DocType: Packing Slip Item,DN Detail,DN Detail
-DocType: Time Log,Billed,Billed
-DocType: Batch,Batch Description,Batch Beskrivelse
-DocType: Delivery Note,Time at which items were delivered from warehouse,"Tidspunkt, hvor varerne blev leveret fra lageret"
-DocType: Sales Invoice,Sales Taxes and Charges,Salg Skatter og Afgifter
-DocType: Employee,Organization Profile,Organisation profil
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Venligst setup nummerering serie for Deltagelse via Setup> Nummerering Series
-DocType: Employee,Reason for Resignation,Årsag til Udmeldelse
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
 apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Skabelon til præstationsvurderinger.
-DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Kassekladde Detaljer
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' ikke i regnskabsåret {2}
-DocType: Buying Settings,Settings for Buying Module,Indstillinger til køb modul
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Indtast venligst kvittering først
-DocType: Buying Settings,Supplier Naming By,Leverandør Navngivning Af
-DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Du installere dropbox python-modul
-DocType: Employee,Passport Number,Passport Number
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Leder
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Fra kvittering
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samme element er indtastet flere gange.
-DocType: SMS Settings,Receiver Parameter,Modtager Parameter
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
-DocType: Sales Person,Sales Person Targets,Salg person Mål
-sites/assets/js/form.min.js +271,To,Til
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Indtast e-mail-adresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ende rør danner
-DocType: Production Order Operation,In minutes,I minutter
-DocType: Issue,Resolution Date,Opløsning Dato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
-DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
-apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til Group
-DocType: Activity Cost,Activity Type,Aktivitet Type
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Leveres Beløb
-DocType: Customer,Fixed Days,Faste dage
-DocType: Sales Invoice,Packing List,Pakning List
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
-DocType: Activity Cost,Projects User,Projekter Bruger
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
-DocType: Company,Round Off Cost Center,Afrunde Cost center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
-DocType: Material Request,Material Transfer,Materiale Transfer
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åbning (dr)
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Indstillinger
-DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
-DocType: Production Order Operation,Actual Start Time,Faktiske Start Time
-DocType: BOM Operation,Operation Time,Operation Time
-sites/assets/js/list.min.js +5,More,Mere
-DocType: Pricing Rule,Sales Manager,Salgschef
-sites/assets/js/desk.min.js +7673,Rename,Omdøb
-DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bøjning
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillad Bruger
-DocType: Journal Entry,Bill No,Bill Ingen
-DocType: Purchase Invoice,Quarterly,Kvartalsvis
-DocType: Selling Settings,Delivery Note Required,Følgeseddel Nødvendig
-DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Indtast venligst item detaljer
-DocType: Purchase Receipt,Other Details,Andre detaljer
-DocType: Account,Accounts,Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Lige klipning
-DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
-DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
-DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
-DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
-DocType: Hub Settings,Seller City,Sælger By
-DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
-DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Element har varianter.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
-DocType: Bin,Stock Value,Stock Value
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
-DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal Consumed Per Unit
-DocType: Serial No,Warranty Expiry Date,Garanti Udløbsdato
-DocType: Material Request Item,Quantity and Warehouse,Mængde og Warehouse
-DocType: Sales Invoice,Commission Rate (%),Kommissionen Rate (%)
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Imod Voucher type skal være en af ​​kundeordre, Salg Faktura eller Kassekladde"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Velkommen
-DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
+DocType: Hub Settings,Hub Settings,Hub Indstillinger
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Indsendt
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Emne
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Varer modtaget fra leverandører.
-DocType: Communication,Open,Åbent
-DocType: Lead,Campaign Name,Kampagne Navn
-,Reserved,Reserveret
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Vil du virkelig ønsker at UNSTOP
-DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} er ikke et lager Vare
-DocType: Mode of Payment Account,Default Account,Standard-konto
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
-DocType: Contact Us Settings,Address Title,Adresse Titel
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vælg ugentlige off dag
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
+DocType: Features Setup,Quality,Kvalitet
+DocType: Pricing Rule,Sales Partner,Salg Partner
+DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
+DocType: Journal Entry,Total Credit,Total Credit
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Hastighed, hvormed leverandørens valuta omregnes til virksomhedens basisvaluta"
+DocType: Sales Invoice,Source,Kilde
+apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Indtast Referencedato
+apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Din regnskabsår begynder på
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Opret ny
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Sæt som Lost
+DocType: Sales Order,Recurring Order,Tilbagevendende Order
+DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
 DocType: Production Order Operation,Planned End Time,Planned Sluttid
-,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
-DocType: Dropbox Backup,Daily,Daglig
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
-DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
-DocType: Employee,Cell Number,Cell Antal
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i "Mod Kassekladde 'kolonne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
-DocType: Opportunity,Opportunity From,Mulighed Fra
-apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
-DocType: Item Group,Website Specifications,Website Specifikationer
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Ny konto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
-DocType: ToDo,High,Høj
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
-DocType: Opportunity,Maintenance,Vedligeholdelse
-DocType: User,Male,Mand
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
-DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
-apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampagner.
+DocType: Upload Attendance,Get Template,Få skabelon
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
+,Available Qty,Tilgængelig Antal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Make kundeordre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløb
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
+DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
+DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
+DocType: Serial No,Delivery Time,Leveringstid
+DocType: Mode of Payment Account,Default Account,Standard-konto
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Cost Center For Item med Item Code '
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
+DocType: Lead,Next Contact By,Næste Kontakt By
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+DocType: Bin,Actual Quantity,Faktiske Mængde
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
+DocType: Stock Entry,Subcontract,Underleverance
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Velkommen til ERPNext
+DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
+DocType: Purchase Taxes and Charges,Account Head,Konto hoved
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Sandblæsnings udstyr
+apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Samlet Target
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
+DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
+DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
+DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
+DocType: Payment Reconciliation Invoice,Outstanding Amount,Udestående beløb
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åbning (dr)
+DocType: Account,Accounts User,Regnskab Bruger
+DocType: Rename Tool,Rename Tool,Omdøb Tool
+DocType: Delivery Note,Print Without Amount,Print uden Beløb
+DocType: C-Form,Invoices,Fakturaer
+DocType: Item Attribute,Item Attribute,Item Attribut
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,I dag er {0} 's fødselsdag!
+DocType: Deduction Type,Deduction Type,Fradrag Type
+DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
+DocType: Stock Settings,Item Naming By,Item Navngivning By
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -652,1257 +92,3469 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard skat skabelon, der kan anvendes på alle salgstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre udgifter / indtægter hoveder som "Shipping", "forsikring", "Håndtering" osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer **. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af ​​grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på "Forrige Row alt" kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Er det Tax inkluderet i Basic Rate ?: Hvis du markerer dette, betyder det, at denne skat ikke vil blive vist under elementet bordet, men vil indgå i Basic Rate i din vigtigste punkt bordet. Dette er nyttigt, når du ønsker at give en flad pris (inklusive alle afgifter) pris til kunderne."
-DocType: Employee,Bank A/C No.,Bank A / C No.
-DocType: Expense Claim,Project,Projekt
-DocType: Quality Inspection Reading,Reading 7,Reading 7
-DocType: Address,Personal,Personlig
-DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
-DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kassekladde {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office vedligeholdelsesudgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Indtast Vare først
-DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioneret Beløb kan ikke være større end krav Beløb i Row {0}.
-DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Prisliste ikke valgt
-DocType: Employee,Family Background,Familie Baggrund
-DocType: Process Payroll,Send Email,Send Email
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen Tilladelse
-DocType: Company,Default Bank Account,Standard bankkonto
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
-DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mine Fakturaer
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Ingen medarbejder fundet
-DocType: Purchase Order,Stopped,Stoppet
-DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
-apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Vælg BOM at starte
-DocType: SMS Center,All Customer Contact,Alle Customer Kontakt
-apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload lager balance via csv.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu
-,Support Analytics,Support Analytics
-DocType: Item,Website Warehouse,Website Warehouse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Vil du virkelig ønsker at stoppe produktionen rækkefølge:
-DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv"
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5
-apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form optegnelser
-apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Kunde og leverandør
-DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
-apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support forespørgsler fra kunder.
-DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
-DocType: Production Planning Tool,Select Items,Vælg emner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} mod regning {1} ​​dateret {2}
-DocType: Comment,Reference Name,Henvisning Navn
-DocType: Maintenance Visit,Completion Status,Afslutning status
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
-DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,"Forventet leveringsdato kan ikke være, før Sales Order Date"
-DocType: Upload Attendance,Import Attendance,Import Fremmøde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
-DocType: Process Payroll,Activity Log,Activity Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Resultat / Loss
-apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
-DocType: Production Order,Item To Manufacture,Item Til Fremstilling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent formstøbning
-DocType: Sales Order Item,Projected Qty,Projiceret Antal
-DocType: Sales Invoice,Payment Due Date,Betaling Due Date
-DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Åbning'
-DocType: Notification Control,Delivery Note Message,Levering Note Message
-DocType: Expense Claim,Expenses,Udgifter
-,Purchase Receipt Trends,Kvittering Tendenser
-DocType: Appraisal,Select template from which you want to get the Goals,"Vælg skabelon, hvorfra du ønsker at få de mål"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forskning & Udvikling
-,Amount to Bill,Beløb til Bill
-DocType: Company,Registration Details,Registrering Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Satsningen
-DocType: Item,Re-Order Qty,Re-prisen evt
-DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt at sende til {0}
-DocType: Pricing Rule,Price or Discount,Pris eller rabat
-DocType: Sales Team,Incentives,Incitamenter
-DocType: SMS Log,Requested Numbers,Anmodet Numbers
-apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Præstationsvurdering.
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Kan ikke fortsætte {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
-DocType: Account,Balance must be,Balance skal være
-DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
-DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Sømning
-,Available Qty,Tilgængelig Antal
-DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
-DocType: Salary Slip,Working Days,Arbejdsdage
-DocType: Serial No,Incoming Rate,Indgående Rate
-DocType: Packing Slip,Gross Weight,Bruttovægt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Navnet på din virksomhed, som du oprette dette system."
-DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i alt nej. Arbejdsdage
-DocType: Job Applicant,Hold,Hold
-DocType: Employee,Date of Joining,Dato for Sammenføjning
-DocType: Naming Series,Update Series,Opdatering Series
-DocType: Supplier Quotation,Is Subcontracted,Underentreprise
-DocType: Item Attribute,Item Attribute Values,Item Egenskab Værdier
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
-DocType: Purchase Invoice Item,Purchase Receipt,Kvittering
-,Received Items To Be Billed,Modtagne varer skal faktureres
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sandblæsning
-sites/assets/js/desk.min.js +3938,Ms,Ms
+apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
+DocType: Material Request Item,Required Date,Nødvendig Dato
+apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal År: {0} ikke eksisterer
+,Supplier-Wise Sales Analytics,Forhandler-Wise Sales Analytics
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Fra Material Request
+,Customers Not Buying Since Long Time,Kunder Ikke købe siden lang tid
+DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Time Log {0} skal være »Tilmeldt '
+DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Varer der skal ansøges som er "på lager" i betragtning af alle lagre baseret på forventede qty og mindste bestilling qty
+DocType: Hub Settings,Hub Node,Hub Node
+DocType: Communication,Rejected,Afvist
+DocType: Employee,Personal Details,Personlige oplysninger
+DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
+DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Udskift Utility
+DocType: Purchase Invoice,Total Advance,Samlet Advance
+DocType: Production Order,Actual Start Date,Faktiske startdato
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity støbning
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
+DocType: Employee,Place of Issue,Sted for Issue
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
-DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} skal være aktiv
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vælg dokumenttypen først
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
-DocType: Salary Slip,Leave Encashment Amount,Lad Indløsning Beløb
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Løbenummer {0} ikke hører til Vare {1}
-DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
-DocType: Bank Reconciliation,Total Amount,Samlet beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
-DocType: Production Planning Tool,Production Orders,Produktionsordrer
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Value
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg prisliste
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Udgive synkronisere emner
-apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
-DocType: Purchase Receipt,Range,Range
+DocType: Appraisal,For Employee,For Medarbejder
+DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
+DocType: Job Applicant,Applicant Name,Ansøger Navn
+DocType: Quality Inspection,Readings,Aflæsninger
+DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Skal du bekræfte din e-mail-id
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af ​​dens varianter"
+DocType: Features Setup,POS View,POS View
+DocType: Sales Order Item,Produced Quantity,Produceret Mængde
+DocType: Sales Partner,Sales Partner Target,Salg Partner Target
+DocType: Journal Entry Account,Sales Order,Sales Order
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
+apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel Tildeling bør være lig med 100%
+DocType: Account,Accounts Manager,Accounts Manager
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firma Forkortelse
+apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
+DocType: Issue,Resolution Date,Opløsning Dato
+DocType: Maintenance Schedule Item,No of Visits,Ingen af ​​besøg
+DocType: Employee,Ms,Ms
+apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampagner.
+DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udgifter' rolle
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Milling
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Undersænkning
+DocType: Sales Order Item,Sales Order Date,Sales Order Date
+DocType: Production Order Operation,In minutes,I minutter
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Udhugning
 DocType: Supplier,Default Payable Accounts,Standard betales Konti
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
-DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Item Varianter {0} opdateret
-DocType: Quality Inspection Reading,Reading 6,Læsning 6
+DocType: Quality Inspection Reading,Reading 7,Reading 7
+DocType: Communication,Delivery Status,Levering status
+DocType: Event,Wednesday,Onsdag
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhedsbrev er allerede blevet sendt
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (Antal)
+DocType: Manufacturing Settings,Manufacturing Settings,Manufacturing Indstillinger
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: På grund / reference Date overstiger tilladte kunde kredit dage efter {0} dag (e)
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Health Care
+DocType: Notification Control,Notification Control,Meddelelse Kontrol
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
-DocType: Address,Shop,Butik
-DocType: Hub Settings,Sync Now,Synkroniser nu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
-DocType: Employee,Permanent Address Is,Faste adresse
-DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
-DocType: Employee,Exit Interview Details,Exit Interview Detaljer
-DocType: Item,Is Purchase Item,Er Indkøb Item
-DocType: Journal Entry Account,Purchase Invoice,Indkøb Faktura
-DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
-DocType: Stock Entry,Total Outgoing Value,Samlet Udgående Value
-DocType: Lead,Request for Information,Anmodning om information
-DocType: Payment Tool,Paid,Betalt
-DocType: Salary Slip,Total in words,I alt i ord
-DocType: Material Request Item,Lead Time Date,Leveringstid Dato
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For 'Product Bundle' elementer, Warehouse, Serial No og Batch Ingen vil blive betragtet fra "Packing List 'bord. Hvis Warehouse og Batch Ingen er ens for alle emballage poster for enhver "Product Bundle 'post, kan indtastes disse værdier i de vigtigste element tabellen, vil værdierne blive kopieret til" Packing List' bord."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Forsendelser til kunderne.
-DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Indkomst
-DocType: Contact Us Settings,Address Line 1,Adresse Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmaets navn
-DocType: SMS Center,Total Message(s),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Vælg Item for Transfer
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
-DocType: Pricing Rule,Max Qty,Max Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
-DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den relevante gruppe (som regel Anvendelse af fondene> Omsætningsaktiver> bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen "Bank"
-DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
-DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejder Fødselsdag Påmindelser
-DocType: Comment,Unsubscribed,Afmeldt
-DocType: Opportunity,Walk In,Walk In
-DocType: Item,Inspection Criteria,Inspektion Kriterier
-apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial Cost Centers.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvid
-DocType: SMS Center,All Lead (Open),Alle Bly (Open)
-DocType: Purchase Invoice,Get Advances Paid,Få forskud
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Vedhæft dit billede
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Lave
-DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
-DocType: Workflow State,Stop,Stands
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Bestil type skal være en af ​​{0}
-DocType: Lead,Next Contact Date,Næste Kontakt Dato
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
-DocType: Holiday List,Holiday List Name,Holiday listenavn
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Aktieoptioner
-DocType: Journal Entry Account,Expense Claim,Expense krav
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antal for {0}
-DocType: Leave Application,Leave Application,Forlad Application
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lad Tildeling Tool
-DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimning
-DocType: Workstation,Net Hour Rate,Net Hour Rate
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
-DocType: Company,Default Terms,Standard Vilkår
-DocType: Packing Slip Item,Packing Slip Item,Packing Slip Vare
-DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
-DocType: Delivery Note,Delivery To,Levering Til
-DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivering
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
-DocType: Features Setup,Purchase Discounts,Køb Rabatter
-DocType: Workstation,Wages,Løn
-DocType: Time Log,Will be updated only if Time Log is 'Billable',"Vil kun blive opdateret, hvis Time Log er "faktureres""
-DocType: Project,Internal,Intern
-DocType: Task,Urgent,Urgent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
-DocType: Item,Manufacturer,Producent
-DocType: Landed Cost Item,Purchase Receipt Item,Kvittering Vare
-DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Selling Beløb
-apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater "Status" og Gem
-DocType: Serial No,Creation Document No,Creation dokument nr
-DocType: Issue,Issue,Issue
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item Varianter. f.eks størrelse, farve etc."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
-DocType: BOM Operation,Operation,Operation
-DocType: Lead,Organization Name,Organisationens navn
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af "Find varer fra Køb Kvitteringer 'knappen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Buying
-DocType: GL Entry,Against,Imod
-DocType: Item,Default Selling Cost Center,Standard Selling Cost center
-DocType: Sales Partner,Implementation Partner,Implementering Partner
-DocType: Opportunity,Contact Info,Kontakt Info
-DocType: Packing Slip,Net Weight UOM,Nettovægt UOM
-DocType: Item,Default Supplier,Standard Leverandør
-DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
-DocType: Shipping Rule Condition,Shipping Rule Condition,Forsendelse Rule Betingelse
-DocType: Features Setup,Miscelleneous,Miscelleneous
-DocType: Holiday List,Get Weekly Off Dates,Få ugentlige Off Datoer
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
-DocType: Sales Person,Select company name first.,Vælg firmanavn først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citater modtaget fra leverandører.
-apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Til {0} | {1} {2}
-DocType: Time Log Batch,updated via Time Logs,opdateret via Time Logs
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
-DocType: Opportunity,Your sales person who will contact the customer in future,"Dit salg person, som vil kontakte kunden i fremtiden"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
-DocType: Company,Default Currency,Standard Valuta
-DocType: Contact,Enter designation of this Contact,Indtast udpegelsen af ​​denne Kontakt
-DocType: Contact Us Settings,Address,Adresse
-DocType: Expense Claim,From Employee,Fra Medarbejder
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
-DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
-DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato
-DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
-DocType: SMS Center,Total Characters,Total tegn
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
-DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
-DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Afstemning Faktura
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
-DocType: Item,website page link,webside link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Lad os forberede systemet til første brug.
-DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firma registreringsnumre til din reference. Skat numre etc.
-DocType: Sales Partner,Distributor,Distributør
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
-,Ordered Items To Be Billed,Bestilte varer at blive faktureret
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vælg Time Logs og Send for at oprette en ny Sales Invoice.
-DocType: Global Defaults,Global Defaults,Globale standarder
-DocType: Salary Slip,Deductions,Fradrag
-DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nuværende faktura menstruation
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Batch er blevet faktureret.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opret Opportunity
-DocType: Salary Slip,Leave Without Pay,Lad uden løn
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
+DocType: Employee,Salary Mode,Løn-tilstand
+,Sales Analytics,Salg Analytics
+apps/erpnext/erpnext/config/hr.py +120,Salary components.,Løn komponenter.
 DocType: Supplier,Communications,Kommunikation
+apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenesteydelser.
+DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Tilføj Skatter
+DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Åbning'
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Make Time Log Batch
+DocType: Serial No,Out of Warranty,Ud af garanti
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail-meddelelser
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Make Vedligeholdelse Besøg
+DocType: Warehouse,Warehouse Contact Info,Lager Kontakt Info
+DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen."
+DocType: Employee,Offer Date,Offer Dato
+DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock kø (FIFO)
+DocType: Sales Order,Delivery Date,Leveringsdato
+DocType: Sales Order,Billing Status,Fakturering status
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Harpiks støbning
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serien {0} allerede anvendes i {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra indkøbsordre
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke lov til at opdatere lagertransaktioner ældre end {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
+,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
+DocType: C-Form Invoice Detail,Grand Total,Grand Total
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Materiale Anmodning {0} skabt
+DocType: System Settings,In Hours,I Hours
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity Lost
+DocType: Customer,From Lead,Fra Lead
+DocType: Supplier,Credit Days,Credit Dage
+DocType: Operation,Default Workstation,Standard Workstation
+DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
+DocType: Supplier,Contact HTML,Kontakt HTML
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Buying
+DocType: Purchase Taxes and Charges,Actual,Faktiske
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+DocType: Sales Team,Contribution (%),Bidrag (%)
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En anden Løn Struktur {0} er aktiv for medarbejder {1}. Venligst gøre sin status "Inaktiv" for at fortsætte.
+DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke ændres for Serial No.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
+DocType: Customer,Credit Days Based On,Credit Dage Baseret på
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke Sæt
+DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
+DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
+DocType: Company,Abbr,Fork
+apps/frappe/frappe/website/template.py +140,Next,Næste
+apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Generelt
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taget
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Indstil som standard
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsstøbning
+DocType: Supplier,Is Frozen,Er Frozen
+DocType: Employee External Work History,Total Experience,Total Experience
+,Amount to Bill,Beløb til Bill
+,Item-wise Price List Rate,Item-wise Prisliste Rate
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse kan kun ændres via Stock indtastning / følgeseddel / kvittering
+,Pending Amount,Afventer Beløb
+DocType: Newsletter,Test Email Id,Test Email Id
+DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vælg salgsordrer, som du ønsker at skabe produktionsordrer."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operationer kan ikke være tomt.
+DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitet Omkostninger eksisterer for Medarbejder {0} mod Activity Type - {1}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
+apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Kunde og leverandør
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde Fra Dato og fremmøde til dato er obligatorisk
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
+DocType: SMS Center,All Sales Partner Contact,Alle Sales Partner Kontakt
+DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Dine kunder
+,Produced,Produceret
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rød
+DocType: Quality Inspection Reading,Reading 8,Reading 8
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
+,Customer Credit Balance,Customer Credit Balance
+DocType: Journal Entry,Stock Entry,Stock indtastning
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Sænksmedning
+DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
+DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer.
+DocType: GL Entry,Against Voucher Type,Mod Voucher Type
+DocType: Journal Entry Account,Party Balance,Party Balance
+DocType: Authorization Control,Authorization Control,Authorization Kontrol
+apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
+DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
+DocType: Lead,Campaign Name,Kampagne Navn
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
+DocType: Activity Cost,Billing Rate,Fakturering Rate
+DocType: Account,Chargeable,Gebyr
+DocType: Lead,Request for Information,Anmodning om information
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Dagblades
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investeringer støbning
+DocType: Buying Settings,Naming Series,Navngivning Series
+DocType: Account,Cost of Goods Sold,Vareforbrug
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første Lad Godkender i listen, vil blive indstillet som standard Forlad Godkender"
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiale Request af maksimum {0} kan gøres for Item {1} mod Sales Order {2}
+DocType: Journal Entry,Accounts Payable,Kreditor
+DocType: Sales Partner,Dealer,Forhandler
+DocType: Purchase Invoice,Monthly,Månedlig
+apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Udfyld formularen og gemme det
+DocType: Global Defaults,Global Defaults,Globale standarder
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
+DocType: Purchase Invoice,Items,Varer
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direkte metal lasersintring
+DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse tilføjet endnu.
+DocType: Appraisal Goal,Goal,Goal
+apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support forespørgsler fra kunder.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Strygning
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vælg Company ...
+DocType: Pricing Rule,Price or Discount,Pris eller rabat
+DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
+DocType: Pricing Rule,Valid Upto,Gyldig Op
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Detail & Wholesale
+DocType: Sales Invoice,Commission,Kommissionen
+DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
+DocType: Workflow State,Stop,Stands
+DocType: Authorization Rule,Applicable To (Role),Gælder for (Rolle)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
+DocType: Pricing Rule,Supplier,Leverandør
+DocType: DocField,Password,Adgangskode
+DocType: Account,Expense,Expense
+DocType: Journal Entry,Remark,Bemærkning
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dine Leverandører
+apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})",Total forhånd ({0}) mod Order {1} kan ikke være større \ end Grand Total ({2})
+DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
+DocType: Production Order Operation,Updated via 'Time Log',Opdateret via 'Time Log'
+DocType: Lead,Fax,Fax
+,Profit and Loss Statement,Resultatopgørelse
+DocType: Lead,Lead,Bly
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger poster saldi opdateret
+apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Vare {0} skal være Salg eller service Item i {1}
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Ny {0} Navn
+apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
+DocType: Leave Block List,Leave Block List Name,Lad Block List Name
+DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
+DocType: Purchase Order,Ref SQ,Ref SQ
+DocType: SMS Settings,Receiver Parameter,Modtager Parameter
+DocType: C-Form,Customer,Kunde
+DocType: Serial No,Purchase / Manufacture Details,Køb / Fremstilling Detaljer
+DocType: SMS Center,SMS Center,SMS-center
+DocType: Manufacturing Settings,Allow Production on Holidays,Tillad Produktion på helligdage
+DocType: Quality Inspection Reading,Reading 9,Reading 9
+DocType: Event,Sunday,Søndag
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Hæftning
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
+DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
+DocType: Pricing Rule,Price,Pris
+DocType: Naming Series,Update Series,Opdatering Series
+apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} ikke hører til virksomheden {1}
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Gns. Salgskurs
+DocType: Journal Entry Account,Purchase Invoice,Indkøb Faktura
+DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Bemærk: Hvis betaling ikke sker mod nogen reference, gør Kassekladde manuelt."
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
+DocType: Sales Partner,Sales Partner Name,Salg Partner Navn
+DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til print)
+DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
+DocType: Address Template,"
    Default Template
    
+
    Uses Jinja Templating and all the fields of Address (including Custom Fields if any) will be available
    
+
    {{ address_line1 }}<br>
+{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
+{{ city }}<br>
+{% if state %}{{ state }}<br>{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}<br>{% endif -%}
+{{ country }}<br>
+{% if phone %}Phone: {{ phone }}<br>{% endif -%}
+{% if fax %}Fax: {{ fax }}<br>{% endif -%}
+{% if email_id %}Email: {{ email_id }}<br>{% endif -%}
+
    ","
     Standardskabelon 
     Bruger Jinja Templatering og alle områderne adresse (herunder brugerdefinerede felter hvis nogen) vil være til rådighed 
     {{ address_line1 }}<br> {% if address_line2 %}{{ address_line2 }}<br>{% endif -%} {{ city }}<br> {% if state %}{{ state }}<br>{% endif -%} {% if pincode %} PIN: {{ pincode }}<br>{% endif -%} {{ country }}<br> {% if phone %}Phone: {{ phone }}<br>{% endif -%} {% if fax %}Fax: {{ fax }}<br>{% endif -%} {% if email_id %}Email: {{ email_id }}<br>{% endif -%} 
    "
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Vælg dit sprog
+DocType: Employee,Owned,Ejet
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
+DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
+apps/erpnext/erpnext/hooks.py +70,Orders,Ordrer
+apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
+DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hæv Materiale Request når bestanden når re-order-niveau
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
+DocType: POS Profile,[Select],[Vælg]
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivering
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
+DocType: Batch,Batch,Batch
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
+DocType: Leave Application,Total Leave Days,Total feriedage
+apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansøgning om orlov.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opsætning
+DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Sort
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} er allerede indsendt
+DocType: Time Log,Operation ID,Operation ID
+DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","At spore mærke i følgende dokumenter Delivery Note, Opportunity, Material Request, punkt, Indkøbsordre, Indkøb Gavekort, køber Modtagelse, Citat, Sales Faktura, Produkt Bundle, salgsordre, Løbenummer"
+DocType: Production Order,Operation Cost,Operation Cost
+apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler til print skabeloner f.eks Proforma Invoice.
+DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
+DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjælp
+DocType: Communication,Closed,Lukket
+DocType: Quotation,Term Details,Term Detaljer
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoudtog
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brev hoveder for print skabeloner.
+DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle eksport relaterede områder som valuta, konverteringsfrekvens, eksport i alt, eksport grand total etc er tilgængelige i Delivery Note, POS, Citat, Sales Invoice, Sales Order etc."
+DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
+DocType: Packing Slip,Gross Weight,Bruttovægt
+DocType: Communication,Email,Email
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Ny Cost center navn
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
+DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
+DocType: Hub Settings,Seller City,Sælger By
+DocType: Material Request,Material Issue,Materiale Issue
+,Ordered Items To Be Delivered,"Bestilte varer, der skal leveres"
+DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
+DocType: Purchase Order Item,Qty as per Stock UOM,Antal pr Stock UOM
+DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vælg den periode, hvor fakturaen vil blive genereret automatisk"
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser manipuleret netto formgivning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Ulønnet
+DocType: DocField,Fold,Fold
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Kontroller, om du vil sende lønseddel i e-mail til den enkelte medarbejder, samtidig indsende lønseddel"
+DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
+apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} er obligatorisk
+DocType: SMS Settings,Enter url parameter for message,Indtast url parameter for besked
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kortfristede forpligtelser
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
+DocType: Selling Settings,Default Customer Group,Standard Customer Group
+DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af ​​denne pakke. (Beregnes automatisk som summen af ​​nettovægt på poster)
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink indpakning
+DocType: Shipping Rule,Calculate Based On,Beregn baseret på
+apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiel / regnskabsår.
+DocType: BOM,Costing,Koster
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
+DocType: Bin,Ordered Quantity,Bestilt Mængde
+,Purchase Order Items To Be Billed,Købsordre Varer at blive faktureret
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Vælg Item
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af ​​{0}
+DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende faktura, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
+DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto ordre vil blive genereret f.eks 05, 28 osv"
+DocType: SMS Center,All Sales Person,Alle Sales Person
+DocType: Account,Auditor,Revisor
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas danner
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Varehuse
+DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Betalt Amt
+DocType: Item,Valuation Method,Værdiansættelsesmetode
+DocType: BOM Item,BOM Item,BOM Item
+DocType: Sales Invoice,Mass Mailing,Mass Mailing
+,Bank Reconciliation Statement,Bank Saldoopgørelsen
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
+DocType: Custom Field,Custom,Brugerdefineret
+DocType: Opportunity,Maintenance,Vedligeholdelse
+DocType: Item,Customer Items,Kunde Varer
+DocType: Lead,Industry,Industri
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Indtast venligst firmanavn først
+DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
+DocType: Company,For Reference Only.,Kun til reference.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
+DocType: Lead,Middle Income,Midterste indkomst
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den dag (e), hvor du ansøger om orlov er ferie. Du har brug for ikke søge om orlov."
+DocType: Purchase Receipt,Rejected Warehouse,Afvist Warehouse
+apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
+apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhedsbrev Mailing List
+DocType: Production Order Operation,Work In Progress,Work In Progress
+DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
+DocType: Sales Order Item,For Production,For Produktion
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tryk fitting
+,Billed Amount,Faktureret beløb
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
+DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
+DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram af Cost Centers
+DocType: Shopping Cart Settings,Shopping Cart Settings,Indkøbskurv Indstillinger
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentarer
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
+DocType: Accounts Settings,Credit Controller,Credit Controller
+DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
+DocType: Email Account,Service,Service
+DocType: Purchase Taxes and Charges,Deduct,Fratrække
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Indtast standard valuta i Company Master
+,Financial Analytics,Finansielle Analytics
+DocType: Lead,Call,Opkald
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fejl: {0}> {1}
+DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Vedhæft Logo
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserboring
+DocType: Page,All,Alle
+DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
+DocType: Company,Retail,Retail
+DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
+DocType: Shipping Rule Condition,From Value,Fra Value
+DocType: Quality Inspection,Purchase Receipt No,Kvittering Nej
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
+,Qty to Order,Antal til ordre
+DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} er ikke et lager Vare
+apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Gem dokumentet først.
+apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhedsbrev
+DocType: Stock Settings,Default Item Group,Standard Punkt Group
+DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Angiv en
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Item Varianter {0} opdateret
+DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"I Ord vil være synlig, når du gemmer følgesedlen."
+DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
+DocType: Time Log,Projects Manager,Projekter manager
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig On
+DocType: Item Supplier,Item Supplier,Vare Leverandør
+DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
+DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
+apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke setup for Serial nr. Kolonne skal være tomt
+DocType: Offer Letter,Offer Letter Terms,Tilbyd Letter Betingelser
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorleje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
+DocType: Purchase Invoice,Total Taxes and Charges,Total Skatter og Afgifter
+DocType: Employee External Work History,Salary,Løn
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
+DocType: Employee,Bank Name,Bank navn
+apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
+DocType: Payment Tool,Set Matching Amounts,Set matchende Beløb
+DocType: Accounts Settings,Accounts Settings,Konti Indstillinger
+apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Indtast "underentreprise" som Ja eller Nej
+DocType: Attendance,Absent,Fraværende
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Lave
+DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
+DocType: File,old_parent,old_parent
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
+DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle import- relaterede områder som valuta, konverteringsfrekvens, samlede import, import grand total etc er tilgængelige i købskvittering, leverandør Citat, købsfaktura, Indkøbsordre etc."
+DocType: Web Page,Left,Venstre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
+DocType: DocField,Image,Billede
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse kræves
+DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
+DocType: Purchase Invoice,Half-yearly,Halvårligt
+DocType: Lead,Interested,Interesseret
+DocType: Salary Structure Earning,Salary Structure Earning,Løn Struktur Earning
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
+apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Slutdato kan ikke være mindre end forventet startdato
+DocType: Project,Expected End Date,Forventet Slutdato
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betaling Type
+DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
+DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
+DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Samlede kan ikke være nul
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkendelse Rolle kan ikke være det samme som rolle reglen gælder for
+DocType: Event,Saturday,Lørdag
+DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Hvis du vil tilføje barn noder, udforske træet og klik på noden, hvorunder du ønsker at tilføje flere noder."
+DocType: Item,Manufacturer,Producent
+DocType: Budget Detail,Fiscal Year,Regnskabsår
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
+,Qty to Receive,Antal til Modtag
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
+DocType: HR Settings,Payroll Settings,Payroll Indstillinger
+apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vælg {0}
+DocType: Sales Taxes and Charges Template,Sales Master Manager,Salg Master manager
+DocType: Appraisal,Appraisal,Vurdering
+DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fra tilbudsgivning
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, 'Afrundet Total' felt, vil ikke være synlig i enhver transaktion"
+DocType: Item,Is Service Item,Er service Item
+DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejder Fødselsdag Påmindelser
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Lige klipning
+DocType: Production Plan Sales Order,SO Date,SO Dato
+DocType: Authorization Rule,Transaction,Transaktion
+,Finished Goods,Færdigvarer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for "Værdiansættelse" eller "Værdiansættelse og Total '"
+DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Opret Bank Punktet om den samlede løn for de ovenfor valgte kriterier
+DocType: Pricing Rule,Brand,Brand
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Batch er blevet faktureret.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Besked sendt
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventory Level
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
+DocType: Maintenance Schedule,Schedules,Tidsplaner
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
+DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
+,Budget Variance Report,Budget Variance Report
+DocType: Monthly Distribution,Distribution Name,Distribution Name
+DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Indtast venligst udgiftskonto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
+DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
+DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis "På lager" eller "Ikke på lager" baseret på lager til rådighed i dette lager.
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
+DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når nogen af ​​de kontrollerede transaktioner er "Indsendt", en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede "Kontakt" i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Masse efterbehandling
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ingen Bemærkninger
+DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
+DocType: Purchase Invoice Item,Image View,Billede View
+DocType: Naming Series,Prefix,Præfiks
+DocType: Payment Tool,Get Outstanding Vouchers,Få Udestående Vouchers
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
+DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Item {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
+DocType: Sales Invoice,Rounded Total,Afrundet alt
+apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Logs
+DocType: Sales Team,Contact No.,Kontakt No.
+DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
+DocType: Leave Allocation,New Leaves Allocated,Nye Blade Allokeret
+,Purchase Order Trends,Indkøbsordre Trends
+DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend Blade
+DocType: Payment Reconciliation,Payments,Betalinger
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Element er påkrævet
+DocType: Serial No,Creation Date,Oprettelsesdato
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
+DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
+DocType: Workflow State,Edit,Edit
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
+,Bank Clearance Summary,Bank Clearance Summary
+DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
+DocType: Employee,Leave Encashed?,Efterlad indkasseres?
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettoløn kan ikke være negativ
+DocType: Time Log,Time Log,Time Log
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
+DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske Antal (ved kilden / mål)
+DocType: Lead,Organization Name,Organisationens navn
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
+DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
+DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
+DocType: Appraisal,Start Date,Startdato
+DocType: Bin,Stock Value,Stock Value
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Indtast venligst gyldige mobile nos
+DocType: Employee,Holiday List,Holiday List
+DocType: SMS Log,Requested Numbers,Anmodet Numbers
+DocType: Expense Claim,Approver,Godkender
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen 'Actual "i rækken {0} kan ikke indgå i Item Rate
+DocType: Opportunity,Contact Info,Kontakt Info
+DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
+DocType: Holiday List,Holidays,Helligdage
+DocType: Workflow State,Tasks,Opgaver
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citater modtaget fra leverandører.
+DocType: Item Attribute Value,Attribute Value,Attribut Værdi
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vælg Company og Party Type først
+DocType: Purchase Invoice,Repeat on Day of Month,Gentag på Dag Måned
+DocType: DocField,Type,Type
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Skæring
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Forventet balance pr bank
+DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker til at fastsætte årlige budgetter på Konti.
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktioner kan kun slettes af skaberen af ​​selskabet
+DocType: Batch,Expiry Date,Udløbsdato
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
+DocType: User,Gender,Køn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
+DocType: Production Planning Tool,Select Items,Vælg emner
+apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke opgave som sin afhængige opgave {0} ikke er lukket.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
+DocType: Upload Attendance,Download Template,Hent skabelon
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Fordampningsemissioner-mønster støbning
+DocType: POS Profile,Write Off Cost Center,Skriv Off Cost center
+DocType: Production Order Operation,Actual Start Time,Faktiske Start Time
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst besked, før du sender"
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Rivning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
+DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Passiver
+,Employee Information,Medarbejder Information
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Bemærk: {0}
+DocType: Dropbox Backup,Allow Dropbox Access,Tillad Dropbox Access
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
+DocType: Production Planning Tool,Download Materials Required,Hent Påkrævede materialer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
+DocType: Stock Entry,As per Stock UOM,Pr Stock UOM
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
+DocType: Purchase Order,Delivered,Leveret
+DocType: Serial No,Out of AMC,Ud af AMC
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
+DocType: Project,Internal,Intern
+DocType: Authorization Rule,Based On,Baseret på
+DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Foretag Løn Struktur
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid "
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
+DocType: Item,"Allow in Sales Order of type ""Service""",Tillad i kundeordre af typen "Service"
+DocType: Item,Is Sales Item,Er Sales Item
+DocType: Warranty Claim,Raised By,Rejst af
+DocType: Sales Order,% Amount Billed,% Beløb Billed
+DocType: Account,Expense Account,Udgiftskonto
+apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dette er en rod territorium og kan ikke redigeres.
+apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Vare {0} skal være en service Item.
+DocType: Leave Type,Is Carry Forward,Er Carry Forward
+DocType: Employee,History In Company,Historie I Company
+,Received Items To Be Billed,Modtagne varer skal faktureres
+DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke er udløbet
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rullende
+DocType: Features Setup,Sales Extras,Salg Extras
+DocType: Sales Invoice,Supplier Reference,Leverandør reference
+DocType: Item,Has Variants,Har Varianter
+DocType: Material Request Item,Lead Time Date,Leveringstid Dato
+DocType: Task,Actual End Date (via Time Logs),Faktiske Slutdato (via Time Logs)
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på "Generer Schedule '
+DocType: BOM,Manufacturing,Produktion
+DocType: Note,Note,Bemærk
+DocType: Stock Entry,Total Incoming Value,Samlet Indgående Value
+DocType: Delivery Note,Return Against Delivery Note,Retur Against følgeseddel
+DocType: Account,Is Group,Is Group
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
+DocType: Expense Claim,Project,Projekt
+DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
+,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
+DocType: Leave Block List Date,Block Date,Block Dato
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetik
+DocType: Leave Block List,Block Days,Bloker dage
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+DocType: Employee,Bank A/C No.,Bank A / C No.
+DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
+apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Varer og Priser
+DocType: Upload Attendance,Import Attendance,Import Fremmøde
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Indtast 'Forventet leveringsdato'
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
+DocType: Territory,Territory Manager,Territory manager
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
+apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial Cost Centers.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkter
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Foretag lønseddel
+DocType: Product Bundle,List items that form the package.,"Listeelementer, der danner pakken."
+DocType: Event,All Day,All Day
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af ​​{0}
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Item værdiansættelse sats genberegnes overvejer landede omkostninger kupon beløb
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varianter
+DocType: Task,Urgent,Urgent
+DocType: ToDo,Priority,Prioritet
+DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal Consumed Per Unit
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Item værdiansættelse opdateret
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Sprøjtestøbning
+DocType: Quality Inspection,Get Specification Details,Få Specifikation Detaljer
+,Qty to Transfer,Antal til Transfer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vælg Firma
+DocType: Item,Quality Parameters,Kvalitetsparametre
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
+DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
+DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
+DocType: Sales Invoice,Existing Customer,Eksisterende kunde
+DocType: Item Customer Detail,Ref Code,Ref Code
+DocType: Quality Inspection Reading,Parameter,Parameter
+DocType: Task,Actual Start Date (via Time Logs),Faktiske startdato (via Time Logs)
+DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
+DocType: Maintenance Schedule Detail,Actual Date,Faktiske dato
+DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
+apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
+DocType: Target Detail,Target Qty,Target Antal
+DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
+DocType: Leave Block List,Applies to Company,Gælder for Company
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
+DocType: Contact,Passive,Passiv
+DocType: Payment Tool,Total Payment Amount,Samlet Betaling Beløb
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
+DocType: Sales Partner,Targets,Mål
+DocType: Contact Us Settings,State,Stat
+DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
+DocType: Employee,Relation,Relation
+DocType: Workstation,Operating Costs,Drifts- omkostninger
+DocType: Item,Manufacturer Part Number,Producentens varenummer
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
+DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
+DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
+DocType: Warranty Claim,Issue Date,Udstedelsesdagen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemisk bearbejdning
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
+DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hoved under ansvar, hvor gevinst / tab vil være reserveret"
+DocType: Sales Partner,Implementation Partner,Implementering Partner
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
+DocType: Event,Thursday,Torsdag
+DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbering
+DocType: Item,Publish in Hub,Offentliggør i Hub
+DocType: Territory,Parent Territory,Parent Territory
+DocType: Item,Sales Details,Salg Detaljer
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,synkroniseret {0} Varer
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerede beløb
+DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tilpas den indledende tekst, der går som en del af denne e-mail. Hver transaktion har en separat indledende tekst."
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vedligeholdelse Skema Detail
+DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra datotid
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Ny Kontonavn
+DocType: Purchase Invoice,Contact Person,Kontakt Person
+DocType: Communication,Other,Andre
+DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentdel, du får lov til at modtage eller levere mere mod den bestilte mængde. For eksempel: Hvis du har bestilt 100 enheder. og din Allowance er 10%, så du får lov til at modtage 110 enheder."
+DocType: Email Alert,Reference Date,Henvisning Dato
+DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
+DocType: DocField,Label,Label
+DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
+DocType: Upload Attendance,Upload HTML,Upload HTML
+DocType: Project Task,Pending Review,Afventer anmeldelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden 'Kontant eller bank konto' er ikke angivet
+DocType: Async Task,Status,Status
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
+apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
+DocType: Quality Inspection Reading,Reading 5,Reading 5
+DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
+DocType: Lead,Person Name,Person Name
+apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
+DocType: Maintenance Visit,Partially Completed,Delvist Afsluttet
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} ikke tilhører selskabet {1}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sidde stramt, mens dit system bliver setup. Dette kan tage et øjeblik."
+apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre 'Ingen Copy "er indstillet"
+DocType: Purchase Receipt Item,Required By,Kræves By
+DocType: Item Tax,Tax Rate,Skat
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklame
+DocType: Time Log,From Time,Fra Time
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Materiale
+DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Oprethold Samme Rate Gennem Sales Cycle
+DocType: Purchase Invoice,Recurring Id,Tilbagevendende Id
+DocType: Journal Entry,Credit Note,Kreditnota
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Sådan opretter du en Tax-konto
+DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
+apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skat og andre løn fradrag.
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktiveret
+DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Kompressionsstøbning
+DocType: Address,Plant,Plant
+DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef for Marketing og Salg
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Indtast Cost center
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
+apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generer lønsedler
+DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintring
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Indkøbsordre Item Leveres
+DocType: Newsletter List,Total Subscribers,Total Abonnenter
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
+DocType: Purchase Order,% Billed,% Billed
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sæbe & Vaskemiddel
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
+DocType: Event,Groups,Grupper
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Hvad gør det?
+,Lead Id,Bly Id
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",fx "Byg værktøjer til bygherrer"
+DocType: Lead,From Customer,Fra kunde
+DocType: Sales Partner,Partner Type,Partner Type
+DocType: Employee Education,Year of Passing,År for Passing
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Vælg Time Logs.
+DocType: Customer,Customer Details,Kunde Detaljer
+DocType: Address,Utilities,Forsyningsvirksomheder
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Der kan kun være én Forsendelse Rule Condition med 0 eller blank værdi for "til værdi"
+apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garanti krav
+apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
+DocType: Company,Default Bank Account,Standard bankkonto
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af ​​livet er nået
+DocType: Address,Shipping,Forsendelse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
+apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Tilføje
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg prisliste
+DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
+,Accounts Browser,Konti Browser
+apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan for vedligeholdelse besøg.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Ved at trykke
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grøn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Indkomst
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM opdateret for Item {0}
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs for fakturering.
+DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Prisfastsættelse Rule
+DocType: Item,Max Discount (%),Max Rabat (%)
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
+DocType: Sales Order,Not Billed,Ikke Billed
+DocType: Account,Company,Firma
+DocType: Lead,Blog Subscriber,Blog Subscriber
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
+DocType: Item Variant,Item Variant,Item Variant
+DocType: Holiday List,Weekly Off,Ugentlig Off
+DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
+DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
+DocType: Account,Payable,Betales
+DocType: Serial No,Delivery Document Type,Levering Dokumenttype
+DocType: Sales Invoice,C-Form Applicable,C-anvendelig
+DocType: Page,No,Ingen
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varer modtaget fra leverandører.
+DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
+DocType: Packed Item,Packed Item,Pakket Vare
+DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mine forsendelser
+DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
+,Serial No Status,Løbenummer status
+DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
+apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Afsluttet
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svejsning
+DocType: Item,Weight UOM,Vægt UOM
+DocType: Purchase Invoice,Contact,Kontakt
+DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i alt nej. Arbejdsdage
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig "Fra sag nr '
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
+DocType: Time Log,Will be updated when batched.,"Vil blive opdateret, når batched."
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Løbenummer er obligatorisk for Item {0}
+DocType: Leave Type,Is Encash,Er indløse
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
+DocType: Lead,Mobile No.,Mobil No.
+DocType: Employee,Date Of Retirement,Dato for pensionering
+DocType: Batch,Batch Description,Batch Beskrivelse
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mere
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Køber
+DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Vælg BOM at starte
+DocType: Purchase Order Item,Received Qty,Modtaget Antal
+DocType: SMS Center,Receiver List,Modtager liste
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Lægemidler
+DocType: DocShare,Document Type,Dokumenttype
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ikke i gang
+,Purchase Register,Indkøb Register
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
+DocType: Pricing Rule,Supplier Type,Leverandør Type
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ingen data
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan ikke fortsætte {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
+DocType: BOM Item,BOM No,BOM Ingen
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Angiv som Lukket
+DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Hvis markeret, vil BOM for sub-montage elementer overvejes for at få råvarer. Ellers vil alle sub-montage poster behandles som et råstof."
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Belægning
+apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Vare {0} skal være service Item
+DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Tøv ikke oprette konti for kunder og leverandører. De er skabt direkte fra kunden / Leverandør mestre.
+DocType: Item,Synced With Hub,Synkroniseret med Hub
+DocType: Employee,Applicable Holiday List,Gældende Holiday List
+DocType: Dependent Task,Dependent Task,Afhængig Opgave
+DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
+DocType: Cost Center,Budgets,Budgetter
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
+DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
+DocType: Journal Entry,Cash Entry,Cash indtastning
+DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye blade Tildelte (i dage)
+DocType: Account,Stock,Lager
+DocType: Sales Invoice Item,Serial No,Løbenummer
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
+DocType: Production Order,Warehouses,Pakhuse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorer
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
+DocType: Quality Inspection,Verified By,Verified by
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
+DocType: Global Defaults,Default Company,Standard Company
+DocType: Authorization Rule,This will be used for setting rule in HR module,Dette vil blive brugt til at indstille regel i HR-modulet
+DocType: BOM,Manage cost of operations,Administrer udgifter til operationer
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vælg en gruppe node først.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
+DocType: Department,Department,Afdeling
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Indtast Vare først
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. ikke være 0
+DocType: Project,Default Cost Center,Standard Cost center
+DocType: BOM,Item UOM,Item UOM
+DocType: Sales Person,Parent Sales Person,Parent Sales Person
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre samme firma
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede blevet returneret
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Velkommen
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For 'Product Bundle' elementer, Warehouse, Serial No og Batch Ingen vil blive betragtet fra "Packing List 'bord. Hvis Warehouse og Batch Ingen er ens for alle emballage poster for enhver "Product Bundle 'post, kan indtastes disse værdier i de vigtigste element tabellen, vil værdierne blive kopieret til" Packing List' bord."
+DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
+DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Expense krav)
+DocType: Sales Partner,Target Distribution,Target Distribution
+DocType: Delivery Note,Required only for sample item.,Kræves kun for prøve element.
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Opsætning af Medarbejdere
+DocType: Production Plan Item,Planned Qty,Planned Antal
+DocType: Company,Default Letter Head,Standard Letter hoved
+DocType: Maintenance Schedule Item,Periodicity,Hyppighed
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinering
+DocType: Leave Application,Follow via Email,Følg via e-mail
+DocType: Employee,Contract End Date,Kontrakt Slutdato
+DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,For Leverandøren
+DocType: Price List,Price List Name,Pris List Name
+DocType: Stock Reconciliation Item,Leave blank if no change,"Efterlad tom, hvis ingen ændring"
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
+apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kassekladde {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Hvis du vælger "Ja" vil give en unik identitet til hver enhed i denne post, som kan ses i Serial Ingen mester."
+DocType: Shipping Rule Condition,To Value,Til Value
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slibning
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Omregningsfaktor kan ikke være i fraktioner
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Told og afgifter
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
+apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vælg en gyldig csv fil med data
+DocType: Sales Invoice Item,Brand Name,Brandnavn
+DocType: Company,Registration Details,Registrering Detaljer
+DocType: BOM Operation,Hour Rate,Hour Rate
+DocType: Job Applicant,Job Applicant,Job Ansøger
+DocType: Features Setup,Purchase Discounts,Køb Rabatter
+apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Kurv
+DocType: Journal Entry,Accounting Entries,Bogføring
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samme element er indtastet flere gange.
+DocType: Bank Reconciliation,Total Amount,Samlet beløb
+DocType: Journal Entry,Bank Entry,Bank indtastning
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Opkøb skal kontrolleres, om nødvendigt er valgt som {0}"
+apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Til {0} | {1} {2}
+DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
+,Sales Funnel,Salg Tragt
+DocType: Newsletter,Test,Prøve
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Udkast
+DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
+DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
+DocType: Activity Cost,Costing Rate,Costing Rate
+DocType: Blog Post,Blog Post,Blog-indlæg
+DocType: Employee,Rented,Lejet
+DocType: Installation Note Item,Against Document Detail No,Imod Dokument Detail Nej
+DocType: Leave Type,Leave Type Name,Lad Type Navn
+DocType: Bank Reconciliation,Journal Entries,Journaloptegnelser
+apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
+DocType: Job Applicant,Thread HTML,Tråd HTML
+DocType: Letter Head,Is Default,Er Standard
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Element har varianter.
+DocType: SMS Log,No of Requested SMS,Ingen af ​​Anmodet SMS
+DocType: Issue,Opening Time,Åbning tid
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lad Tildeling Tool
+DocType: Upload Attendance,Import Log,Import Log
+DocType: Purchase Invoice,In Words,I Words
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} findes ikke
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Skabelon
+DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deaktiver kapacitetsplanlægning og tidsregistrering
+DocType: Project Task,View Task,View Opgave
+DocType: GL Entry,Against Voucher,Mod Voucher
+DocType: Purchase Receipt,Other Details,Andre detaljer
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Se venligst vedhæftede
+DocType: C-Form,Quarter,Kvarter
+DocType: Holiday List,Holiday List Name,Holiday listenavn
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log ikke fakturerbare
+DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
+apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} skal indsendes
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",fx "My Company LLC"
+apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten target qty eller målbeløbet er obligatorisk
+DocType: Item Group,Show In Website,Vis I Website
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Bemærk: Denne Cost Center er en gruppe. Kan ikke gøre regnskabsposter mod grupper.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Udgifter
+apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Typen er obligatorisk
+DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
+DocType: Item Price,Item Price,Item Pris
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smeltning
+apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
+DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
+DocType: SMS Parameter,SMS Parameter,SMS Parameter
+DocType: Account,Frozen,Frosne
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Stålbørstning
+DocType: Holiday List,Clear Table,Klar Table
+DocType: Lead,Upper Income,Upper Indkomst
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt status
+DocType: SMS Log,No of Sent SMS,Ingen af ​​Sent SMS
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Activity Omkostninger findes for Activity Type - {0}
+,Trial Balance,Trial Balance
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønseddel fundet for måned:
+apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Opsætning indgående server til salg email id. (F.eks sales@example.com)
+DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
+DocType: Communication,Received,Modtaget
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Dine produkter eller tjenester
+DocType: DocType,Administrator,Administrator
+DocType: POS Profile,POS Profile,POS profil
+DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
+DocType: Buying Settings,Settings for Buying Module,Indstillinger til køb modul
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
+DocType: Sales Invoice,Return Against Sales Invoice,Retur Against Sales Invoice
+,To Produce,At producere
+apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
+,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
+DocType: Sales Order,Not Applicable,Gælder ikke
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Cost Center med eksisterende transaktioner kan ikke konverteres til finans
+DocType: Employee,Leave Approvers,Lad godkendere
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Venligst setup nummerering serie for Deltagelse via Setup> Nummerering Series
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
+apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrer Sales Person Tree.
+DocType: Sales Invoice,Posting Time,Udstationering Time
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
+DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
+DocType: Shipping Rule Condition,Shipping Rule Condition,Forsendelse Rule Betingelse
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Item Code> Vare Gruppe> Brand
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Yderligere noder kan kun oprettes under 'koncernens typen noder
+DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
+DocType: Item Attribute Value,Abbreviation,Forkortelse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Henvisning # {0} dateret {1}
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Optag element bevægelse.
+DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Som kan Produktionsordre gøres for denne post, skal det være en lagervare."
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision på salg
+DocType: Quality Inspection Reading,Accepted,Accepteret
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Vælg dit land, tidszone og valuta"
+apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
+DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
+DocType: Account,Root Type,Root Type
+DocType: User,Male,Mand
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskabsår er obligatorisk"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Indtast salgsordre i ovenstående tabel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Element er opdateret
+DocType: Employee,Exit,Udgang
+DocType: Bulk Email,Not Sent,Ikke Sent
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Boring
+DocType: Website Settings,Website Settings,Website Settings
+DocType: Purchase Order Item,Material Request Detail No,Materiale Request Detail Nej
+DocType: Item Price,Multiple Item prices.,Flere Item priser.
+DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
+DocType: Address,Billing,Fakturering
+apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Maxiumm rabat for Item {0} er {1}%
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Lad os forberede systemet til første brug.
+DocType: Employee,Date of Birth,Fødselsdato
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Udløbet
+DocType: Lead,Next Contact Date,Næste Kontakt Dato
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal sprøjtestøbning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
+DocType: Features Setup,Sales Discounts,Salg Rabatter
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Svulmende
+DocType: Journal Entry Account,Exchange Rate,Exchange Rate
+DocType: Stock Entry,Total Outgoing Value,Samlet Udgående Value
+DocType: Cost Center,Parent Cost Center,Parent Cost center
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Bejdsning
+DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
+DocType: Shopping Cart Settings,Quotation Series,Citat Series
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Rifling
+,Batch-Wise Balance History,Batch-Wise Balance History
+DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemisk bearbejdning
+DocType: Brand,Item Manager,Item manager
+DocType: Customer,Last Day of the Next Month,Sidste dag i den næste måned
+DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
+DocType: Sales Order Item,Projected Qty,Projiceret Antal
+DocType: SMS Log,SMS Log,SMS Log
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Efterbehandling & industriel efterbehandling
+DocType: Customer,Commission Rate,Kommissionens Rate
+DocType: C-Form Invoice Detail,Net Total,Net Total
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
+,Sales Register,Salg Register
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM skal være forskellig fra nuværende bestand UOM
+DocType: Company,Stock Settings,Stock Indstillinger
+DocType: Company,Company Info,Firma Info
+DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
+DocType: Item,Item Code for Suppliers,Item Code for leverandører
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
+DocType: Salary Slip,Bank Account No.,Bankkonto No.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Prægning
+DocType: Cost Center,Cost Center Name,Cost center Navn
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Bidrag Beløb
+,Gross Profit,Gross Profit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
+DocType: Account,Accounts,Konti
+DocType: Payment Tool,Against Vouchers,Mod Vouchers
+DocType: Account,Parent Account,Parent Konto
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installation rekord for en Serial No.
+DocType: Workflow State,Refresh,Opdater
+DocType: Expense Claim Detail,Claim Amount,Krav Beløb
+DocType: Item,UOMs,UOMs
+DocType: Journal Entry,Bill Date,Bill Dato
+DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoveder (eller grupper) mod hvilken regnskabsposter er lavet og balancer opretholdes.
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
+DocType: Production Planning Tool,Material Requirement,Material Requirement
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
+DocType: DocPerm,Level,Level
+DocType: Naming Series,Update Series Number,Opdatering Series Number
+DocType: Production Order,Production Order,Produktionsordre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+					Available Qty: {4}, Transfer Qty: {5}","Række {0}: Antal ikke avalable i lageret {1} på {2} {3}. Tilgængelig Antal: {4}, Transfer Antal: {5}"
+,Quotation Trends,Citat Trends
+apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhed af et element.
+DocType: Employee,Health Details,Sundhed Detaljer
+apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
+,Production Orders in Progress,Produktionsordrer i Progress
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Denne tidslog konflikter med {0} for {1} {2}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Billing (Sales Invoice)
+DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
+DocType: Attendance,Attendance,Fremmøde
+DocType: Features Setup,Item Serial Nos,Vare Serial Nos
+DocType: Employee,Organization Profile,Organisation profil
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Vare {0} forekommer flere gange i prisliste {1}
+DocType: Item,website page link,webside link
+DocType: Lead,Lower Income,Lavere indkomst
+DocType: Salary Structure,Monthly Earning & Deduction,Månedlige Earning & Fradrag
+DocType: BOM Operation,Operation Time,Operation Time
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Kassekladde Detaljer
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
+DocType: Salary Slip,Arrear Amount,Bagud Beløb
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Træbearbejdning
+,Qty to Deliver,Antal til Deliver
+apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Element {0} ignoreres da det ikke er en lagervare
+DocType: BOM,Operating Cost,Driftsomkostninger
+apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Opdateret
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
+DocType: Naming Series,User must always select,Brugeren skal altid vælge
+DocType: Project,Gross Margin %,Gross Margin%
+DocType: Attendance,Attendance Date,Fremmøde Dato
+DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
+apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
+DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
+DocType: Quality Inspection,Item Serial No,Vare Løbenummer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacity Planning Fejl
-DocType: Lead,Consultant,Konsulent
-DocType: Salary Slip,Earnings,Indtjening
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Åbning Regnskab Balance
-DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
+DocType: Packing Slip,Get Items,Få Varer
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
+DocType: Task Depends On,Task Depends On,Task Afhænger On
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
+DocType: SMS Center,All Contact,Alle Kontakt
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den relevante gruppe (som regel Anvendelse af fondene> Omsætningsaktiver> bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen "Bank"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På lager
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
+DocType: Issue,Support,Support
+DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Imod Voucher type skal være en af ​​kundeordre, Salg Faktura eller Kassekladde"
+DocType: Authorization Rule,Approving Role,Godkendelse Rolle
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Køb Beløb
+DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
+DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
+DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord vil være synlig, når du gemmer Sales Order."
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine Adresser
+DocType: Quotation,Shopping Cart,Indkøbskurv
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Intet at anmode
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
+,Download Backups,Hent Backups
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kemisk
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
+DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
+DocType: Email Digest,Income / Expense,Indtægter / Expense
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentielle muligheder for at sælge.
+DocType: Opportunity,Contact Mobile No,Kontakt Mobile Ingen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
+DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vælg Medarbejder, for hvem du opretter Vurdering."
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt at sende til {0}
+DocType: Designation,Designation,Betegnelse
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugal casting
+apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Oprette regler til at begrænse transaktioner baseret på værdier.
+apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Overført overskud
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
+DocType: Appraisal,Employee,Medarbejder
+DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sandblæsning
+apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor emner er gemt.
+DocType: Process Payroll,Submit Salary Slip,Indsend lønseddel
+apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+DocType: Item Group,Item Classification,Item Klassifikation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
+DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængelig Antal på Warehouse
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} er blevet afmeldt fra denne liste.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempling
+DocType: Activity Cost,Projects User,Projekter Bruger
+,Stock Analytics,Stock Analytics
+DocType: Pricing Rule,Max Qty,Max Antal
+DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
+DocType: Serial No,Under Warranty,Under Garanti
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
+DocType: Email Digest,Receivables,Tilgodehavender
+DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
+DocType: Time Log,Hours,Timer
+,Purchase Order Items To Be Received,"Købsordre, der modtages"
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Leveres Beløb
+DocType: Purchase Order Item,Warehouse and Reference,Warehouse og reference
+DocType: Employee,Permanent Address Is,Faste adresse
+DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
+DocType: GL Entry,Against,Imod
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
+DocType: Delivery Note,Delivery To,Levering Til
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
+DocType: Stock Settings,Allowance Percent,Godtgørelse Procent
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landbrug
+DocType: Employee,Passport Number,Passport Number
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opret kunde
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
+DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Resultat / Loss
+DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
+,Ordered Items To Be Billed,Bestilte varer at blive faktureret
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
+DocType: Communication,Phone,Telefon
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Issue Materiale
+DocType: Quality Inspection,Inspection Type,Inspektion Type
+apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke vælge charge type som 'On Forrige Row Beløb' eller 'On Forrige Row alt "for første række
+DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelse Regel først valgt baseret på "Apply On 'felt, som kan være Item, punkt Group eller Brand."
+DocType: Print Settings,Classic,Klassisk
+DocType: Employee,Encashment Date,Indløsning Dato
+DocType: SMS Settings,SMS Settings,SMS-indstillinger
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
+DocType: Salary Slip,Total Deduction,Samlet Fradrag
+apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Forfaldsdato er obligatorisk
+DocType: Production Order Operation,Estimated Time and Cost,Estimeret tid og omkostninger
+DocType: SMS Log,Sent To,Sendt Til
+DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+DocType: Time Log,Will be updated only if Time Log is 'Billable',"Vil kun blive opdateret, hvis Time Log er "faktureres""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttype er obligatorisk
+DocType: Payment Tool,Payment Account,Betaling konto
+DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
+DocType: Quotation,Order Type,Bestil Type
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Udførelse
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Ætsning
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Annulleret
+DocType: GL Entry,Transaction Date,Transaktion Dato
+DocType: Item Attribute,Item Attribute Values,Item Egenskab Værdier
+DocType: Selling Settings,Selling Settings,Salg af indstillinger
+DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nuværende faktura menstruation
+apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillad Bruger
+apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrer Customer Group Tree.
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i Løn Structure ikke kan være mindre end Medarbejder Sammenføjning Dato.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Varmvalsning
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionskasserne
+DocType: Purchase Invoice,Next Date,Næste dato
+apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Forkert antal finansposter fundet. Du har muligvis valgt et forkert konto i transaktionen.
+DocType: Email Digest,Email Digest,Email Digest
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
+DocType: Purchase Invoice Advance,Journal Entry Detail No,Kassekladde Detail Nej
+,POS,POS
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+DocType: Salary Structure,Total Earning,Samlet Earning
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplosiv danner
+DocType: Sales Invoice,Sales Team1,Salg TEAM1
+DocType: Delivery Note,Vehicle No,Vehicle Ingen
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
+DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
+DocType: Employee,Notice (days),Varsel (dage)
+DocType: Cost Center,Budget,Budget
+DocType: Maintenance Visit,Scheduled,Planlagt
+DocType: Bank Reconciliation Detail,Against Account,Mod konto
+apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: kvittering {1} findes ikke i ovenstående 'Køb Kvitteringer' bord
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
+DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
+DocType: SMS Center,All Customer Contact,Alle Customer Kontakt
+apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukning (Åbning + Totals)
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Til
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlægning
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
+DocType: Selling Settings,Delivery Note Required,Følgeseddel Nødvendig
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
+DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
+,S.O. No.,SÅ No.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic bearbejdning
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Opsætning Allerede Complete !!
+DocType: Notification Control,Purchase Order Message,Indkøbsordre Message
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},"Mængde, der kræves for Item {0} i række {1}"
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserveret Antal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
+DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hård drejning
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
+apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Garanti krav mod Serial No.
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
+,Reserved,Reserveret
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Løbenummer {0} er allerede blevet modtaget
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
+DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
+DocType: Journal Entry,Reference Number,Referencenummer
+apps/frappe/frappe/config/setup.py +59,Settings,Indstillinger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
+DocType: Account,Profit and Loss,Resultatopgørelse
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Selling Beløb
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Ny konto
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformning
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
+DocType: Delivery Note,Billing Address,Faktureringsadresse
+DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",For at tildele problemet ved at bruge knappen "Tildel" i indholdsoversigten.
+DocType: Production Order,Expected Delivery Date,Forventet leveringsdato
+DocType: Company,Round Off Account,Afrunde konto
+DocType: Purchase Invoice,Yearly,Årlig
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rækker for Stock Afstemning.
+DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
+DocType: Employee,Blood Group,Blood Group
+apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
+DocType: Account,Temporary,Midlertidig
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+DocType: Serial No,Creation Time,Creation Time
+DocType: Contact Us Settings,Address Line 1,Adresse Line 1
+DocType: Page,Yes,Ja
+apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
+DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
+DocType: Purchase Invoice,Quarterly,Kvartalsvis
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mad
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Cost center er nødvendig for "Resultatopgørelsen" konto {0}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
+DocType: Lead,Address & Contact,Adresse og kontakt
+DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
+DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
+,Employee Birthday,Medarbejder Fødselsdag
+DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
+DocType: Packing Slip Item,DN Detail,DN Detail
+,Terretory,Terretory
+DocType: Workstation,Working Hours,Arbejdstider
+,Stock Ageing,Stock Ageing
+DocType: Employee Education,Graduate,Graduate
+DocType: Features Setup,After Sale Installations,Efter salg Installationer
+DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Fra dato' er nødvendig
+DocType: System Settings,Loading...,Indlæser ...
+DocType: Lead,Consultant,Konsulent
+DocType: Stock Entry,Repack,Pakke
+apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
+,Setup Wizard,Setup Wizard
+apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverandør database.
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Opkald
+DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
+DocType: Sales Invoice,Paid Amount,Betalt Beløb
+apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
+DocType: Item,Is Fixed Asset Item,Er Fast aktivpost
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+DocType: Maintenance Visit,Customer Feedback,Kundefeedback
+DocType: Fiscal Year,Year Name,År Navn
+,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
+apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand mester.
+DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet Planlægning For (dage)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referencenummer & Reference Dato er nødvendig for {0}
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
+DocType: Monthly Distribution,Monthly Distribution,Månedlig Distribution
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
+DocType: Stock Entry Detail,Source Warehouse,Kilde Warehouse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
+DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Til dato' er nødvendig
+DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
+
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjælper du distribuerer dit budget tværs måneder, hvis du har sæsonudsving i din virksomhed. At distribuere et budget ved hjælp af denne fordeling, skal du indstille dette ** Månedlig Distribution ** i ** Cost Center **"
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kommerciel
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
+DocType: SMS Center,Create Receiver List,Opret Modtager liste
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Samlet Order Anses
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vi køber denne vare
+DocType: Appraisal Goal,Score (0-5),Score (0-5)
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan ikke indstilles for gruppe Cost center
+DocType: Dropbox Backup,Dropbox Access Key,Dropbox adgangsnøgle
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
+apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
+DocType: Appraisal Goal,Appraisal Goal,Vurdering Goal
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
+DocType: Holiday,Holiday,Holiday
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Rådgivning
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order kræves for Item {0}
+DocType: Item,Default Selling Cost Center,Standard Selling Cost center
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
+DocType: Expense Claim Detail,Expense Date,Expense Dato
+DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
+DocType: Leave Control Panel,Employee Type,Medarbejder Type
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
+DocType: Time Log,Billing Amount,Fakturering Beløb
+DocType: GL Entry,GL Entry,GL indtastning
+DocType: Project Task,Working,Working
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vælg venligst regnskabsår
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
+DocType: Bank Reconciliation Detail,Cheque Number,Check Number
+apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
+DocType: Contact Us Settings,Introduction,Introduktion
+,Average Commission Rate,Gennemsnitlig Kommissionens Rate
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtig hjælp
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ingen produktionsordrer oprettet
+DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
+DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
+DocType: Stock Entry,Manufacture,Fremstilling
+DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsatte mål Item Group-wise for denne Sales Person.
+DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
+DocType: Packing Slip Item,Packing Slip Item,Packing Slip Vare
+DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Indtast venligst Køb Kvitteringer
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Navn er påkrævet
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch er blevet annulleret.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
+DocType: Address,Shop,Butik
+DocType: SMS Center,Send To,Send til
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Kilde og mål lageret ikke kan være ens for rækken {0}
+DocType: Features Setup,Exports,Eksport
+DocType: C-Form,C-Form,C-Form
+DocType: Web Form,Select DocType,Vælg DocType
+DocType: Item,Taxes,Skatter
+DocType: Leave Control Panel,Allocate,Tildele
+DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
+DocType: Employee,Exit Interview Details,Exit Interview Detaljer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i Item sats i række {0}"
+apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordrer frigives til produktion.
+,Employee Leave Balance,Medarbejder Leave Balance
+DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuel Stock UOM
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Håndtering af Projekter
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
+apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektion indkommende kvalitet.
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Åbning Stock Balance
+apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0} rækker tilladt
+DocType: Campaign,Campaign-.####,Kampagne -. ####
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {0}
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Indtast e-mail-adresse
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
+DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan henvise rækken, hvis gebyret type er 'On Forrige Row Beløb "eller" Forrige Row alt'"
+DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Vare
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Føre til Citat
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
+DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
+DocType: Time Log,Costing Amount,Koster Beløb
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
+DocType: Stock Settings,Auto Material Request,Auto Materiale Request
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
+DocType: Salary Slip,Leave Encashment Amount,Lad Indløsning Beløb
+DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
+DocType: Process Payroll,Process Payroll,Proces Payroll
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst 1 faktura i tabellen
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Tilføj Brugere
+DocType: Warranty Claim,Resolved By,Løst Af
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Indtast Betaling Beløb i mindst én række
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smedning
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Varer allerede synkroniseret
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Tilføj Løbenummer
+DocType: Communication,Communication,Kommunikation
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
+apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
+DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
+DocType: Item Group,Parent Item Group,Moderselskab Item Group
+DocType: Quality Inspection,In Process,I Process
+DocType: Time Log Batch,updated via Time Logs,opdateret via Time Logs
+DocType: Naming Series,Current Value,Aktuel værdi
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
+DocType: Lead,Product Enquiry,Produkt Forespørgsel
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail-adresse
+apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser
+DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
+DocType: Employee,Employment Type,Beskæftigelse type
+apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrer Sales Partners.
+DocType: Sales Invoice Advance,Advance Amount,Advance Beløb
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",fx "MC"
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
+DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
+DocType: Serial No,Creation Document Type,Creation Dokumenttype
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør> Leverandør type
+DocType: Naming Series,Select Transaction,Vælg Transaktion
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Varm isostatisk presning
+DocType: Department,Days for which Holidays are blocked for this department.,"Dage, som Holidays er blokeret for denne afdeling."
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,f.eks 5
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhed (departement) herre.
+DocType: Employee,Job Profile,Job profil
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end Grand Total
+DocType: Purchase Order,Advance Paid,Advance Betalt
+DocType: Sales Partner,Logo,Logo
+,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
+DocType: Bin,Quantity Requested for Purchase,"Mængde, der ansøges for Indkøb"
+DocType: Purchase Receipt,Get Current Stock,Få Aktuel Stock
+DocType: Account,Income,Indkomst
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Opret Løn Struktur for medarbejder {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Midlertidige Konti
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code kan ikke ændres for Serial No.
+DocType: Account,Sales User,Salg Bruger
+DocType: Item Reorder,Transfer,Transfer
+,Item-wise Purchase History,Vare-wise Købshistorik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
+apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ingen Vare med Barcode {0}
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
+DocType: Landed Cost Item,Purchase Receipt Item,Kvittering Vare
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må kun optræde én gang
+apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Indtast 'Gentag på dag i måneden »felt værdi
+DocType: Material Request,Requested For,Anmodet om
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
+DocType: Payment Tool,Paid,Betalt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Repræsentationsudgifter
+DocType: Contact Us Settings,Address,Adresse
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
+apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ikke aktiv
+,Accounts Payable Summary,Kreditorer Resumé
+DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Den første bruger bliver System Manager (du kan ændre dette senere).
+DocType: Issue,Attachment,Attachment
+,Purchase Receipt Trends,Kvittering Tendenser
+DocType: Opportunity,Walk In,Walk In
+DocType: Sales Invoice,Sales Team,Salgsteam
+DocType: Hub Settings,Seller Name,Sælger Navn
+DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
+DocType: Quotation,Maintenance Manager,Vedligeholdelse manager
+DocType: Installation Note Item,Against Document No,Mod dokument nr
+apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
+DocType: Pricing Rule,Selling,Selling
+DocType: Pricing Rule,Disable,Deaktiver
+DocType: Salary Slip,Salary Slip,Lønseddel
+DocType: Purchase Invoice Item,Expense Head,Expense Hoved
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er spærret
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Fra
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
+DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
+apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Angiv venligst Standard Valuta i Company Master og Globale standardindstillinger
+DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
+DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
+DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
+DocType: Purchase Invoice,Supplier Name,Leverandør Navn
+DocType: UOM,Must be Whole Number,Skal være hele tal
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub forsamlinger
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antal for {0}
+DocType: Holiday List,Get Weekly Off Dates,Få ugentlige Off Datoer
+DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
+DocType: Appraisal,Calculate Total Score,Beregn Total Score
+DocType: Purchase Order,Supplied Items,Medfølgende varer
+DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
+DocType: Pricing Rule,Sales Manager,Salgschef
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vælg Medarbejder Record først.
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} allerede faktureret
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
+DocType: Item,Re-Order Level,Re-Order Level
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Sats (%)
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
+DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
+DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se "Rate Of Materials Based On" i Costing afsnit
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Succesfuld Afstemt
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Imod Voucher type skal være en af ​​indkøbsordre, købsfaktura eller Kassekladde"
+DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
+DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
+DocType: Quality Inspection,Report Date,Report Date
+DocType: Salary Slip,Payment Days,Betalings Dage
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Løn Slip af medarbejder {0} allerede skabt for denne måned
+DocType: Maintenance Schedule,Schedule,Køreplan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
+DocType: Purchase Receipt Item,Purchase Order Item No,Indkøbsordre Konto nr
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",' findes ikke
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
+DocType: Territory,Territory Name,Territory Navn
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stationær
+DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har oprettet en standard skabelon i Salg Skatter og Afgifter Skabelon, skal du vælge en, og klik på knappen nedenfor."
+DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
+apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gentages
+DocType: Attendance,Employee Name,Medarbejder Navn
+DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
+DocType: Production Order,Planned End Date,Planlagt Slutdato
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
+apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
+apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
+DocType: Account,Liability,Ansvar
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Forbrugerprodukter
+DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
+DocType: Customer Group,Mention if non-standard receivable account applicable,"Nævne, hvis ikke-standard tilgodehavende konto gældende"
+DocType: Leave Application,Reason,Årsag
+DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
+DocType: BOM Operation,Operation,Operation
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Prisfastsættelse Regel anvendes?
+DocType: Sales Person,Select company name first.,Vælg firmanavn først.
+DocType: Leave Block List,Block Holidays on important days.,Bloker Ferie på vigtige dage.
+DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-mail er obligatorisk
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt '
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+DocType: Purchase Order,Raw Materials Supplied,Raw Materials Leveres
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} af Item {1} er udløbet.
+DocType: Quality Inspection Reading,Reading 4,Reading 4
+apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Company, Valuta, indeværende finansår, etc."
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
+DocType: Purchase Invoice,Recurring Type,Tilbagevendende Type
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
+DocType: Item Group,General Settings,Generelle indstillinger
+DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Hjælp
+DocType: Employee,Divorced,Skilt
+DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
+DocType: Notification Control,Expense Claim Rejected,Expense krav Afvist
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lad følgende brugere til at godkende Udfyld Ansøgninger om blok dage.
+DocType: Account,Account Type,Kontotype
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skruning
+DocType: Fiscal Year,Companies,Virksomheder
+DocType: Time Log,Billed,Billed
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
+DocType: Serial No,Is Cancelled,Er Annulleret
+DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Off Udestående beløb
+DocType: Warranty Claim,Warranty Claim,Garanti krav
+DocType: Employee,Confirmation Date,Bekræftelse Dato
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv lasersintring
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Time
+DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
+DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vælg Månedlig Distribution, hvis du ønsker at spore baseret på sæsonudsving."
+DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
+DocType: Hub Settings,Access Token,Access Token
+DocType: Project,Estimated Costing,Anslået Costing
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen "-" ".", "#", og "/" ikke tilladt i navngivning serie"
+DocType: Company,Default Holiday List,Standard Holiday List
+DocType: Production Order Operation,Completed Qty,Afsluttet Antal
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Gå til den relevante gruppe (som regel finansieringskilde> Aktuelle Passiver> Skatter og Afgifter og oprette en ny konto (ved at klikke på Tilføj barn) af typen "Skat" og gøre nævne Skatteprocent.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for en Færdig god Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
+DocType: ToDo,Reference,Henvisning
+DocType: Process Payroll,Activity Log,Activity Log
+DocType: Time Log,For Manufacturing,For Manufacturing
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
+apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial konti.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindst en af ​​salg eller køb skal vælges
+apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
+DocType: Landed Cost Voucher,Purchase Receipts,Køb Kvitteringer
+apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Stenbrud
+DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
+DocType: Quality Inspection,Quality Inspection,Quality Inspection
+DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
+DocType: Journal Entry,Total Debit,Samlet Debit
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Fra vedligeholdelsesplan
+DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
+
+Examples:
+
+1. Validity of the offer.
+1. Payment Terms (In Advance, On Credit, part advance etc).
+1. What is extra (or payable by the Customer).
+1. Safety / usage warning.
+1. Warranty if any.
+1. Returns Policy.
+1. Terms of shipping, if applicable.
+1. Ways of addressing disputes, indemnity, liability, etc.
+1. Address and Contact of your Company.","Standard vilkår og betingelser, der kan føjes til salg og køb. Eksempler: 1. gyldighed tilbuddet. 1. Betalingsbetingelser (i forvejen, på kredit, del forhånd osv). 1. Hvad er ekstra (eller skulle betales af Kunden). 1. Sikkerhed / forbrug advarsel. 1. Garanti hvis nogen. 1. Retur Politik. 1. Betingelser for skibsfart, hvis relevant. 1. Måder adressering tvister, erstatning, ansvar mv 1. Adresse og Kontakt i din virksomhed."
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sandstøbning
+DocType: Salary Slip,Gross Pay,Gross Pay
+DocType: Employee,Emergency Contact Details,Emergency Kontaktoplysning
+DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af ​​produktliste."
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden er nødvendig
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
+apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Tree of Bill of Materials
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
+DocType: Purchase Invoice,Advances,Forskud
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
+DocType: Item,Supplier Items,Leverandør Varer
+DocType: Purchase Invoice Item,Item,Vare
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation gren mester.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
+DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
+DocType: Purchase Invoice Item,Accounting,Regnskab
+,Sales Invoice Trends,Salgsfaktura Trends
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åbning (Cr)
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vil du virkelig ønsker at indsende alle lønseddel for måned {0} og år {1}
+DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
+DocType: Production Planning Tool,Sales Orders,Salgsordrer
+DocType: Notification Control,Customize the Notification,Tilpas Underretning
+DocType: Event,Monday,Mandag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Udstedt
+DocType: Sales Order Item,Actual Qty,Faktiske Antal
+DocType: Communication,Subject,Emne
+DocType: Employee,Permanent Address,Permanent adresse
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oprettet
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enhed
+DocType: Packing Slip,To Package No.,At pakke No.
+DocType: Employee,Single,Enkeltværelse
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiske Udgifter
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Venligst opsætning din kontoplan, før du starter bogføring"
+,Projected,Projiceret
+DocType: Payment Reconciliation,Maximum Amount,Maksimumbeløb
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+DocType: User,Female,Kvinde
+DocType: UOM,UOM Name,UOM Navn
+DocType: Employee,Personal Email,Personlig Email
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Forbrugsmaterialer
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
+DocType: Newsletter,Create and Send Newsletters,Opret og send nyhedsbreve
+DocType: Maintenance Visit,Maintenance Time,Vedligeholdelse Time
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen medarbejder fundet!
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Leder
+apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for HR modul
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status "Godkendt" kan indsendes
+DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
+DocType: Material Request Item,Min Order Qty,Min prisen evt
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
+DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
+DocType: Sales Partner,Agent,Agent
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
+DocType: Currency Exchange,Currency Exchange,Valutaveksling
+DocType: Purchase Taxes and Charges,Parenttype,Parenttype
+DocType: Sales Partner,Reseller,Forhandler
+apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
+apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+					Email Address'","{0} er en ugyldig e-mail-adresse i ""Notification \ e-mail adresse'"
+DocType: Employee,Cheque,Cheque
+DocType: Authorization Rule,Approving User,Godkendelse Bruger
+DocType: Stock Entry,Material Receipt,Materiale Kvittering
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiale Request bruges til at gøre dette Stock indtastning
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Foretag Leverandør Citat
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Syning
+apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
+DocType: Stock Entry,Difference Account,Forskel konto
+DocType: Company,Ignore,Ignorer
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Indtast venligst Item Code.
+DocType: Fiscal Year,Year End Date,År Slutdato
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
+DocType: Workstation,Wages,Løn
+DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
+DocType: Pricing Rule,Purchase Manager,Indkøb manager
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Modtagere
+DocType: Employee,New Workplace,Ny Arbejdsplads
+DocType: Bank Reconciliation,Bank Account,Bankkonto
+DocType: Purchase Receipt Item,Rejected Serial No,Afvist Løbenummer
+DocType: GL Entry,Party,Selskab
+DocType: Account,Fixed Asset,Fast Asset
+DocType: BOM,Operations,Operationer
+DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
+DocType: Employee,Employee Number,Medarbejder nummer
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
+DocType: Bank Reconciliation,From Date,Fra dato
+apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
+DocType: Notification Control,Delivery Note Message,Levering Note Message
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Du indstille Navngivning Series for {0} via Opsætning> Indstillinger> Navngivning Series
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
+DocType: Employee Education,Qualification,Kvalifikation
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
+apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måleenhed
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Ledelse
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typer af aktiviteter for Time Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investeringer støbning
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {0}
-DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til Item Code af varianten. For eksempel, hvis dit forkortelse er "SM", og punktet koden er "T-SHIRT", punktet koden for den variant, vil være "T-SHIRT-SM""
-DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blå
-DocType: Purchase Invoice,Is Return,Er Return
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Yderligere noder kan kun oprettes under 'koncernens typen noder
-DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} gyldige løbenr for Item {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code kan ikke ændres for Serial No.
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} allerede oprettet for bruger: {1} og selskab {2}
-DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
-DocType: Stock Settings,Default Item Group,Standard Punkt Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lamineret objekt fremstillingsvirksomhed
-apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverandør database.
-DocType: Account,Balance Sheet,Balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Cost Center For Item med Item Code '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch danner
-DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
-apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skat og andre løn fradrag.
-DocType: Lead,Lead,Bly
-DocType: Email Digest,Payables,Gæld
-DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
-,Purchase Order Items To Be Billed,Købsordre Varer at blive faktureret
-DocType: Purchase Invoice Item,Net Rate,Net Rate
-DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Poster og GL Entries er reposted for de valgte Køb Kvitteringer
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
-DocType: Holiday,Holiday,Holiday
-DocType: Event,Saturday,Lørdag
-DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det anses for alle brancher
-,Daily Time Log Summary,Daglig Time Log Summary
-DocType: DocField,Label,Label
-DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
-DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
-DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
-DocType: Lead,Call,Opkald
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
-apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
-,Trial Balance,Trial Balance
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Opsætning af Medarbejdere
-sites/assets/js/erpnext.min.js +5,"Grid """,Grid "
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
-DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
-DocType: Contact,User ID,Bruger-id
-DocType: Communication,Sent,Sent
-apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
-DocType: File,Lft,LFT
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
-DocType: Communication,Delivery Status,Levering status
-DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resten af ​​verden
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
-,Budget Variance Report,Budget Variance Report
-DocType: Salary Slip,Gross Pay,Gross Pay
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Betalt udbytte
-DocType: Stock Reconciliation,Difference Amount,Forskel Beløb
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Overført overskud
-DocType: BOM Item,Item Description,Punkt Beskrivelse
-DocType: Payment Tool,Payment Mode,Betaling tilstand
-DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direkte metal lasersintring
-DocType: Purchase Order,Supplied Items,Medfølgende varer
-DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
-DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
-DocType: Opportunity Item,Opportunity Item,Opportunity Vare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
-,Employee Leave Balance,Medarbejder Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
-DocType: Address,Address Type,Adressetype
-DocType: Purchase Receipt,Rejected Warehouse,Afvist Warehouse
-DocType: GL Entry,Against Voucher,Mod Voucher
-DocType: Item,Default Buying Cost Center,Standard købsomkostninger center
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Vare {0} skal være Sales Item
-DocType: Item,Lead Time in days,Lead Time i dage
-,Accounts Payable Summary,Kreditorer Resumé
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
-DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Lille
-DocType: Employee,Employee Number,Medarbejder nummer
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
-,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto head {0} oprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grøn
-DocType: Item,Auto re-order,Auto re-ordre
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Opnået
-DocType: Employee,Place of Issue,Sted for Issue
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
-DocType: Report,Disabled,Handicappet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
-apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landbrug
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Dine produkter eller tjenester
-DocType: Mode of Payment,Mode of Payment,Mode Betaling
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
-DocType: Journal Entry Account,Purchase Order,Indkøbsordre
-DocType: Warehouse,Warehouse Contact Info,Lager Kontakt Info
-sites/assets/js/form.min.js +190,Name is required,Navn er påkrævet
-DocType: Purchase Invoice,Recurring Type,Tilbagevendende Type
-DocType: Address,City/Town,By / Town
-DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
-DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
-apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelse Regel først valgt baseret på "Apply On 'felt, som kan være Item, punkt Group eller Brand."
-DocType: Hub Settings,Seller Website,Sælger Website
-apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsordre status er {0}
-DocType: Appraisal Goal,Goal,Goal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,For Leverandøren
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
-DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Der kan kun være én Forsendelse Rule Condition med 0 eller blank værdi for "til værdi"
-DocType: Authorization Rule,Transaction,Transaktion
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Bemærk: Denne Cost Center er en gruppe. Kan ikke gøre regnskabsposter mod grupper.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Værktøj
-DocType: Item,Website Item Groups,Website varegrupper
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produktion ordrenummer er obligatorisk for lager post fremstilling formål
-DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
-apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
-DocType: Journal Entry,Journal Entry,Kassekladde
-DocType: Workstation,Workstation Name,Workstation Navn
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
-DocType: Sales Partner,Target Distribution,Target Distribution
-sites/assets/js/desk.min.js +7652,Comments,Kommentarer
-DocType: Salary Slip,Bank Account No.,Bankkonto No.
-DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Værdiansættelse Rate kræves for Item {0}
-DocType: Quality Inspection Reading,Reading 8,Reading 8
-DocType: Sales Partner,Agent,Agent
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} for alle poster er nul, kan du skal ændre 'Fordel afgifter baseret på'"
-DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og Afgifter Beregning
-DocType: BOM Operation,Workstation,Arbejdsstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
-DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
-DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Faktura Dato
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
-sites/assets/js/form.min.js +212,No Data,Ingen data
-DocType: Appraisal Template Goal,Appraisal Template Goal,Vurdering Template Goal
-DocType: Salary Slip,Earning,Optjening
-,BOM Browser,BOM Browser
-DocType: Purchase Taxes and Charges,Add or Deduct,Tilføje eller fratrække
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Samlet ordreværdi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mad
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan lave en tid log kun mod en indsendt produktionsordre
-DocType: Maintenance Schedule Item,No of Visits,Ingen af ​​besøg
-DocType: File,old_parent,old_parent
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
-apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operationer kan ikke være tomt.
-,Delivered Items To Be Billed,Leverede varer at blive faktureret
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke ændres for Serial No.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status opdateret til {0}
-DocType: DocField,Description,Beskrivelse
-DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
-DocType: Letter Head,Is Default,Er Standard
-DocType: Address,Utilities,Forsyningsvirksomheder
-DocType: Purchase Invoice Item,Accounting,Regnskab
-DocType: Features Setup,Features Setup,Features Setup
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Se tilbud Letter
-DocType: Communication,Communication,Kommunikation
-DocType: Item,Is Service Item,Er service Item
-DocType: Activity Cost,Projects,Projekter
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vælg venligst regnskabsår
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
-DocType: BOM Operation,Operation Description,Operation Beskrivelse
-DocType: Item,Will also apply to variants,Vil også gælde for varianter
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
-DocType: Quotation,Shopping Cart,Indkøbskurv
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gennemsnitlig Daily Udgående
-DocType: Pricing Rule,Campaign,Kampagne
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal "Godkendt" eller "Afvist"
-DocType: Purchase Invoice,Contact Person,Kontakt Person
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
-DocType: Holiday List,Holidays,Helligdage
-DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
-DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
-DocType: Item,Maintain Stock,Vedligehold Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
-DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen 'Actual "i rækken {0} kan ikke indgå i Item Rate
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større end planlagt antal ({2}) på produktionsordre {3}
+DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Hvis du har salgsteam og salg Partners (Channel Partners) de kan mærkes og vedligeholde deres bidrag i salget aktivitet
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter tilføjet endnu.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Vær med
+apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs til produktion.
+DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra datotid
-DocType: Email Digest,For Company,For Company
-apps/erpnext/erpnext/config/support.py +38,Communication log.,Kommunikation log.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Køb Beløb
-DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
-apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
-DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vælg emne kode
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank indtastning
+apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
+DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
+DocType: Item,Customer Code,Customer Kode
+DocType: Purchase Receipt Item,Rate and Amount,Sats og Beløb
+DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
+DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
+DocType: Item Website Specification,Item Website Specification,Item Website Specification
+DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologi
+DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Angiv venligst Company for at fortsætte
+apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupper.
+DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Samlet fakturering Dette år:
+DocType: Opportunity,Opportunity Type,Opportunity Type
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgte Prisfastsættelse Regel er lavet til "pris", vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i "Rate 'felt, snarere end' Prisliste Rate 'område."
+DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
+DocType: Sales Invoice,Sales Taxes and Charges,Salg Skatter og Afgifter
+DocType: Employee,Reports to,Rapporter til
+DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Indtast venligst Skriv Off konto
+apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item Varianter. f.eks størrelse, farve etc."
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
+DocType: Customer Group,Customer Group Name,Customer Group Name
+apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Vis Balance
+apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Opdatering
+DocType: Expense Claim,Approval Status,Godkendelsesstatus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Value
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
-DocType: Employee,Owned,Ejet
-DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
-DocType: Pricing Rule,"Higher the number, higher the priority","Højere tallet er, jo højere prioritet"
-,Purchase Invoice Trends,Købsfaktura Trends
-DocType: Employee,Better Prospects,Bedre udsigter
-DocType: Appraisal,Goals,Mål
-DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC status
-,Accounts Browser,Konti Browser
-DocType: GL Entry,GL Entry,GL indtastning
-DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
-,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,To Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
-DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
-Used for Taxes and Charges",Skat detalje tabel hentes fra post mester som en streng og opbevares i dette område. Bruges til skatter og afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
-DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
-DocType: Job Opening,"Job profile, qualifications required etc.","Jobprofil, kvalifikationer kræves etc."
-DocType: Journal Entry Account,Account Balance,Kontosaldo
-DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vi køber denne vare
-DocType: Address,Billing,Fakturering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
-DocType: Bulk Email,Not Sent,Ikke Sent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplosiv danner
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Skatter og Afgifter (Company valuta)
-DocType: Shipping Rule,Shipping Account,Forsendelse konto
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt at sende til {0} modtagere
-DocType: Quality Inspection,Readings,Aflæsninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub forsamlinger
-DocType: Shipping Rule Condition,To Value,Til Value
-DocType: Supplier,Stock Manager,Stock manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packing Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorleje
-apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Ingen adresse tilføjet endnu.
-DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
-DocType: Item,Inventory,Inventory
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
-DocType: Item,Sales Details,Salg Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
-DocType: Opportunity,With Items,Med Varer
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
-DocType: Notification Control,Expense Claim Rejected,Expense krav Afvist
+DocType: Workstation Working Hour,End Time,End Time
+DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
+DocType: Purchase Order Item,Billed Amt,Billed Amt
+DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
+DocType: Employee Education,Under Graduate,Under Graduate
+DocType: Appraisal Goal,Score Earned,Score tjent
+apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Præstationsvurdering.
+DocType: Sales Order,%  Delivered,% Leveres
+apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
+DocType: Item,End of Life,End of Life
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
-DocType: Item Attribute,Item Attribute,Item Attribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regeringen
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Item Varianter
-DocType: Company,Services,Tjenester
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),I alt ({0})
-DocType: Cost Center,Parent Cost Center,Parent Cost center
-DocType: Sales Invoice,Source,Kilde
-DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ingen resultater i Payment tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Regnskabsår Startdato
-DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Undersænkning
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Packing Slip (r) annulleret
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
-DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
-DocType: Item Group,Item Group Name,Item Group Name
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Taget
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
-DocType: Pricing Rule,For Price List,For prisliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
-DocType: Maintenance Schedule,Schedules,Tidsplaner
+DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
+DocType: Workflow,Is Active,Er Aktiv
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
-DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
-DocType: Period Closing Voucher,CoA Help,CoA Hjælp
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Fejl: {0}> {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
-DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde> Customer Group> Territory
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængelig Batch Antal på Warehouse
-DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Batch Detail
-DocType: Workflow State,Tasks,Opgaver
-DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjælp
-DocType: Event,Tuesday,Tirsdag
-DocType: Leave Block List,Block Holidays on important days.,Bloker Ferie på vigtige dage.
-,Accounts Receivable Summary,Debitor Resumé
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
-DocType: UOM,UOM Name,UOM Navn
-DocType: Top Bar Item,Target,Target
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Bidrag Beløb
-DocType: Sales Invoice,Shipping Address,Forsendelse Adresse
-DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Dette værktøj hjælper dig med at opdatere eller fastsætte mængden og værdiansættelse på lager i systemet. Det bruges typisk til at synkronisere systemets værdier og hvad der rent faktisk eksisterer i dine lagre.
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"I Ord vil være synlig, når du gemmer følgesedlen."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand mester.
-DocType: ToDo,Due Date,Due Date
-DocType: Sales Invoice Item,Brand Name,Brandnavn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kasse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisationen
-DocType: Monthly Distribution,Monthly Distribution,Månedlig Distribution
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
-DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
-DocType: Sales Partner,Sales Partner Target,Salg Partner Target
-DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Udhugning
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
-,Bank Reconciliation Statement,Bank Saldoopgørelsen
-DocType: Address,Lead Name,Bly navn
-,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Åbning Stock Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må kun optræde én gang
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
-DocType: Shipping Rule Condition,From Value,Fra Value
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
-DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugal casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfelt-assisteret efterbehandling
-DocType: Company,Default Holiday List,Standard Holiday List
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Passiver
-DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
-DocType: Opportunity,Contact Mobile No,Kontakt Mobile Ingen
-DocType: Production Planning Tool,Select Sales Orders,Vælg salgsordrer
-,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
-DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
-DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
-DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
-DocType: SMS Center,Receiver List,Modtager liste
-DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Vis
-DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv lasersintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
-DocType: Quotation Item,Quotation Item,Citat Vare
-DocType: Account,Account Name,Kontonavn
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
-DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Tilføje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
-DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
-DocType: Company,Default Payable Account,Standard Betales konto
-apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reserveret Antal
-DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
-DocType: Lead,Upper Income,Upper Indkomst
-apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
-DocType: BOM Item,BOM Item,BOM Item
-DocType: Appraisal,For Employee,For Medarbejder
-DocType: Company,Default Values,Standardværdier
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
-DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tryk fitting
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
-DocType: Customer,Default Price List,Standard prisliste
-DocType: Payment Reconciliation,Payments,Betalinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Varm isostatisk presning
-DocType: ToDo,Medium,Medium
-DocType: Budget Detail,Budget Allocated,Budgettet
-,Customer Credit Balance,Customer Credit Balance
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Skal du bekræfte din e-mail-id
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden kræves for 'Customerwise Discount'
-apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
-DocType: Quotation,Term Details,Term Detaljer
-DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet Planlægning For (dage)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ingen af ​​elementerne har nogen ændring i mængde eller værdi.
-DocType: Warranty Claim,Warranty Claim,Garanti krav
-,Lead Details,Bly Detaljer
-DocType: Authorization Rule,Approving User,Godkendelse Bruger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smedning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
-DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
-DocType: Pricing Rule,Applicable For,Gældende For
-DocType: Bank Reconciliation,From Date,Fra dato
-DocType: Maintenance Visit,Partially Completed,Delvist Afsluttet
-DocType: Leave Type,Include holidays within leaves as leaves,Medtag helligdage inden blade som blade
-DocType: Sales Invoice,Packed Items,Pakket Varer
-apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Garanti krav mod Serial No.
-DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Udskift en bestemt BOM i alle andre styklister, hvor det bruges. Det vil erstatte den gamle BOM linket, opdatere omkostninger og regenerere "BOM Explosion Item" tabel som pr ny BOM"
-DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
-DocType: Employee,Permanent Address,Permanent adresse
-apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Vare {0} skal være en service Item.
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vælg emne kode
-DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducer Fradrag for Leave uden løn (LWP)
-DocType: Territory,Territory Manager,Territory manager
-DocType: Selling Settings,Selling Settings,Salg af indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Auktioner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskabsår er obligatorisk"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringsomkostninger
-,Item Shortage Report,Item Mangel Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne "Weight UOM" for"
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiale Request bruges til at gøre dette Stock indtastning
-apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhed af et element.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt '
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
-DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
-DocType: Employee,Date Of Retirement,Dato for pensionering
-DocType: Upload Attendance,Get Template,Få skabelon
-DocType: Address,Postal,Postal
-DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minedrift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Harpiks støbning
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Vælg {0} først.
-DocType: Territory,Parent Territory,Parent Territory
-DocType: Quality Inspection Reading,Reading 2,Reading 2
-DocType: Stock Entry,Material Receipt,Materiale Kvittering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkter
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, så det kan ikke vælges i salgsordrer mv"
-DocType: Lead,Next Contact By,Næste Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},"Mængde, der kræves for Item {0} i række {1}"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} kan ikke slettes, da mængden findes for Item {1}"
-DocType: Quotation,Order Type,Bestil Type
-DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
-DocType: Payment Tool,Find Invoices to Match,Find fakturaer til Match
-,Item-wise Sales Register,Vare-wise Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",fx "XYZ National Bank"
-DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Samlet Target
-DocType: Job Applicant,Applicant for a Job,Ansøger om et job
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ingen produktionsordrer oprettet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Løn Slip af medarbejder {0} allerede skabt for denne måned
-DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
-apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
-DocType: Sales Invoice Item,Batch No,Batch Nej
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
-DocType: DocPerm,Delete,Slet
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variant
-sites/assets/js/desk.min.js +7971,New {0},Ny {0}
-DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
-DocType: Employee,Leave Encashed?,Efterlad indkasseres?
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
-DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Make indkøbsordre
-DocType: SMS Center,Send To,Send til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
-DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
-DocType: Sales Invoice Item,Customer's Item Code,Kundens Item Code
-DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
-DocType: Territory,Territory Name,Territory Navn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
-apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Ansøger om et job.
-DocType: Purchase Order Item,Warehouse and Reference,Warehouse og reference
-DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
-DocType: Country,Country,Land
-apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
-DocType: Communication,Received,Modtaget
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
-DocType: DocField,Attach Image,Vedhæft billede
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af ​​denne pakke. (Beregnes automatisk som summen af ​​nettovægt på poster)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Efterlad tom, hvis ingen ændring"
-DocType: Sales Order,To Deliver and Bill,At levere og Bill
-apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs til produktion.
-DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-wise Omarranger Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} skal indsendes
-DocType: Authorization Control,Authorization Control,Authorization Kontrol
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log til opgaver.
-DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiale Request af maksimum {0} kan gøres for Item {1} mod Sales Order {2}
-DocType: Employee,Salutation,Salutation
-DocType: Communication,Rejected,Afvist
-DocType: Pricing Rule,Brand,Brand
-DocType: Item,Will also apply for variants,Vil også gælde for varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Leveres
-apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
-DocType: Sales Order Item,Actual Qty,Faktiske Antal
-DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
-DocType: Hub Settings,Hub Node,Hub Node
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
-DocType: SMS Center,Create Receiver List,Opret Modtager liste
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Udløbet
-DocType: Packing Slip,To Package No.,At pakke No.
-DocType: DocType,System,System
-DocType: Warranty Claim,Issue Date,Udstedelsesdagen
-DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
-DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation
-DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun Udkast)"
-DocType: Payment Tool,Make Payment Entry,Foretag indbetaling indtastning
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Mængde for Item {0} skal være mindre end {1}
-,Sales Invoice Trends,Salgsfaktura Trends
-DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend Blade
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan henvise rækken, hvis gebyret type er 'On Forrige Row Beløb "eller" Forrige Row alt'"
-DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
-DocType: Stock Settings,Allowance Percent,Godtgørelse Procent
-DocType: SMS Settings,Message Parameter,Besked Parameter
-DocType: Serial No,Delivery Document No,Levering dokument nr
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra køb Kvitteringer
-DocType: Serial No,Creation Date,Oprettelsesdato
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Vare {0} forekommer flere gange i prisliste {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
-DocType: Purchase Order Item,Supplier Quotation Item,Leverandør Citat Vare
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Foretag Løn Struktur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
-DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik på 'Make Salg Faktura' knappen for at oprette en ny Sales Invoice.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Periode fra og periode datoer obligatoriske for tilbagevendende% s
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Indtast venligst Produktion Vare først
+DocType: Contact Us Settings,Pincode,Pinkode
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
+DocType: Workflow State,Time,Tid
+DocType: Sales Invoice,Cold Calling,Telefonsalg
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
+DocType: Opportunity,To Discuss,Til Diskuter
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
+DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
+,Maintenance Schedules,Vedligeholdelsesplaner
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballering og etikettering
-DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
-DocType: Sales Person,Parent Sales Person,Parent Sales Person
-apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Angiv venligst Standard Valuta i Company Master og Globale standardindstillinger
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
-DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Håndtering af Projekter
-DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
-DocType: Budget Detail,Fiscal Year,Regnskabsår
-DocType: Cost Center,Budget,Budget
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Opnået
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Område / kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,f.eks 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
-DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
-DocType: Item,Is Sales Item,Er Sales Item
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke setup for Serial nr. Check Item mester
-DocType: Maintenance Visit,Maintenance Time,Vedligeholdelse Time
-,Amount to Deliver,"Beløb, Deliver"
+DocType: Lead,Lead Owner,Bly Owner
+DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
+,Requested Qty,Anmodet Antal
+DocType: Employee Education,Post Graduate,Post Graduate
+apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
+DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
+DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplet opsætning
+DocType: Blog Post,Guest,Gæst
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,En vare eller tjenesteydelse
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Der var fejl.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Aflytning
-DocType: Naming Series,Current Value,Aktuel værdi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs oprettet:
+apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Expense Krav
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vælg Time Logs og Send for at oprette en ny Sales Invoice.
+DocType: Communication,Recipients,Modtagere
+DocType: Customer,Credit Limit,Kreditgrænse
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hvis du ikke vil anvende Prisfastsættelse Regel i en bestemt transaktion, bør alle gældende Priser Regler deaktiveres."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskabet er obligatorisk
+DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
+DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
+DocType: Territory,Territory Targets,Territory Mål
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Område / kunde
+apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-over
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
+DocType: SMS Settings,SMS Sender Name,SMS Sender Name
+DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
+DocType: Sales Order,Fully Billed,Fuldt Billed
+apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' er deaktiveret
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
+DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
+DocType: Item,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisationen
+DocType: Features Setup,Imports,Import
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuerlig støbning
+DocType: Task,depends_on,depends_on
+apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
+DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes"
+DocType: Sales Invoice,Commission Rate (%),Kommissionen Rate (%)
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden Sales Person {0} eksisterer med samme Medarbejder id
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} gyldige løbenr for Item {1}
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
-,Serial No Status,Løbenummer status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Item tabel kan ikke være tom
+DocType: Opportunity,Quotation,Citat
+DocType: Item,Has Batch No,Har Batch Nej
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste emner"
+DocType: Job Applicant,Applicant for a Job,Ansøger om et job
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
+DocType: Employee,Date of Issue,Udstedelsesdato
+DocType: Offer Letter Term,Offer Term,Offer Term
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Der var fejl.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse ikke fundet i systemet
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Lad godkender skal være en af ​​{0}
+DocType: Top Bar Item,Target,Target
+DocType: ToDo,Due Date,Due Date
+DocType: Payment Tool,Make Payment Entry,Foretag indbetaling indtastning
+apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} skal være aktiv
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
+DocType: Purchase Invoice,Supplier Address,Leverandør Adresse
+DocType: Item Group,Website Specifications,Website Specifikationer
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Indstil {0}
+DocType: Delivery Note,Installation Status,Installation status
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blå
+DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
+DocType: Item,Inventory,Inventory
+DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
+DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ingen af ​​elementerne har nogen ændring i mængde eller værdi.
+DocType: Workstation,Rent Cost,Leje Omkostninger
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lodning
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
+DocType: Sales Partner,Contact Desc,Kontakt Desc
+DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vælg Item for Transfer
+DocType: Email Digest,Note: Email will not be sent to disabled users,Bemærk: E-mail vil ikke blive sendt til handicappede brugere
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-wise budgetter på denne Territory. Du kan også medtage sæsonudsving ved at indstille Distribution.
+DocType: Supplier Quotation,Is Subcontracted,Underentreprise
+DocType: Employee,Current Address,Nuværende adresse
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
+apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
+DocType: Issue,Opening Date,Åbning Dato
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Indtast Company
+DocType: Job Opening,"Job profile, qualifications required etc.","Jobprofil, kvalifikationer kræves etc."
+DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
+DocType: Workflow State,User,Bruger
+DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
+DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (Company Valuta)
+DocType: Supplier,Address HTML,Adresse HTML
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
+DocType: Sales Person,Sales Person Targets,Salg person Mål
+DocType: Installation Note,Installation Time,Installation Time
+apps/erpnext/erpnext/config/support.py +38,Communication log.,Kommunikation log.
+DocType: Salary Slip Deduction,Default Amount,Standard Mængde
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch danner
+DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
+DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Lukning indtastning
+DocType: DocType,Setup,Opsætning
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik på "Generer Schedule '
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kasse
+DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
+DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapning
+apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Angiv venligst Company
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
+apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
+DocType: Features Setup,Item Advanced,Item Avanceret
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,I alt Skat
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,Medarbejder Records.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
+DocType: BOM Replace Tool,New BOM,Ny BOM
+DocType: Sales Invoice,Advertisement,Annonce
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Kan ikke godkende orlov, som du ikke har tilladelse til at godkende blade på Block Datoer"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Indtast Skatter og Afgifter
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
+DocType: Leave Type,Max Days Leave Allowed,Max Dage Leave tilladt
+DocType: Hub Settings,Seller Website,Sælger Website
+DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tilgodehavende konto
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} allerede oprettet for bruger: {1} og selskab {2}
+apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skatteaktiver
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Oplag {0} eksisterer ikke
+DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
+DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
+DocType: GL Entry,Is Advance,Er Advance
+DocType: Payment Tool,Received Or Paid,Modtaget eller betalt
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,og
+DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
+DocType: C-Form,Received Date,Modtaget Dato
+DocType: Address,Address Type,Adressetype
+apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigering
+apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skat Kategori kan ikke være "Værdiansættelse" eller "Værdiansættelse og Total" som alle elementer er ikke-lagervarer
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} for alle poster er nul, kan du skal ændre 'Fordel afgifter baseret på'"
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
+DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
+DocType: Serial No,Under AMC,Under AMC
+apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup> Trykning og Branding> Adresse skabelon.
+DocType: Sales Order Item,Ordered Qty,Bestilt Antal
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Værdiansættelse Rate kræves for Item {0}
+DocType: Purchase Invoice Item,Net Rate,Net Rate
+DocType: Features Setup,Sales and Purchase,Salg og Indkøb
+DocType: SMS Log,Sent On,Sendt On
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fejl]
+apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Vare {0} skal være en Sales Item
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af "Find varer fra Køb Kvitteringer 'knappen
+DocType: DocPerm,Delete,Slet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+,General Ledger,General Ledger
+DocType: Notification Control,Sales Order Message,Sales Order Message
+DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Bestil type skal være en af ​​{0}
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
+DocType: Address,Postal,Postal
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} kan ikke slettes, da mængden findes for Item {1}"
+DocType: Purchase Invoice,Get Advances Paid,Få forskud
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
+DocType: Sales Order,Fully Delivered,Fuldt Leveres
+apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykning og Branding
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
+DocType: Expense Claim,Expenses,Udgifter
+apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
+DocType: Item Group,Item Group Name,Item Group Name
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
+DocType: Employee,Cell Number,Cell Antal
+DocType: Company,Default Payable Account,Standard Betales konto
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden kræves for 'Customerwise Discount'
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
+apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
+DocType: Rename Tool,File to Rename,Fil til Omdøb
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
+DocType: Project,% Tasks Completed,% Opgaver Afsluttet
+DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Indtast venligst selskab først
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-print
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
+DocType: Sales Partner,Partner's Website,Partner s hjemmeside
+,Support Analytics,Support Analytics
+DocType: Item,Is Purchase Item,Er Indkøb Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mine Fakturaer
+DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
+apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
+DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Navn
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
+DocType: Salary Slip,Deductions,Fradrag
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vælg regnskabsår
+apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dette er en rod-konto og kan ikke redigeres.
+DocType: Account,Purchase User,Køb Bruger
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
+DocType: Maintenance Visit,Maintenance Date,Vedligeholdelse Dato
+apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedligeholdelse Besøg Formål
+DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
+DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
+All dates and employee combination in the selected period will come in the template, with existing attendance records","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
+DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrer Territory Tree.
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
+DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
+DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og Afgifter Fratrukket (Company Valuta)
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sygefravær
+DocType: Purchase Receipt Item,Accepted Warehouse,Accepteret varelager
+DocType: Notification Control,Quotation Message,Citat Message
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Regnskabsår Slutdato
+apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Oprette og administrere de daglige, ugentlige og månedlige email fordøjer."
+DocType: Project,Expected Start Date,Forventet startdato
+,Transferred Qty,Overført Antal
+DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale indstillinger
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet
+DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
+DocType: Production Order Operation,Actual End Time,Faktiske Sluttid
+DocType: GL Entry,Remarks,Bemærkninger
+apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offer kandidat et job.
+DocType: Issue,Issue,Issue
+DocType: Communication,Sent,Sent
+DocType: Customer,Individual,Individuel
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
+DocType: Item,Purchase Details,Køb Detaljer
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tilføj Abonnenter
+DocType: Purchase Invoice Item,Page Break,Side Break
+apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse udgifter
+,Sales Browser,Salg Browser
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Trykstøbning
+apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
+apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Spørgsmål
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
+DocType: Journal Entry Account,Sales Invoice,Salg Faktura
+apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Venligst sæt Dropbox genvejstaster i dit site config
+apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+DocType: Web Page,Slideshow,Slideshow
+DocType: Item,Will also apply to variants,Vil også gælde for varianter
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
+DocType: Payment Tool,Payment Mode,Betaling tilstand
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Salg Return
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Din regnskabsår slutter den
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
+DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til Item Code af varianten. For eksempel, hvis dit forkortelse er "SM", og punktet koden er "T-SHIRT", punktet koden for den variant, vil være "T-SHIRT-SM""
+DocType: Event,Friday,Fredag
+,Accounts Receivable Summary,Debitor Resumé
+,Pending SO Items For Purchase Request,Afventer SO Varer til Indkøb Request
+DocType: Journal Entry,Excise Entry,Excise indtastning
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
+DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Bruger {0} er deaktiveret
+DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gennemsnitlig Daily Udgående
+DocType: Sales Invoice Item,Batch No,Batch Nej
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dyppestøbning
+DocType: Salary Slip,Earning,Optjening
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
+DocType: Employee,Company Email,Firma Email
+DocType: Salary Slip,Earning & Deduction,Earning & Fradrag
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Sænksmedning
+DocType: Production Order,Manufactured Qty,Fremstillet Antal
+DocType: Quality Inspection Reading,Reading 3,Reading 3
+DocType: Party Account,Party Account,Party Account
+DocType: Company,Warn,Advar
+DocType: Journal Entry,Journal Entry,Kassekladde
+DocType: Installation Note,Installation Date,Installation Dato
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
+DocType: Customer Group,Has Child Node,Har Child Node
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af ​​Løn Per Day"
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ende rør danner
+DocType: Company,Delete Company Transactions,Slet Company Transaktioner
+DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
+DocType: Appraisal Goal,Weightage (%),Weightage (%)
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ikke indstillet
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Dato
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent formstøbning
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
+DocType: Stock Entry,Sales Invoice No,Salg faktura nr
+DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
+DocType: Production Planning Tool,Material Request For Warehouse,Materiale Request For Warehouse
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
+DocType: Installation Note,Installation Note,Installation Bemærk
+DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
+DocType: Item,Default Unit of Measure,Standard Måleenhed
+DocType: Purchase Invoice Item,Item Name,Item Name
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskab Punktet om Stock
+DocType: BOM Replace Tool,Replace,Udskifte
+DocType: Item,Inspection Criteria,Inspektion Kriterier
+DocType: Offer Letter Term,Value / Description,/ Beskrivelse
+DocType: Stock Entry,Purpose,Formål
+DocType: Purchase Order Item,Supplier Quotation Item,Leverandør Citat Vare
+DocType: Opportunity Item,Opportunity Item,Opportunity Vare
+DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Salg Person
+DocType: Employee,Relieving Date,Lindre Dato
+DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
+apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
+DocType: C-Form,C-Form No,C-Form Ingen
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+DocType: Communication,Open,Åbent
+DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
+DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
+DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af
+DocType: Activity Cost,Projects,Projekter
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
+DocType: Sales Invoice,Exhibition,Udstilling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfaldne
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Order
+,BOM Search,BOM Søg
+DocType: Notification Control,Purchase Receipt Message,Kvittering Message
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tegning
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vælg Anvend Rabat på
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
+DocType: ToDo,High,Høj
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citater til Leads eller kunder.
+DocType: Sales Invoice,Shipping Address,Forsendelse Adresse
+DocType: Quotation Item,Quotation Item,Citat Vare
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
+DocType: Item,Serial Number Series,Serial Number Series
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polering
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
+DocType: Authorization Rule,Authorization Rule,Autorisation Rule
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: Serial No,Warranty Expiry Date,Garanti Udløbsdato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} er aflyst
+apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter
+DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nuværende BOM og New BOM må ikke være samme
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Clearance dato kan ikke være før check dato i række {0}
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vælg dokumenttypen først
+DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke have en forælder cost center
+DocType: Page,Page Name,Side Navn
+DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
+DocType: Expense Claim,Task,Opgave
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nul værdier
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør id
+DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
+DocType: Sales Invoice,Payment Due Date,Betaling Due Date
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal "Godkendt" eller "Afvist"
+DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
+DocType: Purchase Invoice,Is Return,Er Return
+DocType: Opportunity,Lost Reason,Tabt Årsag
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-konto kan ikke slettes
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicate entry
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,For at oprette en bankkonto
+DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
+DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
+DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
+DocType: Pricing Rule,Apply On,Påfør On
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
+DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank kassekredit
+DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+
+The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
+
+For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
+
+Note: BOM = Bill of Materials","Samlede gruppe af ** Varer ** i anden ** Item **. Dette er nyttigt, hvis du bundling en bestemt ** Varer ** i en pakke, og du kan bevare status over de pakkede ** Varer ** og ikke den samlede ** Item **. Pakken ** Item ** vil have "Er Stock Item" som "Nej" og "Er Sales Item" som "Ja". For eksempel: Hvis du sælger Laptops og Rygsække separat og har en særlig pris, hvis kunden køber både, så Laptop + Rygsæk vil være en ny Product Bundle Item. Bemærk: BOM = Bill of Materials"
+apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
+DocType: Item,"Example: ABCD.#####
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er indstillet, og Løbenummer nævnes ikke i transaktioner, så automatisk serienummer vil blive oprettet på grundlag af denne serie. Hvis du altid ønsker at eksplicit nævne Serial Nos for dette element. lader dette være blankt."
+DocType: Company,Default Terms,Standard Vilkår
+DocType: Company,Default Income Account,Standard Indkomst konto
+,Sales Partners Commission,Salg Partners Kommissionen
+DocType: Item Variant Attribute,Attribute,Attribut
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
+apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
+DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Udskift en bestemt BOM i alle andre styklister, hvor det bruges. Det vil erstatte den gamle BOM linket, opdatere omkostninger og regenerere "BOM Explosion Item" tabel som pr ny BOM"
+apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
+DocType: Quality Inspection,Sample Size,Sample Size
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Vis Time Logs
+DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Dette værktøj hjælper dig med at opdatere eller fastsætte mængden og værdiansættelse på lager i systemet. Det bruges typisk til at synkronisere systemets værdier og hvad der rent faktisk eksisterer i dine lagre.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
+DocType: Workstation,per hour,per time
+apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardindstillinger for at købe transaktioner.
+DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende orden, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
+DocType: Purchase Invoice Item,Project Name,Projektnavn
+DocType: Opportunity,Opportunity From,Mulighed Fra
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på "Generer Schedule 'at hente Løbenummer tilføjet for Item {0}
+DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminering
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Raw Material
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total Ulønnet
+apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til Group
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Global POS Profil {0} allerede skabt til selskab {1}
+DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
+DocType: Notification Control,Custom Message,Tilpasset Message
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minedrift
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
+DocType: C-Form Invoice Detail,Territory,Territory
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Indkomst
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Drejning
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Lille
+DocType: Newsletter,Email Sent?,E-mail Sendt?
+DocType: Budget Detail,Budget Allocated,Budgettet
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Se tilbud Letter
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
+apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload lager balance via csv.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting
+DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-wise Omarranger Level
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} skabt til Medarbejder {1} i givet datointerval
+DocType: Task,Closing Date,Closing Dato
+DocType: Sales Order,Not Delivered,Ikke leveret
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Dybtrækning
+DocType: Attendance,Present,Present
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindst ét ​​element skal indtastes med negativt mængde gengæld dokument
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Fra Valuta og Til valuta ikke kan være samme
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
+DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Indtast forælder omkostningssted
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Indtil
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten af ​​verden
+DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation
+DocType: Features Setup,Item Barcode,Item Barcode
+DocType: Communication,Date,Dato
+DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
+,Purchase Analytics,Køb Analytics
+DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Ny UOM må IKKE være af typen heltal
+apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form optegnelser
+DocType: BOM,Total Cost,Total Cost
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
+DocType: SMS Center,All Lead (Open),Alle Bly (Open)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Antal kan ikke være større end Max Antal
+DocType: Item,Weightage,Weightage
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformning
+DocType: Quality Inspection,Inspected By,Inspiceres af
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end 'antal til Fremstilling'
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Du er ikke autoriseret til at tilføje eller opdatere poster før {0}
+DocType: Lead,Do Not Contact,Må ikke komme i kontakt
+DocType: GL Entry,Voucher Type,Voucher Type
+DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
+DocType: Employee,Reason for Resignation,Årsag til Udmeldelse
+DocType: BOM Replace Tool,Current BOM,Aktuel BOM
+DocType: Sales Invoice,Is Opening Entry,Åbner post
+DocType: Payment Tool,Make Journal Entry,Make Kassekladde
+DocType: SMS Center,Total Message(s),Total Besked (r)
+DocType: Employee,Salutation,Salutation
+DocType: Feed,Full Name,Fulde navn
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Konvertering Factor er nødvendig
+DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
+DocType: Item,Variant Of,Variant af
+DocType: Bin,FCFS Rate,FCFS Rate
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsordre status er {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
+DocType: Print Settings,Modern,Moderne
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
+DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vi sælger denne Vare
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
+DocType: Item,Default Supplier,Standard Leverandør
+DocType: BOM,Item Desription,Item desription
+DocType: Employee Education,Class / Percentage,Klasse / Procent
+DocType: Sales Invoice,Debit To,Betalingskort Til
+DocType: Bank Reconciliation,To Date,Til dato
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
+DocType: Sales Partner,Retailer,Forhandler
+DocType: Comment,Reference Name,Henvisning Navn
+DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
+DocType: Period Closing Voucher,Period Closing Voucher,Periode Lukning Voucher
+DocType: Expense Claim,Approved,Godkendt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
+DocType: Account,Equity,Egenkapital
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Udgive synkronisere emner
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
+DocType: Pricing Rule,Buying,Køb
+DocType: Territory,For reference,For reference
+apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Åbning Regnskab Balance
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
+DocType: Features Setup,Point of Sale,Point of Sale
+DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
+DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
+DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Fremmøde rekord.
+DocType: Quality Inspection Reading,Reading 6,Læsning 6
+DocType: Currency Exchange,From Currency,Fra Valuta
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater "Status" og Gem
+DocType: Buying Settings,Buying Settings,Opkøb Indstillinger
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 tegn
+DocType: Job Opening,Job Title,Jobtitel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktion Vare
+DocType: Notification Control,Prompt for Email on Submission of,Spørg til Email på Indsendelse af
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Forventet leveringsdato kan ikke være, før Sales Order Date"
+DocType: Pricing Rule,Min Qty,Min Antal
+,Sales Order Trends,Salg Order Trends
+DocType: Delivery Note,Instructions,Instruktioner
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisering
+DocType: Item Price,Bulk Import Help,Bulk Import Hjælp
+DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Indsend denne produktionsordre til videre forarbejdning.
+DocType: Purchase Invoice Item,Purchase Receipt,Kvittering
+DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice Item
+DocType: Expense Claim,From Employee,Fra Medarbejder
+DocType: Features Setup,To get Item Group in details table,At få Item Group i detaljer tabel
+DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
+apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Ansøger om et job.
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regeringen
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dette er en rod kundegruppe og kan ikke redigeres.
+DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log af aktiviteter udført af brugere mod Opgaver, der kan bruges til sporing af tid, fakturering."
+DocType: Branch,Branch,Branch
+apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresse Titel er obligatorisk.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfelt-assisteret efterbehandling
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
+,Item Shortage Report,Item Mangel Rapport
+DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
+DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
+DocType: Bin,Bin,Bin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
+DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
+DocType: Leave Control Panel,Carry Forward,Carry Forward
+DocType: Item,Moving Average,Glidende gennemsnit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prisfastsættelse Regel er lavet til at overskrive Prisliste / definere rabatprocent, baseret på nogle kriterier."
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmaets navn
+DocType: Price List,Price List Master,Prisliste Master
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøb prisliste
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
+DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
+apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke ændre virksomhedens standard valuta, fordi der er eksisterende transaktioner. Transaktioner skal annulleres for at ændre standard valuta."
+DocType: Pricing Rule,Item Group,Item Group
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sprængning
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Lukning (dr)
+DocType: Item Group,Default Expense Account,Standard udgiftskonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vælg venligst Company først
+DocType: BOM Operation,Workstation,Arbejdsstation
+DocType: Newsletter,Newsletter List,Nyhedsbrev List
+DocType: Features Setup,Brands,Mærker
+DocType: Quality Inspection Reading,Reading 10,Reading 10
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Forkant
+apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Sæt
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
+apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office vedligeholdelsesudgifter
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Koldvalsning
+apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Vedligeholdelsesplan {0} eksisterer imod {0}
+DocType: Fiscal Year,Year Start Date,År Startdato
+DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
+apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
+DocType: Hub Settings,Name Token,Navn Token
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Fra Leverandør Citat
+DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+DocType: Company,Round Off Cost Center,Afrunde Cost center
+DocType: Purchase Invoice,End Date,Slutdato
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Vis / Skjul funktioner som Serial Nos, POS mv"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
+DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
+DocType: Bulk Email,Message,Besked
+DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
+DocType: Sales Invoice,Customer Address,Kunde Adresse
+DocType: Custom Script,Client,Klient
+DocType: Task,Review Date,Anmeldelse Dato
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Stemmemaskiner
+DocType: Item,Variants,Varianter
+DocType: Quotation Item,Against Docname,Mod Docname
+DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks
+DocType: Journal Entry Account,Expense Claim,Expense krav
+DocType: Workflow State,Search,Søg
+apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
+DocType: Journal Entry,Accounts Receivable,Tilgodehavender
+DocType: Packed Item,Parent Detail docname,Parent Detail docname
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Udgifter
+DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun Udkast)"
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Komprimering plus sintring
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dage siden sidste ordre
+DocType: Employee,Married,Gift
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Åbning
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkendelse Brugeren kan ikke være det samme som brugeren er reglen gælder for
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
+DocType: Product Bundle,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
+DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
+apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) af et element.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Skalstøbning
+DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
+DocType: Features Setup,Miscelleneous,Miscelleneous
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vælg Incharge Person navn
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",fx "XYZ National Bank"
+DocType: Lead,Lead Type,Lead Type
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
+DocType: Account,Cash,Kontanter
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Gentegning
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ingen resultater i Payment tabellen
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Aktieoptioner
+DocType: Journal Entry,Opening Entry,Åbning indtastning
+DocType: Appraisal,Appraisal Template,Vurdering skabelon
+DocType: Salary Slip Earning,Salary Slip Earning,Lønseddel Earning
+DocType: POS Profile,Write Off Account,Skriv Off konto
+apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
+DocType: DocType,System,System
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
+DocType: Pricing Rule,Campaign,Kampagne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
+DocType: Appraisal,Select template from which you want to get the Goals,"Vælg skabelon, hvorfra du ønsker at få de mål"
+DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
+DocType: Lead,Request Type,Anmodning Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farve
+DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Række {0}: For at indstille {1} periodicitet, skal forskellen mellem fra og til dato \ være større end eller lig med {2}"
-DocType: Pricing Rule,Selling,Selling
-DocType: Employee,Salary Information,Løn Information
-DocType: Sales Person,Name and Employee ID,Navn og Medarbejder ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
-DocType: Website Item Group,Website Item Group,Website Item Group
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Told og afgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Indtast Referencedato
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
-DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
-DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
-DocType: Material Request Item,Material Request Item,Materiale Request Vare
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupper.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
-,Item-wise Purchase History,Vare-wise Købshistorik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rød
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på "Generer Schedule 'at hente Løbenummer tilføjet for Item {0}
-DocType: Account,Frozen,Frosne
-,Open Production Orders,Åbne produktionsordrer
-DocType: Installation Note,Installation Time,Installation Time
-apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
-DocType: Issue,Resolution Details,Opløsning Detaljer
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Skift UOM for et element.
-DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
-DocType: Item Attribute,Attribute Name,Attribut Navn
-apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Vare {0} skal være Salg eller service Item i {1}
-DocType: Item Group,Show In Website,Vis I Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
-DocType: Task,Expected Time (in hours),Forventet tid (i timer)
-,Qty to Order,Antal til ordre
-DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","At spore mærke i følgende dokumenter Delivery Note, Opportunity, Material Request, punkt, Indkøbsordre, Indkøb Gavekort, køber Modtagelse, Citat, Sales Faktura, Produkt Bundle, salgsordre, Løbenummer"
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
-DocType: Appraisal,For Employee Name,For Medarbejder Navn
-DocType: Holiday List,Clear Table,Klar Table
-DocType: Features Setup,Brands,Mærker
-DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra indkøbsordre
-DocType: Activity Cost,Costing Rate,Costing Rate
-DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke Sæt
-DocType: Communication,Date,Dato
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kunde Omsætning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sidde stramt, mens dit system bliver setup. Dette kan tage et øjeblik."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
-DocType: Bank Reconciliation Detail,Against Account,Mod konto
-DocType: Maintenance Schedule Detail,Actual Date,Faktiske dato
-DocType: Item,Has Batch No,Har Batch Nej
-DocType: Delivery Note,Excise Page Number,Excise Sidetal
-DocType: Employee,Personal Details,Personlige oplysninger
-,Maintenance Schedules,Vedligeholdelsesplaner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Prægning
-,Quotation Trends,Citat Trends
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Som kan Produktionsordre gøres for denne post, skal det være en lagervare."
-DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Vær med
-DocType: Authorization Rule,Above Value,Over værdi
-,Pending Amount,Afventer Beløb
-DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Leveret
-apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Opsætning indgående server for job email id. (F.eks jobs@example.com)
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
-DocType: Journal Entry,Accounts Receivable,Tilgodehavender
-,Supplier-Wise Sales Analytics,Forhandler-Wise Sales Analytics
-DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes"
-DocType: Custom Field,Custom,Brugerdefineret
-DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Sprøjtestøbning
-DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
-apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial konti.
-DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
-DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
-DocType: HR Settings,HR Settings,HR-indstillinger
 apps/frappe/frappe/config/setup.py +130,Printing,Udskrivning
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
-DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den dag (e), hvor du ansøger om orlov er ferie. Du har brug for ikke søge om orlov."
-sites/assets/js/desk.min.js +7805,and,og
-DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enhed
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Venligst sæt Dropbox genvejstaster i dit site config
-apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Angiv venligst Company
-,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
-DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste emner"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Din regnskabsår slutter den
-DocType: POS Profile,Price List,Pris List
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Expense Krav
-DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Godkendelse Rolle
-,BOM Search,BOM Søg
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukning (Åbning + Totals)
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Angiv venligst valuta i selskabet
-DocType: Workstation,Wages per hour,Lønningerne i timen
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {3}
-apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Vis / Skjul funktioner som Serial Nos, POS mv"
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Clearance dato kan ikke være før check dato i række {0}
-DocType: Salary Slip,Deduction,Fradrag
-DocType: Address Template,Address Template,Adresse Skabelon
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
-DocType: Territory,Classification of Customers by region,Klassifikation af kunder efter region
-DocType: Project,% Tasks Completed,% Opgaver Afsluttet
-DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Indtast venligst Produktion Vare først
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,handicappet bruger
-DocType: Opportunity,Quotation,Citat
-DocType: Salary Slip,Total Deduction,Samlet Fradrag
-DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Omkostninger Opdateret
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Er du sikker på du vil UNSTOP
-DocType: Employee,Date of Birth,Fødselsdato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede blevet returneret
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
-DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
-DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
-DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
-DocType: Purchase Taxes and Charges,Deduct,Fratrække
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
-DocType: Purchase Order Item,Qty as per Stock UOM,Antal pr Stock UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vælg en gyldig csv fil med data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Belægning
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen "-" ".", "#", og "/" ikke tilladt i navngivning serie"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
-DocType: Expense Claim,Approver,Godkender
-,SO Qty,SO Antal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
-DocType: Appraisal,Calculate Total Score,Beregn Total Score
-DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
-apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dyppestøbning
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opsætning
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
-DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
-DocType: Pricing Rule,Supplier,Leverandør
-DocType: C-Form,Quarter,Kvarter
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse udgifter
-DocType: Global Defaults,Default Company,Standard Company
-apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgift eller Forskel konto er obligatorisk for Item {0}, da det påvirker den samlede lagerværdi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
-DocType: Employee,Bank Name,Bank navn
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-over
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Bruger {0} er deaktiveret
-DocType: Leave Application,Total Leave Days,Total feriedage
-DocType: Email Digest,Note: Email will not be sent to disabled users,Bemærk: E-mail vil ikke blive sendt til handicappede brugere
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vælg Company ...
-DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
-apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
-DocType: Currency Exchange,From Currency,Fra Valuta
-DocType: DocField,Name,Navn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Sales Order kræves for Item {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
-DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Andre
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Angiv som Stoppet
-DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
-DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke vælge charge type som 'On Forrige Row Beløb' eller 'On Forrige Row alt "for første række
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Afsluttet
-DocType: Web Form,Select DocType,Vælg DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Rømning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik på "Generer Schedule 'for at få tidsplan
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Ny Cost center
-DocType: Bin,Ordered Quantity,Bestilt Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",fx "Byg værktøjer til bygherrer"
-DocType: Quality Inspection,In Process,I Process
-DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} mod salgsordre {1}
-DocType: Account,Fixed Asset,Fast Asset
-DocType: Time Log Batch,Total Billing Amount,Samlet Billing Beløb
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tilgodehavende konto
-,Stock Balance,Stock Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Sales Order til Betaling
-DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs oprettet:
-DocType: Item,Weight UOM,Vægt UOM
-DocType: Employee,Blood Group,Blood Group
-DocType: Purchase Invoice Item,Page Break,Side Break
-DocType: Production Order Operation,Pending,Afventer
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontor udstyr
-DocType: Purchase Invoice Item,Qty,Antal
-DocType: Fiscal Year,Companies,Virksomheder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hæv Materiale Request når bestanden når re-order-niveau
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Fra vedligeholdelsesplan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
-DocType: Purchase Invoice,Contact Details,Kontaktoplysninger
-DocType: C-Form,Received Date,Modtaget Dato
-DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har oprettet en standard skabelon i Salg Skatter og Afgifter Skabelon, skal du vælge en, og klik på knappen nedenfor."
-DocType: Stock Entry,Total Incoming Value,Samlet Indgående Value
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøb prisliste
-DocType: Offer Letter Term,Offer Term,Offer Term
-DocType: Quality Inspection,Quality Manager,Kvalitetschef
-DocType: Job Applicant,Job Opening,Job Åbning
-DocType: Payment Reconciliation,Payment Reconciliation,Betaling Afstemning
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vælg Incharge Person navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologi
-DocType: Offer Letter,Offer Letter,Tilbyd Letter
-apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
-DocType: Time Log,To Time,Til Time
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Hvis du vil tilføje barn noder, udforske træet og klik på noden, hvorunder du ønsker at tilføje flere noder."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
-DocType: Production Order Operation,Completed Qty,Afsluttet Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Prisliste {0} er deaktiveret
-DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Sales Order {0} er stoppet
-DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
-DocType: Item,Customer Item Codes,Kunde Item Koder
-DocType: Opportunity,Lost Reason,Tabt Årsag
-apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svejsning
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM kræves
-DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Alle elementer er allerede blevet faktureret
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig "Fra sag nr '
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
-DocType: Project,External,Ekstern
-DocType: Features Setup,Item Serial Nos,Vare Serial Nos
-apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
-DocType: Branch,Branch,Branch
-apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykning og Branding
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønseddel fundet for måned:
-DocType: Bin,Actual Quantity,Faktiske Mængde
-DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Dine kunder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Kompressionsstøbning
-DocType: Leave Block List Date,Block Date,Block Dato
-DocType: Sales Order,Not Delivered,Ikke leveret
-,Bank Clearance Summary,Bank Clearance Summary
-apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Oprette og administrere de daglige, ugentlige og månedlige email fordøjer."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Item Code> Vare Gruppe> Brand
-DocType: Appraisal Goal,Appraisal Goal,Vurdering Goal
-DocType: Event,Friday,Fredag
-DocType: Time Log,Costing Amount,Koster Beløb
-DocType: Process Payroll,Submit Salary Slip,Indsend lønseddel
-DocType: Salary Structure,Monthly Earning & Deduction,Månedlige Earning & Fradrag
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Maxiumm rabat for Item {0} er {1}%
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
-DocType: Sales Partner,Address & Contacts,Adresse & Contacts
-DocType: SMS Log,Sender Name,Sender Name
-DocType: Page,Title,Titel
-sites/assets/js/list.min.js +104,Customize,Tilpas
-DocType: POS Profile,[Select],[Vælg]
-DocType: SMS Log,Sent To,Sendt Til
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Make Sales Invoice
-DocType: Company,For Reference Only.,Kun til reference.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ugyldig {0}: {1}
-DocType: Sales Invoice Advance,Advance Amount,Advance Beløb
-DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Fra dato' er nødvendig
-DocType: Journal Entry,Reference Number,Referencenummer
-DocType: Employee,Employment Details,Beskæftigelse Detaljer
-DocType: Employee,New Workplace,Ny Arbejdsplads
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Angiv som Lukket
-apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ingen Vare med Barcode {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. ikke være 0
-DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Hvis du har salgsteam og salg Partners (Channel Partners) de kan mærkes og vedligeholde deres bidrag i salget aktivitet
-DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af ​​siden
-DocType: Item,"Allow in Sales Order of type ""Service""",Tillad i kundeordre af typen "Service"
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butikker
-DocType: Time Log,Projects Manager,Projekter manager
-DocType: Serial No,Delivery Time,Leveringstid
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
-DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Rejser
-DocType: Leave Block List,Allow Users,Tillad brugere
-DocType: Sales Invoice,Recurring,Tilbagevendende
-DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat indtægter og omkostninger for produkt- vertikaler eller afdelinger.
-DocType: Rename Tool,Rename Tool,Omdøb Tool
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
-DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transfer Materiale
-DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
-DocType: Purchase Invoice,Price List Currency,Pris List Valuta
-DocType: Naming Series,User must always select,Brugeren skal altid vælge
-DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
-DocType: Installation Note,Installation Note,Installation Bemærk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Tilføj Skatter
-,Financial Analytics,Finansielle Analytics
-DocType: Quality Inspection,Verified By,Verified by
-DocType: Address,Subsidiary,Datterselskab
-apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke ændre virksomhedens standard valuta, fordi der er eksisterende transaktioner. Transaktioner skal annulleres for at ændre standard valuta."
-DocType: Quality Inspection,Purchase Receipt No,Kvittering Nej
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
-DocType: System Settings,In Hours,I Hours
-DocType: Process Payroll,Create Salary Slip,Opret lønseddel
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Forventet balance pr bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polering
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
-DocType: Appraisal,Employee,Medarbejder
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Fra
-DocType: Features Setup,After Sale Installations,Efter salg Installationer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} er fuldt faktureret
-DocType: Workstation Working Hour,End Time,End Time
-apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
-apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig On
-DocType: Sales Invoice,Mass Mailing,Mass Mailing
-DocType: Page,Standard,Standard
-DocType: Rename Tool,File to Rename,Fil til Omdøb
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
-DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
-DocType: Selling Settings,Sales Order Required,Sales Order Påkrævet
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opret kunde
-DocType: Purchase Invoice,Credit To,Credit Til
-DocType: Employee Education,Post Graduate,Post Graduate
-DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vedligeholdelse Skema Detail
-DocType: Quality Inspection Reading,Reading 9,Reading 9
-DocType: Supplier,Is Frozen,Er Frozen
-DocType: Buying Settings,Buying Settings,Opkøb Indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Masse efterbehandling
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for en Færdig god Item
-DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
-apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Opsætning indgående server til salg email id. (F.eks sales@example.com)
-DocType: Warranty Claim,Raised By,Rejst af
-DocType: Payment Tool,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Angiv venligst Company for at fortsætte
-sites/assets/js/list.min.js +23,Draft,Udkast
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
-DocType: Quality Inspection Reading,Accepted,Accepteret
-DocType: User,Female,Kvinde
-apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
-DocType: Print Settings,Modern,Moderne
-DocType: Communication,Replied,Svarede
-DocType: Payment Tool,Total Payment Amount,Samlet Betaling Beløb
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større end planlagt antal ({2}) på produktionsordre {3}
-DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
-DocType: Newsletter,Test,Prøve
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af "Har Serial Nej ',' Har Batch Nej ',' Er Stock Item" og "værdiansættelsesmetode '"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
-DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
 DocType: Stock Entry,For Quantity,For Mængde
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} er ikke indsendt
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Anmodning om.
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
-DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplet opsætning
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt status
-DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
-apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhedsbrev Mailing List
-DocType: Delivery Note,Transporter Name,Transporter Navn
-DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måleenhed
-DocType: Fiscal Year,Year End Date,År Slutdato
-DocType: Task Depends On,Task Depends On,Task Afhænger On
-DocType: Lead,Opportunity,Mulighed
-DocType: Salary Structure Earning,Salary Structure Earning,Løn Struktur Earning
-,Completed Production Orders,Afsluttede produktionsordrer
-DocType: Operation,Default Workstation,Standard Workstation
-DocType: Notification Control,Expense Claim Approved Message,Expense krav Godkendt Message
+apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ingen resultater i Invoice tabellen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
+DocType: Leave Type,Include holidays within leaves as leaves,Medtag helligdage inden blade som blade
+DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
+apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
+DocType: Production Order,Item To Manufacture,Item Til Fremstilling
+DocType: Purchase Invoice,Price List Currency,Pris List Valuta
+DocType: Address,Subsidiary,Datterselskab
+DocType: Contact Us Settings,Address Title,Adresse Titel
+DocType: Purchase Invoice Item,Qty,Antal
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
+DocType: Company History,Year,År
+DocType: Sales Order,% of materials delivered against this Sales Order,% Af materialer leveret mod denne Sales Order
+DocType: Journal Entry,Write Off,Skriv Off
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle elementer er allerede blevet faktureret
+DocType: Buying Settings,Purchase Receipt Required,Kvittering Nødvendig
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lad Management
+DocType: BOM,Materials,Materialer
+DocType: Payment Tool,Reference No,Referencenummer
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Indtast venligst kvittering først
+DocType: Sales Partner,Distributor,Distributør
+apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Land klogt standardadresse Skabeloner
+apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Mængde kan ikke være en del i række {0}
+DocType: Standard Reply,Owner,Ejer
+DocType: Task,Expected Time (in hours),Forventet tid (i timer)
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sætte godkendelse på grundlag af Rabat for {0}
+DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
+apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Typer af Expense krav.
+DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Forsvar
+DocType: Employee,Family Background,Familie Baggrund
+DocType: Sales Order,Partly Billed,Delvist Billed
+DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
+DocType: About Us Settings,Website,Websted
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
 DocType: Email Digest,How frequently?,Hvor ofte?
-DocType: Purchase Receipt,Get Current Stock,Få Aktuel Stock
-apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Tree of Bill of Materials
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
-DocType: Production Order,Actual End Date,Faktiske Slutdato
-DocType: Authorization Rule,Applicable To (Role),Gælder for (Rolle)
-DocType: Stock Entry,Purpose,Formål
-DocType: Item,Will also apply for variants unless overrridden,"Vil også gælde for varianter, medmindre overrridden"
-DocType: Purchase Invoice,Advances,Forskud
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkendelse Brugeren kan ikke være det samme som brugeren er reglen gælder for
-DocType: SMS Log,No of Requested SMS,Ingen af ​​Anmodet SMS
-DocType: Campaign,Campaign-.####,Kampagne -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En tredjepart, distributør/forhandler/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
-DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
-DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: Purchase Order,% Received,% Modtaget
+DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
+DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
+DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Batch Detail
+DocType: SMS Center,Send SMS,Send SMS
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mine ordrer
+DocType: Item,Default BOM,Standard BOM
+DocType: Sales Order,To Deliver and Bill,At levere og Bill
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Anlæg og maskiner
+DocType: Warehouse,Warehouse Name,Warehouse Navn
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Navnet på din virksomhed, som du oprette dette system."
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
+apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Send masse SMS til dine kontakter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Item tabel kan ikke være tom
+DocType: Material Request Item,Quantity and Warehouse,Mængde og Warehouse
+DocType: Company,Default Receivable Account,Standard Tilgodehavende konto
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Make Sales Invoice
+apps/frappe/frappe/config/desk.py +7,Tools,Værktøj
+DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: File,Lft,LFT
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemisk bearbejdning
+DocType: Purchase Order,To Receive,At Modtage
+apps/erpnext/erpnext/config/stock.py +125,Price List master.,Pris List mester.
+DocType: Quality Inspection,Quality Manager,Kvalitetschef
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
+,Issued Items Against Production Order,Udstedte Varer Against produktionsordre
+DocType: Production Planning Tool,Get Items From Sales Orders,Få elementer fra salgsordrer
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Revenue
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
+DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råvarer til analyse."
+DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Den første bruger: Du
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-id
+DocType: Salary Slip,Deduction,Fradrag
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
+DocType: Packing Slip,Package Weight Details,Pakke vægt detaljer
+DocType: Employee,Held On,Held On
+DocType: Address,Personal,Personlig
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Årsag til at miste
+apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åbning for et job.
+apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Forkert Adgangskode
+DocType: Payment Reconciliation,Reconcile,Forene
+DocType: Sales Invoice Item,Delivery Note,Følgeseddel
+DocType: Sales Person,Name and Employee ID,Navn og Medarbejder ID
+,Requested Items To Be Ordered,Anmodet Varer skal bestilles
+DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
+apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik på 'Make Salg Faktura' knappen for at oprette en ny Sales Invoice.
+DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
+DocType: Async Task,System Manager,System Manager
+DocType: Maintenance Visit,Completion Status,Afslutning status
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-mail-adresse
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunden eksisterer med samme navn
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM kræves
+DocType: Project,Project Type,Projekt type
+DocType: Communication,Series,Series
+DocType: Territory,Classification of Customers by region,Klassifikation af kunder efter region
+DocType: Production Planning Tool,Filter based on item,Filter baseret på emne
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Bearbejdning
+DocType: Offer Letter,Offer Letter,Tilbyd Letter
+DocType: Project,External,Ekstern
+DocType: Workstation,Workstation Name,Workstation Navn
+DocType: Employee,Emergency Phone,Emergency Phone
+DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
+DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
+DocType: DocField,Name,Navn
+DocType: Workstation Working Hour,Start Time,Start Time
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
+DocType: Item Reorder,Material Request Type,Materiale Request Type
+apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
+DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
+DocType: Sales Invoice,Packed Items,Pakket Varer
+DocType: Employee,Health Concerns,Sundhedsmæssige betænkeligheder
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Make indkøbsordre
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
+apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butikker
+DocType: Account,Balance Sheet,Balance
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
+apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
+DocType: Stock Entry,From BOM,Fra BOM
+DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
+DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
+DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
+apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenter
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
+DocType: Hub Settings,Seller Country,Sælger Land
+DocType: Account,Old Parent,Gammel Parent
+DocType: Purchase Order,Stopped,Stoppet
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder for {0}
+DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
+DocType: Packing Slip,From Package No.,Fra pakken No.
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
+DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af ​​siden
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Tak for din interesse i at abonnere på vores opdateringer
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Gnave
+DocType: Account,Warehouse,Warehouse
+DocType: Pricing Rule,Valid From,Gyldig fra
+DocType: Comment,Unsubscribed,Afmeldt
+DocType: Pricing Rule,Discount Percentage,Discount Procent
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
+DocType: Buying Settings,Supplier Naming By,Leverandør Navngivning Af
+DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
+DocType: Sales Invoice,Total Commission,Samlet Kommissionen
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
+DocType: ToDo,Medium,Medium
+apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Savning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mod salgsordre {1}
+apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
+DocType: Quality Inspection Reading,Reading 2,Reading 2
+,Lead Details,Bly Detaljer
+DocType: Company,Domain,Domæne
+DocType: Employee,Internal Work History,Intern Arbejde Historie
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først
+DocType: Serial No,Incoming Rate,Indgående Rate
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
+DocType: Lead,Address Desc,Adresse Desc
+DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
+DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+DocType: Production Planning Tool,Create Material Requests,Opret Materiale Anmodning
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
+DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
+DocType: Company,Default Cash Account,Standard Kontant konto
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
+DocType: Supplier Quotation Item,Material Request No,Materiale Request Nej
+DocType: Time Log,Billable,Faktureres
+apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne "Weight UOM" for"
+DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducer Fradrag for Leave uden løn (LWP)
+apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunering
+DocType: Issue,First Responded On,Først svarede den
+apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noget gik galt!
+DocType: Job Applicant,Job Opening,Job Åbning
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
+DocType: Appraisal,Goals,Mål
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
+DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det anses for alle brancher
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
+DocType: POS Profile,Terms and Conditions,Betingelser
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Ny {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
+DocType: Item,Has Serial No,Har Løbenummer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i "Mod Kassekladde 'kolonne
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Fra dato skal være før til dato
+DocType: Purchase Taxes and Charges,On Net Total,On Net Total
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på 'Vælg som standard'"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontor udstyr
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Gennemse BOM
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Fjernsyn
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
+DocType: Company,Services,Tjenester
+DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitning
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {3}
+DocType: Delivery Note,Time at which items were delivered from warehouse,"Tidspunkt, hvor varerne blev leveret fra lageret"
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Andre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series opdateret
+DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat indtægter og omkostninger for produkt- vertikaler eller afdelinger.
+DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
+DocType: Address,City/Town,By / Town
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blæsestøbning
+DocType: Material Request Item,Material Request Item,Materiale Request Vare
+DocType: Material Request,Material Transfer,Materiale Transfer
+,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
+DocType: Item,Re-Order Qty,Re-prisen evt
+DocType: Payment Tool,Find Invoices to Match,Find fakturaer til Match
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Tildelte beløb kan ikke er større end unadusted beløb
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Financial Services
+,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray danner
+apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regler for anvendelse af priser og rabat.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto head {0} oprettet
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Satsningen
+DocType: Account,Round Off,Afrunde
+DocType: Leave Application,Leave Approver Name,Lad Godkender Navn
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Regnskabsår Startdato
+DocType: Account,Credit,Credit
+DocType: Sales Invoice,Is POS,Er POS
+apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Opnået
+apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
+DocType: Item,Customer Item Codes,Kunde Item Koder
+DocType: Project Task,Project Task,Project Task
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
+DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
+DocType: Purchase Invoice,Mobile No,Mobile Ingen
+DocType: Account,Debit,Betalingskort
+DocType: BOM Item,Scrap %,Skrot%
+DocType: Payment Tool,Payment Tool,Betaling Tool
+DocType: Event,Tuesday,Tirsdag
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt at sende til {0} modtagere
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolering
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dage siden sidste ordre' skal være større end eller lig med nul
+,Stock Projected Qty,Stock Forventet Antal
+DocType: Supplier,Stock Manager,Stock manager
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
+apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' ikke i regnskabsåret {2}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
+DocType: BOM,Manufacturing User,Manufacturing Bruger
+DocType: Production Planning Tool,Production Orders,Produktionsordrer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åbning Balance Egenkapital
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Ny Leave Application
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
+DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Loading
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vælg en CSV-fil
+DocType: Sales Invoice Item,Customer's Item Code,Kundens Item Code
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Lukning (Cr)
+DocType: Sales Invoice,Customer Name,Customer Name
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Omkostninger Opdateret
+DocType: BOM Operation,Operation Description,Operation Beskrivelse
+DocType: Sales Person,Sales Person Name,Salg Person Name
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
+DocType: Process Payroll,Select Employees,Vælg Medarbejdere
+,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
+DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Skatter og Afgifter (Company valuta)
+,Project wise Stock Tracking,Projekt klogt Stock Tracking
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Gross Profit%
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
+DocType: Features Setup,Item Batch Nos,Item Batch nr
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i kvittering mod hvert punkt
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioneret Beløb kan ikke være større end krav Beløb i Row {0}.
+DocType: Journal Entry,Bill No,Bill Ingen
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kunde Omsætning
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i "Raw Materials Leveres 'bord i Indkøbsordre {1}
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Forsker
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
+DocType: BOM,Exploded_items,Exploded_items
+DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Falsning
+apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
+DocType: Workstation,Wages per hour,Lønningerne i timen
+apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Samlet Varians
+DocType: Time Log Batch,Total Hours,Total Hours
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Fra kvittering
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
+DocType: Account,Balance must be,Balance skal være
+DocType: Issue,Raised By (Email),Rejst af (E-mail)
+DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
+DocType: Cost Center,Cost Center,Cost center
+apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
+DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
+DocType: Item,Default Warehouse,Standard Warehouse
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen Tilladelse
+,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Samlet ordreværdi
+DocType: Opportunity,With Items,Med Varer
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampagne navn er påkrævet
+DocType: DocField,Currency,Valuta
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
+DocType: Employee,Emergency Contact,Emergency Kontakt
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vælg ugentlige off dag
+DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
+DocType: Industry Type,Industry Type,Industri Type
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused deposition modeling
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde.
+apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Udskift Item / BOM i alle styklister
+DocType: DocField,Description,Beskrivelse
+DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
+DocType: Account,Stock Adjustment,Stock Justering
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
+DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Betalt udbytte
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængelig Batch Antal på Warehouse
+DocType: Lead,Suggestions,Forslag
+DocType: Opportunity,Your sales person who will contact the customer in future,"Dit salg person, som vil kontakte kunden i fremtiden"
+DocType: ToDo,Low,Lav
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En tredjepart, distributør/forhandler/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
+DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
+,Delivery Note Trends,Følgeseddel Tendenser
+apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
+DocType: Purchase Receipt,Range,Range
+DocType: Account,Receivable,Tilgodehavende
+DocType: Purchase Invoice,Contact Details,Kontaktoplysninger
+apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standard rapporter
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
+apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årligt
+DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
+apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgift eller Forskel konto er obligatorisk for Item {0}, da det påvirker den samlede lagerværdi"
+DocType: Lead,Channel Partner,Channel Partner
+DocType: Communication,Replied,Svarede
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
+DocType: Item,Lead Time in days,Lead Time i dage
+DocType: Journal Entry,Debit Note,Debetnota
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrerende efterbehandling
+DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik på "Generer Schedule 'for at få tidsplan
+DocType: Appraisal,For Employee Name,For Medarbejder Navn
+apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaler
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se Leads
+DocType: Item Group,Check this if you want to show in website,Markér dette hvis du ønsker at vise i website
+DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhedsbrev List Subscriber
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvid
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringsomkostninger
+DocType: Journal Entry,User Remark,Bruger Bemærkning
+DocType: Sales Order,Partly Delivered,Delvist Delivered
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
+DocType: Purchase Invoice,Credit To,Credit Til
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Tilpas
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Angiv venligst valuta i selskabet
+DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og Afgifter Beregning
+DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / kunde
+DocType: Naming Series,Setup Series,Opsætning Series
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+DocType: Purchase Invoice Item,Rate,Rate
+apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
+DocType: Sales Invoice,Get Advances Received,Få forskud
+DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
+DocType: Company,Phone No,Telefon Nej
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fuld formstøbning
+DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
+DocType: Purchase Invoice,Terms,Betingelser
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
+DocType: Process Payroll,Send Email,Send Email
+apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
+DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Hvis du inddrage i fremstillingsindustrien aktivitet. Aktiverer Item 'Er Fremstillet'
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum støbning
+DocType: Contact Us Settings,City,By
+DocType: Hub Settings,Seller Description,Sælger Beskrivelse
+apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
+apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Omkostninger ved forskellige aktiviteter
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Rømning
+DocType: Tax Rule,Sales,Salg
+DocType: Salary Structure,Salary Structure,Løn Struktur
+DocType: BOM Operation,BOM Operation,BOM Operation
+DocType: Warranty Claim,Resolution,Opløsning
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før Material Request Dato
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Lavet af
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Løn skabelon mester.
+,Monthly Salary Register,Månedlig Løn Tilmeld
+apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
+DocType: Purchase Invoice,Contact Email,Kontakt E-mail
+DocType: SMS Settings,Message Parameter,Besked Parameter
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel efterbehandling
+DocType: C-Form Invoice Detail,Invoice Date,Faktura Dato
+DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Afstemning Faktura
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
+DocType: Pricing Rule,"Higher the number, higher the priority","Højere tallet er, jo højere prioritet"
+apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
+DocType: Newsletter,A Lead with this email id should exist,Et emne med dette e-mail-id skal være oprettet.
+DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
+DocType: Time Log,Will be updated when billed.,"Vil blive opdateret, når faktureret."
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
+DocType: Time Log Batch,Total Billing Amount,Samlet Billing Beløb
+DocType: POS Profile,Update Stock,Opdatering Stock
+DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
+Operations shall not be tracked against Production Order",Deaktiverer oprettelsen af ​​tid logs mod produktionsordrer. Operationer må ikke spores mod produktionsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: Serial No,Delivery Details,Levering Detaljer
+DocType: Hub Settings,Sync Now,Synkroniser nu
+DocType: Dropbox Backup,Daily,Daglig
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
+,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
+DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Hvis du har lange trykte formater, kan denne funktion bruges til at opdele side, der skal udskrives på flere sider med alle sidehoveder og sidefødder på hver side"
+DocType: Mode of Payment,Mode of Payment,Mode Betaling
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Plot
+DocType: Stock Reconciliation,Difference Amount,Forskel Beløb
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Tilføj et par prøve optegnelser
+apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
+DocType: Item,Item Tax,Item Skat
+DocType: Leave Block List,Allow Users,Tillad brugere
+DocType: Cost Center,Stock User,Stock Bruger
+DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
+DocType: Delivery Note,Transporter Name,Transporter Navn
+DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
+DocType: Company,Distribution,Distribution
+DocType: Pricing Rule,Applicable For,Gældende For
+DocType: Account,Account,Konto
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekræft din e-mail
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} er fuldt faktureret
+DocType: Workstation,Net Hour Rate,Net Hour Rate
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Menneskelige Ressourcer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åbning
+DocType: Production Order,Planned Operating Cost,Planlagt driftsomkostninger
+DocType: Job Opening,Description of a Job Opening,Beskrivelse af et job Åbning
+DocType: Country,Country,Land
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
+,Amount to Deliver,"Beløb, Deliver"
+apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Opnået
+DocType: Lead,Opportunity,Mulighed
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
+DocType: Appraisal,HR User,HR Bruger
+DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
+DocType: Quotation Item,Against Doctype,Mod DOCTYPE
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Omkostninger Centers
+DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
+DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
+DocType: Item,Auto re-order,Auto re-ordre
+DocType: GL Entry,Voucher No,Blad nr
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af materialer leveret mod denne følgeseddel
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kolde dimensionering
+DocType: Warranty Claim,Service Address,Tjeneste Adresse
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
+DocType: Batch,Batch ID,Batch-id
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Genbestil Antal
+apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Udgift / Difference konto ({0}) skal være en »resultatet« konto
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id skal være unikt, der allerede eksisterer for {0}"
+apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Opsætning indgående server for job email id. (F.eks jobs@example.com)
+DocType: Employee,External Work History,Ekstern Work History
+DocType: Production Order,Planned Start Date,Planlagt startdato
+DocType: Features Setup,To track any installation or commissioning related work after sales,At spore enhver installation eller idriftsættelse relateret arbejde eftersalgsservice
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} er ikke indsendt
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} findes ikke
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
+DocType: Dropbox Backup,Send Notifications To,Send meddelelser til
+DocType: Employee,Mr,Hr
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Knusning
+,Hub,Hub
+DocType: Item Reorder,Item Reorder,Item Genbestil
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vælg {0} først
+DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
+DocType: Journal Entry Account,Purchase Order,Indkøbsordre
+DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittering Varer
+apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
+apps/frappe/frappe/templates/base.html +134,Added,Tilføjet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Poster og GL Entries er reposted for de valgte Køb Kvitteringer
+DocType: Employee,Salary Information,Løn Information
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
+DocType: Item,Allow Production Order,Tillad produktionsordre
+DocType: Authorization Rule,Customer / Item Name,Kunde / Item Name
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
+DocType: Appraisal Template Goal,Appraisal Template Goal,Vurdering Template Goal
+DocType: Expense Claim,Total Sanctioned Amount,Total Sanktioneret Beløb
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order til Betaling
+DocType: Job Applicant,Hold,Hold
+DocType: Letter Head,Letter Head,Brev hoved
+DocType: Item,Website Description,Website Beskrivelse
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg Item hvor "Er Stock Item" er "Nej" og "Er Sales Item" er "Ja", og der er ingen anden Product Bundle"
+DocType: Newsletter,Newsletter,Nyhedsbrev
+DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
+apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
+DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
+DocType: Item,Website Warehouse,Website Warehouse
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
+DocType: Features Setup,Features Setup,Features Setup
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som "Left"
+DocType: Maintenance Visit,Breakdown,Sammenbrud
+apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
+DocType: Report,Report Type,Rapporttype
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vandstråleskæring
+DocType: Installation Note Item,Installed Qty,Antal installeret
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
+DocType: Website Item Group,Website Item Group,Website Item Group
+DocType: BOM Item,Item Description,Punkt Beskrivelse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
+DocType: Item,Default Buying Cost Center,Standard købsomkostninger center
+DocType: Employee,Education,Uddannelse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
+DocType: User,Bio,Bio
+DocType: Address,Lead Name,Bly navn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Ny Cost center
+DocType: Bin,Reserved Quantity,Reserveret Mængde
+DocType: Attendance,Half Day,Half Day
+DocType: Email Digest,For Company,For Company
+DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Felt fås i Delivery Note, Citat, Sales Invoice, Sales Order"
+,Open Production Orders,Åbne produktionsordrer
+DocType: Account,Bank,Bank
+DocType: Monthly Distribution Percentage,Month,Måned
+DocType: Project Task,Task ID,Opgave-id
+DocType: About Us Settings,Website Manager,Website manager
+DocType: SMS Settings,Static Parameters,Statiske parametre
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Vedhæft Brevpapir
+,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
+DocType: Item,Will also apply for variants unless overrridden,"Vil også gælde for varianter, medmindre overrridden"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Opdater færdigvarer
+DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Adgang tilladt
+DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
+DocType: Item Attribute,Attribute Name,Attribut Navn
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuum støbning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kassebeholdning
+DocType: Contact,User ID,Bruger-id
+DocType: User,Last Name,Efternavn
+apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Du installere dropbox python-modul
+DocType: Salary Slip,Net Pay,Nettoløn
+DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
+DocType: Customer,Fixed Days,Faste dage
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ugyldig {0}: {1}
+DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
+DocType: Rename Tool,Rename Log,Omdøbe Log
+DocType: Quality Inspection,Outgoing,Udgående
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
+DocType: Hub Settings,Seller Email,Sælger Email
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
+apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester.
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+DocType: Workflow State,Primary,Primær
+DocType: Employee,Marital Status,Civilstand
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Sømning
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Du vil bruge det til login
+apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
+DocType: C-Form,Amended From,Ændret Fra
+DocType: Pricing Rule,For Price List,For prisliste
+apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),I alt ({0})
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Ny Company
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle bearbejdning
+DocType: Bank Reconciliation Detail,Posting Date,Udstationering Dato
+DocType: Product Bundle,Parent Item,Parent Item
+,Item-wise Sales History,Vare-wise Sales History
+DocType: Contact,Enter designation of this Contact,Indtast udpegelsen af ​​denne Kontakt
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Mængde for Item {0} skal være mindre end {1}
+DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bøjning
+DocType: Cost Center,Distribution Id,Distribution Id
+DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
+DocType: Issue,Resolution Details,Opløsning Detaljer
+,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrokemisk slibning
+DocType: Salary Slip,Leave Without Pay,Lad uden løn
+DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
+DocType: System Settings,System Settings,Systemindstillinger
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra kundeordre
+DocType: Address Template,Address Template,Adresse Skabelon
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde> Customer Group> Territory
+DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
+DocType: Customer,Default Price List,Standard prisliste
+DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges",Skat detalje tabel hentes fra post mester som en streng og opbevares i dette område. Bruges til skatter og afgifter
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,Venligst setup Medarbejder navnesystem i Human Resource> HR-indstillinger
+DocType: Employee,Employment Details,Beskæftigelse Detaljer
+apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
+DocType: Contact Us Settings,Address Line 2,Adresse Linje 2
+DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
+DocType: Process Payroll,Create Salary Slip,Opret lønseddel
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Indsend alle lønsedler for de ovenfor valgte kriterier
+DocType: Naming Series,Help HTML,Hjælp HTML
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detaljer
+DocType: Authorization Rule,Above Value,Over værdi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
+DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
+DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
+DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
+DocType: Production Order,Actual End Date,Faktiske Slutdato
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Indtast venligst item detaljer
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
+apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Pakhuse.
+DocType: Quality Inspection,Incoming,Indgående
+DocType: Department,Leave Block List,Lad Block List
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Vælg antal
+apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, så det kan ikke vælges i salgsordrer mv"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mod regning {1} ​​dateret {2}
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
+DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Bruger (login) ID. Hvis sat, vil det blive standard for alle HR-formularer."
+DocType: Salary Slip,Working Days,Arbejdsdage
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate skal være samme som {0} {1} ({2})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
+DocType: Employee,Current Address Is,Nuværende adresse er
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Revisor
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
+DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Langskæring
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forskning & Udvikling
+DocType: Item,Website Item Groups,Website varegrupper
+DocType: Page,Standard,Standard
+DocType: Target Detail,Target Detail,Target Detail
+DocType: Quotation,Quotation To,Citat Til
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Large
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
+DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan lave en tid log kun mod en indsendt produktionsordre
+DocType: Serial No,Delivery Document No,Levering dokument nr
+DocType: Purchase Common,Purchase Common,Indkøb Common
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packing Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
+DocType: Employee Education,School/University,Skole / Universitet
+DocType: Purchase Order,To Bill,Til Bill
+DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu
+DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Til Time skal være større end From Time
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flyselskab
+DocType: Delivery Note,Excise Page Number,Excise Sidetal
+DocType: Delivery Note,To Warehouse,Til Warehouse
+DocType: Production Planning Tool,Select Sales Orders,Vælg salgsordrer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Udgifter
+,Requested,Anmodet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
+DocType: Lead,Market Segment,Market Segment
+DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer som navn og besættelse af forældre, ægtefælle og børn"
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
+apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
+DocType: HR Settings,HR Settings,HR-indstillinger
+DocType: Sales Team,Incentives,Incitamenter
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
+DocType: C-Form,Total Invoiced Amount,Total Faktureret beløb
+DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Kontroller, om du har brug for automatiske tilbagevendende fakturaer. Når du har indsendt nogen faktura, vil Tilbagevendende sektion være synlige."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
+DocType: Leave Application,Leave Application,Forlad Application
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vælg regnskabsår ...
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Rejser
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
+DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
+apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Tilføj / rediger Priser
+DocType: Selling Settings,Sales Order Required,Sales Order Påkrævet
+DocType: Employee,Widowed,Enke
+DocType: Buying Settings,Purchase Order Required,Indkøbsordre Påkrævet
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Opretning
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
+DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
+DocType: Employee,Reason for Leaving,Årsag til Leaving
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Opfandt
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Medarbejder {0} var på orlov på {1}. Kan ikke markere fremmøde.
+apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre 'Ingen Copy "er indstillet"
+DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstat Værktøj
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Usikrede lån
+apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
+DocType: Sales Invoice Item,Sales Order Item,Sales Order Vare
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
+apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Noter
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Anmodning om.
+DocType: Item,Minimum Order Qty,Minimum Antal
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Udfladning
+DocType: Target Detail,Target  Amount,Målbeløbet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte udgifter
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Sidste ordrebeløb
+DocType: Company,Stock Adjustment Account,Stock Justering konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst "Er Advance 'mod konto {1}, hvis dette er et forskud post."
+DocType: Purchase Taxes and Charges,Add or Deduct,Tilføje eller fratrække
+DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC status
+DocType: GL Entry,Party Type,Party Type
+DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
+DocType: Sales Invoice,Packing List,Pakning List
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
+DocType: Shipping Rule,Net Weight,Vægt
+DocType: Issue,Support Team,Support Team
+DocType: Address,Preferred Shipping Address,Foretrukne Forsendelsesadresse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
+DocType: Item,Attributes,Attributter
+DocType: Account,Tax,Skat
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
+DocType: Company,Change Abbreviation,Skift Forkortelse
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Faktura Dato
+apps/erpnext/erpnext/config/stock.py +141,Main Reports,Vigtigste Reports
+DocType: Delivery Note,% Installed,% Installeret
+DocType: Shipping Rule,Shipping Account,Forsendelse konto
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hamring
+DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Hvis du følger kvalitetskontrol. Aktiverer Item QA Nødvendig og QA Ingen i kvittering
+DocType: Email Account,Email Ids,Email Ids
+DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Discount Fields vil være tilgængelig i Indkøbsordre, kvittering, købsfaktura"
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra køb Kvitteringer
+DocType: Budget Detail,Budget Detail,Budget Detail
+apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskabsår {0} ikke fundet.
+DocType: Production Order Operation,Make Time Log,Make Time Log
+DocType: Item,Will also apply for variants,Vil også gælde for varianter
+DocType: Email Digest,Payables,Gæld
+DocType: Pricing Rule,Customer Group,Customer Group
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Omdøb
+apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
+DocType: User,First Name,Fornavn
+DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firma registreringsnumre til din reference. Skat numre etc.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Indtast venligst forælder konto gruppe for lager {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Købmand
+apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
+apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og Credit ikke ens for {0} # {1}. Forskellen er {2}.
+DocType: Pricing Rule,Discount on Price List Rate (%),Rabat på prisliste Rate (%)
+DocType: Time Log,To Time,Til Time
+DocType: Pricing Rule,Item Code,Item Code
+DocType: Sales Invoice,Recurring,Tilbagevendende
+,BOM Browser,BOM Browser
+,Completed Production Orders,Afsluttede produktionsordrer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materiale Request
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log til opgaver.
+apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vælg Bankkonto
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5
+DocType: Production Order Operation,"in Minutes
+Updated via 'Time Log'",i minutter Opdateret via 'Time Log'
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Limning
+DocType: Offer Letter,Awaiting Response,Afventer svar
+,Stock Ledger,Stock Ledger
+DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
+DocType: Employee Leave Approver,Leave Approver,Lad Godkender
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Value
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Forsendelser til kunderne.
+DocType: Appraisal,Total Score (Out of 5),Total Score (ud af 5)
+DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
+DocType: Accounts Settings,Settings for Accounts,Indstillinger for konti
+DocType: Employee,Date of Joining,Dato for Sammenføjning
+DocType: BOM,With Operations,Med Operations
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
+DocType: System Settings,Time Zone,Time Zone
+DocType: Item,Inspection Required,Inspection Nødvendig
+DocType: Company,Default Currency,Standard Valuta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+,Daily Time Log Summary,Daglig Time Log Summary
+DocType: POS Profile,Price List,Pris List
+DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløb
+DocType: Time Log,Batched for Billing,Batched for fakturering
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
+DocType: Maintenance Visit,Maintenance Type,Vedligeholdelse Type
+DocType: Blog Category,Parent Website Route,Parent Website Route
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tilføj Child
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Clearance Dato ikke nævnt
+DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
+DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
+DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spor fører af Industry Type.
+apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} er ikke en gyldig e-mail-id
+,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserskæring
+,SO Qty,SO Antal
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Auktioner
+DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Løbenummer {0} ikke hører til Vare {1}
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Venligst følgeseddel først
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
+apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
+DocType: DocField,Column Break,Kolonne Break
+DocType: Project,Gross Margin,Gross Margin
+DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
+apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Ny {0}: # {1}
+DocType: Attendance,HR Manager,HR Manager
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
+DocType: DocField,Attach Image,Vedhæft billede
+,Delivered Items To Be Billed,Leverede varer at blive faktureret
+,Item-wise Sales Register,Vare-wise Sales Register
+DocType: Warranty Claim,From Company,Fra Company
+DocType: SMS Center,Total Characters,Total tegn
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,fx moms
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforering
+DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
+DocType: Expense Claim,Expense Approver,Expense Godkender
+DocType: Packing Slip,Net Weight UOM,Nettovægt UOM
+apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
+DocType: Maintenance Schedule Item,Half Yearly,Halvdelen Årlig
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv dag)
+DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
+DocType: Employee,Better Prospects,Bedre udsigter
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Gem nyhedsbrevet før afsendelse
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicate indtastning. Forhør Authorization Rule {0}
+DocType: Quality Inspection,Delivery Note No,Levering Note Nej
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Afsluttet Antal kan ikke være mere end {0} til drift {1}
+DocType: Report,Disabled,Handicappet
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
+DocType: GL Entry,Is Opening,Er Åbning
+DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktiveret, vil systemet sende bogføring for opgørelse automatisk."
+DocType: Payment Reconciliation,Payment Reconciliation,Betaling Afstemning
+DocType: Quality Inspection Reading,Reading 1,Læsning 1
+apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
+DocType: Journal Entry,Contra Entry,Contra indtastning
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af ​​sin levetid på {1}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Du skal gemme formularen, før du fortsætter"
+DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
+DocType: Leave Allocation,Leave Allocation,Lad Tildeling
+DocType: Tax Rule,Purchase,Købe
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink fitting
+DocType: Account,Income Account,Indkomst konto
+DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
+DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
+DocType: Employee,Feedback,Feedback
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sag nr.' kan ikke være mindre end 'Fra sag nr.'
+DocType: Serial No,Creation Document No,Creation dokument nr
+DocType: Account,Account Name,Kontonavn
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Aflytning
+DocType: Earning Type,Earning Type,Optjening Type
+DocType: Production Order Operation,Pending,Afventer
+DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
+DocType: Customer,Sales Team Details,Salg Team Detaljer
+DocType: Sales Partner,Address & Contacts,Adresse & Contacts
+,Stock Balance,Stock Balance
+DocType: Lead,Converted,Konverteret
+DocType: Supplier,Supplier Details,Leverandør Detaljer
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridisk
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -1924,1789 +3576,109 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skat skabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som "Shipping", "forsikring", "Håndtering" osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer * *. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af ​​grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på "Forrige Row alt" kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Overvej Skat eller Gebyr for: I dette afsnit kan du angive, om skatten / afgiften er kun for værdiansættelse (ikke en del af det samlede) eller kun for total (ikke tilføre værdi til emnet) eller til begge. 10. Tilføj eller fratrække: Uanset om du ønsker at tilføje eller fratrække afgiften."
-DocType: Note,Note,Bemærk
-DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
-DocType: Email Account,Email Ids,Email Ids
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Sæt som oplades
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
-DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Dette Orlov Ansøgning afventer godkendelse. Kun Leave Godkender kan opdatere status.
-DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
-apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
-DocType: Journal Entry,Credit Note,Kreditnota
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Afsluttet Antal kan ikke være mere end {0} til drift {1}
-DocType: Features Setup,Quality,Kvalitet
-DocType: Contact Us Settings,Introduction,Introduktion
-DocType: Warranty Claim,Service Address,Tjeneste Adresse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rækker for Stock Afstemning.
-DocType: Stock Entry,Manufacture,Fremstilling
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Venligst følgeseddel først
-DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Clearance Dato ikke nævnt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
-DocType: Item,Allow Production Order,Tillad produktionsordre
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (Antal)
-DocType: Installation Note Item,Installed Qty,Antal installeret
-DocType: Lead,Fax,Fax
-DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Indsendt
-DocType: Salary Structure,Total Earning,Samlet Earning
-DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine Adresser
-DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
-apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation gren mester.
-DocType: Sales Order,Billing Status,Fakturering status
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Udgifter
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Above
-DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
-,Download Backups,Hent Backups
-DocType: Notification Control,Sales Order Message,Sales Order Message
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Company, Valuta, indeværende finansår, etc."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betaling Type
-DocType: Process Payroll,Select Employees,Vælg Medarbejdere
-DocType: Bank Reconciliation,To Date,Til dato
-DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
-sites/assets/js/form.min.js +308,Details,Detaljer
-DocType: Purchase Invoice,Total Taxes and Charges,Total Skatter og Afgifter
-DocType: Employee,Emergency Contact,Emergency Kontakt
-DocType: Item,Quality Parameters,Kvalitetsparametre
-DocType: Target Detail,Target  Amount,Målbeløbet
-DocType: Shopping Cart Settings,Shopping Cart Settings,Indkøbskurv Indstillinger
-DocType: Journal Entry,Accounting Entries,Bogføring
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicate indtastning. Forhør Authorization Rule {0}
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Global POS Profil {0} allerede skabt til selskab {1}
-DocType: Purchase Order,Ref SQ,Ref SQ
-apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Udskift Item / BOM i alle styklister
-DocType: Purchase Order Item,Received Qty,Modtaget Antal
-DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
-DocType: Product Bundle,Parent Item,Parent Item
-DocType: Account,Account Type,Kontotype
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på "Generer Schedule '
-,To Produce,At producere
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
-DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
-DocType: Bin,Reserved Quantity,Reserveret Mængde
-DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittering Varer
-apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Skæring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Udfladning
-DocType: Account,Income Account,Indkomst konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
-DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
-DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se "Rate Of Materials Based On" i Costing afsnit
-DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
-DocType: Item Reorder,Material Request Type,Materiale Request Type
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenter
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
-DocType: Cost Center,Cost Center,Cost center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
-DocType: Notification Control,Purchase Order Message,Indkøbsordre Message
-DocType: Upload Attendance,Upload HTML,Upload HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
-				than the Grand Total ({2})",Total forhånd ({0}) mod Order {1} kan ikke være større \ end Grand Total ({2})
-DocType: Employee,Relieving Date,Lindre Dato
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prisfastsættelse Regel er lavet til at overskrive Prisliste / definere rabatprocent, baseret på nogle kriterier."
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse kan kun ændres via Stock indtastning / følgeseddel / kvittering
-DocType: Employee Education,Class / Percentage,Klasse / Procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef for Marketing og Salg
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser manipuleret netto formgivning
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgte Prisfastsættelse Regel er lavet til "pris", vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i "Rate 'felt, snarere end' Prisliste Rate 'område."
-apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spor fører af Industry Type.
-DocType: Item Supplier,Item Supplier,Vare Leverandør
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
-apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
-DocType: Company,Stock Settings,Stock Indstillinger
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
-apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrer Customer Group Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Ny Cost center navn
-DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
-apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup> Trykning og Branding> Adresse skabelon.
-DocType: Appraisal,HR User,HR Bruger
-DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
-apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Spørgsmål
-apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af ​​{0}
-DocType: Sales Invoice,Debit To,Betalingskort Til
-DocType: Delivery Note,Required only for sample item.,Kræves kun for prøve element.
-DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
-,Pending SO Items For Purchase Request,Afventer SO Varer til Indkøb Request
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
-,Profit and Loss Statement,Resultatopgørelse
-DocType: Bank Reconciliation Detail,Cheque Number,Check Number
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Ved at trykke
-DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
-,Sales Browser,Salg Browser
-DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Large
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen medarbejder fundet!
-DocType: C-Form Invoice Detail,Territory,Territory
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
-DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
-DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Allokeret
-apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Citat {0} er aflyst
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Medarbejder {0} var på orlov på {1}. Kan ikke markere fremmøde.
-DocType: Sales Partner,Targets,Mål
-DocType: Price List,Price List Master,Prisliste Master
-DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
-,S.O. No.,SÅ No.
-DocType: Production Order Operation,Make Time Log,Make Time Log
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrokemisk slibning
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dette er en rod kundegruppe og kan ikke redigeres.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Venligst opsætning din kontoplan, før du starter bogføring"
-DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Prisfastsættelse Rule
-sites/assets/js/list.min.js +24,Cancelled,Annulleret
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i Løn Structure ikke kan være mindre end Medarbejder Sammenføjning Dato.
-DocType: Employee Education,Graduate,Graduate
-DocType: Leave Block List,Block Days,Bloker dage
-DocType: Journal Entry,Excise Entry,Excise indtastning
-DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
-
-Examples:
-
-1. Validity of the offer.
-1. Payment Terms (In Advance, On Credit, part advance etc).
-1. What is extra (or payable by the Customer).
-1. Safety / usage warning.
-1. Warranty if any.
-1. Returns Policy.
-1. Terms of shipping, if applicable.
-1. Ways of addressing disputes, indemnity, liability, etc.
-1. Address and Contact of your Company.","Standard vilkår og betingelser, der kan føjes til salg og køb. Eksempler: 1. gyldighed tilbuddet. 1. Betalingsbetingelser (i forvejen, på kredit, del forhånd osv). 1. Hvad er ekstra (eller skulle betales af Kunden). 1. Sikkerhed / forbrug advarsel. 1. Garanti hvis nogen. 1. Retur Politik. 1. Betingelser for skibsfart, hvis relevant. 1. Måder adressering tvister, erstatning, ansvar mv 1. Adresse og Kontakt i din virksomhed."
-DocType: Attendance,Leave Type,Forlad Type
-apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Udgift / Difference konto ({0}) skal være en »resultatet« konto
-DocType: Account,Accounts User,Regnskab Bruger
-DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende faktura, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
-DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til print)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0} rækker tilladt
-DocType: C-Form Invoice Detail,Net Total,Net Total
-DocType: Bin,FCFS Rate,FCFS Rate
-apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Billing (Sales Invoice)
-DocType: Payment Reconciliation Invoice,Outstanding Amount,Udestående beløb
-DocType: Project Task,Working,Working
-DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock kø (FIFO)
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Vælg Time Logs.
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} ikke tilhører selskabet {1}
-DocType: Account,Round Off,Afrunde
-,Requested Qty,Anmodet Antal
-DocType: BOM Item,Scrap %,Skrot%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg"
-DocType: Maintenance Visit,Purposes,Formål
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindst ét ​​element skal indtastes med negativt mængde gengæld dokument
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemisk bearbejdning
-,Requested,Anmodet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ingen Bemærkninger
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfaldne
-DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
-DocType: Monthly Distribution,Distribution Name,Distribution Name
-DocType: Features Setup,Sales and Purchase,Salg og Indkøb
-DocType: Purchase Order Item,Material Request No,Materiale Request Nej
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} er blevet afmeldt fra denne liste.
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
-apps/frappe/frappe/templates/base.html +132,Added,Tilføjet
-apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrer Territory Tree.
-DocType: Journal Entry Account,Sales Invoice,Salg Faktura
-DocType: Journal Entry Account,Party Balance,Party Balance
-DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Vælg Anvend Rabat på
-DocType: Company,Default Receivable Account,Standard Tilgodehavende konto
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Opret Bank Punktet om den samlede løn for de ovenfor valgte kriterier
-DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
-DocType: Purchase Invoice,Half-yearly,Halvårligt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskabsår {0} ikke fundet.
-DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskab Punktet om Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Opfandt
-DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Element {0} eksisterer ikke
-DocType: Sales Invoice,Customer Address,Kunde Adresse
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
-DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
-DocType: Account,Root Type,Root Type
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Plot
-DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
-DocType: BOM,Item UOM,Item UOM
-DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
-DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray danner
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Konto {0} er spærret
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventory Level
-DocType: Stock Entry,Subcontract,Underleverance
-DocType: Production Planning Tool,Get Items From Sales Orders,Få elementer fra salgsordrer
-DocType: Production Order Operation,Actual End Time,Faktiske Sluttid
-DocType: Production Planning Tool,Download Materials Required,Hent Påkrævede materialer
-DocType: Item,Manufacturer Part Number,Producentens varenummer
-DocType: Production Order Operation,Estimated Time and Cost,Estimeret tid og omkostninger
-DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Forkant
-DocType: SMS Log,No of Sent SMS,Ingen af ​​Sent SMS
-DocType: Account,Company,Firma
-DocType: Account,Expense Account,Udgiftskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farve
-DocType: Maintenance Visit,Scheduled,Planlagt
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg Item hvor "Er Stock Item" er "Nej" og "Er Sales Item" er "Ja", og der er ingen anden Product Bundle"
-DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
-DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Pris List Valuta ikke valgt
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: kvittering {1} findes ikke i ovenstående 'Køb Kvitteringer' bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Indtil
-DocType: Rename Tool,Rename Log,Omdøbe Log
-DocType: Installation Note Item,Against Document No,Mod dokument nr
-apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrer Sales Partners.
-DocType: Quality Inspection,Inspection Type,Inspektion Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vælg {0}
-DocType: C-Form,C-Form No,C-Form Ingen
-DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Forsker
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Opdatering
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Gem nyhedsbrevet før afsendelse
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-mail er obligatorisk
-apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektion indkommende kvalitet.
-DocType: Employee,Exit,Udgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Typen er obligatorisk
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrerende efterbehandling
-DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
-DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
-DocType: Sales Invoice,Advertisement,Annonce
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
-DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
-DocType: Expense Claim,Expense Approver,Expense Godkender
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
-sites/assets/js/erpnext.min.js +48,Pay,Betale
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
-DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
-apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slibning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink indpakning
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekræftet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør> Leverandør type
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
-apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status "Godkendt" kan indsendes
-apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresse Titel er obligatorisk.
-DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Dagblades
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vælg regnskabsår
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smeltning
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Du er den Leave Godkender til denne oplysning. Venligst Opdater "Status" og Gem
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
-DocType: Attendance,Attendance Date,Fremmøde Dato
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
-DocType: Address,Preferred Shipping Address,Foretrukne Forsendelsesadresse
-DocType: Purchase Receipt Item,Accepted Warehouse,Accepteret varelager
-DocType: Bank Reconciliation Detail,Posting Date,Udstationering Dato
-DocType: Item,Valuation Method,Værdiansættelsesmetode
-DocType: Sales Invoice,Sales Team,Salgsteam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicate entry
-DocType: Serial No,Under Warranty,Under Garanti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fejl]
-DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord vil være synlig, når du gemmer Sales Order."
-,Employee Birthday,Medarbejder Fødselsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
-DocType: UOM,Must be Whole Number,Skal være hele tal
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye blade Tildelte (i dage)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
-DocType: Pricing Rule,Discount Percentage,Discount Procent
-DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Ordrer
-DocType: Leave Control Panel,Employee Type,Medarbejder Type
-DocType: Employee Leave Approver,Leave Approver,Lad Godkender
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Sænksmedning
-DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udgifter' rolle
-,Issued Items Against Production Order,Udstedte Varer Against produktionsordre
-DocType: Pricing Rule,Purchase Manager,Indkøb manager
-DocType: Payment Tool,Payment Tool,Betaling Tool
-DocType: Target Detail,Target Detail,Target Detail
-DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Lukning indtastning
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
-DocType: Customer,Credit Limit,Kreditgrænse
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
-DocType: GL Entry,Voucher No,Blad nr
-DocType: Leave Allocation,Leave Allocation,Lad Tildeling
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Materiale Anmodning {0} skabt
-apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
-DocType: Customer,Last Day of the Next Month,Sidste dag i den næste måned
-DocType: Employee,Feedback,Feedback
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: På grund / reference Date overstiger tilladte kunde kredit dage efter {0} dag (e)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Sandblæsnings udstyr
-DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
-DocType: Website Settings,Website Settings,Website Settings
-DocType: Activity Cost,Billing Rate,Fakturering Rate
-,Qty to Deliver,Antal til Deliver
-DocType: Monthly Distribution Percentage,Month,Måned
-,Stock Analytics,Stock Analytics
-DocType: Installation Note Item,Against Document Detail No,Imod Dokument Detail Nej
-DocType: Quality Inspection,Outgoing,Udgående
-DocType: Material Request,Requested For,Anmodet om
-DocType: Quotation Item,Against Doctype,Mod DOCTYPE
-DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root-konto kan ikke slettes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
-DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Henvisning # {0} dateret {1}
-DocType: Pricing Rule,Item Code,Item Code
-DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
-DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-DocType: Journal Entry,User Remark,Bruger Bemærkning
-DocType: Lead,Market Segment,Market Segment
-DocType: Communication,Phone,Telefon
-DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Lukning (dr)
-DocType: Contact,Passive,Passiv
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
-apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
-DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Off Udestående beløb
-DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Kontroller, om du har brug for automatiske tilbagevendende fakturaer. Når du har indsendt nogen faktura, vil Tilbagevendende sektion være synlige."
-DocType: Account,Accounts Manager,Accounts Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Time Log {0} skal være »Tilmeldt '
-DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
-DocType: Production Planning Tool,Create Material Requests,Opret Materiale Anmodning
-DocType: Employee Education,School/University,Skole / Universitet
-DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængelig Antal på Warehouse
-,Billed Amount,Faktureret beløb
-DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Tilføj et par prøve optegnelser
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Lad Management
-DocType: Event,Groups,Grupper
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
-DocType: Sales Order,Fully Delivered,Fuldt Leveres
-DocType: Lead,Lower Income,Lavere indkomst
-DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hoved under ansvar, hvor gevinst / tab vil være reserveret"
-DocType: Payment Tool,Against Vouchers,Mod Vouchers
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtig hjælp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Kilde og mål lageret ikke kan være ens for rækken {0}
-DocType: Features Setup,Sales Extras,Salg Extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Videresendte Blade
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
-,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
-DocType: Warranty Claim,From Company,Fra Company
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
-DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
-,Qty to Receive,Antal til Modtag
-DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Omregningsfaktor kan ikke være i fraktioner
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Du vil bruge det til login
-DocType: Sales Partner,Retailer,Forhandler
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
-DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
-DocType: Sales Order,%  Delivered,% Leveres
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank kassekredit
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Foretag lønseddel
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Unstop
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Gennemse BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikrede lån
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åbning Balance Egenkapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Kan ikke godkende orlov, som du ikke har tilladelse til at godkende blade på Block Datoer"
-DocType: Appraisal,Appraisal,Vurdering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum støbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tegning
-apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gentages
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Lad godkender skal være en af ​​{0}
-DocType: Hub Settings,Seller Email,Sælger Email
-DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
-DocType: Workstation Working Hour,Start Time,Start Time
-DocType: Item Price,Bulk Import Help,Bulk Import Hjælp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Vælg antal
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkendelse Rolle kan ikke være det samme som rolle reglen gælder for
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Besked sendt
-DocType: Production Plan Sales Order,SO Date,SO Dato
-DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Hastighed, hvormed Prisliste valuta omregnes til kundens basisvaluta"
-DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (Company Valuta)
-DocType: BOM Operation,Hour Rate,Hour Rate
-DocType: Stock Settings,Item Naming By,Item Navngivning By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Fra tilbudsgivning
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
-DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} findes ikke
-DocType: Purchase Receipt Item,Purchase Order Item No,Indkøbsordre Konto nr
-DocType: System Settings,System Settings,Systemindstillinger
-DocType: Project,Project Type,Projekt type
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
-apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Omkostninger ved forskellige aktiviteter
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke lov til at opdatere lagertransaktioner ældre end {0}
-DocType: Item,Inspection Required,Inspection Nødvendig
-DocType: Purchase Invoice Item,PR Detail,PR Detail
-DocType: Sales Order,Fully Billed,Fuldt Billed
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kassebeholdning
-DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
-DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
-DocType: Serial No,Is Cancelled,Er Annulleret
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Mine forsendelser
-DocType: Journal Entry,Bill Date,Bill Dato
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
-DocType: Supplier,Supplier Details,Leverandør Detaljer
-DocType: Communication,Recipients,Modtagere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skruning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Rifling
-DocType: Expense Claim,Approval Status,Godkendelsesstatus
-DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
-apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vælg Bankkonto
-DocType: Newsletter,Create and Send Newsletters,Opret og send nyhedsbreve
-sites/assets/js/report.min.js +107,From Date must be before To Date,Fra dato skal være før til dato
-DocType: Sales Order,Recurring Order,Tilbagevendende Order
-DocType: Company,Default Income Account,Standard Indkomst konto
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / kunde
-DocType: Item Group,Check this if you want to show in website,Markér dette hvis du ønsker at vise i website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Velkommen til ERPNext
-DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
-apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Føre til Citat
-DocType: Lead,From Customer,Fra kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Opkald
-DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
-DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
-,Projected,Projiceret
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
-DocType: Notification Control,Quotation Message,Citat Message
-DocType: Issue,Opening Date,Åbning Dato
-DocType: Journal Entry,Remark,Bemærkning
-DocType: Purchase Receipt Item,Rate and Amount,Sats og Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Fra kundeordre
-DocType: Blog Category,Parent Website Route,Parent Website Route
-DocType: Sales Order,Not Billed,Ikke Billed
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre samme firma
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Ingen kontakter tilføjet endnu.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ikke aktiv
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Mod Faktura Bogføringsdato
-DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
-DocType: Time Log,Batched for Billing,Batched for fakturering
-apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
-DocType: POS Profile,Write Off Account,Skriv Off konto
-sites/assets/js/erpnext.min.js +26,Discount Amount,Rabat Beløb
-DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
-DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,fx moms
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
-DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
-DocType: Shopping Cart Settings,Quotation Series,Citat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas danner
-DocType: Sales Order Item,Sales Order Date,Sales Order Date
-DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskabet er obligatorisk
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Gå til den relevante gruppe (som regel finansieringskilde> Aktuelle Passiver> Skatter og Afgifter og oprette en ny konto (ved at klikke på Tilføj barn) af typen "Skat" og gøre nævne Skatteprocent.
-,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserskæring
-DocType: Event,Monday,Mandag
-DocType: Journal Entry,Stock Entry,Stock indtastning
-DocType: Account,Payable,Betales
-DocType: Salary Slip,Arrear Amount,Bagud Beløb
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Gross Profit%
-DocType: Appraisal Goal,Weightage (%),Weightage (%)
-DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
-DocType: Newsletter,Newsletter List,Nyhedsbrev List
-DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Kontroller, om du vil sende lønseddel i e-mail til den enkelte medarbejder, samtidig indsende lønseddel"
-DocType: Lead,Address Desc,Adresse Desc
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindst en af ​​salg eller køb skal vælges
-apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
-DocType: Page,All,Alle
-DocType: Stock Entry Detail,Source Warehouse,Kilde Warehouse
-DocType: Installation Note,Installation Date,Installation Dato
-DocType: Employee,Confirmation Date,Bekræftelse Dato
-DocType: C-Form,Total Invoiced Amount,Total Faktureret beløb
-DocType: Account,Sales User,Salg Bruger
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Antal kan ikke være større end Max Antal
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Sæt
-DocType: Lead,Lead Owner,Bly Owner
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Warehouse kræves
-DocType: Employee,Marital Status,Civilstand
-DocType: Stock Settings,Auto Material Request,Auto Materiale Request
-DocType: Time Log,Will be updated when billed.,"Vil blive opdateret, når faktureret."
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nuværende BOM og New BOM må ikke være samme
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
-DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
-DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
-DocType: Territory,Territory Targets,Territory Mål
-DocType: Delivery Note,Transporter Info,Transporter Info
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Indkøbsordre Item Leveres
-apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brev hoveder for print skabeloner.
-apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler til print skabeloner f.eks Proforma Invoice.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
-DocType: POS Profile,Update Stock,Opdatering Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
-apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
-DocType: Purchase Invoice,Terms,Betingelser
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Opret ny
-DocType: Buying Settings,Purchase Order Required,Indkøbsordre Påkrævet
-,Item-wise Sales History,Vare-wise Sales History
-DocType: Expense Claim,Total Sanctioned Amount,Total Sanktioneret Beløb
-,Purchase Analytics,Køb Analytics
-DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
-DocType: Expense Claim,Task,Opgave
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbering
-DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Item {0}
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
-,Stock Ledger,Stock Ledger
-DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Noter
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vælg en gruppe node først.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af ​​{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Udfyld formularen og gemme det
-DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
-DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
-DocType: SMS Center,Send SMS,Send SMS
-DocType: Company,Default Letter Head,Standard Letter hoved
-DocType: Time Log,Billable,Faktureres
-DocType: Authorization Rule,This will be used for setting rule in HR module,Dette vil blive brugt til at indstille regel i HR-modulet
-DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Genbestil Antal
-DocType: Company,Stock Adjustment Account,Stock Justering konto
-DocType: Journal Entry,Write Off,Skriv Off
-DocType: Time Log,Operation ID,Operation ID
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Bruger (login) ID. Hvis sat, vil det blive standard for alle HR-formularer."
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
-DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity Lost
-DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Discount Fields vil være tilgængelig i Indkøbsordre, kvittering, købsfaktura"
-DocType: Report,Report Type,Rapporttype
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Loading
-DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstat Værktøj
-apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Land klogt standardadresse Skabeloner
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
-apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
-DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Hvis du inddrage i fremstillingsindustrien aktivitet. Aktiverer Item 'Er Fremstillet'
-DocType: Sales Invoice,Rounded Total,Afrundet alt
-DocType: Product Bundle,List items that form the package.,"Listeelementer, der danner pakken."
-apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel Tildeling bør være lig med 100%
-DocType: Serial No,Out of AMC,Ud af AMC
-DocType: Purchase Order Item,Material Request Detail No,Materiale Request Detail Nej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hård drejning
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Make Vedligeholdelse Besøg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
-DocType: Company,Default Cash Account,Standard Kontant konto
-apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Indtast 'Forventet leveringsdato'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end Grand Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Bemærk: Hvis betaling ikke sker mod nogen reference, gør Kassekladde manuelt."
-DocType: Item,Supplier Items,Leverandør Varer
-DocType: Opportunity,Opportunity Type,Opportunity Type
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Ny Company
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Cost center er nødvendig for "Resultatopgørelsen" konto {0}
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktioner kan kun slettes af skaberen af ​​selskabet
-apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Forkert antal finansposter fundet. Du har muligvis valgt et forkert konto i transaktionen.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,For at oprette en bankkonto
-DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
-,Stock Ageing,Stock Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' er deaktiveret
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
-					Available Qty: {4}, Transfer Qty: {5}","Række {0}: Antal ikke avalable i lageret {1} på {2} {3}. Tilgængelig Antal: {4}, Transfer Antal: {5}"
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
-DocType: Event,Sunday,Søndag
-DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden 'Kontant eller bank konto' er ikke angivet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Skabelon
-DocType: Sales Person,Sales Person Name,Salg Person Name
-apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst 1 faktura i tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Tilføj Brugere
-DocType: Pricing Rule,Item Group,Item Group
-DocType: Task,Actual Start Date (via Time Logs),Faktiske startdato (via Time Logs)
-DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
-DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
-DocType: Sales Order,Partly Billed,Delvist Billed
-DocType: Item,Default BOM,Standard BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
-apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
-DocType: Time Log Batch,Total Hours,Total Hours
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Blade for type {0} allerede afsat til Medarbejder {1} for Fiscal År {0}
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Element er påkrævet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal sprøjtestøbning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Fra følgeseddel
-DocType: Time Log,From Time,Fra Time
-DocType: Notification Control,Custom Message,Tilpasset Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Vælg dit land, tidszone og valuta"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
-DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Bejdsning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sandstøbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisering
-DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
-DocType: Newsletter,A Lead with this email id should exist,Et emne med dette e-mail-id skal være oprettet.
-DocType: Stock Entry,From BOM,Fra BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',Klik på "Generer Schedule '
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
-DocType: Salary Structure,Salary Structure,Løn Struktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
-DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flyselskab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Issue Materiale
-DocType: Material Request Item,For Warehouse,For Warehouse
-DocType: Employee,Offer Date,Offer Dato
-DocType: Hub Settings,Access Token,Access Token
-DocType: Sales Invoice Item,Serial No,Løbenummer
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
-DocType: Item,Is Fixed Asset Item,Er Fast aktivpost
-DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
-DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Hvis du har lange trykte formater, kan denne funktion bruges til at opdele side, der skal udskrives på flere sider med alle sidehoveder og sidefødder på hver side"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
-DocType: Purchase Invoice,Items,Varer
-DocType: Fiscal Year,Year Name,År Navn
-DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
-DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
-DocType: Sales Partner,Sales Partner Name,Salg Partner Navn
-DocType: Purchase Invoice Item,Image View,Billede View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Efterbehandling & industriel efterbehandling
-DocType: Issue,Opening Time,Åbning tid
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
-DocType: Shipping Rule,Calculate Based On,Beregn baseret på
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Boring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blæsestøbning
-DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
-apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre 'Ingen Copy "er indstillet"
-DocType: Account,Purchase User,Køb Bruger
-DocType: Notification Control,Customize the Notification,Tilpas Underretning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hamring
-DocType: Web Page,Slideshow,Slideshow
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
-DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
-DocType: Journal Entry,Print Heading,Print Overskrift
-DocType: Quotation,Maintenance Manager,Vedligeholdelse manager
-DocType: Workflow State,Search,Søg
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Samlede kan ikke være nul
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dage siden sidste ordre' skal være større end eller lig med nul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lodning
-DocType: C-Form,Amended From,Ændret Fra
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Raw Material
-DocType: Leave Application,Follow via Email,Følg via e-mail
-DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten target qty eller målbeløbet er obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
-DocType: Leave Allocation,Carry Forward,Carry Forward
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Cost Center med eksisterende transaktioner kan ikke konverteres til finans
-DocType: Department,Days for which Holidays are blocked for this department.,"Dage, som Holidays er blokeret for denne afdeling."
-,Produced,Produceret
-DocType: Item,Item Code for Suppliers,Item Code for leverandører
-DocType: Issue,Raised By (Email),Rejst af (E-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Generelt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Vedhæft Brevpapir
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for "Værdiansættelse" eller "Værdiansættelse og Total '"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
-DocType: Journal Entry,Bank Entry,Bank indtastning
-DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
-DocType: Blog Post,Blog Post,Blog-indlæg
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
-apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
-DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
-DocType: Quality Inspection,Item Serial No,Vare Løbenummer
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Time
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
-					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
-DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
-DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
-DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
-DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
-DocType: Account,Tax,Skat
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinering
-DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
-DocType: Quality Inspection,Report Date,Report Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
-DocType: C-Form,Invoices,Fakturaer
-DocType: Job Opening,Job Title,Jobtitel
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Modtagere
-DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
-apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
-DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentdel, du får lov til at modtage eller levere mere mod den bestilte mængde. For eksempel: Hvis du har bestilt 100 enheder. og din Allowance er 10%, så du får lov til at modtage 110 enheder."
-DocType: Pricing Rule,Customer Group,Customer Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
-DocType: Item,Website Description,Website Beskrivelse
-DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
-,Sales Register,Salg Register
-DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
-DocType: Address,Plant,Plant
-DocType: DocType,Setup,Opsætning
-apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Koldvalsning
-DocType: Customer Group,Customer Group Name,Customer Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
-DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
-DocType: GL Entry,Against Voucher Type,Mod Voucher Type
-DocType: Item,Attributes,Attributter
-DocType: Packing Slip,Get Items,Få Varer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Indtast venligst Skriv Off konto
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
-DocType: DocField,Image,Billede
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
-DocType: Communication,Other,Andre
-DocType: C-Form,C-Form,C-Form
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ikke indstillet
-DocType: Production Order,Planned Start Date,Planlagt startdato
-DocType: Serial No,Creation Document Type,Creation Dokumenttype
-DocType: Leave Type,Is Encash,Er indløse
-DocType: Purchase Invoice,Mobile No,Mobile Ingen
-DocType: Payment Tool,Make Journal Entry,Make Kassekladde
-DocType: Leave Allocation,New Leaves Allocated,Nye Blade Allokeret
-apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
-DocType: Project,Expected End Date,Forventet Slutdato
-DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Kommerciel
-DocType: Cost Center,Distribution Id,Distribution Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
-apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenesteydelser.
-DocType: Purchase Invoice,Supplier Address,Leverandør Adresse
-DocType: Contact Us Settings,Address Line 2,Adresse Linje 2
-DocType: ToDo,Reference,Henvisning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforering
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Antal
-apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Financial Services
-DocType: Tax Rule,Sales,Salg
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
-DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Savning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminering
-DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
-DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
-apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Forfaldsdato er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintring
-DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
-DocType: Naming Series,Setup Series,Opsætning Series
-DocType: Supplier,Contact HTML,Kontakt HTML
-DocType: Landed Cost Voucher,Purchase Receipts,Køb Kvitteringer
-DocType: Payment Reconciliation,Maximum Amount,Maksimumbeløb
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Prisfastsættelse Regel anvendes?
-DocType: Quality Inspection,Delivery Note No,Levering Note Nej
-DocType: Company,Retail,Retail
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
-DocType: Attendance,Absent,Fraværende
-DocType: Product Bundle,Product Bundle,Produkt Bundle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Knusning
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
-DocType: Upload Attendance,Download Template,Hent skabelon
-DocType: GL Entry,Remarks,Bemærkninger
-DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
-DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
-DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Installation rekord for en Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuerlig støbning
-sites/assets/js/erpnext.min.js +10,Please specify a,Angiv en
-DocType: Offer Letter,Awaiting Response,Afventer svar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kolde dimensionering
-DocType: Salary Slip,Earning & Deduction,Earning & Fradrag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
-DocType: Holiday List,Weekly Off,Ugentlig Off
-DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
-DocType: Sales Invoice,Return Against Sales Invoice,Retur Against Sales Invoice
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
-DocType: Serial No,Creation Time,Creation Time
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Revenue
-DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Hjælp
-,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
-apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
-DocType: GL Entry,Is Advance,Er Advance
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde Fra Dato og fremmøde til dato er obligatorisk
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Indtast "underentreprise" som Ja eller Nej
-DocType: Sales Team,Contact No.,Kontakt No.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
-DocType: Workflow State,Time,Tid
-DocType: Features Setup,Sales Discounts,Salg Rabatter
-DocType: Hub Settings,Seller Country,Sælger Land
-DocType: Authorization Rule,Authorization Rule,Autorisation Rule
-DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Order
-DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af ​​produktliste."
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tilføj Child
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Konvertering Factor er nødvendig
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision på salg
-DocType: Offer Letter Term,Value / Description,/ Beskrivelse
-,Customers Not Buying Since Long Time,Kunder Ikke købe siden lang tid
-DocType: Production Order,Expected Delivery Date,Forventet leveringsdato
-apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og Credit ikke ens for {0} # {1}. Forskellen er {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Svulmende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Fordampningsemissioner-mønster støbning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Repræsentationsudgifter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Alder
-DocType: Time Log,Billing Amount,Fakturering Beløb
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
-apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansøgning om orlov.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiske Udgifter
-DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto ordre vil blive genereret f.eks 05, 28 osv"
-DocType: Sales Invoice,Posting Time,Udstationering Time
-DocType: Sales Order,% Amount Billed,% Beløb Billed
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Udgifter
-DocType: Sales Partner,Logo,Logo
-DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
-apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte udgifter
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Har du virkelig ønsker at UNSTOP dette materiale Request?
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
-DocType: Maintenance Visit,Breakdown,Sammenbrud
-DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
-DocType: Feed,Full Name,Fulde navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
-,Transferred Qty,Overført Antal
-apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigering
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlægning
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Make Time Log Batch
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Udstedt
-DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vi sælger denne Vare
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør id
-DocType: Journal Entry,Cash Entry,Cash indtastning
-DocType: Sales Partner,Contact Desc,Kontakt Desc
-apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
-DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
-DocType: Brand,Item Manager,Item manager
-DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker til at fastsætte årlige budgetter på Konti.
-DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Stenbrud
-DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
-apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
-DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firma Forkortelse
-DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Hvis du følger kvalitetskontrol. Aktiverer Item QA Nødvendig og QA Ingen i kvittering
-DocType: GL Entry,Party Type,Party Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
-DocType: Item Attribute Value,Abbreviation,Forkortelse
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsstøbning
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Løn skabelon mester.
-DocType: Leave Type,Max Days Leave Allowed,Max Dage Leave tilladt
-DocType: Payment Tool,Set Matching Amounts,Set matchende Beløb
-DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
-,Sales Funnel,Salg Tragt
-apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Kurv
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Tak for din interesse i at abonnere på vores opdateringer
-,Qty to Transfer,Antal til Transfer
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citater til Leads eller kunder.
-DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
-,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} status er 'Stoppet'
-DocType: Account,Temporary,Midlertidig
-DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
-DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
-DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
-DocType: Pricing Rule,Buying,Køb
-DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch er blevet annulleret.
-DocType: Salary Slip Earning,Salary Slip Earning,Lønseddel Earning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorer
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
-,Item-wise Price List Rate,Item-wise Prisliste Rate
-DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
-DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Strygning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
-DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
-apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden er nødvendig
-DocType: Letter Head,Letter Head,Brev hoved
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
-DocType: Purchase Order,To Receive,At Modtage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink fitting
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,Indtægter / Expense
-DocType: Employee,Personal Email,Personlig Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Samlet Varians
-DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktiveret, vil systemet sende bogføring for opgørelse automatisk."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
-DocType: Production Order Operation,"in Minutes
-Updated via 'Time Log'",i minutter Opdateret via 'Time Log'
-DocType: Customer,From Lead,Fra Lead
-apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordrer frigives til produktion.
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
-DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
-DocType: Serial No,Out of Warranty,Ud af garanti
-DocType: BOM Replace Tool,Replace,Udskifte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
-DocType: Purchase Invoice Item,Project Name,Projektnavn
-DocType: Workflow State,Edit,Edit
-DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
-DocType: Features Setup,Item Batch Nos,Item Batch nr
-DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Menneskelige Ressourcer
-DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skatteaktiver
-DocType: BOM Item,BOM No,BOM Ingen
-DocType: Contact Us Settings,Pincode,Pinkode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
-DocType: Item,Moving Average,Glidende gennemsnit
-DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM skal være forskellig fra nuværende bestand UOM
-DocType: Account,Debit,Betalingskort
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
-DocType: Production Order,Operation Cost,Operation Cost
-apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
-DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsatte mål Item Group-wise for denne Sales Person.
-DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",For at tildele problemet ved at bruge knappen "Tildel" i indholdsoversigten.
-DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Mod faktura
-apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal År: {0} ikke eksisterer
 DocType: Currency Exchange,To Currency,Til Valuta
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lad følgende brugere til at godkende Udfyld Ansøgninger om blok dage.
-apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Typer af Expense krav.
-DocType: Item,Taxes,Skatter
-DocType: Project,Default Cost Center,Standard Cost center
-DocType: Purchase Invoice,End Date,Slutdato
-DocType: Employee,Internal Work History,Intern Arbejde Historie
-DocType: DocField,Column Break,Kolonne Break
-DocType: Event,Thursday,Torsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Drejning
-DocType: Maintenance Visit,Customer Feedback,Kundefeedback
-DocType: Account,Expense,Expense
-DocType: Sales Invoice,Exhibition,Udstilling
-apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Element {0} ignoreres da det ikke er en lagervare
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Indsend denne produktionsordre til videre forarbejdning.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hvis du ikke vil anvende Prisfastsættelse Regel i en bestemt transaktion, bør alle gældende Priser Regler deaktiveres."
-DocType: Company,Domain,Domæne
-,Sales Order Trends,Salg Order Trends
-DocType: Employee,Held On,Held On
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktion Vare
-,Employee Information,Medarbejder Information
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Sats (%)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Regnskabsår Slutdato
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Foretag Leverandør Citat
-DocType: Quality Inspection,Incoming,Indgående
-DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
-DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
-DocType: Batch,Batch ID,Batch-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Bemærk: {0}
-,Delivery Note Trends,Følgeseddel Tendenser
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
-DocType: GL Entry,Party,Selskab
-DocType: Sales Order,Delivery Date,Leveringsdato
-DocType: DocField,Currency,Valuta
-DocType: Opportunity,Opportunity Date,Opportunity Dato
-DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
-DocType: Purchase Order,To Bill,Til Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
-DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
-DocType: Employee,History In Company,Historie I Company
-DocType: Address,Shipping,Forsendelse
-DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
-DocType: Department,Leave Block List,Lad Block List
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke setup for Serial nr. Kolonne skal være tomt
-DocType: Accounts Settings,Accounts Settings,Konti Indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Anlæg og maskiner
-DocType: Sales Partner,Partner's Website,Partner s hjemmeside
-DocType: Opportunity,To Discuss,Til Diskuter
-DocType: SMS Settings,SMS Settings,SMS-indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Midlertidige Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Sort
-DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
-DocType: Account,Auditor,Revisor
-DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
-DocType: DocField,Fold,Fold
-DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
-DocType: Pricing Rule,Disable,Deaktiver
-DocType: Project Task,Pending Review,Afventer anmeldelse
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Angiv venligst
-DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-id
-DocType: Page,Page Name,Side Navn
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Til Time skal være større end From Time
-DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel efterbehandling
-DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
-DocType: Account,Asset,Asset
-DocType: Project Task,Task ID,Opgave-id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",fx "MC"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
-,Sales Person-wise Transaction Summary,Salg Person-wise Transaktion Summary
-DocType: System Settings,Time Zone,Time Zone
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Oplag {0} eksisterer ikke
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
-DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af materialer leveret mod denne følgeseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Hæftning
-DocType: Customer,Customer Details,Kunde Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
-DocType: Employee,Reports to,Rapporter til
-DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
-DocType: Sales Invoice,Paid Amount,Betalt Beløb
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Lukning Konto {0} skal være af typen 'ansvar'
-,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
-DocType: Item Variant,Item Variant,Item Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
-DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
-DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Indtast mængde for Item {0}
-DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
-DocType: Tax Rule,Purchase,Købe
+DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Antal
-DocType: Item Group,Parent Item Group,Moderselskab Item Group
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Omkostninger Centers
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Pakhuse.
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Hastighed, hvormed leverandørens valuta omregnes til virksomhedens basisvaluta"
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
-DocType: Employee,Employment Type,Beskæftigelse type
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
-DocType: Item Group,Default Expense Account,Standard udgiftskonto
-DocType: Employee,Notice (days),Varsel (dage)
-DocType: Page,Yes,Ja
-DocType: Employee,Encashment Date,Indløsning Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Imod Voucher type skal være en af ​​indkøbsordre, købsfaktura eller Kassekladde"
-DocType: Account,Stock Adjustment,Stock Justering
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Activity Omkostninger findes for Activity Type - {0}
-DocType: Production Order,Planned Operating Cost,Planlagt driftsomkostninger
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Ny {0} Navn
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Vedlagt {0} # {1}
-DocType: Job Applicant,Applicant Name,Ansøger Navn
-DocType: Authorization Rule,Customer / Item Name,Kunde / Item Name
-DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
-
-The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
-
-For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
-
-Note: BOM = Bill of Materials","Samlede gruppe af ** Varer ** i anden ** Item **. Dette er nyttigt, hvis du bundling en bestemt ** Varer ** i en pakke, og du kan bevare status over de pakkede ** Varer ** og ikke den samlede ** Item **. Pakken ** Item ** vil have "Er Stock Item" som "Nej" og "Er Sales Item" som "Ja". For eksempel: Hvis du sælger Laptops og Rygsække separat og har en særlig pris, hvis kunden køber både, så Laptop + Rygsæk vil være en ny Product Bundle Item. Bemærk: BOM = Bill of Materials"
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Løbenummer er obligatorisk for Item {0}
-DocType: Item Variant Attribute,Attribute,Attribut
-sites/assets/js/desk.min.js +7652,Created By,Lavet af
-DocType: Serial No,Under AMC,Under AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Item værdiansættelse sats genberegnes overvejer landede omkostninger kupon beløb
-apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
-DocType: BOM Replace Tool,Current BOM,Aktuel BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Tilføj Løbenummer
-DocType: Production Order,Warehouses,Pakhuse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stationær
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
-DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløb
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Opdater færdigvarer
-DocType: Workstation,per hour,per time
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serien {0} allerede anvendes i {1}
-DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
-DocType: Company,Distribution,Distribution
-sites/assets/js/erpnext.min.js +50,Amount Paid,Beløb betalt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
-DocType: Account,Receivable,Tilgodehavende
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
-DocType: Sales Invoice,Supplier Reference,Leverandør reference
-DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Hvis markeret, vil BOM for sub-montage elementer overvejes for at få råvarer. Ellers vil alle sub-montage poster behandles som et råstof."
-DocType: Material Request,Material Issue,Materiale Issue
-DocType: Hub Settings,Seller Description,Sælger Beskrivelse
-DocType: Employee Education,Qualification,Kvalifikation
-DocType: Item Price,Item Price,Item Pris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sæbe & Vaskemiddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
-DocType: Warehouse,Warehouse Name,Warehouse Navn
-DocType: Naming Series,Select Transaction,Vælg Transaktion
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
-DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
-DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
-apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Udskift Utility
-DocType: POS Profile,Terms and Conditions,Betingelser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
-DocType: Leave Block List,Applies to Company,Gælder for Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
-DocType: Purchase Invoice,In Words,I Words
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,I dag er {0} 's fødselsdag!
-DocType: Production Planning Tool,Material Request For Warehouse,Materiale Request For Warehouse
-DocType: Sales Order Item,For Production,For Produktion
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Indtast salgsordre i ovenstående tabel
-DocType: Project Task,View Task,View Opgave
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Din regnskabsår begynder på
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Indtast venligst Køb Kvitteringer
-DocType: Sales Invoice,Get Advances Received,Få forskud
-DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på 'Vælg som standard'"
-apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Mangel Antal
-DocType: Salary Slip,Salary Slip,Lønseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunering
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Til dato' er nødvendig
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generer pakkesedler for pakker, der skal leveres. Bruges til at anmelde pakke nummer, pakkens indhold og dens vægt."
-DocType: Sales Invoice Item,Sales Order Item,Sales Order Vare
-DocType: Salary Slip,Payment Days,Betalings Dage
-DocType: BOM,Manage cost of operations,Administrer udgifter til operationer
-DocType: Features Setup,Item Advanced,Item Avanceret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Varmvalsning
-DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når nogen af ​​de kontrollerede transaktioner er "Indsendt", en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede "Kontakt" i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale indstillinger
-DocType: Employee Education,Employee Education,Medarbejder Uddannelse
-DocType: Salary Slip,Net Pay,Nettoløn
-DocType: Account,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Løbenummer {0} er allerede blevet modtaget
-,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
-DocType: Purchase Invoice,Recurring Id,Tilbagevendende Id
-DocType: Customer,Sales Team Details,Salg Team Detaljer
-DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentielle muligheder for at sælge.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sygefravær
-DocType: Email Digest,Email Digest,Email Digest
-DocType: Delivery Note,Billing Address Name,Fakturering Adresse Navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Varehuse
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
-DocType: Workflow,Is Active,Er Aktiv
-apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Gem dokumentet først.
-DocType: Account,Chargeable,Gebyr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
-DocType: Company,Change Abbreviation,Skift Forkortelse
-DocType: Workflow State,Primary,Primær
-DocType: Expense Claim Detail,Expense Date,Expense Dato
-DocType: Item,Max Discount (%),Max Rabat (%)
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Sidste ordrebeløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sprængning
-DocType: Company,Warn,Advar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Item værdiansættelse opdateret
-DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
-DocType: BOM,Manufacturing User,Manufacturing Bruger
-DocType: Purchase Order,Raw Materials Supplied,Raw Materials Leveres
-DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
-DocType: Communication,Series,Series
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
-DocType: Appraisal,Appraisal Template,Vurdering skabelon
-DocType: Communication,Email,Email
-DocType: Item Group,Item Classification,Item Klassifikation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedligeholdelse Besøg Formål
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
-,General Ledger,General Ledger
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se Leads
-DocType: Item Attribute Value,Attribute Value,Attribut Værdi
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id skal være unikt, der allerede eksisterer for {0}"
-,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vælg {0} først
-DocType: Features Setup,To get Item Group in details table,At få Item Group i detaljer tabel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Gentegning
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} af Item {1} er udløbet.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Ætsning
-DocType: Sales Invoice,Commission,Kommissionen
-DocType: Address Template,"
    Default Template
    
-
    Uses Jinja Templating and all the fields of Address (including Custom Fields if any) will be available
    
-
    {{ address_line1 }}<br>
-{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
-{{ city }}<br>
-{% if state %}{{ state }}<br>{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}<br>{% endif -%}
-{{ country }}<br>
-{% if phone %}Phone: {{ phone }}<br>{% endif -%}
-{% if fax %}Fax: {{ fax }}<br>{% endif -%}
-{% if email_id %}Email: {{ email_id }}<br>{% endif -%}
-
    ","
     Standardskabelon 
     Bruger Jinja Templatering og alle områderne adresse (herunder brugerdefinerede felter hvis nogen) vil være til rådighed 
     {{ address_line1 }}<br> {% if address_line2 %}{{ address_line2 }}<br>{% endif -%} {{ city }}<br> {% if state %}{{ state }}<br>{% endif -%} {% if pincode %} PIN: {{ pincode }}<br>{% endif -%} {{ country }}<br> {% if phone %}Phone: {{ phone }}<br>{% endif -%} {% if fax %}Fax: {{ fax }}<br>{% endif -%} {% if email_id %}Email: {{ email_id }}<br>{% endif -%} 
    "
-DocType: Salary Slip Deduction,Default Amount,Standard Mængde
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse ikke fundet i systemet
-DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
-,Project wise Stock Tracking,Projekt klogt Stock Tracking
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Vedligeholdelsesplan {0} eksisterer imod {0}
-DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske Antal (ved kilden / mål)
-DocType: Item Customer Detail,Ref Code,Ref Code
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,Medarbejder Records.
-DocType: HR Settings,Payroll Settings,Payroll Indstillinger
-apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke have en forælder cost center
-DocType: Sales Invoice,C-Form Applicable,C-anvendelig
-DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i kvittering mod hvert punkt
-DocType: Payment Tool,Get Outstanding Vouchers,Få Udestående Vouchers
-DocType: Warranty Claim,Resolved By,Løst Af
-DocType: Appraisal,Start Date,Startdato
-sites/assets/js/desk.min.js +7629,Value,Value
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Afsætte blade i en periode.
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
-DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
-DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis "På lager" eller "Ikke på lager" baseret på lager til rådighed i dette lager.
-apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
-DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
-DocType: Time Log,Hours,Timer
-DocType: Project,Expected Start Date,Forventet startdato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rullende
-DocType: ToDo,Priority,Prioritet
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Adgang tilladt
-DocType: Dropbox Backup,Weekly,Ugentlig
-DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
-DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
-DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
-DocType: Workstation,Operating Costs,Drifts- omkostninger
-DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle bearbejdning
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Vigtigste Reports
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger poster saldi opdateret
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
-DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Tilføj / rediger Priser
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram af Cost Centers
-,Requested Items To Be Ordered,Anmodet Varer skal bestilles
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Mine ordrer
-DocType: Price List,Price List Name,Pris List Name
-DocType: Time Log,For Manufacturing,For Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaler
-DocType: BOM,Manufacturing,Produktion
-,Ordered Items To Be Delivered,"Bestilte varer, der skal leveres"
-DocType: Account,Income,Indkomst
-,Setup Wizard,Setup Wizard
-DocType: Industry Type,Industry Type,Industri Type
-apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noget gik galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
-DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Trykstøbning
-DocType: Email Alert,Reference Date,Henvisning Dato
-apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhed (departement) herre.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Indtast venligst gyldige mobile nos
-DocType: Budget Detail,Budget Detail,Budget Detail
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst besked, før du sender"
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM opdateret for Item {0}
-DocType: Company History,Year,År
-apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Time Log {0} allerede faktureret
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Usikrede lån
-DocType: Cost Center,Cost Center Name,Cost center Navn
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Vare {0} med Serial Nej {1} er allerede installeret
-DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Betalt Amt
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
-DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
-,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
-DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
-DocType: Naming Series,Help HTML,Hjælp HTML
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
-DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En anden Løn Struktur {0} er aktiv for medarbejder {1}. Venligst gøre sin status "Inaktiv" for at fortsætte.
-DocType: Purchase Invoice,Contact,Kontakt
-DocType: Features Setup,Exports,Eksport
-DocType: Lead,Converted,Konverteret
-DocType: Item,Has Serial No,Har Løbenummer
-DocType: Employee,Date of Issue,Udstedelsesdato
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
-DocType: Issue,Content Type,Indholdstype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
-DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
-DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
-DocType: Cost Center,Budgets,Budgetter
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Opdateret
-DocType: Employee,Emergency Contact Details,Emergency Kontaktoplysning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Hvad gør det?
-DocType: Delivery Note,To Warehouse,Til Warehouse
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
-,Average Commission Rate,Gennemsnitlig Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
-DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
-DocType: Purchase Taxes and Charges,Account Head,Konto hoved
-apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
-DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garanti krav
-DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
-DocType: Item,Customer Code,Customer Kode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapning
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dage siden sidste ordre
-DocType: Buying Settings,Naming Series,Navngivning Series
-DocType: Leave Block List,Leave Block List Name,Lad Block List Name
-DocType: User,Enabled,Aktiveret
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Vil du virkelig ønsker at indsende alle lønseddel for måned {0} og år {1}
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
-DocType: Target Detail,Target Qty,Target Antal
-DocType: Attendance,Present,Present
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
-DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
-DocType: Authorization Rule,Based On,Baseret på
-,Ordered Qty,Bestilt Antal
-DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
-apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
-apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generer lønsedler
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} er ikke en gyldig e-mail-id
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Opkøb skal kontrolleres, om nødvendigt er valgt som {0}"
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
-DocType: ToDo,Low,Lav
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
-DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Indstil {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Gentag på Dag Måned
-DocType: Employee,Health Details,Sundhed Detaljer
-DocType: Offer Letter,Offer Letter Terms,Tilbyd Letter Betingelser
-DocType: Features Setup,To track any installation or commissioning related work after sales,At spore enhver installation eller idriftsættelse relateret arbejde eftersalgsservice
-DocType: Project,Estimated Costing,Anslået Costing
-DocType: Purchase Invoice Advance,Journal Entry Detail No,Kassekladde Detail Nej
-DocType: Employee External Work History,Salary,Løn
-DocType: Serial No,Delivery Document Type,Levering Dokumenttype
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,Indsend alle lønsedler for de ovenfor valgte kriterier
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,synkroniseret {0} Varer
-DocType: Sales Order,Partly Delivered,Delvist Delivered
-DocType: Sales Invoice,Existing Customer,Eksisterende kunde
-DocType: Email Digest,Receivables,Tilgodehavender
-DocType: Quality Inspection Reading,Reading 5,Reading 5
-DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil ordren blive sendt automatisk på bestemt dato"
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampagne navn er påkrævet
-DocType: Maintenance Visit,Maintenance Date,Vedligeholdelse Dato
-DocType: Purchase Receipt Item,Rejected Serial No,Afvist Løbenummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Dybtrækning
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhedsbrev
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Vis Balance
-DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er indstillet, og Løbenummer nævnes ikke i transaktioner, så automatisk serienummer vil blive oprettet på grundlag af denne serie. Hvis du altid ønsker at eksplicit nævne Serial Nos for dette element. lader dette være blankt."
-DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
-DocType: Journal Entry Account,Amount,Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitning
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
-,Sales Analytics,Salg Analytics
-DocType: Manufacturing Settings,Manufacturing Settings,Manufacturing Indstillinger
-apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Indtast standard valuta i Company Master
-DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Ny Kontonavn
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
-DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
-DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekræft din e-mail
-apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offer kandidat et job.
-DocType: Notification Control,Prompt for Email on Submission of,Spørg til Email på Indsendelse af
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
-apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
+DocType: Material Request Item,For Warehouse,For Warehouse
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Vedhæft dit billede
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} er påkrævet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuum støbning
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før Material Request Dato
-DocType: Contact Us Settings,City,By
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic bearbejdning
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
-apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Vare {0} skal være en Sales Item
-DocType: Naming Series,Update Series Number,Opdatering Series Number
-DocType: Account,Equity,Egenkapital
-DocType: Task,Closing Date,Closing Dato
-DocType: Sales Order Item,Produced Quantity,Produceret Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
-DocType: Sales Partner,Partner Type,Partner Type
-DocType: Purchase Taxes and Charges,Actual,Faktiske
-DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
-DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
-DocType: Production Order,Production Order,Produktionsordre
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
-DocType: Quotation Item,Against Docname,Mod Docname
-DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vælg den periode, hvor fakturaen vil blive genereret automatisk"
+DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Lukning Konto {0} skal være af typen 'ansvar'
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lamineret objekt fremstillingsvirksomhed
 DocType: BOM,Raw Material Cost,Raw Material Omkostninger
-DocType: Item,Re-Order Level,Re-Order Level
-DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råvarer til analyse."
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
-DocType: Employee,Applicable Holiday List,Gældende Holiday List
-DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttype er obligatorisk
-DocType: Item,Serial Number Series,Serial Number Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Detail & Wholesale
-DocType: Issue,First Responded On,Først svarede den
-DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Den første bruger: Du
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Succesfuld Afstemt
-DocType: Production Order,Planned End Date,Planlagt Slutdato
-apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor emner er gemt.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerede beløb
-DocType: Attendance,Attendance,Fremmøde
-DocType: Page,No,Ingen
-DocType: BOM,Materials,Materialer
-DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
-,Item Prices,Item Priser
-DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
-DocType: Period Closing Voucher,Period Closing Voucher,Periode Lukning Voucher
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Pris List mester.
-DocType: Task,Review Date,Anmeldelse Dato
-DocType: DocPerm,Level,Level
-DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Milling
-DocType: Company,Round Off Account,Afrunde konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Gnave
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Rådgivning
-DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
-sites/assets/js/erpnext.min.js +50,Change,Ændring
-DocType: Purchase Invoice,Contact Email,Kontakt E-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Indkøbsordre {0} er "Venter"
-DocType: Appraisal Goal,Score Earned,Score tjent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",fx "My Company LLC"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
-DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dette er en rod territorium og kan ikke redigeres.
-DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
-DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
-DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempling
-DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nul værdier
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
-DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
-DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
-DocType: Item,Default Warehouse,Standard Warehouse
-DocType: Task,Actual End Date (via Time Logs),Faktiske Slutdato (via Time Logs)
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Indtast forælder omkostningssted
-DocType: Delivery Note,Print Without Amount,Print uden Beløb
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skat Kategori kan ikke være "Værdiansættelse" eller "Værdiansættelse og Total" som alle elementer er ikke-lagervarer
-DocType: User,Last Name,Efternavn
-DocType: Web Page,Left,Venstre
-DocType: Event,All Day,All Day
-DocType: Issue,Support Team,Support Team
-DocType: Appraisal,Total Score (Out of 5),Total Score (ud af 5)
-DocType: Contact Us Settings,State,Stat
-DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance
-DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Expense krav)
-DocType: User,Gender,Køn
-DocType: Journal Entry,Debit Note,Debetnota
-DocType: Stock Entry,As per Stock UOM,Pr Stock UOM
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke er udløbet
-DocType: Journal Entry,Total Debit,Samlet Debit
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Salg Person
-DocType: Sales Invoice,Cold Calling,Telefonsalg
-DocType: SMS Parameter,SMS Parameter,SMS Parameter
-DocType: Maintenance Schedule Item,Half Yearly,Halvdelen Årlig
-DocType: Lead,Blog Subscriber,Blog Subscriber
-apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Oprette regler til at begrænse transaktioner baseret på værdier.
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af ​​Løn Per Day"
-DocType: Purchase Invoice,Total Advance,Samlet Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Unstop Material Request
-DocType: Workflow State,User,Bruger
-DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Sæt som Lost
-DocType: Customer,Credit Days Based On,Credit Dage Baseret på
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Oprethold Samme Rate Gennem Sales Cycle
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} er allerede indsendt
-,Items To Be Requested,Varer skal ansøges
-DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
-DocType: Company,Company Info,Firma Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Falsning
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
-DocType: Production Planning Tool,Filter based on item,Filter baseret på emne
-DocType: Fiscal Year,Year Start Date,År Startdato
-DocType: Attendance,Employee Name,Medarbejder Navn
-DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
-DocType: Purchase Common,Purchase Common,Indkøb Common
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
-DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
-DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
-DocType: Production Order,Manufactured Qty,Fremstillet Antal
-DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
-apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
-DocType: DocField,Default,Standard
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
-DocType: Maintenance Schedule,Schedule,Køreplan
-DocType: Account,Parent Account,Parent Konto
-DocType: Quality Inspection Reading,Reading 3,Reading 3
-,Hub,Hub
-DocType: GL Entry,Voucher Type,Voucher Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Prisliste ikke fundet eller handicappede
-DocType: Expense Claim,Approved,Godkendt
-DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som "Left"
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Hvis du vælger "Ja" vil give en unik identitet til hver enhed i denne post, som kan ses i Serial Ingen mester."
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} skabt til Medarbejder {1} i givet datointerval
-DocType: Employee,Education,Uddannelse
-DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
-DocType: Employee,Current Address Is,Nuværende adresse er
-DocType: Address,Office,Kontor
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standard rapporter
-apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Vælg Medarbejder Record først.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Sådan opretter du en Tax-konto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Indtast venligst udgiftskonto
-DocType: Account,Stock,Lager
-DocType: Employee,Current Address,Nuværende adresse
-DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
-DocType: Serial No,Purchase / Manufacture Details,Køb / Fremstilling Detaljer
-DocType: Employee,Contract End Date,Kontrakt Slutdato
-DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
-DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
-DocType: DocShare,Document Type,Dokumenttype
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Fra Leverandør Citat
-DocType: Deduction Type,Deduction Type,Fradrag Type
-DocType: Attendance,Half Day,Half Day
-DocType: Pricing Rule,Min Qty,Min Antal
-DocType: GL Entry,Transaction Date,Transaktion Dato
-DocType: Production Plan Item,Planned Qty,Planned Antal
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,I alt Skat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
-DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
-DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
-DocType: Notification Control,Purchase Receipt Message,Kvittering Message
-DocType: Production Order,Actual Start Date,Faktiske startdato
-DocType: Sales Order,% of materials delivered against this Sales Order,% Af materialer leveret mod denne Sales Order
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Optag element bevægelse.
-DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhedsbrev List Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Stemmemaskiner
-DocType: Email Account,Service,Service
-DocType: Hub Settings,Hub Settings,Hub Indstillinger
-DocType: Project,Gross Margin %,Gross Margin%
-DocType: BOM,With Operations,Med Operations
-,Monthly Salary Register,Månedlig Løn Tilmeld
-apps/frappe/frappe/website/template.py +123,Next,Næste
-DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
-DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolering
-DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Indtast Betaling Beløb i mindst én række
-DocType: POS Profile,POS Profile,POS profil
-apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Række {0}: Betaling Beløb kan ikke være større end udestående beløb
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total Ulønnet
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log ikke fakturerbare
-apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af ​​dens varianter"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Køber
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettoløn kan ikke være negativ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
-DocType: SMS Settings,Static Parameters,Statiske parametre
-DocType: Purchase Order,Advance Paid,Advance Betalt
-DocType: Item,Item Tax,Item Skat
-DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kortfristede forpligtelser
-apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Send masse SMS til dine kontakter
-DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rulning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
-DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
-DocType: Purchase Invoice,Next Date,Næste dato
-DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Indtast Skatter og Afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Bearbejdning
-DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer som navn og besættelse af forældre, ægtefælle og børn"
-DocType: Hub Settings,Seller Name,Sælger Navn
-DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og Afgifter Fratrukket (Company Valuta)
-DocType: Item Group,General Settings,Generelle indstillinger
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Fra Valuta og Til valuta ikke kan være samme
-DocType: Stock Entry,Repack,Pakke
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Du skal gemme formularen, før du fortsætter"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Vedhæft Logo
-DocType: Customer,Commission Rate,Kommissionens Rate
-apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
-DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kan ikke redigeres.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Tildelte beløb kan ikke er større end unadusted beløb
-DocType: Manufacturing Settings,Allow Production on Holidays,Tillad Produktion på helligdage
-DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
-DocType: Packing Slip,Package Weight Details,Pakke vægt detaljer
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vælg en CSV-fil
-DocType: Dropbox Backup,Send Backups to Dropbox,Send Backups til Dropbox
-DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
-apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
-DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
-DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
-,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
-DocType: Batch,Expiry Date,Udløbsdato
-,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først
-apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester.
-DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halv dag)
-DocType: Supplier,Credit Days,Credit Dage
-DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Få elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
-apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
-DocType: Dropbox Backup,Send Notifications To,Send meddelelser til
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Dato
-DocType: Employee,Reason for Leaving,Årsag til Leaving
-DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
-DocType: GL Entry,Is Opening,Er Åbning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Konto {0} findes ikke
-DocType: Account,Cash,Kontanter
-DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Opret Løn Struktur for medarbejder {0}
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opret Opportunity
+DocType: DocField,Default,Standard
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produktion ordrenummer er obligatorisk for lager post fremstilling formål
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
+DocType: Dropbox Backup,Send Backups to Dropbox,Send Backups til Dropbox
+DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
+DocType: Journal Entry Account,Account Balance,Kontosaldo
+DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
+DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
+DocType: Delivery Note,Billing Address Name,Fakturering Adresse Navn
+DocType: Page,Title,Titel
+DocType: Company,Default Values,Standardværdier
+DocType: Opportunity,Opportunity Date,Opportunity Dato
+,Item Prices,Item Priser
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+,Purchase Invoice Trends,Købsfaktura Trends
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og Fixture
+DocType: Item,Copy From Item Group,Kopier fra Item Group
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
+DocType: SMS Log,Sender Name,Sender Name
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
+DocType: Sales Order,To Deliver,Til at levere
+DocType: Sales Invoice Item,Quantity,Mængde
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikrede lån
+DocType: Employee Education,Employee Education,Medarbejder Uddannelse
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
+,Items To Be Requested,Varer skal ansøges
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke setup for Serial nr. Check Item mester
+DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
+DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Hastighed, hvormed Prisliste valuta omregnes til kundens basisvaluta"
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
+DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
+DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
+DocType: Notification Control,Expense Claim Approved Message,Expense krav Godkendt Message
+,Sales Person-wise Transaction Summary,Salg Person-wise Transaktion Summary
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dobbelt hus
+DocType: Activity Cost,Activity Type,Aktivitet Type
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Afsætte blade for året.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
+DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
+apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Skift UOM for et element.
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generer pakkesedler for pakker, der skal leveres. Bruges til at anmelde pakke nummer, pakkens indhold og dens vægt."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
+DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vælg Charge Type først
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekræftet
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Vare {0} skal være Sales Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af "Har Serial Nej ',' Har Batch Nej ',' Er Stock Item" og "værdiansættelsesmetode '"
+DocType: Journal Entry,Print Heading,Print Overskrift
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Afsætte blade i en periode.
+apps/frappe/frappe/desk/query_report.py +136,Total,Total
+DocType: Serial No,Maintenance Status,Vedligeholdelse status
+apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Angiv venligst
+DocType: Dropbox Backup,Weekly,Ugentlig
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rulning
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
+DocType: Item,Maintain Stock,Vedligehold Stock
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
+DocType: Account,Asset,Asset
+DocType: Salary Slip,Earnings,Indtjening
+DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
+DocType: Selling Settings,Default Territory,Standard Territory
+DocType: Purchase Order,Start date of current order's period,Startdato for nuværende ordres periode
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,handicappet bruger
+DocType: Maintenance Visit,Purposes,Formål
+DocType: Contact,Is Primary Contact,Er Primær Kontaktperson
+DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
+DocType: Address,Office,Kontor
+DocType: Attendance,Leave Type,Forlad Type
+DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
+DocType: Issue,Content Type,Indholdstype
+DocType: Salary Slip,Total in words,I alt i ord
+DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil ordren blive sendt automatisk på bestemt dato"
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
+DocType: User,Enabled,Aktiveret
+DocType: Warehouse,Warehouse Detail,Warehouse Detail
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index da6551bd74..7c306d3ec0 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Løn-tilstand
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vælg Månedlig Distribution, hvis du ønsker at spore baseret på sæsonudsving."
 DocType: Employee,Divorced,Skilt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Varer allerede synkroniseret
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillad Vare der skal tilføjes flere gange i en transaktion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Komprimering plus sintring
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Fra Material Request
+DocType: Purchase Order,Customer Contact,Kundeservice Kontakt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Ansøger
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Customer Name
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle eksport relaterede områder som valuta, konverteringsfrekvens, eksport i alt, eksport grand total etc er tilgængelige i Delivery Note, POS, Citat, Sales Invoice, Sales Order etc."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoveder (eller grupper) mod hvilken regnskabsposter er lavet og balancer opretholdes.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
 DocType: Leave Type,Leave Type Name,Lad Type Navn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series opdateret
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Flere Item priser.
 DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Slutdato kan ikke være mindre end forventet startdato
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Må virkelig ønsker at unstop produktionsordre:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Ny Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Ny Leave Application
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter
 DocType: Sales Invoice Item,Quantity,Mængde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
 DocType: Employee Education,Year of Passing,År for Passing
-sites/assets/js/erpnext.min.js +27,In Stock,På lager
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Kan kun gøre betaling mod faktureret Sales Order
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På lager
 DocType: Designation,Designation,Betegnelse
 DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Health Care
 DocType: Purchase Invoice,Monthly,Månedlig
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faktura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Forsinket betaling (dage)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail-adresse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Forsvar
 DocType: Company,Abbr,Fork
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Ingen
-sites/assets/js/erpnext.min.js +55,Please select Price List,Vælg venligst prislisten
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Træbearbejdning
 DocType: Production Order Operation,Work In Progress,Work In Progress
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-print
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åbning for et job.
 DocType: Item Attribute,Increment,Tilvækst
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Vælg Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklame
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
 DocType: Payment Reconciliation,Reconcile,Forene
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Købmand
 DocType: Quality Inspection Reading,Reading 1,Læsning 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Make Bank indtastning
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank indtastning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionskasserne
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
 DocType: SMS Center,All Sales Person,Alle Sales Person
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Skriv Off Cost center
 DocType: Warehouse,Warehouse Detail,Warehouse Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Skat Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Du er ikke autoriseret til at tilføje eller opdatere poster før {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Du er ikke autoriseret til at tilføje eller opdatere poster før {0}
 DocType: Item,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunden eksisterer med samme navn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Gæst
 DocType: Quality Inspection,Get Specification Details,Få Specifikation Detaljer
 DocType: Lead,Interested,Interesseret
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åbning
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Åbning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra Item Group
 DocType: Journal Entry,Opening Entry,Åbning indtastning
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Produkt Forespørgsel
 DocType: Standard Reply,Owner,Ejer
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Indtast venligst selskab først
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Vælg venligst Company først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vælg venligst Company først
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Total Cost
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Præfiks
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Forbrugsmaterialer
 DocType: Upload Attendance,Import Log,Import Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
+DocType: Sales Invoice Item,Delivered By Supplier,Leveret af Leverandøren
 DocType: SMS Center,All Contact,Alle Kontakt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Contra indtastning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Vis Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Kredit i Company Valuta
 DocType: Delivery Note,Installation Status,Installation status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af ​​livet er nået
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af ​​livet er nået
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for HR modul
 DocType: SMS Center,SMS Center,SMS-center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Opretning
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Indtast url parameter for
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regler for anvendelse af priser og rabat.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Denne tidslog konflikter med {0} for {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabat på prisliste Rate (%)
-sites/assets/js/form.min.js +279,Start,Start
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Fornavn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Din opsætning er færdig. Forfriskende.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fuld formstøbning
 DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice Item
 ,Production Orders in Progress,Produktionsordrer i Progress
 DocType: Lead,Address & Contact,Adresse og kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,Tilføj ubrugte blade fra tidligere tildelinger
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
 DocType: Newsletter List,Total Subscribers,Total Abonnenter
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Navn
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dobbelt hus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Du indstille Navngivning Series for {0} via Opsætning> Indstillinger> Navngivning Series
 DocType: Time Log,Will be updated when batched.,"Vil blive opdateret, når batched."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst "Er Advance 'mod konto {1}, hvis dette er et forskud post."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst "Er Advance 'mod konto {1}, hvis dette er et forskud post."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} ikke hører til virksomheden {1}
 DocType: Bulk Email,Message,Besked
 DocType: Item Website Specification,Item Website Specification,Item Website Specification
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox adgangsnøgle
 DocType: Payment Tool,Reference No,Referencenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af ​​sin levetid på {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af ​​sin levetid på {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
 DocType: Stock Entry,Sales Invoice No,Salg faktura nr
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Item,Publish in Hub,Offentliggør i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Materiale Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Køb Detaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i "Raw Materials Leveres 'bord i Indkøbsordre {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Meddelelse Kontrol
 DocType: Lead,Suggestions,Forslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-wise budgetter på denne Territory. Du kan også medtage sæsonudsving ved at indstille Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Indtast venligst forælder konto gruppe for lager {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mod {0} {1} kan ikke være større end udestående beløb {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mod {0} {1} kan ikke være større end udestående beløb {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobil No.
 DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
 DocType: Employee,External Work History,Ekstern Work History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Vil du virkelig ønsker at stoppe
 DocType: Communication,Closed,Lukket
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Er du sikker på du vil STOP
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Job profil
 DocType: Newsletter,Newsletter,Nyhedsbrev
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Følgeseddel
 DocType: Dropbox Backup,Allow Dropbox Access,Tillad Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumé for denne uge og verserende aktiviteter
 DocType: Workstation,Rent Cost,Leje Omkostninger
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
 DocType: Item Tax,Tax Rate,Skat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Vælg Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Vælg Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch nr skal være det samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuel Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) af et element.
 DocType: C-Form Invoice Detail,Invoice Date,Faktura Dato
 DocType: GL Entry,Debit Amount,Debit Beløb
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr Company i {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr Company i {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-mail-adresse
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Se venligst vedhæftede
 DocType: Purchase Order,% Received,% Modtaget
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspiceres af
 DocType: Maintenance Visit,Maintenance Type,Vedligeholdelse Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
 DocType: Leave Application,Leave Approver Name,Lad Godkender Navn
 ,Schedule Date,Tidsplan Dato
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Indkøb Register
 DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
 DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
 DocType: Purchase Receipt,Vehicle Date,Køretøj Dato
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Årsag til at miste
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% Installeret
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Indtast venligst firmanavn først
 DocType: BOM,Item Desription,Item desription
 DocType: Purchase Invoice,Supplier Name,Leverandør Navn
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Læs ERPNext Manual
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Serial nr baseret på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Salg Master manag
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
 DocType: SMS Log,Sent On,Sendt On
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
 DocType: Sales Order,Not Applicable,Gælder ikke
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Skalstøbning
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Indtast venligst Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Indtast venligst Item Code.
 DocType: BOM,Costing,Koster
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between O
 DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
 DocType: Journal Entry,Accounts Payable,Kreditor
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tilføj Abonnenter
-sites/assets/js/erpnext.min.js +5,""" does not exists",' findes ikke
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",' findes ikke
 DocType: Pricing Rule,Valid Upto,Gyldig Op
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Indkomst
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
 DocType: Payment Tool,Received Or Paid,Modtaget eller betalt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Vælg Firma
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vælg Firma
 DocType: Stock Entry,Difference Account,Forskel konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke opgave som sin afhængige opgave {0} ikke er lukket.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
 DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetik
 DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
 DocType: Communication,Subject,Emne
 DocType: Shipping Rule,Net Weight,Vægt
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Vil du virkelig ønsker at stoppe denne Material Request?
 DocType: Sales Order,To Deliver,Til at levere
 DocType: Purchase Invoice Item,Item,Vare
 DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
 DocType: Account,Profit and Loss,Resultatopgørelse
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Håndtering af underleverancer
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Håndtering af underleverancer
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Ny UOM må IKKE være af typen heltal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
 DocType: Territory,For reference,For reference
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Løbenummer {0}, som det bruges på lager transaktioner"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Lukning (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Lukning (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
 DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
 ,Pending Qty,Afventer Antal
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Fakturering og levering status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
 DocType: Leave Control Panel,Allocate,Tildele
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Salg Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Salg Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vælg salgsordrer, som du ønsker at skabe produktionsordrer."
+DocType: Item,Delivered by Supplier (Drop Ship),Leveret af Leverandøren (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Løn komponenter.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referencenummer & Reference Dato er nødvendig for {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referencenummer & Reference Dato er nødvendig for {0}
 DocType: Event,Wednesday,Onsdag
 DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Modtager Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
 DocType: Sales Person,Sales Person Targets,Salg person Mål
-sites/assets/js/form.min.js +271,To,Til
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Indtast e-mail-adresse
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Til
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Indtast e-mail-adresse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ende rør danner
 DocType: Production Order Operation,In minutes,I minutter
 DocType: Issue,Resolution Date,Opløsning Dato
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,Projekter Bruger
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
 DocType: Company,Round Off Cost Center,Afrunde Cost center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
 DocType: Material Request,Material Transfer,Materiale Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åbning (dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Indstillinger
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
 DocType: Production Order Operation,Actual Start Time,Faktiske Start Time
 DocType: BOM Operation,Operation Time,Operation Time
-sites/assets/js/list.min.js +5,More,Mere
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mere
 DocType: Pricing Rule,Sales Manager,Salgschef
-sites/assets/js/desk.min.js +7673,Rename,Omdøb
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Omdøb
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bøjning
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillad Bruger
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Lige klipning
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
 DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
 DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
 DocType: Hub Settings,Seller City,Sælger By
 DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Element har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Velkommen
 DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Emne
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Varer modtaget fra leverandører.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varer modtaget fra leverandører.
 DocType: Communication,Open,Åbent
 DocType: Lead,Campaign Name,Kampagne Navn
 ,Reserved,Reserveret
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Vil du virkelig ønsker at UNSTOP
 DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
 DocType: Employee,Cell Number,Cell Antal
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i "Mod Kassekladde 'kolonne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i "Mod Kassekladde 'kolonne
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Mulighed Fra
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioneret Beløb kan ikke være større end krav Beløb i Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Prisliste ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familie Baggrund
 DocType: Process Payroll,Send Email,Send Email
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen Tilladelse
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mine Fakturaer
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Ingen medarbejder fundet
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
 DocType: Purchase Order,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Vælg BOM at starte
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload la
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu
 ,Support Analytics,Support Analytics
 DocType: Item,Website Warehouse,Website Warehouse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Vil du virkelig ønsker at stoppe produktionen rækkefølge:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form optegnelser
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Suppo
 DocType: Features Setup,"To enable ""Point of Sale"" features",For at aktivere "Point of Sale" funktioner
 DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
 DocType: Production Planning Tool,Select Items,Vælg emner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} mod regning {1} ​​dateret {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mod regning {1} ​​dateret {2}
 DocType: Comment,Reference Name,Henvisning Navn
 DocType: Maintenance Visit,Completion Status,Afslutning status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,"Forventet leveringsdato kan ikke være, før Sales Order Date"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Forventet leveringsdato kan ikke være, før Sales Order Date"
 DocType: Upload Attendance,Import Attendance,Import Fremmøde
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Activity Log
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
 DocType: Production Order,Item To Manufacture,Item Til Fremstilling
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent formstøbning
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Indkøbsordre til betaling
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status er {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Indkøbsordre til betaling
 DocType: Sales Order Item,Projected Qty,Projiceret Antal
 DocType: Sales Invoice,Payment Due Date,Betaling Due Date
 DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,Anmodet Numbers
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Præstationsvurdering.
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Kan ikke fortsætte {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan ikke fortsætte {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
 DocType: Account,Balance must be,Balance skal være
 DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Kvittering
 ,Received Items To Be Billed,Modtagne varer skal faktureres
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sandblæsning
-sites/assets/js/desk.min.js +3938,Ms,Ms
+DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,Range
 DocType: Supplier,Default Payable Accounts,Standard betales Konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Item Varianter {0} opdateret
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
 DocType: Address,Shop,Butik
 DocType: Hub Settings,Sync Now,Synkroniser nu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
 DocType: Employee,Permanent Address Is,Faste adresse
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
 DocType: Employee,Exit Interview Details,Exit Interview Detaljer
 DocType: Item,Is Purchase Item,Er Indkøb Item
 DocType: Journal Entry Account,Purchase Invoice,Indkøb Faktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
 DocType: Stock Entry,Total Outgoing Value,Samlet Udgående Value
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Åbning Dato og Closing Datoen skal ligge inden samme regnskabsår
 DocType: Lead,Request for Information,Anmodning om information
 DocType: Payment Tool,Paid,Betalt
 DocType: Salary Slip,Total in words,I alt i ord
 DocType: Material Request Item,Lead Time Date,Leveringstid Dato
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Måske Valutaveksling rekord er ikke skabt til
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For 'Product Bundle' elementer, Warehouse, Serial No og Batch Ingen vil blive betragtet fra "Packing List 'bord. Hvis Warehouse og Batch Ingen er ens for alle emballage poster for enhver "Product Bundle 'post, kan indtastes disse værdier i de vigtigste element tabellen, vil værdierne blive kopieret til" Packing List' bord."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Forsendelser til kunderne.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Forsendelser til kunderne.
 DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Indkomst
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Betaling Beløb = udestående beløb
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,Adresse Line 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmaets navn
 DocType: SMS Center,Total Message(s),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle de hjælpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den relevante gruppe (som regel Anvendelse af fondene> Omsætningsaktiver> bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen "Bank"
 DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvid
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Vedhæft dit billede
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Lave
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Lave
 DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
 DocType: Workflow State,Stop,Stands
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,Packing Slip Vare
 DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
 DocType: Delivery Note,Delivery To,Levering Til
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attributtabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivering
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"Vil kun blive
 DocType: Project,Internal,Intern
 DocType: Task,Urgent,Urgent
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå til skrivebordet og begynde at bruge ERPNext
 DocType: Item,Manufacturer,Producent
 DocType: Landed Cost Item,Purchase Receipt Item,Kvittering Vare
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Selling Beløb
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater "Status" og Gem
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater "Status" og Gem
 DocType: Serial No,Creation Document No,Creation dokument nr
 DocType: Issue,Issue,Issue
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item Varianter. f.eks størrelse, farve etc."
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard Selling Cost center
 DocType: Sales Partner,Implementation Partner,Implementering Partner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} er {1}
 DocType: Opportunity,Contact Info,Kontakt Info
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Making Stock Angivelser
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Making Stock Angivelser
 DocType: Packing Slip,Net Weight UOM,Nettovægt UOM
 DocType: Item,Default Supplier,Standard Leverandør
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Få ugentlige Off Datoer
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
 DocType: Sales Person,Select company name first.,Vælg firmanavn først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citater modtaget fra leverandører.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Til {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,opdateret via Time Logs
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firma registreringsnumre til din reference. Skat numre etc.
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
 ,Ordered Items To Be Billed,Bestilte varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Fra Range skal være mindre end at ligge
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vælg Time Logs og Send for at oprette en ny Sales Invoice.
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skat og
 DocType: Lead,Lead,Bly
 DocType: Email Digest,Payables,Gæld
 DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
 ,Purchase Order Items To Be Billed,Købsordre Varer at blive faktureret
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betal
 DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
 DocType: Lead,Call,Opkald
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Opsætning af Medarbejdere
-sites/assets/js/erpnext.min.js +5,"Grid """,Grid "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Opsætning af Medarbejdere
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,Sent
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
 DocType: Communication,Delivery Status,Levering status
 DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resten af ​​verden
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten af ​​verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Gross Pay
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Betalt udbytte
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Regnskab Ledger
 DocType: Stock Reconciliation,Difference Amount,Forskel Beløb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Overført overskud
 DocType: BOM Item,Item Description,Punkt Beskrivelse
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,Opportunity Vare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åbning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Medarbejder Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
 DocType: Address,Address Type,Adressetype
 DocType: Purchase Receipt,Rejected Warehouse,Afvist Warehouse
 DocType: GL Entry,Against Voucher,Mod Voucher
 DocType: Item,Default Buying Cost Center,Standard købsomkostninger center
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","For at få det bedste ud af ERPNext, anbefaler vi, at du tager lidt tid og se disse hjælpe videoer."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Vare {0} skal være Sales Item
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,til
 DocType: Item,Lead Time in days,Lead Time i dage
 ,Accounts Payable Summary,Kreditorer Resumé
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Sted for Issue
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
 DocType: Report,Disabled,Handicappet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landbrug
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,Mode Betaling
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
 DocType: Journal Entry Account,Purchase Order,Indkøbsordre
 DocType: Warehouse,Warehouse Contact Info,Lager Kontakt Info
-sites/assets/js/form.min.js +190,Name is required,Navn er påkrævet
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Navn er påkrævet
 DocType: Purchase Invoice,Recurring Type,Tilbagevendende Type
 DocType: Address,City/Town,By / Town
 DocType: Email Digest,Annual Income,Årlige indkomst
 DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Goal
 DocType: Sales Invoice Item,Edit Description,Edit Beskrivelse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,For Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,For Leverandøren
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Der kan kun være én Forsendelse Rule Condition med 0 eller blank værdi for "til værdi"
 DocType: Authorization Rule,Transaction,Transaktion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Bemærk: Denne Cost Center er en gruppe. Kan ikke gøre regnskabsposter mod grupper.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Værktøj
+apps/frappe/frappe/config/desk.py +7,Tools,Værktøj
 DocType: Item,Website Item Groups,Website varegrupper
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produktion ordrenummer er obligatorisk for lager post fremstilling formål
 DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,Workstation Navn
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-sites/assets/js/desk.min.js +7652,Comments,Kommentarer
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentarer
 DocType: Salary Slip,Bank Account No.,Bankkonto No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Værdiansættelse Rate kræves for Item {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vælg Firma
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Faktura Dato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
-sites/assets/js/form.min.js +212,No Data,Ingen data
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ingen data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Vurdering Template Goal
 DocType: Salary Slip,Earning,Optjening
 DocType: Payment Tool,Party Account Currency,Party Account Valuta
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,Party Account Valuta
 DocType: Purchase Taxes and Charges,Add or Deduct,Tilføje eller fratrække
 DocType: Company,If Yearly Budget Exceeded (for expense account),Hvis Årlig budget overskredet (for udgiftskonto)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Samlet ordreværdi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mad
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Ingen af ​​besøg
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta for Lukning Der skal være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operationer kan ikke være tomt.
 ,Delivered Items To Be Billed,Leverede varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke ændres for Serial No.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status opdateret til {0}
 DocType: DocField,Description,Beskrivelse
 DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
 DocType: Letter Head,Is Default,Er Standard
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
 DocType: Item,Maintain Stock,Vedligehold Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen 'Actual "i rækken {0} kan ikke indgå i Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen 'Actual "i rækken {0} kan ikke indgå i Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra datotid
 DocType: Email Digest,For Company,For Company
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
 DocType: Employee,Owned,Ejet
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC status
 DocType: GL Entry,GL Entry,GL indtastning
 DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,To Do List
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorleje
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Ingen adresse tilføjet endnu.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse tilføjet endnu.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
 DocType: Item,Inventory,Inventory
 DocType: Features Setup,"To enable ""Point of Sale"" view",For at aktivere "Point of Sale" view
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
 DocType: Item,Sales Details,Salg Detaljer
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Med Varer
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
 DocType: Item Attribute,Item Attribute,Item Attribut
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regeringen
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Item Varianter
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varianter
 DocType: Company,Services,Tjenester
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),I alt ({0})
 DocType: Cost Center,Parent Cost Center,Parent Cost center
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Regnskabsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Undersænkning
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing Slip (r) annulleret
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
 DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
 DocType: Item Group,Item Group Name,Item Group Name
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Taget
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taget
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
 DocType: Pricing Rule,For Price List,For prisliste
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,Tidsplaner
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
-DocType: Period Closing Voucher,CoA Help,CoA Hjælp
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Fejl: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fejl: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde> Customer Group> Territory
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjælp
 DocType: Event,Tuesday,Tirsdag
 DocType: Leave Block List,Block Holidays on important days.,Bloker Ferie på vigtige dage.
 ,Accounts Receivable Summary,Debitor Resumé
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Blade for type {0} allerede afsat til Medarbejder {1} for perioden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
 DocType: UOM,UOM Name,UOM Navn
 DocType: Top Bar Item,Target,Target
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,Salg Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskab Punktet om {0} kan kun foretages i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Udhugning
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
 ,Bank Reconciliation Statement,Bank Saldoopgørelsen
 DocType: Address,Lead Name,Bly navn
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Åbning Stock Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Åbning Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må kun optræde én gang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
 DocType: Shipping Rule Condition,From Value,Fra Value
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,Kontakt Mobile Ingen
 DocType: Production Planning Tool,Select Sales Orders,Vælg salgsordrer
 ,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Markér som Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
 DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
 DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
 DocType: SMS Center,Receiver List,Modtager liste
 DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Vis
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
 DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv lasersintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reserveret Antal
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserveret Antal
 DocType: Party Account,Party Account,Party Account
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
 DocType: Lead,Upper Income,Upper Indkomst
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
 DocType: Employee,Permanent Address,Permanent adresse
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Vare {0} skal være en service Item.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Forskud mod {0} {1} kan ikke være større \ end Grand alt {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vælg emne kode
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducer Fradrag for Leave uden løn (LWP)
 DocType: Territory,Territory Manager,Territory manager
+DocType: Delivery Note Item,To Warehouse (Optional),Til Warehouse (valgfri)
 DocType: Sales Invoice,Paid Amount (Company Currency),Betalt beløb (Company Valuta)
 DocType: Purchase Invoice,Additional Discount,Ekstra Rabat
 DocType: Selling Settings,Selling Settings,Salg af indstillinger
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minedrift
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Harpiks støbning
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Vælg {0} først.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,Batch Nej
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillad flere salgsordrer mod Kundens Indkøbsordre
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
 DocType: DocPerm,Delete,Slet
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variant
-sites/assets/js/desk.min.js +7971,New {0},Ny {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Ny {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
 DocType: Employee,Leave Encashed?,Efterlad indkasseres?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
 DocType: Item,Variants,Varianter
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
 DocType: Communication,Received,Modtaget
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,Salutation
 DocType: Communication,Rejected,Afvist
 DocType: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Vil også gælde for varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Leveres
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Sales Order Item,Actual Qty,Faktiske Antal
 DocType: Sales Invoice Item,References,Referencer
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,F
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Har Varianter
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik på 'Make Salg Faktura' knappen for at oprette en ny Sales Invoice.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Periode fra og periode datoer obligatoriske for tilbagevendende% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballering og etikettering
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Angiv venligst Standard Valuta i Company Master og Globale standardindstillinger
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Håndtering af Projekter
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Håndtering af Projekter
 DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
 DocType: Budget Detail,Fiscal Year,Regnskabsår
 DocType: Cost Center,Budget,Budget
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Selling
 DocType: Employee,Salary Information,Løn Information
 DocType: Sales Person,Name and Employee ID,Navn og Medarbejder ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Told og afgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Indtast Referencedato
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Indtast Referencedato
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
 DocType: Material Request Item,Material Request Item,Materiale Request Vare
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
 ,Item-wise Purchase History,Vare-wise Købshistorik
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rød
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på "Generer Schedule 'at hente Løbenummer tilføjet for Item {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på "Generer Schedule 'at hente Løbenummer tilføjet for Item {0}
 DocType: Account,Frozen,Frosne
 ,Open Production Orders,Åbne produktionsordrer
 DocType: Installation Note,Installation Time,Installation Time
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Citat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Som kan Produktionsordre gøres for denne post, skal det være en lagervare."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Som kan Produktionsordre gøres for denne post, skal det være en lagervare."
 DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Vær med
 DocType: Authorization Rule,Above Value,Over værdi
 ,Pending Amount,Afventer Beløb
 DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Leveret
+DocType: Purchase Order,Delivered,Leveret
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Opsætning indgående server for job email id. (F.eks jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Køretøjsnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter ba
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
 DocType: HR Settings,HR Settings,HR-indstillinger
 apps/frappe/frappe/config/setup.py +130,Printing,Udskrivning
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
 DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den dag (e), hvor du ansøger om orlov er ferie. Du har brug for ikke søge om orlov."
-sites/assets/js/desk.min.js +7805,and,og
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,og
 DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Samlet Fradrag
 DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Omkostninger Opdateret
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Er du sikker på du vil UNSTOP
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede blevet returneret
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
 DocType: Expense Claim,Approver,Godkender
 ,SO Qty,SO Antal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dyppestøbning
+DocType: Purchase Order,To be delivered to customer,Der skal leveres til kunden
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Løbenummer {0} tilhører ikke nogen Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opsætning
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Fra Valuta
 DocType: DocField,Name,Navn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Sales Order kræves for Item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order kræves for Item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Andre
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Angiv som Stoppet
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finde en matchende Item. Vælg en anden værdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke vælge charge type som 'On Forrige Row Beløb' eller 'On Forrige Row alt "for første række
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,Vælg DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Rømning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik på "Generer Schedule 'for at få tidsplan
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Ny Cost center
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Ny Cost center
 DocType: Bin,Ordered Quantity,Bestilt Mængde
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",fx "Byg værktøjer til bygherrer"
 DocType: Quality Inspection,In Process,I Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} mod salgsordre {1}
+DocType: Purchase Order Item,Reference Document Type,Referencedokument type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mod salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Føljeton Inventory
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Føljeton Inventory
 DocType: Activity Type,Default Billing Rate,Standard Billing Rate
 DocType: Time Log Batch,Total Billing Amount,Samlet Billing Beløb
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tilgodehavende konto
 ,Stock Balance,Stock Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Sales Order til Betaling
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order til Betaling
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs oprettet:
 DocType: Item,Weight UOM,Vægt UOM
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
 DocType: Production Order Operation,Completed Qty,Afsluttet Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Prisliste {0} er deaktiveret
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktiveret
 DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Sales Order {0} er stoppet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serienumre, der kræves for Item {1}. Du har givet {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
 DocType: Item,Customer Item Codes,Kunde Item Koder
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svejsning
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM kræves
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Alle elementer er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle elementer er allerede blevet faktureret
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig "Fra sag nr '
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
 DocType: Project,External,Ekstern
 DocType: Features Setup,Item Serial Nos,Vare Serial Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Adresse & Contacts
 DocType: SMS Log,Sender Name,Sender Name
 DocType: Page,Title,Titel
-sites/assets/js/list.min.js +104,Customize,Tilpas
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Tilpas
 DocType: POS Profile,[Select],[Vælg]
 DocType: SMS Log,Sent To,Sendt Til
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Make Sales Invoice
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,End of Life
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Rejser
 DocType: Leave Block List,Allow Users,Tillad brugere
+DocType: Purchase Order,Customer Mobile No,Kunden Mobile Ingen
 DocType: Sales Invoice,Recurring,Tilbagevendende
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat indtægter og omkostninger for produkt- vertikaler eller afdelinger.
 DocType: Rename Tool,Rename Tool,Omdøb Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
 DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Materiale
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
 DocType: Purchase Invoice,Price List Currency,Pris List Valuta
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,Medarbejder
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Fra
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Inviter som Bruger
 DocType: Features Setup,After Sale Installations,Efter salg Installationer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} er fuldt faktureret
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} er fuldt faktureret
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Fil til Omdøb
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Vis Betalinger
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Opsætning indgående server til salg email id. (F.eks sales@example.com)
 DocType: Warranty Claim,Raised By,Rejst af
 DocType: Payment Tool,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Angiv venligst Company for at fortsætte
-sites/assets/js/list.min.js +23,Draft,Udkast
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Angiv venligst Company for at fortsætte
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Udkast
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,Accepted,Accepteret
 DocType: User,Female,Kvinde
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
 DocType: Newsletter,Test,Prøve
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af "Har Serial Nej ',' Har Batch Nej ',' Er Stock Item" og "værdiansættelsesmetode '"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hurtig Kassekladde
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
 DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
 DocType: Stock Entry,For Quantity,For Mængde
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} er ikke indsendt
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Anmodning om.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} er ikke indsendt
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Anmodning om.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplet opsætning
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhedsbrev Mailin
 DocType: Delivery Note,Transporter Name,Transporter Navn
 DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måleenhed
 DocType: Fiscal Year,Year End Date,År Slutdato
 DocType: Task Depends On,Task Depends On,Task Afhænger On
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En tredjepart, distributør/forhandler/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
 DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
@@ -2021,11 +2032,9 @@ DocType: Note,Note,Bemærk
 DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
 DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Sæt som oplades
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
 DocType: Tax Rule,Billing City,Fakturering By
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Dette Orlov Ansøgning afventer godkendelse. Kun Leave Godkender kan opdatere status.
 DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
 DocType: Journal Entry,Credit Note,Kreditnota
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (Antal)
 DocType: Installation Note Item,Installed Qty,Antal installeret
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Indsendt
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Indsendt
 DocType: Salary Structure,Total Earning,Samlet Earning
 DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine Adresser
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,eller
 DocType: Sales Order,Billing Status,Fakturering status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Udgifter
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Above
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
 DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
 ,Download Backups,Hent Backups
 DocType: Notification Control,Sales Order Message,Sales Order Message
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Vælg Medarbejdere
 DocType: Bank Reconciliation,To Date,Til dato
 DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
-sites/assets/js/form.min.js +308,Details,Detaljer
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detaljer
 DocType: Purchase Invoice,Total Taxes and Charges,Total Skatter og Afgifter
 DocType: Employee,Emergency Contact,Emergency Kontakt
 DocType: Item,Quality Parameters,Kvalitetsparametre
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,Modtaget Antal
 DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Kontotype
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på "Generer Schedule '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på "Generer Schedule '
 ,To Produce,At producere
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Udfladning
 DocType: Account,Income Account,Indkomst konto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se "Rate Of Materials Based On" i Costing afsnit
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Stock Indstillinger
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrer Customer Group Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Ny Cost center navn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Ny Cost center navn
 DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup> Trykning og Branding> Adresse skabelon.
 DocType: Appraisal,HR User,HR Bruger
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Large
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen medarbejder fundet!
 DocType: C-Form Invoice Detail,Territory,Territory
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
+DocType: Purchase Order,Customer Address Display,Kunden Adresse Display
 DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
 DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Allokeret
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standard måleenhed for Item {0} kan ikke ændres direkte, fordi \ du allerede har gjort nogle transaktion (er) med en anden UOM. Hvis du vil ændre standard UOM, \ brug «UOM Erstat Utility 'værktøj under Lager modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Citat {0} er aflyst
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} er aflyst
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Medarbejder {0} var på orlov på {1}. Kan ikke markere fremmøde.
 DocType: Sales Partner,Targets,Mål
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dette er en rod kundegruppe og kan ikke redigeres.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Venligst opsætning din kontoplan, før du starter bogføring"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Prisfastsættelse Rule
-sites/assets/js/list.min.js +24,Cancelled,Annulleret
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Annulleret
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i Løn Structure ikke kan være mindre end Medarbejder Sammenføjning Dato.
 DocType: Employee Education,Graduate,Graduate
 DocType: Leave Block List,Block Days,Bloker dage
 DocType: Journal Entry,Excise Entry,Excise indtastning
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advarsel: Salg Order {0} findes allerede mod Kundens Indkøbsordre {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advarsel: Salg Order {0} findes allerede mod Kundens Indkøbsordre {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke fakturere
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 DocType: Features Setup,Sales and Purchase,Salg og Indkøb
-DocType: Purchase Order Item,Material Request No,Materiale Request Nej
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
+DocType: Supplier Quotation Item,Material Request No,Materiale Request Nej
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} er blevet afmeldt fra denne liste.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
-apps/frappe/frappe/templates/base.html +132,Added,Tilføjet
+apps/frappe/frappe/templates/base.html +134,Added,Tilføjet
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrer Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Salg Faktura
 DocType: Journal Entry Account,Party Balance,Party Balance
 DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Vælg Anvend Rabat på
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vælg Anvend Rabat på
 DocType: Company,Default Receivable Account,Standard Tilgodehavende konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Opret Bank Punktet om den samlede løn for de ovenfor valgte kriterier
 DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskab Punktet om Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Opfandt
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray danner
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Konto {0} er spærret
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er spærret
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventory Level
 DocType: Stock Entry,Subcontract,Underleverance
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Indtast venligst {0} først
 DocType: Production Planning Tool,Get Items From Sales Orders,Få elementer fra salgsordrer
 DocType: Production Order Operation,Actual End Time,Faktiske Sluttid
 DocType: Production Planning Tool,Download Materials Required,Hent Påkrævede materialer
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,Planlagt
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg Item hvor "Er Stock Item" er "Nej" og "Er Sales Item" er "Ja", og der er ingen anden Product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
 DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Pris List Valuta ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Pris List Valuta ikke valgt
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: kvittering {1} findes ikke i ovenstående 'Køb Kvitteringer' bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Indtil
 DocType: Rename Tool,Rename Log,Omdøbe Log
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
 DocType: Expense Claim,Expense Approver,Expense Godkender
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
-sites/assets/js/erpnext.min.js +48,Pay,Betale
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slibning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink indpakning
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Ventende Aktiviteter
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ventende Aktiviteter
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekræftet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør> Leverandør type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"In
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Dagblades
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vælg regnskabsår
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smeltning
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Du er den Leave Godkender til denne oplysning. Venligst Opdater "Status" og Gem
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
 DocType: Attendance,Attendance Date,Fremmøde Dato
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ugyldig periode
 DocType: Customer,Credit Limit,Kreditgrænse
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
 DocType: GL Entry,Voucher No,Blad nr
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Skabe
 DocType: Customer,Address and Contact,Adresse og kontakt
 DocType: Customer,Last Day of the Next Month,Sidste dag i den næste måned
 DocType: Employee,Feedback,Feedback
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: På grund / reference Date overstiger tilladte kunde kredit dage efter {0} dag (e)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Tidsplan
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: På grund / reference Date overstiger tilladte kunde kredit dage efter {0} dag (e)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tidsplan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Sandblæsnings udstyr
 DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
 DocType: Website Settings,Website Settings,Website Settings
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,Udgående
 DocType: Material Request,Requested For,Anmodet om
 DocType: Quotation Item,Against Doctype,Mod DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root-konto kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-konto kan ikke slettes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
 ,Is Primary Address,Er primære adresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Henvisning # {0} dateret {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Henvisning # {0} dateret {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrer Adresser
 DocType: Pricing Rule,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,Bruger Bemærkning
 DocType: Lead,Market Segment,Market Segment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Lukning (dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Lukning (dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Off Udestående beløb
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Kontroller, om du har brug for automatiske tilbagevendende fakturaer. Når du har indsendt nogen faktura, vil Tilbagevendende sektion være synlige."
 DocType: Account,Accounts Manager,Accounts Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Time Log {0} skal være »Tilmeldt '
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Time Log {0} skal være »Tilmeldt '
 DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Koster Pris baseret på Activity type (i timen)
 DocType: Production Planning Tool,Create Material Requests,Opret Materiale Anmodning
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Tilføj et par prøve optegnelser
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Lad Management
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lad Management
 DocType: Event,Groups,Grupper
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
 DocType: Sales Order,Fully Delivered,Fuldt Leveres
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Salg Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Videresendte Blade
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
 ,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens Indkøbsordre
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit til konto skal være en balance konto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
 DocType: Sales Order,%  Delivered,% Leveres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank kassekredit
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Foretag lønseddel
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Unstop
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Gennemse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikrede lån
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,Vurdering
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum støbning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tegning
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gentages
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Lad godkender skal være en af ​​{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Lad godkender skal være en af ​​{0}
 DocType: Hub Settings,Seller Email,Sælger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (Company Valuta)
 DocType: BOM Operation,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Item Navngivning By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Fra tilbudsgivning
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fra tilbudsgivning
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} findes ikke
 DocType: Purchase Receipt Item,Purchase Order Item No,Indkøbsordre Konto nr
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,Inspection Nødvendig
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Fuldt Billed
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kassebeholdning
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Levering lager kræves for lagervare {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Levering lager kræves for lagervare {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
 DocType: Serial No,Is Cancelled,Er Annulleret
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Mine forsendelser
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mine forsendelser
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
 DocType: Supplier,Supplier Details,Leverandør Detaljer
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vælg Bankkonto
 DocType: Newsletter,Create and Send Newsletters,Opret og send nyhedsbreve
-sites/assets/js/report.min.js +107,From Date must be before To Date,Fra dato skal være før til dato
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Fra dato skal være før til dato
 DocType: Sales Order,Recurring Order,Tilbagevendende Order
 DocType: Company,Default Income Account,Standard Indkomst konto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / kunde
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
 ,Projected,Projiceret
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
 DocType: Notification Control,Quotation Message,Citat Message
 DocType: Issue,Opening Date,Åbning Dato
 DocType: Journal Entry,Remark,Bemærkning
 DocType: Purchase Receipt Item,Rate and Amount,Sats og Beløb
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Fra kundeordre
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra kundeordre
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Ikke Billed
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre samme firma
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Ingen kontakter tilføjet endnu.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter tilføjet endnu.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ikke aktiv
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Mod Faktura Bogføringsdato
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
 DocType: Time Log,Batched for Billing,Batched for fakturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
-sites/assets/js/erpnext.min.js +26,Discount Amount,Rabat Beløb
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
 DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,fx moms
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
 DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
 DocType: Shopping Cart Settings,Quotation Series,Citat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas danner
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Kunde eller leverandør Detaljer
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Sæt
 DocType: Lead,Lead Owner,Bly Owner
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Warehouse kræves
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse kræves
 DocType: Employee,Marital Status,Civilstand
 DocType: Stock Settings,Auto Material Request,Auto Materiale Request
 DocType: Time Log,Will be updated when billed.,"Vil blive opdateret, når faktureret."
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tilgængelig Batch Antal ved fra vores varelager
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nuværende BOM og New BOM må ikke være samme
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
 DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,Opdatering Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registrering af al kommunikation af type e-mail, telefon, chat, besøg osv"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
 DocType: Purchase Invoice,Terms,Betingelser
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Opret ny
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Opret ny
 DocType: Buying Settings,Purchase Order Required,Indkøbsordre Påkrævet
 ,Item-wise Sales History,Vare-wise Sales History
 DocType: Expense Claim,Total Sanctioned Amount,Total Sanktioneret Beløb
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Noter
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vælg en gruppe node først.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af ​​{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Udfyld formularen og gemme det
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Udfyld formularen og gemme det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fællesskab Forum
 DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
 DocType: SMS Center,Send SMS,Send SMS
 DocType: Company,Default Letter Head,Standard Letter hoved
 DocType: Time Log,Billable,Faktureres
 DocType: Authorization Rule,This will be used for setting rule in HR module,Dette vil blive brugt til at indstille regel i HR-modulet
 DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Genbestil Antal
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Genbestil Antal
 DocType: Company,Stock Adjustment Account,Stock Justering konto
 DocType: Journal Entry,Write Off,Skriv Off
 DocType: Time Log,Operation ID,Operation ID
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Discount Fields vil være tilgængelig i Indkøbsordre, kvittering, købsfaktura"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Bemærk: Du må ikke oprette konti for kunder og leverandører
 DocType: Report,Report Type,Rapporttype
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Loading
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Loading
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstat Værktøj
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Land klogt standardadresse Skabeloner
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Leverandøren leverer til Kunden
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Vis skat break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Hvis du inddrage i fremstillingsindustrien aktivitet. Aktiverer Item 'Er Fremstillet'
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktura Bogføringsdato
 DocType: Sales Invoice,Rounded Total,Afrundet alt
 DocType: Product Bundle,List items that form the package.,"Listeelementer, der danner pakken."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel Tildeling bør være lig med 100%
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
 DocType: Company,Default Cash Account,Standard Kontant konto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Indtast 'Forventet leveringsdato'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Indtast 'Forventet leveringsdato'
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Række {0}: Antal ikke avalable i lageret {1} på {2} {3}. Tilgængelig Antal: {4}, Transfer Antal: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
+DocType: Purchase Order,Customer Contact Email,Kundeservice Kontakt E-mail
 DocType: Event,Sunday,Søndag
 DocType: Sales Team,Contribution (%),Bidrag (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden 'Kontant eller bank konto' er ikke angivet
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Skabelon
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Skabelon
 DocType: Sales Person,Sales Person Name,Salg Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst 1 faktura i tabellen
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Tilføj Brugere
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),Faktiske startdato (via Time Log
 DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
 DocType: Sales Order,Partly Billed,Delvist Billed
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
 DocType: Time Log Batch,Total Hours,Total Hours
 DocType: Journal Entry,Printing Settings,Udskrivning Indstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Blade for type {0} allerede afsat til Medarbejder {1} for Fiscal År {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Element er påkrævet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal sprøjtestøbning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Fra følgeseddel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
 DocType: Time Log,From Time,Fra Time
 DocType: Notification Control,Custom Message,Tilpasset Message
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,Et emne med dette e-m
 DocType: Stock Entry,From BOM,Fra BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',Klik på "Generer Schedule '
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik på "Generer Schedule '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
 DocType: Salary Structure,Salary Structure,Løn Struktur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flyselskab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Issue Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Issue Materiale
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Offer Dato
 DocType: Hub Settings,Access Token,Access Token
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,Åbning tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
+DocType: Delivery Note Item,From Warehouse,Fra Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Boring
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blæsestøbning
 DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,Ændret Fra
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Følg via e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten target qty eller målbeløbet er obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Vælg Bogføringsdato først
-DocType: Leave Allocation,Carry Forward,Carry Forward
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vælg Bogføringsdato først
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Åbning Dato bør være, før Closing Dato"
+DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Cost Center med eksisterende transaktioner kan ikke konverteres til finans
 DocType: Department,Days for which Holidays are blocked for this department.,"Dage, som Holidays er blokeret for denne afdeling."
 ,Produced,Produceret
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
 DocType: Quality Inspection,Item Serial No,Vare Løbenummer
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Time
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ikke indstillet
 DocType: Production Order,Planned Start Date,Planlagt startdato
 DocType: Serial No,Creation Document Type,Creation Dokumenttype
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Besøg
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Besøg
 DocType: Leave Type,Is Encash,Er indløse
 DocType: Purchase Invoice,Mobile No,Mobile Ingen
 DocType: Payment Tool,Make Journal Entry,Make Kassekladde
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nye Blade Allokeret
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
 DocType: Project,Expected End Date,Forventet Slutdato
 DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Kommerciel
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kommerciel
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} må ikke være en lagervare
 DocType: Cost Center,Distribution Id,Distribution Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Værdi for Egenskab {0} skal være inden for området af {1} til {2} i intervaller på {3}
 DocType: Tax Rule,Sales,Salg
 DocType: Stock Entry Detail,Basic Amount,Grundbeløb
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
+DocType: Leave Allocation,Unused leaves,Ubrugte blade
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Savning
 DocType: Tax Rule,Billing State,Fakturering stat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminering
 DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
 DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Forfaldsdato er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
 DocType: Attendance,Absent,Fraværende
 DocType: Product Bundle,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Række {0}: Ugyldig henvisning {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Knusning
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
 DocType: Upload Attendance,Download Template,Hent skabelon
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,Bemærkninger
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Installation rekord for en Serial No.
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installation rekord for en Serial No.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuerlig støbning
-sites/assets/js/erpnext.min.js +10,Please specify a,Angiv en
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Angiv en
 DocType: Offer Letter,Awaiting Response,Afventer svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Frem
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kolde dimensionering
 DocType: Salary Slip,Earning & Deduction,Earning & Fradrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
 DocType: Holiday List,Weekly Off,Ugentlig Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Svulmende
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Fordampningsemissioner-mønster støbning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Repræsentationsudgifter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Alder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
 DocType: Time Log,Billing Amount,Fakturering Beløb
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansøgning om orlov.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiske Udgifter
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto ordre vil blive genereret f.eks 05, 28 osv"
 DocType: Sales Invoice,Posting Time,Udstationering Time
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Åbne Meddelelser
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Åbne Meddelelser
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte udgifter
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Har du virkelig ønsker at UNSTOP dette materiale Request?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrud
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på dato
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
 DocType: Feed,Full Name,Fulde navn
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Stenbrud
 DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firma Forkortelse
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citater
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Skat Skabelon er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} status er 'Stoppet'
 DocType: Account,Temporary,Midlertidig
 DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
 DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Strygning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
 DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Kommende begivenheder
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende begivenheder
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden er nødvendig
 DocType: Letter Head,Letter Head,Brev hoved
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hurtig indtastning
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
 DocType: Purchase Order,To Receive,At Modtage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink fitting
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
 DocType: Serial No,Out of Warranty,Ud af garanti
 DocType: BOM Replace Tool,Replace,Udskifte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
 DocType: Purchase Invoice Item,Project Name,Projektnavn
 DocType: Supplier,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
 DocType: Workflow State,Edit,Edit
 DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
 DocType: Features Setup,Item Batch Nos,Item Batch nr
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Menneskelige Ressourcer
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Menneskelige Ressourcer
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skatteaktiver
 DocType: BOM Item,BOM No,BOM Ingen
 DocType: Contact Us Settings,Pincode,Pinkode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
 DocType: Item,Moving Average,Glidende gennemsnit
 DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM skal være forskellig fra nuværende bestand UOM
 DocType: Account,Debit,Betalingskort
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsat
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",For at tildele problemet ved at bruge knappen "Tildel" i indholdsoversigten.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Mod faktura
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal År: {0} ikke eksisterer
 DocType: Currency Exchange,To Currency,Til Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lad følgende brugere til at godkende Udfyld Ansøgninger om blok dage.
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Sats
 DocType: Stock Entry Detail,Additional Cost,Yderligere omkostninger
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Regnskabsår Slutdato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Foretag Leverandør Citat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Foretag Leverandør Citat
 DocType: Quality Inspection,Incoming,Indgående
 DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: Løbenummer {1} matcher ikke med {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Batch-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Bemærk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Bemærk: {0}
 ,Delivery Note Trends,Følgeseddel Tendenser
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Denne uges Summary
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
 DocType: GL Entry,Party,Selskab
 DocType: Sales Order,Delivery Date,Leveringsdato
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,A
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
 DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
 DocType: Employee,History In Company,Historie I Company
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Nyhedsbreve
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Nyhedsbreve
 DocType: Address,Shipping,Forsendelse
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
 DocType: Department,Leave Block List,Lad Block List
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,Revisor
 DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Standard måleenhed for Variant skal være samme som skabelon
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standard måleenhed for Variant skal være samme som skabelon
 DocType: DocField,Fold,Fold
 DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
 DocType: Pricing Rule,Disable,Deaktiver
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Rapporter til
 DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
 DocType: Sales Invoice,Paid Amount,Betalt Beløb
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Lukning Konto {0} skal være af typen 'ansvar'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Lukning Konto {0} skal være af typen 'ansvar'
 ,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
 DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Indtast mængde for Item {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
 DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
 DocType: Tax Rule,Purchase,Købe
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Antal
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials","Samlede gruppe af ** Varer ** i anden ** Item **
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Løbenummer er obligatorisk for Item {0}
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Angiv fra / til spænder
-sites/assets/js/desk.min.js +7652,Created By,Lavet af
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Lavet af
 DocType: Serial No,Under AMC,Under AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Item værdiansættelse sats genberegnes overvejer landede omkostninger kupon beløb
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
 DocType: BOM Replace Tool,Current BOM,Aktuel BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Tilføj Løbenummer
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Tilføj Løbenummer
 DocType: Production Order,Warehouses,Pakhuse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stationær
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
 DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløb
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Opdater færdigvarer
 DocType: Workstation,per hour,per time
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serien {0} allerede anvendes i {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serien {0} allerede anvendes i {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
 DocType: Company,Distribution,Distribution
-sites/assets/js/erpnext.min.js +50,Amount Paid,Beløb betalt
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
 DocType: Customer,Default Taxes and Charges,Standard Skatter og Afgifter
 DocType: Account,Receivable,Tilgodehavende
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Række # {0}: Ikke tilladt at skifte leverandør, da indkøbsordre allerede findes"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
 DocType: Sales Invoice,Supplier Reference,Leverandør reference
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Hvis markeret, vil BOM for sub-montage elementer overvejes for at få råvarer. Ellers vil alle sub-montage poster behandles som et råstof."
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på 'Vælg som standard'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Mangel Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
 DocType: Salary Slip,Salary Slip,Lønseddel
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunering
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Til dato' er nødvendig
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når nogen af ​​de kontrollerede transaktioner er "Indsendt", en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede "Kontakt" i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale indstillinger
 DocType: Employee Education,Employee Education,Medarbejder Uddannelse
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
 DocType: Salary Slip,Net Pay,Nettoløn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Løbenummer {0} er allerede blevet modtaget
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,Manufacturing Bruger
 DocType: Purchase Order,Raw Materials Supplied,Raw Materials Leveres
 DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
 DocType: Communication,Series,Series
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
 DocType: Appraisal,Appraisal Template,Vurdering skabelon
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Item Klassifikation
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,Payroll Indstillinger
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Angiv bestilling
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke have en forælder cost center
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Vælg mærke ...
 DocType: Sales Invoice,C-Form Applicable,C-anvendelig
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
 DocType: Supplier,Address and Contacts,Adresse og kontaktpersoner
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Få Udestående Vouchers
 DocType: Warranty Claim,Resolved By,Løst Af
 DocType: Appraisal,Start Date,Startdato
-sites/assets/js/desk.min.js +7629,Value,Value
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Value
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Afsætte blade i en periode.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Adgang tilladt
 DocType: Dropbox Backup,Weekly,Ugentlig
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Modtag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Modtag
 DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
 DocType: Workstation,Operating Costs,Drifts- omkostninger
 DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle bearbejdning
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Tilføj / rediger Priser
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram af Cost Centers
 ,Requested Items To Be Ordered,Anmodet Varer skal bestilles
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Mine ordrer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mine ordrer
 DocType: Price List,Price List Name,Pris List Name
 DocType: Time Log,For Manufacturing,For Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaler
@@ -3471,7 +3489,7 @@ DocType: Account,Income,Indkomst
 DocType: Industry Type,Industry Type,Industri Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noget gik galt!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Trykstøbning
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,År
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Time Log {0} allerede faktureret
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} allerede faktureret
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Usikrede lån
 DocType: Cost Center,Cost Center Name,Cost center Navn
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Vare {0} med Serial Nej {1} er allerede installeret
 DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Betalt Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
 ,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
 DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
 DocType: Naming Series,Help HTML,Hjælp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,Konverteret
 DocType: Item,Has Serial No,Har Løbenummer
 DocType: Employee,Date of Issue,Udstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
 DocType: Issue,Content Type,Indholdstype
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Kontroller venligst Multi Valuta indstilling for at tillade konti med anden valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Kontroller venligst Multi Valuta indstilling for at tillade konti med anden valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
@@ -3524,14 +3542,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
 ,Average Commission Rate,Gennemsnitlig Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
 DocType: Purchase Taxes and Charges,Account Head,Konto hoved
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garanti krav
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,Navngivning Series
 DocType: Leave Block List,Leave Block List Name,Lad Block List Name
 DocType: User,Enabled,Aktiveret
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Vil du virkelig ønsker at indsende alle lønseddel for måned {0} og år {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vil du virkelig ønsker at indsende alle lønseddel for måned {0} og år {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
 DocType: Target Detail,Target Qty,Target Antal
 DocType: Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
 DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
 DocType: Authorization Rule,Based On,Baseret på
-,Ordered Qty,Bestilt Antal
+DocType: Sales Order Item,Ordered Qty,Bestilt Antal
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Konto {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode fra og periode datoer obligatorisk for tilbagevendende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generer lønsedler
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} er ikke en gyldig e-mail-id
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
-DocType: Journal Entry Account,Amount,Beløb
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløb
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitning
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salg Analytics
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før Material Request Dato
 DocType: Contact Us Settings,City,By
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic bearbejdning
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Vare {0} skal være en Sales Item
 DocType: Naming Series,Update Series Number,Opdatering Series Number
 DocType: Account,Equity,Egenkapital
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,Faktiske
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
 DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
 DocType: Production Order,Production Order,Produktionsordre
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
 DocType: Quotation Item,Against Docname,Mod Docname
 DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Raw Material Omkostninger
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råvarer til analyse."
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt Chart
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gældende Holiday List
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttype er obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Detail & Wholesale
 DocType: Issue,First Responded On,Først svarede den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,Fremmøde
 DocType: Page,No,Ingen
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
 ,Item Prices,Item Priser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Rådgivning
 DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
-sites/assets/js/erpnext.min.js +50,Change,Ændring
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
 DocType: Purchase Invoice,Contact Email,Kontakt E-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Indkøbsordre {0} er "Venter"
 DocType: Appraisal Goal,Score Earned,Score tjent
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",fx "My Company LLC"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
 DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
 DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempling
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nul værdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
 DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
 DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 DocType: Task,Actual End Date (via Time Logs),Faktiske Slutdato (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Total Score (ud af 5)
 DocType: Contact Us Settings,State,Stat
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Expense krav)
 DocType: User,Gender,Køn
 DocType: Journal Entry,Debit Note,Debetnota
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,Blog Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Oprette regler til at begrænse transaktioner baseret på værdier.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af ​​Løn Per Day"
 DocType: Purchase Invoice,Total Advance,Samlet Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Unstop Material Request
 DocType: Workflow State,User,Bruger
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Behandling Payroll
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Behandling Payroll
 DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
 DocType: GL Entry,Credit Amount,Credit Beløb
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Sæt som Lost
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,Credit Dage Baseret på
 DocType: Tax Rule,Tax Rule,Skatteregel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Oprethold Samme Rate Gennem Sales Cycle
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} er allerede indsendt
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} er allerede indsendt
 ,Items To Be Requested,Varer skal ansøges
 DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Fakturering Pris baseret på Activity type (i timen)
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
 DocType: Production Planning Tool,Filter based on item,Filter baseret på emne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debet konto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Medarbejder Navn
 DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
 DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
 DocType: Production Order,Manufactured Qty,Fremstillet Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
 DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
 DocType: Maintenance Schedule,Schedule,Køreplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definer budget for denne Cost Center. For at indstille budgettet handling, se "Company List""
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,Parent Konto
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Prisliste ikke fundet eller handicappede
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
 DocType: Expense Claim,Approved,Godkendt
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som "Left"
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Uddannelse
 DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
 DocType: Employee,Current Address Is,Nuværende adresse er
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Valgfri. Sætter virksomhedens standard valuta, hvis ikke angivet."
 DocType: Address,Office,Kontor
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standard rapporter
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Vælg Medarbejder Record først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Række {0}: Party / Konto matcher ikke med {1} / {2} i {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgængelige Antal ved fra vores varelager
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vælg Medarbejder Record først.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Række {0}: Party / Konto matcher ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Sådan opretter du en Tax-konto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Indtast venligst udgiftskonto
 DocType: Account,Stock,Lager
 DocType: Employee,Current Address,Nuværende adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
 DocType: Serial No,Purchase / Manufacture Details,Køb / Fremstilling Detaljer
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch Inventory
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventory
 DocType: Employee,Contract End Date,Kontrakt Slutdato
 DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
 DocType: DocShare,Document Type,Dokumenttype
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Fra Leverandør Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Fra Leverandør Citat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Antal
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
 DocType: Notification Control,Purchase Receipt Message,Kvittering Message
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Samlede fordelte blade er mere end periode
 DocType: Production Order,Actual Start Date,Faktiske startdato
 DocType: Sales Order,% of materials delivered against this Sales Order,% Af materialer leveret mod denne Sales Order
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Optag element bevægelse.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Optag element bevægelse.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhedsbrev List Subscriber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Stemmemaskiner
 DocType: Email Account,Service,Service
 DocType: Hub Settings,Hub Settings,Hub Indstillinger
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskabsposteringer er allerede foretaget i valuta {0} for virksomheden {1}. Vælg tilgodehavendets eller gældens konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskabsposteringer er allerede foretaget i valuta {0} for virksomheden {1}. Vælg tilgodehavendets eller gældens konto med valuta {0}.
 ,Monthly Salary Register,Månedlig Løn Tilmeld
-apps/frappe/frappe/website/template.py +123,Next,Næste
+apps/frappe/frappe/website/template.py +140,Next,Næste
 DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
 DocType: BOM Operation,BOM Operation,BOM Operation
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolering
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,Næste dato
 DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Indtast Skatter og Afgifter
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Bearbejdning
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer som navn og besættelse af forældre, ægtefælle og børn"
 DocType: Hub Settings,Seller Name,Sælger Navn
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og Afgifter Fratrukket (Company Valuta)
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
 ,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
 DocType: Batch,Expiry Date,Udløbsdato
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","For at indstille genbestille niveau, skal post være et køb Item eller Manufacturing Vare"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","For at indstille genbestille niveau, skal post være et køb Item eller Manufacturing Vare"
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halv dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Credit Dage
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Få elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
 DocType: Dropbox Backup,Send Notifications To,Send meddelelser til
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Årsag til Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
 DocType: GL Entry,Is Opening,Er Åbning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Konto {0} findes ikke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} findes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Opret Løn Struktur for medarbejder {0}
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 172198d22a..7b7acc27c8 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Gehaltsmodus
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Bitte ""Monatsweise Verteilung"" wählen, wenn saisonbedingt aufgezeichnet werden soll."
 DocType: Employee,Divorced,Geschieden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Warnung: Gleicher Artikel wurde mehrfach eingegeben.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Warnung: Gleicher Artikel wurde mehrfach eingegeben.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Artikel sind bereits synchronisiert
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Zulassen, dass ein Artikel mehrfach in einer Transaktion hinzugefügt werden kann"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materialkontrolle {0} stornieren vor Abbruch dieses Garantieantrags
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Verdichtung und Sintern
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Währung für Preisliste {0} erforderlich
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Wird in der Transaktion berechnet.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Von Materialanforderung
+DocType: Purchase Order,Customer Contact,Customer Contact
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Von Materialanforderung
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Baumstruktur
 DocType: Job Applicant,Job Applicant,Bewerber
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Keine weiteren Ergebnisse.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Kundenname
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle mit dem Export verknüpften Felder (wie z. B. Währung, Wechselkurs, Summe Export, Gesamtsumme Export usw.) sind in Lieferschein, POS, Angebot, Ausgangsrechnung, Kundenauftrag usw. verfügbar"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Typen (oder Gruppen), zu denen Buchungseinträge vorgenommen und Salden geführt werden."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Ausstände für {0} können nicht kleiner als Null sein ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Ausstände für {0} können nicht kleiner als Null sein ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 Minuten
 DocType: Leave Type,Leave Type Name,Bezeichnung der Abwesenheit
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie erfolgreich aktualisiert
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Mehrfach-Artikelpreise.
 DocType: SMS Center,All Supplier Contact,Alle Lieferantenkontakte
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Voraussichtliches Enddatum kann nicht vor dem voraussichtlichen Startdatum liegen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Wollen Sie den folgenden Fertigungsauftrag wirklich fortsetzen:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile #{0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Neuer Urlaubsantrag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Neuer Urlaubsantrag
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bankwechsel
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"Diese Option wird verwendet, um die kundenspezifische Artikelnummer zu erhalten und den Artikel aufgrund der Artikelnummer auffindbar zu machen"
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
@@ -59,26 +59,26 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Varianten anze
 DocType: Sales Invoice Item,Quantity,Menge
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredite (Passiva)
 DocType: Employee Education,Year of Passing,Jahr des Abgangs
-sites/assets/js/erpnext.min.js +27,In Stock,Auf Lager
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Eine Zahlung kann nur zu einer noch nicht abgeglichenen Kundenbestellung gemacht werden
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Auf Lager
 DocType: Designation,Designation,Bezeichnung
 DocType: Production Plan Item,Production Plan Item,Artikel auf dem Produktionsplan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Benutzer {0} ist bereits Mitarbeiter {1} zugewiesen 
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Neues POS-Profil erstellen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Gesundheitswesen
 DocType: Purchase Invoice,Monthly,Monatlich
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Rechnung
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zahlungsverzug (Tage)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Rechnung
 DocType: Maintenance Schedule Item,Periodicity,Periodizität
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-Mail-Addresse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Verteidigung
 DocType: Company,Abbr,Kürzel
 DocType: Appraisal Goal,Score (0-5),Punktzahl (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Zeile # {0}:
 DocType: Delivery Note,Vehicle No,Fahrzeug-Nr.
-sites/assets/js/erpnext.min.js +55,Please select Price List,Bitt eine Preisliste auswählen
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Bitt eine Preisliste auswählen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Holzbearbeitung
-DocType: Production Order Operation,Work In Progress,Laufende Arbeiten
+DocType: Production Order Operation,Work In Progress,Fertigung
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-Druck
 DocType: Employee,Holiday List,Ferienplaner
 DocType: Time Log,Time Log,Zeitprotokoll
@@ -100,14 +100,15 @@ DocType: Rename Tool,"Attach .csv file with two columns, one for the old name an
 DocType: Packed Item,Parent Detail docname,Übergeordnetes Detail Dokumentenname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Stellenausschreibung.
-DocType: Item Attribute,Increment,Inkrement
+DocType: Item Attribute,Increment,Schrittweite
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Wählen Sie Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Werbung
 DocType: Employee,Married,Verheiratet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
 DocType: Payment Reconciliation,Reconcile,Abgleichen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Lebensmittelgeschäft
 DocType: Quality Inspection Reading,Reading 1,Ablesung 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Bankbuchung erstellen
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Bankbuchung erstellen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionsfonds
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Angabe des Lagers ist zwingend erforderlich, wenn der Kontotyp ""Lager"" ist"
 DocType: SMS Center,All Sales Person,Alle Vertriebsmitarbeiter
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Kostenstelle für Abschreibungen
 DocType: Warehouse,Warehouse Detail,Lagerdetail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kreditlimit für Kunde {0} {1}/{2} wurde überschritten
 DocType: Tax Rule,Tax Type,Steuerart
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren
 DocType: Item,Item Image (if not slideshow),Artikelbild (wenn keine Diashow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Ein Kunde mit dem gleichen Namen existiert
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundensatz / 60) * tatsächliche Betriebszeit
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Gast
 DocType: Quality Inspection,Get Specification Details,Spezifikationsdetails aufrufen
 DocType: Lead,Interested,Interessiert
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Stückliste
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Eröffnung
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Eröffnung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Von {0} bis {1}
 DocType: Item,Copy From Item Group,Von Artikelgruppe kopieren
 DocType: Journal Entry,Opening Entry,Eröffnungsbuchung
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Produktanfrage
 DocType: Standard Reply,Owner,Eigentümer
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Bitte zuerst die Firma angeben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Bitte zuerst Firma auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Bitte zuerst Firma auswählen
 DocType: Employee Education,Under Graduate,Schulabgänger
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Ziel auf
 DocType: BOM,Total Cost,Gesamtkosten
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Präfix
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Verbrauchsgut
 DocType: Upload Attendance,Import Log,Importprotokoll
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Absenden
+DocType: Sales Invoice Item,Delivered By Supplier,Zugestellt von Lieferanten
 DocType: SMS Center,All Contact,Alle Kontakte
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Jahresgehalt
 DocType: Period Closing Voucher,Closing Fiscal Year,Abschluss des Geschäftsjahres
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Gegenbuchung
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Zeitprotokolle anzeigen
 DocType: Journal Entry Account,Credit in Company Currency,(Gut)Haben in Unternehmenswährung
 DocType: Delivery Note,Installation Status,Installationsstatus
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akzeptierte + abgelehnte Menge muss für diese Position {0} gleich der erhaltenen Menge sein
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akzeptierte + abgelehnte Menge muss für diese Position {0} gleich der erhaltenen Menge sein
 DocType: Item,Supply Raw Materials for Purchase,Rohmaterial für Einkauf bereitstellen
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Artikel {0} muss ein Kaufartikel sein
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Vorlage herunterladen, passende Daten eintragen und geänderte Datei anfügen.
  Alle Termine und Mitarbeiter-Kombinationen im gewählten Zeitraum werden in die Vorlage übernommen, inklusive der bestehenden Anwesenheitslisten"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Artikel {0} ist nicht aktiv oder hat das Ende der Lebensdauer erreicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Artikel {0} ist nicht aktiv oder hat das Ende der Lebensdauer erreicht
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,"Wird aktualisiert, wenn die Ausgangsrechnung versendet wurde."
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Einstellungen für das Personal-Modul
 DocType: SMS Center,SMS Center,SMS-Center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Begradigung
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,URL-Parameter für Nachric
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regeln für die Anwendung von Preisen und Rabatten.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Dieses Zeitprotokoll steht im Widerspruch mit {0} für {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Preisliste muss für Einkauf oder Vertrieb gültig sein
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Installationsdatum kann nicht vor dem Liefertermin für Artikel {0} liegen
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installationsdatum kann nicht vor dem Liefertermin für Artikel {0} liegen
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt auf die Preisliste (%)
-sites/assets/js/form.min.js +279,Start,Start
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Vorname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Die Installation ist abgeschlossen. Aktualisiere.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Vollformguß
 DocType: Offer Letter,Select Terms and Conditions,Bitte Geschäftsbedingungen auswählen
 DocType: Production Planning Tool,Sales Orders,Kundenaufträge
@@ -223,13 +224,14 @@ DocType: Production Order Operation,Updated via 'Time Log',"Aktualisiert über "
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} gehört nicht zu Firma {1}
 DocType: Naming Series,Series List for this Transaction,Serienliste für diese Transaktion
 DocType: Sales Invoice,Is Opening Entry,Ist Eröffnungsbuchung
-DocType: Customer Group,Mention if non-standard receivable account applicable,"Vermerken, wenn das Konto Nicht-Standard-Forderungen zutreffend ist"
+DocType: Customer Group,Mention if non-standard receivable account applicable,"Vermerken, wenn kein Standard-Forderungskonto zutreffend ist"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"""Für Lager"" wird vor dem Abschicken benötigt"
 DocType: Sales Partner,Reseller,Wiederverkäufer
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Bitte Firmenname angeben
 DocType: Delivery Note Item,Against Sales Invoice Item,Zu Ausgangsrechnungs-Position
 ,Production Orders in Progress,Fertigungsaufträge in Arbeit
 DocType: Lead,Address & Contact,Adresse & Kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,In unbenutzten Blätter aus früheren Vergaben
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
 DocType: Newsletter List,Total Subscribers,Gesamtanzahl der Abonnenten
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Ansprechpartner
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Ausstehende Menge
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Erstellt eine Gehaltsabrechnung gemäß der oben getroffenen Auswahl.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Einkaufsanfrage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Doppelgehäuse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen versenden
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen versenden
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Entlassungsdatum muss nach dem Einstandsdatum liegen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Abwesenheiten pro Jahr
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Bitte die Serienbezeichnung für {0} über Setup > Einstellungen > Serien benamen eingeben
 DocType: Time Log,Will be updated when batched.,"Wird aktualisiert, wenn Stapel erstellt werden."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte ""Ist Vorkasse"" zu Konto {1} anklicken, ."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte ""Ist Vorkasse"" zu Konto {1} anklicken, ."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Lager {0} gehört nicht zu Firma {1}
 DocType: Bulk Email,Message,Mitteilung
 DocType: Item Website Specification,Item Website Specification,Artikel-Webseitenspezifikation
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox-Zugangsschlüssel
 DocType: Payment Tool,Reference No,Referenznr.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Urlaub gesperrt
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
 DocType: Stock Entry,Sales Invoice No,Ausgangsrechnungs-Nr.
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Mindestbestellmenge
 DocType: Pricing Rule,Supplier Type,Lieferantentyp
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Artikel {0} wird storniert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Materialanforderung
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materialanforderung
 DocType: Bank Reconciliation,Update Clearance Date,Tilgungsdatum aktualisieren
 DocType: Item,Purchase Details,Kaufinformationen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" der Einkaufsbestellung {1} nicht gefunden"
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Benachrichtungseinstellungen
 DocType: Lead,Suggestions,Vorschläge
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Artikelgruppenbezogene Budgets für diese Region erstellen. Durch Setzen der Auslieferungseinstellungen können auch saisonale Aspekte mit einbezogen werden.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Bitte die übergeordnete Kontengruppe für das Lager {0} eingeben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein
 DocType: Supplier,Address HTML,Adresse im HTML-Format
 DocType: Lead,Mobile No.,Mobilfunknr.
 DocType: Maintenance Schedule,Generate Schedule,Zeitplan generieren
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Neue Lagermaßeinheit
 DocType: Period Closing Voucher,Closing Account Head,Bezeichnung des Abschlusskontos
 DocType: Employee,External Work History,Externe Arbeits-Historie
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Zirkelschluss-Fehler
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Wollen Sie wirklich ANHALTEN
 DocType: Communication,Closed,Geschlossen
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"""In Worten (Export)"" wird sichtbar, sobald Sie den Lieferschein speichern."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Sind Sie sicher, dass Sie ANHALTEN wollen?"
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Stellenbeschreibung
 DocType: Newsletter,Newsletter,Newsletter
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Lieferschein
 DocType: Dropbox Backup,Allow Dropbox Access,Dropbox-Zugang zulassen
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Steuern einrichten
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Zahlungsbuchung wurde geändert, nachdem sie abgerufen wurde. Bitte erneut abrufen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben 
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben 
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Zusammenfassung für diese Woche und anstehende Aktivitäten
 DocType: Workstation,Rent Cost,Mietkosten
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Bitte Monat und Jahr auswählen
@@ -337,20 +337,20 @@ apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/custome
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Bitte Feldwert ""Wiederholung an Tag von Monat"" eingeben"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Kurs, zu dem die Kundenwährung in die Basiswährung des Kunden umgerechnet wird"
-DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verfügbar in Stückliste, Lieferschein, Eingangsrechnung, Fertigungsauftrag, Einkaufsauftrag, Eingangslieferschein, Ausgangsrechnung, Kundenauftrag, Lagerbuchung, Zeiterfassung"
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verfügbar in Stückliste, Lieferschein, Eingangsrechnung, Fertigungsauftrag, Einkaufsauftrag, Kaufbeleg, Ausgangsrechnung, Kundenauftrag, Lagerbuchung, Zeiterfassung"
 DocType: Item Tax,Tax Rate,Steuersatz
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Artikel auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Artikel auswählen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",Der chargenweise verwaltete Artikel: {0} kann nicht mit dem Lager abgeglichen werden. Stattdessen Lagerbuchung verwenden
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} ist bereits versendet
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} ist bereits versendet
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,In nicht-Gruppe umwandeln
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Eingangslieferschein muss versendet werden
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kaufbeleg muss versendet werden
 DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuelle Lagermaßeinheit
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Charge (Los) eines Artikels.
 DocType: C-Form Invoice Detail,Invoice Date,Rechnungsdatum
 DocType: GL Entry,Debit Amount,Soll-Betrag
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ihre E-Mail-Adresse
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Bitte Anhang beachten
 DocType: Purchase Order,% Received,% erhalten
@@ -360,7 +360,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Anweisungen
 DocType: Quality Inspection,Inspected By,Geprüft von
 DocType: Maintenance Visit,Maintenance Type,Wartungstyp
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Seriennummer {0} gehört nicht zu Lieferschein {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Seriennummer {0} gehört nicht zu Lieferschein {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parameter der Artikel-Qualitätsprüfung
 DocType: Leave Application,Leave Approver Name,Name des Urlaubsgenehmigers
 ,Schedule Date,Geplantes Datum
@@ -372,14 +372,14 @@ DocType: Currency Exchange,Currency Exchange,Währungs-Umrechnung
 DocType: Purchase Invoice Item,Item Name,Artikelname
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Guthabenüberschuss
 DocType: Employee,Widowed,Verwitwet
-DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Anzufragende Artikel basierend auf prognostizierter Menge und Mindestbestellmenge, die in keinem Lager vorrätig sind."
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Anzufragende Artikel, die in keinem Lager vorrätig sind, ermittelt auf Basis der prognostizierten und der Mindestbestellmenge"
 DocType: Workstation,Working Hours,Arbeitszeit
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Startnummer/aktuelle laufende Nummer einer bestehenden Serie ändern.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Wenn mehrere Preisregeln weiterhin gleichrangig gelten, werden die Benutzer aufgefordert, Vorrangregelungen manuell zu erstellen, um den Konflikt zu lösen."
 ,Purchase Register,Übersicht über Einkäufe
 DocType: Landed Cost Item,Applicable Charges,Anfallende Gebühren
 DocType: Workstation,Consumable Cost,Verbrauchskosten
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
 DocType: Purchase Receipt,Vehicle Date,Fahrzeug-Datum
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medizinisch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Grund für das Verlieren
@@ -400,6 +400,7 @@ DocType: Delivery Note,% Installed,% installiert
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Bitte zuerst den Firmennamen angeben
 DocType: BOM,Item Desription,Artikelbeschreibung
 DocType: Purchase Invoice,Supplier Name,Lieferantenname
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lesen Sie das Handbuch ERPNext
 DocType: Account,Is Group,Ist Gruppe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisch Seriennummern auf Basis FIFO einstellen
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Aktivieren, damit dieselbe Lieferantenrechnungsnummer nur einmal vorkommen kann"
@@ -415,13 +416,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Hauptvertriebslei
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Allgemeine Einstellungen für alle Fertigungsprozesse.
 DocType: Accounts Settings,Accounts Frozen Upto,Konten gesperrt bis
 DocType: SMS Log,Sent On,Gesendet am
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
 DocType: Sales Order,Not Applicable,Nicht anwendbar
-apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Vorlage Ferien.
+apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Stammdaten zum Urlaub.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Maskenformverfahren
 DocType: Material Request Item,Required Date,Angefragtes Datum
 DocType: Delivery Note,Billing Address,Rechnungsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Bitte die Artikelnummer eingeben
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Bitte die Artikelnummer eingeben
 DocType: BOM,Costing,Kalkulation
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Wenn aktiviert, wird der Steuerbetrag als bereits in den Druckkosten enthalten erachtet."
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gesamtmenge
@@ -444,7 +445,7 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Zeit zwischen
 DocType: Customer,Buyer of Goods and Services.,Käufer von Waren und Dienstleistungen.
 DocType: Journal Entry,Accounts Payable,Verbindlichkeiten
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Abonnenten hinzufügen
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" Existiert nicht"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Existiert nicht"
 DocType: Pricing Rule,Valid Upto,Gültig bis
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Erträge
@@ -452,24 +453,23 @@ apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can n
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,"Administrativer Benutzer
 "
 DocType: Payment Tool,Received Or Paid,Erhalten oder bezahlt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Bitte Firma auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Bitte Firma auswählen
 DocType: Stock Entry,Difference Account,Differenzkonto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Aufgabe kann nicht geschlossen werden, da die von ihr abhängige Aufgabe {0} nicht geschlossen ist."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
 DocType: Production Order,Additional Operating Cost,Zusätzliche Betriebskosten
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
 DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
 DocType: Communication,Subject,Betreff
 DocType: Shipping Rule,Net Weight,Nettogewicht
 DocType: Employee,Emergency Phone,Notruf
 ,Serial No Warranty Expiry,Ablaufdatum der Garantie zu Seriennummer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Wollen Sie diese Materialanfrage wirklich ANHALTEN?
 DocType: Sales Order,To Deliver,Auszuliefern
 DocType: Purchase Invoice Item,Item,Artikel
 DocType: Journal Entry,Difference (Dr - Cr),Differenz (Soll - Haben)
 DocType: Account,Profit and Loss,Gewinn und Verlust
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Unterbeauftragung verwalten
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Unterbeauftragung verwalten
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Neue Maßeinheit darf NICHT vom Typ ganze Zahl sein
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Möbel und Anbauteile
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Unternehmens umgerechnet wird"
@@ -490,18 +490,18 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Hinzufügen/Bearbeiten vo
 DocType: Purchase Invoice,Supplier Invoice No,Lieferantenrechnungsnr.
 DocType: Territory,For reference,Zu Referenzzwecken
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Die Seriennummer {0} kann nicht gelöscht werden, da sie in Lagertransaktionen verwendet wird"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Schlußstand (Haben)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Schlußstand (Haben)
 DocType: Serial No,Warranty Period (Days),Gewährleistungsfrist (Tage)
 DocType: Installation Note Item,Installation Note Item,Bestandteil des Installationshinweises
 ,Pending Qty,Ausstehend Menge
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Ignorieren
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS an folgende Nummern versendet: {0} 
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Eingangslieferschein aus Unteraufträgen
+apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Kaufbeleg aus Unteraufträgen
 DocType: Pricing Rule,Valid From,Gültig ab
 DocType: Sales Invoice,Total Commission,Gesamtprovision
 DocType: Pricing Rule,Sales Partner,Vertriebspartner
-DocType: Buying Settings,Purchase Receipt Required,Eingangslieferschein notwendig
+DocType: Buying Settings,Purchase Receipt Required,Kaufbeleg notwendig
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","""Monatsweise Verteilung"" hilft dabei das Budget über Monate zu verteilen, wenn es im Unternehmen saisonale Einflüsse gibt.
@@ -512,7 +512,7 @@ apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanz-
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Verzeihung! Seriennummern können nicht zusammengeführt werden,"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Kundenauftrag erstellen
 DocType: Project Task,Project Task,Projektaufgabe
-,Lead Id,ID des Interessenten
+,Lead Id,Lead-ID
 DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
 DocType: About Us Settings,Website Manager,Webseiten-Administrator
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Das Startdatum des Geschäftsjahres sollte nicht nach dem Enddatum des Gschäftsjahres liegen
@@ -523,8 +523,9 @@ DocType: Sales Order,Billing and Delivery Status,Abrechnungs- und Lieferstatus
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Kunden wiederholen
 DocType: Leave Control Panel,Allocate,Zuweisen
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Vorhergehende
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Umsatzrendite
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Umsatzrendite
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Kundenaufträge auswählen, aus denen Fertigungsaufträge erstellt werden sollen."
+DocType: Item,Delivered by Supplier (Drop Ship),Vom Lieferanten gelieferten (Tropfen-Schiff)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Gehaltskomponenten
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank von potentiellen Kunden.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundendatenbank
@@ -535,7 +536,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Stürzen
 DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ein logisches Lager zu dem Lagerbuchungen gemacht werden.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenznr. & Referenz-Tag sind erforderlich für {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenznr. & Referenz-Tag sind erforderlich für {0}
 DocType: Event,Wednesday,Mittwoch
 DocType: Sales Invoice,Customer's Vendor,Kundenlieferant
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Fertigungsauftrag ist zwingend erforderlich
@@ -563,13 +564,13 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pri
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Bitte das Dropbox-Python-Modul installieren
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Leiter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,von Eingangslieferschein
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Von Kaufbeleg
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
 DocType: SMS Settings,Receiver Parameter,Empfängerparameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""basierend auf"" und ""guppiert nach"" können nicht gleich sein"
 DocType: Sales Person,Sales Person Targets,Ziele für Vertriebsmitarbeiter
-sites/assets/js/form.min.js +271,To,An
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Bitte eine E-Mail-Adresse angeben
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,An
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Bitte eine E-Mail-Adresse angeben
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Abschliessende Rohrbearbeitung
 DocType: Production Order Operation,In minutes,In Minuten
 DocType: Issue,Resolution Date,Beschluss-Datum
@@ -586,7 +587,7 @@ DocType: Activity Cost,Projects User,Projektanwender
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Verbraucht
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nicht in der Rechnungs-Details-Tabelle gefunden
 DocType: Company,Round Off Cost Center,Abschluss-Kostenstelle
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Stornierung dieses Kundenauftrages abgebrochen werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Stornierung dieses Kundenauftrages abgebrochen werden
 DocType: Material Request,Material Transfer,Materialübertrag
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Anfangsstand (Soll)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Buchungszeitstempel muss nach {0} liegen
@@ -594,9 +595,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Einstellungen
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Einstandspreis Steuern und Gebühren
 DocType: Production Order Operation,Actual Start Time,Tatsächliche Startzeit
 DocType: BOM Operation,Operation Time,Zeit für einen Arbeitsgang
-sites/assets/js/list.min.js +5,More,Weiter
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Weiter
 DocType: Pricing Rule,Sales Manager,Vertriebsleiter
-sites/assets/js/desk.min.js +7673,Rename,Umbenennen
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Umbenennen
 DocType: Journal Entry,Write Off Amount,Abschreibungs-Betrag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Beugung
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Benutzer zulassen
@@ -612,13 +613,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Direktscheren
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Wird verwendet, um einen Artikel in Einkaufs-und Verkaufsdokumenten auf der Grundlage ihrer Seriennummern nachzuverfolgen. Diese Funktion kann auch verwendet werden, um die Einzelheiten zum Garantiefall des Produktes mit zu protokollieren."
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktueller Lagerbestand
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Ausschusslager ist zwingend erfoderlich für Ausschuss-Artikel
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Ausschusslager ist zwingend erfoderlich für Ausschuss-Artikel
 DocType: Account,Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
 DocType: Employee,Provide email id registered in company,Geben Sie die in der Firma registrierte E-Mail-ID an
 DocType: Hub Settings,Seller City,Stadt des Verkäufers
 DocType: Email Digest,Next email will be sent on:,Nächste E-Mail wird gesendet am:
 DocType: Offer Letter Term,Offer Letter Term,Gültigkeit des Angebotsschreibens
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Artikel hat Varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} nicht gefunden
 DocType: Bin,Stock Value,Lagerwert
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Struktur-Typ
@@ -633,17 +634,16 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Willkommen
 DocType: Journal Entry,Credit Card Entry,Kreditkarten-Buchung
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Aufgaben-Betreff
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Von Lieferanten erhaltene Ware.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Von Lieferanten erhaltene Ware.
 DocType: Communication,Open,Öffnen
 DocType: Lead,Campaign Name,Kampagnenname
 ,Reserved,Reserviert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Wollen Sie wirklich FORTSETZEN
 DocType: Purchase Order,Supply Raw Materials,Rohmaterial bereitstellen
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Versand."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Umlaufvermögen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} ist kein Lagerartikel
 DocType: Mode of Payment Account,Default Account,Standardkonto
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"""Interessent"" muss eingestellt werden, wenn eine ""Chance"" aus dem Interessenten entsteht"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Lead muss eingestellt werden, wenn eine Opportunity aus dem Lead entsteht"
 DocType: Contact Us Settings,Address Title,Adressen-Bezeichnung
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Bitte die wöchentlichen Auszeittage auswählen
 DocType: Production Order Operation,Planned End Time,Geplante Endzeit
@@ -653,9 +653,9 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Kundenauftrags-Nr
 DocType: Employee,Cell Number,Mobiltelefonnummer
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Journalbuchung"" eingegeben werden"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Journalbuchung"" eingegeben werden"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
-DocType: Opportunity,Opportunity From,Vertriebschance von
+DocType: Opportunity,Opportunity From,Opportunity von
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Monatliche Gehaltsabrechnung
 DocType: Item Group,Website Specifications,Webseiten-Spezifikationen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Neues Konto
@@ -666,7 +666,7 @@ DocType: ToDo,High,Hoch
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Stückliste kann nicht deaktiviert oder storniert werden, weil sie mit anderen Stücklisten verknüpft ist"
 DocType: Opportunity,Maintenance,Wartung
 DocType: User,Male,Männlich
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Eingangslieferscheinnummer ist für Artikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kaufbelegnummer ist für Artikel {0} erforderlich
 DocType: Item Attribute Value,Item Attribute Value,Attributwert des Artikels
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Vertriebskampagnen.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -712,7 +712,7 @@ DocType: Employee,Bank A/C No.,Bankkonto-Nr.
 DocType: Expense Claim,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Ablesung 7
 DocType: Address,Personal,Persönlich
-DocType: Expense Claim Detail,Expense Claim Type,Spesenabrechnungstyp
+DocType: Expense Claim Detail,Expense Claim Type,Art der Spesenabrechnung
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardeinstellungen für den Warenkorb
 apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journalbuchung {0} ist mit Bestellung {1} verknüpft. Bitte prüfen, ob in dieser Rechnung ""Vorkasse"" angedruckt werden soll."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnologie
@@ -722,7 +722,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Haftung
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Genehmigter Betrag kann nicht größer als geforderter Betrag in Zeile {0} sein.
 DocType: Company,Default Cost of Goods Sold Account,Standard-Herstellkosten
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Preisliste nicht ausgewählt
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Preisliste nicht ausgewählt
 DocType: Employee,Family Background,Familiärer Hintergrund
 DocType: Process Payroll,Send Email,E-Mail absenden
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Keine Berechtigung
@@ -733,7 +733,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Stk
 DocType: Item,Items with higher weightage will be shown higher,Artikel mit höherem Gewicht werden weiter oben angezeigt
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ausführlicher Kontenabgleich
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Meine Rechnungen
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Kein Mitarbeiter gefunden
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Kein Mitarbeiter gefunden
 DocType: Purchase Order,Stopped,Angehalten
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,"Stückliste auswählen, um zu beginnen"
@@ -742,7 +742,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Lagerbest
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Jetzt senden
 ,Support Analytics,Support-Analyse
 DocType: Item,Website Warehouse,Webseiten-Lager
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Wollen Sie den folgenden Fertigungsauftrag wirklich anhalten:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Der Tag des Monats, an dem eine automatische Rechnung erstellt wird, z. B. 05, 28 usw."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punktzahl muß kleiner oder gleich 5 sein
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Kontakt-Formular Datensätze
@@ -752,12 +751,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Suppo
 DocType: Features Setup,"To enable ""Point of Sale"" features","Um ""Point of Sale""-Funktionen zu aktivieren"
 DocType: Bin,Moving Average Rate,Wert für den Gleitenden Durchschnitt
 DocType: Production Planning Tool,Select Items,Artikel auswählen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} zu Rechnung {1} ​​vom {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} zu Rechnung {1} ​​vom {2}
 DocType: Comment,Reference Name,Referenzname
 DocType: Maintenance Visit,Completion Status,Fertigstellungsstatus
 DocType: Sales Invoice Item,Target Warehouse,Eingangslager
 DocType: Item,Allow over delivery or receipt upto this percent,Überlieferung bis zu diesem Prozentsatz zulassen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum des Kundenauftrags liegen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum des Kundenauftrags liegen
 DocType: Upload Attendance,Import Attendance,Import von Anwesenheiten
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikelgruppen
 DocType: Process Payroll,Activity Log,Aktivitätsprotokoll
@@ -765,7 +764,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisch beim Versand von Transaktionen Mitteilung verfassen.
 DocType: Production Order,Item To Manufacture,Zu fertigender Artikel
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Kokillengussverfahren
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Bestellung an Zahlungs
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Bestellung an Zahlungs
 DocType: Sales Order Item,Projected Qty,Voraussichtliche Menge
 DocType: Sales Invoice,Payment Due Date,Zahlungsstichtag
 DocType: Newsletter,Newsletter Manager,Newsletter-Manager
@@ -774,7 +774,7 @@ apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""
 DocType: Notification Control,Delivery Note Message,Lieferschein-Nachricht
 DocType: Expense Claim,Expenses,Ausgaben
 DocType: Item Variant Attribute,Item Variant Attribute,Artikelvariantenattribut
-,Purchase Receipt Trends,Entwicklung Eingangslieferscheine
+,Purchase Receipt Trends,Trandanalyse Kaufbelege
 DocType: Appraisal,Select template from which you want to get the Goals,"Vorlage auswählen, von der Sie die Ziele abrufen möchten"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forschung & Entwicklung
 ,Amount to Bill,Rechnungsbetrag
@@ -789,8 +789,8 @@ DocType: SMS Log,Requested Numbers,Angeforderte Nummern
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Mitarbeiterbeurteilung
 DocType: Sales Invoice Item,Stock Details,Lagerinformationen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projektwert
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Verkaufsstelle
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},{0} kann nicht fortgeschrieben werden
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Verkaufsstelle
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},{0} kann nicht fortgeschrieben werden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto bereits im Haben, es ist nicht mehr möglich das Konto als Sollkonto festzulegen"
 DocType: Account,Balance must be,Saldo muss sein
 DocType: Hub Settings,Publish Pricing,Preise veröffentlichen
@@ -809,11 +809,11 @@ DocType: Naming Series,Update Series,Serie aktualisieren
 DocType: Supplier Quotation,Is Subcontracted,Ist Untervergabe
 DocType: Item Attribute,Item Attribute Values,Artikel-Attributwerte
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Abonnenten anzeigen
-DocType: Purchase Invoice Item,Purchase Receipt,Eingangslieferschein
+DocType: Purchase Invoice Item,Purchase Receipt,Kaufbeleg
 ,Received Items To Be Billed,"Empfangene Artikel, die in Rechnung gestellt werden"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Schleifstrahlen
-sites/assets/js/desk.min.js +3938,Ms,Fr.
-apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Wechselkurs-Vorlage.
+DocType: Employee,Ms,Fr.
+apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Stammdaten zur Währungsumrechnung.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},In den nächsten {0} Tagen kann für den Arbeitsgang {1} kein Zeitfenster gefunden werden
 DocType: Production Order,Plan material for sub-assemblies,Materialplanung für Unterbaugruppen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,Stückliste {0} muss aktiv sein
@@ -831,46 +831,49 @@ apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish t
 DocType: GL Entry,Account Currency,Währung
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Bitte Abschlusskonto in Firma vermerken
 DocType: Purchase Receipt,Range,Bandbreite
-DocType: Supplier,Default Payable Accounts,Standard-Kreditorenkonten
+DocType: Supplier,Default Payable Accounts,Standard-Verbindlichkeitenkonten
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
 DocType: Features Setup,Item Barcode,Artikelstrichcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
 DocType: Quality Inspection Reading,Reading 6,Ablesung 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Eingangsrechnung Vorkasse
 DocType: Address,Shop,Laden
 DocType: Hub Settings,Sync Now,Jetzt synchronisieren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank-/Geldkonto wird automatisch in Kassenbon aktualisiert, wenn dieser Modus ausgewählt ist."
 DocType: Employee,Permanent Address Is,Feste Adresse ist
 DocType: Production Order Operation,Operation completed for how many finished goods?,Für wie viele fertige Erzeugnisse wurde der Arbeitsgang abgeschlossen?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Die Marke
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Zustimmung für Artikel {1} bei Überschreitung von {0}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Zustimmung für Artikel {1} bei Überschreitung von {0}.
 DocType: Employee,Exit Interview Details,Befragungs-Details verlassen
 DocType: Item,Is Purchase Item,Ist Einkaufsartikel
 DocType: Journal Entry Account,Purchase Invoice,Eingangsrechnung
 DocType: Stock Ledger Entry,Voucher Detail No,Belegdetail-Nr.
 DocType: Stock Entry,Total Outgoing Value,Gesamtwert Auslieferungen
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Eröffnungsdatum und Abschlussdatum sollte im gleichen Geschäftsjahr sein
 DocType: Lead,Request for Information,Informationsanfrage
 DocType: Payment Tool,Paid,Bezahlt
 DocType: Salary Slip,Total in words,Summe in Worten
 DocType: Material Request Item,Lead Time Date,Lieferzeit und -datum
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,ist obligatorisch. Vielleicht Devisenwechsel Datensatz nicht für erstellt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Zeile #{0}: Bitte Seriennummer für Artikel {1} angeben
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Für Artikel aus ""Produkt-Bundles"" werden Lager, Seriennummer und Chargennummer aus der Tabelle ""Packliste"" berücksichtigt. Wenn Lager und Chargennummer für alle Packstücke in jedem Artikel eines Produkt-Bundles gleich sind, können diese Werte in die Tabelle ""Hauptpositionen"" eingetragen werden, Die Werte werden in die Tabelle ""Packliste"" kopiert."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Lieferungen an Kunden.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Lieferungen an Kunden.
 DocType: Purchase Invoice Item,Purchase Order Item,Lieferantenauftrags-Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Erträge
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,"""Zahlungsbetrag = Ausstehender Betrag"" setzen"
-DocType: Contact Us Settings,Address Line 1,Adresszeile 1
+DocType: Contact Us Settings,Address Line 1,Adresse Zeile 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Abweichung
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmenname
 DocType: SMS Center,Total Message(s),Summe Nachricht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Sehen Sie sich eine Liste aller Hilfe-Videos
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Bezeichnung des Kontos bei der Bank, bei der der Scheck eingereicht wurde, auswählen."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Benutzer erlauben, die Preisliste zu Transaktionen zu bearbeiten"
 DocType: Pricing Rule,Max Qty,Max Menge
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Verkaufs-/Einkaufs-Bestellung"" sollte immer als ""Vorkasse"" eingestellt werden"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Verkaufs-/Einkaufs-Bestellung"" sollte immer als ""Vorkasse"" eingestellt werden"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemische Industrie
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
 DocType: Process Payroll,Select Payroll Year and Month,Jahr und Monat der Gehaltsabrechnung auswählen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Zur entsprechenden Gruppe gehen (normalerweise ""Mittelverwendung"" > ""Umlaufvermögen""  > ""Bankkonten"") und durck Klicken auf ""Unterpunkt hinzufügen"" ein neues Konto vom Typ ""Bank"" erstellen"
 DocType: Workstation,Electricity Cost,Stromkosten
@@ -882,10 +885,10 @@ apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Fina
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Übergeben
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Weiß
-DocType: SMS Center,All Lead (Open),Alle Interessenten (offen)
+DocType: SMS Center,All Lead (Open),Alle Leads (offen)
 DocType: Purchase Invoice,Get Advances Paid,Gezahlte Anzahlungen aufrufen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Fügen Sie Ihr Bild hinzu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Erstellen
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Eigenes Bild anhängen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Erstellen
 DocType: Journal Entry,Total Amount in Words,Gesamtsumme in Worten
 DocType: Workflow State,Stop,Anhalten
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Es ist ein Fehler aufgetreten. Ein möglicher Grund könnte sein, dass Sie das Formular nicht gespeichert haben. Bitte kontaktieren Sie support@erpnext.com wenn das Problem weiterhin besteht."
@@ -903,13 +906,13 @@ DocType: Leave Block List,Leave Block List Dates,Urlaubssperrenliste Termine
 DocType: Company,If Monthly Budget Exceeded (for expense account),Wenn das monatliche Budget überschritten ist (für Aufwandskonto)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Zuschnitt
 DocType: Workstation,Net Hour Rate,Nettostundensatz
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Einstandspreis-Eingangslieferschein
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Einstandspreis-Kaufbeleg
 DocType: Company,Default Terms,Standardbedingungen
 DocType: Packing Slip Item,Packing Slip Item,Position auf dem Packzettel
 DocType: POS Profile,Cash/Bank Account,Kassen-/Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt.
 DocType: Delivery Note,Delivery To,Lieferung an
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
 DocType: Production Planning Tool,Get Sales Orders,Kundenaufträge aufrufen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kann nicht negativ sein
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Feilen
@@ -920,12 +923,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"Wird nur dann
 DocType: Project,Internal,Intern
 DocType: Task,Urgent,Dringend
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Bitte eine gültige Zeilen-ID für die Zeile {0} in Tabelle {1} angeben
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gehen Sie auf die Desktop-und starten Sie mit ERPNext
 DocType: Item,Manufacturer,Hersteller
-DocType: Landed Cost Item,Purchase Receipt Item,Eingangslieferschein-Artikel
+DocType: Landed Cost Item,Purchase Receipt Item,Kaufbeleg-Artikel
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Lager im Kundenauftrag reserviert / Fertigwarenlager
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Verkaufsbetrag
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Zeitprotokolle
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sie sind der Ausgabenbewilliger für diesen Datensatz. Bitte aktualisieren Sie den ""Status"" und speichern Sie ihn ab"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sie sind der Ausgabenbewilliger für diesen Datensatz. Bitte aktualisieren Sie den ""Status"" und speichern Sie ihn ab"
 DocType: Serial No,Creation Document No,Belegerstellungs-Nr.
 DocType: Issue,Issue,Anfrage
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attribute für Artikelvarianten, z. B. Größe, Farbe usw."
@@ -934,23 +938,24 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: BOM Operation,Operation,Arbeitsgang
 DocType: Lead,Organization Name,Firmenname
 DocType: Tax Rule,Shipping State,Versandstatus
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Artikel müssen über die Schaltfläche ""Artikel von Eingangslieferschein übernehmen"" hinzugefügt werden"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Artikel müssen über die Schaltfläche ""Artikel von Kaufbeleg übernehmen"" hinzugefügt werden"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Vertriebskosten
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard-Kauf
 DocType: GL Entry,Against,Zu
 DocType: Item,Default Selling Cost Center,Standard-Vertriebskostenstelle
 DocType: Sales Partner,Implementation Partner,Umsetzungspartner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} ist {1}
 DocType: Opportunity,Contact Info,Kontakt-Information
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Lagerbuchungen erstellen
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Lagerbuchungen erstellen
 DocType: Packing Slip,Net Weight UOM,Nettogewichtmaßeinheit
 DocType: Item,Default Supplier,Standardlieferant
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Prozensatz erlaubter Überproduktion
 DocType: Shipping Rule Condition,Shipping Rule Condition,Versandbedingung
 DocType: Features Setup,Miscelleneous,Sonstiges
 DocType: Holiday List,Get Weekly Off Dates,Wöchentliche Abwesenheitstermine abrufen
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Enddatum kann nicht kleiner als Startdatum sein
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Enddatum kann nicht vor Startdatum liegen
 DocType: Sales Person,Select company name first.,Zuerst den Firmennamen auswählen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Soll
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Soll
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Angebote von Lieferanten
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},An {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,Aktualisiert über Zeitprotokolle
@@ -978,7 +983,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Meldenummern des Unternehmens für Ihre Unterlagen. Steuernummern usw.
 DocType: Sales Partner,Distributor,Lieferant
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Warenkorb-Versandregel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages abgebrochen werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages abgebrochen werden
 ,Ordered Items To Be Billed,"Bestellte Artikel, die abgerechnet werden müssen"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Von-Bereich muss kleiner sein als Bis-Bereich
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,"Bitte Zeitprotokolle auswählen und versenden, um eine neue Ausgangsrechnung zu erstellen."
@@ -986,7 +991,7 @@ DocType: Global Defaults,Global Defaults,Allgemeine Voreinstellungen
 DocType: Salary Slip,Deductions,Abzüge
 DocType: Purchase Invoice,Start date of current invoice's period,Startdatum der laufenden Rechnungsperiode
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Dieser Zeitprotokollstapel wurde abgerechnet.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Vertriebschance erstellen
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opportunity erstellen
 DocType: Salary Slip,Leave Without Pay,Unbezahlter Urlaub
 DocType: Supplier,Communications,Kommunikationswesen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Fehler in der Kapazitätsplanung
@@ -1023,14 +1028,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ihr Vertriebsmitarbeiter erhält an diesem Datum eine Erinnerung, den Kunden zu kontaktieren"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Weitere Konten können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Steuer und sonstige Gehaltsabzüge
-DocType: Lead,Lead,Interessent
+DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Verbindlichkeiten
 DocType: Account,Warehouse,Lager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
 ,Purchase Order Items To Be Billed,Abzurechnende Lieferantenauftrags-Artikel
 DocType: Purchase Invoice Item,Net Rate,Nettopreis
 DocType: Purchase Invoice Item,Purchase Invoice Item,Eingangsrechnungs-Artikel
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Buchungen auf das Lagerbuch und Hauptbuch-Buchungen werden für die gewählten Eingangslieferscheine umgebucht
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Buchungen auf das Lagerbuch und Hauptbuch-Buchungen werden für die gewählten Kaufbelege umgebucht
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Artikel 1
 DocType: Holiday,Holiday,Urlaub
 DocType: Event,Saturday,Samstag
@@ -1041,11 +1046,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Nicht abgeglichene
 DocType: Global Defaults,Current Fiscal Year,Laufendes Geschäftsjahr
 DocType: Global Defaults,Disable Rounded Total,Gerundete Gesamtsumme deaktivieren
 DocType: Lead,Call,Anruf
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Doppelte Zeile {0} mit dem gleichen {1}
 ,Trial Balance,Probebilanz
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Mitarbeiter einrichten
-sites/assets/js/erpnext.min.js +5,"Grid ""","Verzeichnis """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Mitarbeiter einrichten
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Verzeichnis """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Bitte zuerstPräfix auswählen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forschung
 DocType: Maintenance Visit Purpose,Work Done,Arbeit erledigt
@@ -1055,14 +1060,15 @@ DocType: Communication,Sent,Verschickt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Hauptbuch anzeigen
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Frühestens
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
 DocType: Communication,Delivery Status,Lieferstatus
 DocType: Production Order,Manufacture against Sales Order,Herstellung laut Kundenauftrag
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Rest der Welt
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Rest der Welt
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Der Artikel {0} kann keine Charge haben
 ,Budget Variance Report,Budget-Abweichungsbericht
 DocType: Salary Slip,Gross Pay,Bruttolohn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Ausgeschüttete Dividenden
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Hauptbuch
 DocType: Stock Reconciliation,Difference Amount,Differenzmenge
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Gewinnrücklagen
 DocType: BOM Item,Item Description,Artikelbeschreibung
@@ -1072,19 +1078,21 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct
 DocType: Purchase Order,Supplied Items,Gelieferte Artikel
 DocType: Production Order,Qty To Manufacture,Herzustellende Menge
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Gleiche Preise während des gesamten Einkaufszyklus beibehalten
-DocType: Opportunity Item,Opportunity Item,Gelegenheitsartikel
+DocType: Opportunity Item,Opportunity Item,Opportunity-Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Temporäre Eröffnungskonten
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryogenwalzen
 ,Employee Leave Balance,Mitarbeiter-Urlaubskonto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Saldo für Konto {0} muss immer {1} sein
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo für Konto {0} muss immer {1} sein
 DocType: Address,Address Type,Adresstyp
 DocType: Purchase Receipt,Rejected Warehouse,Ausschusslager
 DocType: GL Entry,Against Voucher,Gegenbeleg
 DocType: Item,Default Buying Cost Center,Standard-Einkaufskostenstelle
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Um das Beste aus ERPNext zu bekommen, empfehlen wir Ihnen, einige Zeit dauern, und beobachten Sie diese Hilfe-Videos."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Artikel {0} muss ein Verkaufsartikel sein
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,nach
 DocType: Item,Lead Time in days,Lieferzeit in Tagen
 ,Accounts Payable Summary,Übersicht der Verbindlichkeiten
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Keine Berechtigung gesperrtes Konto {0} zu bearbeiten
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Keine Berechtigung gesperrtes Konto {0} zu bearbeiten
 DocType: Journal Entry,Get Outstanding Invoices,Ausstehende Rechnungen aufrufen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
@@ -1100,7 +1108,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Ausstellungsort
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Vertrag
 DocType: Report,Disabled,Deaktiviert
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Maßeinheit-Umrechnungsfaktor ist erforderlich für Maßeinheit: {0} bei Artikel: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Maßeinheit-Umrechnungsfaktor ist erforderlich für Maßeinheit: {0} bei Artikel: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte Aufwendungen
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Zeile {0}: Menge ist zwingend erforderlich
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landwirtschaft
@@ -1109,13 +1117,13 @@ DocType: Mode of Payment,Mode of Payment,Zahlungsweise
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden.
 DocType: Journal Entry Account,Purchase Order,Lieferantenauftrag
 DocType: Warehouse,Warehouse Contact Info,Kontaktinformation des Lager
-sites/assets/js/form.min.js +190,Name is required,Name ist erforderlich
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Name ist erforderlich
 DocType: Purchase Invoice,Recurring Type,Wiederkehrender Typ
 DocType: Address,City/Town,Stadt/Ort
 DocType: Email Digest,Annual Income,Jährliches Einkommen
 DocType: Serial No,Serial No Details,Details zur Seriennummer
 DocType: Purchase Invoice Item,Item Tax Rate,Artikelsteuersatz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",Für {0} können nur Habenkonten mit einer weiteren Sollbuchung verknüpft werden
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",Für {0} können nur Habenkonten mit einer weiteren Sollbuchung verknüpft werden
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht versendet
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Betriebsvermögen
@@ -1126,14 +1134,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Ziel
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Voraussichtlicher Liefertermin liegt vor dem geplanten Starttermin.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Für Lieferant
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Für Lieferant
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Das Festlegen des Kontotyps hilft bei der Auswahl dieses Kontos bei Transaktionen.
 DocType: Purchase Invoice,Grand Total (Company Currency),Gesamtbetrag (Firmenwährung)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Summe Auslieferungen
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Es kann nur eine Versandbedingung mit dem Wert ""0"" oder ""leer"" für ""Bis-Wert"" geben"
 DocType: Authorization Rule,Transaction,Transaktion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Hinweis: Diese Kostenstelle ist eine Gruppe. Buchungen können nicht zu Gruppen erstellt werden.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Werkzeuge
+apps/frappe/frappe/config/desk.py +7,Tools,Werkzeuge
 DocType: Item,Website Item Groups,Webseiten-Artikelgruppen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Eine Fertigungsauftragsnummer ist für Lagerbuchungen zu Einlagerungen aus der Fertigung zwingend erforderlich
 DocType: Purchase Invoice,Total (Company Currency),Gesamtsumme (Firmenwährung)
@@ -1143,7 +1151,7 @@ DocType: Workstation,Workstation Name,Name des Arbeitsplatzes
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-Mail-Zusammenfassung:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
 DocType: Sales Partner,Target Distribution,Aufteilung der Zielvorgaben
-sites/assets/js/desk.min.js +7652,Comments,Kommentare
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentare
 DocType: Salary Slip,Bank Account No.,Bankkonto-Nr.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dies ist die Nummer der letzten erstellten Transaktion mit diesem Präfix
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Wertansatz für Artikel {0} benötigt
@@ -1158,27 +1166,27 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Bitte wähle
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Bevorzugter Urlaub
 DocType: Purchase Invoice,Supplier Invoice Date,Lieferantenrechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sie müssen Ihren Einkaufswagen aktivieren.
-sites/assets/js/form.min.js +212,No Data,Keine Daten
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Keine Daten
 DocType: Appraisal Template Goal,Appraisal Template Goal,Bewertungsvorlage zur Zielorientierung
-DocType: Salary Slip,Earning,Gewinn
+DocType: Salary Slip,Earning,Einkommen
 DocType: Payment Tool,Party Account Currency,Gruppenkonten-Währung
 ,BOM Browser,Stücklisten-Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Addieren/Subtrahieren
 DocType: Company,If Yearly Budget Exceeded (for expense account),Wenn das jährliche Budget überschritten ist (für Aufwandskonto)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Überlagernde Bedingungen gefunden zwischen:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,"""Zu Journalbuchung"" {0} ist bereits mit einem anderen Beleg abgeglichen"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,"""Zu Journalbuchung"" {0} ist bereits mit einem anderen Beleg abgeglichen"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Gesamtbestellwert
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Lebensmittel
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Alter Bereich 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Ein Zeitprotokoll kann nur zu einem versendeten Fertigungsauftrag erstellt werden
 DocType: Maintenance Schedule Item,No of Visits,Anzahl der Besuche
 DocType: File,old_parent,Altes übergeordnetes Element
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter an Kontakte und Interessenten.
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter an Kontakte und Leads.
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Währung des Closing Konto muss {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summe der Punkte für alle Ziele sollte 100 sein. Aktueller Stand {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,"""Arbeitsvorbereitung"" kann nicht leer sein."
 ,Delivered Items To Be Billed,Gelieferte Artikel zur Abrechnung
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kann für Seriennummer nicht geändert werden
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status aktualisiert auf {0}
 DocType: DocField,Description,Beschreibung
 DocType: Authorization Rule,Average Discount,Durchschnittlicher Rabatt
 DocType: Letter Head,Is Default,Ist Standard
@@ -1206,7 +1214,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Artikelsteuerbetrag
 DocType: Item,Maintain Stock,Lager verwalten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Es wurden bereits Lagerbuchungen zum Fertigungsauftrag erstellt
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Freilassen, wenn für alle Einstufungen gültig"
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Von Datetime
 DocType: Email Digest,For Company,Für Firma
@@ -1216,7 +1224,7 @@ DocType: Sales Invoice,Shipping Address Name,Lieferadresse
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontenplan
 DocType: Material Request,Terms and Conditions Content,Allgemeine Geschäftsbedingungen Inhalt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
 DocType: Maintenance Visit,Unscheduled,Außerplanmäßig
 DocType: Employee,Owned,Im Besitz von
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Hängt von unbezahltem Urlaub ab
@@ -1229,7 +1237,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Status der Garantie / des jährlic
 DocType: GL Entry,GL Entry,Buchung zum Hauptbuch
 DocType: HR Settings,Employee Settings,Mitarbeitereinstellungen
 ,Batch-Wise Balance History,Stapelweise Kontostands-Historie
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Aufgabenliste
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Aufgabenliste
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Auszubildende(r)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Menge ist nicht erlaubt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1261,13 +1269,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Büromiete
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import fehlgeschlagen !
-sites/assets/js/erpnext.min.js +24,No address added yet.,Noch keine Adresse hinzugefügt.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Noch keine Adresse hinzugefügt.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeitsplatz-Arbeitsstunde
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich zu JV Menge {2} sein
 DocType: Item,Inventory,Lagerbestand
 DocType: Features Setup,"To enable ""Point of Sale"" view","Um die ""Point of Sale""-Ansicht zu aktivieren"
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Für einen leeren Einkaufswagen kann keine Zahlung getätigt werden
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Für einen leeren Einkaufswagen kann keine Zahlung getätigt werden
 DocType: Item,Sales Details,Verkaufsdetails
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning-Verfahren
 DocType: Opportunity,With Items,Mit Artikeln
@@ -1277,7 +1285,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Versand."
 DocType: Item Attribute,Item Attribute,Artikelattribut
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regierung
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Artikelvarianten
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Artikelvarianten
 DocType: Company,Services,Services
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Gesamtsumme ({0})
 DocType: Cost Center,Parent Cost Center,Übergeordnete Kostenstelle
@@ -1287,11 +1295,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Startdatum des Geschäftsjahres
 DocType: Employee External Work History,Total Experience,Gesamterfahrung
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Senken
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Packzettel storniert
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packzettel storniert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fracht- und Versandkosten
 DocType: Material Request Item,Sales Order No,Kundenauftrags-Nr.
 DocType: Item Group,Item Group Name,Name der Artikelgruppe
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Vorgenommen
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Vorgenommen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Material der Fertigung übergeben
 DocType: Pricing Rule,For Price List,Für Preisliste
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Direktsuche
@@ -1300,8 +1308,7 @@ DocType: Maintenance Schedule,Schedules,Zeitablaufpläne
 DocType: Purchase Invoice Item,Net Amount,Nettobetrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stückliste Detailnr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Zusätzlicher Rabatt (Firmenwährung)
-DocType: Period Closing Voucher,CoA Help,Hilfe zum Kontenplan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Fehler: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fehler: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Bitte neues Konto aus dem Kontenplan erstellen.
 DocType: Maintenance Visit,Maintenance Visit,Wartungsbesuch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde > Kundengruppe > Region
@@ -1312,6 +1319,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Hilfe zum Einstandpreis
 DocType: Event,Tuesday,Dienstag
 DocType: Leave Block List,Block Holidays on important days.,Urlaub an wichtigen Tagen sperren.
 ,Accounts Receivable Summary,Übersicht der Forderungen
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Blätter für Typ {0} für die Periode bereits für Employee {1} {2} zugeordnet - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Bitte in einem Mitarbeiterdatensatz das Feld Nutzer-ID setzen, um die Rolle Mitarbeiter zuzuweisen"
 DocType: UOM,UOM Name,Maßeinheit-Name
 DocType: Top Bar Item,Target,Ziel
@@ -1319,7 +1327,7 @@ apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_
 DocType: Sales Invoice,Shipping Address,Versandadresse
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Dieses Werkzeug hilft Ihnen dabei, die Menge und die Bewertung von Bestand im System zu aktualisieren oder zu ändern. Es wird in der Regel verwendet, um die Systemwerte und den aktuellen Bestand Ihrer Lager zu synchronisieren."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"""In Worten"" wird sichtbar, sobald Sie den Lieferschein speichern."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Vorlage zur (Handels-)Marke
+apps/erpnext/erpnext/config/stock.py +120,Brand master.,Stammdaten zur Marke
 DocType: ToDo,Due Date,Fälligkeitsdatum
 DocType: Sales Invoice Item,Brand Name,Bezeichnung der (Handels-)Marke
 DocType: Purchase Receipt,Transporter Details,Transporter-Details
@@ -1332,20 +1340,20 @@ DocType: Sales Partner,Sales Partner Target,Vertriebspartner-Ziel
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Eine Buchung für {0} kann nur in der Währung: {1} vorgenommen werden
 DocType: Pricing Rule,Pricing Rule,Preisregel
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Kerbung
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materialanforderung für Kaufauftrag
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materialanforderung für Kaufauftrag
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Zeile # {0}: Zurückgegebener Artikel {1} existiert nicht in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonten
 ,Bank Reconciliation Statement,Kontoauszug zum Kontenabgleich
-DocType: Address,Lead Name,Name des Interessenten
+DocType: Address,Lead Name,Name des Leads
 ,POS,Verkaufsstelle
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Anfangslagerbestand
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Anfangslagerbestand
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} darf nur einmal vorkommen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Übertragung von mehr {0} als {1} mit Einkaufsbestellung {2} nicht erlaubt
 "
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Erfolgreich zugewiesene Abwesenheiten für {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Erfolgreich zugewiesene Abwesenheiten für {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Keine Artikel zum Verpacken
 DocType: Shipping Rule Condition,From Value,Von-Wert
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Bei der Bank nicht berücksichtigte Beträge
 DocType: Quality Inspection Reading,Reading 4,Ablesung 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Ansprüche auf Kostenübernahme durch das Unternehmen.
@@ -1358,19 +1366,20 @@ DocType: Opportunity,Contact Mobile No,Kontakt-Mobiltelefonnummer
 DocType: Production Planning Tool,Select Sales Orders,Kundenaufträge auswählen
 ,Material Requests for which Supplier Quotations are not created,"Materialanfragen, für die keine Lieferantenangebote erstellt werden"
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Wird verwendet, um Artikel über den Barcode nachzuverfolgen. Durch das Scannen des Artikel-Barcodes können Artikel in einen Lieferschein und eine Ausgangsrechnung eingegeben werden."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Als Lieferung
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Angebot erstellen
 DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Arbeitsgänge für X Tage im Voraus planen.
 DocType: HR Settings,Stop Birthday Reminders,Geburtstagserinnerungen ausschalten
 DocType: SMS Center,Receiver List,Empfängerliste
 DocType: Payment Tool Detail,Payment Amount,Zahlungsbetrag
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbrauchte Menge
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Anzeigen
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Anzeigen
 DocType: Salary Structure Deduction,Salary Structure Deduction,Gehaltsstruktur-Abzug
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektives Lasersintern
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mengeneinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mengeneinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importvorgang erfolgreich!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Aufwendungen für in Umlauf gebrachte Artikel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
@@ -1379,19 +1388,19 @@ DocType: Quotation Item,Quotation Item,Angebotsposition
 DocType: Account,Account Name,Kontenname
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Von-Datum kann später liegen als Bis-Datum
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Seriennummer {0} mit Menge {1} kann nicht eine Teilmenge sein
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Stammdaten Lieferantentyp.
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Stammdaten zum Lieferantentyp.
 DocType: Purchase Order Item,Supplier Part Number,Artikelnummer Lieferant
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Hinzufügen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Umrechnungskurs kann nicht 0 oder 1 sein
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} wird abgebrochen oder gestoppt
 DocType: Accounts Settings,Credit Controller,Kredit-Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Datum des Versands mit dem Fahrzeug
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Eingangslieferschein {0} wurde nicht versendet
-DocType: Company,Default Payable Account,Standard-Kreditorenkonto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kaufbeleg {0} wurde nicht versendet
+DocType: Company,Default Payable Account,Standard-Verbindlichkeitenkonto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Einstellungen für Online-Warenkorb, wie Versandregeln, Preisliste usw."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Einrichtung abgeschlossen
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% berechnet
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reservierte Menge
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reservierte Menge
 DocType: Party Account,Party Account,Gruppenkonto
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Personalwesen
 DocType: Lead,Upper Income,Gehobenes Einkommen
@@ -1418,13 +1427,13 @@ DocType: Quotation,Term Details,Details der Geschäftsbedingungen
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapazitätsplanung für (Tage)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten.
 DocType: Warranty Claim,Warranty Claim,Garantieantrag
-,Lead Details,Einzelheiten zum Interessenten
+,Lead Details,Einzelheiten zum Lead
 DocType: Authorization Rule,Approving User,Genehmigender Benutzer
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Schmiedearbeit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Überzug
 DocType: Purchase Invoice,End date of current invoice's period,Schlußdatum der laufenden Eingangsrechnungsperiode
 DocType: Pricing Rule,Applicable For,Anwendbar für
-DocType: Bank Reconciliation,From Date,Von Datum
+DocType: Bank Reconciliation,From Date,Von-Datum
 DocType: Shipping Rule Country,Shipping Rule Country,Versandregel für Land
 DocType: Maintenance Visit,Partially Completed,Teilweise abgeschlossen
 DocType: Leave Type,Include holidays within leaves as leaves,Urlaube innerhalb von Abwesenheiten als Abwesenheiten mit einbeziehen
@@ -1434,11 +1443,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Warenkorb aktivieren
 DocType: Employee,Permanent Address,Feste Adresse
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Artikel {0} muss ein Dienstleistungsartikel sein.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
-						than Grand Total {2}",Vorgehen gegen {0} {1} kann nicht größer sein \ bezahlt als Gesamtsumme {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+						than Grand Total {2}",Anzahlung zu {0} {1} kann nicht größer sein als als Gesamtsumme {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Bitte Artikelnummer auswählen
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Abzug für unbezahlten Urlaub (LWP) vermindern
 DocType: Territory,Territory Manager,Gebietsleiter
+DocType: Delivery Note Item,To Warehouse (Optional),Um Warehouse (Optional)
 DocType: Sales Invoice,Paid Amount (Company Currency),Gezahlter Betrag (Firmenwährung)
 DocType: Purchase Invoice,Additional Discount,Zusätzlicher Rabatt
 DocType: Selling Settings,Selling Settings,Vertriebseinstellungen
@@ -1461,7 +1471,7 @@ DocType: Item,Weightage,Gewichtung
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Bergbau
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Gießharzverfahren
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Bitte zuerst {0} auswählen.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Bitte zuerst {0} auswählen.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Übergeordnete Region
 DocType: Quality Inspection Reading,Reading 2,Ablesung 2
@@ -1489,13 +1499,13 @@ DocType: Sales Invoice Item,Batch No,Chargennummer
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Können mehrere Kundenaufträge gegenüber einer Kundenbestellung
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Haupt
 DocType: DocPerm,Delete,Löschen
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
-sites/assets/js/desk.min.js +7971,New {0},Neu {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Neu {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,"Angehaltener Auftrag kann nicht abgebrochen werden. Bitte zuerst fortsetzen, um dann abzubrechen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Angehaltener Auftrag kann nicht abgebrochen werden. Bitte zuerst fortsetzen, um dann abzubrechen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
 DocType: Employee,Leave Encashed?,Urlaub eingelöst?
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Vertriebschancet von""-Feld ist zwingend erforderlich"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Feld ""Opportunity von"" ist zwingend erforderlich"
 DocType: Item,Variants,Varianten
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Einkaufsbestellung erstellen
 DocType: SMS Center,Send To,Senden an
@@ -1511,7 +1521,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adressen
 DocType: Communication,Received,Erhalten
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Journalbuchung"" {0} hat keine nicht-abgeglichenen {1} Buchungen"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Journalbuchung"" {0} hat nur abgeglichene {1} Buchungen"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Doppelte Seriennummer für Posten {0} eingegeben
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Bedingung für eine Versandregel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Artikel darf keinen Fertigungsauftrag haben.
@@ -1532,7 +1542,6 @@ DocType: Employee,Salutation,Anrede
 DocType: Communication,Rejected,Abgelehnt
 DocType: Pricing Rule,Brand,(Handels-)Marke
 DocType: Item,Will also apply for variants,Gilt auch für Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% geliefert
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Artikel zum Zeitpunkt des Verkaufs zusammenfassen.
 DocType: Sales Order Item,Actual Qty,Tatsächliche Anzahl
 DocType: Sales Invoice Item,References,Referenzen
@@ -1558,26 +1567,25 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity fo
 DocType: Leave Application,Apply / Approve Leaves,Urlaub eintragen/genehmigen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kann sich nur auf eine Zeile beziehen, wenn die Berechnungsart der Kosten entweder ""auf Betrag der vorherigen Zeile"" oder ""auf Gesamtbetrag der vorherigen Zeilen"" ist"
 DocType: Sales Order Item,Delivery Warehouse,Auslieferungslager
-DocType: Stock Settings,Allowance Percent,Zulassen Prozent
+DocType: Stock Settings,Allowance Percent,Zugelassener Prozentsatz
 DocType: SMS Settings,Message Parameter,Mitteilungsparameter
 DocType: Serial No,Delivery Document No,Lieferbelegnummer
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Artikel von Eingangslieferscheinen übernehmen
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Artikel vom Kaufbeleg übernehmen
 DocType: Serial No,Creation Date,Erstellungsdatum
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Artikel {0} erscheint mehrfach in Preisliste {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Vertrieb muss aktiviert werden, wenn ""Anwendbar auf"" ausgewählt ist bei {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Angebotsposition Lieferant
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Gehaltsübersicht erstellen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Scherverfahren
-DocType: Item,Has Variants,Varianten vorhanden
+DocType: Item,Has Variants,Hat Varianten
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Auf ""Ausgangsrechnung erstellen"" klicken, um eine neue Ausgangsrechnung zu erstellen."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,"""Periode von"" und ""Periode bis"" sind notwendig bei wiederkehrendem Eintrag %s"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Verpackung und Kennzeichnung
 DocType: Monthly Distribution,Name of the Monthly Distribution,Bezeichnung der monatsweisen Verteilung
 DocType: Sales Person,Parent Sales Person,Übergeordneter Verkäufer
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Bitte Standardwährung in den Unternehmensstammdaten und den allgemeinen Voreinstellungen angeben
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox-Zugangsdaten
 DocType: Purchase Invoice,Recurring Invoice,Wiederkehrende Rechnung
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Verwalten von Projekten
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Verwalten von Projekten
 DocType: Supplier,Supplier of Goods or Services.,Lieferant von Waren oder Dienstleistungen.
 DocType: Budget Detail,Fiscal Year,Geschäftsjahr
 DocType: Cost Center,Budget,Budget
@@ -1605,11 +1613,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Vertrieb
 DocType: Employee,Salary Information,Gehaltsinformationen
 DocType: Sales Person,Name and Employee ID,Name und Personalkennung
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
 DocType: Website Item Group,Website Item Group,Webseiten-Artikelgruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Zölle und Steuern
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Bitte den Stichtag eingeben
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} Zahlungsbuchungen können nicht nach {1} gefiltert werden
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Bitte den Stichtag eingeben
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} Zahlungsbuchungen können nicht nach {1} gefiltert werden
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabelle für Artikel, der auf der Webseite angezeigt wird"
 DocType: Purchase Order Item Supplied,Supplied Qty,Gelieferte Anzahl
 DocType: Material Request Item,Material Request Item,Materialanfrageartikel
@@ -1617,7 +1625,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Artikelgruppenstr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Für diese Berechnungsart kann keine Zeilennummern zugeschrieben werden, die größer oder gleich der aktuellen Zeilennummer ist"
 ,Item-wise Purchase History,Artikelbezogene Einkaufshistorie
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rot
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Bitte auf ""Zeitplan generieren"" klicken, um die Seriennummer für Artikel {0} abzurufen"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Bitte auf ""Zeitplan generieren"" klicken, um die Seriennummer für Artikel {0} abzurufen"
 DocType: Account,Frozen,Gesperrt
 ,Open Production Orders,Fertigungsaufträge öffnen
 DocType: Installation Note,Installation Time,Installationszeit
@@ -1634,7 +1642,7 @@ DocType: Item Group,Show In Website,Auf der Webseite anzeigen
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
 DocType: Task,Expected Time (in hours),Voraussichtliche Zeit (in Stunden)
 ,Qty to Order,Zu bestellende Menge
-DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Wird verwendet, um Markennamen in den folgenden Dokumenten nachzuverfolgen: Lieferschein, Vertriebschance, Materialanforderung, Artikel, Bestellung, Kaufbeleg, Kaufquittung, Angebot, Ausgangsrechnung, Produkt-Bundle, Kundenauftrag, Seriennummer"
+DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Wird verwendet, um Markennamen in den folgenden Dokumenten nachzuverfolgen: Lieferschein, Opportunity, Materialanforderung, Artikel, Bestellung, Kaufbeleg, Kaufquittung, Angebot, Ausgangsrechnung, Produkt-Bundle, Kundenauftrag, Seriennummer"
 apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-Diagramm aller Aufgaben.
 DocType: Appraisal,For Employee Name,Für Mitarbeiter-Name
 DocType: Holiday List,Clear Table,Tabelle leeren
@@ -1661,13 +1669,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Angebotsentwicklung
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Artikelgruppe ist im Artikelstamm für Artikel {0} nicht erwähnt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Da ein Fertigungsauftrag für diesen Artikel gemacht werden kann, muss es sich um einen Lagerartikel handeln."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Da ein Fertigungsauftrag für diesen Artikel gemacht werden kann, muss es sich um einen Lagerartikel handeln."
 DocType: Shipping Rule Condition,Shipping Amount,Versandbetrag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Eintritt
 DocType: Authorization Rule,Above Value,Über Wert
 ,Pending Amount,Ausstehender Betrag
 DocType: Purchase Invoice Item,Conversion Factor,Umrechnungsfaktor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Geliefert
+DocType: Purchase Order,Delivered,Geliefert
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),"Posteingangsserver für E-Mail-ID ""Stellen"" einrichten. (z.B. jobs@example.com)"
 DocType: Purchase Receipt,Vehicle Number,Fahrzeugnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Das Datum, an dem wiederkehrende Rechnungen angehalten werden"
@@ -1681,13 +1689,13 @@ DocType: Bank Reconciliation,Include Reconciled Entries,Abgeglichene Buchungen e
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanzkontenstruktur
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Freilassen, wenn für alle Mitarbeitertypen gültig"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Kosten auf folgender Grundlage verteilen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konto {0} muss vom Typ ""Aktivposten"" sein, weil der Artikel {1} ein Aktivposten ist"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konto {0} muss vom Typ ""Anlagegut"" sein, weil der Artikel {1} ein Anlagegut ist"
 DocType: HR Settings,HR Settings,Personaleinstellungen
 apps/frappe/frappe/config/setup.py +130,Printing,Druck
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Spesenabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Spesenabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren.
 DocType: Purchase Invoice,Additional Discount Amount,Zusätzlicher Rabatt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Der/Die Tag(e), für den/die Urlaub beantragt wird, sind Feiertage. Hierfür muss kein Urlaub beantragen werden."
-sites/assets/js/desk.min.js +7805,and,und
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,und
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
@@ -1724,11 +1732,10 @@ DocType: Opportunity,Quotation,Angebot
 DocType: Salary Slip,Total Deduction,Gesamtabzug
 DocType: Quotation,Maintenance User,Mitarbeiter für die Wartung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kosten aktualisiert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,"Sind Sie sicher, dass Sie FORTSETZEN wollen?"
 DocType: Employee,Date of Birth,Geburtsdatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Artikel {0} wurde bereits zurück gegeben
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"""Geschäftsjahr"" steht für ein Finazgeschäftsjahr. Alle Buchungen und anderen größeren Transaktionen werden mit dem ""Geschäftsjahr"" verglichen."
-DocType: Opportunity,Customer / Lead Address,Kunden/Interessenten-Adresse
+DocType: Opportunity,Customer / Lead Address,Kunden/Lead-Adresse
 DocType: Production Order Operation,Actual Operation Time,Tatsächliche Betriebszeit
 DocType: Authorization Rule,Applicable To (User),Anwendbar auf (Benutzer)
 DocType: Purchase Taxes and Charges,Deduct,Abziehen
@@ -1737,16 +1744,17 @@ DocType: Purchase Order Item,Qty as per Stock UOM,Menge in Lagermaßeinheit
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Bitte eine gültige CSV-Datei mit Daten auswählen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Beschichtung
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sonderzeichen außer ""-"", ""#"", ""."" und ""/"" sind in der Serienbezeichnung nicht erlaubt"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Verkaufsaktionen unter Beobachtung halten. Interessenten, Angebote, Kundenaufträge usw. von Kampagnen beobachten um die Verzinsung des eingesetzten Kapitals zu messen."
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Verkaufsaktionen unter Beobachtung halten. Leads, Angebote, Kundenaufträge usw. von Kampagnen beobachten um die Verzinsung des eingesetzten Kapitals zu messen."
 DocType: Expense Claim,Approver,Genehmigender
 ,SO Qty,SO Menge
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Es gibt Lagerbuchungen zum Lager {0}, daher kann das Lager nicht umbenannt oder verändert werden"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Es gibt Lagerbuchungen zum Lager {0}, daher kann das Lager nicht umbenannt oder verändert werden"
 DocType: Appraisal,Calculate Total Score,Gesamtwertung berechnen
 DocType: Supplier Quotation,Manufacturing Manager,Fertigungsleiter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seriennummer {0} ist unter Garantie bis {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Lieferschein in Pakete aufteilen.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Lieferungen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Tauchformverfahren
+DocType: Purchase Order,To be delivered to customer,Um zum Kunden geliefert werden
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,"Status des Zeitprotokolls muss ""versendet"" sein"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seriennummer {0} gehört zu keinem Lager
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Einrichten
@@ -1771,11 +1779,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Von Währung
 DocType: DocField,Name,Name
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Bitte zugewiesenen Betrag, Rechnungsart und Rechnungsnummer in mindestens einer Zeile auswählen"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Im System nicht berücksichtigte Beträge
 DocType: Purchase Invoice Item,Rate (Company Currency),Preis (Firmenwährung)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Andere
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,"Als ""angehalten"" einstellen"
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Kann nicht finden, einen passenden Artikel. Bitte wählen Sie einen anderen Wert für {0}."
 DocType: POS Profile,Taxes and Charges,Steuern und Gebühren
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt oder Dienstleistung, die gekauft, verkauft oder auf Lager gehalten wird."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Die Berechnungsart kann für die erste Zeile nicht auf ""bezogen auf Menge der vorhergenden Zeile"" oder auf ""bezogen auf Gesamtmenge der vorhergenden Zeile"" gesetzt werden"
@@ -1784,19 +1792,20 @@ DocType: Web Form,Select DocType,Dokumenttyp auswählen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Anstich
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankwesen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Bitte auf ""Zeitplan generieren"" klicken, um den Zeitplan zu erhalten"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Neue Kostenstelle
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Neue Kostenstelle
 DocType: Bin,Ordered Quantity,Bestellte Menge
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","z. B. ""Fertigungs-Werkzeuge für Hersteller"""
 DocType: Quality Inspection,In Process,In Bearbeitung
 DocType: Authorization Rule,Itemwise Discount,Artikelbezogener Rabatt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
-DocType: Account,Fixed Asset,Anlagegut
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serienbestand
+DocType: Purchase Order Item,Reference Document Type,Reference Document Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
+DocType: Account,Fixed Asset,Anlagevermögen
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serienbestand
 DocType: Activity Type,Default Billing Rate,Standard-Rechnungspreis
 DocType: Time Log Batch,Total Billing Amount,Gesamtrechnungsbetrag
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Verbindlichkeiten-Konto
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Forderungskonto
 ,Stock Balance,Lagerbestand
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Kundenauftrag zur Zahlung
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Kundenauftrag zur Zahlung
 DocType: Expense Claim Detail,Expense Claim Detail,Spesenabrechnungsdetail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Zeitprotokolle erstellt:
 DocType: Item,Weight UOM,Gewichts-Maßeinheit
@@ -1829,13 +1838,12 @@ apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Gesamtrechnungsbetrag
 DocType: Time Log,To Time,Bis-Zeit
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Um Unterknoten hinzuzufügen, klicken Sie in der Baumstruktur auf den Knoten, unter dem Sie weitere Knoten hinzufügen möchten."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Konto für Gutschrift muss ein Kreditorenkonto sein
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Habenkonto muss ein Verbindlichkeitenkonto sein
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Stücklisten-Rekursion: {0} kann nicht übergeordnetes Element oder Unterpunkt von {2} sein
 DocType: Production Order Operation,Completed Qty,gefertigte Menge
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",Für {0} können nur Sollkonten mit einer weiteren Habenbuchung verknüpft werden
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Preisliste {0} ist deaktiviert
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",Für {0} können nur Sollkonten mit einer weiteren Habenbuchung verknüpft werden
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Preisliste {0} ist deaktiviert
 DocType: Manufacturing Settings,Allow Overtime,Überstunden zulassen
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Kundenauftrag {0} ist angehalten
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Seriennummern für Artikel erforderlich {1}. Sie haben zur Verfügung gestellt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktueller Wertansatz
 DocType: Item,Customer Item Codes,Kundenartikelnummern
@@ -1844,9 +1852,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Schweißen
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Neue Lagermaßeinheit ist erforderlich
 DocType: Quality Inspection,Sample Size,Stichprobenumfang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Bitte eine eine gültige ""Von Fall Nr."" angeben"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 DocType: Project,External,Extern
 DocType: Features Setup,Item Serial Nos,Artikel-Seriennummern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Benutzer und Berechtigungen
@@ -1873,7 +1881,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,M
 DocType: Sales Partner,Address & Contacts,Adresse & Kontakte
 DocType: SMS Log,Sender Name,Absendername
 DocType: Page,Title,Bezeichnung
-sites/assets/js/list.min.js +104,Customize,Anpassen
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Anpassen
 DocType: POS Profile,[Select],[Select ]
 DocType: SMS Log,Sent To,Gesendet An
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Verkaufsrechnung erstellen
@@ -1898,12 +1906,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Lebensdauer
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Reise
 DocType: Leave Block List,Allow Users,Benutzer zulassen
+DocType: Purchase Order,Customer Mobile No,Kundenmobil Nein
 DocType: Sales Invoice,Recurring,Wiederkehrend
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Einnahmen und Ausgaben für Produktbereiche oder Abteilungen separat verfolgen.
 DocType: Rename Tool,Rename Tool,Werkzeug zum Umbenennen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten aktualisieren
 DocType: Item Reorder,Item Reorder,Artikelnachbestellung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Material übergeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Material übergeben
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Arbeitsgänge und Betriebskosten angeben und eine eindeutige Arbeitsgang-Nr. für diesen Arbeitsgang angeben.
 DocType: Purchase Invoice,Price List Currency,Preislistenwährung
 DocType: Naming Series,User must always select,Benutzer muss immer auswählen
@@ -1914,7 +1923,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Steu
 DocType: Quality Inspection,Verified By,Geprüft durch
 DocType: Address,Subsidiary,Tochtergesellschaft
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Die Standardwährung der Firma kann nicht geändern werden, weil es bestehende Transaktionen gibt. Transaktionen müssen abgebrochen werden, um die Standardwährung zu ändern."
-DocType: Quality Inspection,Purchase Receipt No,Eingangslieferschein Nr.
+DocType: Quality Inspection,Purchase Receipt No,Kaufbeleg Nr.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Anzahlung
 DocType: System Settings,In Hours,In Stunden
 DocType: Process Payroll,Create Salary Slip,Gehaltsabrechnung erstellen
@@ -1926,7 +1935,7 @@ DocType: Appraisal,Employee,Mitarbeiter
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import von E-Mails aus
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Als Benutzer einladen
 DocType: Features Setup,After Sale Installations,After Sale-Installationen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} wird voll in Rechnung gestellt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} wird voll in Rechnung gestellt
 DocType: Workstation Working Hour,End Time,Endzeit
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Allgemeine Vertragsbedingungen für den Verkauf und Einkauf.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppieren nach Beleg
@@ -1935,8 +1944,9 @@ DocType: Sales Invoice,Mass Mailing,Massen-E-Mail-Versand
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,"Datei, die umbenannt werden soll"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Lieferantenbestellnummer ist für Artikel {0} erforderlich
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zahlung anzeigen
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Angegebene Stückliste {0} gibt es nicht für Artikel {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages aufgehoben werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages aufgehoben werden
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Größe
 DocType: Notification Control,Expense Claim Approved,Spesenabrechnung zugelassen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Arzneimittel
@@ -1955,8 +1965,8 @@ DocType: Upload Attendance,Attendance To Date,Anwesenheit bis Datum
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Posteingangsserver für E-Mail-ID Vertrieb einrichten. (z. B. sales@example.com)
 DocType: Warranty Claim,Raised By,Gemeldet von
 DocType: Payment Tool,Payment Account,Zahlungskonto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
-sites/assets/js/list.min.js +23,Draft,Entwurf
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Entwurf
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Ausgleich für
 DocType: Quality Inspection Reading,Accepted,Genehmigt
 DocType: User,Female,Weiblich
@@ -1969,14 +1979,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Bezeichnung der Versandregel
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da es bestehende Lagertransaktionen für diesen Artikel gibt, können die Werte von ""Hat Seriennummer"", ""Hat Losnummer"", ""Ist Lagerartikel"" und ""Bewertungsmethode"" nicht geändert werden"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Schnell Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Sie können den Preis nicht ändern, wenn eine Stückliste für einen Artikel aufgeführt ist"
 DocType: Employee,Previous Work Experience,Vorherige Berufserfahrung
 DocType: Stock Entry,For Quantity,Für Menge
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Bitte die geplante Menge für Artikel {0} in Zeile {1} eingeben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} wurde nicht versendet
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Artikelanfragen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} wurde nicht versendet
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Artikelanfragen
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Für jeden zu fertigenden Artikel wird ein separater Fertigungsauftrag erstellt.
 DocType: Purchase Invoice,Terms and Conditions1,Allgemeine Geschäftsbedingungen1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Einrichtung abschliessen
@@ -1988,11 +1999,11 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter-Versan
 DocType: Delivery Note,Transporter Name,Name des Transportunternehmers
 DocType: Contact,Enter department to which this Contact belongs,"Abteilung eingeben, zu der dieser Kontakt gehört"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Summe Abwesenheit
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artikel oder Lager in Reihe {0} stimmen nicht mit Materialanforderung überein
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artikel oder Lager in Reihe {0} stimmen nicht mit Materialanforderung überein
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Mengeneinheit
 DocType: Fiscal Year,Year End Date,Enddatum des Geschäftsjahres
 DocType: Task Depends On,Task Depends On,Aufgabe hängt davon ab
-DocType: Lead,Opportunity,Vertriebschance
+DocType: Lead,Opportunity,Opportunity
 DocType: Salary Structure Earning,Salary Structure Earning,Gehaltsstruktur-Verdienst
 ,Completed Production Orders,Abgeschlossene Fertigungsaufträge
 DocType: Operation,Default Workstation,Standard-Arbeitsplatz
@@ -2014,7 +2025,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ein Drittanbieter/Händler/Kommissionär/verbundenes Unternehmen/Wiederverkäufer, der die Produkte auf Provisionsbasis verkauft."
 DocType: Customer Group,Has Child Node,Unterknoten vorhanden
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} zu Bestellung {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} zu Bestellung {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Statische URL-Parameter hier eingeben (z. B. Absender=ERPNext, Benutzername=ERPNext, Passwort=1234 usw.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ist in keinem aktiven Geschäftsjahr. Für weitere Details, bitte {2} prüfen."
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert"
@@ -2065,11 +2076,9 @@ DocType: Note,Note,Anmerkung
 DocType: Purchase Receipt Item,Recd Quantity,Zurückgegebene Menge
 DocType: Email Account,Email Ids,E-Mail-IDs
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über Kundenaufträge bestellte Stückzahl {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,"Als ""fortgesetzt"" markieren"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht versendet
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Geldkonto
 DocType: Tax Rule,Billing City,Stadt laut Rechnungsadresse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Die Genehmigung dieses Urlaubsantrags ist ausstehend. Nur der Urlaubsgenehmiger kann den Status aktualisieren.
 DocType: Global Defaults,Hide Currency Symbol,Währungssymbol ausblenden
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","z. B. Bank, Bargeld, Kreditkarte"
 DocType: Journal Entry,Credit Note,Gutschrift
@@ -2081,7 +2090,7 @@ apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
 DocType: Stock Entry,Manufacture,Herstellung
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Bitte Lieferschein zuerst
 DocType: Purchase Invoice,Currency and Price List,Währungs- und Preisliste
-DocType: Opportunity,Customer / Lead Name,Kunden/Interessenten-Name
+DocType: Opportunity,Customer / Lead Name,Kunden/Lead-Name
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Einlösungsdatum nicht benannt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
 DocType: Item,Allow Production Order,Fertigungsauftrag zulassen
@@ -2090,16 +2099,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Summe (Anzahl)
 DocType: Installation Note Item,Installed Qty,Installierte Anzahl
 DocType: Lead,Fax,Telefax
 DocType: Purchase Taxes and Charges,Parenttype,Typ des übergeordneten Elements
-sites/assets/js/list.min.js +26,Submitted,Versendet
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Versendet
 DocType: Salary Structure,Total Earning,Gesamteinnahmen
 DocType: Purchase Receipt,Time at which materials were received,"Zeitpunkt, zu dem Materialien empfangen wurden"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Meine Adressen
 DocType: Stock Ledger Entry,Outgoing Rate,Verkaufspreis
-apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Vorlage Unternehmensfiliale.
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Stammdaten zu Unternehmensfilialen.
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,oder
 DocType: Sales Order,Billing Status,Abrechnungsstatus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Versorgungsaufwendungen
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,Über 90
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Über 90
 DocType: Buying Settings,Default Buying Price List,Standard-Einkaufspreisliste
 ,Download Backups,Datensicherungen herunterladen
 DocType: Notification Control,Sales Order Message,Benachrichtigung über Kundenauftrag
@@ -2108,7 +2117,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Mitarbeiter auswählen
 DocType: Bank Reconciliation,To Date,Bis-Datum
 DocType: Opportunity,Potential Sales Deal,Möglicher Verkaufsabschluss
-sites/assets/js/form.min.js +308,Details,Details
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Details
 DocType: Purchase Invoice,Total Taxes and Charges,Gesamte Steuern und Gebühren
 DocType: Employee,Emergency Contact,Notfallkontakt
 DocType: Item,Quality Parameters,Qualitätsparameter
@@ -2123,18 +2132,18 @@ DocType: Purchase Order Item,Received Qty,Empfangene Menge
 DocType: Stock Entry Detail,Serial No / Batch,Seriennummer / Charge
 DocType: Product Bundle,Parent Item,Übergeordneter Artikel
 DocType: Account,Account Type,Kontentyp
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren"""
 ,To Produce,Zu produzieren
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Für Zeile {0} in {1}. Um {2} in die Artikel-Bewertung mit einzubeziehen, muss auch Zeile {3} mit enthalten sein"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Kennzeichnung des Paketes für die Lieferung (für den Druck)
 DocType: Bin,Reserved Quantity,Reservierte Menge
-DocType: Landed Cost Voucher,Purchase Receipt Items,Eingangslieferschein-Artikel
+DocType: Landed Cost Voucher,Purchase Receipt Items,Kaufbeleg-Artikel
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare anpassen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Zuschnitt
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Abflachung
 DocType: Account,Income Account,Ertragskonto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Guss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Auslieferung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Auslieferung
 DocType: Stock Reconciliation Item,Current Qty,Aktuelle Anzahl
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Siehe „Anteil der zu Grunde liegenden Materialien“ im Abschnitt Kalkulation
 DocType: Appraisal Goal,Key Responsibility Area,Wichtigster Verantwortungsbereich
@@ -2151,22 +2160,22 @@ apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}
 				than the Grand Total ({2})",Summe der Anzahlungen ({0}) zu Bestellung {1} kann nicht größer sein  als die Gesamtsumme ({2})
 DocType: Employee,Relieving Date,Entlassungsdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Die Preisregel überschreibt die Preisliste. Bitte einen Rabattsatz aufgrund bestimmter Kriterien definieren.
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kann nur über Lagerbuchung / Lieferschein / Kaufrechung geändert werden
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kann nur über Lagerbuchung / Lieferschein / Kaufbeleg geändert werden
 DocType: Employee Education,Class / Percentage,Klasse / Anteil
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Leiter Marketing und Vertrieb
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Einkommensteuer
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Lasertechnikbasierende Netzformung
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn für ""Preis"" eine Preisregel ausgewählt wurde, wird die Preisliste überschrieben. Der Preis aus der Preisregel ist der endgültige Preis, es sollte also kein weiterer Rabatt gewährt werden. Daher wird er in Transaktionen wie Kundenauftrag, Bestellung etc., vorrangig aus dem Feld ""Preis"" gezogen, und dann erst aus dem Feld ""Preisliste""."
-apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Interessenten nachverfolgen nach Branchentyp.
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Leads nachverfolgen nach Branchentyp.
 DocType: Item Supplier,Item Supplier,Artikellieferant
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle Adressen.
 DocType: Company,Stock Settings,Lager-Voreinstellungen
 DocType: User,Bio,Lebenslauf
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Neuer Kostenstellenname
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Neuer Kostenstellenname
 DocType: Leave Control Panel,Leave Control Panel,Urlaubsverwaltung
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Keine Standard-Adressvorlage gefunden. Bitte eine neue unter Setup > Druck und Branding > Adressvorlage erstellen.
 DocType: Appraisal,HR User,Personalbenutzer
@@ -2185,44 +2194,44 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Zahlungsabgleichs-Werkzeug-Details
 ,Sales Browser,Vertriebs-Browser
 DocType: Journal Entry,Total Credit,Gesamt-Haben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Darlehen und Anzahlungen (Aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Schuldner
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Groß
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Kein Mitarbeiter gefunden!
 DocType: C-Form Invoice Detail,Territory,Region
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Bitte bei ""Besuche erforderlich"" NEIN angeben"
+DocType: Purchase Order,Customer Address Display,Kundenadresse anzeigen
 DocType: Stock Settings,Default Valuation Method,Standard-Bewertungsmethode
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polieren
 DocType: Production Order Operation,Planned Start Time,Geplante Startzeit
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Zugewiesen
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bilanz schliessen und in die Gewinn und Verlustrechnung übernehmen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil bereits einige Transaktion(en) mit einer anderen Standard-Maßeinheit gemacht wurden. Bitte das Maßeinheit-Ersetzungswerkzeug im Lagermodul verwenden."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Wechselkurs zum Umrechnen einer Währung in eine andere angeben
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Angebot {0} wird storniert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Angebot {0} wird storniert
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Offener Gesamtbetrag
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"Mitarbeiter {0} war am {1} im Urlaub. Er kann nicht auf ""anwesend"" gesetzt werden."
 DocType: Sales Partner,Targets,Ziele
-DocType: Price List,Price List Master,Preislisten-Vorlage
+DocType: Price List,Price List Master,Preislisten-Stammdaten
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkaufstransaktionen können für mehrere ""Vertriebsmitarbeiter"" markiert werden, so dass Ziele festgelegt und überwacht werden können."
 ,S.O. No.,Lieferantenbestellung Nr.
 DocType: Production Order Operation,Make Time Log,Zeitprotokoll erstellen
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Bitte Kunden aus dem Interessenten {0} erstellen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
 DocType: Price List,Applicable for Countries,Anwendbar für Länder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Rechner
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrochemisches Schleifen
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dies ist eine Root-Kundengruppe und kann nicht bearbeitet werden.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Bitte zunächst Kontenplan einrichten, bevor Buchungen vorgenommen werden"
 DocType: Purchase Invoice,Ignore Pricing Rule,Preisregel ignorieren
-sites/assets/js/list.min.js +24,Cancelled,Abgebrochen
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Abgebrochen
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Von-Datum in der Gehaltsstruktur kann nicht vor dem Eintrittsdatum des Mitarbeiters liegen.
 DocType: Employee Education,Graduate,Akademiker
 DocType: Leave Block List,Block Days,Tage sperren
 DocType: Journal Entry,Excise Entry,Eintrag/Buchung entfernen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Warnung: Kundenauftrag {0} gegen Kunden Bestellung bereits vorhanden {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Warnung: Kundenauftrag {0} gegen Kunden Bestellung bereits vorhanden {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2279,28 +2288,28 @@ DocType: Account,Stock Received But Not Billed,"Empfangener, aber nicht berechne
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttolohn +  ausstehender Betrag +   Inkassobetrag - Summe aller Abzüge
 DocType: Monthly Distribution,Distribution Name,Bezeichnung des Großhandels
 DocType: Features Setup,Sales and Purchase,Vertrieb und Einkauf
-DocType: Purchase Order Item,Material Request No,Materialanfragenr.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
+DocType: Supplier Quotation Item,Material Request No,Materialanfragenr.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Kurs, zu dem die Währung des Kunden in die Basiswährung des Unternehmens umgerechnet wird"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} wurde erfolgreich aus dieser Liste ausgetragen.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettopreis (Firmenwährung)
-apps/frappe/frappe/templates/base.html +132,Added,Hinzugefügt
+apps/frappe/frappe/templates/base.html +134,Added,Hinzugefügt
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Baumstruktur der Region verwalten.
 DocType: Journal Entry Account,Sales Invoice,Ausgangsrechnung
 DocType: Journal Entry Account,Party Balance,Gruppen-Saldo
 DocType: Sales Invoice Item,Time Log Batch,Zeitprotokollstapel
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Bitte ""Rabatt anwenden auf"" auswählen"
-DocType: Company,Default Receivable Account,Standard-Sollkonto
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Bitte ""Rabatt anwenden auf"" auswählen"
+DocType: Company,Default Receivable Account,Standard-Forderungskonto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Bankbuchung für die Gesamtvergütung, die gemäß der oben ausgewählten Kriterien bezahlt wurde, erstellen"
 DocType: Stock Entry,Material Transfer for Manufacture,Materialübertrag für Herstellung
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabatt-Prozentsatz kann entweder auf eine Preisliste oder auf alle Preislisten angewandt werden.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Der Rabatt-Prozentsatz kann entweder auf eine Preisliste oder auf alle Preislisten angewandt werden.
 DocType: Purchase Invoice,Half-yearly,Halbjährlich
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Geschäftsjahr {0} nicht gefunden.
 DocType: Bank Reconciliation,Get Relevant Entries,Zutreffende Buchungen aufrufen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Lagerbuchung
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Prägung
 DocType: Sales Invoice,Sales Team1,Verkaufsteam1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Artikel {0} existiert nicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Artikel {0} existiert nicht
 DocType: Sales Invoice,Customer Address,Kundenadresse
 apps/frappe/frappe/desk/query_report.py +136,Total,Summe
 DocType: Purchase Invoice,Apply Additional Discount On,Zusätzlichen Rabatt gewähren auf
@@ -2315,13 +2324,15 @@ DocType: Quality Inspection,Quality Inspection,Qualitätsprüfung
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Besonders klein
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Sprühformverfahren
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Gewünschte Materialmenge ist geringer als die Mindestbestellmenge
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Konto {0} ist gesperrt
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} ist gesperrt
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juristische Person/Niederlassung mit einem separaten Kontenplan, die zum Unternehmen gehört."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL oder BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kann nur gegen Bezahlung zu machen noch nicht abgerechneten {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssatz kann nicht größer als 100 sein
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Mindestbestandshöhe
 DocType: Stock Entry,Subcontract,Zulieferer
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Bitte geben Sie {0} zuerst
 DocType: Production Planning Tool,Get Items From Sales Orders,Artikel aus Kundenaufträgen abrufen
 DocType: Production Order Operation,Actual End Time,Tatsächliche Endzeit
 DocType: Production Planning Tool,Download Materials Required,Erforderliche Materialien herunterladen
@@ -2338,9 +2349,9 @@ DocType: Maintenance Visit,Scheduled,Geplant
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Bitte einen Artikel auswählen, bei dem ""Ist Lagerartikel"" mit ""Nein"" und ""Ist Verkaufsartikel"" mit ""Ja"" bezeichnet ist, und es kein anderes Produkt-Bundle gibt"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Bitte ""Monatsweise Verteilung"" wählen, um Ziele ungleichmäßig über Monate zu verteilen."
 DocType: Purchase Invoice Item,Valuation Rate,Wertansatz
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Preislistenwährung nicht ausgewählt
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Artikel Zeile {0}: Eingangslieferschein {1} existiert nicht in der obigen Tabelle ""Eingangslieferscheine"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Mitarbeiter {0} hat sich bereits für {1} zwischen {2} und {3} beworben
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Preislistenwährung nicht ausgewählt
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Artikel Zeile {0}: Kaufbeleg {1} existiert nicht in der obigen Tabelle ""Eingangslieferscheine"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Mitarbeiter {0} hat sich bereits für {1} zwischen {2} und {3} beworben
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projektstartdatum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Bis
 DocType: Rename Tool,Rename Log,Protokoll umbenennen
@@ -2366,14 +2377,14 @@ DocType: Sales Invoice,Advertisement,Werbung
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Probezeit
 DocType: Customer Group,Only leaf nodes are allowed in transaction,In dieser Transaktion sind nur Unterknoten erlaubt
 DocType: Expense Claim,Expense Approver,Ausgabenbewilliger
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Eingangslieferschein-Artikel geliefert
-sites/assets/js/erpnext.min.js +48,Pay,Zahlen
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kaufbeleg-Artikel geliefert
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Zahlen
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Um Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS-Gateway-URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokolle über den SMS-Versand
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Schliff
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Einschweißtechnik
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Ausstehende Aktivitäten
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ausstehende Aktivitäten
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bestätigt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Lieferant > Lieferantentyp
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Bitte Entlassungsdatum eingeben.
@@ -2384,10 +2395,9 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Na
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Zeitungsverleger
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Geschäftsjahr auswählen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Verhüttung
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Sie sind der Abwesenheitsbewilliger für diesen Datensatz. Bitte aktualisieren Sie den ""Status"" und speichern Sie ihn ab"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Meldebestand
 DocType: Attendance,Attendance Date,Anwesenheitsdatum
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gehaltsaufteilung nach Einkünften und Abzügen.
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gehaltsaufteilung nach Einkommen und Abzügen.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Ein Konto mit Unterknoten kann nicht in ein Kontoblatt umgewandelt werden
 DocType: Address,Preferred Shipping Address,Bevorzugte Lieferadresse
 DocType: Purchase Receipt Item,Accepted Warehouse,Akzeptiertes Lager
@@ -2420,6 +2430,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostenstelle mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Abschreibung
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Lieferant(en)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ungültige Zeitraum
 DocType: Customer,Credit Limit,Kreditlimit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Bitte Transaktionstyp auswählen
 DocType: GL Entry,Voucher No,Belegnr.
@@ -2429,8 +2440,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Vorla
 DocType: Customer,Address and Contact,Adresse und Kontakt
 DocType: Customer,Last Day of the Next Month,Letzter Tag des nächsten Monats
 DocType: Employee,Feedback,Rückmeldung
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Servicezeitplan
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Servicezeitplan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Schleifmittelstrahlbearbeitung
 DocType: Stock Settings,Freeze Stock Entries,Lagerbuchungen sperren
 DocType: Website Settings,Website Settings,Webseiten-Einstellungen
@@ -2444,11 +2455,11 @@ DocType: Quality Inspection,Outgoing,Ausgang
 DocType: Material Request,Requested For,Angefordert für
 DocType: Quotation Item,Against Doctype,Zu DocType
 DocType: Delivery Note,Track this Delivery Note against any Project,Diesen Lieferschein in jedem Projekt nachverfolgen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root-Konto kann nicht gelöscht werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-Konto kann nicht gelöscht werden
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Lagerbuchungen anzeigen
 ,Is Primary Address,Ist Hauptadresse
 DocType: Production Order,Work-in-Progress Warehouse,Lager für unfertige Erzeugnisse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referenz #{0} vom {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referenz #{0} vom {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Adressen verwalten
 DocType: Pricing Rule,Item Code,Artikelnummer
 DocType: Production Planning Tool,Create Production Orders,Fertigungsaufträge erstellen
@@ -2457,14 +2468,14 @@ DocType: Journal Entry,User Remark,Benutzerbemerkung
 DocType: Lead,Market Segment,Marktsegment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Interne Berufserfahrung des Mitarbeiters
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Schlußstand (Soll)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Schlußstand (Soll)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Seriennummer {0} ist nicht auf Lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Steuer-Vorlage für Verkaufstransaktionen.
 DocType: Sales Invoice,Write Off Outstanding Amount,Abschreibung auf offene Forderungen
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Aktivieren, wenn Sie automatisch wiederkehrende Ausgangsrechnungen benötigen. Nach dem Absenden einer Ausgangsrechnung wird der Bereich für wiederkehrende Ausgangsrechnungen angezeigt."
 DocType: Account,Accounts Manager,Kontenmanager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',"Zeitprotokoll {0} muss ""versendet"" sein"
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Zeitprotokoll {0} muss ""versendet"" sein"
 DocType: Stock Settings,Default Stock UOM,Standardlagermaßeinheit
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Kalkulationspreis basierend auf Aktivitätsart (pro Stunde)
 DocType: Production Planning Tool,Create Material Requests,Materialanfragen erstellen
@@ -2475,7 +2486,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Kontenabgleich
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Updates abholen
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Ein paar Beispieldatensätze hinzufügen
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Lassen Verwaltung
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lassen Verwaltung
 DocType: Event,Groups,Gruppen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppieren nach Konto
 DocType: Sales Order,Fully Delivered,Komplett geliefert
@@ -2486,12 +2497,11 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Ausgangs- und Eingangslager können nicht gleich sein für die Zeile {0}
 DocType: Features Setup,Sales Extras,Vertriebsextras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budget für Konto {1} zu Kostenstelle {2} wird um {3} überschritten
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Anlage/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
-DocType: Leave Allocation,Carry Forwarded Leaves,Übertragene Urlaubsgenehmigungen
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Von-Datum"" muss nach ""Bis-Datum"" liegen"
 ,Stock Projected Qty,Geplanter Lagerbestand
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Kunden-Bestellung
 DocType: Warranty Claim,From Company,Von Firma
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Wert oder Menge
@@ -2502,15 +2512,14 @@ DocType: Leave Block List,Leave Block List Allowed,Urlaubssperrenliste zugelasse
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Umrechnungsfaktor kann nicht ein Bruchteil sein
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,"Sie brauchen das, um sich anzumelden."
 DocType: Sales Partner,Retailer,Einzelhändler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Habenbuchung zum Konto muss ein Bestandskonto sein
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Lieferantentypen
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Artikelnummer ist zwingend erforderlich, da der Artikel nicht automatisch nummeriert wird"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Artikelnummer ist zwingend erforderlich, da der Artikel nicht automatisch nummeriert wird"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Wartungsplanposition
 DocType: Sales Order,%  Delivered,%  geliefert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kontokorrentkredit Konto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Gehaltsabrechnung erstellen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Fortsetzen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Stückliste durchsuchen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Gedeckte Kredite
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Beeindruckende Produkte
@@ -2520,7 +2529,7 @@ DocType: Appraisal,Appraisal,Bewertung
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Schaumstoffguß
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Zeichnung
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Ereignis wiederholen
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
 DocType: Hub Settings,Seller Email,E-Mail-Adresse des Verkäufers
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Einkaufsrechnung)
 DocType: Workstation Working Hour,Start Time,Startzeit
@@ -2534,8 +2543,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobetrag (Firmenwährung)
 DocType: BOM Operation,Hour Rate,Stundensatz
 DocType: Stock Settings,Item Naming By,Artikelbezeichnung nach
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Von Angebot
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Eine weitere Periodenabschlussbuchung {0} wurde nach {1} erstellt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Von Angebot
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Eine weitere Periodenabschlussbuchung {0} wurde nach {1} erstellt
 DocType: Production Order,Material Transferred for Manufacturing,Material zur Herstellung übertragen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} existiert nicht
 DocType: Purchase Receipt Item,Purchase Order Item No,Lieferantenauftrags-Artikel-Nr.
@@ -2548,11 +2557,11 @@ DocType: Item,Inspection Required,Prüfung erforderlich
 DocType: Purchase Invoice Item,PR Detail,PR-Detail
 DocType: Sales Order,Fully Billed,Voll berechnet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Barmittel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Auslieferungslager für Lagerartikel {0} erforderlich
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Auslieferungslager für Lagerartikel {0} erforderlich
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Nettogewicht + Gewicht des Verpackungsmaterials (Für den Ausdruck)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Benutzer mit dieser Rolle sind berechtigt Konten zu sperren und  Buchungen zu gesperrten Konten zu erstellen/verändern
 DocType: Serial No,Is Cancelled,Ist storniert
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Meine Lieferungen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Meine Lieferungen
 DocType: Journal Entry,Bill Date,Rechnungsdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Wenn es mehrere Preisregeln mit der höchsten Priorität gibt, werden folgende interne Prioritäten angewandt:"
 DocType: Supplier,Supplier Details,Lieferantendetails
@@ -2565,7 +2574,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Überweisung
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Bitte ein Bankkonto auswählen
 DocType: Newsletter,Create and Send Newsletters,Newsletter erstellen und senden
-sites/assets/js/report.min.js +107,From Date must be before To Date,Von-Datum muss vor dem Bis-Datum liegen
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Von-Datum muss vor dem Bis-Datum liegen
 DocType: Sales Order,Recurring Order,Wiederkehrende Bestellung
 DocType: Company,Default Income Account,Standard-Ertragskonto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundengruppe / Kunde
@@ -2580,31 +2589,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Bestandsmaßeinheit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Bestellung {0} wurde nicht versendet
 ,Projected,projektiert
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seriennummer {0} gehört nicht zu Lager {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Hinweis: Das System überprüft Überlieferungen und Überbuchungen zu Artikel {0} nicht da Stückzahl oder Menge 0 sind
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Hinweis: Das System überprüft Überlieferungen und Überbuchungen zu Artikel {0} nicht da Stückzahl oder Menge 0 sind
 DocType: Notification Control,Quotation Message,Angebotsmitteilung
 DocType: Issue,Opening Date,Eröffnungsdatum
 DocType: Journal Entry,Remark,Bemerkung
 DocType: Purchase Receipt Item,Rate and Amount,Preis und Menge
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Langweilig
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Aus Kundenauftrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Aus Kundenauftrag
 DocType: Blog Category,Parent Website Route,Pfad zur übergeordneten Webseite
 DocType: Sales Order,Not Billed,Nicht abgerechnet
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Beide Lager müssen zur gleichen Firma gehören
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Noch keine Kontakte hinzugefügt.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Noch keine Kontakte hinzugefügt.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nicht aktiv
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Zu Rechnung mit Buchungsdatum
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Einstandskosten
 DocType: Time Log,Batched for Billing,Für Abrechnung gebündelt
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Rechnungen von Lieferanten
 DocType: POS Profile,Write Off Account,Abschreibungs-Konto
-sites/assets/js/erpnext.min.js +26,Discount Amount,Rabattbetrag
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabattbetrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Zurück zur Einkaufsrechnung
 DocType: Item,Warranty Period (in days),Gewährleistungsfrist (in Tagen)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,z. B. Mehrwertsteuer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
 DocType: Journal Entry Account,Journal Entry Account,Journalbuchungskonto
-DocType: Shopping Cart Settings,Quotation Series,Angebotsserie
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0} ). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen
+DocType: Shopping Cart Settings,Quotation Series,Serienbezeichnung der Angebote
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0} ). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Bleigasformen
 DocType: Sales Order Item,Sales Order Date,Kundenauftrags-Datum
 DocType: Sales Invoice Item,Delivered Qty,Gelieferte Stückzahl
@@ -2635,11 +2643,12 @@ DocType: Account,Sales User,Verkaufsmitarbeiter
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Mindestmenge kann nicht größer als Maximalmenge sein
 DocType: Stock Entry,Customer or Supplier Details,Kunden- oder Lieferanten-Details
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Einstellen
-DocType: Lead,Lead Owner,Eigentümer des Interessenten (Leads)
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Angabe des Lagers wird benötigt
+DocType: Lead,Lead Owner,Eigentümer des Leads
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Angabe des Lagers wird benötigt
 DocType: Employee,Marital Status,Familienstand
 DocType: Stock Settings,Auto Material Request,Automatische Materialanforderung
 DocType: Time Log,Will be updated when billed.,"Wird aktualisiert, wenn abgerechnet ist."
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Erhältlich Batch Menge an von LAGER
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuelle Stückliste und neue Stückliste können nicht identisch sein
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
 DocType: Sales Invoice,Against Income Account,Zu Ertragskonto
@@ -2656,12 +2665,12 @@ DocType: POS Profile,Update Stock,Lagerbestand aktualisieren
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Feinstbearbeitung
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Unterschiedliche Maßeinheiten für Artikel führen zu falschen Werten für das (Gesamt-)Nettogewicht. Es muss sicher gestellt sein, dass das Nettogewicht jedes einzelnen Artikels in der gleichen Maßeinheit angegeben ist."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stückpreis
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Bitte Artikel vom Lieferschein nehmen
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Bitte Artikel vom Lieferschein nehmen
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journalbuchungen {0} sind entknüpft
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Aufzeichnung aller Kommunikations vom Typ Email, Telefon, Chat, Besuch usw."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Bitte Abschlusskostenstelle in Firma vermerken
 DocType: Purchase Invoice,Terms,Geschäftsbedingungen
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Neuen Eintrag erstellen
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Neuen Eintrag erstellen
 DocType: Buying Settings,Purchase Order Required,Lieferantenauftrag erforderlich
 ,Item-wise Sales History,Artikelbezogene Verkaufshistorie
 DocType: Expense Claim,Total Sanctioned Amount,Summe genehmigter Beträge
@@ -2678,32 +2687,36 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Abzug auf der Gehaltsabrech
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Hinweise
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Zuerst einen Gruppenknoten wählen.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Zweck muss einer von diesen sein: {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Formular ausfüllen und speichern
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Formular ausfüllen und speichern
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Einen Bericht herunterladen, der das gesamte Rohmaterial mit seinem neuesten Bestandsstatus angibt"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Zugewandt
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Urlaubskonto vor Anwendung
 DocType: SMS Center,Send SMS,SMS senden
 DocType: Company,Default Letter Head,Standardbriefkopf
 DocType: Time Log,Billable,Abrechenbar
 DocType: Authorization Rule,This will be used for setting rule in HR module,Dies wird für die Festlegung der Regel im Personal-Modul verwendet
 DocType: Account,Rate at which this tax is applied,"Kurs, zu dem dieser Steuersatz angewandt wird"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Nachbestellmenge
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Nachbestellmenge
 DocType: Company,Stock Adjustment Account,Bestandskorrektur-Konto
 DocType: Journal Entry,Write Off,Abschreiben
 DocType: Time Log,Operation ID,Arbeitsgang-ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systembenutzer-ID (Anmeldung). Wenn gesetzt, wird sie standardmäßig für alle HR-Formulare verwendet."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: von {1}
 DocType: Task,depends_on,hängt ab von
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Vertriebschance verloren
-DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabattfelder stehen in  Lieferantenauftrag, Eingangslieferschein und in der Eingangsrechnung zur Verfügung"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity verloren
+DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabattfelder stehen in  Lieferantenauftrag, Kaufbeleg und in der Eingangsrechnung zur Verfügung"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Name des neuen Kontos. Hinweis: Bitte keine Konten für Kunden und Lieferanten erstellen
 DocType: Report,Report Type,Berichtstyp
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Ladevorgang läuft
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Ladevorgang läuft
 DocType: BOM Replace Tool,BOM Replace Tool,Stücklisten-Austauschwerkzeug
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landesspezifische Standard-Adressvorlagen
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
+DocType: Sales Order Item,Supplier delivers to Customer,Lieferant liefert nach Kunden
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Steuern anzeigen Break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Daten-Import und -Export
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Bei eigener Beteiligung an den  Fertigungshandlungen, ""Eigenfertigung"" aktivieren."
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Rechnungsbuchungsdatum
 DocType: Sales Invoice,Rounded Total,Gerundete Gesamtsumme
 DocType: Product Bundle,List items that form the package.,"Die Artikel auflisten, die das Paket bilden."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prozentuale Aufteilung sollte gleich 100% sein
@@ -2714,14 +2727,14 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
 DocType: Company,Default Cash Account,Standardkassenkonto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Unternehmensstammdaten (nicht Kunde oder Lieferant)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Summe aus gezahltem Betrag + Abschreibungsbetrag kann nicht größer als Gesamtsumme sein
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ist keine gültige Chargennummer für Artikel {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Hinweis: Wenn die Zahlung nicht mit einer Referenz abgeglichen werden kann, bitte Journalbuchung manuell erstellen."
 DocType: Item,Supplier Items,Lieferantenartikel
-DocType: Opportunity,Opportunity Type,Typ der Vertriebschance
+DocType: Opportunity,Opportunity Type,Opportunity-Typ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Neue Firma
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},"Kostenstelle wird für ""Gewinn- und Verlust""-Konto {0} benötigt"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktionen können nur durch den Ersteller der Firma gelöscht werden
@@ -2736,11 +2749,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Zeile {0}: Menge nicht im Lager {1} auf {2} {3} verfügbar. Verfügbare Menge: {4}, Übertragsmenge: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Artikel 3
+DocType: Purchase Order,Customer Contact Email,Kundenservice Kontakt per E-Mail
 DocType: Event,Sunday,Sonntag
 DocType: Sales Team,Contribution (%),Beitrag (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Hinweis: Zahlungsbuchung wird nicht erstellt, da kein ""Kassen- oder Bankkonto"" angegeben wurde"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwortung
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Vorlage
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Vorlage
 DocType: Sales Person,Sales Person Name,Name des Vertriebsmitarbeiters
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Bitte mindestens eine Rechnung in die Tabelle eingeben
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Benutzer hinzufügen
@@ -2749,7 +2763,7 @@ DocType: Task,Actual Start Date (via Time Logs),Tatsächliches Start-Datum (übe
 DocType: Stock Reconciliation Item,Before reconciliation,Vor Ausgleich
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},An {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Steuern und Gebühren hinzugerechnet (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
 DocType: Sales Order,Partly Billed,Teilweise abgerechnet
 DocType: Item,Default BOM,Standardstückliste
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambern
@@ -2757,12 +2771,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Offener Gesamtbetrag
 DocType: Time Log Batch,Total Hours,Summe der Stunden
 DocType: Journal Entry,Printing Settings,Druckeinstellungen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Fahrzeugbau
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Abwesenheiten für Typ {0} sind bereits für das Geschäftsjahr {0} dem Arbeitnehmer {1} zugeteilt
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Artikel erforderlich
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metallspritzguss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Von Lieferschein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Von Lieferschein
 DocType: Time Log,From Time,Von Zeit
 DocType: Notification Control,Custom Message,Benutzerdefinierte Mitteilung
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment-Banking
@@ -2774,21 +2787,21 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand cas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisierung
 DocType: Purchase Invoice Item,Rate,Satz
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Praktikant
-DocType: Newsletter,A Lead with this email id should exist,Ein Interessent mit dieser E-Mail-Kennung sollte existieren
+DocType: Newsletter,A Lead with this email id should exist,Ein Lead mit dieser E-Mail-Kennung sollte existieren
 DocType: Stock Entry,From BOM,Von Stückliste
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundlagen
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundeinkommen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaktionen vor {0} werden gesperrt
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Bitte auf ""Zeitplan generieren"" klicken"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Für halbe Urlaubstage sollten Von-Datum und Bis-Datum gleich sein
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Bitte auf ""Zeitplan generieren"" klicken"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Für halbe Urlaubstage sollten Von-Datum und Bis-Datum gleich sein
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","z. B. Kg, Einheit, Nr, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenznr. ist zwingend erforderlich, wenn Referenz-Tag eingegeben wurde"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenznr. ist zwingend erforderlich, wenn Referenz-Tag eingegeben wurde"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Eintrittsdatum muss nach dem Geburtsdatum liegen
 DocType: Salary Structure,Salary Structure,Gehaltsstruktur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",Es existieren mehrere Preisregeln mit denselben Kriterien. Bitte diesen Konflikt durch Vergabe von Vorrangregelungen lösen. Preisregeln: {0}
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Fluggesellschaft
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Ausgabe-Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Ausgabe-Material
 DocType: Material Request Item,For Warehouse,Für Lager
 DocType: Employee,Offer Date,Angebotsdatum
 DocType: Hub Settings,Access Token,Zugriffstoken
@@ -2811,6 +2824,7 @@ DocType: Issue,Opening Time,Öffnungszeit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Von- und Bis-Daten erforderlich
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Wertpapier- & Rohstoffbörsen
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
+DocType: Delivery Note Item,From Warehouse,Ab Lager
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Bohrung
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blasformen
 DocType: Purchase Taxes and Charges,Valuation and Total,Bewertung und Summe
@@ -2832,11 +2846,12 @@ DocType: C-Form,Amended From,Abgeändert von
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Rohmaterial
 DocType: Leave Application,Follow via Email,Per E-Mail nachverfolgen
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Steuerbetrag nach Abzug von Rabatt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Für dieses Konto existiert ein Unterkonto. Sie können dieses Konto nicht löschen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Für dieses Konto existiert ein Unterkonto. Sie können dieses Konto nicht löschen.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Entweder Zielstückzahl oder Zielmenge ist zwingend erforderlich
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},für Artikel {0} existiert keine Standardstückliste
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Bitte wählen Sie zuerst Buchungsdatum
-DocType: Leave Allocation,Carry Forward,Übertragen
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},für Artikel {0} existiert keine Standardstückliste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Bitte wählen Sie zuerst Buchungsdatum
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Eröffnungsdatum sollte vor dem Abschlussdatum sein
+DocType: Leave Control Panel,Carry Forward,Übertragen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Kostenstelle mit bestehenden Transaktionen kann nicht in Sachkonto umgewandelt werden
 DocType: Department,Days for which Holidays are blocked for this department.,"Tage, an denen eine Urlaubssperre für diese Abteilung gilt."
 ,Produced,Produziert
@@ -2857,16 +2872,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Summe (Betrag)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Unterhaltung & Freizeit
 DocType: Purchase Order,The date on which recurring order will be stop,Das Datum an dem die sich wiederholende Bestellung endet
 DocType: Quality Inspection,Item Serial No,Artikel-Seriennummer
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} muss um {1} reduziert werden, oder die Überlauftoleranz sollte erhöht werden"
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} muss um {1} reduziert werden, oder die Überlauftoleranz sollte erhöht werden"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Summe Gegenwartswerte
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Stunde
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serienartikel {0} kann nicht über einen Lagerabgleich aktualisiert werden
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Material dem Lieferanten übergeben
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"""Neue Seriennummer"" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Eingangslieferschein erstellt werden"
-DocType: Lead,Lead Type,Typ des Interessenten
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Material dem Lieferanten übergeben
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"""Neue Seriennummer"" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Kaufbeleg erstellt werden"
+DocType: Lead,Lead Type,Typ des Leads
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Angebot erstellen
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Alle diese Artikel sind bereits in Rechnung gestellt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle diese Artikel sind bereits in Rechnung gestellt
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kann von {0} genehmigt werden
 DocType: Shipping Rule,Shipping Rule Conditions,Versandbedingungen
 DocType: BOM Replace Tool,The new BOM after replacement,Die neue Stückliste nach dem Austausch
@@ -2914,7 +2929,7 @@ DocType: C-Form,C-Form,Kontakt-Formular
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Arbeitsgang-ID nicht gesetzt
 DocType: Production Order,Planned Start Date,Geplanter Starttermin
 DocType: Serial No,Creation Document Type,Belegerstellungs-Typ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Serviceeinsatz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Serviceeinsatz
 DocType: Leave Type,Is Encash,Ist Inkasso
 DocType: Purchase Invoice,Mobile No,Mobilfunknummer
 DocType: Payment Tool,Make Journal Entry,Journalbuchung erstellen
@@ -2922,13 +2937,13 @@ DocType: Leave Allocation,New Leaves Allocated,Neue Urlaubszuordnung
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projektbezogene Daten sind für das Angebot nicht verfügbar
 DocType: Project,Expected End Date,Voraussichtliches Enddatum
 DocType: Appraisal Template,Appraisal Template Title,Bezeichnung der Bewertungsvorlage
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Werbung
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Werbung
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Übergeordneter Artikel {0} darf kein Lagerartikel sein
 DocType: Cost Center,Distribution Id,Verteilungs-ID
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Beeindruckende Dienstleistungen
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle Produkte oder Dienstleistungen.
 DocType: Purchase Invoice,Supplier Address,Lieferantenadresse
-DocType: Contact Us Settings,Address Line 2,Adresszeile 2
+DocType: Contact Us Settings,Address Line 2,Adresse Zeile 2
 DocType: ToDo,Reference,Referenz
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforieren
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ausgabe-Menge
@@ -2938,22 +2953,23 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Wert des Attributs {0} muss innerhalb des Bereichs von {1} bis {2} mit Schrittweite {3} liegen
 DocType: Tax Rule,Sales,Vertrieb
 DocType: Stock Entry Detail,Basic Amount,Grundbetrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
-DocType: Customer,Default Receivable Accounts,Standard-Sollkonten
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
+DocType: Leave Allocation,Unused leaves,Unbenutzte Blättern
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
+DocType: Customer,Default Receivable Accounts,Standard-Forderungskonten
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sägearbeiten
 DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminieren
 DocType: Item Reorder,Transfer,Übertragung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
-DocType: Authorization Rule,Applicable To (Employee),Anwendbar für (Mitarbeiter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
+DocType: Authorization Rule,Applicable To (Employee),Anwendbar auf (Mitarbeiter)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterverfahren
 DocType: Journal Entry,Pay To / Recd From,Zahlen an/Erhalten von
 DocType: Naming Series,Setup Series,Serie bearbeiten
 DocType: Supplier,Contact HTML,Kontakt-HTML
-DocType: Landed Cost Voucher,Purchase Receipts,Eingangslieferscheine
+DocType: Landed Cost Voucher,Purchase Receipts,Kaufbelege
 DocType: Payment Reconciliation,Maximum Amount,Höchstbetrag
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Wie wird die Preisregel angewandt?
 DocType: Quality Inspection,Delivery Note No,Lieferschein-Nummer
@@ -2961,6 +2977,7 @@ DocType: Company,Retail,Einzelhandel
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunden {0} existiert nicht
 DocType: Attendance,Absent,Abwesend
 DocType: Product Bundle,Product Bundle,Produkt-Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Ungültige Referenz {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zerkleinerung
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vorlage für Einkaufssteuern und -gebühren
 DocType: Upload Attendance,Download Template,Vorlage herunterladen
@@ -2968,16 +2985,16 @@ DocType: GL Entry,Remarks,Bemerkungen
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Rohmaterial-Artikelnummer
 DocType: Journal Entry,Write Off Based On,Abschreibung basierend auf
 DocType: Features Setup,POS View,Verkaufsstellen-Ansicht
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Installationsdatensatz für eine Seriennummer
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installationsdatensatz für eine Seriennummer
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Strangguss
-sites/assets/js/erpnext.min.js +10,Please specify a,Bitte angeben
-DocType: Offer Letter,Awaiting Response,Wartet auf Antwort
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Bitte angeben
+DocType: Offer Letter,Awaiting Response,Warte auf Antwort
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Über
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kaltschlicht-Verfahren
 DocType: Salary Slip,Earning & Deduction,Einkünfte & Abzüge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kann keine Gruppe sein
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,"Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt
 DocType: Holiday List,Weekly Off,Wöchentlich frei
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Für z. B. 2012, 2012-13"
@@ -3021,12 +3038,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Prall
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Vollformgießen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Bewirtungskosten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Kundenauftrags abgebrochen werden
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Alter
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Kundenauftrags abgebrochen werden
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alter
 DocType: Time Log,Billing Amount,Rechnungsbetrag
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ungültzige Anzahl für Artikel {0} angegeben. Anzahl sollte größer als 0 sein.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Urlaubsanträge
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Rechtskosten
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Der Tag des Monats, an dem eine automatische Bestellung erzeugt wird, z. B. 05, 28 usw."
 DocType: Sales Invoice,Posting Time,Buchungszeit
@@ -3035,9 +3052,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Hier aktivieren, wenn der Benutzer gezwungen sein soll, vor dem Speichern eine Serie auszuwählen. Bei Aktivierung gibt es keine Standardvorgabe."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Kein Artikel mit Seriennummer {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Offene Benachrichtigungen
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Offene Benachrichtigungen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte Aufwendungen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Wollen Sie wirklich diese Materialanfrage  FORTSETZEN?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Neuer Kundenumsatz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Reisekosten
 DocType: Maintenance Visit,Breakdown,Übersicht
@@ -3048,11 +3064,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Zum
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Ziehschleifen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probezeit
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lagerartikel zwingend notwendig.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lagerartikel zwingend notwendig.
 DocType: Feed,Full Name,Vollständiger Name
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Falzen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Zahlung des Gehalts für Monat {0} und Jahre {1}
-DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert Preisliste Rate, wenn sie fehlt"
+DocType: Stock Settings,Auto insert Price List rate if missing,"Preisliste automatisch einfügen, wenn sie fehlt"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Summe gezahlte Beträge
 ,Transferred Qty,Übergebene Menge
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigieren
@@ -3071,7 +3087,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Zeilen hinzufü
 DocType: Buying Settings,Default Supplier Type,Standardlieferantentyp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Abbau
 DocType: Production Order,Total Operating Cost,Gesamtbetriebskosten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle Kontakte
 DocType: Newsletter,Test Email Id,E-Mail-ID testen
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firmenkürzel
@@ -3081,7 +3097,7 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be
 DocType: Item Attribute Value,Abbreviation,Abkürzung
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Keine Berechtigung da {0} die Höchstgrenzen überschreitet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsformverfahren
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Gehalt Stammdaten.
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Stammdaten zur Gehaltsvorlage.
 DocType: Leave Type,Max Days Leave Allowed,Maximal zulässige Urlaubstage
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set Steuerregel für Einkaufswagen
 DocType: Payment Tool,Set Matching Amounts,Passende Beträge einstellen
@@ -3091,24 +3107,23 @@ apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandat
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Wagen
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Vielen Dank für Ihr Interesse an einem Abonnement unserer Aktualisierungen
 ,Qty to Transfer,Zu versendende Menge
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Angebote an Interessenten oder Kunden.
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Angebote an Leads oder Kunden.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle darf gesperrten Bestand bearbeiten
 ,Territory Target Variance Item Group-Wise,Artikelgruppenbezogene regionale Zielabweichung
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Kundengruppen
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Eltern-Konto {1} existiert nicht
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preisliste (Firmenwährung)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',"{0} {1} hat den Status ""angehalten"""
 DocType: Account,Temporary,Temporär
 DocType: Address,Preferred Billing Address,Bevorzugte Rechnungsadresse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prozentuale Aufteilung
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretärin
 DocType: Serial No,Distinct unit of an Item,Eindeutige Einheit eines Artikels
 DocType: Pricing Rule,Buying,Einkauf
-DocType: HR Settings,Employee Records to be created by,Mitarbeiter-Datensätze zu erstellen von
+DocType: HR Settings,Employee Records to be created by,Mitarbeiter-Datensätze werden erstellt nach
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Dieser Zeitprotokollstapel wurde storniert.
-,Reqd By Date,Reqd nach Datum
+,Reqd By Date,Benötigt nach Datum
 DocType: Salary Slip Earning,Salary Slip Earning,Verdienst laut Gehaltsabrechnung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Gläubiger
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Seriennummer ist obligatorisch
@@ -3117,13 +3132,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelbezogene Steuer-
 DocType: Purchase Order Item,Supplier Quotation,Lieferantenangebot
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""In Worten"" wird sichtbar, sobald Sie das Angebot speichern."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Bügeln
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} ist beendet
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ist beendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
 DocType: Lead,Add to calendar on this date,Zu diesem Datum in Kalender einfügen
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Kommende Veranstaltungen
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende Veranstaltungen
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunde ist verpflichtet
 DocType: Letter Head,Letter Head,Briefkopf
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Schnelleingabe
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,"{0} ist zwingend für ""Zurück"""
 DocType: Purchase Order,To Receive,Um zu empfangen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Schrumpftechnik
@@ -3136,35 +3152,35 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Broke
 DocType: Address,Postal Code,Postleitzahl
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","""In Minuten"" über 'Zeitprotokoll' aktualisiert"
-DocType: Customer,From Lead,Von Interessent
+DocType: Customer,From Lead,Von Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Für die Produktion freigegebene Bestellungen.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Geschäftsjahr auswählen ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
 DocType: Hub Settings,Name Token,Kürzel benennen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Hobeln
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard-Vertrieb
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindestens ein Lager ist zwingend
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindestens ein Lager ist zwingend erforderlich
 DocType: Serial No,Out of Warranty,Außerhalb der Garantie
 DocType: BOM Replace Tool,Replace,Ersetzen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Bitte die Standardmaßeinheit eingeben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Bitte die Standardmaßeinheit eingeben
 DocType: Purchase Invoice Item,Project Name,Projektname
-DocType: Supplier,Mention if non-standard receivable account,"Vermerken, wenn es sich um ein Nicht-Standard-Forderungskonto handelt"
+DocType: Supplier,Mention if non-standard receivable account,"Vermerken, wenn es sich um kein Standard-Forderungskonto handelt"
 DocType: Workflow State,Edit,Bearbeiten
 DocType: Journal Entry Account,If Income or Expense,Wenn Ertrag oder Aufwand
 DocType: Features Setup,Item Batch Nos,Artikel-Chargennummern
 DocType: Stock Ledger Entry,Stock Value Difference,Lagerwert-Differenz
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Personal
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Personal
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Zahlung zum Zahlungsabgleich
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Steueransprüche
 DocType: BOM Item,BOM No,Stücklisten-Nr.
-DocType: Contact Us Settings,Pincode,PIN-Kode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalbuchung {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen
+DocType: Contact Us Settings,Pincode,Postleitzahl (PLZ)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalbuchung {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen
 DocType: Item,Moving Average,Gleitender Durchschnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,"Die Stückliste, die ersetzt wird"
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Neue Lagermaßeinheit muss sich von aktueller Lagermaßeinheit unterscheiden
 DocType: Account,Debit,Soll
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Abwesenheiten müssen ein Vielfaches von 0,5 sein"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Abwesenheiten müssen ein Vielfaches von 0,5 sein"
 DocType: Production Order,Operation Cost,Kosten eines Arbeitsgangs
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Anwesenheiten aus einer CSV-Datei hochladen
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Offener Betrag
@@ -3172,11 +3188,10 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ziele a
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Um diese Anfrage zuzuweisen, bitte die Schaltfläche ""Zuweisen"" auf der Seitenleiste verwenden."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bestände älter als [Tage] sperren
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Wenn zwei oder mehrere Preisregeln basierend auf den oben genannten Bedingungen gefunden werden, wird eine Vorrangregelung angewandt. Priorität ist eine Zahl zwischen 0 und 20, wobei der Standardwert Null (leer) ist. Die höhere Zahl hat  Vorrang, wenn es mehrere Preisregeln zu den gleichen Bedingungen gibt."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Zu Rechnung
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Geschäftsjahr: {0} existiert nicht
 DocType: Currency Exchange,To Currency,In Währung
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Zulassen, dass die folgenden Benutzer Urlaubsanträge für Blöcke von Tagen genehmigen können."
-apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Spesenabrechnungstypen
+apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Art der Spesenabrechnung
 DocType: Item,Taxes,Steuern
 DocType: Project,Default Cost Center,Standardkostenstelle
 DocType: Purchase Invoice,End Date,Enddatum
@@ -3201,7 +3216,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Satz
 DocType: Stock Entry Detail,Additional Cost,Zusätzliche Kosten
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Enddatum des Geschäftsjahres
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden."
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Lieferantenangebot erstellen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Lieferantenangebot erstellen
 DocType: Quality Inspection,Incoming,Eingehend
 DocType: BOM,Materials Required (Exploded),Benötigte Materialien (erweitert)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Verdienst für unbezahlten Urlaub (LWP) vermindern
@@ -3209,15 +3224,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Seriennummer {1} nicht mit übereinstimmen {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Ungeplante Abwesenheit
 DocType: Batch,Batch ID,Chargen-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Hinweis: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Hinweis: {0}
 ,Delivery Note Trends,Entwicklung Lieferscheine
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Zusammenfassung dieser Woche
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} muss ein gekaufter oder unterbeauftragter Artikel in Zeile {1} sein
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} muss ein gekaufter oder unterbeauftragter Artikel in Zeile {1} sein
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kann nur über Lagertransaktionen aktualisiert werden
 DocType: GL Entry,Party,Gruppe
 DocType: Sales Order,Delivery Date,Liefertermin
 DocType: DocField,Currency,Währung
-DocType: Opportunity,Opportunity Date,Datum der Vertriebschance
+DocType: Opportunity,Opportunity Date,Datum der Opportunity
 DocType: Purchase Receipt,Return Against Purchase Receipt,Zurück zum Kaufbeleg
 DocType: Purchase Order,To Bill,Abrechnen
 DocType: Material Request,% Ordered,% Bestellt
@@ -3225,7 +3240,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,A
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
 DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
 DocType: Employee,History In Company,Historie im Unternehmen
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Newsletters
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletters
 DocType: Address,Shipping,Versand
 DocType: Stock Ledger Entry,Stock Ledger Entry,Buchung im Lagerbuch
 DocType: Department,Leave Block List,Urlaubssperrenliste
@@ -3244,7 +3259,7 @@ DocType: Account,Auditor,Prüfer
 DocType: Purchase Order,End date of current order's period,Schlußdatum der laufenden Bestellperiode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Angebotsschreiben erstellen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zurück
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Standard-Maßeinheit muss für eine Variante die gleiche wie für eine Vorlage sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standard-Maßeinheit muss für eine Variante die gleiche wie für eine Vorlage sein
 DocType: DocField,Fold,Falz
 DocType: Production Order Operation,Production Order Operation,Arbeitsgang im Fertigungsauftrag
 DocType: Pricing Rule,Disable,Deaktivieren
@@ -3276,7 +3291,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Berichte an
 DocType: SMS Settings,Enter url parameter for receiver nos,URL-Parameter für Empfängernummern eingeben
 DocType: Sales Invoice,Paid Amount,Gezahlter Betrag
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',"Abschlusskonto {0} muss vom Typ ""Verbindlichkeit"" sein"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Abschlusskonto {0} muss vom Typ ""Verbindlichkeit"" sein"
 ,Available Stock for Packing Items,Verfügbarer Bestand für Verpackungsartikel
 DocType: Item Variant,Item Variant,Artikelvariante
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Diese Adressvorlage als Standard einstellen, da es keinen anderen Standard gibt"
@@ -3284,7 +3299,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Qualitätsmanagement
 DocType: Production Planning Tool,Filter based on customer,Filtern nach Kunden
 DocType: Payment Tool Detail,Against Voucher No,Gegenbeleg-Nr.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Bitte die Menge für Artikel {0} eingeben
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Bitte die Menge für Artikel {0} eingeben
 DocType: Employee External Work History,Employee External Work History,Externe Berufserfahrung des Mitarbeiters
 DocType: Tax Rule,Purchase,Einkauf
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilanzmenge
@@ -3321,28 +3336,29 @@ Note: BOM = Bill of Materials","Fassen Sie eine Gruppe von Artikeln zu einem neu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Seriennummer ist für Artikel {0} zwingend erforderlich
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Bitte Von-/Bis-Bereich genau angeben
-sites/assets/js/desk.min.js +7652,Created By,Erstellt von
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Erstellt von
 DocType: Serial No,Under AMC,Unter jährlichem Wartungsvertrag
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Artikelpreis wird unter Einbezug von Belegen über den Einstandspreis neu berechnet
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardeinstellungen für Vertriebstransaktionen.
 DocType: BOM Replace Tool,Current BOM,Aktuelle Stückliste
-sites/assets/js/erpnext.min.js +8,Add Serial No,Seriennummer hinzufügen
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Seriennummer hinzufügen
 DocType: Production Order,Warehouses,Lager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Druck- und Schreibwaren
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppen-Knoten
 DocType: Payment Reconciliation,Minimum Amount,Mindestbetrag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Fertigwaren aktualisieren
 DocType: Workstation,per hour,pro stunde
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serie {0} bereits verwendet in {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serie {0} bereits verwendet in {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto für das Lager (Permanente Inventur) wird unter diesem Konto erstellt.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kann nicht gelöscht werden, da es Buchungen im Lagerbuch gibt."
 DocType: Company,Distribution,Großhandel
-sites/assets/js/erpnext.min.js +50,Amount Paid,Zahlbetrag
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zahlbetrag
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleiter
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Versand
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max erlaubter Rabatt für Artikel: {0} ist {1}%
 DocType: Customer,Default Taxes and Charges,Standard-Steuern und -Abgaben
 DocType: Account,Receivable,Forderung
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Nicht erlaubt den Lieferanten zu wechseln, wie Bestellung bereits vorhanden"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, die Zahlungen, die das gesetzte Kreditlimit überschreiten, durchführen darf."
 DocType: Sales Invoice,Supplier Reference,Referenznummer des Lieferanten
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Wenn aktiviert, wird die Stückliste für Unterbaugruppen-Artikel berücksichtigt, um Rohmaterialien zu bekommen. Andernfalls werden alle Unterbaugruppen-Artikel als Rohmaterial behandelt."
@@ -3379,8 +3395,8 @@ DocType: Email Digest,Add/Remove Recipients,Empfänger hinzufügen/entfernen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion für angehaltenen Fertigungsauftrag {0} nicht erlaubt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Um dieses Geschäftsjahr als Standard festzulegen, auf ""Als Standard festlegen"" anklicken"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Posteingangsserver für E-Mail-ID Support einrichten. (z. B. support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Engpassmenge
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polieren
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Bis-Datum"" ist erforderlich,"
@@ -3393,6 +3409,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Wenn eine der ausgewählten Transaktionen den Status ""versendet"" erreicht hat, geht automatisch ein E-Mail-Fenster auf, so dass eine E-Mail an die mit dieser Transaktion verknüpften Kontaktdaten gesendet wird, mit der Transaktion als Anhang.  Der Benutzer kann auswählen, ob er diese E-Mail absenden will."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Allgemeine Einstellungen
 DocType: Employee Education,Employee Education,Mitarbeiterschulung
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Es ist notwendig, um zu holen Item Details."
 DocType: Salary Slip,Net Pay,Nettolohn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Seriennummer {0} bereits erhalten
@@ -3400,7 +3417,7 @@ apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has
 DocType: Purchase Invoice,Recurring Id,Wiederkehrende ID
 DocType: Customer,Sales Team Details,Verkaufsteamdetails
 DocType: Expense Claim,Total Claimed Amount,Summe des geforderten Betrags
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Mögliche Gelegenheiten für den Vertrieb.
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Mögliche Opportunities für den Vertrieb.
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Krankheitsbedingte Abwesenheit
 DocType: Email Digest,Email Digest,Täglicher E-Mail-Bericht
 DocType: Delivery Note,Billing Address Name,Name der Rechnungsadresse
@@ -3425,7 +3442,7 @@ DocType: BOM,Manufacturing User,Fertigungs-Benutzer
 DocType: Purchase Order,Raw Materials Supplied,Gelieferte Rohmaterialien
 DocType: Purchase Invoice,Recurring Print Format,Wiederkehrendes Druckformat
 DocType: Communication,Series,Serie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum der Bestellung liegen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum der Bestellung liegen
 DocType: Appraisal,Appraisal Template,Bewertungsvorlage
 DocType: Communication,Email,E-Mail
 DocType: Item Group,Item Classification,Artikeleinteilung
@@ -3433,7 +3450,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business De
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Zweck des Wartungsbesuchs
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
 ,General Ledger,Hauptbuch
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Interessenten anzeigen
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Leads anzeigen
 DocType: Item Attribute Value,Attribute Value,Attributwert
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",E-Mail-ID muss einmalig sein; diese E-Mail-ID existiert bereits für {0}
 ,Itemwise Recommended Reorder Level,Vorgeschlagener artikelbezogener Meldebestand
@@ -3481,17 +3498,18 @@ DocType: HR Settings,Payroll Settings,Einstellungen zur Gehaltsabrechnung
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Bestellung aufgeben
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kann keine übergeordnete Kostenstelle haben
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Marke auswählen ...
 DocType: Sales Invoice,C-Form Applicable,Kontakt-Formular geeignet
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss größer als 0 für die Operation {0}
 DocType: Supplier,Address and Contacts,Adresse und Kontaktinformationen
 DocType: UOM Conversion Detail,UOM Conversion Detail,Maßeinheit-Umrechnungs-Detail
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Webfreundlich halten: 900px (breit) zu 100px (hoch)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ein Fertigungsauftrag kann nicht zu einer Artikel-Vorlage gemacht werden
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Kosten werden im Eingangslieferschein mit jedem Artikel abgeglichen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Kosten werden im Kaufbeleg mit jedem Artikel abgeglichen
 DocType: Payment Tool,Get Outstanding Vouchers,Offene Posten aufrufen
 DocType: Warranty Claim,Resolved By,Gelöst von
 DocType: Appraisal,Start Date,Startdatum
-sites/assets/js/desk.min.js +7629,Value,Wert
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Wert
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Urlaube für einen Zeitraum zuordnen.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Hier klicken um die Richtigkeit zu bestätigen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen
@@ -3507,14 +3525,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox-Zugang erlaubt
 DocType: Dropbox Backup,Weekly,Wöchentlich
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,z. B. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Erhalten
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Erhalten
 DocType: Maintenance Visit,Fully Completed,Vollständig abgeschlossen
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% abgeschlossen
 DocType: Employee,Educational Qualification,Schulische Qualifikation
 DocType: Workstation,Operating Costs,Betriebskosten
 DocType: Employee Leave Approver,Employee Leave Approver,Urlaubsgenehmiger des Mitarbeiters
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} wurde erfolgreich zu unserer Newsletter-Liste hinzugefügt.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronenstrahlbearbeitung
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Einkaufsstammdaten-Manager
@@ -3527,7 +3545,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Preise hinzufügen / bearbeiten
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Übersicht der Kostenstellen
 ,Requested Items To Be Ordered,"Angeforderte Artikel, die bestellt werden sollen"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Meine Bestellungen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Meine Bestellungen
 DocType: Price List,Price List Name,Preislistenname
 DocType: Time Log,For Manufacturing,Für die Herstellung
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Summen
@@ -3538,12 +3556,12 @@ DocType: Account,Income,Einkommen
 DocType: Industry Type,Industry Type,Wirtschaftsbranche
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Etwas ist schiefgelaufen!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Achtung: Die Urlaubsverwaltung enthält die folgenden gesperrten Daten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits versendet
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits versendet
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fertigstellungstermin
 DocType: Purchase Invoice Item,Amount (Company Currency),Betrag (Firmenwährung)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Druckguss
 DocType: Email Alert,Reference Date,Referenzdatum
-apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Vorlage Organisationseinheit (Abteilung).
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Stammdaten der Organisationseinheit (Abteilung).
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Bitte gültige Mobilnummern eingeben
 DocType: Budget Detail,Budget Detail,Budget-Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Bitte eine Nachricht vor dem Versenden eingeben
@@ -3552,10 +3570,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Jahr
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Verkaufsstellen-Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Bitte SMS-Einstellungen aktualisieren
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Zeitprotokoll {0} bereits abgerechnet
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Zeitprotokoll {0} bereits abgerechnet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Ungesicherte Kredite
 DocType: Cost Center,Cost Center Name,Kostenstellenname
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Artikel {0} mit Seriennummer {1} ist bereits installiert
 DocType: Maintenance Schedule Detail,Scheduled Date,Geplantes Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Summe gezahlte Beträge
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mitteilungen mit mehr als 160 Zeichen werden in mehrere Nachrichten aufgeteilt
@@ -3563,10 +3580,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Erhalten und akzeptiert
 ,Serial No Service Contract Expiry,Ablaufdatum des Wartungsvertrags zur Seriennummer
 DocType: Item,Unit of Measure Conversion,Maßeinheit-Konvertierung
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Mitarbeiter kann nicht verändert werden
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
 DocType: Naming Series,Help HTML,HTML-Hilfe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Summe der zugeordneten Gewichtungen sollte 100% sein. Sie ist {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Zustimmung für Artikel {1} bei Überschreitung von {0}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Zustimmung für Artikel {1} bei Überschreitung von {0}
 DocType: Address,Name of person or organization that this address belongs to.,"Name der Person oder des Unternehmens, zu dem diese Adresse gehört."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ihre Lieferanten
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
@@ -3577,10 +3594,11 @@ DocType: Lead,Converted,umgewandelt
 DocType: Item,Has Serial No,Seriennummer vorhanden
 DocType: Employee,Date of Issue,Ausstellungsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Von {0} für {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Stellen Lieferant für Artikel {1}
 DocType: Issue,Content Type,Inhaltstyp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Rechner
 DocType: Item,List this Item in multiple groups on the website.,Diesen Artikel in mehreren Gruppen auf der Webseite auflisten.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Bitte die Option Mehrfachwährung aktivieren um Konten mit anderen Währungen zu erlauben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Bitte die Option Mehrfachwährung aktivieren um Konten mit anderen Währungen zu erlauben
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Artikel: {0} ist nicht im System vorhanden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Sie haben keine Berechtigung gesperrte Werte zu setzen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nicht zugeordnete Buchungen aufrufen
@@ -3591,14 +3609,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,An Lager
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} wurde mehr als einmal für das Geschäftsjahr {1} erfasst
 ,Average Commission Rate,Durchschnittlicher Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Die Anwesenheit kann nicht für zukünftige Termine markiert werden
 DocType: Pricing Rule,Pricing Rule Help,Hilfe zur Preisregel
 DocType: Purchase Taxes and Charges,Account Head,Kontobezeichnung
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Zusatzkosten aktualisieren um die Einstandskosten des Artikels zu kalkulieren
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektro
 DocType: Stock Entry,Total Value Difference (Out - In),Gesamt-Wertdifferenz (Aus - Ein)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Row {0}: Wechselkurs ist obligatorisch
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Wechselkurs ist obligatorisch
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Benutzer-ID ist für Mitarbeiter {0} nicht eingegeben
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Strahlverfahren
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Von Garantieantrag
@@ -3607,20 +3625,22 @@ DocType: Item,Customer Code,Kunden-Nr.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Geburtstagserinnerung für {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Läppen
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Tage seit dem letzten Auftrag
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bestandskonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
 DocType: Buying Settings,Naming Series,Nummernkreis
 DocType: Leave Block List,Leave Block List Name,Urlaubssperrenliste Name
 DocType: User,Enabled,Aktiviert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Wertpapiere
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Wollen Sie wirklich alle Gehaltsabrechnungen für den Monat {0} im Jahr {1} versenden
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Wollen Sie wirklich alle Gehaltsabrechnungen für den Monat {0} im Jahr {1} versenden
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import-Abonnenten
 DocType: Target Detail,Target Qty,Zielmenge
 DocType: Attendance,Present,Gegenwart
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht versendet werden
 DocType: Notification Control,Sales Invoice Message,Mitteilung zur Ausgangsrechnung
 DocType: Authorization Rule,Based On,Beruht auf
-,Ordered Qty,Bestellte Menge
+DocType: Sales Order Item,Ordered Qty,Bestellte Menge
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Zeitraum ab Periode auf Daten obligatorisch für wiederkehrende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekthandlung/Aufgabe
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Gehaltsabrechnungen generieren
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ist keine gültige E-Mail-Kennung
@@ -3660,7 +3680,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Anwesenheit hochladen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Stückliste und Fertigungsmenge werden benötigt
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Alter Bereich 2
-DocType: Journal Entry Account,Amount,Betrag
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Betrag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nieten
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stückliste ersetzt
 ,Sales Analytics,Vertriebsanalyse
@@ -3687,7 +3707,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Voraussichtliches Datum kann nicht vor dem Datum der Materialanforderung liegen
 DocType: Contact Us Settings,City,Stadt
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultraschallbearbeitung
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Fehler: Keine gültige ID?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fehler: Keine gültige ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Artikel {0} muss ein Verkaufsartikel sein
 DocType: Naming Series,Update Series Number,Seriennummer aktualisieren
 DocType: Account,Equity,Eigenkapital
@@ -3702,22 +3722,22 @@ DocType: Purchase Taxes and Charges,Actual,Tatsächlich
 DocType: Authorization Rule,Customerwise Discount,Kundenspezifischer Rabatt
 DocType: Purchase Invoice,Against Expense Account,Zu Aufwandskonto
 DocType: Production Order,Production Order,Fertigungsauftrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits versendet
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits versendet
 DocType: Quotation Item,Against Docname,Zu Dokumentenname
 DocType: SMS Center,All Employee (Active),Alle Mitarbeiter (Aktiv)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Jetzt ansehen
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Bitte Zeitraum auswählen, zu dem die Rechnung automatisch erstellt werden soll."
 DocType: BOM,Raw Material Cost,Rohmaterialkosten
 DocType: Item,Re-Order Level,Meldebestand
-DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Geben Sie die Posten und die geplante Menge ein, für die Sie die Fertigungsaufträge erhöhen möchten, oder laden Sie Rohmaterialien für die Analyse herunter."
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt-Diagramm
+DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Geben Sie die Posten und die geplante Menge ein, für die Sie Fertigungsaufträge erstellen möchten, oder laden Sie die Rohmaterialien für die Analyse herunter."
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt-Diagramm
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Teilzeit
 DocType: Employee,Applicable Holiday List,Geltende Urlaubsliste
 DocType: Employee,Cheque,Scheck
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serie aktualisiert
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Berichtstyp ist zwingend erforderlich
 DocType: Item,Serial Number Series,Serie der Seriennummer
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Angabe des Lagers ist für Lagerartikel {0} in Zeile {1} zwingend erfoderlich
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Angabe des Lagers ist für Lagerartikel {0} in Zeile {1} zwingend erfoderlich
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Einzel- & Großhandel
 DocType: Issue,First Responded On,Zuerst geantwortet auf
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kreuzweise Auflistung des Artikels in mehreren Gruppen
@@ -3732,12 +3752,12 @@ DocType: Attendance,Attendance,Anwesenheit
 DocType: Page,No,Nein
 DocType: BOM,Materials,Materialien
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Wenn deaktiviert, muss die Liste zu jeder Abteilung, für die sie gelten soll, hinzugefügt werden."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Steuer-Vorlage für Einkaufstransaktionen.
 ,Item Prices,Artikelpreise
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"""In Worten"" wird sichtbar, sobald Sie den Lieferantenauftrag speichern."
 DocType: Period Closing Voucher,Period Closing Voucher,Periodenabschlussbeleg
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Preislisten-Vorlage.
+apps/erpnext/erpnext/config/stock.py +125,Price List master.,Preislisten-Stammdaten.
 DocType: Task,Review Date,Überprüfungsdatum
 DocType: Purchase Invoice,Advance Payments,Anzahlungen
 DocType: DocPerm,Level,Ebene
@@ -3752,9 +3772,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Verwaltungskosten
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Beratung
 DocType: Customer Group,Parent Customer Group,Übergeordnete Kundengruppe
-sites/assets/js/erpnext.min.js +50,Change,Ändern
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ändern
 DocType: Purchase Invoice,Contact Email,Kontakt-E-Mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',"Lieferantenauftrag {0} wurde ""angehalten"""
 DocType: Appraisal Goal,Score Earned,Erreichte Punktzahl
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","z. B. ""Meine Firma GmbH"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Mitteilungsfrist
@@ -3764,12 +3783,13 @@ DocType: Packing Slip,Gross Weight UOM,Bruttogewicht-Maßeinheit
 DocType: Email Digest,Receivables / Payables,Forderungen/Verbindlichkeiten
 DocType: Delivery Note Item,Against Sales Invoice,Zu Ausgangsrechnung
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempeln
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Bankkonto
 DocType: Landed Cost Item,Landed Cost Item,Einstandspreis-Artikel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Nullwerte anzeigen
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Menge eines Artikels nach der Herstellung/dem Umpacken auf Basis vorgegebener Mengen von Rohmaterial
 DocType: Payment Reconciliation,Receivable / Payable Account,Forderungen-/Verbindlichkeiten-Konto
 DocType: Delivery Note Item,Against Sales Order Item,Zu Kundenauftrags-Position
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
 DocType: Item,Default Warehouse,Standardlager
 DocType: Task,Actual End Date (via Time Logs),Tatsächliches Enddatum (über Zeitprotokoll)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kann nicht einem Gruppenkonto {0} zugeordnet werden
@@ -3781,9 +3801,9 @@ DocType: Web Page,Left,Links
 DocType: Event,All Day,Ganzer Tag
 DocType: Issue,Support Team,Support-Team
 DocType: Appraisal,Total Score (Out of 5),Gesamtwertung (max 5)
-DocType: Contact Us Settings,State,Zustand
+DocType: Contact Us Settings,State,Bundesland/Kanton
 DocType: Batch,Batch,Charge
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Saldo
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Saldo
 DocType: Project,Total Expense Claim (via Expense Claims),Gesamtforderungen auf Spesen (über Spesenabrechnungen)
 DocType: User,Gender,Geschlecht
 DocType: Journal Entry,Debit Note,Lastschrift
@@ -3797,11 +3817,10 @@ DocType: SMS Parameter,SMS Parameter,SMS-Parameter
 DocType: Maintenance Schedule Item,Half Yearly,Halbjährlich
 DocType: Lead,Blog Subscriber,Blog-Abonnent
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Regeln erstellen um Transaktionen auf Basis von Werten zu beschränken.
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Wenn aktiviert, beinhaltet die Gesamtanzahl der Arbeitstage auch Feiertage und dies reduziert den Wert des Gehalts pro Tag."
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Wenn aktiviert, beinhaltet die Gesamtanzahl der Arbeitstage auch Urlaubstage und dies reduziert den Wert des Gehalts pro Tag."
 DocType: Purchase Invoice,Total Advance,Summe der Anzahlungen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Materialanforderung fortsetzen
 DocType: Workflow State,User,Benutzer
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Gehaltsabrechnung verarbeiten
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Gehaltsabrechnung verarbeiten
 DocType: Opportunity Item,Basic Rate,Grundpreis
 DocType: GL Entry,Credit Amount,Guthaben-Summe
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,"Als ""verloren"" markieren"
@@ -3809,7 +3828,7 @@ DocType: Customer,Credit Days Based On,Zahlungsziel basierend auf
 DocType: Tax Rule,Tax Rule,Steuer-Regel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Gleiche Preise während des gesamten Verkaufszyklus beibehalten
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zeiten außerhalb der normalen Arbeitszeiten am Arbeitsplatz zulassen.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} wurde bereits gesendet
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} wurde bereits gesendet
 ,Items To Be Requested,Anzufragende Artikel
 DocType: Purchase Order,Get Last Purchase Rate,Letzten Einkaufspreis aufrufen
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Preis basierend auf Aktivitätsart (pro Stunde)
@@ -3818,6 +3837,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID der Firmen-E-Mail-Adresse wurde nicht gefunden, deshalb wird die E-Mail nicht gesendet"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Mittelverwendung (Aktiva)
 DocType: Production Planning Tool,Filter based on item,Filtern nach Artikeln
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debit Account
 DocType: Fiscal Year,Year Start Date,Startdatum des Geschäftsjahres
 DocType: Attendance,Employee Name,Mitarbeitername
 DocType: Sales Invoice,Rounded Total (Company Currency),Gerundete Gesamtsumme (Firmenwährung)
@@ -3825,18 +3845,18 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to G
 DocType: Purchase Common,Purchase Common,Einkauf Allgemein
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} wurde geändert. Bitte aktualisieren.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Benutzer davon abhalten, Urlaubsanträge für folgende Tage zu machen."
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Zu Vertriebschance
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Von Opportunity
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Stanzen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Vergünstigungen an Mitarbeiter
 DocType: Sales Invoice,Is POS,Ist POS (Point of Sales)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
 DocType: Production Order,Manufactured Qty,Hergestellte Menge
 DocType: Purchase Receipt Item,Accepted Quantity,Akzeptierte Menge
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existiert nicht
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rechnungen an Kunden
 DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Forderung {1} sein. Ausstehender Betrag ist {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Forderung {1} sein. Ausstehender Betrag ist {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} Empfänger hinzugefügt
 DocType: Maintenance Schedule,Schedule,Zeitplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Budget für diese Kostenstelle definieren. Um das Budget wirksam werden zu lassen, bitte Unternehmensliste anschauen"
@@ -3844,32 +3864,34 @@ DocType: Account,Parent Account,Übergeordnetes Konto
 DocType: Quality Inspection Reading,Reading 3,Ablesung 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Belegtyp
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
 DocType: Expense Claim,Approved,Genehmigt
 DocType: Pricing Rule,Price,Preis
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Wenn Sie „Ja“ auswählen, wird jeder Instanz dieses Artikels eine eindeutige Identität zugeteilt, die in der Vorlage Seriennummern eingesehen werden kann."
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Wenn Sie „Ja“ auswählen, wird jeder Instanz dieses Artikels eine eindeutige Identität zugeteilt, die in den Stammdaten der Seriennummern eingesehen werden kann."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Bewertung {0} für Mitarbeiter {1} im angegebenen Datumsbereich erstellt
 DocType: Employee,Education,Bildung
 DocType: Selling Settings,Campaign Naming By,Kampagne benannt durch
 DocType: Employee,Current Address Is,Aktuelle Adresse ist
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Optional. Setzt Standardwährung des Unternehmens, falls nicht angegeben."
 DocType: Address,Office,Büro
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardberichte
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Journalbuchungen
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Konto nicht mit übereinstimmen {1} / {2} in {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Verfügbare Stückzahl an ab Lager
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Konto nicht mit übereinstimmen {1} / {2} in {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Um ein Steuerkonto erstellen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Bitte das Aufwandskonto angeben
 DocType: Account,Stock,Lagerbestand
 DocType: Employee,Current Address,Aktuelle Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Wenn der Artikel eine Variante eines anderen Artikels ist, dann werden Beschreibung, Bild, Preise, Steuern usw. aus der Vorlage übernommen, sofern nicht ausdrücklich etwas angegeben ist."
 DocType: Serial No,Purchase / Manufacture Details,Einzelheiten zu Kauf / Herstellung
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Chargenbestand
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Chargenbestand
 DocType: Employee,Contract End Date,Vertragsende
 DocType: Sales Order,Track this Sales Order against any Project,Diesen Kundenauftrag in jedem Projekt nachverfolgen
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Aufträge (deren Lieferung aussteht) entsprechend der oben genannten Kriterien abrufen
 DocType: DocShare,Document Type,Dokumententyp
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Von Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Von Lieferantenangebot
 DocType: Deduction Type,Deduction Type,Abzugsart
 DocType: Attendance,Half Day,Halbtags
 DocType: Pricing Rule,Min Qty,Mindestmenge
@@ -3880,20 +3902,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Für Menge (hergestellte Menge) ist zwingend erforderlich
 DocType: Stock Entry,Default Target Warehouse,Standard-Eingangslager
 DocType: Purchase Invoice,Net Total (Company Currency),Nettosumme (Firmenwährung)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Zeile {0}: Gruppen-Typ und Gruppe sind nur auf Forderungen-/Verbindlichkeiten-Konto anwendbar
-DocType: Notification Control,Purchase Receipt Message,Eingangslieferschein-Nachricht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Zeile {0}: Gruppen-Typ und Gruppe sind nur auf Forderungen-/Verbindlichkeiten-Konto anwendbar
+DocType: Notification Control,Purchase Receipt Message,Kaufbeleg-Nachricht
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Aufteilbaren Gesamt Blätter sind mehr als Periode
 DocType: Production Order,Actual Start Date,Tatsächliches Startdatum
 DocType: Sales Order,% of materials delivered against this Sales Order,% der für diesen Kundenauftrag gelieferten Materialien
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Lagerbewegung aufzeichnen.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Lagerbewegung aufzeichnen.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter-Abonnentenliste
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Einstemmen
 DocType: Email Account,Service,Service
 DocType: Hub Settings,Hub Settings,Hub-Einstellungen
 DocType: Project,Gross Margin %,Handelsspanne %
 DocType: BOM,With Operations,Mit Arbeitsgängen
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Es wurden bereits Buchungen in der Währung {0} für Firma {1} vorgenommen. Bitte ein Forderungs- oder Verbindlichkeiten-Konto mit Währung {0} wählen.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Es wurden bereits Buchungen in der Währung {0} für Firma {1} vorgenommen. Bitte ein Forderungs- oder Verbindlichkeiten-Konto mit Währung {0} wählen.
 ,Monthly Salary Register,Übersicht monatliche Gehälter
-apps/frappe/frappe/website/template.py +123,Next,Weiter
+apps/frappe/frappe/website/template.py +140,Next,Weiter
 DocType: Warranty Claim,If different than customer address,Wenn anders als Kundenadresse
 DocType: BOM Operation,BOM Operation,Stücklisten-Vorgang
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolieren
@@ -3924,6 +3947,7 @@ DocType: Purchase Invoice,Next Date,Nächster Termin
 DocType: Employee Education,Major/Optional Subjects,Wichtiger/wahlweiser Betreff
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Bitte Steuern und Gebühren eingeben
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Maschinelle Bearbeitung
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier können Sie Familiendetails wie Namen und Beruf der Eltern, Ehepartner und Kinder pflegen"
 DocType: Hub Settings,Seller Name,Name des Verkäufers
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Steuern und Gebühren abgezogen (Firmenwährung)
@@ -3950,29 +3974,29 @@ DocType: Purchase Order,To Receive and Bill,Um zu empfangen und abzurechnen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Konstrukteur
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vorlage für Allgemeine Geschäftsbedingungen
 DocType: Serial No,Delivery Details,Lieferdetails
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatisch Materialanforderung erstellen, wenn die Menge unter diesen Wert fällt"
 ,Item-wise Purchase Register,Artikelbezogene Übersicht der Einkäufe
 DocType: Batch,Expiry Date,Verfalldatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Um den Meldebestand festzulegen, muss der Artikel ein Einkaufsartikel oder ein Fertigungsartiel sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Um den Meldebestand festzulegen, muss der Artikel ein Einkaufsartikel oder ein Fertigungsartiel sein"
 ,Supplier Addresses and Contacts,Lieferanten-Adressen und Kontaktdaten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Bitte zuerst Kategorie auswählen
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt-Stammdaten
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Kein Symbol wie $ usw. neben Währungen anzeigen.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halbtags)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halbtags)
 DocType: Supplier,Credit Days,Zahlungsziel
 DocType: Leave Type,Is Carry Forward,Ist Übertrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Artikel aus der Stückliste holen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Artikel aus der Stückliste holen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lieferzeittage
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Stückliste
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Zeile {0}: Gruppen-Typ und Gruppe sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Zeile {0}: Gruppen-Typ und Gruppe sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich
 DocType: Dropbox Backup,Send Notifications To,Benachrichtigungen senden an
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref-Datum
 DocType: Employee,Reason for Leaving,Grund für das Verlassen
 DocType: Expense Claim Detail,Sanctioned Amount,Genehmigter Betrag
 DocType: GL Entry,Is Opening,Ist Eröffnung
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Konto {0} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} existiert nicht
 DocType: Account,Cash,Bargeld
 DocType: Employee,Short biography for website and other publications.,Kurzbiographie für die Webseite und andere Publikationen.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Bitte Gehaltsstruktur für Mitarbeiter {0} erstellen
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index fa8d997492..40edbc9d48 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Λειτουργία Μισθός
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Επιλέξτε μηνιαίας κατανομή, αν θέλετε να παρακολουθείτε με βάση την εποχικότητα."
 DocType: Employee,Divorced,Διαζευγμένος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Προσοχή: Το ίδιο το στοιχείο έχει εισαχθεί πολλές φορές.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Προσοχή: Το ίδιο το στοιχείο έχει εισαχθεί πολλές φορές.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,είδη που έχουν ήδη συγχρονιστεί
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Επιτρέψτε στοιχείου να προστεθούν πολλές φορές σε μια συναλλαγή
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Ακύρωση επίσκεψης {0} πριν από την ακύρωση αυτής της αίτησης εγγύησης
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Συμπίεση συν συσσωμάτωσης
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Το νόμισμα είναι απαραίτητο για τον τιμοκατάλογο {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Θα υπολογίζεται στη συναλλαγή.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Από αίτηση υλικού
+DocType: Purchase Order,Customer Contact,Επικοινωνία Πελατών
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Από αίτηση υλικού
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Δέντρο
 DocType: Job Applicant,Job Applicant,Αιτών εργασία
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Δεν υπάρχουν άλλα αποτελέσματα.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Όνομα πελάτη
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Όλα τα πεδία που συνδέονται με εξαγωγές, όπως το νόμισμα, συντελεστής μετατροπής, το σύνολο των εξαγωγών, γενικό σύνολο των εξαγωγών κλπ είναι διαθέσιμα στο δελτίο αποστολής, POS, προσφορά, τιμολόγιο πώλησης, παραγγελίες πώλησης, κ.λ.π."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Κύριες εγγραφές (ή ομάδες) κατά τις οποίες δημιουργούνται λογιστικές εγγραφές διατηρούνται υπόλοιπα.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Η εκκρεμότητα για {0} δεν μπορεί να είναι μικρότερη από το μηδέν ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Η εκκρεμότητα για {0} δεν μπορεί να είναι μικρότερη από το μηδέν ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Προεπιλογή 10 λεπτά
 DocType: Leave Type,Leave Type Name,Όνομα τύπου άδειας 
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Η σειρά ενημερώθηκε με επιτυχία
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Πολλαπλές τιμές είδο
 DocType: SMS Center,All Supplier Contact,Όλες οι επαφές προμηθευτή
 DocType: Quality Inspection Reading,Parameter,Παράμετρος
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Αναμενόμενη ημερομηνία λήξης δεν μπορεί να είναι μικρότερη από την αναμενόμενη ημερομηνία έναρξης
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Θέλετε να συνεχίσετε την εντολή παραγωγής;
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Σειρά # {0}: Βαθμολογία πρέπει να είναι ίδιο με το {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Νέα αίτηση άδειας
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Νέα αίτηση άδειας
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Τραπεζική επιταγή
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Για να διατηρήσετε τον πελατοκεντρικό κωδικό είδους και να καταστούν προσβάσιμα με βάση τον κωδικό τους, χρησιμοποιήστε αυτή την επιλογή"
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Προβολή
 DocType: Sales Invoice Item,Quantity,Ποσότητα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Δάνεια (παθητικό )
 DocType: Employee Education,Year of Passing,Έτος περάσματος
-sites/assets/js/erpnext.min.js +27,In Stock,Σε Απόθεμα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Μπορούν να πληρώνουν κατά unbilled παραγγελία
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Σε Απόθεμα
 DocType: Designation,Designation,Ονομασία
 DocType: Production Plan Item,Production Plan Item,Είδος σχεδίου παραγωγής
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Ο χρήστης {0} έχει ήδη ανατεθεί στον εργαζομένο {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Κάνε νέα POS Προφίλ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Υγειονομική περίθαλψη
 DocType: Purchase Invoice,Monthly,Μηνιαίος
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Τιμολόγιο
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Καθυστέρηση στην πληρωμή (Ημέρες)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Τιμολόγιο
 DocType: Maintenance Schedule Item,Periodicity,Περιοδικότητα
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Διεύθυνση ηλεκτρονικού ταχυδρομείου
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Άμυνα
 DocType: Company,Abbr,Συντ.
 DocType: Appraisal Goal,Score (0-5),Αποτέλεσμα (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Γραμμή # {0}:
 DocType: Delivery Note,Vehicle No,Αρ. οχήματος
-sites/assets/js/erpnext.min.js +55,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Ξυλουργική
 DocType: Production Order Operation,Work In Progress,Εργασία σε εξέλιξη
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D εκτύπωση
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Όνομα αρχείου γονικ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Άνοιγμα θέσης εργασίας.
 DocType: Item Attribute,Increment,Προσαύξηση
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Επιλέξτε Αποθήκη ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Διαφήμιση
 DocType: Employee,Married,Παντρεμένος
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
 DocType: Payment Reconciliation,Reconcile,Συμφωνήστε
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Παντοπωλείο
 DocType: Quality Inspection Reading,Reading 1,Μέτρηση 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Δημιούργησε εγγυητική τραπέζης
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Δημιούργησε εγγυητική τραπέζης
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Ιδιωτικά ταμεία συντάξεων
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Η αποθήκη είναι απαραίτητη αν ο τύπος του λογαριασμού είναι 'Αποθήκη'
 DocType: SMS Center,All Sales Person,Όλοι οι πωλητές
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Κέντρου κόστους δια
 DocType: Warehouse,Warehouse Detail,Λεπτομέρειες αποθήκης
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Το πιστωτικό όριο έχει ξεπεραστεί για τον πελάτη {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Φορολογική Τύπος
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Δεν επιτρέπεται να προσθέσετε ή να ενημερώσετε τις καταχωρήσεις πριν από {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Δεν επιτρέπεται να προσθέσετε ή να ενημερώσετε τις καταχωρήσεις πριν από {0}
 DocType: Item,Item Image (if not slideshow),Φωτογραφία είδους (αν όχι slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Υπάρχει πελάτης με το ίδιο όνομα
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ώρα Βαθμολογήστε / 60) * Πραγματικός χρόνος λειτουργίας
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Επισκέπτης
 DocType: Quality Inspection,Get Specification Details,Βρες λεπτομέρειες προδιαγραφών
 DocType: Lead,Interested,Ενδιαφερόμενος
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Λίστα υλικών
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Άνοιγμα
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Άνοιγμα
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Από {0} έως {1}
 DocType: Item,Copy From Item Group,Αντιγραφή από ομάδα ειδών
 DocType: Journal Entry,Opening Entry,Αρχική καταχώρηση
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Ερώτηση για προϊόν 
 DocType: Standard Reply,Owner,Ιδιοκτήτης
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Παρακαλώ εισάγετε πρώτα εταιρεία 
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Επιλέξτε την εταιρεία πρώτα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Επιλέξτε την εταιρεία πρώτα
 DocType: Employee Education,Under Graduate,Τελειόφοιτος
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Στόχος στις
 DocType: BOM,Total Cost,Συνολικό κόστος
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Πρόθεμα
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Αναλώσιμα
 DocType: Upload Attendance,Import Log,Αρχείο καταγραφής εισαγωγής
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Αποστολή
+DocType: Sales Invoice Item,Delivered By Supplier,Παραδίδονται από τον προμηθευτή
 DocType: SMS Center,All Contact,Όλες οι επαφές
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Ετήσιος Μισθός
 DocType: Period Closing Voucher,Closing Fiscal Year,Κλείσιμο χρήσης
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Λογιστική εγγραφή ακύρω
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Εμφάνιση χρόνος Καταγράφει
 DocType: Journal Entry Account,Credit in Company Currency,Πιστωτικές στην Εταιρεία Νόμισμα
 DocType: Delivery Note,Installation Status,Κατάσταση εγκατάστασης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Η αποδεκτή + η απορριπτέα ποσότητα πρέπει να είναι ίση με την ληφθείσα ποσότητα για το είδος {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Η αποδεκτή + η απορριπτέα ποσότητα πρέπει να είναι ίση με την ληφθείσα ποσότητα για το είδος {0}
 DocType: Item,Supply Raw Materials for Purchase,Παροχή Πρώτων Υλών για Αγορά
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Το είδος {0} πρέπει να είναι ένα είδος αγοράς
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Κατεβάστε το πρότυπο, συμπληρώστε τα κατάλληλα δεδομένα και επισυνάψτε το τροποποιημένο αρχείο. Όλες οι ημερομηνίες και ο συνδυασμός των υπαλλήλων στην επιλεγμένη περίοδο θα εμφανιστεί στο πρότυπο, με τους υπάρχοντες καταλόγους παρουσίας"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Το είδος {0} δεν είναι ενεργό ή το τέλος της ζωής έχει περάσει
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Το είδος {0} δεν είναι ενεργό ή το τέλος της ζωής έχει περάσει
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Θα ενημερωθεί μετά τήν έκδοση του τιμολογίου πωλήσεων.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
 DocType: SMS Center,SMS Center,Κέντρο SMS 
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ίσιωμα
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Εισάγετε παρά
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Κανόνες για την εφαρμογή τιμολόγησης και εκπτώσεων.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Αυτή τη φορά Σύνδεση συγκρούσεις με {0} για {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ο τιμοκατάλογος πρέπει να ισχύει για την αγορά ή πώληση
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Η ημερομηνία εγκατάστασης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παράδοσης για το είδος {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Η ημερομηνία εγκατάστασης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παράδοσης για το είδος {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Έκπτωση στις Τιμοκατάλογος Ποσοστό (%)
-sites/assets/js/form.min.js +279,Start,Αρχή
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Αρχή
 DocType: User,First Name,Όνομα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Οι ρυθμίσεις σας είναι πλήρεις. Ανανέωση...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Πλήρη φόρμα χύτευση
 DocType: Offer Letter,Select Terms and Conditions,Επιλέξτε Όροι και Προϋποθέσεις
 DocType: Production Planning Tool,Sales Orders,Παραγγελίες πωλήσεων
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Κατά το είδος στο τιμολόγιο πώλησης
 ,Production Orders in Progress,Εντολές παραγωγής σε εξέλιξη
 DocType: Lead,Address & Contact,Διεύθυνση & Επαφή
+DocType: Leave Allocation,Add unused leaves from previous allocations,Προσθήκη αχρησιμοποίητα φύλλα από προηγούμενες κατανομές
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Το επόμενο επαναλαμβανόμενο {0} θα δημιουργηθεί στις {1}
 DocType: Newsletter List,Total Subscribers,Σύνολο Συνδρομητές
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Όνομα επαφής
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,Εκκρεμής ποσότητα 
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Δημιουργεί βεβαίωση αποδοχών για τα προαναφερόμενα κριτήρια.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Αίτηση αγοράς.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Διπλό περίβλημα
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Η ημερομηνία απαλλαγής πρέπει να είναι μεταγενέστερη από την ημερομηνία ένταξης
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Αφήνει ανά έτος
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Παρακαλώ ορίστε Ονομασία σειράς για {0} μέσω Ρύθμιση> Ρυθμίσεις> Ονομασία σειράς
 DocType: Time Log,Will be updated when batched.,Θα ενημερωθεί με την παρτίδα.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Γραμμή {0}: παρακαλώ επιλέξτε το «είναι προκαταβολή» έναντι του λογαριασμού {1} αν αυτό είναι μια καταχώρηση προκαταβολής.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Γραμμή {0}: παρακαλώ επιλέξτε το «είναι προκαταβολή» έναντι του λογαριασμού {1} αν αυτό είναι μια καταχώρηση προκαταβολής.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Η αποθήκη {0} δεν ανήκει στην εταιρεία {1}
 DocType: Bulk Email,Message,Μήνυμα
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox access key
 DocType: Payment Tool,Reference No,Αριθμός αναφοράς
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Η άδεια εμποδίστηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
 DocType: Stock Entry,Sales Invoice No,Αρ. Τιμολογίου πώλησης
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Ελάχιστη ποσότητα παραγγε
 DocType: Pricing Rule,Supplier Type,Τύπος προμηθευτή
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Θέση {0} δεν βρέθηκε στο «πρώτες ύλες που προμηθεύεται« πίνακα Εντολή Αγοράς {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Έλεγχος ενημερώ
 DocType: Lead,Suggestions,Προτάσεις
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Ορισμός προϋπολογισμών ανά ομάδα είδους για αυτήν την περιοχή. Μπορείτε επίσης να συμπεριλάβετε εποχικότητα ρυθμίζοντας τη διανομή.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Παρακαλώ εισάγετε την γονική ομάδα λογαριασμού για την αποθήκη {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Πληρωμή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερη από ό, τι οφειλόμενο ποσό {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Πληρωμή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερη από ό, τι οφειλόμενο ποσό {2}"
 DocType: Supplier,Address HTML,Διεύθυνση ΗΤΜΛ
 DocType: Lead,Mobile No.,Αρ. Κινητού
 DocType: Maintenance Schedule,Generate Schedule,Δημιούργησε πρόγραμμα
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Νέα Μ.Μ.Αποθέματο
 DocType: Period Closing Voucher,Closing Account Head,Κλείσιμο κύριας εγγραφής λογαριασμού
 DocType: Employee,External Work History,Ιστορικό εξωτερικής εργασίας
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Κυκλικού λάθους Αναφορά
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Θέλετε σίγουρα να διακόψετε; 
 DocType: Communication,Closed,Κλειστό
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Με λόγια (εξαγωγή) θα είναι ορατά αφού αποθηκεύσετε το δελτίο αποστολής.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Είστε σίγουρος πως θέλετε να σταματήσετε
 DocType: Lead,Industry,Βιομηχανία
 DocType: Employee,Job Profile,Προφίλ εργασίας
 DocType: Newsletter,Newsletter,Ενημερωτικό δελτίο
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Δελτίο αποστολής
 DocType: Dropbox Backup,Allow Dropbox Access,Επίτρεψε πρόσβαση στο dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ρύθμιση Φόροι
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Περίληψη για αυτή την εβδομάδα και εν αναμονή δραστηριότητες
 DocType: Workstation,Rent Cost,Κόστος ενοικίασης
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Παρακαλώ επιλέξτε μήνα και έτος
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Ισοτιμία με την οποία το νόμισμα του πελάτη μετατρέπεται στο βασικό νόμισμα του πελάτη
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Διαθέσιμο σε Λ.Υ., Δελτίο αποστολής, τιμολόγιο αγοράς, αίτηση παραγωγής, παραγγελία αγοράς, αποδεικτικό παραλαβής αγοράς, τιμολόγιο πωλήσεων, παραγγελίες πώλησης, καταχώρηση αποθέματος, φύλλο κατανομής χρόνου"
 DocType: Item Tax,Tax Rate,Φορολογικός συντελεστής
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Επιλέξτε Προϊόν
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Επιλέξτε Προϊόν
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Το είδος: {0} όσον αφορά παρτίδες, δεν μπορεί να συμφωνηθεί με τη χρήση \ συμφωνιών αποθέματος, χρησιμοποιήστε καταχωρήσεις αποθέματος"""
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Σειρά # {0}: Παρτίδα Δεν πρέπει να είναι ίδιο με το {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Μετατροπή σε μη-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Το αποδεικτικό παραλαβής αγοράς πρέπει να υποβληθεί
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Τρέχουσα Μ.Μ. Α
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Παρτίδας (lot) ενός είδους.
 DocType: C-Form Invoice Detail,Invoice Date,Ημερομηνία τιμολογίου
 DocType: GL Entry,Debit Amount,Χρεωστικό ποσό
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Μπορεί να υπάρχει μόνο 1 λογαριασμός ανά εταιρεία σε {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Μπορεί να υπάρχει μόνο 1 λογαριασμός ανά εταιρεία σε {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Η διεύθυνση email σας
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Παρακαλώ δείτε συνημμένο
 DocType: Purchase Order,% Received,% Παραλήφθηκε
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Οδηγίες
 DocType: Quality Inspection,Inspected By,Επιθεωρήθηκε από
 DocType: Maintenance Visit,Maintenance Type,Τύπος συντήρησης
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Ο σειριακός αριθμός {0} δεν ανήκει στο δελτίο αποστολής {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Ο σειριακός αριθμός {0} δεν ανήκει στο δελτίο αποστολής {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Παράμετρος ελέγχου ποιότητας είδους
 DocType: Leave Application,Leave Approver Name,Όνομα υπευθύνου έγκρισης άδειας
 ,Schedule Date,Ημερομηνία χρονοδιαγράμματος
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Ταμείο αγορών
 DocType: Landed Cost Item,Applicable Charges,Ισχύουσες χρεώσεις
 DocType: Workstation,Consumable Cost,Κόστος αναλώσιμων
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
 DocType: Purchase Receipt,Vehicle Date,Όχημα Ημερομηνία
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Ιατρικός
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Αιτιολογία απώλειας
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% Εγκατεστημένο
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Παρακαλώ εισάγετε πρώτα το όνομα της εταιρείας
 DocType: BOM,Item Desription,Περιγραφή είδους
 DocType: Purchase Invoice,Supplier Name,Όνομα προμηθευτή
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Διαβάστε το Εγχειρίδιο ERPNext
 DocType: Account,Is Group,Είναι η ομάδα
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Αυτόματη Ρύθμιση αύξοντες αριθμούς με βάση FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Ελέγξτε Προμηθευτής Αριθμός Τιμολογίου Μοναδικότητα
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Διαχειρι
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Παγκόσμια ρυθμίσεις για όλες τις διαδικασίες κατασκευής.
 DocType: Accounts Settings,Accounts Frozen Upto,Παγωμένοι λογαριασμοί μέχρι
 DocType: SMS Log,Sent On,Εστάλη στις
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Κύρια εγγραφή αργιών.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Χύτευση κέλυφος
 DocType: Material Request Item,Required Date,Απαιτούμενη ημερομηνία
 DocType: Delivery Note,Billing Address,Διεύθυνση χρέωσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
 DocType: BOM,Costing,Κοστολόγηση
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Εάν είναι επιλεγμένο, το ποσό του φόρου θα πρέπει να θεωρείται ότι έχει ήδη συμπεριληφθεί στην τιμή / ποσό εκτύπωσης"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Συνολική ποσότητα
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Χρόνου 
 DocType: Customer,Buyer of Goods and Services.,Αγοραστής αγαθών και υπηρεσιών.
 DocType: Journal Entry,Accounts Payable,Πληρωτέοι λογαριασμοί 
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Προσθήκη Συνδρομητές
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" Δεν υπάρχει"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Δεν υπάρχει"
 DocType: Pricing Rule,Valid Upto,Ισχύει μέχρι
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους πελάτες σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Άμεσα έσοδα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Δεν μπορείτε να φιλτράρετε με βάση λογαριασμό, εάν είναι ομαδοποιημένες ανά λογαριασμό"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Διοικητικός λειτουργός
 DocType: Payment Tool,Received Or Paid,Παραληφθέντα ή πληρωθέντα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Επιλέξτε Εταιρεία
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Επιλέξτε Εταιρεία
 DocType: Stock Entry,Difference Account,Λογαριασμός διαφορών
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Δεν μπορεί να κλείσει το έργο ως εξαρτώμενη εργασία του {0} δεν έχει κλείσει.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
 DocType: Production Order,Additional Operating Cost,Πρόσθετο λειτουργικό κόστος
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Καλλυντικά
 DocType: DocField,Type,Τύπος
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
 DocType: Communication,Subject,Θέμα
 DocType: Shipping Rule,Net Weight,Καθαρό βάρος
 DocType: Employee,Emergency Phone,Τηλέφωνο έκτακτης ανάγκης
 ,Serial No Warranty Expiry,Ημερομηνία λήξης της εγγύησης του σειριακού αριθμού
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Θέλετε πραγματικά να διακόψετε αυτήν την αίτηση υλικού;
 DocType: Sales Order,To Deliver,Να Παραδώσει
 DocType: Purchase Invoice Item,Item,Είδος
 DocType: Journal Entry,Difference (Dr - Cr),Διαφορά ( dr - cr )
 DocType: Account,Profit and Loss,Κέρδη και ζημιές
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Διαχείριση της υπεργολαβίας
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Διαχείριση της υπεργολαβίας
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Η νέα Μ.Μ. δεν πρέπει να είναι του τύπου ακέραιος αριθμός
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Έπιπλα και λοιπός εξοπλισμός
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Ισοτιμία με την οποία το νόμισμα τιμοκαταλόγου μετατρέπεται στο βασικό νόμισμα της εταιρείας
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Προσθήκη / επε
 DocType: Purchase Invoice,Supplier Invoice No,Αρ. τιμολογίου του προμηθευτή
 DocType: Territory,For reference,Για αναφορά
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Δεν μπορείτε να διαγράψετε Αύξων αριθμός {0}, όπως χρησιμοποιείται στις συναλλαγές μετοχών"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Κλείσιμο (cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Κλείσιμο (cr)
 DocType: Serial No,Warranty Period (Days),Περίοδος εγγύησης (ημέρες)
 DocType: Installation Note Item,Installation Note Item,Είδος σημείωσης εγκατάστασης
 ,Pending Qty,Εν αναμονή Ποσότητα
@@ -521,8 +521,9 @@ DocType: Sales Order,Billing and Delivery Status,Χρέωση και Παράδ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Επαναλαμβανόμενοι πελάτες
 DocType: Leave Control Panel,Allocate,Κατανομή
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Προηγούμενο
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Επιστροφή πωλήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Επιστροφή πωλήσεων
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Επιλέξτε παραγγελίες πώλησης από τις οποίες θέλετε να δημιουργήσετε εντολές παραγωγής.
+DocType: Item,Delivered by Supplier (Drop Ship),Δημοσιεύθηκε από τον Προμηθευτή (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Συνιστώσες του μισθού.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Βάση δεδομένων των δυνητικών πελατών.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Βάση δεδομένων των πελατών.
@@ -533,7 +534,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Η ανατροπή
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Μια λογική αποθήκη στην οποία θα γίνονται οι καταχωρήσεις αποθέματος
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Ο αρ. αναφοράς & η ημερομηνία αναφοράς για {0} είναι απαραίτητες.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Ο αρ. αναφοράς & η ημερομηνία αναφοράς για {0} είναι απαραίτητες.
 DocType: Event,Wednesday,Τετάρτη
 DocType: Sales Invoice,Customer's Vendor,Πωλητής πελάτη
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Η εντολή παραγωγής είναι υποχρεωτική
@@ -566,8 +567,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Παράμετρος παραλήπτη
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Τα πεδία με βάση και ομαδοποίηση κατά δεν μπορεί να είναι ίδια
 DocType: Sales Person,Sales Person Targets,Στόχοι πωλητή
-sites/assets/js/form.min.js +271,To,Έως
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Παρακαλώ εισάγετε τη διεύθυνση email
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Έως
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Παρακαλώ εισάγετε τη διεύθυνση email
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Άκρο του σωλήνα που σχηματίζουν
 DocType: Production Order Operation,In minutes,Σε λεπτά
 DocType: Issue,Resolution Date,Ημερομηνία επίλυσης
@@ -584,7 +585,7 @@ DocType: Activity Cost,Projects User,Χρήστης έργων
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,šΚαταναλώθηκε
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Δεν βρέθηκε στον πίνακα στοιχείων τιμολογίου
 DocType: Company,Round Off Cost Center,Στρογγυλεύουν Κέντρο Κόστους
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Η επίσκεψη συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Η επίσκεψη συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 DocType: Material Request,Material Transfer,Μεταφορά υλικού
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Άνοιγμα ( dr )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Η χρονοσήμανση αποστολής πρέπει να είναι μεταγενέστερη της {0}
@@ -592,9 +593,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Ρυθμίσεις
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Φόροι και εβπιβαρύνσεις κόστους αποστολής εμπορευμάτων
 DocType: Production Order Operation,Actual Start Time,Πραγματική ώρα έναρξης
 DocType: BOM Operation,Operation Time,Χρόνος λειτουργίας
-sites/assets/js/list.min.js +5,More,Περισσότερο
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Περισσότερο
 DocType: Pricing Rule,Sales Manager,Διευθυντής πωλήσεων
-sites/assets/js/desk.min.js +7673,Rename,Μετονομασία
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Μετονομασία
 DocType: Journal Entry,Write Off Amount,Διαγραφή ποσού
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Κάμψη
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Επίτρεψε χρήστη
@@ -610,13 +611,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Ευθεία διάτμηση
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Για να παρακολουθήσετε το είδος στα παραστατικά πωλήσεων και αγοράς με βάση τους σειριακούς τους αριθμούς. Μπορεί επίσης να χρησιμοποιηθεί για να παρακολουθείτε τις λεπτομέρειες της εγγύησης του προϊόντος.
 DocType: Purchase Receipt Item Supplied,Current Stock,Τρέχον απόθεμα
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Η αποθήκη απορριφθέντων είναι απαραίτητη για το είδος που απορρίφθηκε
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Η αποθήκη απορριφθέντων είναι απαραίτητη για το είδος που απορρίφθηκε
 DocType: Account,Expenses Included In Valuation,Δαπάνες που περιλαμβάνονται στην αποτίμηση
 DocType: Employee,Provide email id registered in company,Παρέχετε ένα email ID εγγεγραμμένο στην εταιρεία
 DocType: Hub Settings,Seller City,Πόλη πωλητή
 DocType: Email Digest,Next email will be sent on:,Το επόμενο μήνυμα email θα αποσταλεί στις:
 DocType: Offer Letter Term,Offer Letter Term,Προσφορά Επιστολή Όρος
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Στοιχείο έχει παραλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Το είδος {0} δεν βρέθηκε
 DocType: Bin,Stock Value,Αξία των αποθεμάτων
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Τύπος δέντρου
@@ -631,11 +632,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Καλωσόρισμα
 DocType: Journal Entry,Credit Card Entry,Καταχώηρση πιστωτικής κάρτας
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Θέμα εργασίας
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Τα εμπορεύματα παραλήφθηκαν από τους προμηθευτές.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Τα εμπορεύματα παραλήφθηκαν από τους προμηθευτές.
 DocType: Communication,Open,Ανοιχτό
 DocType: Lead,Campaign Name,Όνομα εκστρατείας
 ,Reserved,Δεσμευμένη
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Θέλετε πραγματικά να συνεχιστεί; 
 DocType: Purchase Order,Supply Raw Materials,Παροχή Πρώτων Υλών
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Η ημερομηνία κατά την οποία θα δημιουργηθεί το επόμενο τιμολόγιο. Δημιουργείται με την υποβολή.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Τρέχον ενεργητικό
@@ -651,7 +651,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Αρ. παραγγελίας αγοράς πελάτη 
 DocType: Employee,Cell Number,Αριθμός κινητού
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Απολεσθέν
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα εγγυητική στη στήλη 'κατά λογιστική εγγραφή'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα εγγυητική στη στήλη 'κατά λογιστική εγγραφή'
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Ενέργεια
 DocType: Opportunity,Opportunity From,Ευκαιρία από
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Μηνιαία κατάσταση μισθοδοσίας.
@@ -721,7 +721,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Υποχρέωση
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Κυρώσεις Το ποσό δεν μπορεί να είναι μεγαλύτερη από την αξίωση Ποσό στη σειρά {0}.
 DocType: Company,Default Cost of Goods Sold Account,Προεπιλογή Κόστος Πωληθέντων Λογαριασμού
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
 DocType: Employee,Family Background,Ιστορικό οικογένειας
 DocType: Process Payroll,Send Email,Αποστολή email
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Δεν έχετε άδεια
@@ -732,7 +732,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Αριθμ
 DocType: Item,Items with higher weightage will be shown higher,Τα στοιχεία με υψηλότερες weightage θα δείξει υψηλότερη
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Λεπτομέρειες συμφωνίας τραπεζικού λογαριασμού
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Τιμολόγια μου
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Δεν βρέθηκε υπάλληλος
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Δεν βρέθηκε υπάλληλος
 DocType: Purchase Order,Stopped,Σταματημένη
 DocType: Item,If subcontracted to a vendor,Αν υπεργολαβία σε έναν πωλητή
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Επιλέξτε BOM για να ξεκινήσετε
@@ -741,7 +741,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Ανεβ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Αποστολή τώρα
 ,Support Analytics,Στατιστικά στοιχεία υποστήριξης
 DocType: Item,Website Warehouse,Αποθήκη δικτυακού τόπου
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Θέλετε σίγουρα να σταματήσετε αυτήν την Εντολή Παραγωγής;
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Η ημέρα του μήνα κατά την οποίο θα δημιουργηθεί το αυτοματοποιημένο τιμολόγιο, π.Χ. 05, 28 Κλπ"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Το αποτέλεσμα πρέπει να είναι μικρότερο από ή ίσο με 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-form εγγραφές
@@ -751,12 +750,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Ερ
 DocType: Features Setup,"To enable ""Point of Sale"" features",Για να ενεργοποιήσετε το "Point of Sale" χαρακτηριστικά
 DocType: Bin,Moving Average Rate,Κινητή μέση τιμή
 DocType: Production Planning Tool,Select Items,Επιλέξτε είδη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} ​​της {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} ​​της {2}
 DocType: Comment,Reference Name,Όνομα αναφοράς
 DocType: Maintenance Visit,Completion Status,Κατάσταση ολοκλήρωσης
 DocType: Sales Invoice Item,Target Warehouse,Αποθήκη προορισμού
 DocType: Item,Allow over delivery or receipt upto this percent,Επιτρέψτε πάνω από την παράδοση ή την παραλαβή μέχρι αυτή τη τοις εκατό
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας πωλήσεων
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας πωλήσεων
 DocType: Upload Attendance,Import Attendance,Εισαγωγή συμμετοχών
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Όλες οι ομάδες ειδών
 DocType: Process Payroll,Activity Log,Αρχείο καταγραφής δραστηριότητας
@@ -764,7 +763,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
 DocType: Production Order,Item To Manufacture,Είδος προς κατασκευή
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Μόνιμη καλούπι
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Εντολή Αγοράς για Πληρωμή
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} κατάσταση είναι {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Εντολή Αγοράς για Πληρωμή
 DocType: Sales Order Item,Projected Qty,Προβλεπόμενη ποσότητα
 DocType: Sales Invoice,Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής
 DocType: Newsletter,Newsletter Manager,Ενημερωτικό Δελτίο Διευθυντής
@@ -788,8 +788,8 @@ DocType: SMS Log,Requested Numbers,Αιτήματα Αριθμοί
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Αξιολόγηση της απόδοσης.
 DocType: Sales Invoice Item,Stock Details,Χρηματιστήριο Λεπτομέρειες
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Αξία έργου
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Δεν είναι δυνατή η μεταφορά προς τα εμπρός {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Δεν είναι δυνατή η μεταφορά προς τα εμπρός {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Το υπόλοιπο του λογαριασμού είναι ήδη πιστωτικό, δεν επιτρέπεται να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι χρεωστικό"
 DocType: Account,Balance must be,Το υπόλοιπο πρέπει να
 DocType: Hub Settings,Publish Pricing,Δημοσιεύστε τιμολόγηση
@@ -811,7 +811,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
 ,Received Items To Be Billed,Είδη που παραλήφθηκαν και πρέπει να τιμολογηθούν
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Λειαντικά ανατινάξεις
-sites/assets/js/desk.min.js +3938,Ms,Κα
+DocType: Employee,Ms,Κα
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Κύρια εγγραφή συναλλαγματικής ισοτιμίας.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
 DocType: Production Order,Plan material for sub-assemblies,Υλικό σχεδίου για τα υποσυστήματα
@@ -833,29 +833,31 @@ DocType: Purchase Receipt,Range,Εύρος
 DocType: Supplier,Default Payable Accounts,Προεπιλεγμένοι λογαριασμοί πληρωτέων
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
 DocType: Features Setup,Item Barcode,Barcode είδους
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς 
 DocType: Address,Shop,Κατάστημα
 DocType: Hub Settings,Sync Now,Συγχρονισμός τώρα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Γραμμή {0} : μια πιστωτική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Γραμμή {0} : μια πιστωτική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Ο προεπιλεγμένος λογαριασμός τραπέζης / μετρητών θα ενημερώνεται αυτόματα στην έκδοση τιμολογίου POS, όταν επιλέγεται αυτός ο τρόπος."
 DocType: Employee,Permanent Address Is,Η μόνιμη διεύθυνση είναι
 DocType: Production Order Operation,Operation completed for how many finished goods?,Για πόσα τελικά προϊόντα ολοκληρώθηκε η λειτουργία;
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Το εμπορικό σήμα
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}.
 DocType: Employee,Exit Interview Details,Λεπτομέρειες συνέντευξης εξόδου 
 DocType: Item,Is Purchase Item,Είναι είδος αγοράς
 DocType: Journal Entry Account,Purchase Invoice,Τιμολόγιο αγοράς
 DocType: Stock Ledger Entry,Voucher Detail No,Αρ. λεπτομερειών αποδεικτικού
 DocType: Stock Entry,Total Outgoing Value,Συνολική εξερχόμενη αξία
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Ημερομηνία ανοίγματος και καταληκτική ημερομηνία θα πρέπει να είναι εντός της ίδιας Χρήσεως
 DocType: Lead,Request for Information,Αίτηση για πληροφορίες
 DocType: Payment Tool,Paid,Πληρωμένο
 DocType: Salary Slip,Total in words,Σύνολο ολογράφως
 DocType: Material Request Item,Lead Time Date,Ημερομηνία ανοχής χρόνου
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,είναι υποχρεωτική. Ίσως συναλλάγματος αρχείο δεν έχει δημιουργηθεί για
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Γραμμή # {0}: παρακαλώ ορίστε σειριακό αριθμό για το είδος {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Για τα στοιχεία «Προϊόν Bundle», Αποθήκη, Αύξων αριθμός παρτίδας και Δεν θα θεωρηθεί από την «Packing List» πίνακα. Αν Αποθήκης και Μαζική Δεν είναι ίδιες για όλα τα είδη συσκευασίας για τη θέση του κάθε «Πακέτο Προϊόντων», οι αξίες αυτές μπορούν να εγγραφούν στον κύριο πίνακα Στοιχείο, οι τιμές θα αντιγραφούν στο «Packing List» πίνακα."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Αποστολές προς τους πελάτες.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Αποστολές προς τους πελάτες.
 DocType: Purchase Invoice Item,Purchase Order Item,Είδος παραγγελίας αγοράς 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Έμμεσα έσοδα
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Καθορίστε το ποσό πληρωμής = οφειλόμενο ποσό
@@ -863,13 +865,14 @@ DocType: Contact Us Settings,Address Line 1,Γραμμή διεύθυνσης 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Διακύμανση
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Όνομα εταιρείας
 DocType: SMS Center,Total Message(s),Σύνολο μηνυμάτων
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Δείτε μια λίστα με όλα τα βίντεο βοήθειας
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Επιλέξτε την κύρια εγγραφή λογαριασμού της τράπεζας όπου κατατέθηκε η επιταγή.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Επίτρεψε στο χρήστη να επεξεργάζεται τιμές τιμοκατάλογου στις συναλλαγές
 DocType: Pricing Rule,Max Qty,Μέγιστη ποσότητα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Γραμμή {0}:η πληρωμή έναντι πωλήσεων / παραγγελιών αγοράς θα πρέπει πάντα να επισημαίνεται ως προκαταβολή
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Γραμμή {0}:η πληρωμή έναντι πωλήσεων / παραγγελιών αγοράς θα πρέπει πάντα να επισημαίνεται ως προκαταβολή
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Χημικό
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
 DocType: Process Payroll,Select Payroll Year and Month,Επιλέξτε Μισθοδοσίας Έτος και Μήνας
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Πηγαίνετε στην κατάλληλη ομάδα (συνήθως Εφαρμογή των Ταμείων> Κυκλοφορούν Ενεργητικό> τραπεζικούς λογαριασμούς και να δημιουργήσετε ένα νέο λογαριασμό (κάνοντας κλικ στην επιλογή Προσθήκη Παιδί) του τύπου "Τράπεζα"
 DocType: Workstation,Electricity Cost,Κόστος ηλεκτρικής ενέργειας
@@ -884,7 +887,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Λε
 DocType: SMS Center,All Lead (Open),Όλες οι επαφές (ανοιχτές)
 DocType: Purchase Invoice,Get Advances Paid,Βρες προκαταβολές που καταβλήθηκαν
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Επισύναψη της εικόνα σας
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Δημιούργησε
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Δημιούργησε
 DocType: Journal Entry,Total Amount in Words,Συνολικό ποσό ολογράφως
 DocType: Workflow State,Stop,Διακοπή
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Υπήρξε ένα σφάλμα. Ένας πιθανός λόγος θα μπορούσε να είναι ότι δεν έχετε αποθηκεύσει τη φόρμα. Παρακαλώ επικοινωνήστε με το support@erpnext.Com εάν το πρόβλημα παραμένει.
@@ -908,7 +911,7 @@ DocType: Packing Slip Item,Packing Slip Item,Είδος δελτίου συσκ
 DocType: POS Profile,Cash/Bank Account,Λογαριασμός μετρητών/τραπέζης
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Planning Tool,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Υποβολή
@@ -919,12 +922,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Θα πρέπε
 DocType: Project,Internal,Εσωτερικός
 DocType: Task,Urgent,Επείγον
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Παρακαλείστε να προσδιορίσετε μια έγκυρη ταυτότητα Σειρά για τη σειρά {0} στο τραπέζι {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Μετάβαση στην επιφάνεια εργασίας και να αρχίσετε να χρησιμοποιείτε ERPNext
 DocType: Item,Manufacturer,Κατασκευαστής
 DocType: Landed Cost Item,Purchase Receipt Item,Είδος αποδεικτικού παραλαβής αγοράς 
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Αποθήκη δεσμευμένων στις παραγγελίες πωλησης/ αποθήκη έτοιμων προϊόντων
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Ποσό πώλησης
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Αρχεία καταγραφής χρονολογίου
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Είστε ο υπεύθυνος έγκρισης δαπανών για αυτή την εγγραφή. Ενημερώστε την κατάσταση και αποθηκεύστε
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Είστε ο υπεύθυνος έγκρισης δαπανών για αυτή την εγγραφή. Ενημερώστε την κατάσταση και αποθηκεύστε
 DocType: Serial No,Creation Document No,Αρ. εγγράφου δημιουργίας 
 DocType: Issue,Issue,Έκδοση
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Χαρακτηριστικά για τις διαμορφώσεις του είδους. Π.Χ. Μέγεθος, χρώμα κ.λ.π."
@@ -939,8 +943,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
 DocType: Opportunity,Contact Info,Πληροφορίες επαφής
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Κάνοντας Χρηματιστήριο Καταχωρήσεις
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Κάνοντας Χρηματιστήριο Καταχωρήσεις
 DocType: Packing Slip,Net Weight UOM,Μ.Μ. Καθαρού βάρους
 DocType: Item,Default Supplier,Προεπιλεγμένος προμηθευτής
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Πάνω Παραγωγής Επίδομα Ποσοστό
@@ -949,7 +954,7 @@ DocType: Features Setup,Miscelleneous,Διάφορα
 DocType: Holiday List,Get Weekly Off Dates,Βρες ημερομηνίες εβδομαδιαίων αργιών
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Η ημερομηνία λήξης δεν μπορεί να είναι προγενέστερη της ημερομηνίας έναρξης
 DocType: Sales Person,Select company name first.,Επιλέξτε το όνομα της εταιρείας πρώτα.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Προσφορές που λήφθηκαν από προμηθευτές.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Έως {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,ενημερώνεται μέσω χρόνος Καταγράφει
@@ -977,7 +982,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Αριθμοί μητρώου των επιχειρήσεων για την αναφορά σας. Αριθμοί φόρου κ.λ.π.
 DocType: Sales Partner,Distributor,Διανομέας
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Κανόνες αποστολής καλαθιού αγορών
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 ,Ordered Items To Be Billed,Παραγγελθέντα είδη για τιμολόγηση
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Από το φάσμα πρέπει να είναι μικρότερη από ό, τι στην γκάμα"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Επιλέξτε αρχεία καταγραφής χρονολογίου και πατήστε υποβολή για να δημιουργηθεί ένα νέο τιμολόγιο πώλησης
@@ -1025,7 +1030,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Φορο
 DocType: Lead,Lead,Επαφή
 DocType: Email Digest,Payables,Υποχρεώσεις
 DocType: Account,Warehouse,Αποθήκη
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Σειρά # {0}: Απορρίφθηκε Ποσότητα δεν μπορούν να εισαχθούν στην Αγορά Επιστροφή
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Σειρά # {0}: Απορρίφθηκε Ποσότητα δεν μπορούν να εισαχθούν στην Αγορά Επιστροφή
 ,Purchase Order Items To Be Billed,Είδη παραγγελίας αγοράς προς χρέωση
 DocType: Purchase Invoice Item,Net Rate,Καθαρή Τιμή
 DocType: Purchase Invoice Item,Purchase Invoice Item,Είδος τιμολογίου αγοράς 
@@ -1040,11 +1045,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Μη συμφωνη
 DocType: Global Defaults,Current Fiscal Year,Τρέχουσα χρήση
 DocType: Global Defaults,Disable Rounded Total,Απενεργοποίηση στρογγυλοποίησης συνόλου
 DocType: Lead,Call,Κλήση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Διπλότυπη γραμμή {0} με το ίδιο {1}
 ,Trial Balance,Ισοζύγιο
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Ρύθμιση εργαζόμενοι
-sites/assets/js/erpnext.min.js +5,"Grid """,Πλέγμα '
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ρύθμιση εργαζόμενοι
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Πλέγμα '
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Έρευνα
 DocType: Maintenance Visit Purpose,Work Done,Η εργασία ολοκληρώθηκε
@@ -1054,14 +1059,15 @@ DocType: Communication,Sent,Εστάλη
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Προβολή καθολικού
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Η πιο παλιά
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
 DocType: Communication,Delivery Status,Κατάσταση παράδοσης
 DocType: Production Order,Manufacture against Sales Order,Παραγωγή κατά παραγγελία πώλησης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Τρίτες χώρες
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Τρίτες χώρες
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Το είδος {0} δεν μπορεί να έχει παρτίδα
 ,Budget Variance Report,Έκθεση διακύμανσης του προϋπολογισμού
 DocType: Salary Slip,Gross Pay,Ακαθάριστες αποδοχές
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Μερίσματα που καταβάλλονται
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Λογιστική Λογιστική
 DocType: Stock Reconciliation,Difference Amount,Διαφορά Ποσό
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Αδιανέμητα Κέρδη
 DocType: BOM Item,Item Description,Περιγραφή είδους
@@ -1075,15 +1081,17 @@ DocType: Opportunity Item,Opportunity Item,Είδος ευκαιρίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Προσωρινό άνοιγμα
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Υπόλοιπο αδείας υπαλλήλου
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Το υπόλοιπο λογαριασμού {0} πρέπει να είναι πάντα {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Το υπόλοιπο λογαριασμού {0} πρέπει να είναι πάντα {1}
 DocType: Address,Address Type,Τύπος διεύθυνσης
 DocType: Purchase Receipt,Rejected Warehouse,Αποθήκη απορριφθέντων
 DocType: GL Entry,Against Voucher,Κατά το αποδεικτικό
 DocType: Item,Default Buying Cost Center,Προεπιλεγμένο κέντρο κόστους αγορών
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Για να πάρετε το καλύτερο από ERPNext, σας συνιστούμε να πάρει κάποιο χρόνο και να παρακολουθήσουν αυτά τα βίντεο βοήθεια."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Το είδος {0} πρέπει να είναι είδος πωλήσης
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,να
 DocType: Item,Lead Time in days,Χρόνος των ημερών
 ,Accounts Payable Summary,Σύνοψη πληρωτέων λογαριασμών
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Δεν επιτρέπεται να επεξεργαστείτε τον παγωμένο λογαριασμό {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Δεν επιτρέπεται να επεξεργαστείτε τον παγωμένο λογαριασμό {0}
 DocType: Journal Entry,Get Outstanding Invoices,Βρες εκκρεμή τιμολόγια
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
@@ -1099,7 +1107,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Τόπος έκδοσης
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Συμβόλαιο
 DocType: Report,Disabled,Απενεργοποιημένο
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Ο παράγοντας μετατροπής Μ.Μ. απαιτείται για τη Μ.Μ.: {0} στο είδος: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Ο παράγοντας μετατροπής Μ.Μ. απαιτείται για τη Μ.Μ.: {0} στο είδος: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Έμμεσες δαπάνες
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Γραμμή {0}: η ποσότητα είναι απαραίτητη
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Γεωργία
@@ -1108,13 +1116,13 @@ DocType: Mode of Payment,Mode of Payment,Τρόπος πληρωμής
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Αυτή είναι μια κύρια ομάδα ειδών και δεν μπορεί να επεξεργαστεί.
 DocType: Journal Entry Account,Purchase Order,Παραγγελία αγοράς
 DocType: Warehouse,Warehouse Contact Info,Πληροφορίες επικοινωνίας για την αποθήκη
-sites/assets/js/form.min.js +190,Name is required,Το όνομα είναι απαραίτητο
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Το όνομα είναι απαραίτητο
 DocType: Purchase Invoice,Recurring Type,Τύπος επαναλαμβανόμενου
 DocType: Address,City/Town,Πόλη / χωριό
 DocType: Email Digest,Annual Income,ΕΤΗΣΙΟ εισοδημα
 DocType: Serial No,Serial No Details,Λεπτομέρειες σειριακού αρ.
 DocType: Purchase Invoice Item,Item Tax Rate,Φορολογικός συντελεστής είδους 
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Κεφάλαιο εξοπλισμών
@@ -1125,14 +1133,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Στόχος
 DocType: Sales Invoice Item,Edit Description,Επεξεργασία Περιγραφή
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Αναμενόμενη ημερομηνία τοκετού είναι μικρότερο από το προβλεπόμενο Ημερομηνία Έναρξης.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Για προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Για προμηθευτή
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Η ρύθμιση του τύπου λογαριασμού βοηθά στην επιλογή αυτού του λογαριασμού στις συναλλαγές.
 DocType: Purchase Invoice,Grand Total (Company Currency),Γενικό σύνολο (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Συνολική εξερχόμενη
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Μπορεί να υπάρχει μόνο μία συνθήκη κανόνα αποστολής με 0 ή κενή τιμή για το πεδίο 'εώς αξία'
 DocType: Authorization Rule,Transaction,Συναλλαγή
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Σημείωση : αυτό το κέντρο κόστους είναι μια ομάδα. Δεν μπορούν να γίνουν λογιστικές εγγραφές σε ομάδες.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Εργαλεία
+apps/frappe/frappe/config/desk.py +7,Tools,Εργαλεία
 DocType: Item,Website Item Groups,Ομάδες ειδών δικτυακού τόπου
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Ο Αριθμός εντολής παραγωγής είναι υποχρεωτικός για την καταχώρηση αποθέματος
 DocType: Purchase Invoice,Total (Company Currency),Σύνολο (Εταιρεία νομίσματος)
@@ -1142,7 +1150,7 @@ DocType: Workstation,Workstation Name,Όνομα σταθμού εργασίας
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Στείλτε ενημερωτικό άρθρο email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
 DocType: Sales Partner,Target Distribution,Στόχος διανομής
-sites/assets/js/desk.min.js +7652,Comments,Σχόλια
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Σχόλια
 DocType: Salary Slip,Bank Account No.,Αριθμός τραπεζικού λογαριασμού
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Αυτός είναι ο αριθμός της τελευταίας συναλλαγής που δημιουργήθηκε με αυτό το πρόθεμα
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Η τιμή αποτίμησης είναι απαραίτητη για το είδος {0}
@@ -1157,7 +1165,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Παρακα
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Άδεια μετ' αποδοχών
 DocType: Purchase Invoice,Supplier Invoice Date,Ημερομηνία τιμολογίου του προμηθευτή
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Χρειάζεται να ενεργοποιήσετε το καλάθι αγορών
-sites/assets/js/form.min.js +212,No Data,Δεν υπάρχουν δεδομένα
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Δεν υπάρχουν δεδομένα
 DocType: Appraisal Template Goal,Appraisal Template Goal,Στόχος προτύπου αξιολόγησης
 DocType: Salary Slip,Earning,Κέρδος
 DocType: Payment Tool,Party Account Currency,Κόμμα Λογαριασμού Νόμισμα
@@ -1165,7 +1173,7 @@ DocType: Payment Tool,Party Account Currency,Κόμμα Λογαριασμού 
 DocType: Purchase Taxes and Charges,Add or Deduct,Πρόσθεση ή Αφαίρεση
 DocType: Company,If Yearly Budget Exceeded (for expense account),Αν ετήσιος προϋπολογισμός Υπέρβαση (για λογαριασμό εξόδων)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Βρέθηκαν συνθήκες που επικαλύπτονται μεταξύ:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Κατά την ημερολογιακή εγγραφή {0} έχει ήδη ρυθμιστεί από κάποιο άλλο αποδεικτικό
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Κατά την ημερολογιακή εγγραφή {0} έχει ήδη ρυθμιστεί από κάποιο άλλο αποδεικτικό
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Συνολική αξία της παραγγελίας
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Τροφή
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Eύρος γήρανσης 3
@@ -1173,11 +1181,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Αρ. επισκέψεων
 DocType: File,old_parent,Παλαιός γονέας
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Ενημερωτικά δελτία για επαφές
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Νόμισμα του Λογαριασμού κλεισίματος πρέπει να είναι {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Άθροισμα των βαθμών για όλους τους στόχους πρέπει να είναι 100. Πρόκειται για {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Οι λειτουργίες δεν μπορεί να είναι κενές.
 ,Delivered Items To Be Billed,Είδη για χρέωση που έχουν παραδοθεί
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Η αποθήκη δεν μπορεί να αλλάξει για τον σειριακό αριθμό
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Η κατάσταση ενημερώθηκε για {0}
 DocType: DocField,Description,Περιγραφή
 DocType: Authorization Rule,Average Discount,Μέση έκπτωση
 DocType: Letter Head,Is Default,Είναι προεπιλογή
@@ -1205,7 +1213,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Ποσό φόρου είδους
 DocType: Item,Maintain Stock,Διατηρήστε Χρηματιστήριο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Έχουν ήδη δημιουργηθεί καταχωρήσεις αποθέματος για την εντολή παραγωγής
 DocType: Leave Control Panel,Leave blank if considered for all designations,Άφησε το κενό αν ισχύει για όλες τις ονομασίες
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Μέγιστο: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Από ημερομηνία και ώρα
 DocType: Email Digest,For Company,Για την εταιρεία
@@ -1215,7 +1223,7 @@ DocType: Sales Invoice,Shipping Address Name,Όνομα διεύθυνσης α
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Λογιστικό σχέδιο
 DocType: Material Request,Terms and Conditions Content,Περιεχόμενο όρων και προϋποθέσεων
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
@@ -1228,7 +1236,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Κατάσταση εγγύηση
 DocType: GL Entry,GL Entry,Καταχώρηση gl 
 DocType: HR Settings,Employee Settings,Ρυθμίσεις των υπαλλήλων
 ,Batch-Wise Balance History,Ιστορικό υπολοίπων παρτίδας
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Λίστα εκκρεμών εργασιών
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Λίστα εκκρεμών εργασιών
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Μαθητευόμενος
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Δεν επιτρέπεται αρνητική ποσότητα 
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1260,13 +1268,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ενοίκιο γραφείου
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Ρύθμιση στοιχείων SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Η εισαγωγή απέτυχε!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Δεν δημιουργήθηκαν διευθύνσεις
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Δεν δημιουργήθηκαν διευθύνσεις
 DocType: Workstation Working Hour,Workstation Working Hour,Ώρες εργαασίας σταθμού εργασίας
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Αναλυτής
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το ποσό κε {2}
 DocType: Item,Inventory,Απογραφή
 DocType: Features Setup,"To enable ""Point of Sale"" view",Για να ενεργοποιήσετε το "Point of Sale" προβολή
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Η πληρωμή δεν μπορεί να γίνει για άδειο καλάθι
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Η πληρωμή δεν μπορεί να γίνει για άδειο καλάθι
 DocType: Item,Sales Details,Λεπτομέρειες πωλήσεων
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Καρφίτσωμα
 DocType: Opportunity,With Items,Με Αντικείμενα
@@ -1276,7 +1284,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",Η ημερομηνία κατά την οποία θα δημιουργηθεί το επόμενο τιμολόγιο. Παράγεται σε υποβάλει.
 DocType: Item Attribute,Item Attribute,Χαρακτηριστικό είδους
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Κυβέρνηση
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Παραλλαγές του Είδους
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Παραλλαγές του Είδους
 DocType: Company,Services,Υπηρεσίες
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Σύνολο ({0})
 DocType: Cost Center,Parent Cost Center,Γονικό κέντρο κόστους
@@ -1286,11 +1294,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Ημερομηνία έναρξης για τη χρήση 
 DocType: Employee External Work History,Total Experience,Συνολική εμπειρία
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Εκβάθυνσης
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης
 DocType: Material Request Item,Sales Order No,Αρ. παραγγελίας πώλησης 
 DocType: Item Group,Item Group Name,Όνομα ομάδας ειδών
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Πάρθηκε
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Πάρθηκε
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Μεταφορά υλικών για μεταποίηση
 DocType: Pricing Rule,For Price List,Για τιμοκατάλογο
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Αναζήτησης εκτελεστικού στελέχους
@@ -1299,8 +1307,7 @@ DocType: Maintenance Schedule,Schedules,Χρονοδιαγράμματα
 DocType: Purchase Invoice Item,Net Amount,Καθαρό Ποσό
 DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ. 
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Πρόσθετες ποσό έκπτωσης (Εταιρεία νομίσματος)
-DocType: Period Closing Voucher,CoA Help,Coa βοήθεια
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Σφάλμα: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Σφάλμα: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Παρακαλώ να δημιουργήσετε νέο λογαριασμό από το λογιστικό σχέδιο.
 DocType: Maintenance Visit,Maintenance Visit,Επίσκεψη συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Πελάτης> ομάδα πελατών > περιοχή
@@ -1311,6 +1318,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Βοήθεια κόστους απ
 DocType: Event,Tuesday,Τρίτη
 DocType: Leave Block List,Block Holidays on important days.,Αποκλεισμός αδειών στις σημαντικές ημέρες.
 ,Accounts Receivable Summary,Σύνοψη εισπρακτέων λογαριασμών 
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Φύλλα για τον τύπο {0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Παρακαλώ ορίστε το πεδίο ID χρήστη σε μια εγγραφή υπαλλήλου για να ρυθμίσετε το ρόλο του υπαλλήλου
 DocType: UOM,UOM Name,Όνομα Μ.Μ.
 DocType: Top Bar Item,Target,Στόχος
@@ -1331,19 +1339,19 @@ DocType: Sales Partner,Sales Partner Target,Στόχος συνεργάτη πω
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Λογιστική καταχώριση για {0} μπορεί να γίνει μόνο στο νόμισμα: {1}
 DocType: Pricing Rule,Pricing Rule,Κανόνας τιμολόγησης
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Σκάλισμα
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Σειρά # {0}: επιστρεφόμενο στοιχείο {1} δεν υπάρχει σε {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Τραπεζικοί λογαριασμοί
 ,Bank Reconciliation Statement,Δήλωση συμφωνίας τραπεζικού λογαριασμού
 DocType: Address,Lead Name,Όνομα επαφής
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Άνοιγμα Χρηματιστήριο Υπόλοιπο
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Άνοιγμα Χρηματιστήριο Υπόλοιπο
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} Πρέπει να εμφανίζεται μόνο μία φορά
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Δεν επιτρέπεται να μεταφέρουμε περισσότερο {0} από {1} εναντίον παραγγελίας {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Οι άδειες κατανεμήθηκαν επιτυχώς για {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Οι άδειες κατανεμήθηκαν επιτυχώς για {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Δεν βρέθηκαν είδη για συσκευασία
 DocType: Shipping Rule Condition,From Value,Από τιμή
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Η παραγόμενη ποσότητα είναι απαραίτητη
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Η παραγόμενη ποσότητα είναι απαραίτητη
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Τα ποσά που δεν αντικατοπτρίζονται στην τράπεζα
 DocType: Quality Inspection Reading,Reading 4,Μέτρηση 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Απαιτήσεις εις βάρος της εταιρείας.
@@ -1356,19 +1364,20 @@ DocType: Opportunity,Contact Mobile No,Αριθμός κινητού επαφή
 DocType: Production Planning Tool,Select Sales Orders,Επιλέξτε παραγγελίες πώλησης
 ,Material Requests for which Supplier Quotations are not created,Αιτήσεις υλικού για τις οποίες δεν έχουν δημιουργηθεί προσφορές προμηθευτή
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Παρακολούθηση ειδών με barcode. Είναι δυνατή η εισαγωγή ειδών στο δελτίο αποστολής και στο τιμολόγιο πώλησης με σάρωση του barcode των ειδών.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Επισήμανση ως Δημοσιεύθηκε
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Κάντε Προσφορά
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Δοκιμάστε τον προγραμματισμό εργασιών για το X ημέρες νωρίτερα.
 DocType: HR Settings,Stop Birthday Reminders,Διακοπή υπενθυμίσεων γενεθλίων
 DocType: SMS Center,Receiver List,Λίστα παραλήπτη
 DocType: Payment Tool Detail,Payment Amount,Ποσό πληρωμής
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Ποσό που καταναλώθηκε
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Προβολή
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Προβολή
 DocType: Salary Structure Deduction,Salary Structure Deduction,Παρακρατήσεις στο μισθολόγιο
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Επιλεκτική πυροσυσσωμάτωση λέιζερ
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Εισαγωγή επιτυχής!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Κόστος ειδών που εκδόθηκαν
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
@@ -1389,7 +1398,7 @@ DocType: Company,Default Payable Account,Προεπιλεγμένος λογαρ
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ρυθμίσεις για το online καλάθι αγορών, όπως οι κανόνες αποστολής, ο τιμοκατάλογος κλπ"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Η εγκατάσταση ολοκληρώθηκε
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Χρεώθηκαν
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Δεσμευμένη ποσότητα 
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Δεσμευμένη ποσότητα 
 DocType: Party Account,Party Account,Λογαριασμός συμβαλλόμενου
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ανθρώπινοι πόροι
 DocType: Lead,Upper Income,Άνω εισοδήματος
@@ -1432,11 +1441,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ενεργοποίηση του καλαθιού αγορών
 DocType: Employee,Permanent Address,Μόνιμη διεύθυνση
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Το είδος {0} πρέπει να είναι μια υπηρεσία.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Καταβληθείσα προκαταβολή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερο \ από Γενικό Σύνολο {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Παρακαλώ επιλέξτε κωδικό είδους
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Μείωση αφαίρεσης για άδεια άνευ αποδοχών (Α.Α.Α.)
 DocType: Territory,Territory Manager,Διευθυντής περιοχής
+DocType: Delivery Note Item,To Warehouse (Optional),Για Αποθήκη (Προαιρετικό)
 DocType: Sales Invoice,Paid Amount (Company Currency),Ποσού που καταβλήθηκε (Εταιρεία νομίσματος)
 DocType: Purchase Invoice,Additional Discount,Επιπλέον έκπτωση
 DocType: Selling Settings,Selling Settings,Ρυθμίσεις πώλησης
@@ -1459,7 +1469,7 @@ DocType: Item,Weightage,Ζύγισμα
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Εξόρυξη
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Ρητίνη χύτευσης
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών 
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα 
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα 
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},κειμένου {0}
 DocType: Territory,Parent Territory,Έδαφος μητρική
 DocType: Quality Inspection Reading,Reading 2,Μέτρηση 2
@@ -1487,11 +1497,11 @@ DocType: Sales Invoice Item,Batch No,Αρ. Παρτίδας
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Επιτρέψτε πολλαπλές Παραγγελίες εναντίον παραγγελίας του Πελάτη
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Κύριο
 DocType: DocPerm,Delete,Διαγραφή
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Παραλλαγή
-sites/assets/js/desk.min.js +7971,New {0},Νέο {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Παραλλαγή
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Νέο {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Μια σταματημένη παραγγελία δεν μπορεί να ακυρωθεί. Συνεχίστε την προκειμένου να την ακυρώσετε.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Μια σταματημένη παραγγελία δεν μπορεί να ακυρωθεί. Συνεχίστε την προκειμένου να την ακυρώσετε.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
 DocType: Employee,Leave Encashed?,Η άδεια εισπράχθηκε;
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Το πεδίο 'ευκαιρία από' είναι υποχρεωτικό
 DocType: Item,Variants,Παραλλαγές
@@ -1509,7 +1519,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Χώρα
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Διευθύνσεις
 DocType: Communication,Received,Λήψη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Διπλότυπος σειριακός αριθμός για το είδος {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Μια συνθήκη για έναν κανόνα αποστολής
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Το στοιχείο δεν επιτρέπεται να έχει εντολή παραγωγής.
@@ -1530,7 +1540,6 @@ DocType: Employee,Salutation,Χαιρετισμός
 DocType: Communication,Rejected,Απορρίφθηκε
 DocType: Pricing Rule,Brand,Εμπορικό σήμα
 DocType: Item,Will also apply for variants,Θα ισχύουν επίσης για τις παραλλαγές
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Παραδόθηκε 
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Ομαδοποίηση ειδών κατά τη στιγμή της πώλησης.
 DocType: Sales Order Item,Actual Qty,Πραγματική ποσότητα
 DocType: Sales Invoice Item,References,Παραπομπές
@@ -1568,14 +1577,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Κουρά
 DocType: Item,Has Variants,Έχει παραλλαγές
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Κάντε κλικ στο δημιούργησε τιμολόγιο πώλησης για να δημιουργηθεί ένα νέο τιμολόγιο πώλησης.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Οι ημερομηνίες έναρξης και λήξης περιόδου είναι απαραίτητες για επαναλαμβανόμενα %s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Συσκευασία και επισήμανση
 DocType: Monthly Distribution,Name of the Monthly Distribution,Όνομα της μηνιαίας διανομής
 DocType: Sales Person,Parent Sales Person,Γονικός πωλητής
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Παρακαλώ ορίστε προεπιλεγμένο νόμισμα στην κύρια εγγραφή εταιρείας και τις γενικές προεπιλογές
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox access secret
 DocType: Purchase Invoice,Recurring Invoice,Επαναλαμβανόμενο τιμολόγιο
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Διαχείριση έργων
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Διαχείριση έργων
 DocType: Supplier,Supplier of Goods or Services.,Προμηθευτής αγαθών ή υπηρεσιών.
 DocType: Budget Detail,Fiscal Year,Χρήση
 DocType: Cost Center,Budget,Προϋπολογισμός
@@ -1603,11 +1611,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Πώληση
 DocType: Employee,Salary Information,Πληροφορίες μισθού
 DocType: Sales Person,Name and Employee ID,Όνομα και ID υπαλλήλου
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
 DocType: Website Item Group,Website Item Group,Ομάδα ειδών δικτυακού τόπου 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Δασμοί και φόροι
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} εγγραφές πληρωμών δεν μπορεί να φιλτράρεται από {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} εγγραφές πληρωμών δεν μπορεί να φιλτράρεται από {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Πίνακας για το είδος που θα εμφανιστεί στην ιστοσελίδα
 DocType: Purchase Order Item Supplied,Supplied Qty,Παρεχόμενα Ποσότητα
 DocType: Material Request Item,Material Request Item,Είδος αίτησης υλικού
@@ -1615,7 +1623,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Δέντρο ομ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Δεν μπορεί να παραπέμψει τον αριθμό σειράς μεγαλύτερο ή ίσο με τον τρέχοντα αριθμό γραμμής για αυτόν τον τύπο επιβάρυνσης
 ,Item-wise Purchase History,Ιστορικό αγορών ανά είδος 
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Κόκκινος
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε τον σειριακό αριθμό που προστέθηκε για το είδος {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε τον σειριακό αριθμό που προστέθηκε για το είδος {0}
 DocType: Account,Frozen,Παγωμένα
 ,Open Production Orders,Ανοιχτές εντολές παραγωγής
 DocType: Installation Note,Installation Time,Ώρα εγκατάστασης
@@ -1659,13 +1667,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Τάσεις προσφορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Εφόσον μπορεί να γίνει παραγωγής παραγγελίας για το συγκεκριμένο προϊόν, θα πρέπει να είναι ένα είδος αποθέματος."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Εφόσον μπορεί να γίνει παραγωγής παραγγελίας για το συγκεκριμένο προϊόν, θα πρέπει να είναι ένα είδος αποθέματος."
 DocType: Shipping Rule Condition,Shipping Amount,Κόστος αποστολής
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Συμμετοχή
 DocType: Authorization Rule,Above Value,Παραπάνω Αξία 
 ,Pending Amount,Ποσό που εκκρεμεί
 DocType: Purchase Invoice Item,Conversion Factor,Συντελεστής μετατροπής
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Παραδόθηκε
+DocType: Purchase Order,Delivered,Παραδόθηκε
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Ρύθμιση διακομιστή εισερχομένων για το email ID θέσης εργασίας. ( Π.Χ. Jobs@example.Com )
 DocType: Purchase Receipt,Vehicle Number,Αριθμός Οχημάτων
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Η ημερομηνία κατά την οποία το επαναλαμβανόμενο τιμολόγιο θα σταματήσει
@@ -1682,10 +1690,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Επιμέρησε τα
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Ο λογαριασμός {0} πρέπει να είναι του τύπου 'παγίων' καθώς το είδος {1} είναι ένα περιουσιακό στοιχείο
 DocType: HR Settings,HR Settings,Ρυθμίσεις ανθρωπίνου δυναμικού
 apps/frappe/frappe/config/setup.py +130,Printing,Εκτύπωση
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Η αξίωση δαπανών είναι εν αναμονή έγκρισης. Μόνο ο υπεύθυνος έγκρισης δαπανών να ενημερώσει την κατάστασή της.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Η αξίωση δαπανών είναι εν αναμονή έγκρισης. Μόνο ο υπεύθυνος έγκρισης δαπανών να ενημερώσει την κατάστασή της.
 DocType: Purchase Invoice,Additional Discount Amount,Πρόσθετες ποσό έκπτωσης
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Η μέρα ( ες) για την οποία(ες) υποβάλλεται αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να υποβληθεί αίτηση για άδεια.
-sites/assets/js/desk.min.js +7805,and,Και
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,Και
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Αθλητισμός
@@ -1722,7 +1730,6 @@ DocType: Opportunity,Quotation,Προσφορά
 DocType: Salary Slip,Total Deduction,Συνολική έκπτωση
 DocType: Quotation,Maintenance User,Χρήστης συντήρησης
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Κόστος Ενημερώθηκε
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Είστε σίγουρος πως θέλετε να συνεχίσετε
 DocType: Employee,Date of Birth,Ημερομηνία γέννησης
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Το είδος {0} έχει ήδη επιστραφεί
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Η χρήση ** αντιπροσωπεύει ένα οικονομικό έτος. Όλες οι λογιστικές εγγραφές και άλλες σημαντικές συναλλαγές παρακολουθούνται ανά ** χρήση **.
@@ -1738,13 +1745,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Παρακολουθήστε εκστρατείες προώθησης των πωλήσεων. Παρακολουθήστε επαφές, προσφορές, παραγγελίες πωλήσεων κλπ από τις εκστρατείες στις οποίες πρέπει να γίνει μέτρηση της απόδοσης των επενδύσεων. "
 DocType: Expense Claim,Approver,Ο εγκρίνων
 ,SO Qty,Ποσότητα παρ. πώλησης
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Υπάρχουν καταχωρήσεις αποθέματος στην αποθήκη {0}, ως εκ τούτου δεν μπορείτε να εκχωρήσετε ξανά ή να τροποποιήσετε την αποθήκη"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Υπάρχουν καταχωρήσεις αποθέματος στην αποθήκη {0}, ως εκ τούτου δεν μπορείτε να εκχωρήσετε ξανά ή να τροποποιήσετε την αποθήκη"
 DocType: Appraisal,Calculate Total Score,Υπολογισμός συνολικής βαθμολογίας
 DocType: Supplier Quotation,Manufacturing Manager,Υπεύθυνος παραγωγής
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Ο σειριακός αριθμός {0} έχει εγγύηση μέχρι {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Χώρισε το δελτίο αποστολής σημείωση σε πακέτα.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Αποστολές
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Βουτιά χύτευση
+DocType: Purchase Order,To be delivered to customer,Να παραδοθεί στον πελάτη
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Η κατάσταση του αρχείου καταγραφής χρονολογίου πρέπει να υποβληθεί.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Αύξων αριθμός {0} δεν ανήκουν σε καμία αποθήκη
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Ρύθμιση...
@@ -1769,11 +1777,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Από το νόμισμα
 DocType: DocField,Name,Όνομα
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Η παραγγελία πώλησης για το είδος {0} είναι απαραίτητη
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Η παραγγελία πώλησης για το είδος {0} είναι απαραίτητη
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Τα ποσά που δεν αντικατοπτρίζονται στο σύστημα
 DocType: Purchase Invoice Item,Rate (Company Currency),Τιμή (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Άλλα
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Ορισμός ως Διακόπηκε
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Δεν μπορείτε να βρείτε μια αντίστοιχη Θέση. Παρακαλούμε επιλέξτε κάποια άλλη τιμή για το {0}.
 DocType: POS Profile,Taxes and Charges,Φόροι και επιβαρύνσεις
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Ένα προϊόν ή μια υπηρεσία που αγοράζεται, πωλείται ή διατηρείται σε απόθεμα."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Δεν μπορείτε να επιλέξετε τον τύπο επιβάρυνσης ως ποσό προηγούμενης γραμμής ή σύνολο προηγούμενης γραμμής για την πρώτη γραμμή
@@ -1782,19 +1790,20 @@ DocType: Web Form,Select DocType,Επιλέξτε τύπο εγγράφου
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Διάνοιξη
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Κατάθεση
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε το πρόγραμμα
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Νέο κέντρο κόστους
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Νέο κέντρο κόστους
 DocType: Bin,Ordered Quantity,Παραγγελθείσα ποσότητα
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",Π.Χ. Χτίστε εργαλεία για τους κατασκευαστές '
 DocType: Quality Inspection,In Process,Σε επεξεργασία
 DocType: Authorization Rule,Itemwise Discount,Έκπτωση ανά είδος
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} κατά την παραγγελία πώλησης {1}
+DocType: Purchase Order Item,Reference Document Type,Αναφορά Τύπος εγγράφου
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} κατά την παραγγελία πώλησης {1}
 DocType: Account,Fixed Asset,Πάγιο
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Απογραφή συνέχειες
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Απογραφή συνέχειες
 DocType: Activity Type,Default Billing Rate,Επιτόκιο Υπερημερίας Τιμολόγησης
 DocType: Time Log Batch,Total Billing Amount,Συνολικό Ποσό Χρέωσης
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Εισπρακτέα λογαριασμού
 ,Stock Balance,Ισοζύγιο αποθέματος
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Πωλήσεις Τάξης να Πληρωμής
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Πωλήσεις Τάξης να Πληρωμής
 DocType: Expense Claim Detail,Expense Claim Detail,Λεπτομέρειες αξίωσης δαπανών
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Τα αρχεία καταγραφής χρονολογίου δημιουργήθηκαν:
 DocType: Item,Weight UOM,Μονάδα μέτρησης βάρους
@@ -1830,10 +1839,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Ο λογαριασμός πίστωσης πρέπει να είναι πληρωτέος λογαριασμός
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
 DocType: Production Order Operation,Completed Qty,Ολοκληρωμένη ποσότητα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Για {0}, μόνο χρεωστικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις πίστωσης"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Ο τιμοκατάλογος {0} είναι απενεργοποιημένος
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Για {0}, μόνο χρεωστικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις πίστωσης"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ο τιμοκατάλογος {0} είναι απενεργοποιημένος
 DocType: Manufacturing Settings,Allow Overtime,Επιτρέψτε Υπερωρίες
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Η παραγγελία πώλησης {0} έχει διακοπεί
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} αύξοντες αριθμούς που απαιτούνται για τη θέση {1}. Έχετε προβλέπεται {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Τρέχουσα Αποτίμηση Τιμή
 DocType: Item,Customer Item Codes,Θέση Πελάτη Κώδικες
@@ -1842,9 +1850,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Συγκόλλησης
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Απαιτείται νέα Μ.Μ.Αποθέματος 
 DocType: Quality Inspection,Sample Size,Μέγεθος δείγματος
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Καθορίστε μια έγκυρη τιμή στο πεδίο 'από τον αρ. Υπόθεσης' 
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Περαιτέρω κέντρα κόστους μπορεί να γίνει κάτω από ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Περαιτέρω κέντρα κόστους μπορεί να γίνει κάτω από ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 DocType: Project,External,Εξωτερικός
 DocType: Features Setup,Item Serial Nos,Σειριακοί αριθμοί είδους
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Χρήστες και δικαιώματα
@@ -1871,7 +1879,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,Διεύθυνση & Επαφές
 DocType: SMS Log,Sender Name,Όνομα αποστολέα
 DocType: Page,Title,Τίτλος
-sites/assets/js/list.min.js +104,Customize,Προσαρμογή
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Προσαρμογή
 DocType: POS Profile,[Select],[ Επιλέξτε ]
 DocType: SMS Log,Sent To,Αποστέλλονται
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Δημιούργησε τιμολόγιο πώλησης
@@ -1896,12 +1904,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Τέλος της ζωής
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Ταξίδι
 DocType: Leave Block List,Allow Users,Επίστρεψε χρήστες
+DocType: Purchase Order,Customer Mobile No,Κινητό αριθ Πελατών
 DocType: Sales Invoice,Recurring,Επαναλαμβανόμενες
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Παρακολουθήστε ξεωριστά έσοδα και έξοδα για τις κάθετες / διαιρέσεις προϊόντος
 DocType: Rename Tool,Rename Tool,Εργαλείο μετονομασίας
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ενημέρωση κόστους
 DocType: Item Reorder,Item Reorder,Αναδιάταξη είδους
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Μεταφορά υλικού
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Μεταφορά υλικού
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Καθορίστε τις λειτουργίες, το κόστος λειτουργίας και να δώστε ένα μοναδικό αριθμό λειτουργίας στις λειτουργίες σας."
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
@@ -1924,7 +1933,7 @@ DocType: Appraisal,Employee,Υπάλληλος
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Εισαγωγή e-mail από
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Πρόσκληση ως χρήστη
 DocType: Features Setup,After Sale Installations,Εγκαταστάσεις μετά την πώληση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} είναι πλήρως τιμολογημένο
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} είναι πλήρως τιμολογημένο
 DocType: Workstation Working Hour,End Time,Ώρα λήξης
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Πρότυποι όροι σύμβασης για πωλήσεις ή αγορές.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Ομαδοποίηση κατά αποδεικτικό
@@ -1933,8 +1942,9 @@ DocType: Sales Invoice,Mass Mailing,Μαζική αλληλογραφία
 DocType: Page,Standard,Πρότυπο
 DocType: Rename Tool,File to Rename,Αρχείο μετονομασίας
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Ο αριθμός παραγγελίας αγοράς για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Εμφάνιση Πληρωμές
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Το χρονοδιάγραμμα συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Το χρονοδιάγραμμα συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Μέγεθος
 DocType: Notification Control,Expense Claim Approved,Εγκρίθηκε η αξίωση δαπανών 
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Φαρμακευτικός
@@ -1953,8 +1963,8 @@ DocType: Upload Attendance,Attendance To Date,Προσέλευση μέχρι η
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Ρύθμιση διακομιστή εισερχομένων για το email ID πωλήσεων. ( Π.Χ. Sales@example.Com )
 DocType: Warranty Claim,Raised By,Δημιουργήθηκε από
 DocType: Payment Tool,Payment Account,Λογαριασμός πληρωμών
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
-sites/assets/js/list.min.js +23,Draft,Προσχέδιο
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Προσχέδιο
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
 DocType: Quality Inspection Reading,Accepted,Αποδεκτό
 DocType: User,Female,Γυναίκα
@@ -1967,14 +1977,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Ετικέτα κανόνα αποστολής
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
 DocType: Newsletter,Test,Δοκιμή
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Δεδομένου ότι υπάρχουν χρηματιστηριακές συναλλαγές για αυτό το προϊόν, \ δεν μπορείτε να αλλάξετε τις τιμές των «Έχει Αύξων αριθμός», «Έχει Παρτίδα No», «Είναι αναντικατάστατο» και «Μέθοδος αποτίμησης»"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
 DocType: Employee,Previous Work Experience,Προηγούμενη εργασιακή εμπειρία
 DocType: Stock Entry,For Quantity,Για Ποσότητα
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Παρακαλώ εισάγετε προγραμματισμένη ποσότητα για το είδος {0} στη γραμμή {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} Δεν έχει υποβληθεί
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Αιτήσεις για είδη
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} Δεν έχει υποβληθεί
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Αιτήσεις για είδη
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Μια ξεχωριστή εντολή παραγωγής θα δημιουργηθεί για κάθε τελικό καλό είδος.
 DocType: Purchase Invoice,Terms and Conditions1,Όροι και προϋποθέσεις 1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Ολοκλήρωση της εγκατάστασης
@@ -1986,7 +1997,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Κατάλογο
 DocType: Delivery Note,Transporter Name,Όνομα μεταφορέα
 DocType: Contact,Enter department to which this Contact belongs,Εισάγετε το τμήμαστο οποίο ανήκει αυτή η επαφή
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Σύνολο απόντων
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Το είδος ή η αποθήκη για την γραμμή {0} δεν ταιριάζει στην αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Το είδος ή η αποθήκη για την γραμμή {0} δεν ταιριάζει στην αίτηση υλικού
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Μονάδα μέτρησης
 DocType: Fiscal Year,Year End Date,Ημερομηνία λήξης έτους
 DocType: Task Depends On,Task Depends On,Εργασία Εξαρτάται από
@@ -2012,7 +2023,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Η ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι ημερομηνία ενώνουμε"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ένα τρίτο μέρος διανομέας / αντιπρόσωπος / πράκτορας με προμήθεια / affiliate / μεταπωλητής, ο οποίος πωλεί τα προϊόντα της εταιρείας για μια προμήθεια."
 DocType: Customer Group,Has Child Node,Έχει θυγατρικό κόμβο
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} κατά την παραγγελία αγορών {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} κατά την παραγγελία αγορών {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Εισάγετε στατικές παραμέτρους url εδώ (π.Χ. Αποστολέα = erpnext, όνομα = erpnext, password = 1234 κλπ.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} δεν είναι σε καμία ενεργή χρήση. Για περισσότερες πληροφορίες δείτε {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Αυτό είναι ένα παράδειγμα ιστοσελίδας που δημιουργείται αυτόματα από το erpnext
@@ -2063,11 +2074,9 @@ DocType: Note,Note,Σημείωση
 DocType: Purchase Receipt Item,Recd Quantity,Ποσότητα που παραλήφθηκε
 DocType: Email Account,Email Ids,Email ταυτότητες
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Ορισμός ως ανεμπόδιστη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
 DocType: Payment Reconciliation,Bank / Cash Account,Λογαριασμός καταθέσεων σε τράπεζα / μετρητών
 DocType: Tax Rule,Billing City,Πόλη Τιμολόγησης
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Αυτή η αίτηση αδείας βρίσκεται σε αναμονή έγκρισης. Μόνο ο υπεύθυνος αδειών μπορεί να ενημερώσετε την κατάστασή.
 DocType: Global Defaults,Hide Currency Symbol,Απόκρυψη συμβόλου νομίσματος
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","Π.Χ. Τράπεζα, μετρητά, πιστωτική κάρτα"
 DocType: Journal Entry,Credit Note,Πιστωτικό σημείωμα
@@ -2088,7 +2097,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Σύνολο (ποσό
 DocType: Installation Note Item,Installed Qty,Εγκατεστημένη ποσότητα
 DocType: Lead,Fax,Φαξ
 DocType: Purchase Taxes and Charges,Parenttype,Γονικός τύπος
-sites/assets/js/list.min.js +26,Submitted,Υποβλήθηκε
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Υποβλήθηκε
 DocType: Salary Structure,Total Earning,Σύνολο κέρδους
 DocType: Purchase Receipt,Time at which materials were received,Η χρονική στιγμή κατά την οποία παρελήφθησαν τα υλικά
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Διευθύνσεις μου
@@ -2097,7 +2106,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Κύρια ε
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ή
 DocType: Sales Order,Billing Status,Κατάσταση χρέωσης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Έξοδα κοινής ωφέλειας
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Παραπάνω
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Παραπάνω
 DocType: Buying Settings,Default Buying Price List,Προεπιλεγμένος τιμοκατάλογος αγορών
 ,Download Backups,Λήψη αντιγράφων ασφαλείας
 DocType: Notification Control,Sales Order Message,Μήνυμα παραγγελίας πώλησης 
@@ -2106,7 +2115,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Επιλέξτε εργαζόμενοι
 DocType: Bank Reconciliation,To Date,Έως ημερομηνία
 DocType: Opportunity,Potential Sales Deal,Πιθανή συμφωνία πώλησης
-sites/assets/js/form.min.js +308,Details,Λεπτομέρειες
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Λεπτομέρειες
 DocType: Purchase Invoice,Total Taxes and Charges,Σύνολο φόρων και επιβαρύνσεων
 DocType: Employee,Emergency Contact,Επείγουσα επικοινωνία
 DocType: Item,Quality Parameters,Παράμετροι ποιότητας
@@ -2121,7 +2130,7 @@ DocType: Purchase Order Item,Received Qty,Ποσ. Που παραλήφθηκε
 DocType: Stock Entry Detail,Serial No / Batch,Σειριακός αριθμός / παρτίδα
 DocType: Product Bundle,Parent Item,Γονικό είδος
 DocType: Account,Account Type,Τύπος λογαριασμού
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
 ,To Produce,Για παραγωγή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Για γραμμή {0} {1}. Για να συμπεριλάβετε {2} στην τιμή Θέση, σειρές {3} πρέπει επίσης να συμπεριληφθούν"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Αναγνωριστικό του συσκευασίας για την παράδοση (για εκτύπωση)
@@ -2132,7 +2141,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Flattening
 DocType: Account,Income Account,Λογαριασμός εσόδων
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Καλούπι
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Παράδοση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Παράδοση
 DocType: Stock Reconciliation Item,Current Qty,Τρέχουσα Ποσότητα
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Ανατρέξτε στην ενότητα κοστολόγησης την 'τιμή υλικών με βάση'
 DocType: Appraisal Goal,Key Responsibility Area,Βασικός τομέας ευθύνης
@@ -2163,9 +2172,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Όλες τις διευθύνσεις.
 DocType: Company,Stock Settings,Ρυθμίσεις αποθέματος
 DocType: User,Bio,Βιογραφικό
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Διαχειριστείτε το δέντρο ομάδας πελατών.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Νέο όνομα κέντρου κόστους 
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Νέο όνομα κέντρου κόστους 
 DocType: Leave Control Panel,Leave Control Panel,Πίνακας ελέγχου άδειας
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Δεν βρέθηκε προεπιλεγμένο πρότυπο διεύθυνσης. Παρακαλώ να δημιουργήσετε ένα νέο από το μενού εγκατάσταση > εκτύπωση και σηματοποίηση > πρότυπο διεύθυνσης
 DocType: Appraisal,HR User,Χρήστης ανθρωπίνου δυναμικού
@@ -2184,24 +2193,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Λεπτομέρειες εργαλείου πληρωμής 
 ,Sales Browser,Περιηγητής πωλήσεων
 DocType: Journal Entry,Total Credit,Συνολική πίστωση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Τοπικός
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Τοπικός
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Δάνεια και προκαταβολές ( ενεργητικό )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Χρεώστες
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Μεγάλο
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Δεν βρέθηκε υπάλληλος
 DocType: C-Form Invoice Detail,Territory,Περιοχή
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
+DocType: Purchase Order,Customer Address Display,Διεύθυνση Πελατών Οθόνη
 DocType: Stock Settings,Default Valuation Method,Προεπιλεγμένη μέθοδος αποτίμησης
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Στίλβωσης
 DocType: Production Order Operation,Planned Start Time,Προγραμματισμένη ώρα έναρξης
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Κατανεμήθηκε
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Κλείσιμο ισολογισμού και καταγραφή κέρδους ή ζημίας
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, διότι \ έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Για να αλλάξετε την προεπιλεγμένη UOM, \ χρήση »UOM αντικατάστασης χρησιμότητα» εργαλείο στο πλαίσιο της μονάδας Χρηματιστήριο."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Καθορίστε την ισοτιμία να μετατραπεί ένα νόμισμα σε ένα άλλο
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Η προσφορά {0} είναι ακυρωμένη
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Η προσφορά {0} είναι ακυρωμένη
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Συνολικού ανεξόφλητου υπολοίπου
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Ο υπάλληλος {0} ήταν σε άδεια στις {1}. Δεν γίνεται να σημειωθεί παρουσία.
 DocType: Sales Partner,Targets,Στόχοι
@@ -2216,12 +2225,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Αυτή είναι μια κύρια ομάδα πελατών ρίζα και δεν μπορεί να επεξεργαστεί.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Παρακαλώ ρυθμίστε το λογιστικό σχέδιο πριν ξεκινήσετε λογιστικές εγγραφές
 DocType: Purchase Invoice,Ignore Pricing Rule,Αγνοήστε τον κανόνα τιμολόγησης
-sites/assets/js/list.min.js +24,Cancelled,Ακυρώθηκε
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Ακυρώθηκε
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"Από Ημερομηνία Δομή μισθός δεν μπορεί να είναι μικρότερο από ό, τι Υπάλληλος Ημερομηνία Ενώνουμε."
 DocType: Employee Education,Graduate,Πτυχιούχος
 DocType: Leave Block List,Block Days,Αποκλεισμός ημερών
 DocType: Journal Entry,Excise Entry,Καταχώρηση έμμεσης εσωτερικής φορολογίας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Προειδοποίηση: Πωλήσεις Τάξης {0} υπάρχει ήδη κατά παραγγελίας του Πελάτη {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Προειδοποίηση: Πωλήσεις Τάξης {0} υπάρχει ήδη κατά παραγγελίας του Πελάτη {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2278,17 +2287,17 @@ DocType: Account,Stock Received But Not Billed,Το απόθεμα παρελή
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Μικτές αποδοχές + ληξιπρόθεσμο ποσό + ποσό εξαργύρωσης - συνολική μείωση
 DocType: Monthly Distribution,Distribution Name,Όνομα διανομής
 DocType: Features Setup,Sales and Purchase,Πωλήσεις και αγορές
-DocType: Purchase Order Item,Material Request No,Αρ. Αίτησης υλικού
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
+DocType: Supplier Quotation Item,Material Request No,Αρ. Αίτησης υλικού
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Ισοτιμία με την οποία το νόμισμα του πελάτη μετατρέπεται στο βασικό νόμισμα της εταιρείας
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} έχει διαγραφεί επιτυχώς από αυτή τη λίστα.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Καθαρό ποσοστό (Εταιρεία νομίσματος)
-apps/frappe/frappe/templates/base.html +132,Added,Προστέθηκε
+apps/frappe/frappe/templates/base.html +134,Added,Προστέθηκε
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Διαχειριστείτε το δέντρο περιοχών.
 DocType: Journal Entry Account,Sales Invoice,Τιμολόγιο πώλησης
 DocType: Journal Entry Account,Party Balance,Υπόλοιπο συμβαλλόμενου
 DocType: Sales Invoice Item,Time Log Batch,Παρτίδα αρχείων καταγραφής χρονολογίου
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Παρακαλώ επιλέξτε Εφαρμογή έκπτωση σε
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Παρακαλώ επιλέξτε Εφαρμογή έκπτωση σε
 DocType: Company,Default Receivable Account,Προεπιλεγμένος λογαριασμός εισπρακτέων
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Δημιουργία τραπεζικής καταχώηρσης για το σύνολο του μισθού που καταβάλλεται για τα παραπάνω επιλεγμένα κριτήρια
 DocType: Stock Entry,Material Transfer for Manufacture,Μεταφορά υλικού για την κατασκευή
@@ -2299,7 +2308,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Βρες σχετικές κα
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Νομισματοκοπίας
 DocType: Sales Invoice,Sales Team1,Ομάδα πωλήσεων 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Το είδος {0} δεν υπάρχει
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Το είδος {0} δεν υπάρχει
 DocType: Sales Invoice,Customer Address,Διεύθυνση πελάτη
 apps/frappe/frappe/desk/query_report.py +136,Total,Σύνολο
 DocType: Purchase Invoice,Apply Additional Discount On,Εφαρμόστε επιπλέον έκπτωση On
@@ -2314,13 +2323,15 @@ DocType: Quality Inspection,Quality Inspection,Επιθεώρηση ποιότη
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Ψεκάστε σχηματίζοντας
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Νομικό πρόσωπο / θυγατρικές εταιρείες με ξεχωριστό λογιστικό σχέδιο που ανήκουν στον οργανισμό.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Τρόφιμα, ποτά και καπνός"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL or BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Το ποσοστό προμήθειας δεν μπορεί να υπερβαίνει το 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Ελάχιστη ποσότητα
 DocType: Stock Entry,Subcontract,Υπεργολαβία
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Παρακαλούμε, εισάγετε {0} πρώτη"
 DocType: Production Planning Tool,Get Items From Sales Orders,Βρες τα είδη από τις παραγγελίες πώλησης
 DocType: Production Order Operation,Actual End Time,Πραγματική ώρα λήξης
 DocType: Production Planning Tool,Download Materials Required,Κατεβάστε απαιτούμενα υλικά
@@ -2337,9 +2348,9 @@ DocType: Maintenance Visit,Scheduled,Προγραμματισμένη
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Παρακαλώ επιλέξτε το στοιχείο στο οποίο «Είναι αναντικατάστατο" είναι "Όχι" και "είναι οι πωλήσεις Θέση" είναι "ναι" και δεν υπάρχει άλλος Bundle Προϊόν
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Επιλέξτε μηνιαία κατανομή για την άνιση κατανομή στόχων στους μήνες.
 DocType: Purchase Invoice Item,Valuation Rate,Ποσοστό αποτίμησης
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Γραμμή είδους {0}: Η απόδειξη παραλαβής {1} δεν υπάρχει στον παραπάνω πίνακα με τα «αποδεικτικά παραλαβής»
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Ο υπάλληλος {0} έχει ήδη υποβάλει αίτηση για {1} μεταξύ {2} και {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Ο υπάλληλος {0} έχει ήδη υποβάλει αίτηση για {1} μεταξύ {2} και {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Ημερομηνία έναρξης του έργου
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Μέχρι
 DocType: Rename Tool,Rename Log,Αρχείο καταγραφής μετονομασίας
@@ -2366,13 +2377,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Μόνο οι κόμβοι-φύλλα επιτρέπονται σε μία συναλλαγή
 DocType: Expense Claim,Expense Approver,Υπεύθυνος έγκρισης δαπανών
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Το είδος στο αποδεικτικό παραλαβής αγοράς έχει προμηθευτεί
-sites/assets/js/erpnext.min.js +48,Pay,Πληρωμή
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Πληρωμή
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Έως ημερομηνία και ώρα
 DocType: SMS Settings,SMS Gateway URL,SMS gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs για τη διατήρηση της κατάστασης παράδοσης sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Άλεση
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Συρρίκνωση περιτυλίγματος
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Εν αναμονή Δραστηριότητες
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Εν αναμονή Δραστηριότητες
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Επιβεβαιώθηκε
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Προμηθευτής> Τύπος προμηθευτή
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
@@ -2383,7 +2394,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Π
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Εκδότες εφημερίδων
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Επιλέξτε οικονομικό έτος
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Είστε ο υπεύθυνος έγκρισης αδειών για αυτή την εγγραφή. Ενημερώστε την κατάσταση και αποθηκεύστε
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Αναδιάταξη επιπέδου
 DocType: Attendance,Attendance Date,Ημερομηνία συμμετοχής
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Ανάλυση μισθού με βάση τις αποδοχές και τις παρακρατήσεις.
@@ -2419,6 +2429,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε ομάδα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Απόσβεση
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Προμηθευτής(-ές)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Άκυρη περίοδο
 DocType: Customer,Credit Limit,Πιστωτικό όριο
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Επιλέξτε τον τύπο της συναλλαγής
 DocType: GL Entry,Voucher No,Αρ. αποδεικτικού
@@ -2428,8 +2439,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Πρ
 DocType: Customer,Address and Contact,Διεύθυνση και Επικοινωνία
 DocType: Customer,Last Day of the Next Month,Τελευταία μέρα του επόμενου μήνα
 DocType: Employee,Feedback,Ανατροφοδότηση
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Συντήρηση. Πρόγραμμα
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Συντήρηση. Πρόγραμμα
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Μηχανική κατεργασία Λειαντικά jet
 DocType: Stock Settings,Freeze Stock Entries,Πάγωμα καταχωρήσεων αποθέματος
 DocType: Website Settings,Website Settings,Ρυθμίσεις δικτυακού τόπου
@@ -2443,11 +2454,11 @@ DocType: Quality Inspection,Outgoing,Εξερχόμενος
 DocType: Material Request,Requested For,Ζητήθηκαν για
 DocType: Quotation Item,Against Doctype,šΚατά τύπο εγγράφου
 DocType: Delivery Note,Track this Delivery Note against any Project,Παρακολουθήστε αυτό το δελτίο αποστολής σε οποιουδήποτε έργο
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Ο λογαριασμός ρίζας δεν μπορεί να διαγραφεί
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Ο λογαριασμός ρίζας δεν μπορεί να διαγραφεί
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Προβολή καταχωρήσεων αποθέματος
 ,Is Primary Address,Είναι Πρωτοβάθμια Διεύθυνση
 DocType: Production Order,Work-in-Progress Warehouse,Αποθήκη εργασιών σε εξέλιξη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Αναφορά # {0} της {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Αναφορά # {0} της {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Διαχειριστείτε Διευθύνσεις
 DocType: Pricing Rule,Item Code,Κωδικός είδους
 DocType: Production Planning Tool,Create Production Orders,Δημιουργία εντολών παραγωγής
@@ -2456,14 +2467,14 @@ DocType: Journal Entry,User Remark,Παρατήρηση χρήστη
 DocType: Lead,Market Segment,Τομέας της αγοράς
 DocType: Communication,Phone,Τηλέφωνο
 DocType: Employee Internal Work History,Employee Internal Work History,Ιστορικό εσωτερικών εργασιών υπαλλήλου
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Κλείσιμο (dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Κλείσιμο (dr)
 DocType: Contact,Passive,Αδρανής
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Ο σειριακός αριθμός {0} δεν υπάρχει στο απόθεμα
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Φορολογικό πρότυπο για συναλλαγές πώλησης.
 DocType: Sales Invoice,Write Off Outstanding Amount,Διαγραφή οφειλόμενου ποσού
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Επιλέξτε εάν χρειάζεστε αυτόματα επαναλαμβανόμενα τιμολόγια. Μετά την υποβολή κάθε τιμολογίου πώλησης, το επαναλαμβανόμενο τμήμαθα είναι ορατό."
 DocType: Account,Accounts Manager,Διαχειριστής λογαριασμών
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Το αρχείο καταγραφής χρονολογίου {0} πρέπει να 'υποβλήθεί'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Το αρχείο καταγραφής χρονολογίου {0} πρέπει να 'υποβλήθεί'
 DocType: Stock Settings,Default Stock UOM,Προεπιλεγμένη Μ.Μ. Αποθέματος
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Κοστολόγηση Βαθμολογήστε με βάση τον τύπο δραστηριότητας (ανά ώρα)
 DocType: Production Planning Tool,Create Material Requests,Δημιουργία αιτήσεων υλικού
@@ -2474,7 +2485,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Συμφωνία τραπεζι
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Λήψη ενημερώσεων
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Προσθέστε μερικά αρχεία του δείγματος
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Αφήστε Διαχείρισης
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Αφήστε Διαχείρισης
 DocType: Event,Groups,Ομάδες
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Ομαδοποίηση κατά λογαριασμό
 DocType: Sales Order,Fully Delivered,Έχει παραδοθεί πλήρως
@@ -2486,11 +2497,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Πρόσθετα πωλήσεων
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Ο προϋπολογισμός για τον λογαριασμό {1} για το κέντρο κόστους {2} θα ξεφύγει κατά {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
-DocType: Leave Allocation,Carry Forwarded Leaves,Μεταφερμένες άδειες
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Το πεδίο ""από ημερομηνία"" πρέπει να είναι μεταγενέστερο του πεδίο ""έως ημερομηνία"""
 ,Stock Projected Qty,Προβλεπόμενη ποσότητα αποθέματος
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
 DocType: Sales Order,Customer's Purchase Order,Εντολή Αγοράς του Πελάτη
 DocType: Warranty Claim,From Company,Από την εταιρεία
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Αξία ή ποσ
@@ -2503,13 +2513,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Έμπορος λιανικής
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Όλοι οι τύποι προμηθευτή
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Ο κωδικός είδους είναι απαραίτητος γιατί το είδος δεν αριθμείται αυτόματα
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Ο κωδικός είδους είναι απαραίτητος γιατί το είδος δεν αριθμείται αυτόματα
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Είδος χρονοδιαγράμματος συντήρησης
 DocType: Sales Order,%  Delivered,Παραδόθηκε%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Τραπεζικός λογαριασμός υπερανάληψης
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Δημιούργησε βεβαίωση αποδοχών
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Συνέχεια
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Αναζήτηση BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Εξασφαλισμένα δάνεια
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Εκπληκτικά προϊόντα
@@ -2519,7 +2528,7 @@ DocType: Appraisal,Appraisal,Εκτίμηση
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-χύτευση αφρό
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Σχέδιο
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Η ημερομηνία επαναλαμβάνεται
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
 DocType: Hub Settings,Seller Email,Email πωλητή
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Συνολικό Κόστος Αγοράς (μέσω του τιμολογίου αγοράς)
 DocType: Workstation Working Hour,Start Time,Ώρα έναρξης
@@ -2533,8 +2542,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Καθαρό Ποσό (Εταιρεία νομίσματος)
 DocType: BOM Operation,Hour Rate,Χρέωση ανά ώρα
 DocType: Stock Settings,Item Naming By,Ονομασία είδους κατά
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Από την προσφορά
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Μια ακόμη καταχώρηση κλεισίματος περιόδου {0} έχει γίνει μετά από {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Από την προσφορά
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Μια ακόμη καταχώρηση κλεισίματος περιόδου {0} έχει γίνει μετά από {1}
 DocType: Production Order,Material Transferred for Manufacturing,Υλικό το οποίο μεταφέρεται για Βιομηχανία
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Ο λογαριασμός {0} δεν υπάρχει
 DocType: Purchase Receipt Item,Purchase Order Item No,Αριθμός είδους παραγγελίας αγοράς
@@ -2547,11 +2556,11 @@ DocType: Item,Inspection Required,Απαιτείται έλεγχος
 DocType: Purchase Invoice Item,PR Detail,Λεπτομέρειες PR
 DocType: Sales Order,Fully Billed,Πλήρως χρεωμένο
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Μετρητά στο χέρι
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Παράδοση αποθήκη που απαιτούνται για τη θέση του αποθέματος {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Παράδοση αποθήκη που απαιτούνται για τη θέση του αποθέματος {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Το μεικτό βάρος της συσκευασίας. Συνήθως καθαρό βάρος + βάρος υλικού συσκευασίας. (Για εκτύπωση)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Οι χρήστες με αυτό το ρόλο μπορούν να καθορίζουν δεσμευμένους λογαριασμούς και τη δημιουργία / τροποποίηση των λογιστικών εγγραφών δεσμευμένων λογαριασμών
 DocType: Serial No,Is Cancelled,Είναι ακυρωμένο
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Αποστολές μου
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Αποστολές μου
 DocType: Journal Entry,Bill Date,Ημερομηνία χρέωσης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Ακόμα κι αν υπάρχουν πολλαπλοί κανόνες τιμολόγησης με την υψηλότερη προτεραιότητα, στη συνέχεια οι εσωτερικές προτεραιότητες θα εφαρμοστούν:"
 DocType: Supplier,Supplier Details,Στοιχεία προμηθευτή
@@ -2564,7 +2573,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Τραπεζικό έμβασμα
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Παρακαλώ επιλέξτε τραπεζικό λογαριασμό
 DocType: Newsletter,Create and Send Newsletters,Δημιουργήστε και στείλτε τα ενημερωτικά δελτία
-sites/assets/js/report.min.js +107,From Date must be before To Date,Το πεδίο Από την ημερομηνία πρέπει να είναι προγενέστερο του έως ημερομηνία
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Το πεδίο Από την ημερομηνία πρέπει να είναι προγενέστερο του έως ημερομηνία
 DocType: Sales Order,Recurring Order,Επαναλαμβανόμενη παραγγελία
 DocType: Company,Default Income Account,Προεπιλεγμένος λογαριασμός εσόδων
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Ομάδα πελατών / πελάτης
@@ -2579,31 +2588,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Μ.Μ. Αποθέματος
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
 ,Projected,Προβλεπόμενη
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Ο σειριακός αριθμός {0} δεν ανήκει στην αποθήκη {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Σημείωση : το σύστημα δεν θα ελέγχει για υπέρβαση ορίων παράδοσης και κράτησης για το είδος {0} καθώς η ποσότητα ή το ποσό είναι 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Σημείωση : το σύστημα δεν θα ελέγχει για υπέρβαση ορίων παράδοσης και κράτησης για το είδος {0} καθώς η ποσότητα ή το ποσό είναι 0
 DocType: Notification Control,Quotation Message,Μήνυμα προσφοράς
 DocType: Issue,Opening Date,Ημερομηνία έναρξης
 DocType: Journal Entry,Remark,Παρατήρηση
 DocType: Purchase Receipt Item,Rate and Amount,Τιμή και ποσό
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Βαρετό
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Από παραγγελία πώλησης
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Από παραγγελία πώλησης
 DocType: Blog Category,Parent Website Route,Γονική διαδρομή ιστοσελίδας
 DocType: Sales Order,Not Billed,Μη τιμολογημένο
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Και οι δύο αποθήκες πρέπει να ανήκουν στην ίδια εταιρεία
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Δεν δημιουργήθηκαν επαφές 
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Δεν δημιουργήθηκαν επαφές 
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ανενεργό
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Κατά την ημερομηνία αποστολής του τιμολογίου
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Ποσό αποδεικτικοού κόστους αποστολής εμπορευμάτων
 DocType: Time Log,Batched for Billing,Ομαδοποιημένα για χρέωση
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Λογαριασμοί από τους προμηθευτές.
 DocType: POS Profile,Write Off Account,Διαγραφή λογαριασμού
-sites/assets/js/erpnext.min.js +26,Discount Amount,Ποσό έκπτωσης
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Ποσό έκπτωσης
 DocType: Purchase Invoice,Return Against Purchase Invoice,Επιστροφή Ενάντια Αγορά Τιμολόγιο
 DocType: Item,Warranty Period (in days),Περίοδος εγγύησης (σε ημέρες)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,Π.Χ. Φπα
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Στοιχείο 4
 DocType: Journal Entry Account,Journal Entry Account,Λογαριασμός λογιστικής εγγραφής
 DocType: Shopping Cart Settings,Quotation Series,Σειρά προσφορών
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Ένα είδος υπάρχει με το ίδιο όνομα ( {0} ), παρακαλώ να αλλάξετε το όνομα της ομάδας ειδών ή να μετονομάσετε το είδος"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Ένα είδος υπάρχει με το ίδιο όνομα ( {0} ), παρακαλώ να αλλάξετε το όνομα της ομάδας ειδών ή να μετονομάσετε το είδος"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot αερίου μορφοποίησης μετάλλου
 DocType: Sales Order Item,Sales Order Date,Ημερομηνία παραγγελίας πώλησης 
 DocType: Sales Invoice Item,Delivered Qty,Ποσότητα που παραδόθηκε
@@ -2635,10 +2643,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Πελάτη ή προμηθευτή Λεπτομέρειες
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Σετ
 DocType: Lead,Lead Owner,Ιδιοκτήτης επαφής
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Αποθήκη απαιτείται
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Αποθήκη απαιτείται
 DocType: Employee,Marital Status,Οικογενειακή κατάσταση
 DocType: Stock Settings,Auto Material Request,Αυτόματη αίτηση υλικού
 DocType: Time Log,Will be updated when billed.,Θα ενημερωθεί με την τιμολόγηση.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Διαθέσιμο παρτίδας Ποσότητα σε από την αποθήκη
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Η τρέχουσα Λ.Υ. και η νέα Λ.Υ. δεν μπορεί να είναι ίδιες
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Η ημερομηνία συνταξιοδότησης πρέπει να είναι μεταγενέστερη από την ημερομηνία πρόσληψης
 DocType: Sales Invoice,Against Income Account,Κατά τον λογαριασμό εσόδων
@@ -2655,12 +2664,12 @@ DocType: POS Profile,Update Stock,Ενημέρωση αποθέματος
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Στίλβωσης
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Διαφορετικές Μ.Μ.για τα είδη θα οδηγήσουν σε λανθασμένη τιμή ( σύνολο ) καθαρού βάρους. Βεβαιωθείτε ότι το καθαρό βάρος κάθε είδοςυ είναι στην ίδια Μ.Μ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Τιμή Λ.Υ. 
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Παρακαλώ κάντε λήψη ειδών από το δελτίο αποστολής
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Παρακαλώ κάντε λήψη ειδών από το δελτίο αποστολής
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Οι λογιστικές εγγραφές {0} είναι μη συνδεδεμένες
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Εγγραφή όλων των ανακοινώσεων τύπου e-mail, τηλέφωνο, chat, επίσκεψη, κ.α."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Παρακαλείστε να αναφέρετε στρογγυλεύουν Κέντρο Κόστους στην Εταιρεία
 DocType: Purchase Invoice,Terms,Όροι
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Δημιουργία νέου
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Δημιουργία νέου
 DocType: Buying Settings,Purchase Order Required,Απαιτείται παραγγελία αγοράς
 ,Item-wise Sales History,Ιστορικό πωλήσεων ανά είδος
 DocType: Expense Claim,Total Sanctioned Amount,Σύνολο εγκεκριμένων ποσών
@@ -2677,16 +2686,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Παρακρατήσεις
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Σημειώσεις
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Επιλέξτε πρώτα έναν κόμβο ομάδας.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Ο σκοπός πρέπει να είναι ένα από τα {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Συμπληρώστε τη φόρμα και αποθηκεύστε
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Συμπληρώστε τη φόρμα και αποθηκεύστε
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Κατεβάστε μια έκθεση που περιέχει όλες τις πρώτες ύλες με την πιο πρόσφατη κατάσταση των αποθεμάτων τους
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Αντιμετωπίζοντας
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Κοινότητα Φόρουμ
 DocType: Leave Application,Leave Balance Before Application,Υπόλοιπο άδειας πριν από την εφαρμογή
 DocType: SMS Center,Send SMS,Αποστολή SMS
 DocType: Company,Default Letter Head,Προεπιλογή κεφαλίδα επιστολόχαρτου
 DocType: Time Log,Billable,Χρεώσιμο
 DocType: Authorization Rule,This will be used for setting rule in HR module,Αυτό θα χρησιμοποιηθεί για την ρύθμιση κανόνα στην ενότητα hr
 DocType: Account,Rate at which this tax is applied,Ποσοστό με το οποίο επιβάλλεται ο φόρος αυτός
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Αναδιάταξη ποσότητας
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Αναδιάταξη ποσότητας
 DocType: Company,Stock Adjustment Account,Λογαριασμός διευθέτησης αποθέματος
 DocType: Journal Entry,Write Off,Διαγράφω
 DocType: Time Log,Operation ID,Λειτουργία ID
@@ -2697,12 +2707,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Τα πεδία με έκπτωση θα είναι διαθέσιμα σε παραγγελία αγοράς, αποδεικτικό παραλαβής αγοράς, τιμολόγιο αγοράς"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Όνομα του νέου λογαριασμού. Σημείωση: Παρακαλώ μην δημιουργείτε λογαριασμούς για τους πελάτες και προμηθευτές
 DocType: Report,Report Type,Τύπος έκθεσης
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Φόρτωση
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Φόρτωση
 DocType: BOM Replace Tool,BOM Replace Tool,Εργαλείο αντικατάστασης Λ.Υ.
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Προκαθορισμένα πρότυπα διεύθυνσης ανά χώρα
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Προμηθευτής παραδίδει στον πελάτη
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Εμφάνιση φόρου διάλυση
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Δεδομένα εισαγωγής και εξαγωγής
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Αν δραστηριοποιείστε σε μεταποιητικές δραστηριότητες, επιτρέπει την επιλογή 'κατασκευάζεται '"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Τιμολόγιο Ημερομηνία Δημοσίευσης
 DocType: Sales Invoice,Rounded Total,Στρογγυλοποιημένο σύνολο
 DocType: Product Bundle,List items that form the package.,Απαριθμήστε τα είδη που αποτελούν το συσκευασία.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Το ποσοστό κατανομής θα πρέπει να είναι ίσο με το 100 %
@@ -2713,8 +2726,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
 DocType: Company,Default Cash Account,Προεπιλεγμένος λογαριασμός μετρητών
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Κύρια εγγραφή εταιρείας (δεν είναι πελάτης ή προμηθευτής).
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Παρακαλώ εισάγετε 'αναμενόμενη ημερομηνία παράδοσης΄
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Παρακαλώ εισάγετε 'αναμενόμενη ημερομηνία παράδοσης΄
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Το άθροισμα από το καταβληθέν ποσό και το ποσό που διαγράφηκε δεν μπορεί να είναι μεγαλύτερο από το γενικό σύνολο
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},Ο {0} δεν είναι έγκυρος αριθμός παρτίδας για το είδος {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Σημείωση : δεν υπάρχει αρκετό υπόλοιπο άδειας για τον τύπο άδειας {0}
@@ -2735,11 +2748,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Γραμμή {0}: για να ρυθμίσετε {1} περιοδικότητα, η διαφορά μεταξύ της ημερομηνίας από και έως \ πρέπει να είναι μεγαλύτερη ή ίση με {2}"""
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Στοιχείο 3
+DocType: Purchase Order,Customer Contact Email,Πελατών Επικοινωνία Email
 DocType: Event,Sunday,Κυριακή
 DocType: Sales Team,Contribution (%),Συμβολή (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Αρμοδιότητες
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Πρότυπο
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Πρότυπο
 DocType: Sales Person,Sales Person Name,Όνομα πωλητή
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Παρακαλώ εισάγετε τουλάχιστον 1 τιμολόγιο στον πίνακα
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Προσθήκη χρηστών
@@ -2748,7 +2762,7 @@ DocType: Task,Actual Start Date (via Time Logs),Πραγματική Ημερο
 DocType: Stock Reconciliation Item,Before reconciliation,Πριν συμφιλίωση
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Έως {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Φόροι και επιβαρύνσεις που προστέθηκαν (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
 DocType: Sales Order,Partly Billed,Μερικώς τιμολογημένος
 DocType: Item,Default BOM,Προεπιλεγμένη Λ.Υ. 
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2756,12 +2770,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Συνολικού ανεξόφλητου υπολοίπου
 DocType: Time Log Batch,Total Hours,Σύνολο ωρών
 DocType: Journal Entry,Printing Settings,Ρυθμίσεις εκτύπωσης
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Αυτοκίνητο
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Οι άδειες για τον τύπο {0} έχουν ήδη κατανεμηθεί για τον υπάλληλο {1} για το φορολογικό έτος {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Το είδος είναι απαραίτητο
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Μεταλλικά ένεση γείσο
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Από το δελτίο αποστολής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Από το δελτίο αποστολής
 DocType: Time Log,From Time,Από ώρα
 DocType: Notification Control,Custom Message,Προσαρμοσμένο μήνυμα
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Επενδυτική τραπεζική
@@ -2777,17 +2790,17 @@ DocType: Newsletter,A Lead with this email id should exist,Μια επαφή μ
 DocType: Stock Entry,From BOM,Από BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Βασικός
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Οι μεταφορές αποθέματος πριν από τη {0} είναι παγωμένες
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Η 'έως ημερομηνία' πρέπει να είναι η ίδια με την 'από ημερομηνία'΄για την άδεια μισής ημέρας
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Η 'έως ημερομηνία' πρέπει να είναι η ίδια με την 'από ημερομηνία'΄για την άδεια μισής ημέρας
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","Π.Χ. Kg, μονάδα, αριθμοί, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Ο αρ. αναφοράς είναι απαραίτητος εάν έχετε εισάγει ημερομηνία αναφοράς
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Ο αρ. αναφοράς είναι απαραίτητος εάν έχετε εισάγει ημερομηνία αναφοράς
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,"Η ημερομηνία της πρόσληψης πρέπει να είναι μεταγενέστερη από ό, τι η ημερομηνία γέννησης"
 DocType: Salary Structure,Salary Structure,Μισθολόγιο
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Πολλαπλοί κανόνας τιμής υπάρχουν με τα ίδια κριτήρια, παρακαλώ να επιλύσετε την διένεξη \ σύγκρουση με τον ορισμό προτεραιότητας. Κανόνες τιμής: {0}"""
 DocType: Account,Bank,Τράπεζα
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Αερογραμμή
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Υλικό έκδοσης
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Υλικό έκδοσης
 DocType: Material Request Item,For Warehouse,Για αποθήκη
 DocType: Employee,Offer Date,Ημερομηνία προσφοράς
 DocType: Hub Settings,Access Token,Η πρόσβαση παραχωρήθηκε
@@ -2810,6 +2823,7 @@ DocType: Issue,Opening Time,Ώρα ανοίγματος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Τα πεδία από και έως ημερομηνία είναι απαραίτητα
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
+DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Γεώτρηση
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow μορφοποίησης
 DocType: Purchase Taxes and Charges,Valuation and Total,Αποτίμηση και σύνολο
@@ -2831,11 +2845,12 @@ DocType: C-Form,Amended From,Τροποποίηση από
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Πρώτη ύλη
 DocType: Leave Application,Follow via Email,Ακολουθήστε μέσω email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Ποσό φόρου μετά ποσού έκπτωσης
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Υπάρχει θυγατρικός λογαριασμός για αυτόν το λογαριασμό. Δεν μπορείτε να διαγράψετε αυτόν το λογαριασμό.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Υπάρχει θυγατρικός λογαριασμός για αυτόν το λογαριασμό. Δεν μπορείτε να διαγράψετε αυτόν το λογαριασμό.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα. 
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
-DocType: Leave Allocation,Carry Forward,Μεταφορά προς τα εμπρός
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Ημερομηνία ανοίγματος πρέπει να είναι πριν από την Ημερομηνία Κλεισίματος
+DocType: Leave Control Panel,Carry Forward,Μεταφορά προς τα εμπρός
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε καθολικό
 DocType: Department,Days for which Holidays are blocked for this department.,Οι ημέρες για τις οποίες οι άδειες έχουν αποκλειστεί για αυτό το τμήμα
 ,Produced,Παράχθηκε
@@ -2856,16 +2871,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Σύνολο (ποσό
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Διασκέδαση & ψυχαγωγία
 DocType: Purchase Order,The date on which recurring order will be stop,Η ημερομηνία κατά την οποία η επαναλαμβανόμενη παραγγελία θα σταματήσει
 DocType: Quality Inspection,Item Serial No,Σειριακός αριθμός είδους
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} Πρέπει να μειωθεί κατά {1} ή θα πρέπει να αυξηθεί η ανοχή υπερχείλισης
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} Πρέπει να μειωθεί κατά {1} ή θα πρέπει να αυξηθεί η ανοχή υπερχείλισης
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Σύνολο παρόντων
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Ώρα
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Το είδος σειράς {0} δεν μπορεί να ενημερωθεί \ χρησιμοποιώντας συμφωνία αποθέματος"""
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ένας νέος σειριακός αριθμός δεν μπορεί να έχει αποθήκη. Η αποθήκη πρέπει να ορίζεται από καταχωρήσεις αποθέματος ή από παραλαβές αγορών
 DocType: Lead,Lead Type,Τύπος επαφής
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Δημιουργία προσφοράς
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Όλα αυτά τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Όλα αυτά τα είδη έχουν ήδη τιμολογηθεί
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Μπορεί να εγκριθεί από {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Όροι κανόνα αποστολής
 DocType: BOM Replace Tool,The new BOM after replacement,Η νέα Λ.Υ. μετά την αντικατάστασή
@@ -2913,7 +2928,7 @@ DocType: C-Form,C-Form,C-form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Αναγνωριστικό λειτουργίας δεν έχει οριστεί
 DocType: Production Order,Planned Start Date,Προγραμματισμένη ημερομηνία έναρξης
 DocType: Serial No,Creation Document Type,Τύπος εγγράφου δημιουργίας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Συντήρηση. Επίσκεψη
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Συντήρηση. Επίσκεψη
 DocType: Leave Type,Is Encash,Είναι είσπραξη
 DocType: Purchase Invoice,Mobile No,Αρ. Κινητού
 DocType: Payment Tool,Make Journal Entry,Δημιούργησε λογιστική εγγραφή
@@ -2921,7 +2936,7 @@ DocType: Leave Allocation,New Leaves Allocated,Νέες άδειες που κα
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Τα στοιχεία με βάση το έργο δεν είναι διαθέσιμα στοιχεία για προσφορά
 DocType: Project,Expected End Date,Αναμενόμενη ημερομηνία λήξης
 DocType: Appraisal Template,Appraisal Template Title,Τίτλος προτύπου αξιολόγησης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Εμπορικός
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Εμπορικός
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Μητρική Θέση {0} δεν πρέπει να είναι ένα αναντικατάστατο
 DocType: Cost Center,Distribution Id,ID διανομής
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Εκπληκτικές υπηρεσίες
@@ -2937,14 +2952,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Σχέση Χαρακτηριστικό {0} πρέπει να είναι εντός του εύρους από {1} σε {2} σε προσαυξήσεις των {3}
 DocType: Tax Rule,Sales,Πωλήσεις
 DocType: Stock Entry Detail,Basic Amount,Βασικό Ποσό
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
+DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Προεπιλεγμένοι λογαριασμοί εισπρακτέων
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Πριόνισμα
 DocType: Tax Rule,Billing State,Μέλος χρέωσης
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Πλαστικοποίησης
 DocType: Item Reorder,Transfer,Μεταφορά
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
 DocType: Authorization Rule,Applicable To (Employee), Εφαρμοστέα σε (υπάλληλος)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date είναι υποχρεωτική
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
@@ -2960,6 +2976,7 @@ DocType: Company,Retail,Λιανική πώληση
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,O πελάτης {0} δεν υπάρχει
 DocType: Attendance,Absent,Απών
 DocType: Product Bundle,Product Bundle,Πακέτο προϊόντων
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Σύνθλιψη
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Αγοράστε φόροι και επιβαρύνσεις Πρότυπο
 DocType: Upload Attendance,Download Template,Κατεβάστε πρότυπο
@@ -2967,16 +2984,16 @@ DocType: GL Entry,Remarks,Παρατηρήσεις
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Κωδικός είδους πρώτης ύλης
 DocType: Journal Entry,Write Off Based On,Διαγραφή βάσει του
 DocType: Features Setup,POS View,Προβολή POS 
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Αρχείο εγκατάστασης για ένα σειριακό αριθμό
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Αρχείο εγκατάστασης για ένα σειριακό αριθμό
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Συνεχής χύτευση
-sites/assets/js/erpnext.min.js +10,Please specify a,Παρακαλώ ορίστε μια
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Παρακαλώ ορίστε μια
 DocType: Offer Letter,Awaiting Response,Αναμονή Απάντησης
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Πάνω από
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Κρύο μέγεθος
 DocType: Salary Slip,Earning & Deduction,Κέρδος και έκπτωση
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Ο λογαριασμός {0} δεν μπορεί να είναι ομάδα
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Περιοχή
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Προαιρετικό. Αυτή η ρύθμιση θα χρησιμοποιηθεί για το φιλτράρισμα σε διάφορες συναλλαγές.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Προαιρετικό. Αυτή η ρύθμιση θα χρησιμοποιηθεί για το φιλτράρισμα σε διάφορες συναλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
 DocType: Holiday List,Weekly Off,Εβδομαδιαίες αργίες
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Για παράδειγμα το 2012, 2012-13"
@@ -3020,12 +3037,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Διογκώνοντας
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Χύτευση Εξατμιστική-μοτίβο
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Δαπάνες ψυχαγωγίας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Το τιμολόγιο πώλησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Ηλικία
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Το τιμολόγιο πώλησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Ηλικία
 DocType: Time Log,Billing Amount,Ποσό Χρέωσης
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ορίστηκε μη έγκυρη ποσότητα για το είδος {0}. Η ποσότητα αυτή θα πρέπει να είναι μεγαλύτερη από 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Αιτήσεις για χορήγηση άδειας.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να διαγραφεί
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να διαγραφεί
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Νομικές δαπάνες
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Η ημέρα του μήνα κατά την οποίο θα δημιουργηθεί η αυτοματοποιημένη παραγγελία, π.Χ. 05, 28 Κλπ"
 DocType: Sales Invoice,Posting Time,Ώρα αποστολής
@@ -3034,9 +3051,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Λογότυπο
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Ελέγξτε αυτό, αν θέλετε να αναγκάσει τον χρήστη να επιλέξει μια σειρά πριν από την αποθήκευση. Δεν θα υπάρξει καμία προεπιλογή αν επιλέξετε αυτό."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Δεν βρέθηκε είδος με σειριακός αριθμός {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Ανοίξτε Ειδοποιήσεις
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Ανοίξτε Ειδοποιήσεις
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Άμεσες δαπάνες
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Θέλετε πραγματικά να συνεχίσετε αυτήν την αίτηση υλικού;
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Νέα έσοδα πελατών
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Έξοδα μετακίνησης
 DocType: Maintenance Visit,Breakdown,Ανάλυση
@@ -3047,7 +3063,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ως ημερομηνία για
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Ακονίζοντας
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Επιτήρηση
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Η προεπιλεγμένη αποθήκη είναι απαραίτητη για αποθηκεύσιμα είδη.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Η προεπιλεγμένη αποθήκη είναι απαραίτητη για αποθηκεύσιμα είδη.
 DocType: Feed,Full Name,Ονοματεπώνυμο
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Στερεώνοντας
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Πληρωμή του μισθού για τον μήνα {0} και έτος {1}
@@ -3070,7 +3086,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Προσθέσ
 DocType: Buying Settings,Default Supplier Type,Προεπιλεγμένος τύπος προμηθευτής
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Λατομεία
 DocType: Production Order,Total Operating Cost,Συνολικό κόστος λειτουργίας
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Σημείωση : το σημείο {0} εισήχθηκε πολλαπλές φορές
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Σημείωση : το σημείο {0} εισήχθηκε πολλαπλές φορές
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Όλες οι επαφές.
 DocType: Newsletter,Test Email Id,Δοκιμαστικό email ID
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Συντομογραφία εταιρείας
@@ -3094,11 +3110,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Προ
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ο ρόλος έχει τη δυνατότητα επεξεργασίας παγωμένου απόθεματος
 ,Territory Target Variance Item Group-Wise,Εύρος στόχων περιοχής ανά ομάδα ειδών
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Όλες οι ομάδες πελατών
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Φόρος προτύπου είναι υποχρεωτική.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν υπάρχει
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Τιμή τιμοκαταλόγου (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} είναι σε κατάσταση 'σταματημένη'
 DocType: Account,Temporary,Προσωρινός
 DocType: Address,Preferred Billing Address,Προτιμώμενη διεύθυνση χρέωσης
 DocType: Monthly Distribution Percentage,Percentage Allocation,Ποσοστό κατανομής
@@ -3116,13 +3131,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Φορολογικές
 DocType: Purchase Order Item,Supplier Quotation,Προσφορά προμηθευτή
 DocType: Quotation,In Words will be visible once you save the Quotation.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το πρόσημο.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Σιδερώματος
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} Είναι σταματημένο
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} Είναι σταματημένο
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
 DocType: Lead,Add to calendar on this date,Προσθήκη στο ημερολόγιο την ημερομηνία αυτή
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Κανόνες για την προσθήκη εξόδων αποστολής.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Ανερχόμενες εκδηλώσεις
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ανερχόμενες εκδηλώσεις
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Ο πελάτης είναι απαραίτητος
 DocType: Letter Head,Letter Head,Επικεφαλίδα επιστολόχαρτου
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Γρήγορη Έναρξη
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} είναι υποχρεωτική για την Επιστροφή
 DocType: Purchase Order,To Receive,Να Λάβω
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Συρρίκνωση τοποθέτηση
@@ -3146,25 +3162,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Τουλάχιστον μια αποθήκη είναι απαραίτητη
 DocType: Serial No,Out of Warranty,Εκτός εγγύησης
 DocType: BOM Replace Tool,Replace,Αντικατάσταση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Παρακαλώ εισάγετε προεπιλεγμένη μονάδα μέτρησης
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Παρακαλώ εισάγετε προεπιλεγμένη μονάδα μέτρησης
 DocType: Purchase Invoice Item,Project Name,Όνομα έργου
 DocType: Supplier,Mention if non-standard receivable account,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμού
 DocType: Workflow State,Edit,Επεξεργασία
 DocType: Journal Entry Account,If Income or Expense,Εάν είναι έσοδα ή δαπάνη
 DocType: Features Setup,Item Batch Nos,Αρ. Παρτίδας είδους
 DocType: Stock Ledger Entry,Stock Value Difference,Διαφορά αξίας αποθέματος
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Ανθρώπινο Δυναμικό
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Ανθρώπινο Δυναμικό
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Πληρωμή συμφωνίας 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Φορολογικές απαιτήσεις
 DocType: BOM Item,BOM No,Αρ. Λ.Υ.
 DocType: Contact Us Settings,Pincode,Κωδικός pin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Η λογιστική εγγραφή {0} δεν έχει λογαριασμό {1} ή έχει ήδη αντιπαραβληθεί με άλλο αποδεικτικό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Η λογιστική εγγραφή {0} δεν έχει λογαριασμό {1} ή έχει ήδη αντιπαραβληθεί με άλλο αποδεικτικό
 DocType: Item,Moving Average,Κινητός μέσος
 DocType: BOM Replace Tool,The BOM which will be replaced,Η Λ.Υ. που θα αντικατασταθεί
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Η νέα Μ.Μ. Αποθέματος πρέπει να είναι διαφορετική από την τρέχουσα Μ.Μ.αποθέματος
 DocType: Account,Debit,Χρέωση
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Οι άδειες πρέπει να κατανέμονται σαν πολλαπλάσια του 0, 5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Οι άδειες πρέπει να κατανέμονται σαν πολλαπλάσια του 0, 5"
 DocType: Production Order,Operation Cost,Κόστος λειτουργίας
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Ανεβάστε παρουσίες από ένα αρχείο .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Οφειλόμενο ποσό
@@ -3172,7 +3188,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ορί
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Για να αναθέσετε αυτό το ζήτημα, χρησιμοποιήστε το πλήκτρο 'ανάθεση' στο πλαϊνό μενού."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Πάγωμα αποθεμάτων παλαιότερα από [ημέρες]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Αν δύο ή περισσότεροι κανόνες τιμολόγησης που βρέθηκαν με βάση τις παραπάνω προϋποθέσεις, εφαρμόζεται σειρά προτεραιότητας. Η προτεραιότητα είναι ένας αριθμός μεταξύ 0 και 20, ενώ η προεπιλεγμένη τιμή είναι μηδέν (κενό). Μεγαλύτερος αριθμός σημαίνει ότι θα υπερισχύσει εάν υπάρχουν πολλαπλοί κανόνες τιμολόγησης με τους ίδιους όρους."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Κατά το τιμολόγιο
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Φορολογικό Έτος: {0} δεν υπάρχει
 DocType: Currency Exchange,To Currency,Σε νόμισμα
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Επίτρεψε στους παρακάτω χρήστες να εγκρίνουν αιτήσεις αδειών για αποκλεισμένες ημέρες.
@@ -3201,7 +3216,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Πο
 DocType: Stock Entry Detail,Additional Cost,Πρόσθετο κόστος
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Ημερομηνία λήξης για η χρήση 
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
 DocType: Quality Inspection,Incoming,Εισερχόμενος
 DocType: BOM,Materials Required (Exploded),Υλικά που απαιτούνται (αναλυτικά)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Μείωση κερδών για άδεια άνευ αποδοχών (Α.Α.Α.)
@@ -3209,10 +3224,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Σειρά # {0}: Αύξων αριθμός {1} δεν ταιριάζει με το {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Περιστασιακή άδεια
 DocType: Batch,Batch ID,ID παρτίδας
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Σημείωση : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Σημείωση : {0}
 ,Delivery Note Trends,Τάσεις δελτίου αποστολής
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Περίληψη της Εβδομάδας
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} Το είδος στη γραμμή {1} πρέπει να είναι αγορασμένο ή από υπεργολαβία
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} Το είδος στη γραμμή {1} πρέπει να είναι αγορασμένο ή από υπεργολαβία
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Ο λογαριασμός: {0} μπορεί να ενημερώνεται μόνο μέσω συναλλαγών αποθέματος
 DocType: GL Entry,Party,Συμβαλλόμενος
 DocType: Sales Order,Delivery Date,Ημερομηνία παράδοσης
@@ -3225,7 +3240,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Μέση τιμή αγοράς
 DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
 DocType: Employee,History In Company,Ιστορικό στην εταιρεία
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Ενημερωτικά Δελτία
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Ενημερωτικά Δελτία
 DocType: Address,Shipping,Αποστολή
 DocType: Stock Ledger Entry,Stock Ledger Entry,Καθολική καταχώρηση αποθέματος
 DocType: Department,Leave Block List,Λίστα ημερών Άδειας
@@ -3244,7 +3259,7 @@ DocType: Account,Auditor,Ελεγκτής
 DocType: Purchase Order,End date of current order's period,Ημερομηνία λήξης της περιόδου της τρέχουσας παραγγελίας
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Πραγματοποίηση προσφοράς Επιστολή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Απόδοση
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή πρέπει να είναι ίδιο με το Πρότυπο
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή πρέπει να είναι ίδιο με το Πρότυπο
 DocType: DocField,Fold,Αναδίπλωση
 DocType: Production Order Operation,Production Order Operation,Λειτουργία παραγγελίας παραγωγής
 DocType: Pricing Rule,Disable,Απενεργοποίηση
@@ -3276,7 +3291,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Εκθέσεις προς
 DocType: SMS Settings,Enter url parameter for receiver nos,Εισάγετε παράμετρο url για αριθμούς παραλήπτη
 DocType: Sales Invoice,Paid Amount,Καταβληθέν ποσό
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Το κλείσιμο του λογαριασμού {0} πρέπει να είναι τύπου 'ευθύνη'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Το κλείσιμο του λογαριασμού {0} πρέπει να είναι τύπου 'ευθύνη'
 ,Available Stock for Packing Items,Διαθέσιμο απόθεμα για είδη συσκευασίας
 DocType: Item Variant,Item Variant,Παραλλαγή είδους
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Αυτό το πρότυπο διεύθυνσης ορίστηκε ως προεπιλογή, καθώς δεν υπάρχει άλλη προεπιλογή."
@@ -3284,7 +3299,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Διαχείριση ποιότητας
 DocType: Production Planning Tool,Filter based on customer,Φιλτράρισμα με βάση τον πελάτη
 DocType: Payment Tool Detail,Against Voucher No,Κατά τον αρ. αποδεικτικού
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Παρακαλώ εισάγετε ποσότητα για το είδος {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Παρακαλώ εισάγετε ποσότητα για το είδος {0}
 DocType: Employee External Work History,Employee External Work History,Ιστορικό εξωτερικών εργασιών υπαλλήλου
 DocType: Tax Rule,Purchase,Αγορά
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Ισολογισμός ποσότητας
@@ -3321,28 +3336,29 @@ Note: BOM = Bill of Materials","Συγκεντρωτικά ομάδα ** Τα σ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Ο σειριακός αριθμός είναι απαραίτητος για το είδος {0}
 DocType: Item Variant Attribute,Attribute,Χαρακτηριστικό
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Παρακαλείστε να αναφέρετε από / προς το εύρος
-sites/assets/js/desk.min.js +7652,Created By,Δημιουργήθηκε από
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Δημιουργήθηκε από
 DocType: Serial No,Under AMC,Σύμφωνα με Ε.Σ.Υ.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Το πσό αποτίμησης είδους υπολογίζεται εκ νέου εξετάζοντας τα αποδεικτικά κόστους μεταφοράς
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές πωλήσεων.
 DocType: BOM Replace Tool,Current BOM,Τρέχουσα Λ.Υ.
-sites/assets/js/erpnext.min.js +8,Add Serial No,Προσθήκη σειριακού αριθμού
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Προσθήκη σειριακού αριθμού
 DocType: Production Order,Warehouses,Αποθήκες
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Εκτύπωση και στάσιμο
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Κόμβος ομάδας
 DocType: Payment Reconciliation,Minimum Amount,Ελάχιστο ποσό
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Ενημέρωση τελικών ειδών
 DocType: Workstation,per hour,Ανά ώρα
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Η σειρά {0} έχει ήδη χρησιμοποιηθεί σε {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Η σειρά {0} έχει ήδη χρησιμοποιηθεί σε {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Ο λογαριασμός για την αποθήκη (διαρκής απογραφή) θα δημιουργηθεί στο πλαίσιο του παρόντος λογαριασμού.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή."
 DocType: Company,Distribution,Διανομή
-sites/assets/js/erpnext.min.js +50,Amount Paid,Πληρωμένο Ποσό
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Πληρωμένο Ποσό
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Υπεύθυνος έργου
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Αποστολή
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Η μέγιστη έκπτωση που επιτρέπεται για το είδος: {0} είναι {1}%
 DocType: Customer,Default Taxes and Charges,Προεπιλογή Φόροι και τέλη
 DocType: Account,Receivable,Εισπρακτέος
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Σειρά # {0}: Δεν επιτρέπεται να αλλάξουν προμηθευτή, όπως υπάρχει ήδη παραγγελίας"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ρόλος που έχει τη δυνατότητα να υποβάλει τις συναλλαγές που υπερβαίνουν τα όρια πίστωσης.
 DocType: Sales Invoice,Supplier Reference,Σύσταση προμηθευτή
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Εάν είναι επιλεγμένο, οι Λ.Υ. Για τα εξαρτήματα θα ληφθούν υπόψη για να παρθούν οι πρώτες ύλες. Διαφορετικά, όλα τα υπο-συγκρότημα είδη θα πρέπει να αντιμετωπίζονται ως πρώτη ύλη."
@@ -3379,8 +3395,8 @@ DocType: Email Digest,Add/Remove Recipients,Προσθήκη / αφαίρεση
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Η συναλλαγή δεν επιτρέπεται σε σταματημένες εντολές παραγωγής {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Για να ορίσετε την τρέχουσα χρήση ως προεπιλογή, κάντε κλικ στο 'ορισμός ως προεπιλογή'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Ρύθμιση διακομιστή εισερχομένων για το email ID υποστήριξης. ( Π.Χ. Support@example.Com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Έλλειψη ποσότητας
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
 DocType: Salary Slip,Salary Slip,Βεβαίωση αποδοχών
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Γυάλισμα
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,Το πεδίο 'έως ημερομηνία' είναι απαραίτητο.
@@ -3393,6 +3409,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Όταν υποβληθεί οποιαδήποτε από τις επιλεγμένες συναλλαγές, θα ανοίξει αυτόματα ένα pop-up παράθυρο email ώστε αν θέλετε να στείλετε ένα μήνυμα email στη συσχετισμένη επαφή για την εν λόγω συναλλαγή, με τη συναλλαγή ως συνημμένη."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Καθολικές ρυθμίσεις
 DocType: Employee Education,Employee Education,Εκπαίδευση των υπαλλήλων
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
 DocType: Salary Slip,Net Pay,Καθαρές αποδοχές
 DocType: Account,Account,Λογαριασμός
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Ο σειριακός αριθμός {0} έχει ήδη ληφθεί
@@ -3425,7 +3442,7 @@ DocType: BOM,Manufacturing User,Χρήστης παραγωγής
 DocType: Purchase Order,Raw Materials Supplied,Πρώτες ύλες που προμηθεύτηκαν
 DocType: Purchase Invoice,Recurring Print Format,Επαναλαμβανόμενες έντυπη μορφή
 DocType: Communication,Series,Σειρά
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας αγοράς
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας αγοράς
 DocType: Appraisal,Appraisal Template,Πρότυπο αξιολόγησης
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Ταξινόμηση είδους
@@ -3481,6 +3498,7 @@ DocType: HR Settings,Payroll Settings,Ρυθμίσεις μισθοδοσίας
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Ταίριαξε μη συνδεδεμένα τιμολόγια και πληρωμές.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Παραγγέλνω
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Η ρίζα δεν μπορεί να έχει γονικό κέντρο κόστους
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Επιλέξτε Μάρκα ...
 DocType: Sales Invoice,C-Form Applicable,Εφαρμόσιμο σε C-Form
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
 DocType: Supplier,Address and Contacts,Διεύθυνση και Επικοινωνία
@@ -3491,7 +3509,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Βρες εκκρεμή αποδεικτικά
 DocType: Warranty Claim,Resolved By,Επιλύθηκε από
 DocType: Appraisal,Start Date,Ημερομηνία έναρξης
-sites/assets/js/desk.min.js +7629,Value,Αξία
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Αξία
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Κατανομή αδειών για μία περίοδο.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Κάντε κλικ εδώ για να επιβεβαιώσετε
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Ο λογαριασμός {0}: δεν μπορεί να οριστεί ως γονικός λογαριασμός του εαυτού του.
@@ -3507,14 +3525,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Επιτρέπεται η πρόσβαση στο dropbox
 DocType: Dropbox Backup,Weekly,Εβδομαδιαίος
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Π.Χ. SMSgateway.Com / api / send_SMS.Cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Λήψη
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Λήψη
 DocType: Maintenance Visit,Fully Completed,Πλήρως ολοκληρωμένο
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ολοκληρωμένο
 DocType: Employee,Educational Qualification,Εκπαιδευτικά προσόντα
 DocType: Workstation,Operating Costs,Λειτουργικά έξοδα
 DocType: Employee Leave Approver,Employee Leave Approver,Υπεύθυνος έγκρισης αδειών υπαλλήλου
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} έχει προστεθεί με επιτυχία στην λίστα ενημερωτικών δελτίων μας.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Μηχανουργική κατεργασία με δέσμη ηλεκτρονίων
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Κύρια εγγραφή υπευθύνου αγορών
@@ -3527,7 +3545,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Τύπος εγγράφου το
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Διάγραμμα των κέντρων κόστους
 ,Requested Items To Be Ordered,Είδη που ζητήθηκε να παραγγελθούν
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Οι παραγγελίες μου
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Οι παραγγελίες μου
 DocType: Price List,Price List Name,Όνομα τιμοκαταλόγου
 DocType: Time Log,For Manufacturing,Στον τομέα της Μεταποίησης
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Σύνολα
@@ -3538,7 +3556,7 @@ DocType: Account,Income,Έσοδα
 DocType: Industry Type,Industry Type,Τύπος βιομηχανίας
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Κάτι πήγε στραβά!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Το τιμολόγιο πώλησης {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Το τιμολόγιο πώλησης {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ημερομηνία ολοκλήρωσης
 DocType: Purchase Invoice Item,Amount (Company Currency),Ποσό (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die χύτευσης
@@ -3552,10 +3570,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Έτος
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Προφίλ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Παρακαλώ ενημερώστε τις ρυθμίσεις SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Χρόνος καταγραφής {0} έχει ήδη χρεωθεί
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Χρόνος καταγραφής {0} έχει ήδη χρεωθεί
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Ακάλυπτά δάνεια
 DocType: Cost Center,Cost Center Name,Όνομα κέντρου κόστους
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Το είδος {0} με σειριακό αριθμό {1} έχει ήδη εγκατασταθεί
 DocType: Maintenance Schedule Detail,Scheduled Date,Προγραμματισμένη ημερομηνία
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Συνολικό καταβεβλημένο ποσό
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Τα μηνύματα που είναι μεγαλύτερα από 160 χαρακτήρες θα χωρίζονται σε πολλαπλά μηνύματα
@@ -3563,10 +3580,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Που έχουν παρα
 ,Serial No Service Contract Expiry,Λήξη σύμβασης παροχής υπηρεσιών για τον σειριακό αριθμό
 DocType: Item,Unit of Measure Conversion,Μονάδα μετατροπής Μέτρου
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Υπάλληλος που δεν μπορεί να αλλάξει
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
 DocType: Naming Series,Help HTML,Βοήθεια ΗΤΜΛ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Το σύνολο βάρους πού έχει ανατεθεί έπρεπε να είναι 100 %. Είναι {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}
 DocType: Address,Name of person or organization that this address belongs to.,Όνομα προσώπου ή οργανισμού που ανήκει αυτή η διεύθυνση.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Οι προμηθευτές σας
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
@@ -3577,10 +3594,11 @@ DocType: Lead,Converted,Έχει μετατραπεί
 DocType: Item,Has Serial No,Έχει σειριακό αριθμό
 DocType: Employee,Date of Issue,Ημερομηνία έκδοσης
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Από {0} για {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
 DocType: Issue,Content Type,Τύπος περιεχομένου
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Ηλεκτρονικός υπολογιστής
 DocType: Item,List this Item in multiple groups on the website.,Εμφάνισε το είδος σε πολλαπλές ομάδες στην ιστοσελίδα.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Το είδος: {0} δεν υπάρχει στο σύστημα
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
 DocType: Payment Reconciliation,Get Unreconciled Entries,Βρες καταχωρήσεις χωρίς συμφωνία 
@@ -3591,14 +3609,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Προς αποθήκη
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Ο λογαριασμός {0} έχει εισαχθεί περισσότερες από μία φορά για τη χρήση {1}
 ,Average Commission Rate,Μέσος συντελεστής προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""έχει σειριακό αριθμό"" δεν μπορεί να είναι ""ναι"" για μη αποθηκεύσιμα είδη."
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""έχει σειριακό αριθμό"" δεν μπορεί να είναι ""ναι"" για μη αποθηκεύσιμα είδη."
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Η συμμετοχή δεν μπορεί να σημειωθεί για μελλοντικές ημερομηνίες
 DocType: Pricing Rule,Pricing Rule Help,Βοήθεια για τον κανόνα τιμολόγησης
 DocType: Purchase Taxes and Charges,Account Head,Κύρια εγγραφή λογαριασμού
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Ενημέρωση πρόσθετων δαπανών για τον υπολογισμό του κόστος μεταφοράς των ειδών
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Ηλεκτρικός
 DocType: Stock Entry,Total Value Difference (Out - In),Συνολική διαφορά αξίας (εξερχόμενη - εισερχόμενη)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Το ID χρήστη δεν έχει οριστεί για τον υπάλληλο {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Από αξίωση εγγύησης
@@ -3612,15 +3630,17 @@ DocType: Buying Settings,Naming Series,Σειρά ονομασίας
 DocType: Leave Block List,Leave Block List Name,Όνομα λίστας αποκλεισμού ημερών άδειας
 DocType: User,Enabled,Ενεργοποιημένο
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ενεργητικό αποθέματος
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Θέλετε πραγματικά να υποβάλλετε όλες βεβαιώσεις αποδοχών για τον μήνα {0} και το έτος {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Θέλετε πραγματικά να υποβάλλετε όλες βεβαιώσεις αποδοχών για τον μήνα {0} και το έτος {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Εισαγωγή συνδρομητών
 DocType: Target Detail,Target Qty,Ποσ.-στόχος
 DocType: Attendance,Present,Παρόν
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Το δελτίο αποστολής {0} δεν πρέπει να υποβάλλεται
 DocType: Notification Control,Sales Invoice Message,Μήνυμα τιμολογίου πώλησης
 DocType: Authorization Rule,Based On,Με βάση την
-,Ordered Qty,Παραγγελθείσα ποσότητα
+DocType: Sales Order Item,Ordered Qty,Παραγγελθείσα ποσότητα
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι 
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Δραστηριότητες / εργασίες έργου
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Δημιουργία βεβαιώσεων αποδοχών
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} Δεν είναι έγκυρη ταυτότητα email
@@ -3659,7 +3679,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Ανεβάστε παρουσίες 
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM και Βιομηχανία Ποσότητα απαιτούνται
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Eύρος γήρανσης 2
-DocType: Journal Entry Account,Amount,Ποσό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Ποσό
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Καθηλωτική
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Η Λ.Υ. αντικαταστάθηκε
 ,Sales Analytics,Ανάλυση πωλήσεων
@@ -3686,7 +3706,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Η αναμενόμενη ημερομηνία δεν μπορεί να είναι προγενέστερη της ημερομηνία αίτησης υλικού
 DocType: Contact Us Settings,City,Πόλη
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Κατεργασία με υπερήχους
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Σφάλμα: Δεν είναι ένα έγκυρο αναγνωριστικό;
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Σφάλμα: Δεν είναι ένα έγκυρο αναγνωριστικό;
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Το είδος {0} πρέπει να είναι ένα είδος πώλησης
 DocType: Naming Series,Update Series Number,Ενημέρωση αριθμού σειράς
 DocType: Account,Equity,Διαφορά ενεργητικού - παθητικού
@@ -3701,7 +3721,7 @@ DocType: Purchase Taxes and Charges,Actual,Πραγματικός
 DocType: Authorization Rule,Customerwise Discount,Έκπτωση με βάση πελάτη
 DocType: Purchase Invoice,Against Expense Account,Κατά τον λογαριασμό δαπανών
 DocType: Production Order,Production Order,Εντολή παραγωγής
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
 DocType: Quotation Item,Against Docname,Κατά όνομα εγγράφου
 DocType: SMS Center,All Employee (Active),Όλοι οι υπάλληλοι (ενεργοί)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Δείτε τώρα
@@ -3709,14 +3729,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Κόστος πρώτων υλών
 DocType: Item,Re-Order Level,Επίπεδο επαναπαραγγελίας
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Εισάγετε τα είδη και την προγραμματισμένη ποσότητα για την οποία θέλετε να δημιουργηθούν οι εντολές παραγωγής ή να κατεβάσετε τις πρώτες ύλες για την ανάλυση.
-sites/assets/js/list.min.js +174,Gantt Chart,Διάγραμμα gantt 
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Διάγραμμα gantt 
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Μερικής απασχόλησης
 DocType: Employee,Applicable Holiday List,Εφαρμοστέος κατάλογος διακοπών
 DocType: Employee,Cheque,Επιταγή
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Η σειρά ενημερώθηκε
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Ο τύπος έκθεσης είναι υποχρεωτικός
 DocType: Item,Serial Number Series,Σειρά σειριακών αριθμών
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Η αποθήκη είναι απαραίτητη για το απόθεμα του είδους {0} στη γραμμή {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Η αποθήκη είναι απαραίτητη για το απόθεμα του είδους {0} στη γραμμή {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Λιανική & χονδρική πώληση
 DocType: Issue,First Responded On,Πρώτη απάντηση στις
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Εμφάνιση του είδους σε πολλαπλές ομάδες
@@ -3731,7 +3751,7 @@ DocType: Attendance,Attendance,Συμμετοχή
 DocType: Page,No,Όχι
 DocType: BOM,Materials,Υλικά
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Αν δεν είναι επιλεγμένο, η λίστα θα πρέπει να προστίθεται σε κάθε τμήμα όπου πρέπει να εφαρμοστεί."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Η ημερομηνία αποστολής και ώρα αποστολής είναι απαραίτητες
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Η ημερομηνία αποστολής και ώρα αποστολής είναι απαραίτητες
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Φορολογικό πρότυπο για συναλλαγές αγοράς.
 ,Item Prices,Τιμές είδους
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία αγοράς.
@@ -3751,9 +3771,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Δαπάνες διοικήσεως
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Συμβουλή
 DocType: Customer Group,Parent Customer Group,Γονική ομάδα πελατών
-sites/assets/js/erpnext.min.js +50,Change,Αλλαγή
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Αλλαγή
 DocType: Purchase Invoice,Contact Email,Email επαφής
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Η παραγγελία αγοράς {0} είναι 'σταματημένη' 
 DocType: Appraisal Goal,Score Earned,Αποτέλεσμα 
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","Π.Χ. "" Η εταιρεία μου llc """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Ανακοίνωση Περίοδος
@@ -3763,12 +3782,13 @@ DocType: Packing Slip,Gross Weight UOM,Μ.Μ. Μικτού βάρους
 DocType: Email Digest,Receivables / Payables,Απαιτήσεις / υποχρεώσεις
 DocType: Delivery Note Item,Against Sales Invoice,Κατά το τιμολόγιο πώλησης
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Σφράγιση
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Λογαριασμός Πίστωσης
 DocType: Landed Cost Item,Landed Cost Item,Είδος κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Προβολή μηδενικών τιμών
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ποσότητα του είδους που αποκτήθηκε μετά την παραγωγή / ανασυσκευασία από συγκεκριμένες ποσότητες πρώτων υλών
 DocType: Payment Reconciliation,Receivable / Payable Account,Εισπρακτέοι / πληρωτέοι λογαριασμού
 DocType: Delivery Note Item,Against Sales Order Item,Κατά το είδος στην παραγγελία πώλησης
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
 DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη 
 DocType: Task,Actual End Date (via Time Logs),Πραγματική Ημερομηνία λήξης (μέσω χρόνος Καταγράφει)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά του λογαριασμού του Ομίλου {0}
@@ -3782,7 +3802,7 @@ DocType: Issue,Support Team,Ομάδα υποστήριξης
 DocType: Appraisal,Total Score (Out of 5),Συνολική βαθμολογία (από 5)
 DocType: Contact Us Settings,State,Πολιτεία
 DocType: Batch,Batch,Παρτίδα
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Υπόλοιπο
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Υπόλοιπο
 DocType: Project,Total Expense Claim (via Expense Claims),Σύνολο αξίωση Εξόδων (μέσω αξιώσεις Εξόδων)
 DocType: User,Gender,Φύλο
 DocType: Journal Entry,Debit Note,Χρεωστικό σημείωμα
@@ -3798,9 +3818,8 @@ DocType: Lead,Blog Subscriber,Συνδρομητής blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Δημιουργία κανόνων για τον περιορισμό των συναλλαγών που βασίζονται σε αξίες.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Εάν είναι επιλεγμένο, ο συνολικός αριθμός των εργάσιμων ημερών θα περιλαμβάνει τις αργίες, και αυτό θα μειώσει την αξία του μισθού ανά ημέρα"
 DocType: Purchase Invoice,Total Advance,Σύνολο προκαταβολών
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Συνέχεια αίτησης υλικών
 DocType: Workflow State,User,Χρήστης
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Επεξεργασία Μισθοδοσίας
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Επεξεργασία Μισθοδοσίας
 DocType: Opportunity Item,Basic Rate,Βασική τιμή
 DocType: GL Entry,Credit Amount,Πιστωτικές Ποσό
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Ορισμός ως απολεσθέν
@@ -3808,7 +3827,7 @@ DocType: Customer,Credit Days Based On,Πιστωτικές ημερών βάσ
 DocType: Tax Rule,Tax Rule,Φορολογικές Κανόνας
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Διατηρήστε ίδια τιμολόγηση καθ'όλο τον κύκλο πωλήσεων
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Προγραμματίστε κούτσουρα χρόνο εκτός των ωρών εργασίας του σταθμού εργασίας.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} Έχει ήδη υποβληθεί
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} Έχει ήδη υποβληθεί
 ,Items To Be Requested,Είδη που θα ζητηθούν
 DocType: Purchase Order,Get Last Purchase Rate,Βρες τελευταία τιμή αγοράς
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Τιμή χρέωσης ανάλογα με τον τύπο δραστηριότητας (ανά ώρα)
@@ -3817,6 +3836,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Το email ID της εταιρείας δεν βρέθηκε, ως εκ τούτου, δεν αποστέλλονται μηνύματα ταχυδρομείου "
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Εφαρμογή πόρων (ενεργητικό)
 DocType: Production Planning Tool,Filter based on item,Φιλτράρισμα με βάση το είδος
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Ο λογαριασμός Χρεωστικές
 DocType: Fiscal Year,Year Start Date,Ημερομηνία έναρξης έτους
 DocType: Attendance,Employee Name,Όνομα υπαλλήλου
 DocType: Sales Invoice,Rounded Total (Company Currency),Στρογγυλοποιημένο σύνολο (νόμισμα της εταιρείας)
@@ -3828,14 +3848,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Τυφλές
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Παροχές σε εργαζομένους
 DocType: Sales Invoice,Is POS,Είναι POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
 DocType: Production Order,Manufactured Qty,Παραγόμενη ποσότητα
 DocType: Purchase Receipt Item,Accepted Quantity,Αποδεκτή ποσότητα
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} δεν υπάρχει
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Λογαριασμοί για πελάτες.
 DocType: DocField,Default,Προεπιλεγμένο
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id έργου
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} συνδρομητές προστέθηκαν
 DocType: Maintenance Schedule,Schedule,Χρονοδιάγραμμα
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Ορίστε τον προϋπολογισμό γι 'αυτό το Κέντρο Κόστους. Για να ρυθμίσετε δράση του προϋπολογισμού, ανατρέξτε στην ενότητα "Εταιρεία Λίστα""
@@ -3843,7 +3863,7 @@ DocType: Account,Parent Account,Γονικός λογαριασμός
 DocType: Quality Inspection Reading,Reading 3,Μέτρηση 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Τύπος αποδεικτικού
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
 DocType: Expense Claim,Approved,Εγκρίθηκε
 DocType: Pricing Rule,Price,Τιμή
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
@@ -3852,23 +3872,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Εκπαίδευση
 DocType: Selling Settings,Campaign Naming By,Ονοματοδοσία εκστρατείας με βάση
 DocType: Employee,Current Address Is,Η τρέχουσα διεύθυνση είναι
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Προαιρετικό. Ορίζει προεπιλεγμένο νόμισμα της εταιρείας, εφόσον δεν ορίζεται."
 DocType: Address,Office,Γραφείο
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Πρότυπες εκθέσεις
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Λογιστικές ημερολογιακές εγγραφές.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Σειρά {0}: Πάρτι / λογαριασμός δεν ταιριάζει με {1} / {2} στο {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Διαθέσιμο Ποσότητα σε από την αποθήκη
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Σειρά {0}: Πάρτι / λογαριασμός δεν ταιριάζει με {1} / {2} στο {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Για να δημιουργήσετε ένα λογαριασμό φόρων
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
 DocType: Account,Stock,Απόθεμα
 DocType: Employee,Current Address,Τρέχουσα διεύθυνση
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Εάν το είδος είναι μια παραλλαγή ενός άλλου είδους, τότε η περιγραφή, η εικόνα, η τιμολόγηση, οι φόροι κλπ θα οριστούν από το πρότυπο εκτός αν οριστούν ειδικά"
 DocType: Serial No,Purchase / Manufacture Details,Αγορά / λεπτομέρειες παραγωγής
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Παρτίδα Απογραφή
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Παρτίδα Απογραφή
 DocType: Employee,Contract End Date,Ημερομηνία λήξης συμβολαίου
 DocType: Sales Order,Track this Sales Order against any Project,Παρακολουθήστε αυτές τις πωλήσεις παραγγελίας σε οποιουδήποτε έργο
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Εμφάνισε παραγγελίες πώλησης (εκκρεμεί παράδοση) με βάση τα ανωτέρω κριτήρια
 DocType: DocShare,Document Type,Τύπος εγγράφου
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Από προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Από προσφορά προμηθευτή
 DocType: Deduction Type,Deduction Type,Τύπος κράτησης
 DocType: Attendance,Half Day,Μισή ημέρα
 DocType: Pricing Rule,Min Qty,Ελάχιστη ποσότητα
@@ -3879,20 +3901,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Για Ποσότητα (Τεμ Κατασκευάζεται) είναι υποχρεωτικά
 DocType: Stock Entry,Default Target Warehouse,Προεπιλεγμένη αποθήκη προορισμού
 DocType: Purchase Invoice,Net Total (Company Currency),Καθαρό σύνολο (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Σειρά {0}: Τύπος Πάρτυ και το Κόμμα ισχύει μόνο κατά Εισπρακτέα / Πληρωτέα λογαριασμού
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Σειρά {0}: Τύπος Πάρτυ και το Κόμμα ισχύει μόνο κατά Εισπρακτέα / Πληρωτέα λογαριασμού
 DocType: Notification Control,Purchase Receipt Message,Μήνυμα αποδεικτικού παραλαβής αγοράς
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,"Σύνολο των κατανεμημένων φύλλα είναι περισσότερο από ό, τι την περίοδο"
 DocType: Production Order,Actual Start Date,Πραγματική ημερομηνία έναρξης
 DocType: Sales Order,% of materials delivered against this Sales Order,% Των υλικών που παραδόθηκαν σε αυτήν την παραγγελία πώλησης
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Καταγραφή κίνησης είδους
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Καταγραφή κίνησης είδους
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Ενημερωτικό δελτίο Λίστα Συνδρομητής
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Υπηρεσία
 DocType: Hub Settings,Hub Settings,Ρυθμίσεις hub
 DocType: Project,Gross Margin %,Μικτό κέρδος (περιθώριο) %
 DocType: BOM,With Operations,Με λειτουργίες
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Οι λογιστικές εγγραφές έχουν ήδη γίνει στο νόμισμα {0} για την εταιρεία {1}. Παρακαλώ επιλέξτε ένα εισπρακτέο ή πληρωτέο λογαριασμό με το νόμισμα {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Οι λογιστικές εγγραφές έχουν ήδη γίνει στο νόμισμα {0} για την εταιρεία {1}. Παρακαλώ επιλέξτε ένα εισπρακτέο ή πληρωτέο λογαριασμό με το νόμισμα {0}.
 ,Monthly Salary Register,Μηνιαίο ταμείο μισθοδοσίας
-apps/frappe/frappe/website/template.py +123,Next,Επόμενος
+apps/frappe/frappe/website/template.py +140,Next,Επόμενος
 DocType: Warranty Claim,If different than customer address,Αν είναι διαφορετική από τη διεύθυνση του πελάτη
 DocType: BOM Operation,BOM Operation,Λειτουργία Λ.Υ.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3923,6 +3946,7 @@ DocType: Purchase Invoice,Next Date,Επόμενη ημερομηνία
 DocType: Employee Education,Major/Optional Subjects,Σημαντικές / προαιρετικά θέματα
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Παρακαλώ εισάγετε φόρους και επιβαρύνσεις
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Κατεργασίας
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Εδώ μπορείτε να διατηρήσετε τα στοιχεία της οικογένειας όπως το όνομα και η ιδιότητα του γονέα, σύζυγος και παιδιά"
 DocType: Hub Settings,Seller Name,Ονομα πωλητή
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Φόροι και επιβαρύνσεις που παρακρατήθηκαν (νόμισμα της εταιρείας)
@@ -3949,29 +3973,29 @@ DocType: Purchase Order,To Receive and Bill,Για να λάβετε και Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Σχεδιαστής
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Πρότυπο όρων και προϋποθέσεων
 DocType: Serial No,Delivery Details,Λεπτομέρειες παράδοσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Αυτόματη δημιουργία Υλικό Αίτημα εάν η ποσότητα πέσει κάτω από αυτό το επίπεδο
 ,Item-wise Purchase Register,Ταμείο αγορών ανά είδος
 DocType: Batch,Expiry Date,Ημερομηνία λήξης
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Για να ορίσετε το επίπεδο αναπαραγγελίας, στοιχείο πρέπει να είναι ένα στοιχείο αγοράς ή κατασκευής του Είδους"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Για να ορίσετε το επίπεδο αναπαραγγελίας, στοιχείο πρέπει να είναι ένα στοιχείο αγοράς ή κατασκευής του Είδους"
 ,Supplier Addresses and Contacts,Διευθύνσεις προμηθευτή και επαφές
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Παρακαλώ επιλέξτε πρώτα την κατηγορία
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Κύρια εγγραφή έργου.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Να μην εμφανίζεται κανένα σύμβολο όπως $ κλπ δίπλα σε νομίσματα.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Μισή ημέρα)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Λήψη ειδών από Λ.Υ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Λήψη ειδών από Λ.Υ.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ημέρες ανοχής
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill Υλικών
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Σειρά {0}: Τύπος Πάρτυ και το Κόμμα απαιτείται για εισπρακτέοι / πληρωτέοι λογαριασμό {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Σειρά {0}: Τύπος Πάρτυ και το Κόμμα απαιτείται για εισπρακτέοι / πληρωτέοι λογαριασμό {1}
 DocType: Dropbox Backup,Send Notifications To,Αποστολή ενημερώσεων σε
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ημ. αναφοράς
 DocType: Employee,Reason for Leaving,Αιτιολογία αποχώρησης
 DocType: Expense Claim Detail,Sanctioned Amount,Ποσό κύρωσης
 DocType: GL Entry,Is Opening,Είναι άνοιγμα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Γραμμή {0} : μια χρεωστική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Γραμμή {0} : μια χρεωστική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
 DocType: Account,Cash,Μετρητά
 DocType: Employee,Short biography for website and other publications.,Σύντομη βιογραφία για την ιστοσελίδα και άλλες δημοσιεύσεις.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Παρακαλώ δημιουργήστε μισθολόγιο για τον υπάλληλο {0}
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 8c37c4868a..584ae12796 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Modo de Salario
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccione Distribución mensual, si desea realizar un seguimiento basado en la estacionalidad."
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productos ya sincronizados
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar visita {0} antes de cancelar este reclamo de garantía
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Productos de Consumo
@@ -20,7 +20,7 @@ DocType: About Us Settings,Website,Sitio Web
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactación más sinterización
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Desde solicitud de material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Desde solicitud de material
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árbol
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
@@ -35,7 +35,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Nombre del Cliente
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Todos los campos relacionados tales como divisa, tasa de conversión, el total de exportaciones, total general de las exportaciones, etc están disponibles en la nota de entrega, Punto de venta, cotización, factura de venta, órdenes de venta, etc."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) contra el que las entradas contables se hacen y los saldos se mantienen.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Sobresaliente para {0} no puede ser menor que cero ({1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Sobresaliente para {0} no puede ser menor que cero ({1} )
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre de Tipo de Vacaciones
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie actualizado correctamente
@@ -46,9 +46,8 @@ DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios p
 DocType: SMS Center,All Supplier Contact,Todos Contactos de Proveedores
 DocType: Quality Inspection Reading,Parameter,Parámetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha de inicio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Realmente desea reanudar la orden de producción:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Nueva Aplicación de Permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nueva Aplicación de Permiso
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Giro bancario
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . Para mantener el código de artículo del cliente y para efectuar búsquedas en ellos en función de ese código use esta opción
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
@@ -56,23 +55,23 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar varian
 DocType: Sales Invoice Item,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos)
 DocType: Employee Education,Year of Passing,Año de Fallecimiento
-sites/assets/js/erpnext.min.js +27,In Stock,En inventario
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En inventario
 DocType: Designation,Designation,Puesto
 DocType: Production Plan Item,Production Plan Item,Plan de producción de producto
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crear un nuevo perfil de POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Cuidado de la Salud
 DocType: Purchase Invoice,Monthly,Mensual
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidad
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Dirección De Correo Electrónico
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,Vehículo No
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Por favor, seleccione la lista de precios"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, seleccione la lista de precios"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tratamiento de la madera
 DocType: Production Order Operation,Work In Progress,Trabajos en Curso
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impresión 3D
@@ -100,7 +99,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Hacer Entrada del Banco
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Hacer Entrada del Banco
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondos de Pensiones
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén
 DocType: SMS Center,All Sales Person,Todos Ventas de Ventas
@@ -112,7 +111,7 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee N
 DocType: POS Profile,Write Off Cost Center,Centro de costos de desajuste
 DocType: Warehouse,Warehouse Detail,Detalle de almacenes
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 DocType: Item,Item Image (if not slideshow),"Imagen del Artículo (si no, presentación de diapositivas)"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por Hora / 60) * Tiempo real de la operación
@@ -122,7 +121,7 @@ DocType: Blog Post,Guest,Invitado
 DocType: Quality Inspection,Get Specification Details,Obtenga Especificación Detalles
 DocType: Lead,Interested,Interesado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiales (LdM)
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1}
 DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
 DocType: Journal Entry,Opening Entry,Entrada de Apertura
@@ -131,7 +130,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Petición de producto
 DocType: Standard Reply,Owner,Propietario
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Por favor, ingrese primero la compañía"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Por favor, seleccione primero la compañía"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, seleccione primero la compañía"
 DocType: Employee Education,Under Graduate,Bajo Graduación
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Objetivo On
 DocType: BOM,Total Cost,Coste total
@@ -157,15 +156,15 @@ DocType: Newsletter,Email Sent?,Enviar Email ?
 DocType: Journal Entry,Contra Entry,Entrada Contra
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar Registros Tiempo
 DocType: Delivery Note,Installation Status,Estado de la instalación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
 DocType: Item,Supply Raw Materials for Purchase,Materiales Suministro primas para la Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,El producto {0} debe ser un producto para la compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, para rellenar los datos apropiados y adjuntar el archivo modificado.
  Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera enviada .
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
 DocType: SMS Center,SMS Center,Centro SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Enderezar
@@ -190,11 +189,10 @@ DocType: SMS Settings,Enter url parameter for message,Introduzca el parámetro u
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Reglas para la aplicación de distintos precios y descuentos sobre los productos.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Conflictos Conectarse esta vez con {0} de {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,la lista de precios debe ser aplicable para comprar o vender
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa del listado de precios (%)
-sites/assets/js/form.min.js +279,Start,Iniciar
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Iniciar
 DocType: User,First Name,Nombre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Su configuración se ha completado. Actualizando.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fundición de molde completo
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
 DocType: Production Planning Tool,Sales Orders,Ordenes de Venta
@@ -227,19 +225,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Pendiente Cantidad
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Vivienda Doble
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, establece Naming Series para {0} a través de Configuración> Configuración> Serie Naming"
 DocType: Time Log,Will be updated when batched.,Se actualizará al agruparse.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Por favor, consulte ""¿Es Avance 'contra la Cuenta {1} si se trata de una entrada con antelación."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Por favor, consulte ""¿Es Avance 'contra la Cuenta {1} si se trata de una entrada con antelación."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
 DocType: Bulk Email,Message,Mensaje
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 DocType: Dropbox Backup,Dropbox Access Key,Clave de Acceso de Dropbox 
 DocType: Payment Tool,Reference No,Referencia No.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
 DocType: Stock Entry,Sales Invoice No,Factura de Venta No
@@ -251,8 +249,8 @@ DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorios
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Solicitud de Materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de Compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},El elemento {0} no se encuentra en 'Materias Primas Suministradas' en la tabla de la órden de compra {1}
@@ -292,10 +290,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Unidad de Medida de Nuevo Inven
 DocType: Period Closing Voucher,Closing Account Head,Cuenta de cierre principal
 DocType: Employee,External Work History,Historial de trabajos externos
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error de referencia circular
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,¿Realmente desea detener?
 DocType: Communication,Closed,Cerrado
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Exportar) serán visibles una vez que guarde la nota de entrega.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,¿Seguro que quieres dejar de
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Perfil Laboral
 DocType: Newsletter,Newsletter,Boletín de Noticias
@@ -309,7 +305,7 @@ DocType: Sales Invoice Item,Delivery Note,Notas de Entrega
 DocType: Dropbox Backup,Allow Dropbox Access,Permitir Acceso a Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 DocType: Workstation,Rent Cost,Renta Costo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Por favor seleccione el mes y el año
 DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduzca ID de correo electrónico separados por comas, la factura será enviada automáticamente en una fecha determinada"
@@ -323,10 +319,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas"
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Seleccione Producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleccione Producto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe presentarse
 DocType: Stock UOM Replace Utility,Current Stock UOM,Unidad de Medida de Inventario Actual
@@ -341,7 +337,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
 DocType: Maintenance Visit,Maintenance Type,Tipo de Mantenimiento
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parámetro de Inspección de Calidad del producto
 DocType: Leave Application,Leave Approver Name,Nombre de Supervisor de Vacaciones
 ,Schedule Date,Horario Fecha
@@ -360,7 +356,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Registro de Compras
 DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables
 DocType: Workstation,Consumable Cost,Coste de consumibles
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de Ausencias'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de Ausencias'
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razón de Pérdida
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Abalorios Tubo
@@ -400,7 +396,7 @@ apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master de vacaciones .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moldeo Shell
 DocType: Material Request Item,Required Date,Fecha Requerida
 DocType: Delivery Note,Billing Address,Dirección de Facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Costeo
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el importe del impuesto se considerará como ya incluido en el Monto  a Imprimir"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
@@ -421,26 +417,25 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre o
 DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
 DocType: Journal Entry,Accounts Payable,Cuentas por Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Añadir Suscriptores
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" no existe"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" no existe"
 DocType: Pricing Rule,Valid Upto,Válido hasta
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingreso Directo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administrativo
 DocType: Payment Tool,Received Or Paid,Recibido o Pagado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Por favor, seleccione la empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, seleccione la empresa"
 DocType: Stock Entry,Difference Account,Cuenta para la Diferencia
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productos Cosméticos
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
 DocType: Communication,Subject,Sujeto
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de Emergencia
 ,Serial No Warranty Expiry,Número de orden de caducidad Garantía
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,¿Realmente desea detener la requisición de materiales?
 DocType: Sales Order,To Deliver,Para Entregar
 DocType: Purchase Invoice Item,Item,Productos
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
@@ -462,7 +457,7 @@ apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura del Proveedor No
 DocType: Territory,For reference,Por referencia
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Cierre (Cred)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Cierre (Cred)
 DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 DocType: Job Applicant,Thread HTML,Tema HTML
@@ -491,7 +486,7 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
 DocType: Leave Control Panel,Allocate,Asignar
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Volver Ventas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Volver Ventas
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccione órdenes de venta a partir del cual desea crear órdenes de producción.
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariales.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de datos de clientes potenciales.
@@ -503,7 +498,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Monto Facturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
 DocType: Event,Wednesday,Miércoles
 DocType: Sales Invoice,Customer's Vendor,Vendedor del Cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,La orden de producción es obligatoria
@@ -535,8 +530,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
 DocType: Sales Person,Sales Person Targets,Metas de Vendedor
-sites/assets/js/form.min.js +271,To,a
-apps/frappe/frappe/templates/base.html +143,Please enter email address,"Por favor, introduzca la dirección de correo electrónico"
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,a
+apps/frappe/frappe/templates/base.html +145,Please enter email address,"Por favor, introduzca la dirección de correo electrónico"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fin tubo formando
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de Resolución
@@ -553,7 +548,7 @@ DocType: Activity Cost,Projects User,Usuario de proyectos
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
 DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
 DocType: Material Request,Material Transfer,Transferencia de Material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Apertura (Deb)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0}
@@ -561,9 +556,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Configuración
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Impuestos, cargos y costos de destino estimados"
 DocType: Production Order Operation,Actual Start Time,Hora de inicio actual
 DocType: BOM Operation,Operation Time,Tiempo de funcionamiento
-sites/assets/js/list.min.js +5,More,Más
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Más
 DocType: Pricing Rule,Sales Manager,Gerente De Ventas
-sites/assets/js/desk.min.js +7673,Rename,Renombrar
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Renombrar
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Doblado
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir al usuario
@@ -578,13 +573,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Esquila Heterosexual
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario Actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Almacén Rechazado es obligatorio contra Ítem rechazado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Almacén Rechazado es obligatorio contra Ítem rechazado
 DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
 DocType: Employee,Provide email id registered in company,Proporcionar correo electrónico de identificación registrado en la compañía
 DocType: Hub Settings,Seller City,Ciudad del vendedor
 DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Término de carta de oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elemento {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventario
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de Árbol
@@ -598,11 +593,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenido
 DocType: Journal Entry,Credit Card Entry,Introducción de tarjetas de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Asunto de la Tarea
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Productos recibidos de proveedores.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Productos recibidos de proveedores.
 DocType: Communication,Open,Abrir
 DocType: Lead,Campaign Name,Nombre de la campaña
 ,Reserved,Reservado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,¿Realmente desea reanudar?
 DocType: Purchase Order,Supply Raw Materials,Suministro de Materias Primas
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La Fecha en que se la próxima factura sera generada. Se genera al enviar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo Corriente
@@ -618,7 +612,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Nº de Pedido de Compra del Cliente
 DocType: Employee,Cell Number,Número de movil
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina Mensual.
@@ -687,7 +681,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Obligaciones
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la linea {0}.
 DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos de venta por defecto
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,No ha seleccionado una lista de precios
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Process Payroll,Send Email,Enviar Correo Electronico
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Sin permiso
@@ -698,7 +692,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Números
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de Conciliación Bancaria
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mis facturas
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Empleado no encontrado
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Empleado no encontrado
 DocType: Purchase Order,Stopped,Detenido
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un vendedor
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Seleccione la lista de materiales para comenzar
@@ -707,7 +701,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Sube sald
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ahora
 ,Support Analytics,Analitico de Soporte
 DocType: Item,Website Warehouse,Almacén del Sitio Web
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,¿Realmente desea detener la orden de producción?:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El día del mes en el que se generará factura automática por ejemplo 05, 28, etc."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Puntuación debe ser menor o igual a 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registros C -Form
@@ -716,12 +709,12 @@ DocType: Email Digest,Email Digest Settings,Configuración del Boletin de Correo
 apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Consultas de soporte de clientes .
 DocType: Bin,Moving Average Rate,Porcentaje de Promedio Movil
 DocType: Production Planning Tool,Select Items,Seleccione Artículos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha ​​{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha ​​{2}
 DocType: Comment,Reference Name,Nombre de referencia
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: Sales Invoice Item,Target Warehouse,Inventario Objetivo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,La fecha prevista de entrega no puede ser anterior a la fecha de la órden de venta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,La fecha prevista de entrega no puede ser anterior a la fecha de la órden de venta
 DocType: Upload Attendance,Import Attendance,Asistente de importación
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
 DocType: Process Payroll,Activity Log,Registro de Actividad
@@ -749,8 +742,8 @@ DocType: Sales Team,Incentives,Incentivos
 DocType: SMS Log,Requested Numbers,Números solicitados
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Evaluación del Desempeño .
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del Proyecto
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Punto de venta
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},No se puede cargar {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto de venta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},No se puede cargar {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 DocType: Account,Balance must be,Balance debe ser
 DocType: Hub Settings,Publish Pricing,Publicar precios
@@ -772,7 +765,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Recibos de Compra
 ,Received Items To Be Billed,Recepciones por Facturar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Chorreo abrasivo
-sites/assets/js/desk.min.js +3938,Ms,Sra.
+DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Configuración principal para el cambio de divisas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
@@ -793,17 +786,17 @@ DocType: Purchase Receipt,Range,Rango
 DocType: Supplier,Default Payable Accounts,Cuentas por Pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
 DocType: Features Setup,Item Barcode,Código de barras del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Tienda
 DocType: Hub Settings,Sync Now,Sincronizar ahora
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Cuenta de Banco / Efectivo por Defecto defecto se actualizará automáticamente en el punto de venta de facturas cuando se selecciona este modo .
 DocType: Employee,Permanent Address Is,Dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es una compra de productos
 DocType: Journal Entry Account,Purchase Invoice,Factura de Compra
@@ -815,20 +808,20 @@ DocType: Salary Slip,Total in words,Total en palabras
 DocType: Material Request Item,Lead Time Date,Fecha y Hora de la Iniciativa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'"
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Envíos realizados a los clientes
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Envíos realizados a los clientes
 DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingresos Indirectos
 DocType: Contact Us Settings,Address Line 1,Dirección Línea 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variación
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nombre de Compañía
 DocType: SMS Center,Total Message(s),Total Mensage(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Seleccionar elemento de Transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Seleccionar elemento de Transferencia
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad Máxima
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 DocType: Process Payroll,Select Payroll Year and Month,Seleccione nómina Año y Mes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Ir al grupo apropiado, usualmente (Aplicación de Fondos> Activo Circulante> Cuentas Bancarias) y crear una nueva cuenta haciendo clic en Añadir hijo del tipo ""Banco"""
 DocType: Workstation,Electricity Cost,Coste de electricidad
@@ -843,7 +836,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blan
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunte su Fotografía 
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Hacer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Hacer
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
 DocType: Workflow State,Stop,Detenerse
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
@@ -880,7 +873,7 @@ DocType: Landed Cost Item,Purchase Receipt Item,Recibo de Compra del Artículo
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,El almacén reservado en el Pedido de Ventas/Almacén de Productos terminados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Cantidad de Venta
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Registros de Tiempo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de Gastos para este registro. Actualice el 'Estado' y Guarde
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de Gastos para este registro. Actualice el 'Estado' y Guarde
 DocType: Serial No,Creation Document No,Creación del documento No
 DocType: Issue,Issue,Asunto
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
@@ -903,7 +896,7 @@ DocType: Features Setup,Miscelleneous,Varios
 DocType: Holiday List,Get Weekly Off Dates,Obtener cierre de semana
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Fecha Final no puede ser inferior a Fecha de Inicio
 DocType: Sales Person,Select company name first.,Seleccionar nombre de la empresa en primer lugar.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Deb
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Deb
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Para {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,actualizada a través de los registros de tiempo
@@ -930,7 +923,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Los números de registro de la compañía para su referencia. Números fiscales, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Compras Regla de envío
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Seleccionar registros de tiempo e Presentar después de crear una nueva factura de venta .
 DocType: Global Defaults,Global Defaults,Predeterminados globales
@@ -975,7 +968,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuesto
 DocType: Lead,Lead,Iniciativas
 DocType: Email Digest,Payables,Cuentas por Pagar
 DocType: Account,Warehouse,Almacén
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
 ,Purchase Order Items To Be Billed,Ordenes de Compra por Facturar
 DocType: Purchase Invoice Item,Net Rate,Tasa neta
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo
@@ -990,11 +983,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos n
 DocType: Global Defaults,Current Fiscal Year,Año Fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Entradas' no puede estar vacío
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entradas' no puede estar vacío
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
 ,Trial Balance,Balanza de Comprobación
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Configuración de Empleados
-sites/assets/js/erpnext.min.js +5,"Grid ""","Matriz """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuración de Empleados
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Matriz """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Por favor, seleccione primero el prefijo"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Investigación
 DocType: Maintenance Visit Purpose,Work Done,Trabajo Realizado
@@ -1003,10 +996,10 @@ DocType: Communication,Sent,Enviado
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Mostrar libro mayor
 DocType: File,Lft,Izquierda-
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 DocType: Communication,Delivery Status,Estado del Envío
 DocType: Production Order,Manufacture against Sales Order,Fabricación contra Pedido de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago bruto
@@ -1024,7 +1017,7 @@ DocType: Opportunity Item,Opportunity Item,Oportunidad Artículo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura Temporal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balance de Vacaciones del Empleado
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
 DocType: Address,Address Type,Tipo de dirección
 DocType: Purchase Receipt,Rejected Warehouse,Almacén Rechazado
 DocType: GL Entry,Against Voucher,Contra Comprobante
@@ -1032,7 +1025,7 @@ DocType: Item,Default Buying Cost Center,Centro de Costos Por Defecto
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,El producto {0} debe ser un producto para la venta
 DocType: Item,Lead Time in days,Plazo de ejecución en días
 ,Accounts Payable Summary,Balance de Cuentas por Pagar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Verifique Facturas Pendientes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de Venta {0} no es válida
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
@@ -1048,7 +1041,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Lugar de emisión
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato
 DocType: Report,Disabled,Deshabilitado
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos Indirectos
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
@@ -1057,12 +1050,12 @@ DocType: Mode of Payment,Mode of Payment,Método de pago
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
 DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
 DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén 
-sites/assets/js/form.min.js +190,Name is required,El nombre es necesario
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,El nombre es necesario
 DocType: Purchase Invoice,Recurring Type,Tipo de recurrencia
 DocType: Address,City/Town,Ciudad/Provincia
 DocType: Serial No,Serial No Details,Serial No Detalles
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Maquinaria y Equipos
@@ -1072,14 +1065,14 @@ apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated perc
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},El estado de la orden de producción es {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Por proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Moneda Local)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sólo puede haber una Condición de Regla de Envió  con valor 0 o valor en blanco para ""To Value"""
 DocType: Authorization Rule,Transaction,Transacción
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden crear asientos contables en los grupos.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Herramientas
+apps/frappe/frappe/config/desk.py +7,Tools,Herramientas
 DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,El número de la orden de producción es obligatoria para la entrada de productos fabricados en el stock
 DocType: Purchase Invoice,Total (Company Currency),Total (Compañía moneda)
@@ -1089,7 +1082,7 @@ DocType: Workstation,Workstation Name,Nombre de la Estación de Trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Boletin:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
 DocType: Sales Partner,Target Distribution,Distribución Objetivo
-sites/assets/js/desk.min.js +7652,Comments,Comentarios
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentarios
 DocType: Salary Slip,Bank Account No.,Número de Cuenta Bancaria
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este es el número de la última transacción creada con este prefijo
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Tasa de Valoración requerido para el punto {0}
@@ -1103,13 +1096,13 @@ DocType: Attendance,HR Manager,Gerente de Recursos Humanos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Permiso con Privilegio
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor 
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Necesita habilitar Carito de Compras
-sites/assets/js/form.min.js +212,No Data,No hay datos
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No hay datos
 DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo Plantilla de Evaluación
 DocType: Salary Slip,Earning,Ganancia
 ,BOM Browser,Explorar listas de materiales (LdM)
 DocType: Purchase Taxes and Charges,Add or Deduct,Agregar o Deducir
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total del Pedido
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
@@ -1121,7 +1114,6 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
 ,Delivered Items To Be Billed,Envios por facturar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Estado actualizado a {0}
 DocType: DocField,Description,Descripción
 DocType: Authorization Rule,Average Discount,Descuento Promedio
 DocType: Letter Head,Is Default,Es por defecto
@@ -1149,7 +1141,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Total de impuestos de los artícu
 DocType: Item,Maintain Stock,Mantener Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Imagenes de entradas ya creadas por Orden de Producción
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerada para todas las designaciones
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la linea {0} no puede ser incluido en el precio
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la linea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de fecha y hora
 DocType: Email Digest,For Company,Para la empresa
@@ -1159,7 +1151,7 @@ DocType: Sales Invoice,Shipping Address Name,Dirección de envío Nombre
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan de cuentas
 DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,No puede ser mayor que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,No Programada
 DocType: Employee,Owned,Propiedad
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de ausencia sin pago
@@ -1172,7 +1164,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garantía / AMC Estado
 DocType: GL Entry,GL Entry,Entrada GL
 DocType: HR Settings,Employee Settings,Configuración del Empleado
 ,Batch-Wise Balance History,Historial de saldo por lotes
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Tareas por hacer
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tareas por hacer
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,No se permiten cantidades negativas
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1201,12 +1193,12 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Alquiler de Oficina
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configuración de pasarela SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
-sites/assets/js/erpnext.min.js +24,No address added yet.,No se ha añadido ninguna dirección todavía.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección todavía.
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual al importe en Comprobante de Diario {2}
 DocType: Item,Inventory,inventario
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
 DocType: Item,Sales Details,Detalles de Ventas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fijación
 DocType: Opportunity,With Items,Con artículos
@@ -1216,7 +1208,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",La fecha en que se generará próxima factura. Se genera en enviar.
 DocType: Item Attribute,Item Attribute,Atributos del producto
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Gobierno
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Variantes del producto
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Costo Principal
@@ -1226,11 +1218,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Inicio del ejercicio contable
 DocType: Employee External Work History,Total Experience,Experiencia Total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
 DocType: Material Request Item,Sales Order No,Orden de Venta No
 DocType: Item Group,Item Group Name,Nombre del grupo de artículos
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación
 DocType: Pricing Rule,For Price List,Por lista de precios
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Búsqueda de Ejecutivos
@@ -1239,8 +1231,7 @@ DocType: Maintenance Schedule,Schedules,Horarios
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
-DocType: Period Closing Voucher,CoA Help,CoA Ayuda
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Error: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Error: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el Plan General de Contabilidad."
 DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Categoría de cliente> Territorio
@@ -1269,19 +1260,19 @@ DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producc
 DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
 DocType: Pricing Rule,Pricing Rule,Reglas de Precios
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Muescas
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Cuentas bancarias
 ,Bank Reconciliation Statement,Extractos Bancarios
 DocType: Address,Lead Name,Nombre de la Iniciativa
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Saldo inicial de Stock
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Saldo inicial de Stock
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} debe aparecer sólo una vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No se permite transferir más {0} de {1} para la órden de compra {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hay productos para empacar
 DocType: Shipping Rule Condition,From Value,Desde Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Monto no reflejado en banco
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Peticiones para gastos de compañía
@@ -1296,17 +1287,17 @@ DocType: Production Planning Tool,Select Sales Orders,Selección de órdenes de
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crear una cotización
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la linea {0} debe ser 1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la linea {0} debe ser 1
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
 DocType: SMS Center,Receiver List,Lista de receptores
 DocType: Payment Tool Detail,Payment Amount,Pago recibido
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Ver
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Ver
 DocType: Salary Structure Deduction,Salary Structure Deduction,Estructura Salarial Deducción
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterización selectiva por láser
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión 
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión 
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,¡Importación Exitosa!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La cantidad no debe ser más de {0}
@@ -1325,7 +1316,7 @@ DocType: Company,Default Payable Account,Cuenta por Pagar por defecto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuración completa
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturado
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Cant. Reservada
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta asignada
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Ingresos Superior
@@ -1388,7 +1379,7 @@ DocType: Item,Weightage,Coeficiente de Ponderación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minería
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Por favor, seleccione primero {0}"
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Por favor, seleccione primero {0}"
 DocType: Territory,Parent Territory,Territorio Principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepción de Materiales
@@ -1413,11 +1404,11 @@ apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many colum
 DocType: Sales Invoice Item,Batch No,Lote No.
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
 DocType: DocPerm,Delete,Eliminar
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
-sites/assets/js/desk.min.js +7971,New {0},Nuevo {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nuevo {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de sus transacciones
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
 DocType: Employee,Leave Encashed?,Vacaciones Descansadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio
 DocType: Item,Variants,Variantes
@@ -1435,7 +1426,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,País
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Direcciones
 DocType: Communication,Received,Recibido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serie No existe para la partida {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condición para una regla de envío
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,A este producto no se le permite tener orden de producción.
@@ -1454,7 +1445,6 @@ DocType: Employee,Salutation,Saludo
 DocType: Communication,Rejected,Rechazado
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Entregado
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
 DocType: Sales Order Item,Actual Qty,Cantidad Real
 DocType: Quality Inspection Reading,Reading 10,Lectura 10
@@ -1490,14 +1480,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,H
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Cizallamiento
 DocType: Item,Has Variants,Tiene Variantes
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Clic en el botón ""Crear factura de venta"" para crearla."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Las fechas 'Desde Periodo y Hasta Periodo' son obligatorias para porcentajes recurrentes
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Empacado y etiquetado
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nombre de la Distribución Mensual
 DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifíque la moneda predeterminada en la compañía principal y los valores predeterminados globales"
 DocType: Dropbox Backup,Dropbox Access Secret,Acceso Secreto de Dropbox
 DocType: Purchase Invoice,Recurring Invoice,Factura Recurrente
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Gestión de Proyectos
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gestión de Proyectos
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
 DocType: Budget Detail,Fiscal Year,Año fiscal
 DocType: Cost Center,Budget,Presupuesto
@@ -1525,11 +1514,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Ventas
 DocType: Employee,Salary Information,Información salarial
 DocType: Sales Person,Name and Employee ID,Nombre y ID de empleado
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Derechos e Impuestos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
 DocType: Material Request Item,Material Request Item,Elemento de la Solicitud de Material
@@ -1537,7 +1526,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árbol de las cat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una linea mayor o igual al numero de linea actual.
 ,Item-wise Purchase History,Historial de Compras
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rojo
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
 DocType: Account,Frozen,Congelado
 ,Open Production Orders,Abrir Ordenes de Producción
 DocType: Installation Note,Installation Time,Tiempo de instalación
@@ -1580,13 +1569,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Tendencias de Cotización
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
 DocType: Shipping Rule Condition,Shipping Amount,Importe del envío
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unión
 DocType: Authorization Rule,Above Value,Valor Superior
 ,Pending Amount,Monto Pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de Conversión
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Enviado
+DocType: Purchase Order,Delivered,Enviado
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuración del servidor de correo entrante para los trabajos de identificación del email . (por ejemplo jobs@example.com )
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La fecha en que se detiene la factura recurrente
 DocType: Journal Entry,Accounts Receivable,Cuentas por Cobrar
@@ -1602,10 +1591,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos b
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo
 DocType: HR Settings,HR Settings,Configuración de Recursos Humanos
 apps/frappe/frappe/config/setup.py +130,Printing,Impresión
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos está pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos está pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado.
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,El día (s) sobre el cual está solicitando la licencia son vacaciones. Usted no tiene que solicitar la licencia .
-sites/assets/js/desk.min.js +7805,and,y
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,y
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,deportes
@@ -1641,7 +1630,6 @@ DocType: Opportunity,Quotation,Cotización
 DocType: Salary Slip,Total Deduction,Deducción Total
 DocType: Quotation,Maintenance User,Mantenimiento por el Usuario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Costo Actualizado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Esta seguro que desea CONTINUAR
 DocType: Employee,Date of Birth,Fecha de nacimiento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,El producto {0} ya ha sido devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran aquí.
@@ -1657,7 +1645,7 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión. "
 DocType: Expense Claim,Approver,Supervisor
 ,SO Qty,SO Cantidad
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén de {0}, por lo tanto, no se puede volver a asignar o modificar Almacén"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén de {0}, por lo tanto, no se puede volver a asignar o modificar Almacén"
 DocType: Appraisal,Calculate Total Score,Calcular Puntaje Total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufactura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
@@ -1686,11 +1674,10 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Desde Moneda
 DocType: DocField,Name,Nombre
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Monto no reflejado en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Otros
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Establecer como Stopped
 DocType: POS Profile,Taxes and Charges,Impuestos y cargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producto o un servicio que se compra, se vende o se mantiene en stock."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe de linea anterior' o ' Total de linea anterior' para la primera linea
@@ -1699,17 +1686,17 @@ DocType: Web Form,Select DocType,Seleccione tipo de documento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nuevo Centro de Costo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nuevo Centro de Costo
 DocType: Bin,Ordered Quantity,Cantidad Pedida
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
 DocType: Quality Inspection,In Process,En proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de producto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} contra orden de venta {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contra orden de venta {1}
 DocType: Account,Fixed Asset,Activos Fijos
 DocType: Time Log Batch,Total Billing Amount,Monto total de facturación
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Cuenta por Cobrar
 ,Stock Balance,Balance de Inventarios
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Órdenes de venta al Pago
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Órdenes de venta al Pago
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Registros de Tiempo de creados:
 DocType: Item,Weight UOM,Peso Unidad de Medida
@@ -1743,10 +1730,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
 DocType: Production Order Operation,Completed Qty,Cant. Completada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,La lista de precios {0} está deshabilitada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,La lista de precios {0} está deshabilitada
 DocType: Manufacturing Settings,Allow Overtime,Permitir horas extras
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Orden de Venta {0} esta detenida
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual
 DocType: Item,Customer Item Codes,Códigos de clientes
 DocType: Opportunity,Lost Reason,Razón de la pérdida
@@ -1754,9 +1740,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Se requiere Unidad de Medida para Nuevo Inventario
 DocType: Quality Inspection,Sample Size,Tamaño de la muestra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos los artículos que ya se han facturado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Project,External,Externo
 DocType: Features Setup,Item Serial Nos,N º de serie de los Artículo
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y permisos
@@ -1783,7 +1769,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Dirección y Contactos
 DocType: SMS Log,Sender Name,Nombre del Remitente
 DocType: Page,Title,Nombre
-sites/assets/js/list.min.js +104,Customize,Personalización 
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalización 
 DocType: POS Profile,[Select],[Seleccionar]
 DocType: SMS Log,Sent To,Enviado A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Hacer Factura de Venta
@@ -1813,7 +1799,7 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualización de Costos
 DocType: Item Reorder,Item Reorder,Reordenar productos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transferencia de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones."
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 DocType: Naming Series,User must always select,Usuario elegirá siempre
@@ -1835,7 +1821,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in r
 DocType: Appraisal,Employee,Empleado
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar correo electrónico de:
 DocType: Features Setup,After Sale Installations,Instalaciones post venta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} está totalmente facturado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Workstation Working Hour,End Time,Hora de Finalización
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condiciones contractuales estándar para ventas y compras.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupar por recibo
@@ -1845,7 +1831,7 @@ DocType: Page,Standard,Estándar
 DocType: Rename Tool,File to Rename,Archivo a renombrar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamaño
 DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
@@ -1864,8 +1850,8 @@ DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuración del servidor de correo entrante de correo electrónico de identificación de las ventas. (por ejemplo sales@example.com )
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Tool,Payment Account,Pago a cuenta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
-sites/assets/js/list.min.js +23,Draft,Borrador.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Borrador.
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,Accepted,Aceptado
 DocType: User,Female,Femenino
@@ -1877,14 +1863,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Existen transacciones de stock para este producto, \ usted no puede cambiar los valores de 'Tiene No. de serie', 'Tiene No. de lote', 'Es un producto en stock' y 'Método de valoración'"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
 DocType: Stock Entry,For Quantity,Por cantidad
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} no esta presentado
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Listado de solicitudes de productos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} no esta presentado
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Listado de solicitudes de productos
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Para la producción por separado se crea para cada buen artículo terminado.
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones 1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Configuración completa
@@ -1896,7 +1882,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Lista de distribu
 DocType: Delivery Note,Transporter Name,Nombre del Transportista
 DocType: Contact,Enter department to which this Contact belongs,Introduzca departamento al que pertenece este Contacto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Ausente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unidad de Medida
 DocType: Fiscal Year,Year End Date,Año de Finalización
 DocType: Task Depends On,Task Depends On,Tarea Depende de
@@ -1921,7 +1907,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión.
 DocType: Customer Group,Has Child Node,Tiene Nodo Niño
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL estáticas aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en el año fiscal activo. Para más detalles verifique {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
@@ -1972,10 +1958,8 @@ DocType: Note,Note,nota
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantidad
 DocType: Email Account,Email Ids,IDs de Correo Electrónico
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Establecer como destapados
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de Banco / Efectivo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Esta solicitud de autorización está pendiente de aprobación. Sólo el Supervisor de Vacaciones   puede actualizar el estado.
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
 DocType: Journal Entry,Credit Note,Nota de Crédito
@@ -1996,7 +1980,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
 DocType: Installation Note Item,Installed Qty,Cantidad instalada
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Enviado
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Enviado
 DocType: Salary Structure,Total Earning,Ganancia Total
 DocType: Purchase Receipt,Time at which materials were received,Momento en que se recibieron los materiales
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mis direcciones
@@ -2004,7 +1988,7 @@ DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,División principal de la organización.
 DocType: Sales Order,Billing Status,Estado de facturación
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Los gastos de servicios públicos
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Mayor
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Mayor
 DocType: Buying Settings,Default Buying Price List,Lista de precios predeterminada
 ,Download Backups,Descargar Backups
 DocType: Notification Control,Sales Order Message,Mensaje de la Orden de Venta
@@ -2013,7 +1997,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Seleccione Empleados
 DocType: Bank Reconciliation,To Date,Hasta la fecha
 DocType: Opportunity,Potential Sales Deal,Potenciales acuerdos de venta
-sites/assets/js/form.min.js +308,Details,Detalles
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalles
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impuestos y Cargos
 DocType: Employee,Emergency Contact,Contacto de Emergencia
 DocType: Item,Quality Parameters,Parámetros de Calidad
@@ -2028,7 +2012,7 @@ DocType: Purchase Order Item,Received Qty,Cantidad Recibida
 DocType: Stock Entry Detail,Serial No / Batch,N º de serie / lote
 DocType: Product Bundle,Parent Item,Artículo Principal
 DocType: Account,Account Type,Tipo de cuenta
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
 ,To Produce,Producir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la fila {0} en {1}. e incluir {2} en la tasa del producto, las filas {3} también deben ser incluidas"
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificación del paquete para la entrega (para impresión)
@@ -2067,9 +2051,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Ajustes de Inventarios
 DocType: User,Bio,Biografía
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía "
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía "
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nombre de Nuevo Centro de Coste
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nombre de Nuevo Centro de Coste
 DocType: Leave Control Panel,Leave Control Panel,Salir del Panel de Control
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,No se encontró plantilla de dirección por defecto. Favor cree una nueva desde Configuración> Prensa y Branding> Plantilla de Dirección.
 DocType: Appraisal,HR User,Usuario Recursos Humanos
@@ -2087,8 +2071,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Detalle de herramienta de pago
 ,Sales Browser,Navegador de Ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstamos y anticipos (Activos)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -2098,10 +2082,9 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de Valoración
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Pulido
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Numerado
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipo de Cambio para convertir una moneda en otra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Cotización {0} se cancela
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Cotización {0} se cancela
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendiente
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empleado {0} estaba de permiso en {1} . No se puede marcar la asistencia.
 DocType: Sales Partner,Targets,Objetivos
@@ -2115,7 +2098,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz y no se puede editar.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de empezar los registros de contabilidad"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar la regla precios
-sites/assets/js/list.min.js +24,Cancelled,Cancelado
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Cancelado
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La fecha de la estructura salarial no puede ser menor que la fecha de contratación del empleado.
 DocType: Employee Education,Graduate,Graduado
 DocType: Leave Block List,Block Days,Bloquear días
@@ -2175,17 +2158,17 @@ DocType: Account,Stock Received But Not Billed,Inventario Recibido pero no factu
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Pago bruto + Montos atrazados + Vacaciones - Total deducciones
 DocType: Monthly Distribution,Distribution Name,Nombre del Distribución
 DocType: Features Setup,Sales and Purchase,Ventas y Compras
-DocType: Purchase Order Item,Material Request No,Nº de Solicitud de Material
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
+DocType: Supplier Quotation Item,Material Request No,Nº de Solicitud de Material
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base de la compañía
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Moneda Local)
-apps/frappe/frappe/templates/base.html +132,Added,Agregado
+apps/frappe/frappe/templates/base.html +134,Added,Agregado
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Vista en árbol para la administración de los territorios
 DocType: Journal Entry Account,Sales Invoice,Factura de Venta
 DocType: Journal Entry Account,Party Balance,Saldo de socio
 DocType: Sales Invoice Item,Time Log Batch,Grupo de Horas Registradas
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
 DocType: Company,Default Receivable Account,Cuenta por Cobrar Por defecto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banco para el sueldo total pagado por los criterios anteriormente seleccionados
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Manufactura
@@ -2196,7 +2179,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Obtener registros relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Asiento contable de inventario
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Acuñando
 DocType: Sales Invoice,Sales Team1,Team1 Ventas
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
@@ -2211,7 +2194,7 @@ DocType: Quality Inspection,Quality Inspection,Inspección de Calidad
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Rocíe la formación
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Cuenta {0} está congelada
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Cuenta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
@@ -2234,9 +2217,9 @@ DocType: Maintenance Visit,Scheduled,Programado
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, seleccione el ítem donde "Es de la Elemento" es "No" y "¿Es de artículos de venta" es "Sí", y no hay otro paquete de producto"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccione Distribución Mensual de distribuir de manera desigual a través de objetivos meses.
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,El elemento en la fila {0}: Recibo Compra {1} no existe en la tabla de 'Recibos de Compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Empleado {0} ya se ha aplicado para {1} entre {2} y {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Empleado {0} ya se ha aplicado para {1} entre {2} y {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del Proyecto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Hasta
 DocType: Rename Tool,Rename Log,Cambiar el Nombre de Sesión
@@ -2262,7 +2245,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de Gastos
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
-sites/assets/js/erpnext.min.js +48,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Fecha y Hora
 DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
@@ -2278,7 +2261,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Int
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de Periódicos
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fundición
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de las Vacaciones relacionadas a este registro. Actualice el 'Estado' y Guarde
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de Reabastecimiento
 DocType: Attendance,Attendance Date,Fecha de Asistencia
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción.
@@ -2321,7 +2303,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Configuración de las plantillas de términos y condiciones.
 DocType: Customer,Last Day of the Next Month,Último día del siguiente mes
 DocType: Employee,Feedback,Comentarios
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Chorreo abrasivo por maquina
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
 DocType: Website Settings,Website Settings,Configuración del Sitio Web
@@ -2334,10 +2316,10 @@ DocType: Quality Inspection,Outgoing,Saliente
 DocType: Material Request,Requested For,Solicitados para
 DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Cuenta root no se puede borrar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Cuenta root no se puede borrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Imagenes de entradas
 DocType: Production Order,Work-in-Progress Warehouse,Almacén de Trabajos en Proceso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referencia # {0} de fecha {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 DocType: Pricing Rule,Item Code,Código del producto
 DocType: Production Planning Tool,Create Production Orders,Crear Órdenes de Producción
 DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
@@ -2345,14 +2327,14 @@ DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de Mercado
 DocType: Communication,Phone,Teléfono
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabajo Interno del Empleado
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Cierre (Deb)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Cierre (Deb)
 DocType: Contact,Passive,Pasivo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Número de orden {0} no está en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
 DocType: Sales Invoice,Write Off Outstanding Amount,Cantidad de desajuste
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Marque si necesita facturas recurrentes automáticas. Después del envío de cualquier factura de venta, la sección ""Recurrente"" será visible."
 DocType: Account,Accounts Manager,Gerente de Cuentas
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Registro de Tiempo {0} debe ser ' Enviado '
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Registro de Tiempo {0} debe ser ' Enviado '
 DocType: Stock Settings,Default Stock UOM,Unidad de Medida Predeterminada para Inventario
 DocType: Production Planning Tool,Create Material Requests,Crear Solicitudes de Material
 DocType: Employee Education,School/University,Escuela / Universidad
@@ -2362,7 +2344,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Conciliación Bancaria
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Agregar algunos registros de muestra
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Gestión de ausencias
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestión de ausencias
 DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupar por cuenta
 DocType: Sales Order,Fully Delivered,Entregado completamente
@@ -2374,11 +2356,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Extras Ventas
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} contra el centro de costos {2} es mayor por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Mover ausencias reenviadas
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
 ,Stock Projected Qty,Cantidad de Inventario Proyectada
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cantidad
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto
@@ -2389,13 +2370,12 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Lo utilizará para iniciar sesión
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los proveedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el producto no se enumera automáticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el producto no se enumera automáticamente
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Cuenta de sobregiros
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Hacer Nómina
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Continuar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Explorar la lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstamos Garantizados
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles 
@@ -2405,7 +2385,7 @@ DocType: Appraisal,Appraisal,Evaluación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Fundición a la espuma perdida
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dibujar
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Fecha se repite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
 DocType: Hub Settings,Seller Email,Correo Electrónico del Vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
 DocType: Workstation Working Hour,Start Time,Hora de inicio
@@ -2418,8 +2398,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (moneda de la compañía)
 DocType: BOM Operation,Hour Rate,Hora de Cambio
 DocType: Stock Settings,Item Naming By,Ordenar productos por
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Desde cotización
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Desde cotización
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para fabricación
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,La cuenta {0} no existe
 DocType: Purchase Receipt Item,Purchase Order Item No,Orden de Compra del Artículo No
@@ -2435,7 +2415,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con esta función pueden establecer cuentas congeladas y crear / modificar los asientos contables contra las cuentas congeladas
 DocType: Serial No,Is Cancelled,CANCELADO
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Mis envíos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mis envíos
 DocType: Journal Entry,Bill Date,Fecha de factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
 DocType: Supplier,Supplier Details,Detalles del Proveedor
@@ -2448,7 +2428,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferencia Bancaria
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Por favor, seleccione la cuenta bancaria"
 DocType: Newsletter,Create and Send Newsletters,Crear y enviar boletines de noticias
-sites/assets/js/report.min.js +107,From Date must be before To Date,La fecha 'Desde' tiene que ser menor de la fecha 'Hasta'
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,La fecha 'Desde' tiene que ser menor de la fecha 'Hasta'
 DocType: Sales Order,Recurring Order,Orden Recurrente
 DocType: Company,Default Income Account,Cuenta de Ingresos por defecto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Categoría de cliente / Cliente
@@ -2463,31 +2443,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Unidad de Media del Inventario
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,La órden de compra {0} no existe
 ,Projected,Proyectado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de orden {0} no pertenece al Almacén {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
 DocType: Notification Control,Quotation Message,Cotización Mensaje
 DocType: Issue,Opening Date,Fecha de Apertura
 DocType: Journal Entry,Remark,Observación
 DocType: Purchase Receipt Item,Rate and Amount,Tasa y Cantidad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Aburrido
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Desde órden de venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Desde órden de venta
 DocType: Blog Category,Parent Website Route,Ruta del Website Principal
 DocType: Sales Order,Not Billed,No facturado
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a una misma empresa
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,No se han añadido contactos todavía
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No se han añadido contactos todavía
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,No activo
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Fecha de contabilización de factura
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Monto de costos de destino estimados
 DocType: Time Log,Batched for Billing,Lotes para facturar
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
 DocType: POS Profile,Write Off Account,Cuenta de desajuste
-sites/assets/js/erpnext.min.js +26,Discount Amount,Descuento
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Descuento
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía ( en días)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por ejemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
 DocType: Shopping Cart Settings,Quotation Series,Serie Cotización
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formando gas de metal caliente
 DocType: Sales Order Item,Sales Order Date,Fecha de las Órdenes de Venta
 DocType: Sales Invoice Item,Delivered Qty,Cantidad Entregada
@@ -2518,7 +2497,7 @@ DocType: Account,Sales User,Usuario de Ventas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,La cantidad mínima no puede ser mayor que la cantidad maxima
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,conjunto
 DocType: Lead,Lead Owner,Propietario de la Iniciativa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Se requiere Almacén
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Se requiere Almacén
 DocType: Employee,Marital Status,Estado Civil
 DocType: Stock Settings,Auto Material Request,Solicitud de Materiales Automatica
 DocType: Time Log,Will be updated when billed.,Se actualizará cuando se facture.
@@ -2538,11 +2517,11 @@ DocType: POS Profile,Update Stock,Actualizar el Inventario
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos para el redondeo--"
 DocType: Purchase Invoice,Terms,Términos
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Crear
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Crear
 DocType: Buying Settings,Purchase Order Required,Órden de compra requerida
 ,Item-wise Sales History,Detalle de las ventas
 DocType: Expense Claim,Total Sanctioned Amount,Total Sancionada
@@ -2558,7 +2537,7 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Deducción En Planilla
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notas
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Seleccione un nodo de grupo primero.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propósito debe ser uno de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Llene el formulario y guárdelo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Llene el formulario y guárdelo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descargar un informe con todas las materias primas y su inventario actual
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Frente a
 DocType: Leave Application,Leave Balance Before Application,Vacaciones disponibles antes de la solicitud
@@ -2567,7 +2546,7 @@ DocType: Company,Default Letter Head,Encabezado predeterminado
 DocType: Time Log,Billable,Facturable
 DocType: Authorization Rule,This will be used for setting rule in HR module,Esto se utiliza para ajustar la regla en el módulo de Recursos Humanos
 DocType: Account,Rate at which this tax is applied,Velocidad a la que se aplica este impuesto
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Reordenar Cantidad
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordenar Cantidad
 DocType: Company,Stock Adjustment Account,Cuenta de Ajuste de existencias
 DocType: Journal Entry,Write Off,Desajuste
 DocType: Time Log,Operation ID,ID de Operación
@@ -2577,10 +2556,10 @@ DocType: Task,depends_on,depende de
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Oportunidad Perdida
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Los campos 'descuento' estarán disponibles en la orden de compra, recibo de compra y factura de compra"
 DocType: Report,Report Type,Tipo de informe
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Cargando
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Cargando
 DocType: BOM Replace Tool,BOM Replace Tool,Herramienta de reemplazo de lista de materiales (LdM)
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Plantillas predeterminadas para un país en especial
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importación y exportación de datos
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Si usted esta involucrado en la actividad de manufactura, habilite el elemento 'Es Manufacturado'"
 DocType: Sales Invoice,Rounded Total,Total redondeado
@@ -2593,8 +2572,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuración general del sistema.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha estimada de llegada'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha estimada de llegada'"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
@@ -2619,7 +2598,7 @@ DocType: Event,Sunday,Domingo
 DocType: Sales Team,Contribution (%),Contribución (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Plantilla
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre del Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, introduzca al menos 1 factura en la tabla"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Agregar usuarios
@@ -2628,19 +2607,18 @@ DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio actual (Vía reg
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Sales Order,Partly Billed,Parcialmente Facturado
 DocType: Item,Default BOM,Solicitud de Materiales por Defecto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Monto Total Soprepasado
 DocType: Time Log Batch,Total Hours,Total de Horas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotor
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Vacaciones para el tipo {0} ya asignado para Empleado {1} para el Año Fiscal {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Un producto es requerido
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldeo por inyección de metal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Desde nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Desde nota de entrega
 DocType: Time Log,From Time,Desde fecha
 DocType: Notification Control,Custom Message,Mensaje personalizado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca de Inversión
@@ -2656,10 +2634,10 @@ DocType: Newsletter,A Lead with this email id should exist,Una Iniciativa con es
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Hasta la fecha debe ser igual a Partir de la fecha para la licencia de medio día
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Hasta la fecha debe ser igual a Partir de la fecha para la licencia de medio día
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","por ejemplo Kg , Unidad , Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
 DocType: Salary Structure,Salary Structure,Estructura Salarial
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2667,7 +2645,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  conflicto mediante la asignación de prioridad. Reglas de Precio: {0}"
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Línea Aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Por almacén
 DocType: Employee,Offer Date,Fecha de Oferta
 DocType: Hub Settings,Access Token,Token de acceso
@@ -2710,10 +2688,10 @@ DocType: C-Form,Amended From,Modificado Desde
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia Prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cualquiera Cantidad Meta o Monto Meta es obligatoria
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
-DocType: Leave Allocation,Carry Forward,Cargar
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
+DocType: Leave Control Panel,Carry Forward,Cargar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centro de Costos de las transacciones existentes no se puede convertir en el libro mayor
 DocType: Department,Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento .
 ,Produced,Producido
@@ -2734,17 +2712,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimiento y Ocio
 DocType: Purchase Order,The date on which recurring order will be stop,La fecha en que se detiene el pedido recurrente
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Presente
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serializado artículo {0} no se puede actualizar utilizando \
  Stock Reconciliación"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transferencia de material a proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferencia de material a proveedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
 DocType: Lead,Lead Type,Tipo de Iniciativa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotización
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Todos estos elementos ya fueron facturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regla envío Condiciones
 DocType: BOM Replace Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución
@@ -2796,7 +2774,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nuevas Vacaciones Asignadas
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
 DocType: Project,Expected End Date,Fecha de finalización prevista
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Comercial
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
 DocType: Cost Center,Distribution Id,Id de Distribución
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes 
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos los productos o servicios.
@@ -2809,13 +2787,13 @@ apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serie es obligatorio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servicios Financieros
 DocType: Tax Rule,Sales,Venta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cred
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cred
 DocType: Customer,Default Receivable Accounts,Cuentas por Cobrar Por Defecto 
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminación
 DocType: Item Reorder,Transfer,Transferencia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,La fecha de vencimiento es obligatorio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,La sinterización
@@ -2838,15 +2816,15 @@ DocType: GL Entry,Remarks,Observaciones
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Materia Prima Código del Artículo
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
 DocType: Features Setup,POS View,Vista POS
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,El registro de la instalación para un número de serie
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,El registro de la instalación para un número de serie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Colada continua
-sites/assets/js/erpnext.min.js +10,Please specify a,"Por favor, especifique un"
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique un"
 DocType: Offer Letter,Awaiting Response,Esperando Respuesta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamiento en frío
 DocType: Salary Slip,Earning & Deduction,Ganancia y Descuento
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Región
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
 DocType: Holiday List,Weekly Off,Semanal Desactivado
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Por ejemplo, 2012 , 2012-13"
@@ -2889,12 +2867,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Abultado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativo-modelo de fundición
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Gastos de Entretenimiento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Edad
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Edad
 DocType: Time Log,Billing Amount,Monto de facturación
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,La cantidad especificada es inválida para el elemento {0}. La cantidad debe ser mayor que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Las solicitudes de licencia .
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Gastos Legales
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El día del mes en el cual se generará la orden automática por ejemplo 05, 28, etc."
 DocType: Sales Invoice,Posting Time,Hora de contabilización
@@ -2904,7 +2882,6 @@ DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccione esta opción si desea obligar al usuario a seleccionar una serie antes de guardar. No habrá ninguna por defecto si marca ésta casilla.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ningún producto con numero de serie {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Gastos Directos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,¿Realmente desea reanudar esta requisición de materiales?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos de nuevo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Gastos de Viaje
 DocType: Maintenance Visit,Breakdown,Desglose
@@ -2913,7 +2890,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afilando
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
 DocType: Feed,Full Name,Nombre Completo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Remachado
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
@@ -2935,7 +2912,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar lineas
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracción
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos los Contactos.
 DocType: Newsletter,Test Email Id,Prueba de Identificación del email
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de la compañia
@@ -2957,10 +2934,9 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotizac
 DocType: Stock Settings,Role Allowed to edit frozen stock,Función Permitida para editar Inventario Congelado
 ,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo 
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Moneda Local)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} estado es 'Detenido'
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Dirección de facturación preferida
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de
@@ -2977,8 +2953,8 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalle de Impuestos
 DocType: Purchase Order Item,Supplier Quotation,Cotizaciónes a Proveedores
 DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planchado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} esta detenido
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere Cliente
@@ -3004,24 +2980,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
 DocType: Serial No,Out of Warranty,Fuera de Garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida predeterminada"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida predeterminada"
 DocType: Purchase Invoice Item,Project Name,Nombre del proyecto
 DocType: Workflow State,Edit,Editar
 DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
 DocType: Features Setup,Item Batch Nos,Números de lote del producto
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Recursos Humanos
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pago para reconciliación de saldo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Activos por Impuestos
 DocType: BOM Item,BOM No,Lista de materiales (LdM) No.
 DocType: Contact Us Settings,Pincode,Código PIN
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
 DocType: Item,Moving Average,Promedio Movil
 DocType: BOM Replace Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nueva Unidad de Medida del Inventario debe ser diferente de la Unidad de Medida actual
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
 DocType: Production Order,Operation Cost,Costo de operación
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Sube la asistencia de un archivo .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Monto Sobrepasado
@@ -3029,7 +3005,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Estable
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Para asignar este problema, utilice el botón ""Asignar"" en la barra lateral."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelar stock mayores a [Days]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados ​​en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Contra Factura
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,El año fiscal: {0} no existe
 DocType: Currency Exchange,To Currency,Para la moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar Solicitudes de ausencia en bloques de días.
@@ -3056,16 +3031,16 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_cal
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Procentaje (% )
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Fin del ejercicio contable
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por 'nombre'"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Crear cotización de proveedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Crear cotización de proveedor
 DocType: Quality Inspection,Incoming,Entrante
 DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por Licencia sin Sueldo ( LWP )
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
 DocType: Batch,Batch ID,ID de lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota: {0}
 ,Delivery Note Trends,Tendencia de Notas de Entrega
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser un producto para compra o sub-contratado en la linea {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser un producto para compra o sub-contratado en la linea {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario
 DocType: GL Entry,Party,Socio
 DocType: Sales Order,Delivery Date,Fecha de Entrega
@@ -3124,7 +3099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Informes al
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para el receptor no
 DocType: Sales Invoice,Paid Amount,Cantidad pagada
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Cuenta de cierre {0} debe ser de tipo 'Patrimonio'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Cuenta de cierre {0} debe ser de tipo 'Patrimonio'
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del producto
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Al establecer esta plantilla de dirección por defecto ya que no hay otra manera predeterminada
@@ -3132,7 +3107,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de la Calidad
 DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente
 DocType: Payment Tool Detail,Against Voucher No,Comprobante No.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
 DocType: Tax Rule,Purchase,Compra
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Can. en balance
@@ -3166,23 +3141,23 @@ For Example: If you are selling Laptops and Backpacks separately and have a spec
 Note: BOM = Bill of Materials","Grupo Global de la ** ** Los productos que en otro artículo ** **. Esto es útil si usted está empaquetando unas determinadas Artículos ** ** en un paquete y mantener un balance de los ** Los productos envasados ​​** y no el agregado ** ** Artículo. El paquete ** ** Artículo tendrá "Es el archivo de artículos" como "No" y "¿Es artículo de ventas" como "Sí". Por ejemplo: Si usted está vendiendo ordenadores portátiles y Mochilas por separado y tienen un precio especial si el cliente compra a la vez, entonces el ordenador portátil + Mochila será un nuevo paquete de productos de artículos. Nota: BOM = Lista de materiales"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0}
 DocType: Item Variant Attribute,Attribute,Atributo
-sites/assets/js/desk.min.js +7652,Created By,Creado por
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creado por
 DocType: Serial No,Under AMC,Bajo AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,La tasa de valorización del producto se vuelve a calcular considerando los costos adicionales del voucher
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Los ajustes por defecto para las transacciones de venta.
 DocType: BOM Replace Tool,Current BOM,Lista de materiales actual
-sites/assets/js/erpnext.min.js +8,Add Serial No,Agregar No. de serie
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Agregar No. de serie
 DocType: Production Order,Warehouses,Almacenes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Impresión y Papelería
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Agrupar por nota
 DocType: Payment Reconciliation,Minimum Amount,Importe mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualización de las Mercancías Terminadas
 DocType: Workstation,per hour,por horas
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serie {0} ya se utiliza en {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serie {0} ya se utiliza en {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
 DocType: Company,Distribution,Distribución
-sites/assets/js/erpnext.min.js +50,Amount Paid,Total Pagado
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Total Pagado
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
@@ -3223,7 +3198,7 @@ DocType: Email Digest,Add/Remove Recipients,Añadir / Quitar Destinatarios
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este Año Fiscal como Predeterminado , haga clic en "" Establecer como Predeterminado """
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante para el apoyo de id de correo electrónico. (ej. support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Escasez Cantidad
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escasez Cantidad
 DocType: Salary Slip,Salary Slip,Planilla
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruñido
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Hasta la fecha' es requerido
@@ -3267,7 +3242,7 @@ DocType: BOM,Manufacturing User,Usuario de Manufactura
 DocType: Purchase Order,Raw Materials Supplied,Materias primas suministradas
 DocType: Purchase Invoice,Recurring Print Format,Formato de impresión recurrente
 DocType: Communication,Series,Secuencia
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
 DocType: Appraisal,Appraisal Template,Plantilla de Evaluación
 DocType: Communication,Email,Correo electrónico
 DocType: Item Group,Item Classification,Clasificación de producto
@@ -3328,7 +3303,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Verificar Comprobantes Pendientes
 DocType: Warranty Claim,Resolved By,Resuelto por
 DocType: Appraisal,Start Date,Fecha de inicio
-sites/assets/js/desk.min.js +7629,Value,Valor
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Asignar las vacaciones para un período .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Haga clic aquí para verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
@@ -3350,7 +3325,7 @@ DocType: Employee,Educational Qualification,Capacitación Académica
 DocType: Workstation,Operating Costs,Costos Operativos
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de Vacaciones del Empleado
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestra lista de Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanizado por haz de electrones
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
@@ -3363,7 +3338,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,DocType Prevdoc
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Añadir / Editar Precios
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Centros de costos
 ,Requested Items To Be Ordered,Solicitud de Productos Aprobados
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Mis pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mis pedidos
 DocType: Price List,Price List Name,Nombre de la lista de precios
 DocType: Time Log,For Manufacturing,Por fabricación
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totales
@@ -3374,7 +3349,7 @@ DocType: Account,Income,Ingresos
 DocType: Industry Type,Industry Type,Tipo de Industria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo salió mal!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de  finalización
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundición a presión
@@ -3388,10 +3363,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Año
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Perfiles del Punto de Venta POS
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Por favor, actualizar la configuración SMS"
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Hora de registro {0} ya facturado
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Hora de registro {0} ya facturado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Préstamos sin garantía
 DocType: Cost Center,Cost Center Name,Nombre Centro de Costo
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,El elemento {0} con No. de serie {1} ya está instalado
 DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Pagado Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes de más de 160 caracteres se dividirá en varios mensajes
@@ -3399,10 +3373,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Recibidos y Aceptados
 ,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad
 DocType: Item,Unit of Measure Conversion,Unidad de Conversión de la medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleado no se puede cambiar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
 DocType: Naming Series,Help HTML,Ayuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Sus proveedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
@@ -3426,7 +3400,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Para Almacén
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1}
 ,Average Commission Rate,Tasa de Comisión Promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de Regla de Precios
 DocType: Purchase Taxes and Charges,Account Head,Cuenta matriz
@@ -3445,14 +3419,14 @@ DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 DocType: User,Enabled,Habilitado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Activos de Inventario
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},¿Realmente desea enviar toda la nómina para el mes {0} y año {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},¿Realmente desea enviar toda la nómina para el mes {0} y año {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importar suscriptores
 DocType: Target Detail,Target Qty,Cantidad Objetivo
 DocType: Attendance,Present,Presente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada
 DocType: Notification Control,Sales Invoice Message,Mensaje de la Factura
 DocType: Authorization Rule,Based On,Basado en
-,Ordered Qty,Cantidad Pedida
+DocType: Sales Order Item,Ordered Qty,Cantidad Pedida
 DocType: Stock Settings,Stock Frozen Upto,Inventario Congelado hasta
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Actividad del Proyecto / Tarea.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generar etiquetas salariales
@@ -3491,7 +3465,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Subir Asistencia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2
-DocType: Journal Entry Account,Amount,Importe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Importe
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Remachado
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada
 ,Sales Analytics,Análisis de Ventas
@@ -3514,7 +3488,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Lanzamiento no puede ser anterior material Fecha de Solicitud
 DocType: Contact Us Settings,City,Ciudad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Mecanizado por ultrasonidos
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Error: No es un ID válido?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Error: No es un ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,El producto {0} debe ser un producto para la venta
 DocType: Naming Series,Update Series Number,Actualizar número de serie
 DocType: Account,Equity,Patrimonio
@@ -3528,7 +3502,7 @@ DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
 DocType: Production Order,Production Order,Orden de Producción
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos los Empleados (Activos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora
@@ -3536,14 +3510,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Costo de la Materia Prima
 DocType: Item,Re-Order Level,Reordenar Nivel
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis.
-sites/assets/js/list.min.js +174,Gantt Chart,Diagrama de Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama de Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Tiempo Parcial
 DocType: Employee,Applicable Holiday List,Lista de Días Feriados Aplicable
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Actualizado
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo de informe es obligatorio
 DocType: Item,Serial Number Series,Número de Serie Serie
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la linea {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la linea {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
 DocType: Issue,First Responded On,Primera respuesta el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
@@ -3557,7 +3531,7 @@ DocType: Attendance,Attendance,Asistencia
 DocType: Page,No,No
 DocType: BOM,Materials,Materiales
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no está marcada, la lista tendrá que ser añadida a cada departamento donde será aplicada."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
 ,Item Prices,Precios de los Artículos
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,La cantidad en palabras será visible una vez que guarde la orden de compra.
@@ -3575,9 +3549,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Gastos de Administración
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Categoría de cliente principal
-sites/assets/js/erpnext.min.js +50,Change,Cambio
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',La órden de compra {0} esta 'Detenida'
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de Notificación
@@ -3605,7 +3578,7 @@ DocType: Issue,Support Team,Equipo de Soporte
 DocType: Appraisal,Total Score (Out of 5),Puntaje total (de 5 )
 DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Lotes de Producto
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
 DocType: User,Gender,Género
 DocType: Journal Entry,Debit Note,Nota de Débito
@@ -3620,14 +3593,13 @@ DocType: Lead,Blog Subscriber,Suscriptor del Blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día."
 DocType: Purchase Invoice,Total Advance,Total Anticipo
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Continuar Solicitud de Material
 DocType: Workflow State,User,Usuario
 DocType: Opportunity Item,Basic Rate,Precio base
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Establecer como Perdidos
 DocType: Customer,Credit Days Based On,Días de crédito basados en
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantener misma tasa durante todo el ciclo de ventas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear bitácora de trabajo para las horas fuera de la estación.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} ya ha sido presentado
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ya ha sido presentado
 ,Items To Be Requested,Solicitud de Productos
 DocType: Purchase Order,Get Last Purchase Rate,Obtenga último precio de compra
 DocType: Company,Company Info,Información de la compañía
@@ -3646,21 +3618,21 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supresión
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de Empleados
 DocType: Sales Invoice,Is POS,Es POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la linea {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la linea {1}
 DocType: Production Order,Manufactured Qty,Cantidad Fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
 DocType: DocField,Default,Defecto
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} suscriptores añadidos
 DocType: Maintenance Schedule,Schedule,Horario
 DocType: Account,Parent Account,Cuenta Primaria
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Centro de actividades
 DocType: GL Entry,Voucher Type,Tipo de comprobante
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
@@ -3672,7 +3644,7 @@ DocType: Employee,Current Address Is,La Dirección Actual es
 DocType: Address,Office,Oficina
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes Estándares
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entradas en el diario de contabilidad.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para crear una Cuenta de impuestos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
 DocType: Account,Stock,Existencias
@@ -3683,7 +3655,7 @@ DocType: Employee,Contract End Date,Fecha Fin de Contrato
 DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener Ordenes de venta (pendientes de entrega) basados en los criterios anteriores
 DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Desde cotización del proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Desde cotización del proveedor
 DocType: Deduction Type,Deduction Type,Tipo de Deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Pricing Rule,Min Qty,Cantidad Mínima
@@ -3693,11 +3665,11 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Moneda Local)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
 DocType: Notification Control,Purchase Receipt Message,Mensaje de Recibo de Compra
 DocType: Production Order,Actual Start Date,Fecha de inicio actual
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados contra la orden de venta
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Movimientos de inventario
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Movimientos de inventario
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Lista de suscriptores al boletín
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar
 DocType: Email Account,Service,Servicio
@@ -3705,7 +3677,7 @@ DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen Bruto %
 DocType: BOM,With Operations,Con operaciones
 ,Monthly Salary Register,Registar Salario Mensual
-apps/frappe/frappe/website/template.py +123,Next,Próximo
+apps/frappe/frappe/website/template.py +140,Next,Próximo
 DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
 DocType: BOM Operation,BOM Operation,Operación de la lista de materiales (LdM)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,El electropulido
@@ -3759,7 +3731,7 @@ DocType: Purchase Order,To Receive and Bill,Para Recibir y pagar
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantillas de Términos y Condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la linea {0} en la tabla Impuestos para el tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la linea {0} en la tabla Impuestos para el tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crear automáticamente una 'Solicitud de materiales' si la cantidad es inferior a este nivel
 ,Item-wise Purchase Register,Detalle de Compras
 DocType: Batch,Expiry Date,Fecha de caducidad
@@ -3767,20 +3739,20 @@ DocType: Batch,Expiry Date,Fecha de caducidad
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Por favor, seleccione primero la categoría"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Proyecto maestro
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de Crédito
 DocType: Leave Type,Is Carry Forward,Es llevar adelante
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de Entrega en Días
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de materiales (LdM)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: el tipo de entidad se requiere para las cuentas por cobrar/pagar {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: el tipo de entidad se requiere para las cuentas por cobrar/pagar {1}
 DocType: Dropbox Backup,Send Notifications To,Enviar notificaciones a
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Fecha Ref
 DocType: Employee,Reason for Leaving,Razones de Renuncia 
 DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
 DocType: GL Entry,Is Opening,Es apertura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Cuenta {0} no existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Cuenta {0} no existe
 DocType: Account,Cash,Efectivo
 DocType: Employee,Short biography for website and other publications.,Breve biografía de la página web y otras publicaciones.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, cree una estructura salarial para el empleado {0}"
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index e584cd9b92..0f1bbc0eb7 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Modo de pago
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccione la distribución mensual, si usted desea monitoreo de las temporadas"
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productos ya sincronizados
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir añadir el artículo varias veces en una transacción
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar visita {0} antes de cancelar este reclamo de garantía
@@ -23,8 +23,9 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactación más sinterización
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},La divisa/moneda es requerida para lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Desde requisición de materiales
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árbol
+DocType: Purchase Order,Customer Contact,Contacto con el cliente
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Desde requisición de materiales
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,Árbol: {0}
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Nombre del cliente
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Todos los campos relacionados tales como divisa, tasa de conversión, el total de exportaciones, total general de las exportaciones, etc están disponibles en la nota de entrega, Punto de venta, cotización, factura de venta, órdenes de venta, etc."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) para el cual los asientos contables se crean y se mantienen los saldos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),El pago pendiente para {0} no puede ser menor que cero ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),El pago pendiente para {0} no puede ser menor que cero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre del tipo de ausencia
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Secuencia actualizada correctamente
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios p
 DocType: SMS Center,All Supplier Contact,Todos Contactos de Proveedores
 DocType: Quality Inspection Reading,Parameter,Parámetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Realmente desea reanudar la orden de producción:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Línea # {0}: El valor debe ser el mismo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Nueva solicitud de ausencia
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nueva solicitud de ausencia
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,GIRO BANCARIO
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1 . Utilice esta opción para mantener el código del producto asignado por el cliente, de esta manera podrá encontrarlo en el buscador"
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar varian
 DocType: Sales Invoice Item,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos)
 DocType: Employee Education,Year of Passing,Año de graduación
-sites/assets/js/erpnext.min.js +27,In Stock,En inventario
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Sólo se puede crear un pago para las ordenes de venta impagadas
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En inventario
 DocType: Designation,Designation,Puesto
 DocType: Production Plan Item,Production Plan Item,Plan de producción de producto
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crear un nuevo perfil de POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Asistencia médica
 DocType: Purchase Invoice,Monthly,Mensual
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Factura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retraso en el pago (días)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Dirección de correo electrónico
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abreviatura
-DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
+DocType: Appraisal Goal,Score (0-5),Puntuación (0-5)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Línea # {0}:
 DocType: Delivery Note,Vehicle No,Vehículo No.
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Por favor, seleccione la lista de precios"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, seleccione la lista de precios"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tratamiento de la madera
 DocType: Production Order Operation,Work In Progress,TRABAJOS EN PROCESO
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impresión 3D
@@ -92,35 +92,36 @@ apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot ha
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atributo Valor {0} no se puede quitar de {1} como Artículo Variantes \ existen con este atributo.
 DocType: Print Settings,Classic,Clásico
-apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar .
+apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar.
 DocType: BOM,Operations,Operaciones
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},No se puede establecer la autorización sobre la base de descuento para {0}
 DocType: Bin,Quantity Requested for Purchase,Cantidad solicitada para la compra
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y otro para el nombre nuevo"
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y la otra para el nombre nuevo."
 DocType: Packed Item,Parent Detail docname,Detalle principal docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogramo
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura de un puesto
 DocType: Item Attribute,Increment,Incremento
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Seleccione Almacén ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicidad
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Crear entrada de banco
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Crear entrada de banco
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondo de pensiones
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén
-DocType: SMS Center,All Sales Person,Todos Ventas de Ventas
+DocType: SMS Center,All Sales Person,Todos los vendedores
 DocType: Lead,Person Name,Nombre de persona
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Marque si es una orden recurrente, desmarque si quiere detenerla o marcar una fecha final"
-DocType: Sales Invoice Item,Sales Invoice Item,Articulo de la Factura de Venta
+DocType: Sales Invoice Item,Sales Invoice Item,Producto de factura de venta
 DocType: Account,Credit,Haber
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,"Por favor, configure el sistema de Nombre de Empleados a través de: Recursos Humanos > Configuración de recursos humanos"
 DocType: POS Profile,Write Off Cost Center,Desajuste de centro de costos
 DocType: Warehouse,Warehouse Detail,Detalle de almacenes
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
-DocType: Tax Rule,Tax Type,Tipo de Impuestos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
+DocType: Tax Rule,Tax Type,Tipo de impuestos
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 DocType: Item,Item Image (if not slideshow),Imagen del producto (si no utilizará diapositivas)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por Hora / 60) * Tiempo real de la operación
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Invitado
 DocType: Quality Inspection,Get Specification Details,Obtener especificaciones
 DocType: Lead,Interested,Interesado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiales (LdM)
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1}
 DocType: Item,Copy From Item Group,Copiar desde grupo
 DocType: Journal Entry,Opening Entry,Asiento de apertura
@@ -140,9 +141,9 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Petición de producto
 DocType: Standard Reply,Owner,Propietario
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Por favor, ingrese primero la compañía"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Por favor, seleccione primero la compañía"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, seleccione primero la compañía"
 DocType: Employee Education,Under Graduate,Estudiante
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Objetivo On
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Objetivo en
 DocType: BOM,Total Cost,Coste total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Escariado
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Actividad:
@@ -151,32 +152,33 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estado de cuenta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
 DocType: Expense Claim Detail,Claim Amount,Importe del reembolso
-DocType: Employee,Mr,No.
+DocType: Employee,Mr,Sr.
 DocType: Custom Script,Client,Cliente
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipo de Proveedor / Proveedor
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Proveedor / Tipo de proveedor
 DocType: Naming Series,Prefix,Prefijo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumible
 DocType: Upload Attendance,Import Log,Importar registro
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar.
+DocType: Sales Invoice Item,Delivered By Supplier,Entregado por proveedor
 DocType: SMS Center,All Contact,Todos los Contactos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salario Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Inventario de Gastos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Gastos sobre existencias
 DocType: Newsletter,Email Sent?,Enviar Email?
 DocType: Journal Entry,Contra Entry,Entrada contra
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar gestión de tiempos
 DocType: Journal Entry Account,Credit in Company Currency,Divisa por defecto de la cuenta de credito
 DocType: Delivery Note,Installation Status,Estado de la instalación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
 DocType: Item,Supply Raw Materials for Purchase,Suministro de materia prima para la compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,El producto {0} debe ser un producto para la compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, para rellenar los datos apropiados y adjuntar el archivo modificado.
- Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
+ Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera enviada .
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} también deben ser incluidos
-apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
+apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
 DocType: SMS Center,SMS Center,Centro SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Enderezado
 DocType: BOM Replace Tool,New BOM,Nueva solicitud de materiales
@@ -192,22 +194,21 @@ apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carri
 DocType: Serial No,Maintenance Status,Estado del mantenimiento
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Productos y precios
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
-DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccione el empleado para el que está creando la Evaluación .
+DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccione el empleado para el que está creando la evaluación.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},El centro de Costos {0} no pertenece a la compañía {1}
 DocType: Customer,Individual,Individual
 apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan para las visitas
 DocType: SMS Settings,Enter url parameter for message,Introduzca el parámetro url para el mensaje
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Reglas para la aplicación de distintos precios y descuentos sobre los productos.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Esta gestión de tiempos tiene conflictos con {0} de {1} {2}
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,la lista de precios debe ser aplicable para comprar o vender
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0}
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,La lista de precios debe ser aplicable para las compras o ventas
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa de la lista de precios (%)
-sites/assets/js/form.min.js +279,Start,Iniciar
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Iniciar
 DocType: User,First Name,Nombre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Su configuración se ha completado. Actualizando...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fundición de molde completo
 DocType: Offer Letter,Select Terms and Conditions,Seleccione términos y condiciones
-DocType: Production Planning Tool,Sales Orders,Ordenes de Venta
+DocType: Production Planning Tool,Sales Orders,Ordenes de venta
 DocType: Purchase Taxes and Charges,Valuation,Valuación
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Establecer como predeterminado
 ,Purchase Order Trends,Tendencias de ordenes de compra
@@ -230,39 +231,40 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venta del producto
 ,Production Orders in Progress,Órdenes de producción en progreso
 DocType: Lead,Address & Contact,Dirección y Contacto
+DocType: Leave Allocation,Add unused leaves from previous allocations,Añadir las hojas no utilizados de las asignaciones anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
-DocType: Newsletter List,Total Subscribers,Los suscriptores totales
+DocType: Newsletter List,Total Subscribers,Suscriptores totales
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nombre de contacto
 DocType: Production Plan Item,SO Pending Qty,Cant. de OV pendientes
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crear la nómina salarial con los criterios antes seleccionados.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Vivienda Doble
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, las secuencias e identificadores para {0} a través de Configuración> Configuración> Secuencias e identificadores"
 DocType: Time Log,Will be updated when batched.,Se actualizará al agruparse.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
-DocType: Bulk Email,Message,Atención
+DocType: Bulk Email,Message,Mensaje
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 DocType: Dropbox Backup,Dropbox Access Key,Clave de acceso a Dropbox
 DocType: Payment Tool,Reference No,Referencia No.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
-DocType: Stock Entry,Sales Invoice No,Factura de Venta No
+DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
+DocType: Stock Entry,Sales Invoice No,Factura de venta No.
 DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido
 DocType: Lead,Do Not Contact,No contactar
-DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El identificador único para el seguimiento de todas las facturas recurrentes. Se genera al enviar .
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software
+DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El ID único para el seguimiento de todas las facturas recurrentes. Este es generado al validar.
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software.
 DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
-,Terretory,Territorios
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Requisición de Materiales
+,Terretory,Territorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Requisición de Materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},El elemento {0} no se encuentra en 'Materias Primas Suministradas' en la tabla de la órden de compra {1}
@@ -275,10 +277,10 @@ DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invo
 DocType: SMS Settings,SMS Sender Name,Nombre del remitente SMS
 DocType: Contact,Is Primary Contact,Es el contacto principal
 DocType: Notification Control,Notification Control,Control de notificaciónes
-DocType: Lead,Suggestions,Sugerencias
+DocType: Lead,Suggestions,Sugerencias.
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer grupo de presupuestos en este territorio. también puede incluir las temporadas de distribución
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Por favor, ingrese el grupo de cuentas padres / principales para el almacén {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},El pago para {0} {1} no puede ser mayor que el pago pendiente {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},El pago para {0} {1} no puede ser mayor que el pago pendiente {2}
 DocType: Supplier,Address HTML,Dirección HTML
 DocType: Lead,Mobile No.,Número móvil
 DocType: Maintenance Schedule,Generate Schedule,Generar planificación
@@ -287,13 +289,13 @@ DocType: Purchase Invoice Item,Expense Head,Cuenta de gastos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Por favor, seleccione primero el tipo de cargo"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más reciente
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Máximo 5 caractéres
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Seleccione su idioma
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Seleccione su idioma.
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer supervisor de ausencias en la lista sera definido como el administrador de ausencias/vacaciones predeterminado.
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desactiva la creación de bitácoras (gestión de tiempos) para las órdenes de producción (OP). Las operaciones ya no tendrán un seguimiento.
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrar las categoría de los socios de ventas
-DocType: Item,Synced With Hub,Sincronizado con Hub
+DocType: Item,Synced With Hub,Sincronizado con Hub.
 apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Contraseña Incorrecta
 DocType: Item,Variant Of,Variante de
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,El elemento {0} debe ser un servicio
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nueva unidad de medida (UdM)
 DocType: Period Closing Voucher,Closing Account Head,Cuenta principal de cierre
 DocType: Employee,External Work History,Historial de trabajos externos
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error de referencia circular
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,¿Realmente desea detener?
 DocType: Communication,Closed,Cerrado
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Exportar) serán visibles una vez que guarde la nota de entrega.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,¿Seguro que quieres dejar de
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Perfil del puesto
 DocType: Newsletter,Newsletter,Boletín de noticias
@@ -316,13 +316,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales
 DocType: Journal Entry,Multi Currency,Multi moneda
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Se ha actualizado el producto
-DocType: Async Task,System Manager,Administrador del Sistema
+DocType: Async Task,System Manager,Administrador del sistema
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de factura
 DocType: Sales Invoice Item,Delivery Note,Nota de entrega
 DocType: Dropbox Backup,Allow Dropbox Access,Permitir Acceso a Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes
 DocType: Workstation,Rent Cost,Costo de arrendamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Por favor seleccione el mes y el año
@@ -332,17 +332,17 @@ DocType: GL Entry,Debit Amount in Account Currency,Importe debitado con la divis
 DocType: Shipping Rule,Valid for Countries,Válido para los Países
 DocType: Workflow State,Refresh,Actualizar
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Todos los campos tales como la divisa, tasa de conversión, el total de las importaciones, la importación total general etc están disponibles en recibo de compra, cotización de proveedor, factura de compra, orden de compra, etc"
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
+apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este producto es una plantilla y no se puede utilizar en las transacciones. Los atributos del producto se copiarán sobre las variantes, a menos que la opción 'No copiar' este seleccionada"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total del Pedido Considerado
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca el valor en el campo 'Repetir un día al mes'"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa por la cual la divisa es convertida como moneda base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas"
 DocType: Item Tax,Tax Rate,Procentaje del impuesto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Seleccione producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleccione producto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,la factura de compra {0} ya existe
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,la factura de compra {0} ya existe
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Línea # {0}: El lote no puede ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe validarse
@@ -350,20 +350,20 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Unidad de Medida de Inventa
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Listados de los lotes de los productos
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de factura
 DocType: GL Entry,Debit Amount,Importe débitado
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Sólo puede haber 1 cuenta por la empresa en {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Su dirección de correo electrónico
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Corte por chorro de agua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Configuración completa !
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,La configuración ya se ha completado!
 ,Finished Goods,PRODUCTOS TERMINADOS
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
 DocType: Maintenance Visit,Maintenance Type,Tipo de mantenimiento
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},El número de serie {0} no pertenece a la nota de entrega {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},El número de serie {0} no pertenece a la nota de entrega {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parámetro de Inspección de Calidad del producto
 DocType: Leave Application,Leave Approver Name,Nombre del supervisor de ausencias
-,Schedule Date,Horario Fecha
+,Schedule Date,Fecha de programa
 DocType: Packed Item,Packed Item,Artículo empacado
 apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Ajustes predeterminados para las transacciones de compra.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe un costo de actividad para el empleado {0} en el tipo de actividad - {1}
@@ -374,12 +374,12 @@ apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_bala
 DocType: Employee,Widowed,Viudo
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Elementos que deben exigirse que son "" Fuera de Stock "", considerando todos los almacenes basados ​​en Cantidad proyectada y pedido mínimo Cantidad"
 DocType: Workstation,Working Hours,Horas de Trabajo
-DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el número de secuencia nuevo para esta transacción
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el nuevo número de secuencia para esta transacción.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
 ,Purchase Register,Registro de compras
 DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables
 DocType: Workstation,Consumable Cost,Coste de consumibles
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de ausencias'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de ausencias'
 DocType: Purchase Receipt,Vehicle Date,Fecha de Vehículos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razón de pérdida
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Por favor, ingrese el nombre de la compañia"
 DocType: BOM,Item Desription,Descripción de producto
 DocType: Purchase Invoice,Supplier Name,Nombre de proveedor
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lea el Manual ERPNext
 DocType: Account,Is Group,Es un grupo
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automáticamente los números de serie basado en FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprobar número de factura único por proveedor
@@ -412,24 +413,24 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_lis
 DocType: Lead,Channel Partner,Canal de socio
 DocType: Account,Old Parent,Antiguo Padre
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalizar el texto de introducción que va como una parte de este correo electrónico. Cada transacción tiene un texto introductorio separado.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerente de Ventas
+DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerente principal de ventas
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Configuración global para todos los procesos de producción
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta
-DocType: SMS Log,Sent On,Enviado Por
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
+DocType: SMS Log,Sent On,Enviado por
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master de vacaciones .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell molding
 DocType: Material Request Item,Required Date,Fecha de solicitud
 DocType: Delivery Note,Billing Address,Dirección de Facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Presupuesto
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el valor del impuesto se considerará como ya incluido en el Importe"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
 DocType: Employee,Health Concerns,Problemas de salud
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,No pagado
 DocType: Packing Slip,From Package No.,Desde paquete No.
-DocType: Item Attribute,To Range,Para variar
+DocType: Item Attribute,To Range,A rango
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y depósitos
 DocType: Features Setup,Imports,Importaciones
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Union adhesiva
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre o
 DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
 DocType: Journal Entry,Accounts Payable,Cuentas por pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Añadir Suscriptores
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" no existe"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" no existe"
 DocType: Pricing Rule,Valid Upto,Válido hasta
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingreso directo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administrativo
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Funcionario administrativo
 DocType: Payment Tool,Received Or Paid,Recibido o pagado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Por favor, seleccione la empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, seleccione la empresa"
 DocType: Stock Entry,Difference Account,Cuenta para la Diferencia
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productos cosméticos
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
 DocType: Communication,Subject,Asunto
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de emergencia
 ,Serial No Warranty Expiry,Garantía de caducidad del numero de serie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,¿Realmente desea detener la requisición de materiales?
-DocType: Sales Order,To Deliver,Para Entregar
+DocType: Sales Order,To Deliver,Para entregar
 DocType: Purchase Invoice Item,Item,Productos
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
 DocType: Account,Profit and Loss,Pérdidas y ganancias
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Gestión de sub-contrataciones
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestión de sub-contrataciones
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nueva unidad de medida no debe ser un entero
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,MUEBLES Y ENSERES
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasa por la cual la lista de precios es convertida como base de la compañía
@@ -486,17 +486,17 @@ apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid e
 					Email Address'",{0} es una dirección de correo electrónico inválida en 'Email de notificación'
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Facturación total este año:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
-DocType: Purchase Invoice,Supplier Invoice No,Factura del Proveedor No
-DocType: Territory,For reference,Por referencia
+DocType: Purchase Invoice,Supplier Invoice No,Factura de proveedor No.
+DocType: Territory,For reference,Para referencia
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","No se puede eliminar de serie n {0}, ya que se utiliza en las transacciones de valores"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Cierre (Cred)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Cierre (Cred)
 DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 ,Pending Qty,Cantidad pendiente
-DocType: Job Applicant,Thread HTML,Tema HTML
+DocType: Job Applicant,Thread HTML,Hilo HTML
 DocType: Company,Ignore,Pasar por alto
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas 
+apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
 DocType: Pricing Rule,Valid From,Válido desde
 DocType: Sales Invoice,Total Commission,Comisión total
 DocType: Pricing Rule,Sales Partner,Socio de ventas
@@ -521,8 +521,9 @@ DocType: Sales Order,Billing and Delivery Status,Estado de facturación y entreg
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes recurrentes
 DocType: Leave Control Panel,Allocate,Asignar
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Volver Ventas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Devoluciones de ventas
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccione las órdenes de venta con las cuales desea crear la orden de producción.
+DocType: Item,Delivered by Supplier (Drop Ship),Entregado por el Proveedor (nave)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariales
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de datos de clientes potenciales.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de datos de clientes.
@@ -533,7 +534,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Monto facturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
 DocType: Event,Wednesday,Miércoles
 DocType: Sales Invoice,Customer's Vendor,Agente de ventas
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,La orden de producción es obligatoria
@@ -544,30 +545,30 @@ DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
 DocType: Packing Slip Item,DN Detail,Detalle DN
 DocType: Time Log,Billed,Facturado
 DocType: Batch,Batch Description,Descripción de lotes
-DocType: Delivery Note,Time at which items were delivered from warehouse,Momento en que los artículos fueron entregados desde el almacén
-DocType: Sales Invoice,Sales Taxes and Charges,Los impuestos y cargos de venta
+DocType: Delivery Note,Time at which items were delivered from warehouse,Hora en que los productos fueron entregados desde el almacén
+DocType: Sales Invoice,Sales Taxes and Charges,Impuestos y cargos sobre ventas
 DocType: Employee,Organization Profile,Perfil de la organización
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,"Por favor, configure la numeración de la asistencia a través de Configuración > Numeración y Series"
 DocType: Employee,Reason for Resignation,Motivo de la renuncia
-apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Plantilla para las evaluaciones de desempeño .
+apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Plantilla para evaluaciones de desempeño.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Detalles de diarios
 apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' no esta en el Año Fiscal {2}
 DocType: Buying Settings,Settings for Buying Module,Ajustes para módulo de compras
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Por favor, ingrese primero el recibo de compra"
-DocType: Buying Settings,Supplier Naming By,Ordenar proveedores por:
+DocType: Buying Settings,Supplier Naming By,Ordenar proveedores por
 DocType: Activity Type,Default Costing Rate,Precio de costo predeterminado
 DocType: Maintenance Schedule,Maintenance Schedule,Calendario de mantenimiento
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas por Cliente, Categoría de cliente, Territorio, Proveedor, Tipo de proveedor, Campaña, Socio de ventas, etc"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas por cliente, categoría de cliente, territorio, proveedor, tipo de proveedor, campaña, socio de ventas, etc."
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale el módulo python dropbox"
 DocType: Employee,Passport Number,Número de pasaporte
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Desde recibo de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
-DocType: Sales Person,Sales Person Targets,Metas de Vendedor
-sites/assets/js/form.min.js +271,To,a
-apps/frappe/frappe/templates/base.html +143,Please enter email address,"Por favor, introduzca la dirección de correo electrónico (Email)"
+DocType: Sales Person,Sales Person Targets,Objetivos de ventas del vendedor
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,a
+apps/frappe/frappe/templates/base.html +145,Please enter email address,"Por favor, introduzca la dirección de correo electrónico (Email)"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fin tubo formando
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de resolución
@@ -584,7 +585,7 @@ DocType: Activity Cost,Projects User,Usuario de proyectos
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
 DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,La visita de mantenimiento {0} debe ser cancelada antes de cancelar la orden de ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,La visita de mantenimiento {0} debe ser cancelada antes de cancelar la orden de ventas
 DocType: Material Request,Material Transfer,Transferencia de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Apertura (Deb)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0}
@@ -592,9 +593,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Configuración
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Impuestos, cargos y costos de destino estimados"
 DocType: Production Order Operation,Actual Start Time,Hora de inicio actual
 DocType: BOM Operation,Operation Time,Tiempo de operación
-sites/assets/js/list.min.js +5,More,Más
-DocType: Pricing Rule,Sales Manager,Gerente De Ventas
-sites/assets/js/desk.min.js +7673,Rename,Renombrar
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Más
+DocType: Pricing Rule,Sales Manager,Gerente de ventas
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Renombrar
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Doblado
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir al usuario
@@ -610,16 +611,16 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Troquelado
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Almacén rechazado es obligatorio para el producto rechazado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Almacén rechazado es obligatorio para el producto rechazado
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
 DocType: Employee,Provide email id registered in company,Proporcione el correo electrónico registrado en la compañía
-DocType: Hub Settings,Seller City,Ciudad del vendedor
+DocType: Hub Settings,Seller City,Ciudad de vendedor
 DocType: Email Digest,Next email will be sent on:,El siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Términos de carta de oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elemento {0} no encontrado
-DocType: Bin,Stock Value,Valor de Inventario
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de Árbol
+DocType: Bin,Stock Value,Valor de Inventarios
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de árbol
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantidad consumida por unidad
 DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la Garantía
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y almacén
@@ -630,14 +631,13 @@ apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,No se puede
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenido
 DocType: Journal Entry,Credit Card Entry,Introducción de tarjeta de crédito
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Asunto de la Tarea
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Productos recibidos de proveedores.
-DocType: Communication,Open,Abierto
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Asunto de tarea
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Productos recibidos de proveedores.
+DocType: Communication,Open,Abrir
 DocType: Lead,Campaign Name,Nombre de la campaña
 ,Reserved,Reservado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,¿Realmente desea reanudar?
 DocType: Purchase Order,Supply Raw Materials,Suministro de materia prima
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La Fecha en que se la próxima factura sera generada. Se genera al enviar.
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La fecha en que la próxima factura será generada. Es generada al validar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ACTIVO CIRCULANTE
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} no es un producto de stock
 DocType: Mode of Payment Account,Default Account,Cuenta predeterminada
@@ -645,13 +645,13 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be se
 DocType: Contact Us Settings,Address Title,Dirección
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado
-,Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta
+,Sales Person Target Variance Item Group-Wise,"Variación del objetivo de ventas, por grupo de vendedores"
 DocType: Dropbox Backup,Daily,Diario
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
 DocType: Delivery Note,Customer's Purchase Order No,Pedido de compra No.
 DocType: Employee,Cell Number,Número de movil
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdído
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad desde
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina mensual.
@@ -720,9 +720,9 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Obligaciones
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la línea {0}.
 DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos (venta) por defecto
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,No ha seleccionado una lista de precios
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Family Background,Antecedentes familiares
-DocType: Process Payroll,Send Email,Enviar Correo Electronico
+DocType: Process Payroll,Send Email,Enviar correo electronico
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Sin permiso
 DocType: Company,Default Bank Account,Cuenta bancaria por defecto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
@@ -731,31 +731,30 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos.
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor ponderación se mostraran arriba
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de conciliación bancaria
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mis facturas
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Empleado no encontrado
-DocType: Purchase Order,Stopped,Detenido
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Empleado no encontrado
+DocType: Purchase Order,Stopped,Detenido.
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Seleccione la lista de materiales (LdM) para comenzar
 DocType: SMS Center,All Customer Contact,Todos Contactos de Clientes
 apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Sube saldo de existencias a través csv .
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ahora
-,Support Analytics,Analitico de Soporte
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ahora.
+,Support Analytics,Soporte analítico
 DocType: Item,Website Warehouse,Almacén del Sitio Web
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,¿Realmente desea detener la orden de producción?:
-DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El día del mes en el que se generará factura automática por ejemplo 05, 28, etc."
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Puntuación debe ser menor o igual a 5
+DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Día del mes en el que se generará la factura automática por ejemplo 05, 28, etc."
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,La puntuación debe ser menor o igual a 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registros C -Form
 apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Clientes y Proveedores
 DocType: Email Digest,Email Digest Settings,Configuración del boletín de correo electrónico
-apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Consultas de soporte de clientes .
-DocType: Features Setup,"To enable ""Point of Sale"" features",Para habilitar las características de "Punto de Venta"
+apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Soporte técnico para los clientes
+DocType: Features Setup,"To enable ""Point of Sale"" features",Para habilitar las características de 'Punto de Venta'
 DocType: Bin,Moving Average Rate,Porcentaje de precio medio variable
-DocType: Production Planning Tool,Select Items,Seleccione Artículos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha ​​{2}
+DocType: Production Planning Tool,Select Items,Seleccionar productos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha ​​{2}
 DocType: Comment,Reference Name,Nombre de referencia
 DocType: Maintenance Visit,Completion Status,Estado de finalización
-DocType: Sales Invoice Item,Target Warehouse,Inventario Objetivo
+DocType: Sales Invoice Item,Target Warehouse,Inventario estimado
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,La fecha prevista de entrega no puede ser anterior a la fecha de la órden de venta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,La fecha prevista de entrega no puede ser anterior a la fecha de la órden de venta
 DocType: Upload Attendance,Import Attendance,Asistente de importación
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
 DocType: Process Payroll,Activity Log,Registro de Actividad
@@ -763,7 +762,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
 DocType: Production Order,Item To Manufacture,Producto para manufactura
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Molde para fundición
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Orden de compra a pago
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Estado es {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Orden de compra a pago
 DocType: Sales Order Item,Projected Qty,Cantidad proyectada
 DocType: Sales Invoice,Payment Due Date,Fecha de pago
 DocType: Newsletter,Newsletter Manager,Administrador de boletínes
@@ -773,22 +773,22 @@ DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
 DocType: Expense Claim,Expenses,Gastos
 DocType: Item Variant Attribute,Item Variant Attribute,Artículo Variant Atributo
 ,Purchase Receipt Trends,Tendencias de recibos de compra
-DocType: Appraisal,Select template from which you want to get the Goals,Seleccione la plantilla de la que usted desea conseguir los Objetivos de
+DocType: Appraisal,Select template from which you want to get the Goals,Seleccione la plantilla con la cual desea obtener los objetivos de ventas
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y desarrollo
 ,Amount to Bill,Monto a Facturar
 DocType: Company,Registration Details,Detalles de registro
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Cantidad mínima para ordenar
 DocType: Leave Block List Date,Leave Block List Date,Fecha de Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar a {0}
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar a: {0}
 DocType: Pricing Rule,Price or Discount,Precio o descuento
 DocType: Sales Team,Incentives,Incentivos
 DocType: SMS Log,Requested Numbers,Números solicitados
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Evaluación de desempeño.
 DocType: Sales Invoice Item,Stock Details,Detalles de almacén
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del proyecto
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Punto de venta
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},No se puede trasladar {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto de venta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},No se puede trasladar {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 DocType: Account,Balance must be,El balance debe ser
 DocType: Hub Settings,Publish Pricing,Publicar precios
@@ -796,10 +796,10 @@ DocType: Notification Control,Expense Claim Rejected Message,Mensaje de reembols
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Clavado
 ,Available Qty,Cantidad Disponible
 DocType: Purchase Taxes and Charges,On Previous Row Total,Sobre la línea anterior al total
-DocType: Salary Slip,Working Days,Días de Trabajo
+DocType: Salary Slip,Working Days,Días de trabajo
 DocType: Serial No,Incoming Rate,Tasa entrante
 DocType: Packing Slip,Gross Weight,Peso bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,El nombre de la compañía para la que va a configurar el sistema.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,El nombre de la compañía para configurar el sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir vacaciones con el numero total de días laborables
 DocType: Job Applicant,Hold,Mantener
 DocType: Employee,Date of Joining,Fecha de ingreso
@@ -807,17 +807,17 @@ DocType: Naming Series,Update Series,Definir secuencia
 DocType: Supplier Quotation,Is Subcontracted,Es sub-contratado
 DocType: Item Attribute,Item Attribute Values,Valor de los atributos del producto
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Ver Suscriptores
-DocType: Purchase Invoice Item,Purchase Receipt,Recibo de Compra
+DocType: Purchase Invoice Item,Purchase Receipt,Recibo de compra
 ,Received Items To Be Billed,Recepciones por facturar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Chorro abrasivo
-sites/assets/js/desk.min.js +3938,Ms,Sra.
+DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Configuración principal para el cambio de divisas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Por favor, seleccione primero el tipo de documento"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar visitas {0} antes de cancelar la visita de mantenimiento
-DocType: Salary Slip,Leave Encashment Amount,Monto de Vacaciones Descansadas
+DocType: Salary Slip,Leave Encashment Amount,Importe de ausencias / vacaciones pagadas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Número de serie {0} no pertenece al producto {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Solicitada
 DocType: Bank Reconciliation,Total Amount,Importe total
@@ -832,29 +832,31 @@ DocType: Purchase Receipt,Range,Rango
 DocType: Supplier,Default Payable Accounts,Cuentas por pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
 DocType: Features Setup,Item Barcode,Código de barras del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
-DocType: Address,Shop,Tienda
-DocType: Hub Settings,Sync Now,Sincronizar ahora
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Línea {0}: La entrada de crédito no puede vincularse con {1}
+DocType: Address,Shop,Tienda.
+DocType: Hub Settings,Sync Now,Sincronizar ahora.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Línea {0}: La entrada de crédito no puede vincularse con {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,La cuenta de Banco / Efectivo por defecto se actualizará automáticamente en la factura del POS cuando seleccione este 'modelo'
 DocType: Employee,Permanent Address Is,La dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,Se completo la operación para la cantidad de productos terminados?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La marca
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es un producto para compra
 DocType: Journal Entry Account,Purchase Invoice,Factura de compra
 DocType: Stock Ledger Entry,Voucher Detail No,Detalle de Comprobante No
 DocType: Stock Entry,Total Outgoing Value,Valor total de salidas
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Fecha y Fecha de Cierre de apertura debe ser dentro del mismo año fiscal
 DocType: Lead,Request for Information,Solicitud de información
 DocType: Payment Tool,Paid,Pagado
 DocType: Salary Slip,Total in words,Total en palabras
 DocType: Material Request Item,Lead Time Date,Hora de la Iniciativa
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,es obligatorio. Tal vez no se crea registro de cambio de divisa para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Línea #{0}: Por favor, especifique el número de serie para el producto {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'"
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Envíos realizados a los clientes
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Envíos realizados a los clientes
 DocType: Purchase Invoice Item,Purchase Order Item,Producto de la orden de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingresos indirectos
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establecer el importe de pago = pago pendiente
@@ -862,13 +864,14 @@ DocType: Contact Us Settings,Address Line 1,Dirección línea 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variación
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nombre de compañía
 DocType: SMS Center,Total Message(s),Total Mensage(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Ver una lista de todos los vídeos de ayuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar la lista de precios en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad máxima
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 DocType: Process Payroll,Select Payroll Year and Month,"Seleccione la nómina, año y mes"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Ir al grupo apropiado, usualmente (Aplicación de Fondos> Activo Circulante> Cuentas Bancarias) y crear una nueva cuenta haciendo clic en Añadir hijo del tipo ""Banco"""
 DocType: Workstation,Electricity Cost,Costos de energía electrica
@@ -883,10 +886,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blan
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunte su Fotografía 
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Crear
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Crear
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
 DocType: Workflow State,Stop,Detener
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error. Una razón probable es que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Mi carrito
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
 DocType: Lead,Next Contact Date,Siguiente fecha de contacto
@@ -899,7 +902,7 @@ DocType: Leave Application,Leave Application,Solicitud de ausencia
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Herramienta de asignación de vacaciones
 DocType: Leave Block List,Leave Block List Dates,Fechas de Lista de Bloqueo de Vacaciones
 DocType: Company,If Monthly Budget Exceeded (for expense account),Si Presupuesto Mensual excedido (por cuenta de gastos)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Guarnición
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Recortar
 DocType: Workstation,Net Hour Rate,Tasa neta por hora
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo sobre costos de destino estimados
 DocType: Company,Default Terms,Términos / Condiciones predeterminados
@@ -907,7 +910,7 @@ DocType: Packing Slip Item,Packing Slip Item,Lista de embalaje del producto
 DocType: POS Profile,Cash/Bank Account,Cuenta de caja / banco
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
 DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Tabla de atributos es obligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabla de atributos es obligatorio
 DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Presentación
@@ -918,12 +921,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Se actualizara
 DocType: Project,Internal,Interno
 DocType: Task,Urgent,Urgente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la línea {0} en la tabla {1}"
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Vaya al escritorio y comenzar a usar ERPNext
 DocType: Item,Manufacturer,Fabricante
 DocType: Landed Cost Item,Purchase Receipt Item,Recibo de compra del producto
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,El almacén reservado en el Pedido de Ventas/Almacén de Productos terminados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Cantidad de Venta
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Cantidad de venta
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Gestión de tiempos
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Usted es el supervisor de gastos para este registro. Por favor, actualice el estado y guarde"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Usted es el supervisor de gastos para este registro. Por favor, actualice el estado y guarde"
 DocType: Serial No,Creation Document No,Creación del documento No
 DocType: Issue,Issue,Asunto
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
@@ -933,13 +937,14 @@ DocType: BOM Operation,Operation,Operación
 DocType: Lead,Organization Name,Nombre de la organización
 DocType: Tax Rule,Shipping State,Estado de envío
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,GASTOS DE VENTA
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Gastos de venta
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de costos por defecto
 DocType: Sales Partner,Implementation Partner,Socio de implementación
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Ventas Solicitar {0} es {1}
 DocType: Opportunity,Contact Info,Información de contacto
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Crear asientos de stock
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Crear asientos de stock
 DocType: Packing Slip,Net Weight UOM,Unidad de medida de peso neto
 DocType: Item,Default Supplier,Proveedor predeterminado
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Porcentaje permitido de sobre-producción
@@ -947,8 +952,8 @@ DocType: Shipping Rule Condition,Shipping Rule Condition,Regla de envío
 DocType: Features Setup,Miscelleneous,Varios
 DocType: Holiday List,Get Weekly Off Dates,Obtener cierre de semana
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,la fecha final no puede ser inferior a fecha de Inicio
-DocType: Sales Person,Select company name first.,Seleccionar nombre de la empresa en primer lugar.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Deb
+DocType: Sales Person,Select company name first.,Seleccione primero el nombre de la empresa.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Deb
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Para {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,actualizada a través de la gestión de tiempos
@@ -976,7 +981,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Los números de registro de la compañía para su referencia. Números fiscales, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Reglas de envio para el carrito de compras
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tiene que ser menor que en nuestra gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Seleccione la gestión de tiempos y valide para crear una nueva factura de ventas.
@@ -985,7 +990,7 @@ DocType: Salary Slip,Deductions,Deducciones
 DocType: Purchase Invoice,Start date of current invoice's period,Fecha inicial del período de facturación
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Este lote de gestión de tiempos ha sido facturado.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Crear oportunidad
-DocType: Salary Slip,Leave Without Pay,Licencia sin goce de salario (LSS)
+DocType: Salary Slip,Leave Without Pay,Permiso / licencia sin goce de salario (LSS)
 DocType: Supplier,Communications,Comunicaciones
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Error en la planificación de capacidad
 ,Trial Balance for Party,Balance de terceros
@@ -993,7 +998,7 @@ DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganancias
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para el tipo de producción
 apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Apertura de saldos contables
-DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
+DocType: Sales Invoice Advance,Sales Invoice Advance,Factura de ventas anticipada
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada que solicitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gerencia
@@ -1018,71 +1023,74 @@ apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de datos de pr
 DocType: Account,Balance Sheet,Hoja de balance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch forming
-DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,El vendedor recibirá un aviso con esta fecha para ponerse en contacto con el cliente
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,El vendedor recibirá un aviso en esta fecha para ponerse en contacto con el cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
-apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuestos y otras deducciones salariales.
+apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuestos y otras deducciones salariales
 DocType: Lead,Lead,Iniciativa
 DocType: Email Digest,Payables,Cuentas por pagar
 DocType: Account,Warehouse,Almacén
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Línea # {0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
-,Purchase Order Items To Be Billed,Ordenes de compra por facturar
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Línea # {0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
+,Purchase Order Items To Be Billed,Ordenes de compra por pagar
 DocType: Purchase Invoice Item,Net Rate,Precio neto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de compra del producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Elemento 1
 DocType: Holiday,Holiday,Vacaciones
-DocType: Event,Saturday,Sábado
+DocType: Event,Saturday,Sábado.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las sucursales
 ,Daily Time Log Summary,Resumen de registros diarios
 DocType: DocField,Label,Etiqueta
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos no conciliados
-DocType: Global Defaults,Current Fiscal Year,Año Fiscal actual
+DocType: Global Defaults,Current Fiscal Year,Año fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,Las entradas no pueden estar vacías
-apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar línea {0} con igual {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,Las entradas no pueden estar vacías
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Línea {0} duplicada con igual {1}
 ,Trial Balance,Balanza de comprobación
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Configuración de empleados
-sites/assets/js/erpnext.min.js +5,"Grid ""","Matriz """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuración de empleados
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Matriz """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Por favor, seleccione primero el prefijo"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Investigación
 DocType: Maintenance Visit Purpose,Work Done,Trabajo Realizado
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Por favor, especifique al menos un atributo en la tabla"
 DocType: Contact,User ID,ID de usuario
-DocType: Communication,Sent,Enviado
+DocType: Communication,Sent,Enviado.
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Mostrar libro mayor
 DocType: File,Lft,Izquierda-
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 DocType: Communication,Delivery Status,Estado del envío
 DocType: Production Order,Manufacture against Sales Order,Manufacturar para pedido de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resto del mundo
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El producto {0} no puede contener lotes
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago bruto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,DIVIDENDOS PAGADOS
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Contabilidad principal
 DocType: Stock Reconciliation,Difference Amount,Diferencia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,UTILIDADES RETENIDAS
 DocType: BOM Item,Item Description,Descripción del producto
 DocType: Payment Tool,Payment Mode,Método de pago
 DocType: Purchase Invoice,Is Recurring,Es recurrente
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,De metal sinterizado por láser directo
-DocType: Purchase Order,Supplied Items,Artículos suministrados
+DocType: Purchase Order,Supplied Items,Productos suministrados
 DocType: Production Order,Qty To Manufacture,Cantidad para producción
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantener los mismos precios durante el ciclo de compras
 DocType: Opportunity Item,Opportunity Item,Oportunidad Artículo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,APERTURA TEMPORAL
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura temporal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balance de ausencias de empleado
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
 DocType: Address,Address Type,Tipo de dirección
 DocType: Purchase Receipt,Rejected Warehouse,Almacén rechazado
 DocType: GL Entry,Against Voucher,Contra comprobante
 DocType: Item,Default Buying Cost Center,Centro de costos (compra) por defecto
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Para obtener lo mejor de ERPNext, le recomendamos que se tome un tiempo y ver estos vídeos de ayuda."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,El producto {0} debe ser un producto para la venta
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,a
 DocType: Item,Lead Time in days,Plazo de ejecución en días
 ,Accounts Payable Summary,Balance de cuentas por pagar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtener facturas pendientes de pago
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de venta {0} no es válida
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
@@ -1095,43 +1103,43 @@ apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} c
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Ordenar automáticamente 
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Conseguido
-DocType: Employee,Place of Issue,Lugar de emisión
+DocType: Employee,Place of Issue,Lugar de emisión.
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato
 DocType: Report,Disabled,Deshabilitado
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos indirectos
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Línea {0}: La cantidad es obligatoria
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Los productos o servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
-DocType: Journal Entry Account,Purchase Order,Órden de compra
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
+DocType: Journal Entry Account,Purchase Order,Órden de compra (OC)
 DocType: Warehouse,Warehouse Contact Info,Información de contacto del almacén
-sites/assets/js/form.min.js +190,Name is required,El nombre es necesario
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,El nombre es necesario
 DocType: Purchase Invoice,Recurring Type,Tipo de recurrencia
 DocType: Address,City/Town,Ciudad / Provincia
 DocType: Email Digest,Annual Income,Ingresos anuales
 DocType: Serial No,Serial No Details,Detalles del numero de serie
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Nota de Entrega {0} no está validada
-apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado
+apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,BIENES DE CAPITAL
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
-DocType: Hub Settings,Seller Website,Sitio Web Vendedor 
+DocType: Hub Settings,Seller Website,Sitio Web del vendedor
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},El estado de la orden de producción es {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 DocType: Sales Invoice Item,Edit Description,Editar descripción
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio planeada.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Por proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Al configurar el tipo de cuenta facilitará la seleccion de la misma en las transacciones
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Divisa por defecto)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sólo puede haber una Condición de Regla de Envió  con valor 0 o valor en blanco para ""To Value"""
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Sólo puede existir una 'regla de envió' con valor 0 o valor en blanco en 'para el valor'
 DocType: Authorization Rule,Transaction,Transacción
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden crear asientos contables en los grupos.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Herramientas
+apps/frappe/frappe/config/desk.py +7,Tools,Herramientas
 DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,El número de la orden de producción es obligatoria para la entrada de productos fabricados en el stock
 DocType: Purchase Invoice,Total (Company Currency),Total (Divisa por defecto)
@@ -1141,14 +1149,14 @@ DocType: Workstation,Workstation Name,Nombre de la Estación de Trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
 DocType: Sales Partner,Target Distribution,Distribución del objetivo
-sites/assets/js/desk.min.js +7652,Comments,Comentarios
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentarios
 DocType: Salary Slip,Bank Account No.,Número de cuenta bancaria
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este es el número de la última transacción creada con este prefijo
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Tasa de Valoración requerido para el punto {0}
 DocType: Quality Inspection Reading,Reading 8,Lectura 8
 DocType: Sales Partner,Agent,Agente
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total de {0} para todos los elementos es cero, puede que usted debe cambiar 'Distribuir los cargos basados ​​en'"
-DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impuestos y Cargos
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","El total de {0} productos es cero, usted debe cambiar la opción 'Distribuir cargos basados en'"
+DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de impuestos y cargos
 DocType: BOM Operation,Workstation,Puesto de Trabajo
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
@@ -1156,15 +1164,15 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Vacaciones
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de factura de proveedor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Necesita habilitar el carito de compras
-sites/assets/js/form.min.js +212,No Data,No hay datos
-DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo Plantilla de Evaluación
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No hay datos
+DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo de la plantilla de evaluación
 DocType: Salary Slip,Earning,Ingresos
 DocType: Payment Tool,Party Account Currency,Divisa de la cuenta de tercero/s
 ,BOM Browser,Explorar listas de materiales (LdM)
 DocType: Purchase Taxes and Charges,Add or Deduct,Agregar o deducir
 DocType: Company,If Yearly Budget Exceeded (for expense account),Si el presupuesto anual excedido (por cuenta de gastos)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones traslapadas entre:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,El asiento contable {0} ya se encuentra ajustado contra el importe de otro comprobante
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,El asiento contable {0} ya se encuentra ajustado contra el importe de otro comprobante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total del Pedido
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
@@ -1172,11 +1180,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,No. de visitas
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Boletín de noticias para contactos y clientes potenciales.
-apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},La suma de puntos para todas las metas debe ser 100. y es {0}
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Divisa de la cuenta de clausura debe ser {0}
+apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},La suma de puntos para los objetivos debe ser 100. y es {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
 ,Delivered Items To Be Billed,Envios por facturar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Estado actualizado a {0}
 DocType: DocField,Description,Descripción
 DocType: Authorization Rule,Average Discount,Descuento Promedio
 DocType: Letter Head,Is Default,Es por defecto
@@ -1204,7 +1212,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Total impuestos de producto
 DocType: Item,Maintain Stock,Mantener stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Máximo: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de fecha y hora
 DocType: Email Digest,For Company,Para la empresa
@@ -1212,9 +1220,9 @@ apps/erpnext/erpnext/config/support.py +38,Communication log.,Registro de comuni
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Importe de compra
 DocType: Sales Invoice,Shipping Address Name,Nombre de dirección de envío
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan de cuentas
-DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
+DocType: Material Request,Terms and Conditions Content,Contenido de los 'términos y condiciones'
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,Sin programación
 DocType: Employee,Owned,Propiedad
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licencia sin goce de salario
@@ -1227,12 +1235,11 @@ DocType: Warranty Claim,Warranty / AMC Status,Garantía / AMC Estado
 DocType: GL Entry,GL Entry,Entrada GL
 DocType: HR Settings,Employee Settings,Configuración de empleado
 ,Batch-Wise Balance History,Historial de saldo por lotes
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Tareas por hacer
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tareas por hacer
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,No se permiten cantidades negativas
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
-Used for Taxes and Charges","Tabla de detalle de Impuesto descargada de maestro de artículos como una cadena y almacenada en este campo.
- Se utiliza para las tasas y cargos"
+Used for Taxes and Charges","la tabla de detalle de impuestos se obtiene del producto principal como una cadena y es guardado en este campo, este es usado para los impuestos y cargos."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelado, las entradas estarán permitidas a los usuarios restringidos."
@@ -1240,8 +1247,8 @@ DocType: Email Digest,Bank Balance,Saldo bancario
 apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},El asiento contable para {0}: {1} sólo puede hacerse con la divisa: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc"
 DocType: Journal Entry Account,Account Balance,Balance de la cuenta
-apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regla fiscal para las transacciones.
-DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
+apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regla de impuestos para las transacciones.
+DocType: Rename Tool,Type of document to rename.,Indique el tipo de documento que desea cambiar de nombre.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Compramos este artículo
 DocType: Address,Billing,Facturación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
@@ -1249,9 +1256,9 @@ DocType: Bulk Email,Not Sent,No enviado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Formación explosiva
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total impuestos y cargos (Divisa por defecto)
 DocType: Shipping Rule,Shipping Account,Cuenta de envíos
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar a {0} destinatarios
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar a {0} destinatarios.
 DocType: Quality Inspection,Readings,Lecturas
-DocType: Stock Entry,Total Additional Costs,Total de Gastos adicionales
+DocType: Stock Entry,Total Additional Costs,Total de costos adicionales
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub-Ensamblajes
 DocType: Shipping Rule Condition,To Value,Para el valor
 DocType: Supplier,Stock Manager,Gerente de almacén
@@ -1260,23 +1267,23 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ALQUILERES DE LOCAL
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configuración de pasarela SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
-sites/assets/js/erpnext.min.js +24,No address added yet.,No se ha añadido ninguna dirección
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Línea {0}: La cantidad asignada {1} debe ser menor o igual al importe en comprobante de diario {2}
 DocType: Item,Inventory,inventario
-DocType: Features Setup,"To enable ""Point of Sale"" view",Para habilitar "Punto de Venta" vista
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
-DocType: Item,Sales Details,Detalles de Ventas
+DocType: Features Setup,"To enable ""Point of Sale"" view",Para habilitar la vista de 'Punto de Venta'
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
+DocType: Item,Sales Details,Detalles de ventas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fijación
 DocType: Opportunity,With Items,Con productos
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En cantidad
 DocType: Notification Control,Expense Claim Rejected,Reembolso de gastos rechazado
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
-",La fecha en que se generará próxima factura. Se genera en enviar.
+",Fecha en que se generará próxima factura. Es generada al validar.
 DocType: Item Attribute,Item Attribute,Atributos del producto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Gobierno
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Variantes del producto
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Gubernamental
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de costos principal
@@ -1286,21 +1293,20 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Inicio del ejercicio contable
 DocType: Employee External Work History,Total Experience,Experiencia total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE
 DocType: Material Request Item,Sales Order No,Orden de venta No.
 DocType: Item Group,Item Group Name,Nombre del grupo de productos
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferir materiales para producción
 DocType: Pricing Rule,For Price List,Por lista de precios
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Búsqueda de ejecutivos
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
-DocType: Maintenance Schedule,Schedules,Horarios
+DocType: Maintenance Schedule,Schedules,Programas
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Divisa por defecto)
-DocType: Period Closing Voucher,CoA Help,Ayuda CoA
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Error: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Error: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el plan general de contabilidad."
 DocType: Maintenance Visit,Maintenance Visit,Visita de mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Categoría de cliente> Territorio
@@ -1311,17 +1317,18 @@ DocType: Landed Cost Voucher,Landed Cost Help,Ayuda para costos de destino estim
 DocType: Event,Tuesday,Martes
 DocType: Leave Block List,Block Holidays on important days.,Bloquear vacaciones en días importantes.
 ,Accounts Receivable Summary,Balance de cuentas por cobrar
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Hojas para el tipo {0} ya asignado para Empleado {1} para el período {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, seleccione el ID y el nombre del empleado para establecer el rol."
 DocType: UOM,UOM Name,Nombre de la unidad de medida (UdM)
 DocType: Top Bar Item,Target,Objetivo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Importe de contribución
-DocType: Sales Invoice,Shipping Address,Dirección de envío
+DocType: Sales Invoice,Shipping Address,Dirección de envío.
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta herramienta le ayuda a actualizar o corregir la cantidad y la valoración de los valores en el sistema. Normalmente se utiliza para sincronizar los valores del sistema y lo que realmente existe en sus almacenes.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En palabras serán visibles una vez que se guarda la nota de entrega.
 apps/erpnext/erpnext/config/stock.py +120,Brand master.,Marca principal
 DocType: ToDo,Due Date,Fecha de vencimiento
 DocType: Sales Invoice Item,Brand Name,Marca
-DocType: Purchase Receipt,Transporter Details,Detalles Transporter
+DocType: Purchase Receipt,Transporter Details,Detalles de transporte
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caja
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organización
 DocType: Monthly Distribution,Monthly Distribution,Distribución mensual
@@ -1331,19 +1338,19 @@ DocType: Sales Partner,Sales Partner Target,Metas de socio de ventas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},El asiento contable para {0} sólo puede hacerse con la divisa: {1}
 DocType: Pricing Rule,Pricing Rule,Regla de precios
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Muescas
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Requisición de materiales hacia órden de compra
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Requisición de materiales hacia órden de compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Línea # {0}: El artículo devuelto {1} no existe en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,BANCOS
 ,Bank Reconciliation Statement,Estados de conciliación bancarios
 DocType: Address,Lead Name,Nombre de la iniciativa
 ,POS,Punto de venta POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Saldo inicial de Stock
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Saldo inicial de Stock
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} debe aparecer sólo una vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No se permite transferir más {0} de {1} para la órden de compra {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hay productos para empacar
 DocType: Shipping Rule Condition,From Value,Desde Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Monto no reflejado en banco
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Peticiones para gastos de compañía
@@ -1351,24 +1358,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifug
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Acabado asistido por campo magnético
 DocType: Company,Default Holiday List,Lista de vacaciones / festividades predeterminadas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Inventarios por pagar
-DocType: Purchase Receipt,Supplier Warehouse,Almacén Proveedor
+DocType: Purchase Receipt,Supplier Warehouse,Almacén del proveedor
 DocType: Opportunity,Contact Mobile No,No. móvil de contacto
-DocType: Production Planning Tool,Select Sales Orders,Selección de órdenes de venta
-,Material Requests for which Supplier Quotations are not created,La requisición de materiales para la cotizacion/es de proveedor/es no ha sido creada
+DocType: Production Planning Tool,Select Sales Orders,Seleccione órdenes de ventas
+,Material Requests for which Supplier Quotations are not created,Requisición de materiales sin documento de cotización
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar como Entregado
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crear una cotización
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
-DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,Procure planear las operaciones con XX días de antelación.
+DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños.
 DocType: SMS Center,Receiver List,Lista de receptores
 DocType: Payment Tool Detail,Payment Amount,Importe pagado
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Monto consumido
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Ver
-DocType: Salary Structure Deduction,Salary Structure Deduction,Estructura Salarial Deducción
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Ver
+DocType: Salary Structure Deduction,Salary Structure Deduction,Deducciones de la estructura salarial
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterización selectiva por láser
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,¡Importación Exitosa!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La cantidad no debe ser más de {0}
@@ -1377,8 +1385,8 @@ DocType: Quotation Item,Quotation Item,Cotización del producto
 DocType: Account,Account Name,Nombre de la Cuenta
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,"Número de serie {0}, la cantidad {1} no puede ser una fracción"
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Configuración de las categorías de proveedores.
-DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Categorías principales de proveedores.
+DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor.
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Agregar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} está cancelado o detenido
@@ -1387,9 +1395,9 @@ DocType: Delivery Note,Vehicle Dispatch Date,Fecha de despacho de vehículo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,El recibo de compra {0} no esta validado
 DocType: Company,Default Payable Account,Cuenta por pagar por defecto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para las compras online, normas de envío, lista de precios, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuración completa
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuración completa.
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturado
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Cant. Reservada
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta asignada
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos humanos
 DocType: Lead,Upper Income,Ingresos superior
@@ -1416,12 +1424,12 @@ DocType: Quotation,Term Details,Detalles de términos y condiciones
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de capacidad para (Días)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias.
 DocType: Warranty Claim,Warranty Claim,Reclamación de garantía
-,Lead Details,Detalle de Iniciativa
-DocType: Authorization Rule,Approving User,Aprobar Usuario
+,Lead Details,Detalle de Iniciativas
+DocType: Authorization Rule,Approving User,Usuario que permite aprobar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjando
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Enchapado
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
-DocType: Pricing Rule,Applicable For,Aplicable para
+DocType: Pricing Rule,Applicable For,Aplicable para.
 DocType: Bank Reconciliation,From Date,Desde la fecha
 DocType: Shipping Rule Country,Shipping Rule Country,Regla de envio del país
 DocType: Maintenance Visit,Partially Completed,Parcialmente completado
@@ -1432,14 +1440,15 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilitar carrito de compras
 DocType: Employee,Permanent Address,Dirección permanente
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,El producto {0} debe ser un servicio
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",El anticipo pagado para {0} {1} no puede ser mayor que el total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Por favor, seleccione el código del producto"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducir deducción por licencia sin goce de salario (LSS)
 DocType: Territory,Territory Manager,Gerente de Territorio
+DocType: Delivery Note Item,To Warehouse (Optional),Para almacenes (Opcional)
 DocType: Sales Invoice,Paid Amount (Company Currency),Monto pagado (Divisa por defecto)
 DocType: Purchase Invoice,Additional Discount,Descuento adicional
-DocType: Selling Settings,Selling Settings,Configuración de Ventas 
+DocType: Selling Settings,Selling Settings,Configuración de ventas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Subastas en línea
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compañía, mes y año fiscal son obligatorios"
@@ -1459,7 +1468,7 @@ DocType: Item,Weightage,Coeficiente de ponderación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minería
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Por favor, seleccione primero {0}."
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Por favor, seleccione primero {0}."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0}
 DocType: Territory,Parent Territory,Territorio principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
@@ -1476,7 +1485,7 @@ DocType: Payment Tool,Find Invoices to Match,Facturas a conciliar
 ,Item-wise Sales Register,Detalle de ventas
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","por ejemplo ""Banco Nacional XYZ"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este impuesto en el precio base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Total del objetivo
+apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Total meta / objetivo
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Carrito de compras habilitado
 DocType: Job Applicant,Applicant for a Job,Solicitante de Empleo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,No existen órdenes de producción (OP)
@@ -1487,20 +1496,20 @@ DocType: Sales Invoice Item,Batch No,Lote No.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Permitir varias órdenes de venta, para las ordenes de compra de los clientes"
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
 DocType: DocPerm,Delete,Eliminar
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
-sites/assets/js/desk.min.js +7971,New {0},Nuevo/a: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nuevo/a: {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Una orden detenida no puede ser cancelada, debe continuarla antes de cancelar."
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
 DocType: Employee,Leave Encashed?,Vacaciones pagadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'oportunidad desde' es obligatorio
 DocType: Item,Variants,Variantes
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Crear órden de Compra
-DocType: SMS Center,Send To,Enviar a
+DocType: SMS Center,Send To,Enviar a.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
 DocType: Sales Team,Contribution to Net Total,Contribución neta total
 DocType: Sales Invoice Item,Customer's Item Code,Código del producto para clientes
-DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de Inventario
+DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de inventarios
 DocType: Territory,Territory Name,Nombre Territorio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Solicitante de empleo .
@@ -1509,14 +1518,14 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,País
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Direcciones
 DocType: Communication,Received,Recibido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,El asiento contable {0} no tiene ninguna entrada {1} que vincular
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,El asiento contable {0} no tiene ninguna entrada {1} que vincular
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar No. de serie para el producto {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condición para una regla de envío
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,A este producto no se le permite tener orden de producción.
 DocType: DocField,Attach Image,Adjuntar Imagen
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete . ( calculados automáticamente como la suma del peso neto del material)
+DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete. (calculado automáticamente por la suma del peso neto de los materiales)
 DocType: Stock Reconciliation Item,Leave blank if no change,Dejar en blanco si no hay cambio
-DocType: Sales Order,To Deliver and Bill,Para Entregar y Bill
+DocType: Sales Order,To Deliver and Bill,Para entregar y facturar
 DocType: GL Entry,Credit Amount in Account Currency,Importe acreditado con la divisa
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Gestión de tiempos para la producción.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar nivel de reabastecimiento para el almacen
@@ -1526,11 +1535,10 @@ apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Gestión de tiem
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Pago
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo actual
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Máxima requisición de materiales {0} es posible para el producto {1} en las órdenes de venta {2}
-DocType: Employee,Salutation,Saludo
+DocType: Employee,Salutation,Saludo.
 DocType: Communication,Rejected,Rechazado
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Entregado
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
 DocType: Sales Order Item,Actual Qty,Cantidad Real
 DocType: Sales Invoice Item,References,Referencias
@@ -1544,7 +1552,7 @@ apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,
 DocType: SMS Center,Create Receiver List,Crear lista de receptores
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Al paquete No.
-DocType: DocType,System,Sistema
+DocType: DocType,System,Sistema.
 DocType: Warranty Claim,Issue Date,Fecha de emisión
 DocType: Activity Cost,Activity Cost,Costo de Actividad
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad consumida
@@ -1562,21 +1570,20 @@ DocType: Serial No,Delivery Document No,Documento de entrega No.
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener elementos desde los 'recibos de compra'
 DocType: Serial No,Creation Date,Fecha de creación
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},El producto {0} aparece varias veces en el Listado de Precios {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Ventas debe ser seleccionado, si se selecciona Aplicable Para como {0}"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","'Ventas' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Producto de la cotización del proveedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Crear estructura salarial
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Esquilar
 DocType: Item,Has Variants,Posee variantes
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Clic en el botón ""Crear factura de venta"" para crearla."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Las fechas 'Desde Periodo y Hasta Periodo' son obligatorias para porcentajes recurrentes
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Empacado y etiquetado
 DocType: Monthly Distribution,Name of the Monthly Distribution,Defina el nombre de la distribución mensual
 DocType: Sales Person,Parent Sales Person,Persona encargada de ventas
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifíque la divisa por defecto en la compañía principal y los valores predeterminados globales"
 DocType: Dropbox Backup,Dropbox Access Secret,Acceso Secreto a Dropbox
 DocType: Purchase Invoice,Recurring Invoice,Factura recurrente
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Gestión de proyectos
-DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gestión de proyectos
+DocType: Supplier,Supplier of Goods or Services.,Proveedor de servicios y/o productos.
 DocType: Budget Detail,Fiscal Year,Año fiscal
 DocType: Cost Center,Budget,Presupuesto
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Presupuesto no se puede asignar en contra {0}, ya que no es una cuenta de ingresos o gastos"
@@ -1603,19 +1610,19 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Ventas
 DocType: Employee,Salary Information,Información salarial.
 DocType: Sales Person,Name and Employee ID,Nombre y ID de empleado
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,IMPUESTOS Y ARANCELES
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
-DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,la tabla del producto que se mosatrara en el sitio Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Cant. Suministrada
 DocType: Material Request Item,Material Request Item,Requisición de materiales del producto
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árbol de las categorías de producto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una línea mayor o igual al numero de línea actual.
 ,Item-wise Purchase History,Historial de Compras
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rojo
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
 DocType: Account,Frozen,Congelado(a)
 ,Open Production Orders,Ordenes de producción abiertas
 DocType: Installation Note,Installation Time,Tiempo de instalación
@@ -1632,7 +1639,7 @@ DocType: Item Group,Show In Website,Mostrar en el sitio Web
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo
 DocType: Task,Expected Time (in hours),Tiempo previsto (en horas)
 ,Qty to Order,Cantidad a solicitar
-DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Para realizar el seguimiento de marca en el siguiente documentación Nota de entrega, Oportunidad, solicitud de materiales, de artículos, de órdenes de compra, compra vale, Recibo Comprador, la cita, la factura de venta, producto Bundle, órdenes de venta, de serie"
+DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Para realizar el seguimiento de la 'marca' en los documentos: nota de entrega, oportunidad, solicitud de materiales, productos, de órdenes de compra, recibo de compra, comprobante de compra, cotización, factura de venta, paquete de productos, órdenes de venta y número de serie."
 apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Diagrama Gantt de todas las tareas.
 DocType: Appraisal,For Employee Name,Por nombre de empleado
 DocType: Holiday List,Clear Table,Borrar tabla
@@ -1640,7 +1647,7 @@ DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Factura No.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Desde órden de compra
 DocType: Activity Cost,Costing Rate,Costo calculado
-,Customer Addresses And Contacts,Las direcciones de clientes y contactos
+,Customer Addresses And Contacts,Direcciones de clientes y contactos
 DocType: Employee,Resignation Letter Date,Fecha de carta de renuncia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No especificado
@@ -1659,19 +1666,19 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Tendencias de cotizaciones
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
 DocType: Shipping Rule Condition,Shipping Amount,Monto de envío
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unión
-DocType: Authorization Rule,Above Value,Valor Superior
+DocType: Authorization Rule,Above Value,Valor máximo
 ,Pending Amount,Monto pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Enviado
+DocType: Purchase Order,Delivered,Enviado
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuración del servidor de correo entrante corporativo. (por ejemplo jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Número de vehículos
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,La fecha en que se detiene la factura recurrente
+DocType: Purchase Invoice,The date on which recurring invoice will be stop,Fecha en que la factura recurrente es detenida
 DocType: Journal Entry,Accounts Receivable,Cuentas por cobrar
-,Supplier-Wise Sales Analytics,Análisis de Ventas (Proveedores)
-DocType: Address Template,This format is used if country specific format is not found,Este formato se utiliza si no se encuentra un formato específico del país
+,Supplier-Wise Sales Analytics,Análisis de ventas (Proveedores)
+DocType: Address Template,This format is used if country specific format is not found,Este formato será utilizado para todos los documentos si no se encuentra un formato específico para el país.
 DocType: Custom Field,Custom,Personalizar
 DocType: Production Order,Use Multi-Level BOM,Utilizar Lista de Materiales (LdM)  Multi-Nivel
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Inyección de plásticos
@@ -1680,12 +1687,12 @@ apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árbol de
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados ​​en
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo
-DocType: HR Settings,HR Settings,Configuración de recursos humanos
-apps/frappe/frappe/config/setup.py +130,Printing,Imprimiendo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos estará pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado.
+DocType: HR Settings,HR Settings,Configuración de recursos humanos (RRHH)
+apps/frappe/frappe/config/setup.py +130,Printing,Impresión
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos estará pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado.
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,El día (s) sobre el cual está solicitando la licencia son vacaciones. Usted no tiene que solicitar la licencia .
-sites/assets/js/desk.min.js +7805,and,y
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Los día(s) para los cuales usted esta aplicando la ausencia son días festivos, usted no necesita realizar una solicitud de permiso/vacaciones/ausencias."
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,y
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Deportes
@@ -1700,13 +1707,13 @@ DocType: POS Profile,Price List,Lista de precios
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} es ahora el año fiscal predeterminado. Por favor, actualice su navegador para que el cambio surta efecto."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
-DocType: Authorization Rule,Approving Role,Rol de aprobaciones
+DocType: Authorization Rule,Approving Role,Rol que permite aprobaciones
 ,BOM Search,Buscar listas de materiales (LdM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Cierre (Apertura + Totales)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
 DocType: Workstation,Wages per hour,Salarios por hora
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Balance de Inventario en Lote {0} se convertirá en negativa {1} para la partida {2} en Almacén {3}
-apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Ocultar las características como No. de series, POS, etc"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},El balance de Inventario en el lote {0} se convertirá en negativo {1} para el producto {2} en el almacén {3}
+apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Ocultar las características como numeros de serie, POS, etc"
 apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. la divisa debe ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la línea {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},"La fecha de liquidación no puede ser inferior a la fecha de verificación, línea {0}"
@@ -1722,7 +1729,6 @@ DocType: Opportunity,Quotation,Cotización
 DocType: Salary Slip,Total Deduction,Deducción Total
 DocType: Quotation,Maintenance User,Mantenimiento por usuario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Costo actualizado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Esta seguro que desea CONTINUAR
 DocType: Employee,Date of Birth,Fecha de nacimiento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,El producto {0} ya ha sido devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran aquí.
@@ -1738,13 +1744,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión. "
 DocType: Expense Claim,Approver,Supervisor
 ,SO Qty,Cant. OV
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén de {0}, por lo tanto, no se puede volver a asignar o modificar Almacén"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén {0}, por lo tanto, no se puede re-asignar o modificar el almacén"
 DocType: Appraisal,Calculate Total Score,Calcular puntaje total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de producción
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Envíos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldeo por inmersión
+DocType: Purchase Order,To be delivered to customer,Para ser entregado al cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,La gestión de tiempos debe estar validada
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,El número de serie {0} no pertenece a ningún almacén
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuración
@@ -1754,7 +1761,7 @@ DocType: Pricing Rule,Supplier,Proveedor
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,GASTOS VARIOS
 DocType: Global Defaults,Default Company,Compañía predeterminada
-apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de Gastos o Diferencia es obligatorio para el elemento {0} , ya que impacta el valor del stock"
+apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Una cuenta de gastos o de diiferencia es obligatoria para el producto: {0} , ya que impacta el valor del stock"
 apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la línea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock"
 DocType: Employee,Bank Name,Nombre del banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Mas
@@ -1769,11 +1776,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Desde moneda
 DocType: DocField,Name,Nombre
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Monto no reflejado en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Divisa por defecto)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Otros
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Establecer como detenido
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Si no encuentra un artículo a juego. Por favor seleccione otro valor para {0}.
 DocType: POS Profile,Taxes and Charges,Impuestos y cargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producto o un servicio que se compra, se vende o se mantiene en stock."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe de línea anterior' o ' Total de línea anterior' para la primera linea
@@ -1782,19 +1789,20 @@ DocType: Web Form,Select DocType,Seleccione un 'DocType'
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nuevo centro de costos
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nuevo centro de costos
 DocType: Bin,Ordered Quantity,Cantidad ordenada
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
 DocType: Quality Inspection,In Process,En proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de producto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} para orden de venta (OV) {1}
+DocType: Purchase Order Item,Reference Document Type,Referencia Tipo de documento
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} para orden de venta (OV) {1}
 DocType: Account,Fixed Asset,Activo Fijo
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Inventario Serializado
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventario Serializado
 DocType: Activity Type,Default Billing Rate,Monto de facturación predeterminada
-DocType: Time Log Batch,Total Billing Amount,Monto total de facturación
+DocType: Time Log Batch,Total Billing Amount,Importe total de facturación
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Cuenta por cobrar
-,Stock Balance,Balance de Inventarios
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Órdenes de venta a pagar
+,Stock Balance,Balance de Inventarios.
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Órdenes de venta a pagar
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Gestión de tiempos creados:
 DocType: Item,Weight UOM,Unidad de medida (UdM)
@@ -1825,15 +1833,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Techn
 DocType: Offer Letter,Offer Letter,Carta de oferta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generar requisición de materiales (MRP) y órdenes de producción.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Monto total facturado
-DocType: Time Log,To Time,Para Tiempo
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Para agregar registros secundarios , explorar el árbol y haga clic en el registro en el que desea agregar más registros."
+DocType: Time Log,To Time,Hasta hora
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Para agregar sub-grupos, examine el árbol y haga clic en el registro donde desea agregar los sub-registros"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,La cuenta de crédito debe pertenecer al grupo de cuentas por pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
 DocType: Production Order Operation,Completed Qty,Cantidad completada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,La lista de precios {0} está deshabilitada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,La lista de precios {0} está deshabilitada
 DocType: Manufacturing Settings,Allow Overtime,Permitir horas extraordinarias
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Orden de venta {0} esta detenida
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Números de serie necesarios para el producto {1}. Usted ha proporcionado {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual
 DocType: Item,Customer Item Codes,Código del producto asignado por el cliente
@@ -1841,10 +1848,10 @@ DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entradas de pago para las órdenes o facturas.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Se requiere nueva unidad de medida (UdM) para el inventario
-DocType: Quality Inspection,Sample Size,Tamaño de la muestra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Todos los artículos que ya se han facturado
+DocType: Quality Inspection,Sample Size,Tamaño de muestra
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos los artículos que ya se han facturado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique un numero de caso válido"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Project,External,Externo
 DocType: Features Setup,Item Serial Nos,Nº de serie de los productos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y permisos
@@ -1861,7 +1868,7 @@ DocType: Sales Order,Not Delivered,No entregado
 ,Bank Clearance Summary,Liquidez bancaria
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Código del producto> Grupos> Marca
-DocType: Appraisal Goal,Appraisal Goal,Evaluación Meta
+DocType: Appraisal Goal,Appraisal Goal,Meta de evaluación
 DocType: Event,Friday,Viernes
 DocType: Time Log,Costing Amount,Costo acumulado
 DocType: Process Payroll,Submit Salary Slip,Validar nómina salarial
@@ -1869,9 +1876,9 @@ DocType: Salary Structure,Monthly Earning & Deduction,Ingresos mensuales y deduc
 apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el producto {0} es {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importación en masa
 DocType: Sales Partner,Address & Contacts,Dirección y Contactos
-DocType: SMS Log,Sender Name,Nombre del Remitente
+DocType: SMS Log,Sender Name,Nombre del remitente
 DocType: Page,Title,Nombre
-sites/assets/js/list.min.js +104,Customize,Personalización 
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalización 
 DocType: POS Profile,[Select],[Seleccionar]
 DocType: SMS Log,Sent To,Enviado a
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Crear factura de venta
@@ -1896,21 +1903,22 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Final de vida útil
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viajes
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
+DocType: Purchase Order,Customer Mobile No,Cliente Móvil No
 DocType: Sales Invoice,Recurring,Recurrente
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguimiento de Ingresos y Gastos por separado para las verticales de productos o divisiones.
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualización de Costos
 DocType: Item Reorder,Item Reorder,Reabastecer producto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transferencia de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar las operaciones, el costo de operativo y definir un numero único de operación"
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
-DocType: Naming Series,User must always select,Usuario elegirá siempre
+DocType: Naming Series,User must always select,El usuario deberá elegir siempre
 DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
 DocType: Installation Note,Installation Note,Nota de instalación
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Agregar impuestos
 ,Financial Analytics,Análisis financiero
 DocType: Quality Inspection,Verified By,Verificado por
-DocType: Address,Subsidiary,Filial
+DocType: Address,Subsidiary,Subsidiaria
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la divisa/moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas antes de cambiarla"
 DocType: Quality Inspection,Purchase Receipt No,Recibo de compra No.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,GANANCIAS PERCIBIDAS
@@ -1924,7 +1932,7 @@ DocType: Appraisal,Employee,Empleado
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar correo electrónico de:
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Invitar como usuario
 DocType: Features Setup,After Sale Installations,Instalaciones post venta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} está totalmente facturado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Workstation Working Hour,End Time,Hora de finalización
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Contrato estándar de términos y condiciones para ventas y compras.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupar por recibo
@@ -1933,8 +1941,9 @@ DocType: Sales Invoice,Mass Mailing,Correo masivo
 DocType: Page,Standard,Estándar
 DocType: Rename Tool,File to Rename,Archivo a renombrar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Se requiere el numero de orden para el producto {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagos
+apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},La solicitud de la lista de materiales (LdM) especificada: {0} no existe para el producto {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamaño
 DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
@@ -1953,8 +1962,8 @@ DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuración del servidor de correo entrante corporativo de ventas. (por ejemplo sales@example.com )
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Tool,Payment Account,Cuenta de pagos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
-sites/assets/js/list.min.js +23,Draft,Borrador
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Borrador
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,Accepted,Aceptado
 DocType: User,Female,Femenino
@@ -1967,15 +1976,16 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Etiqueta de regla de envío
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Existen transacciones de stock para este producto, \ usted no puede cambiar los valores de 'Tiene No. de serie', 'Tiene No. de lote', 'Es un producto en stock' y 'Método de valoración'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Asiento Rápida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
 DocType: Stock Entry,For Quantity,Por cantidad
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} no esta presentado
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Listado de solicitudes de productos
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Para la producción por separado se crea para cada buen artículo terminado.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} no esta presentado
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Listado de solicitudes de productos.
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Se crearan ordenes de producción separadas para cada producto terminado.
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Configuración completa
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",El asiento contable actualmente se encuentra congelado; nadie puede modificar este registro excepto el rol que se especifica a continuación.
@@ -1986,21 +1996,21 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Lista de distribu
 DocType: Delivery Note,Transporter Name,Nombre del Transportista
 DocType: Contact,Enter department to which this Contact belongs,Introduzca departamento al que pertenece este contacto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Ausente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la línea {0} no coincide con la requisición de materiales
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la línea {0} no coincide con la requisición de materiales
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unidad de Medida (UdM)
 DocType: Fiscal Year,Year End Date,Año de finalización
-DocType: Task Depends On,Task Depends On,Tarea Depende de
+DocType: Task Depends On,Task Depends On,Tarea depende de
 DocType: Lead,Opportunity,Oportunidad
-DocType: Salary Structure Earning,Salary Structure Earning,Estructura Salarial Ingreso
+DocType: Salary Structure Earning,Salary Structure Earning,Ingresos de la estructura salarial
 ,Completed Production Orders,Órdenes de producción (OP) completadas
 DocType: Operation,Default Workstation,Estación de Trabajo por defecto
 DocType: Notification Control,Expense Claim Approved Message,Mensaje de reembolso de gastos
 DocType: Email Digest,How frequently?,¿Con qué frecuencia?
 DocType: Purchase Receipt,Get Current Stock,Verificar inventario actual
-apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Árbol de la lista de materiales
+apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Árbol de lista de materiales
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},La fecha de inicio del mantenimiento no puede ser anterior de la fecha de entrega para {0}
 DocType: Production Order,Actual End Date,Fecha Real de Finalización
-DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol )
+DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol)
 DocType: Stock Entry,Purpose,Propósito
 DocType: Item,Will also apply for variants unless overrridden,También se aplicará para las variantes menos que se sobre escriba
 DocType: Purchase Invoice,Advances,Anticipos
@@ -2011,8 +2021,8 @@ DocType: Campaign,Campaign-.####,Campaña-.####
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perforación
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La fecha de finalización de contrato debe ser mayor que la fecha de ingreso
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedores / comisionistas / afiliados / distribuidores que venden productos de empresas a cambio de una comisión.
-DocType: Customer Group,Has Child Node,Posee sub-nodo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
+DocType: Customer Group,Has Child Node,Posee Sub-grupo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en el año fiscal activo. Para más detalles verifique {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
@@ -2063,11 +2073,9 @@ DocType: Note,Note,Nota
 DocType: Purchase Receipt Item,Recd Quantity,Cantidad recibida
 DocType: Email Account,Email Ids,IDs de Correo Electrónico
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Establecer como reanudado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de banco / efectivo
 DocType: Tax Rule,Billing City,Ciudad de facturación
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Esta solicitud de ausencia estará pendiente de aprobación. Sólo el supervisor de ausencias puede actualizar el estado.
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","Los métodos de pago normalmente utilizados por ejemplo: banco, efectivo, tarjeta de crédito, etc."
 DocType: Journal Entry,Credit Note,Nota de crédito
@@ -2088,16 +2096,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
 DocType: Installation Note Item,Installed Qty,Cantidad instalada
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Validado
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Validado
 DocType: Salary Structure,Total Earning,Ganancia Total
-DocType: Purchase Receipt,Time at which materials were received,Momento en que se recibieron los materiales
+DocType: Purchase Receipt,Time at which materials were received,Hora en que se recibieron los materiales
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mis direcciones
 DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Sucursal principal de la organización.
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ó
 DocType: Sales Order,Billing Status,Estado de facturación
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,SERVICIOS PUBLICOS
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Mayor
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Mayor
 DocType: Buying Settings,Default Buying Price List,Lista de precios por defecto
 ,Download Backups,Descargar Backups
 DocType: Notification Control,Sales Order Message,Mensaje de la orden de venta
@@ -2106,11 +2114,11 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Seleccione los empleados
 DocType: Bank Reconciliation,To Date,Hasta la fecha
 DocType: Opportunity,Potential Sales Deal,Potenciales acuerdos de venta
-sites/assets/js/form.min.js +308,Details,Detalles
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalles
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impuestos y Cargos
 DocType: Employee,Emergency Contact,Contacto de emergencia
 DocType: Item,Quality Parameters,Parámetros de calidad
-DocType: Target Detail,Target  Amount,Monto de objtetivo
+DocType: Target Detail,Target  Amount,Importe previsto
 DocType: Shopping Cart Settings,Shopping Cart Settings,Ajustes de carrito de compras
 DocType: Journal Entry,Accounting Entries,Asientos contables
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Entrada duplicada. Por favor consulte la regla de autorización {0}
@@ -2118,10 +2126,10 @@ apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS
 DocType: Purchase Order,Ref SQ,Ref. SQ
 apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Reemplazar elemento / Solicitud de Materiales en todas las Solicitudes de Materiales
 DocType: Purchase Order Item,Received Qty,Cantidad recibida
-DocType: Stock Entry Detail,Serial No / Batch,N º de serie / lote
+DocType: Stock Entry Detail,Serial No / Batch,No. de serie / lote
 DocType: Product Bundle,Parent Item,Producto padre / principal
 DocType: Account,Account Type,Tipo de cuenta
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'"
 ,To Produce,Producir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificación del paquete para la entrega (para impresión)
@@ -2132,7 +2140,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplastamiento
 DocType: Account,Income Account,Cuenta de ingresos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Moldura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Entregar
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte 'tasa de materiales en base de' en la sección de costos
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
@@ -2161,17 +2169,17 @@ DocType: Item Supplier,Item Supplier,Proveedor del producto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todas las direcciones.
-DocType: Company,Stock Settings,Ajustes de Inventarios
+DocType: Company,Stock Settings,Configuración de inventarios
 DocType: User,Bio,Biografía
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía "
-apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nombre del nuevo centro de costos
-DocType: Leave Control Panel,Leave Control Panel,Salir del panel de control
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía "
+apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nombre del nuevo centro de costos
+DocType: Leave Control Panel,Leave Control Panel,Panel de control de ausencias
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,No se encontró plantilla de dirección por defecto. Favor cree una nueva desde Configuración> Prensa y Branding> Plantilla de Dirección.
 DocType: Appraisal,HR User,Usuario de recursos humanos
-DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y Gastos Deducidos
-apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Problemas
-apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estado debe ser uno de {0}
+DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y cargos deducidos
+apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Incidencias
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},El estado debe ser uno de {0}
 DocType: Sales Invoice,Debit To,Debitar a
 DocType: Delivery Note,Required only for sample item.,Solicitado únicamente para muestra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad actual después de transacción
@@ -2182,26 +2190,26 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Larg
 DocType: Bank Reconciliation Detail,Cheque Number,Número de cheque
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Prensado
 DocType: Payment Tool Detail,Payment Tool Detail,Detalle de herramienta de pago
-,Sales Browser,Navegador de Ventas
+,Sales Browser,Explorar ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: existe otra {0} # {1} para la entrada de inventario {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: existe otra {0} # {1} para la entrada de inventario {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),INVERSIONES Y PRESTAMOS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,DEUDORES VARIOS
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ningún empleado encontrado!
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
+DocType: Purchase Order,Customer Address Display,Dirección del cliente Pantalla
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de valoración
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Pulido
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Numerado
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unidad de medida por defecto para el producto {0} no se puede cambiar directamente, porque ya se ha realizado alguna transacción(es) con otra UdM. Para cambiar la UdM por defecto, utilice la herramienta bajo el modulo de inventario"
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el tipo de cambio para convertir una moneda a otra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,La cotización {0} esta cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,La cotización {0} esta cancelada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Monto total pendiente
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,El empleado {0} estaba ausente el {1}. No se puede marcar la asistencia.
 DocType: Sales Partner,Targets,Objetivos
@@ -2213,15 +2221,15 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create C
 DocType: Price List,Applicable for Countries,Aplicable para los Países
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,EQUIPO DE COMPUTO
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Esmerilado Electro-químico
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz y no se puede editar.
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz (principal) y no se puede editar.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de comenzar los registros de contabilidad"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar la regla precios
-sites/assets/js/list.min.js +24,Cancelled,Cancelado
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Cancelado
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La fecha de la estructura salarial no puede ser menor que la fecha de contratación del empleado.
 DocType: Employee Education,Graduate,Graduado
 DocType: Leave Block List,Block Days,Bloquear días
 DocType: Journal Entry,Excise Entry,Registro de impuestos especiales
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advertencia: orden de venta {0} ya existe para la orden de compra {1} del cliente
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advertencia: orden de venta {0} ya existe para la orden de compra {1} del cliente
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2259,7 +2267,7 @@ DocType: Bin,FCFS Rate,Cambio FCFS
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturación (Facturas de venta)
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Monto pendiente
 DocType: Project Task,Working,Trabajando
-DocType: Stock Ledger Entry,Stock Queue (FIFO),Cola de Inventario (FIFO)
+DocType: Stock Ledger Entry,Stock Queue (FIFO),Cola de inventario (FIFO)
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Por favor seleccione la gestión de tiempos
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} no pertenece a la compañía {1}
 DocType: Account,Round Off,REDONDEOS
@@ -2277,18 +2285,18 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
 DocType: Account,Stock Received But Not Billed,Inventario entrante no facturado
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Pago bruto + Montos atrazados + Vacaciones - Total deducciones
 DocType: Monthly Distribution,Distribution Name,Nombre de la distribución
-DocType: Features Setup,Sales and Purchase,Ventas y Compras
-DocType: Purchase Order Item,Material Request No,Requisición de materiales Nº
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
+DocType: Features Setup,Sales and Purchase,Compras y ventas
+DocType: Supplier Quotation Item,Material Request No,Requisición de materiales Nº
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa por la cual la divisa es convertida como moneda base de la compañía
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Divisa por defecto)
-apps/frappe/frappe/templates/base.html +132,Added,Agregado
+apps/frappe/frappe/templates/base.html +134,Added,Agregado
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administración de territorios
 DocType: Journal Entry Account,Sales Invoice,Factura de venta
 DocType: Journal Entry Account,Party Balance,Saldo de tercero/s
 DocType: Sales Invoice Item,Time Log Batch,Lote de gestión de tiempos
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
 DocType: Company,Default Receivable Account,Cuenta por cobrar por defecto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear asiento de banco para el sueldo total pagado según los siguientes criterios
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de material para producción
@@ -2298,8 +2306,8 @@ apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0}
 DocType: Bank Reconciliation,Get Relevant Entries,Obtener registros relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Asiento contable de inventario
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Acuñando
-DocType: Sales Invoice,Sales Team1,Team1 Ventas
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,El elemento {0} no existe
+DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
@@ -2314,13 +2322,15 @@ DocType: Quality Inspection,Quality Inspection,Inspección de calidad
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray forming
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,La cuenta {0} se encuentra congelada
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,La cuenta {0} se encuentra congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Sólo se puede hacer el pago contra facturados {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivel de inventario mínimo
-DocType: Stock Entry,Subcontract,Subcontrato
+DocType: Stock Entry,Subcontract,Sub-contrato
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Por favor, introduzca {0} primero"
 DocType: Production Planning Tool,Get Items From Sales Orders,Obtener elementos desde las 'ordenes de compa'
 DocType: Production Order Operation,Actual End Time,Hora actual de finalización
 DocType: Production Planning Tool,Download Materials Required,Descargar materiales necesarios
@@ -2331,15 +2341,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,S
 DocType: SMS Log,No of Sent SMS,No. de SMS enviados
 DocType: Account,Company,Compañía
 DocType: Account,Expense Account,Cuenta de costos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software.
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Color
-DocType: Maintenance Visit,Scheduled,Programado
+DocType: Maintenance Visit,Scheduled,Programado.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, seleccione el ítem donde "Es de la Elemento" es "No" y "¿Es de artículos de venta" es "Sí", y no hay otro paquete de producto"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Seleccione la distribución mensual, para asignarla desigualmente en varios meses"
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,El elemento en la fila {0}: Recibo Compra {1} no existe en la tabla de 'Recibos de Compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del proyecto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Hasta
 DocType: Rename Tool,Rename Log,Cambiar el nombre de sesión
@@ -2366,28 +2376,27 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las sub-cuentas son permitidas en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de gastos
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra del producto suministrado
-sites/assets/js/erpnext.min.js +48,Pay,Pagar
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Fecha y Hora
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para fecha y hora
 DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Molienda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retractilado
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Actividades pendientes
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Actividades pendientes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveedor> Tipo de Proveedor
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveedor> Tipo de proveedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Monto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Sólo las solicitudes de ausencia con estado ""Aprobado"" puede ser validadas"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,La dirección principal es obligatoria
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Introduzca el nombre de la campaña, si la solicitud viene desde esta."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de periódicos
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fundición
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Usted es el supervisor de ausencias para este registro. Por favor actualice el 'Estado' y guarde
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de reabastecimiento
 DocType: Attendance,Attendance Date,Fecha de Asistencia
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de salario basado en los ingresos y deducciones
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Una cuenta que tiene sub-grupos no puede convertirse en libro mayor
 DocType: Address,Preferred Shipping Address,Dirección de envío preferida
 DocType: Purchase Receipt Item,Accepted Warehouse,Almacén Aceptado
 DocType: Bank Reconciliation Detail,Posting Date,Fecha de contabilización
@@ -2418,9 +2427,10 @@ DocType: Sales Order,% of materials billed against this Sales Order,% de materia
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Asiento de cierre de período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,El centro de costos con transacciones existentes no se puede convertir a 'grupo'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,DEPRECIACIONES
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor (s)
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor(es)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Período inválido
 DocType: Customer,Credit Limit,Límite de crédito
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccione el tipo de transacción
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccione el tipo de transacción.
 DocType: GL Entry,Voucher No,Comprobante No.
 DocType: Leave Allocation,Leave Allocation,Asignación de vacaciones
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Requisición de materiales {0} creada
@@ -2428,8 +2438,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Confi
 DocType: Customer,Address and Contact,Dirección y contacto
 DocType: Customer,Last Day of the Next Month,Último día del siguiente mes
 DocType: Employee,Feedback,Comentarios.
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Horario de mantenimiento
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Horario de mantenimiento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Chorreo abrasivo por maquina
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
 DocType: Website Settings,Website Settings,Configuración del Sitio Web
@@ -2437,17 +2447,17 @@ DocType: Item,Reorder level based on Warehouse,Nivel de reabastecimiento basado
 DocType: Activity Cost,Billing Rate,Monto de facturación
 ,Qty to Deliver,Cantidad a entregar
 DocType: Monthly Distribution Percentage,Month,Mes
-,Stock Analytics,Análisis de existencias
+,Stock Analytics,Análisis de existencias.
 DocType: Installation Note Item,Against Document Detail No,Contra documento No.
 DocType: Quality Inspection,Outgoing,Saliente
 DocType: Material Request,Requested For,Solicitado para
 DocType: Quotation Item,Against Doctype,Contra 'DocType'
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,La cuenta root no se puede borrar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,La cuenta root no se puede borrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar entradas de stock
 ,Is Primary Address,Es Dirección Primaria
 DocType: Production Order,Work-in-Progress Warehouse,Almacén de Trabajos en Proceso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referencia # {0} de fecha {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar direcciones
 DocType: Pricing Rule,Item Code,Código del producto
 DocType: Production Planning Tool,Create Production Orders,Crear órdenes de producción
@@ -2456,25 +2466,25 @@ DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de mercado
 DocType: Communication,Phone,Teléfono
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de trabajo del empleado
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Cierre (Deb)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Cierre (Deb)
 DocType: Contact,Passive,Pasivo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de serie {0} no se encuentra en stock
-apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta
 DocType: Sales Invoice,Write Off Outstanding Amount,Balance de pagos pendientes
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Marque si necesita facturas recurrentes automáticas. Después del envío de cualquier factura de venta, la sección ""Recurrente"" será visible."
 DocType: Account,Accounts Manager,Gerente de Cuentas
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',La gestión de tiempos {0} debe estar validada
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',La gestión de tiempos {0} debe estar validada
 DocType: Stock Settings,Default Stock UOM,Unidad de Medida (UdM) predeterminada para Inventario
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Costos basados en tipo de actividad (por hora)
 DocType: Production Planning Tool,Create Material Requests,Crear requisición de materiales
-DocType: Employee Education,School/University,Escuela / Universidad
+DocType: Employee Education,School/University,Escuela / Universidad.
 DocType: Sales Invoice Item,Available Qty at Warehouse,Cantidad Disponible en Almacén
 ,Billed Amount,Importe facturado
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Agregar algunos registros de muestra
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Gestión de ausencias
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestión de ausencias
 DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupar por cuenta
 DocType: Sales Order,Fully Delivered,Entregado completamente
@@ -2483,14 +2493,13 @@ DocType: Period Closing Voucher,"The account head under Liability, in which Prof
 DocType: Payment Tool,Against Vouchers,Contra comprobantes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ayuda Rápida
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},"Almacenes de origen y destino no pueden ser los mismos, línea {0}"
-DocType: Features Setup,Sales Extras,Extras Ventas
+DocType: Features Setup,Sales Extras,Ventas extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} en el centro de costos {2} es mayor por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Trasladar ausencias
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
-,Stock Projected Qty,Cantidad de Inventario Proyectada
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
+,Stock Projected Qty,Cantidad de inventario proyectado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordenes de compra de clientes
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cantidad
@@ -2503,28 +2512,27 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,La cuenta de crédito debe pertenecer a las cuentas de balance
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los proveedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,El código del producto es obligatorio porque no es enumerado automáticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},la cotización {0} no es del tipo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,El código del producto es obligatorio porque no es enumerado automáticamente
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},la cotización {0} no es del tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,CUENTA DE SOBRE-GIROS
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Crear nómina salarial
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Continuar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Explorar la lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Prestamos en garantía
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,APERTURA DE CAPITAL
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"No se puede permitir la ausencia, ya que no está autorizado para aprobar sobre fechas bloqueadas"
-DocType: Appraisal,Appraisal,Evaluación
+DocType: Appraisal,Appraisal,Evaluación.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Fundición a la espuma perdida
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dibujar
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Repetir fecha
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
-DocType: Hub Settings,Seller Email,Correo Electrónico del Vendedor
-DocType: Project,Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
+DocType: Hub Settings,Seller Email,Correo electrónico de vendedor
+DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo total de compra (vía facturas de compra)
 DocType: Workstation Working Hour,Start Time,Hora de inicio
 DocType: Item Price,Bulk Import Help,Ayuda de importación en masa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Seleccione Cantidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Seleccione cantidad
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol que aprueba no puede ser igual que el rol al que se aplica la regla
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Darse de baja de este boletín por correo electrónico
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Mensaje enviado
@@ -2533,8 +2541,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (Divisa por defecto)
 DocType: BOM Operation,Hour Rate,Salario por hora
 DocType: Stock Settings,Item Naming By,Ordenar productos por
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Desde cotización
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Desde cotización
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para la producción
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,La cuenta {0} no existe
 DocType: Purchase Receipt Item,Purchase Order Item No,Numero de producto de la orden de compra
@@ -2547,11 +2555,11 @@ DocType: Item,Inspection Required,Inspección requerida
 DocType: Purchase Invoice Item,PR Detail,Detalle PR
 DocType: Sales Order,Fully Billed,Totalmente facturado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,EFECTIVO EN CAJA
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Almacén de entrega requerido para el inventrio del producto {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Almacén de entrega requerido para el inventrio del producto {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con este rol pueden establecer cuentas congeladas y crear / modificar los asientos contables para las mismas
 DocType: Serial No,Is Cancelled,CANCELADO
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Mis envíos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mis envíos
 DocType: Journal Entry,Bill Date,Fecha de factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
 DocType: Supplier,Supplier Details,Detalles del proveedor
@@ -2564,7 +2572,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,TRANSFERENCIA BANCARIA
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Por favor, seleccione la cuenta bancaria"
 DocType: Newsletter,Create and Send Newsletters,Crear y enviar boletines de noticias
-sites/assets/js/report.min.js +107,From Date must be before To Date,La fecha 'Desde' tiene que ser menor de la fecha 'Hasta'
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,La fecha 'Desde' tiene que ser menor de la fecha 'Hasta'
 DocType: Sales Order,Recurring Order,Orden recurrente
 DocType: Company,Default Income Account,Cuenta de ingresos por defecto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Categoría de cliente / Cliente
@@ -2579,31 +2587,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Unidad de media utilizada en el
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
 ,Projected,Proyectado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de serie {0} no pertenece al Almacén {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
 DocType: Notification Control,Quotation Message,Mensaje de cotización
 DocType: Issue,Opening Date,Fecha de apertura
 DocType: Journal Entry,Remark,Observación
 DocType: Purchase Receipt Item,Rate and Amount,Tasa y cantidad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Aburrido
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Desde órden de venta (OV)
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Desde órden de venta (OV)
 DocType: Blog Category,Parent Website Route,Ruta de website principal
 DocType: Sales Order,Not Billed,No facturado
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a la misma compañía
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,No se han añadido contactos
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No se han añadido contactos
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,No activo
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Fecha de contabilización de factura
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Monto de costos de destino estimados
 DocType: Time Log,Batched for Billing,Lotes para facturar
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
 DocType: POS Profile,Write Off Account,Cuenta de desajuste
-sites/assets/js/erpnext.min.js +26,Discount Amount,Descuento
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Descuento
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía (en días)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por ejemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
 DocType: Shopping Cart Settings,Quotation Series,Series de cotizaciones
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formando gas de metal caliente
 DocType: Sales Order Item,Sales Order Date,Fecha de las órdenes de venta
 DocType: Sales Invoice Item,Delivered Qty,Cantidad entregada
@@ -2615,12 +2622,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser c
 DocType: Event,Monday,Lunes
 DocType: Journal Entry,Stock Entry,Entradas de inventario
 DocType: Account,Payable,Pagadero
-DocType: Salary Slip,Arrear Amount,Monto Mora
+DocType: Salary Slip,Arrear Amount,Cuantía pendiente
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes nuevos
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Beneficio Bruto%
-DocType: Appraisal Goal,Weightage (%),Coeficiente de ponderación (% )
+DocType: Appraisal Goal,Weightage (%),Porcentaje (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Fecha de liquidación
-DocType: Newsletter,Newsletter List,Listado de boletínes
+DocType: Newsletter,Newsletter List,Boletínes de noticias
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Marque si desea enviar la nómina salarial por correo a cada empleado, cuando valide la planilla de pagos"
 DocType: Lead,Address Desc,Dirección
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Al menos uno de la venta o compra debe seleccionar
@@ -2630,37 +2637,38 @@ DocType: Stock Entry Detail,Source Warehouse,Almacén de origen
 DocType: Installation Note,Installation Date,Fecha de instalación
 DocType: Employee,Confirmation Date,Fecha de confirmación
 DocType: C-Form,Total Invoiced Amount,Total Facturado
-DocType: Account,Sales User,Usuario de Ventas
+DocType: Account,Sales User,Usuario de ventas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,La cantidad mínima no puede ser mayor que la cantidad maxima
 DocType: Stock Entry,Customer or Supplier Details, Detalle de cliente o proveedor
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Establecer
 DocType: Lead,Lead Owner,Propietario de la iniciativa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Se requiere Almacén
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Se requiere Almacén
 DocType: Employee,Marital Status,Estado civil
 DocType: Stock Settings,Auto Material Request,Requisición de materiales automática
 DocType: Time Log,Will be updated when billed.,Se actualizará cuando se facture.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Cantidad de lotes disponibles en De Almacén
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,La lista de materiales (LdM) actual y la nueva no pueden ser las mismas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,La fecha de jubilación debe ser mayor que la fecha de ingreso
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregado
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución mensual porcentual
-DocType: Territory,Territory Targets,Territorios Objetivos 
+DocType: Territory,Territory Targets,Metas de territorios
 DocType: Delivery Note,Transporter Info,Información de Transportista
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Producto suministrado desde orden de compra
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Membretes para las plantillas de impresión.
-apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para plantillas de impresión, por ejemplo, Factura Proforma."
+apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para las plantillas de impresión, por ejemplo, Factura proforma."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Por favor, extraiga los productos de la nota de entrega"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, extraiga los productos de la nota de entrega"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
-apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registrar todas las comunicaciones: correo electrónico, teléfono, chat, visita, etc."
+apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registro de todas las comunicaciones: correo electrónico, teléfono, chats, visitas, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos de redondeo"
-DocType: Purchase Invoice,Terms,Términos
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Crear
+DocType: Purchase Invoice,Terms,Términos.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Crear
 DocType: Buying Settings,Purchase Order Required,Órden de compra requerida
 ,Item-wise Sales History,Detalle de las ventas
 DocType: Expense Claim,Total Sanctioned Amount,Total Sancionada
@@ -2670,39 +2678,43 @@ DocType: Expense Claim,Task,Tarea
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Viruta
 DocType: Purchase Taxes and Charges,Reference Row #,Línea de referencia #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número de lote es obligatorio para el producto {0}
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Se trata de una persona de las ventas raíz y no se puede editar .
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Este es el vendedor principal y no se puede editar.
 ,Stock Ledger,Mayor de Inventarios
 apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Calificación: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Deducciones en nómina
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notas
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Seleccione un nodo de grupo primero.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Seleccione primero un nodo de grupo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propósito debe ser uno de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Llene el formulario y guárdelo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Llene el formulario y guárdelo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descargar un informe con todas las materias primas y su inventario actual
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Frente a
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Foro Comunitario
 DocType: Leave Application,Leave Balance Before Application,Ausencias disponibles antes de la solicitud
 DocType: SMS Center,Send SMS,Enviar mensaje SMS
 DocType: Company,Default Letter Head,Encabezado predeterminado
 DocType: Time Log,Billable,Facturable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Esto se utiliza para ajustar la regla en el módulo de Recursos Humanos
+DocType: Authorization Rule,This will be used for setting rule in HR module,Esto se utiliza para ajustar la regla en el módulo de recursos humanos (RRHH)
 DocType: Account,Rate at which this tax is applied,Valor por el cual el impuesto es aplicado
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Cantidad a reabastecer
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Cantidad a reabastecer
 DocType: Company,Stock Adjustment Account,Cuenta de ajuste de existencias
 DocType: Journal Entry,Write Off,Desajuste
 DocType: Time Log,Operation ID,ID de Operación
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
+DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Si se define el ID de usuario 'Login', este sera el predeterminado para todos los documentos de recursos humanos (RRHH)"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Desde {1}
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Oportunidad perdida
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Los campos 'descuento' estarán disponibles en la orden de compra, recibo de compra y factura de compra"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nombre de la nueva cuenta. Nota: Por favor no crear cuentas de clientes y proveedores
 DocType: Report,Report Type,Tipo de reporte
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Cargando
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Cargando
 DocType: BOM Replace Tool,BOM Replace Tool,Herramienta de reemplazo de lista de materiales (LdM)
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Plantillas predeterminadas para un país en especial
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Proveedor entrega al Cliente
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mostrar impuestos ruptura
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importación y exportación de datos
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Si usted esta involucrado en la actividad de manufactura, habilite la opción 'Es manufacturado'"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fecha de la factura de envío
 DocType: Sales Invoice,Rounded Total,Total redondeado
 DocType: Product Bundle,List items that form the package.,Lista de tareas que forman el paquete .
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,El porcentaje de asignación debe ser igual al 100%
@@ -2713,17 +2725,17 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuración general del sistema.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Si el pago no se hace en con una  referencia, deberá hacer entrada al diario manualmente."
-DocType: Item,Supplier Items,Artículos del Proveedor
+DocType: Item,Supplier Items,Artículos de proveedor
 DocType: Opportunity,Opportunity Type,Tipo de oportunidad
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Nueva compañía
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},El centro de costos es requerido para la cuenta de 'perdidas y ganancias' {0}
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borrados por el creador de la Compañía
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borradas por el creador de la compañía
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Se encontró un número incorrecto de entradas del libro mayor. Es posible que haya seleccionado una cuenta equivocada en la transacción.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Para crear una Cuenta Bancaria
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
@@ -2735,12 +2747,13 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Línea {0}: La cantidad no esta disponible en el almacén {1} del {2} {3}. Cantidad disponible: {4}, Transferir Cantidad: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Elemento 3
-DocType: Event,Sunday,Domingo
+DocType: Purchase Order,Customer Contact Email,Cliente de correo electrónico de contacto
+DocType: Event,Sunday,Domingo.
 DocType: Sales Team,Contribution (%),Margen (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Plantilla
-DocType: Sales Person,Sales Person Name,Nombre del Vendedor
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
+DocType: Sales Person,Sales Person Name,Nombre de vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, introduzca al menos 1 factura en la tabla"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Agregar usuarios
 DocType: Pricing Rule,Item Group,Grupo de productos
@@ -2748,7 +2761,7 @@ DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio actual (gestión
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y cargos adicionales (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Sales Order,Partly Billed,Parcialmente facturado
 DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2756,13 +2769,12 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Monto total pendiente
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Ajustes de impresión
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotores
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Vacaciones para el tipo {0} ya asignado para Empleado {1} para el Año Fiscal {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Un producto es requerido
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldeo por inyección de metal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Desde nota de entrega
-DocType: Time Log,From Time,Desde fecha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Desde nota de entrega
+DocType: Time Log,From Time,Desde hora
 DocType: Notification Control,Custom Message,Mensaje personalizado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Inversión en la banca
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleccione su país, zona horaria y moneda"
@@ -2777,18 +2789,18 @@ DocType: Newsletter,A Lead with this email id should exist,Debe existir un corre
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Las operaciones de inventario antes de {0} se encuentran congeladas
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,'Hasta la fecha' debe ser igual a 'desde fecha' para una ausencia de medio día
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,'Hasta la fecha' debe ser igual a 'desde fecha' para una ausencia de medio día
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","por ejemplo Kg, Unidades, Metros"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,El No. de referencia es obligatoria si usted introdujo la fecha
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,El No. de referencia es obligatoria si usted introdujo la fecha
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,La fecha de ingreso debe ser mayor a la fecha de nacimiento
-DocType: Salary Structure,Salary Structure,Estructura Salarial
+DocType: Salary Structure,Salary Structure,Estructura salarial
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Existe Regla de Múltiple Precio con los mismos criterios, por favor resolver \
  conflicto mediante la asignación de prioridad. Reglas de Precio: {0}"
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Línea aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Para el almacén
 DocType: Employee,Offer Date,Fecha de oferta
 DocType: Hub Settings,Access Token,Token de acceso
@@ -2802,29 +2814,30 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territo
 DocType: Purchase Invoice,Items,Productos
 DocType: Fiscal Year,Year Name,Nombre del año
 DocType: Process Payroll,Process Payroll,Procesar nómina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
 DocType: Product Bundle Item,Product Bundle Item,Artículo del conjunto de productos
 DocType: Sales Partner,Sales Partner Name,Nombre de socio de ventas
 DocType: Purchase Invoice Item,Image View,Vista de imagen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Terminado y acabado industrial
 DocType: Issue,Opening Time,Hora de apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
+DocType: Delivery Note Item,From Warehouse,De Almacén
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,El moldeo por soplado
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y total
 DocType: Tax Rule,Shipping City,Ciudad de envió
-apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este Artículo es una Variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que 'No Copiar' esté seleccionado
+apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este producto es una variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que la opción 'No copiar' esté seleccionada
 DocType: Account,Purchase User,Usuario de compras
 DocType: Notification Control,Customize the Notification,Personalizar notificación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martilleo
-DocType: Web Page,Slideshow,Presentación
+DocType: Web Page,Slideshow,Presentación.
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La plantilla de direcciones por defecto no puede ser eliminada
 DocType: Sales Invoice,Shipping Rule,Regla de envío
 DocType: Journal Entry,Print Heading,Imprimir encabezado
 DocType: Quotation,Maintenance Manager,Gerente de mantenimiento
-DocType: Workflow State,Search,Búsqueda
+DocType: Workflow State,Search,Buscar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,Los días desde el último pedido debe ser mayor o igual a cero
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
@@ -2832,11 +2845,12 @@ DocType: C-Form,Amended From,Modificado Desde
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total impuestos después del descuento
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,"No es posible eliminar esta cuenta, ya que existe una sub-cuenta"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,"No es posible eliminar esta cuenta, ya que existe una sub-cuenta"
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Es obligatoria la meta de facturacion
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},No existe una lista de materiales por defecto para el elemento {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Por favor, seleccione Fecha de contabilización primero"
-DocType: Leave Allocation,Carry Forward,Trasladar
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No existe una lista de materiales por defecto para el elemento {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Por favor, seleccione Fecha de contabilización primero"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Fecha de apertura debe ser antes de la Fecha de Cierre
+DocType: Leave Control Panel,Carry Forward,Trasladar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,El centro de costos con transacciones existentes no se puede convertir a libro mayor
 DocType: Department,Days for which Holidays are blocked for this department.,Días en que las vacaciones / permisos se bloquearan para este departamento.
 ,Produced,Producido
@@ -2855,21 +2869,21 @@ apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Habili
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,GASTOS POSTALES
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Monto total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
-DocType: Purchase Order,The date on which recurring order will be stop,La fecha en que se detiene el pedido recurrente
+DocType: Purchase Order,The date on which recurring order will be stop,Fecha en que el pedido recurrente es detenido
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Presente
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",El producto serializado {0} no se puede actualizar / reconciliar stock
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transferencia de material a proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferir material a proveedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
 DocType: Lead,Lead Type,Tipo de iniciativa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear cotización
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Todos estos elementos ya fueron facturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condiciones de regla envío
-DocType: BOM Replace Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución
+DocType: BOM Replace Tool,The new BOM after replacement,Nueva lista de materiales después de la sustitución
 DocType: Features Setup,Point of Sale,Punto de Venta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impuesto
@@ -2914,20 +2928,20 @@ DocType: C-Form,C-Form,C - Forma
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID de Operación no definido
 DocType: Production Order,Planned Start Date,Fecha prevista de inicio
 DocType: Serial No,Creation Document Type,Creación de documento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Visita de mantenimiento
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Visita de mantenimiento
 DocType: Leave Type,Is Encash,Se convertirá en efectivo
 DocType: Purchase Invoice,Mobile No,Nº Móvil
 DocType: Payment Tool,Make Journal Entry,Crear asiento contable
 DocType: Leave Allocation,New Leaves Allocated,Nuevas vacaciones asignadas
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Los datos del proyecto no están disponibles para la cotización
 DocType: Project,Expected End Date,Fecha prevista de finalización
-DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Comercial
+DocType: Appraisal Template,Appraisal Template Title,Titulo de la plantilla de evaluación
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,El producto principal {0} no debe ser un artículo de stock
 DocType: Cost Center,Distribution Id,Id de Distribución
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes 
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos los productos o servicios.
-DocType: Purchase Invoice,Supplier Address,Dirección del proveedor
+DocType: Purchase Invoice,Supplier Address,Dirección de proveedor
 DocType: Contact Us Settings,Address Line 2,Dirección línea 2
 DocType: ToDo,Reference,Referencia
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforado
@@ -2938,14 +2952,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor del atributo {0} debe estar dentro del rango de {1} a {2} en los incrementos de {3}
 DocType: Tax Rule,Sales,Ventas
 DocType: Stock Entry Detail,Basic Amount,Importe base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cred
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+DocType: Leave Allocation,Unused leaves,Hojas no utilizadas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cred
 DocType: Customer,Default Receivable Accounts,Cuentas por cobrar predeterminadas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Región de facturación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminación
 DocType: Item Reorder,Transfer,Transferencia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,La fecha de vencimiento es obligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
@@ -2961,6 +2976,7 @@ DocType: Company,Retail,Ventas al por menor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,El cliente {0} no existe
 DocType: Attendance,Absent,Ausente
 DocType: Product Bundle,Product Bundle,Conjunto / paquete de productos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Fila {0}: Referencia no válida {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Aplastante
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantilla de impuestos (compras)
 DocType: Upload Attendance,Download Template,Descargar plantilla
@@ -2968,16 +2984,16 @@ DocType: GL Entry,Remarks,Observaciones
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima 
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
 DocType: Features Setup,POS View,Vista POS
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,El registro de la instalación para un número de serie
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,El registro de la instalación para un número de serie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Colada continua
-sites/assets/js/erpnext.min.js +10,Please specify a,"Por favor, especifique un/a"
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique un/a"
 DocType: Offer Letter,Awaiting Response,Esperando Respuesta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Arriba
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamiento en frío
 DocType: Salary Slip,Earning & Deduction,Ingresos y Deducciones
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Región
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
 DocType: Holiday List,Weekly Off,Semanal Desactivado
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Por ejemplo, 2012 , 2012-13"
@@ -2998,20 +3014,20 @@ apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subc
 DocType: Sales Team,Contact No.,Contacto No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,El tipo de cuenta 'Pérdidas y ganancias' {0} no esta permitida para el asiento de apertura
 DocType: Workflow State,Time,Tiempo
-DocType: Features Setup,Sales Discounts,Descuentos sobre Ventas
-DocType: Hub Settings,Seller Country,País del Vendedor 
+DocType: Features Setup,Sales Discounts,Descuentos sobre ventas
+DocType: Hub Settings,Seller Country,País de vendedor
 DocType: Authorization Rule,Authorization Rule,Regla de Autorización
-DocType: Sales Invoice,Terms and Conditions Details,Detalle de Términos y Condiciones 
+DocType: Sales Invoice,Terms and Conditions Details,Detalle de términos y condiciones
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de impuestos (ventas)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de orden
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que aparecerá en la parte superior de la lista de productos.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones para calcular el monto del envío
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Agregar subcuenta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Agregar elemento
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol que permite definir cuentas congeladas y editar asientos congelados
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene cuentas secundarias"
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene sub-grupos"
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Se requiere un factor de conversión
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,COMISIÓN EN VENTAS
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
 DocType: Tax Rule,Billing Country,País de facturación
@@ -3021,25 +3037,24 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Abultado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Modelo de fundición evaporativo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,GASTOS DE ENTRETENIMIENTO
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Edad
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Edad
 DocType: Time Log,Billing Amount,Monto de facturación
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,La cantidad especificada es inválida para el elemento {0}. La cantidad debe ser mayor que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Solicitudes de ausencia.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,GASTOS LEGALES
-DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El día del mes en el cual se generará la orden automática por ejemplo 05, 28, etc."
+DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El día del mes en el cual se generará la orden automática por ejemplo 05, 29, etc."
 DocType: Sales Invoice,Posting Time,Hora de contabilización
 DocType: Sales Order,% Amount Billed,% Monto facturado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,CUENTA TELEFÓNICA
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Cuenta telefonica
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccione esta opción si desea obligar al usuario a seleccionar una serie antes de guardar. No habrá ninguna por defecto si marca ésta casilla.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ningún producto con numero de serie {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Abrir notificaciones
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Abrir notificaciones
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Gastos directos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,¿Realmente desea reanudar esta requisición de materiales?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos de nuevo cliente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,GASTOS DE VIAJE
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Gastos de viaje
 DocType: Maintenance Visit,Breakdown,Desglose
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,La cuenta: {0} con la divisa: {1} no se puede seleccionar
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque
@@ -3048,7 +3063,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,A la fecha
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afilando
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
 DocType: Feed,Full Name,Nombre completo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Remachado
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1}
@@ -3071,9 +3086,9 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar las lin
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracción
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos los Contactos.
-DocType: Newsletter,Test Email Id,Prueba de Identificación del email
+DocType: Newsletter,Test Email Id,Prueba de Email
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de la compañia
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si usted sigue la inspección de calidad. Habilitará el QA del artículo y el número de QA en el recibo de compra
 DocType: GL Entry,Party Type,Tipo de entidad
@@ -3081,34 +3096,33 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be
 DocType: Item Attribute Value,Abbreviation,Abreviación
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No autorizado desde {0} excede los límites
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Moldeo rotacional
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plantilla Maestra para Salario .
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plantilla maestra de nómina salarial
 DocType: Leave Type,Max Days Leave Allowed,Máximo de días de ausencia permitidos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Establezca la regla fiscal (Impuestos) del carrito de compras
 DocType: Payment Tool,Set Matching Amounts,Coincidir pagos
-DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y Cargos Adicionales
-,Sales Funnel,"""Embudo"" de Ventas"
+DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y cargos adicionales
+,Sales Funnel,"""Embudo"" de ventas"
 apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,La abreviatura es obligatoria
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Carrito
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Gracias por su interés en suscribirse a nuestras actualizaciones
 ,Qty to Transfer,Cantidad a transferir
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotizaciones para clientes y oportunidades
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol que permite editar inventario congelado
-,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo 
+,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. posiblemente el tipo de cambio no se ha creado para {1} en {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. posiblemente el tipo de cambio no se ha creado para {1} en {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Cuenta {0}: desde cuenta padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Divisa por defecto)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} estado es 'Detenido'
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Dirección de facturación preferida
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretario
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretaria
 DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto
 DocType: Pricing Rule,Buying,Compras
 DocType: HR Settings,Employee Records to be created by,Los registros de empleados se crearán por
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este lote de gestión de tiempos ha sido cancelado.
-,Reqd By Date,Solicitado Por Fecha
+,Reqd By Date,Fecha de solicitud
 DocType: Salary Slip Earning,Salary Slip Earning,Ingresos en nómina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,ACREEDORES
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Línea # {0}: El número de serie es obligatorio
@@ -3117,13 +3131,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalle de Impuestos
 DocType: Purchase Order Item,Supplier Quotation,Cotización de proveedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,'En palabras' serán visibles una vez que guarde la cotización.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planchado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} esta detenido
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para añadir los gastos de envío.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Próximos Eventos
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Próximos Eventos
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere cliente
 DocType: Letter Head,Letter Head,Membrete
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada rápida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para su devolución
 DocType: Purchase Order,To Receive,Recibir
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Retractilar
@@ -3138,7 +3153,7 @@ DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",en minutos actualizado a través de bitácora (gestión de tiempo)
 DocType: Customer,From Lead,Desde iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Las órdenes publicadas para la producción.
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccione el año fiscal ...
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccione el año fiscal...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 DocType: Hub Settings,Name Token,Nombre de Token
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planificar
@@ -3146,33 +3161,32 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
 DocType: Serial No,Out of Warranty,Fuera de garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida (UdM) predeterminada"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida (UdM) predeterminada"
 DocType: Purchase Invoice Item,Project Name,Nombre de proyecto
 DocType: Supplier,Mention if non-standard receivable account,Indique si utiliza una cuenta por cobrar distinta a la predeterminada
 DocType: Workflow State,Edit,Editar
 DocType: Journal Entry Account,If Income or Expense,Indique si es un ingreso o egreso
 DocType: Features Setup,Item Batch Nos,Números de lote del producto
-DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Recursos Humanos
+DocType: Stock Ledger Entry,Stock Value Difference,Diferencia del valor de inventario
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pago para reconciliación de saldo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,IMPUESTOS PAGADOS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Impuestos pagados
 DocType: BOM Item,BOM No,Lista de materiales (LdM) No.
 DocType: Contact Us Settings,Pincode,Código PIN
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
 DocType: Item,Moving Average,Precio medio variable
-DocType: BOM Replace Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
+DocType: BOM Replace Tool,The BOM which will be replaced,La lista de materiales que será sustituida
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,La nueva unidad de medida (UdM) del Inventario debe ser diferente a la actual
 DocType: Account,Debit,Debe
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
 DocType: Production Order,Operation Cost,Costo de operación
-apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Subir la asistencia de un archivo .csv
+apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Subir la asistencia desde un archivo .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Saldo pendiente
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos en los grupos de productos para este vendedor
-DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Para asignar este problema, utilice el botón ""Asignar"" en la barra lateral."
+DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Para asignar este asunto / problema, utilice el botón 'Asignar' en la barra lateral."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelar stock mayores a [Days]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados ​​en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Contra factura
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,El año fiscal: {0} no existe
 DocType: Currency Exchange,To Currency,A moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar solicitudes de ausencia en días bloqueados.
@@ -3190,8 +3204,8 @@ DocType: Account,Expense,Gastos
 DocType: Sales Invoice,Exhibition,Exposición
 DocType: Item Attribute,From Range,De Gama
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,El producto {0} ha sido ignorado ya que no es un elemento de stock
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Enviar esta Orden de Producción para su posterior procesamiento .
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no aplicar la Regla de Precios en una transacción en particular, todas las Reglas de Precios aplicables deben ser desactivadas."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Enviar esta orden de producción para su posterior procesamiento.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no utilizar la regla de precios en una única transacción, todas las reglas de precios aplicables deben ser desactivadas."
 DocType: Company,Domain,Rubro
 ,Sales Order Trends,Tendencias de ordenes de ventas
 DocType: Employee,Held On,Retenida en
@@ -3201,7 +3215,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Porce
 DocType: Stock Entry Detail,Additional Cost,Costo adicional
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Fin del ejercicio contable
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Crear cotización de proveedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Crear cotización de proveedor
 DocType: Quality Inspection,Incoming,Entrante
 DocType: BOM,Materials Required (Exploded),Materiales necesarios (despiece)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por licencia sin goce de salario (LSS)
@@ -3209,24 +3223,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Línea # {0}: Número de serie {1} no coincide con {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
 DocType: Batch,Batch ID,ID de lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota: {0}
 ,Delivery Note Trends,Evolución de las notas de entrega
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumen de la semana
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser un producto para compra o sub-contratado en la línea {1}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumen de la semana.
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser 'un producto para compra' o sub-contratado en la línea {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario
 DocType: GL Entry,Party,Tercero
 DocType: Sales Order,Delivery Date,Fecha de entrega
 DocType: DocField,Currency,Divisa / Moneda
 DocType: Opportunity,Opportunity Date,Fecha de oportunidad
 DocType: Purchase Receipt,Return Against Purchase Receipt,Devolución contra recibo compra
-DocType: Purchase Order,To Bill,A Facturar
+DocType: Purchase Order,To Bill,Por facturar
 DocType: Material Request,% Ordered,% Ordenado/a
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Pieza de trabajo
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Trabajo por obra
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Precio promedio de compra
 DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
 DocType: Employee,History In Company,Historia en la Compañia
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Boletín de noticias
-DocType: Address,Shipping,Envío
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Boletín de noticias
+DocType: Address,Shipping,Envío.
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entradas en el mayor de inventarios
 DocType: Department,Leave Block List,Lista de días bloqueados
 DocType: Customer,Tax ID,ID de impuesto
@@ -3237,14 +3251,14 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Partner's Website,Sitio web de socio
 DocType: Opportunity,To Discuss,Para discusión
 DocType: SMS Settings,SMS Settings,Ajustes de SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,CUENTAS TEMPORALES
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas temporales
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,Desplegar lista de materiales (LdM) del producto
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Fecha de finalización del período de orden actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Crear una carta de oferta
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorno
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,La unidad de medida (UdM) predeterminada para la variante debe ser la misma que la plantilla
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retornar
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,La unidad de medida (UdM) predeterminada para la variante debe ser la misma que la plantilla
 DocType: DocField,Fold,Plegar
 DocType: Production Order Operation,Production Order Operation,Operación en la orden de producción
 DocType: Pricing Rule,Disable,Desactivar
@@ -3253,7 +3267,7 @@ apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Ple
 DocType: Task,Total Expense Claim (via Expense Claim),Total reembolso (Vía reembolso de gastos)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID del cliente
 DocType: Page,Page Name,Nombre de la página
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tiempo debe ser mayor que From Time
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,'hasta hora' debe ser mayor que 'desde hora'
 DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Órden de venta {0} no esta validada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: La cuenta padre {1} no pertenece a la empresa {2}
@@ -3262,21 +3276,21 @@ DocType: BOM,Last Purchase Rate,Tasa de cambio de última compra
 DocType: Account,Asset,Activo
 DocType: Project Task,Task ID,Tarea ID
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","por ejemplo ""MC"""
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes
-,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,El inventario no puede existir para el pproducto {0} ya que tiene variantes
+,Sales Person-wise Transaction Summary,Resumen de transacciones por vendedor
 DocType: System Settings,Time Zone,Zona Horaria
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Almacén {0} no existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrarse en el Hub de ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Porcentajes de distribución mensuales
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,El producto seleccionado no puede contener lotes
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiales entregados para esta nota de entrega
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Grapado
 DocType: Customer,Customer Details,Datos de cliente
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formación
-DocType: Employee,Reports to,Informes al
+DocType: Employee,Reports to,Enviar Informes a
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para el receptor no
 DocType: Sales Invoice,Paid Amount,Cantidad pagada
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Cuenta de cierre {0} debe ser de tipo 'Patrimonio'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Cuenta de cierre {0} debe ser de tipo 'Patrimonio'
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del producto
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Establecer esta plantilla de dirección por defecto ya que no existe una predeterminada
@@ -3284,7 +3298,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de calidad
 DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente
 DocType: Payment Tool Detail,Against Voucher No,Comprobante No.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de de trabajos anteriores
 DocType: Tax Rule,Purchase,Compra
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance
@@ -3307,7 +3321,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against
 DocType: Account,Stock Adjustment,Ajuste de existencias
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe una actividad de costo por defecto para la actividad del tipo - {0}
 DocType: Production Order,Planned Operating Cost,Costos operativos planeados
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nuevo {0} Nombre
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nuevo nombre de: {0} 
 apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nombre de artículo
@@ -3318,39 +3332,40 @@ The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item""
 For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
 
 Note: BOM = Bill of Materials","Grupo Global de la ** ** Los productos que en otro artículo ** **. Esto es útil si usted está empaquetando unas determinadas Artículos ** ** en un paquete y mantener un balance de los ** Los productos envasados ​​** y no el agregado ** ** Artículo. El paquete ** ** Artículo tendrá "Es el archivo de artículos" como "No" y "¿Es artículo de ventas" como "Sí". Por ejemplo: Si usted está vendiendo ordenadores portátiles y Mochilas por separado y tienen un precio especial si el cliente compra a la vez, entonces el ordenador portátil + Mochila será un nuevo paquete de productos de artículos. Nota: BOM = Lista de materiales"
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},No. de serie es obligatoria para el producto {0}
 DocType: Item Variant Attribute,Attribute,Atributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique el rango (desde / hasta)"
-sites/assets/js/desk.min.js +7652,Created By,Creado por
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creado por
 DocType: Serial No,Under AMC,Bajo AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,La tasa de valorización del producto se vuelve a calcular considerando los costos adicionales del voucher
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Ajustes por defecto para las transacciones de venta.
 DocType: BOM Replace Tool,Current BOM,Lista de materiales actual
-sites/assets/js/erpnext.min.js +8,Add Serial No,Agregar No. de serie
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Agregar No. de serie
 DocType: Production Order,Warehouses,Almacenes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,IMPRESIONES Y PAPELERÍA
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Agrupar por nota
 DocType: Payment Reconciliation,Minimum Amount,Importe mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualizar mercancía terminada
 DocType: Workstation,per hour,por hora
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Secuencia {0} ya utilizada en {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Secuencia {0} ya utilizada en {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
 DocType: Company,Distribution,Distribución
-sites/assets/js/erpnext.min.js +50,Amount Paid,Total Pagado
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Total Pagado
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de proyectos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para el producto: {0} es {1}%
 DocType: Customer,Default Taxes and Charges,Impuestos y cargos por defecto
 DocType: Account,Receivable,A cobrar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No se permite cambiar de proveedores como la Orden de Compra ya existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol autorizado para validar las transacciones que excedan los límites de crédito establecidos.
-DocType: Sales Invoice,Supplier Reference,Referencia del Proveedor
+DocType: Sales Invoice,Supplier Reference,Referencia de proveedor
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Si se selecciona, la Solicitud de Materiales para los elementos de sub-ensamble será considerado para conseguir materias primas. De lo contrario , todos los elementos de sub-ensamble serán tratados como materia prima ."
 DocType: Material Request,Material Issue,Incidencia de material
-DocType: Hub Settings,Seller Description, Descripción del Vendedor
+DocType: Hub Settings,Seller Description,Descripción del vendedor
 DocType: Employee Education,Qualification,Calificación
 DocType: Item Price,Item Price,Precio de productos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Jabón y Detergente
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Jabón y detergente
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a
 DocType: Warehouse,Warehouse Name,Nombre del Almacén
@@ -3358,9 +3373,9 @@ DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
 DocType: Journal Entry,Write Off Entry,Diferencia de desajuste
 DocType: BOM,Rate Of Materials Based On,Valor de materiales basado ​​en
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitico de Soporte
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Soporte analítico
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Defina la compañía en los almacenes {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Herramienta para cambiar Unidad de Medida
+DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Herramienta para cambiar unidad de medida (UdM)
 DocType: POS Profile,Terms and Conditions,Términos y condiciones
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede ingresar la altura, el peso, alergias, problemas médicos, etc."
@@ -3375,17 +3390,17 @@ DocType: Project Task,View Task,Vista de tareas
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,El año financiero inicia el
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Por favor, ingrese los recibos de compra"
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
-DocType: Email Digest,Add/Remove Recipients,Añadir / Quitar Destinatarios
+DocType: Email Digest,Add/Remove Recipients,Agregar / Quitar destinatarios
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0}
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este Año Fiscal como Predeterminado , haga clic en "" Establecer como Predeterminado """
-apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante para el apoyo de id de correo electrónico. (ej. support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Cantidad faltante
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este año fiscal por defecto, haga clic en 'Establecer como predeterminado'"
+apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante corporativo de soporte técnico. (ej. support@example.com )
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Cantidad faltante
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
 DocType: Salary Slip,Salary Slip,Nómina salarial
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruñido
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Hasta la fecha' es requerido
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar etiquetas de embalaje, para los paquetes que serán entregados, usados para notificar el numero, contenido y peso del paquete, "
-DocType: Sales Invoice Item,Sales Order Item,Articulo de la Solicitud de Venta
+DocType: Sales Invoice Item,Sales Order Item,Producto de la orden de venta
 DocType: Salary Slip,Payment Days,Días de pago
 DocType: BOM,Manage cost of operations,Administrar costo de las operaciones
 DocType: Features Setup,Item Advanced,Producto anticipado
@@ -3393,19 +3408,20 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Cuando alguna de las operaciones comprobadas está en "" Enviado "" , una ventana emergente automáticamente se abre para enviar un correo electrónico al ""Contacto"" asociado en esa transacción , con la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuración global
 DocType: Employee Education,Employee Education,Educación del empleado
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
 DocType: Salary Slip,Net Pay,Pago Neto
 DocType: Account,Account,Cuenta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,El número de serie {0} ya ha sido recibido
 ,Requested Items To Be Transferred,Artículos solicitados para ser transferidos
 DocType: Purchase Invoice,Recurring Id,ID recurrente
-DocType: Customer,Sales Team Details,Detalles del equipo de ventas
+DocType: Customer,Sales Team Details,Detalles del equipo de ventas.
 DocType: Expense Claim,Total Claimed Amount,Total reembolso
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades de venta
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades de venta.
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por enfermedad
 DocType: Email Digest,Email Digest,Boletín por correo electrónico
 DocType: Delivery Note,Billing Address Name,Nombre de la dirección de facturación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Tiendas por departamento
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Balance del Sistema
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Balance del sistema
 DocType: Workflow,Is Active,Está activo
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Guarde el documento primero.
@@ -3425,8 +3441,8 @@ DocType: BOM,Manufacturing User,Usuario de producción
 DocType: Purchase Order,Raw Materials Supplied,Materias primas suministradas
 DocType: Purchase Invoice,Recurring Print Format,Formato de impresión recurrente
 DocType: Communication,Series,Secuencia
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser menor que la fecha de la orden de compra
-DocType: Appraisal,Appraisal Template,Plantilla de Evaluación
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser menor que la fecha de la orden de compra
+DocType: Appraisal,Appraisal Template,Plantilla de evaluación
 DocType: Communication,Email,Correo electrónico (Email)
 DocType: Item Group,Item Classification,Clasificación de producto
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de desarrollo de negocios
@@ -3438,7 +3454,7 @@ DocType: Item Attribute Value,Attribute Value,Valor del Atributo
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","El Email debe ser único,  {0} ya existe"
 ,Itemwise Recommended Reorder Level,Nivel recomendado de reabastecimiento de producto
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Por favor, seleccione primero {0}"
-DocType: Features Setup,To get Item Group in details table,Para obtener Grupo de Artículo en la tabla detalles
+DocType: Features Setup,To get Item Group in details table,"Para obtener el grupo del producto, en detalles de tabla"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redibujar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Grabado
@@ -3468,7 +3484,7 @@ DocType: Address Template,"
    Default Template
    
   "
 DocType: Salary Slip Deduction,Default Amount,Importe por defecto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Almacén no se encuentra en el sistema
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Resumen de este Mes
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Resumen de este mes
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lecturas de inspección de calidad
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días .
 DocType: Tax Rule,Purchase Tax Template,Plantilla de Impuestos sobre compras
@@ -3481,6 +3497,7 @@ DocType: HR Settings,Payroll Settings,Configuración de nómina
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Realizar pedido
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,la tabla raíz no puede tener un centro de costes padre / principal
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Seleccione una marca ...
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
 DocType: Supplier,Address and Contacts,Dirección y contactos
@@ -3491,7 +3508,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Obtener comprobantes pendientes de pago
 DocType: Warranty Claim,Resolved By,Resuelto por
 DocType: Appraisal,Start Date,Fecha de inicio
-sites/assets/js/desk.min.js +7629,Value,Valor
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Asignar las ausencias para un período.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Haga clic aquí para verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como padre / principal.
@@ -3507,38 +3524,38 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Acceso a Dropbox permitido
 DocType: Dropbox Backup,Weekly,Semanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg . smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Recibir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Recibir
 DocType: Maintenance Visit,Fully Completed,Terminado completamente
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completado
 DocType: Employee,Educational Qualification,Formación académica
 DocType: Workstation,Operating Costs,Costos operativos
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de ausencias de empleados
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestro boletín de noticias
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque la cotización ha sido hecha."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanizado por haz de electrones
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,Informes Generales
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Saldo de Apertura de Libro Mayor de Inventarios han sido actualizados
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,las entradas en el diario de existencias han sido actualizadas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual
 DocType: Purchase Receipt Item,Prevdoc DocType,DocType Previo
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Añadir / Editar Precios
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Centros de costos
 ,Requested Items To Be Ordered,Requisiciones pendientes para ser ordenadas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Mis pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mis pedidos
 DocType: Price List,Price List Name,Nombre de la lista de precios
 DocType: Time Log,For Manufacturing,Para producción
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totales
 DocType: BOM,Manufacturing,Manufactura
 ,Ordered Items To Be Delivered,Ordenes pendientes de entrega
 DocType: Account,Income,Ingresos
-,Setup Wizard,Asistente de configuración
+,Setup Wizard,Asistente de configuración.
 DocType: Industry Type,Industry Type,Tipo de industria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo salió mal!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las fechas bloqueadas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,La factura {0} ya ha sido validada
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de  finalización
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Divisa por defecto)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundición a presión
@@ -3548,25 +3565,24 @@ apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter
 DocType: Budget Detail,Budget Detail,Detalle del presupuesto
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, ingrese el mensaje antes de enviarlo"
 DocType: Async Task,Status,Estado
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Unidad de Medida Actualizado para el punto {0}
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Unidad de medida (UdM) actualizada para el producto {0}
 DocType: Company History,Year,Año
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Perfiles de punto de venta POS
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Por favor, actualizar la configuración SMS"
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,La gestión de tiempos {0} ya se encuentra facturada
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,La gestión de tiempos {0} ya se encuentra facturada
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,PRESTAMOS SIN GARANTÍA
 DocType: Cost Center,Cost Center Name,Nombre del centro de costos
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,El elemento {0} con No. de serie {1} ya está instalado
-DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista
+DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Monto total pagado
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes con más de 160 caracteres se dividirá en varios envios
 DocType: Purchase Receipt Item,Received and Accepted,Recibidos y aceptados
 ,Serial No Service Contract Expiry,Número de serie de expiracion del contrato de servicios
 DocType: Item,Unit of Measure Conversion,Conversión unidad de medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,El empleado no se puede cambiar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
 DocType: Naming Series,Help HTML,Ayuda 'HTML'
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Sus proveedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
@@ -3575,12 +3591,13 @@ DocType: Purchase Invoice,Contact,Contacto
 DocType: Features Setup,Exports,Exportaciones
 DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Posee No. de serie
-DocType: Employee,Date of Issue,Fecha de emisión
+DocType: Employee,Date of Issue,Fecha de emisión.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunto de Proveedores para el elemento {1}
 DocType: Issue,Content Type,Tipo de contenido
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado'
 DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
@@ -3591,14 +3608,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Para Almacén
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1}
 ,Average Commission Rate,Tasa de comisión promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de regla de precios
 DocType: Purchase Taxes and Charges,Account Head,Cuenta matriz
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualización de los costes adicionales para el cálculo del precio al desembarque de artículos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
-DocType: Stock Entry,Total Value Difference (Out - In),Diferencia  (Salidas - Entradas)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
+DocType: Stock Entry,Total Value Difference (Out - In),Total diferencia  (Salidas - Entradas)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de usuario no establecido para el empleado {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Pendiente
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Desde reclamo de garantía
@@ -3612,19 +3629,21 @@ DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 DocType: User,Enabled,Habilitado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},¿Realmente desea validar toda la nómina salarial para el mes {0} y año {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},¿Realmente desea validar toda la nómina salarial para el mes {0} y año {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importar suscriptores
-DocType: Target Detail,Target Qty,Cantidad Objetivo
+DocType: Target Detail,Target Qty,Cantidad estimada
 DocType: Attendance,Present,Presente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La nota de entrega {0} no debe estar presentada
-DocType: Notification Control,Sales Invoice Message,Mensaje de la Factura
+DocType: Notification Control,Sales Invoice Message,Mensaje de factura
 DocType: Authorization Rule,Based On,Basado en
-,Ordered Qty,Cantidad ordenada
+DocType: Sales Order Item,Ordered Qty,Cantidad ordenada
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Artículo {0} está deshabilitado
 DocType: Stock Settings,Stock Frozen Upto,Inventario congelado hasta
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periodo Desde y Período Para fechas obligatorias para los recurrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Actividad del proyecto / tarea.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generar nóminas salariales
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} no es un ID de correo electrónico (Email) válido
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra debe comprobarse, si se selecciona Aplicable Para como {0}"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","'Compras' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,El descuento debe ser inferior a 100
 DocType: ToDo,Low,Bajo
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
@@ -3660,16 +3679,16 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Subir asistencia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a manufacturar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2
-DocType: Journal Entry Account,Amount,Importe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Importe
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Remachado
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada
-,Sales Analytics,Análisis de Ventas
+,Sales Analytics,Análisis de ventas
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de producción
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuración de correo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,"Por favor, ingrese la divisa por defecto en la compañía principal"
-DocType: Stock Entry Detail,Stock Entry Detail,Detalle de la Entrada de Inventario
+DocType: Stock Entry Detail,Stock Entry Detail,Detalles de entrada de inventario
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Recordatorios diarios
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflictos norma fiscal con {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflicto de impuestos con {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nombre de nueva cuenta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo materias primas suministradas
 DocType: Selling Settings,Settings for Selling Module,Ajustes para módulo de ventas
@@ -3687,7 +3706,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,La fecha prevista no puede ser menor que la fecha de requisición de materiales
 DocType: Contact Us Settings,City,Ciudad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Mecanizado por ultrasonidos
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Error: No es un ID válido?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Error: No es un ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,El producto {0} debe ser un producto para la venta
 DocType: Naming Series,Update Series Number,Actualizar número de serie
 DocType: Account,Equity,Patrimonio
@@ -3702,28 +3721,28 @@ DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Descuento de cliente
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
 DocType: Production Order,Production Order,Orden de producción
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos los Empleados (Activos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccione el período en que la factura se generará de forma automática
+DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccione el período en el cual la factura se creará automáticamente
 DocType: BOM,Raw Material Cost,Costo de materia prima
 DocType: Item,Re-Order Level,Nivel mínimo de stock.
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis.
-sites/assets/js/list.min.js +174,Gantt Chart,Diagrama Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Tiempo parcial
 DocType: Employee,Applicable Holiday List,Lista de días festivos
 DocType: Employee,Cheque,CHEQUE
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Secuencia actualizada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,El tipo de reporte es obligatorio
 DocType: Item,Serial Number Series,Secuencia del número de serie
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la línea {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la línea {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Ventas al por menor y por mayor
 DocType: Issue,First Responded On,Primera respuesta el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,El primer usuario: Usted
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La fecha de inicio y la fecha final ya están establecidos en el año fiscal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliado con éxito
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliado exitosamente
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dónde se almacenarán los productos
 DocType: Tax Rule,Validity,Validez
@@ -3732,8 +3751,8 @@ DocType: Attendance,Attendance,Asistencia
 DocType: Page,No,No
 DocType: BOM,Materials,Materiales
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no está marcada, la lista tendrá que ser añadida a cada departamento donde será aplicada."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra
 ,Item Prices,Precios de los productos
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,La cantidad en palabras será visible una vez que guarde la orden de compra.
 DocType: Period Closing Voucher,Period Closing Voucher,Cierre de período
@@ -3752,38 +3771,38 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,GASTOS DE ADMINISTRACIÓN
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Categoría principal de cliente
-sites/assets/js/erpnext.min.js +50,Change,Cambio
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',La órden de compra {0} esta 'Detenida'
-DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
+DocType: Appraisal Goal,Score Earned,Puntuación Obtenida.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por ejemplo ""Mi Compañia LLC"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de notificación
 DocType: Bank Reconciliation Detail,Voucher ID,Comprobante ID
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Este es un territorio raíz y no se puede editar .
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Este es un territorio principal y no se puede editar.
 DocType: Packing Slip,Gross Weight UOM,Peso bruto de la unidad de medida (UdM)
 DocType: Email Digest,Receivables / Payables,Por cobrar / Por pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Cuenta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores en cero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del producto obtenido después de la fabricación / empaquetado desde las cantidades determinadas de materia prima
 DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Pagar
 DocType: Delivery Note Item,Against Sales Order Item,Contra la orden de venta del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
 DocType: Item,Default Warehouse,Almacén por defecto
 DocType: Task,Actual End Date (via Time Logs),Fecha de finalización (gestión de tiempos)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Por favor, ingrese el centro de costos principal"
 DocType: Delivery Note,Print Without Amount,Imprimir sin importe
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
+apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,La categoría de impuestos no puede ser 'Valoración ' o 'Valoración y totales' ya que todos los productos no son elementos de inventario
 DocType: User,Last Name,Apellido
 DocType: Web Page,Left,Inactivo/Fuera
 DocType: Event,All Day,Todo el Día
-DocType: Issue,Support Team,Equipo de Soporte
+DocType: Issue,Support Team,Equipo de soporte
 DocType: Appraisal,Total Score (Out of 5),Puntaje total (de 5 )
 DocType: Contact Us Settings,State,Estado
-DocType: Batch,Batch,Lotes de Producto
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance
+DocType: Batch,Batch,Lotes de producto
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
 DocType: User,Gender,Género
 DocType: Journal Entry,Debit Note,Nota de débito
@@ -3798,10 +3817,9 @@ DocType: Maintenance Schedule Item,Half Yearly,Semestral
 DocType: Lead,Blog Subscriber,Suscriptor del Blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día."
-DocType: Purchase Invoice,Total Advance,Total Anticipo
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Continuar requisición de materiales
+DocType: Purchase Invoice,Total Advance,Total anticipo
 DocType: Workflow State,User,Usuario
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Procesando nómina
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Procesando nómina
 DocType: Opportunity Item,Basic Rate,Precio base
 DocType: GL Entry,Credit Amount,Importe acreditado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Establecer como perdido
@@ -3809,7 +3827,7 @@ DocType: Customer,Credit Days Based On,Días de crédito basados en
 DocType: Tax Rule,Tax Rule,Regla fiscal
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantener mismo precio durante todo el ciclo de ventas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear las horas adicionales en la estación de trabajo.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} ya ha sido presentado
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ya ha sido presentado
 ,Items To Be Requested,Solicitud de Productos
 DocType: Purchase Order,Get Last Purchase Rate,Obtener último precio de compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Monto de facturación basado en el tipo de actividad (por hora)
@@ -3818,6 +3836,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Email de la compañía no encontrado, por lo que el correo no ha sido enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),UTILIZACIÓN DE FONDOS (ACTIVOS)
 DocType: Production Planning Tool,Filter based on item,Filtro basado en producto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Cuenta de debito
 DocType: Fiscal Year,Year Start Date,Fecha de inicio
 DocType: Attendance,Employee Name,Nombre de empleado
 DocType: Sales Invoice,Rounded Total (Company Currency),Total redondeado (Divisa por defecto)
@@ -3829,71 +3848,74 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supresión
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de empleados
 DocType: Sales Invoice,Is POS,Es POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
 DocType: Production Order,Manufactured Qty,Cantidad producida
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
 DocType: DocField,Default,Predeterminado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} suscriptores añadidos
-DocType: Maintenance Schedule,Schedule,Horario
+DocType: Maintenance Schedule,Schedule,Programa
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Defina el presupuesto para este centro de costos, puede configurarlo en 'Listado de compañía'"
 DocType: Account,Parent Account,Cuenta principal
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Centro de actividades
 DocType: GL Entry,Voucher Type,Tipo de comprobante
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este producto que se podrá ver en el numero de serie principal"
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Evaluación {0} creado por Empleado {1} en el rango de fechas determinado
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,La evaluación {0} creado para el empleado {1} en el rango de fechas determinado
 DocType: Employee,Education,Educación
 DocType: Selling Settings,Campaign Naming By,Ordenar campañas por
 DocType: Employee,Current Address Is,La dirección actual es
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcional. Establece moneda por defecto de la empresa, si no se especifica."
 DocType: Address,Office,Oficina
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes Estándares
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entradas en el diario de contabilidad.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para crear una Cuenta de impuestos
+DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Cantidad a partir de Almacén
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para crear una cuenta de impuestos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
-DocType: Account,Stock,Existencias
+DocType: Account,Stock,Almacén
 DocType: Employee,Current Address,Dirección actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si el artículo es una variante de otro artículo entonces la descripción, imágenes, precios, impuestos, etc. se establecerán a partir de la plantilla a menos que se especifique explícitamente"
 DocType: Serial No,Purchase / Manufacture Details,Detalles de compra / producción
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Inventario de lotes
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inventario de lotes
 DocType: Employee,Contract End Date,Fecha de finalización de contrato
 DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener ordenes de venta (pendientes de entrega) basadas en los criterios anteriores
 DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Desde cotización de proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Desde cotización de proveedor
 DocType: Deduction Type,Deduction Type,Tipo de deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Pricing Rule,Min Qty,Cantidad mínima
-DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Para realizar un seguimiento de artículos en ventas y documentos de compra con los números de lote. "Industria Preferida: Químicos"
+DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""","Para realizar un seguimiento de los productos en los documentos de compra y venta, con los números de lote. 'Industria preferida: Químicos'"
 DocType: GL Entry,Transaction Date,Fecha de transacción
 DocType: Production Plan Item,Planned Qty,Cantidad planificada
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Impuesto Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Por cantidad (cantidad fabricada) es obligatoria
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Divisa por defecto)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Línea {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Línea {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
 DocType: Notification Control,Purchase Receipt Message,Mensaje de recibo de compra
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de hojas asignados más de periodo
 DocType: Production Order,Actual Start Date,Fecha de inicio actual
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados para esta orden de venta
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Movimientos de inventario
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Listado de todos los movimientos de inventario.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Lista de suscriptores al boletín
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar
 DocType: Email Account,Service,Servicios
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen bruto %
 DocType: BOM,With Operations,Con operaciones
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Asientos contables ya se han hecho en moneda {0} para la compañía de {1}. Por favor, seleccione una cuenta por cobrar o por pagar con la moneda {0}."
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Asientos contables ya se han hecho en moneda {0} para la compañía de {1}. Por favor, seleccione una cuenta por cobrar o por pagar con la moneda {0}."
 ,Monthly Salary Register,Registar salario mensual
-apps/frappe/frappe/website/template.py +123,Next,Siguiente
+apps/frappe/frappe/website/template.py +140,Next,Siguiente
 DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
 DocType: BOM Operation,BOM Operation,Operación de la lista de materiales (LdM)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropulido
@@ -3902,7 +3924,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please en
 DocType: POS Profile,POS Profile,Perfil de POS
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Línea {0}: El importe de pago no puede ser superior al monto pendiente de pago
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total no pagado
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total impagado
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,La gestión de tiempos no se puede facturar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
@@ -3924,8 +3946,9 @@ DocType: Purchase Invoice,Next Date,Siguiente fecha
 DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Por favor, introduzca los impuestos y cargos"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Laboreo
+DocType: Sales Invoice Item,Drop Ship,Nave de la gota
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede ingresar los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
-DocType: Hub Settings,Seller Name,Nombre del Vendedor
+DocType: Hub Settings,Seller Name,Nombre de vendedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y gastos deducibles (Divisa por defecto)
 DocType: Item Group,General Settings,Configuración general
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,'Desde moneda - a moneda' no pueden ser las mismas
@@ -3942,37 +3965,37 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edit
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe no ajustado
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir producción en días festivos
 DocType: Sales Order,Customer's Purchase Order Date,Fecha de pedido de compra del cliente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,CAPITAL SOCIAL
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital de inventario
 DocType: Packing Slip,Package Weight Details,Detalles del peso del paquete
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, seleccione un archivo csv"
 DocType: Dropbox Backup,Send Backups to Dropbox,Enviar copias de seguridad hacia Dropbox
-DocType: Purchase Order,To Receive and Bill,Para Recibir y pagar
+DocType: Purchase Order,To Receive and Bill,Para recibir y pagar
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantillas de términos y condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crear automáticamente una 'requisición de materiales' si la cantidad es inferior a este nivel
 ,Item-wise Purchase Register,Detalle de compras
 DocType: Batch,Expiry Date,Fecha de caducidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para establecer el nivel de pedido, artículo debe ser un artículo de compra o fabricación de artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para establecer el nivel de reabastecimiento, el producto debe ser de 'compra' o un producto para fabricación"
 ,Supplier Addresses and Contacts,Libreta de direcciones de proveedores
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Por favor, seleccione primero la categoría"
-apps/erpnext/erpnext/config/projects.py +18,Project master.,Proyecto maestro
+apps/erpnext/erpnext/config/projects.py +18,Project master.,Listado de todos los proyectos.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de crédito
 DocType: Leave Type,Is Carry Forward,Es un traslado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obtener elementos desde la 'lista de materiales'
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtener elementos desde la 'lista de materiales'
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Días de iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de materiales (LdM)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1}
-DocType: Dropbox Backup,Send Notifications To,Enviar notificaciones a
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1}
+DocType: Dropbox Backup,Send Notifications To,Enviar notificaciones a>
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Fecha Ref.
 DocType: Employee,Reason for Leaving,Razones de renuncia
-DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
+DocType: Expense Claim Detail,Sanctioned Amount,Monto sancionado
 DocType: GL Entry,Is Opening,De apertura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Cuenta {0} no existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Cuenta {0} no existe
 DocType: Account,Cash,EFECTIVO
 DocType: Employee,Short biography for website and other publications.,Breve biografía para la página web y otras publicaciones.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, cree una estructura salarial para el empleado {0}"
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index f36f1530b3..66e054f085 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,حالت حقوق و دستمزد
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",انتخاب توزیع ماهانه، اگر شما می خواهید برای ردیابی بر اساس فصلی.
 DocType: Employee,Divorced,طلاق
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,هشدار: همان مورد وارد شده است چندین بار.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,هشدار: همان مورد وارد شده است چندین بار.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,آیتم ها در حال حاضر همگام سازی
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,اجازه می دهد مورد به چند بار در یک معامله اضافه شود
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,لغو مواد مشاهده {0} قبل از لغو این ادعا گارانتی
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,تراکم علاوه پخت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},برای اطلاع از قیمت ارز مورد نیاز است {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* * * * آیا می شود در معامله محاسبه می شود.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,از درخواست مواد
+DocType: Purchase Order,Customer Contact,مشتریان تماس با
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,از درخواست مواد
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} درخت
 DocType: Job Applicant,Job Applicant,درخواستگر کار
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,نتایج بیشتری.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,نام مشتری
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",همه رشته های مرتبط صادرات مانند ارز، نرخ تبدیل، کل صادرات، صادرات و غیره بزرگ کل در توجه داشته باشید تحویل، POS، نقل قول، فاکتور فروش، سفارش فروش و غیره در دسترس هستند
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,سر (یا گروه) که در برابر مطالب حسابداری ساخته شده است و توازن حفظ می شوند.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),برجسته برای {0} نمی تواند کمتر از صفر ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),برجسته برای {0} نمی تواند کمتر از صفر ({1})
 DocType: Manufacturing Settings,Default 10 mins,پیش فرض 10 دقیقه
 DocType: Leave Type,Leave Type Name,ترک نام نوع
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,سری به روز رسانی با موفقیت
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,قیمت مورد چندگانه.
 DocType: SMS Center,All Supplier Contact,همه با منبع تماس با
 DocType: Quality Inspection Reading,Parameter,پارامتر
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,انتظار می رود تاریخ پایان نمی تواند کمتر از حد انتظار تاریخ شروع
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,آیا واقعا می خواهید به unstop سفارش تولید:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ردیف # {0}: نرخ باید به همان صورت {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,جدید مرخصی استفاده
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,جدید مرخصی استفاده
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,حواله بانکی
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. برای حفظ مشتری کد عاقلانه مورد و به آنها جستجو بر اساس استفاده از کد خود را در این گزینه
 DocType: Mode of Payment Account,Mode of Payment Account,نحوه حساب پرداخت
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,نمایش ا
 DocType: Sales Invoice Item,Quantity,مقدار
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),وام (بدهی)
 DocType: Employee Education,Year of Passing,سال عبور
-sites/assets/js/erpnext.min.js +27,In Stock,در انبار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,می توانید تنها پرداخت در مقابل unbilled را سفارش فروش را
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,در انبار
 DocType: Designation,Designation,تعیین
 DocType: Production Plan Item,Production Plan Item,تولید مورد طرح
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},کاربر {0} در حال حاضر به کارکنان اختصاص داده {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,را نمایش جدید POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,بهداشت و درمان
 DocType: Purchase Invoice,Monthly,ماهیانه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,فاکتور
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),تاخیر در پرداخت (روز)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,فاکتور
 DocType: Maintenance Schedule Item,Periodicity,تناوب
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,آدرس ایمیل
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,دفاع
 DocType: Company,Abbr,مخفف
 DocType: Appraisal Goal,Score (0-5),امتیاز (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},ردیف {0}: {1} {2} با مطابقت ندارد {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ردیف {0}: {1} {2} با مطابقت ندارد {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,ردیف # {0}:
 DocType: Delivery Note,Vehicle No,خودرو بدون
-sites/assets/js/erpnext.min.js +55,Please select Price List,لطفا لیست قیمت را انتخاب کنید
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,لطفا لیست قیمت را انتخاب کنید
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,نجاری
 DocType: Production Order Operation,Work In Progress,کار در حال انجام
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,چاپ سه بعدی
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,جزئیات docname پدر و ماد
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,کیلوگرم
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,باز کردن برای یک کار.
 DocType: Item Attribute,Increment,افزایش
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,انتخاب کنید ... انبار
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,تبلیغات
 DocType: Employee,Married,متاهل
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
 DocType: Payment Reconciliation,Reconcile,وفق دادن
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,خواربار
 DocType: Quality Inspection Reading,Reading 1,خواندن 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,را بانک ورودی
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,را بانک ورودی
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,انبار اجباری است اگر نوع حساب انبار است
 DocType: SMS Center,All Sales Person,همه فرد از فروش
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,ارسال فعال مرکز هزین
 DocType: Warehouse,Warehouse Detail,جزئیات انبار
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
 DocType: Tax Rule,Tax Type,نوع مالیات
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0} نیستید
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0} نیستید
 DocType: Item,Item Image (if not slideshow),مورد تصویر (در صورت اسلاید نمی شود)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,مشتری با همین نام وجود دارد
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(یک ساعت یک نرخ / 60) * * * * واقعی زمان عمل
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,مهمان
 DocType: Quality Inspection,Get Specification Details,دریافت اطلاعات بیشتر مشخصات
 DocType: Lead,Interested,علاقمند
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,صورت مواد
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,افتتاح
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,افتتاح
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},از {0} به {1}
 DocType: Item,Copy From Item Group,کپی برداری از مورد گروه
 DocType: Journal Entry,Opening Entry,ورود افتتاح
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,پرس و جو محصولات
 DocType: Standard Reply,Owner,مالک
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,لطفا ابتدا وارد شرکت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,لطفا ابتدا شرکت را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,لطفا ابتدا شرکت را انتخاب کنید
 DocType: Employee Education,Under Graduate,مقطع
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,هدف در
 DocType: BOM,Total Cost,هزینه کل
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,پیشوند
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,مصرفی
 DocType: Upload Attendance,Import Log,واردات ورود
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ارسال
+DocType: Sales Invoice Item,Delivered By Supplier,تحویل داده شده توسط کننده
 DocType: SMS Center,All Contact,همه تماس
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,حقوق سالانه
 DocType: Period Closing Voucher,Closing Fiscal Year,بستن سال مالی
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,کنترا ورود
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,نمایش زمان گزارش ها
 DocType: Journal Entry Account,Credit in Company Currency,اعتبار در شرکت ارز
 DocType: Delivery Note,Installation Status,وضعیت نصب و راه اندازی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},پذیرفته شده + رد تعداد باید به دریافت مقدار برابر برای مورد است {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},پذیرفته شده + رد تعداد باید به دریافت مقدار برابر برای مورد است {0}
 DocType: Item,Supply Raw Materials for Purchase,عرضه مواد اولیه برای خرید
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,مورد {0} باید مورد خرید است
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود الگو، داده مناسب پر کنید و ضمیمه فایل تغییر یافتهاست. همه تاریخ و کارمند ترکیبی در دوره زمانی انتخاب شده در قالب آمده، با سوابق حضور و غیاب موجود
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,مورد {0} غیر فعال است و یا پایان زندگی رسیده است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,مورد {0} غیر فعال است و یا پایان زندگی رسیده است
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,به روز خواهد شد پس از فاکتور فروش ارائه شده است.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,تنظیمات برای ماژول HR
 DocType: SMS Center,SMS Center,مرکز SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,صاف
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,پارامتر URL برا
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,مشاهده قوانین برای استفاده از قیمت گذاری و تخفیف.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},این زمان درگیری با ورود {0} برای {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,لیست قیمت ها باید قابل استفاده برای خرید و یا فروش است
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},تاریخ نصب و راه اندازی نمی تواند قبل از تاریخ تحویل برای مورد است {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},تاریخ نصب و راه اندازی نمی تواند قبل از تاریخ تحویل برای مورد است {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),تخفیف در لیست قیمت نرخ (٪)
-sites/assets/js/form.min.js +279,Start,شروع
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,شروع
 DocType: User,First Name,نام
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,راه اندازی خود را کامل است. تازه کردن.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ریخته گری کامل قالب
 DocType: Offer Letter,Select Terms and Conditions,انتخاب شرایط و ضوابط
 DocType: Production Planning Tool,Sales Orders,سفارشات فروش
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,در برابر مورد فاکتور فروش
 ,Production Orders in Progress,سفارشات تولید در پیشرفت
 DocType: Lead,Address & Contact,آدرس و تلفن تماس
+DocType: Leave Allocation,Add unused leaves from previous allocations,اضافه کردن برگ های استفاده نشده از تخصیص قبلی
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},بعدی دوره ای {0} خواهد شد در ایجاد {1}
 DocType: Newsletter List,Total Subscribers,مجموع مشترکین
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,تماس با نام
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,SO در انتظار تعداد
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ایجاد لغزش حقوق و دستمزد برای معیارهای ذکر شده در بالا.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,درخواست برای خرید.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,مسکن دو
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تسکین تاریخ باید بیشتر از تاریخ پیوستن شود
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,برگ در سال
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,لطفا نامگذاری سری برای {0} از طریق راه اندازی> تنظیمات> نامگذاری سری مجموعه
 DocType: Time Log,Will be updated when batched.,خواهد شد که بسته بندی های کوچک به روز شد.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ردیف {0}: لطفا بررسی کنید آیا پیشرفته در برابر حساب {1} در صورتی که این یک ورودی پیش است.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ردیف {0}: لطفا بررسی کنید آیا پیشرفته در برابر حساب {1} در صورتی که این یک ورودی پیش است.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},انبار {0} به شرکت تعلق ندارد {1}
 DocType: Bulk Email,Message,پیام
 DocType: Item Website Specification,Item Website Specification,مشخصات مورد وب سایت
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox به دسترسی های کلیدی
 DocType: Payment Tool,Reference No,مرجع بدون
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ترک مسدود
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
 DocType: Stock Entry,Sales Invoice No,فاکتور فروش بدون
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,حداقل تعداد سفارش تعداد
 DocType: Pricing Rule,Supplier Type,نوع منبع
 DocType: Item,Publish in Hub,انتشار در توپی
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,مورد {0} لغو شود
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,درخواست مواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
 DocType: Item,Purchase Details,جزئیات خرید
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},مورد {0} در 'مواد اولیه عرضه شده جدول در سفارش خرید یافت نشد {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,کنترل هشدار از ط
 DocType: Lead,Suggestions,پیشنهادات
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,مجموعه ای مورد بودجه گروه عاقلانه در این سرزمین. شما همچنین می توانید با تنظیم توزیع شامل فصلی.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},لطفا گروه حساب پدر و مادر برای انبار وارد {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},پرداخت در مقابل {0} {1} نمی تواند بیشتر از برجسته مقدار {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},پرداخت در مقابل {0} {1} نمی تواند بیشتر از برجسته مقدار {2}
 DocType: Supplier,Address HTML,آدرس HTML
 DocType: Lead,Mobile No.,شماره موبایل
 DocType: Maintenance Schedule,Generate Schedule,تولید برنامه
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,جدید بورس UOM
 DocType: Period Closing Voucher,Closing Account Head,بستن سر حساب
 DocType: Employee,External Work History,سابقه کار خارجی
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,خطا مرجع مدور
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,آیا شما واقعا می خواهید برای جلوگیری
 DocType: Communication,Closed,بسته
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,به عبارت (صادرات) قابل مشاهده خواهد بود یک بار شما را تحویل توجه را نجات دهد.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,آیا مطمئن هستید که می خواهید برای جلوگیری
 DocType: Lead,Industry,صنعت
 DocType: Employee,Job Profile,نمایش شغلی
 DocType: Newsletter,Newsletter,عضویت در خبرنامه
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,رسید
 DocType: Dropbox Backup,Allow Dropbox Access,اجازه دسترسی Dropbox به
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,راه اندازی مالیات
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,خلاصه برای این هفته و فعالیت های انتظار
 DocType: Workstation,Rent Cost,اجاره هزینه
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,لطفا ماه و سال را انتخاب کنید
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,سرعت که در آن مشتریان ارز به ارز پایه مشتری تبدیل
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",موجود در BOM، تحویل توجه داشته باشید، خرید فاکتور، سفارش تولید، سفارش خرید، رسید خرید، فاکتور فروش، سفارش فروش، انبار ورودی، برنامه زمانی
 DocType: Item Tax,Tax Rate,نرخ مالیات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,انتخاب مورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,انتخاب مورد
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",مورد: {0} موفق دسته ای و زرنگ، نمی تواند با استفاده از \ سهام آشتی، به جای استفاده از بورس ورود آشتی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,خرید فاکتور {0} در حال حاضر ارائه
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,خرید فاکتور {0} در حال حاضر ارائه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: دسته ای بدون باید همان باشد {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,تبدیل به غیر گروه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,رسید خرید باید ارائه شود
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,در حال حاضر سها
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,دسته ای (زیادی) از آیتم استفاده کنید.
 DocType: C-Form Invoice Detail,Invoice Date,تاریخ فاکتور
 DocType: GL Entry,Debit Amount,مقدار بدهی
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,آدرس ایمیل شما
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,لطفا پیوست را ببینید
 DocType: Purchase Order,% Received,٪ دریافتی
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,دستورالعمل
 DocType: Quality Inspection,Inspected By,بازرسی توسط
 DocType: Maintenance Visit,Maintenance Type,نوع نگهداری
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},سریال بدون {0} به تحویل توجه تعلق ندارد {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},سریال بدون {0} به تحویل توجه تعلق ندارد {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,پارامتر بازرسی کیفیت مورد
 DocType: Leave Application,Leave Approver Name,ترک نام تصویب
 ,Schedule Date,برنامه زمانبندی عضویت
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,خرید ثبت نام
 DocType: Landed Cost Item,Applicable Charges,اتهامات قابل اجرا
 DocType: Workstation,Consumable Cost,هزینه مصرفی
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
 DocType: Purchase Receipt,Vehicle Date,خودرو تاریخ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,پزشکی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,دلیل برای از دست دادن
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,٪ نصب
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,لطفا ابتدا نام شرکت وارد
 DocType: BOM,Item Desription,Desription مورد
 DocType: Purchase Invoice,Supplier Name,نام منبع
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,خواندن کتابچه راهنمای کاربر ERPNext
 DocType: Account,Is Group,گروه
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,تنظیم به صورت خودکار سریال بر اساس شماره FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,بررسی تولید کننده فاکتور شماره منحصر به فرد
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,مدیر ارشد
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,تنظیمات جهانی برای تمام فرآیندهای تولید.
 DocType: Accounts Settings,Accounts Frozen Upto,حساب منجمد تا حد
 DocType: SMS Log,Sent On,فرستاده شده در
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,کارشناسی ارشد تعطیلات.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,قالب ریزی و سازه پوسته
 DocType: Material Request Item,Required Date,تاریخ مورد نیاز
 DocType: Delivery Note,Billing Address,نشانی صورتحساب
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,لطفا کد مورد را وارد کنید.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,لطفا کد مورد را وارد کنید.
 DocType: BOM,Costing,هزینه یابی
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",در صورت انتخاب، میزان مالیات در نظر گرفته خواهد به عنوان در حال حاضر در چاپ نرخ / چاپ مقدار شامل
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,مجموع تعداد
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),زمان بی
 DocType: Customer,Buyer of Goods and Services.,خریدار کالا و خدمات.
 DocType: Journal Entry,Accounts Payable,حساب های پرداختنی
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,اضافه کردن مشترکین
-sites/assets/js/erpnext.min.js +5,""" does not exists",وجود ندارد
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",وجود ندارد
 DocType: Pricing Rule,Valid Upto,معتبر تا حد
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,لیست تعداد کمی از مشتریان خود را. آنها می تواند سازمان ها یا افراد.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,درآمد مستقیم
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",می توانید بر روی حساب نمی فیلتر بر اساس، در صورتی که توسط حساب گروه بندی
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,افسر اداری
 DocType: Payment Tool,Received Or Paid,دریافت یا پرداخت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,لطفا انتخاب کنید شرکت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,لطفا انتخاب کنید شرکت
 DocType: Stock Entry,Difference Account,حساب تفاوت
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,می توانید کار نزدیک به عنوان وظیفه وابسته به آن {0} بسته نشده است نیست.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
 DocType: Production Order,Additional Operating Cost,هزینه های عملیاتی اضافی
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
 DocType: DocField,Type,نوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
 DocType: Communication,Subject,موضوع
 DocType: Shipping Rule,Net Weight,وزن خالص
 DocType: Employee,Emergency Phone,تلفن اضطراری
 ,Serial No Warranty Expiry,سریال بدون گارانتی انقضاء
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,آیا شما واقعا می خواهید برای متوقف کردن این درخواست مواد؟
 DocType: Sales Order,To Deliver,رساندن
 DocType: Purchase Invoice Item,Item,بخش
 DocType: Journal Entry,Difference (Dr - Cr),تفاوت (دکتر - کروم)
 DocType: Account,Profit and Loss,حساب سود و زیان
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,مدیریت مقاطعه کاری فرعی
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,مدیریت مقاطعه کاری فرعی
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,جدید UOM NOT باید از نوع عدد صحیح است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,مبلمان و دستگاه ها
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,سرعت که در آن لیست قیمت ارز به ارز پایه شرکت تبدیل
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,افزودن / ویرای
 DocType: Purchase Invoice,Supplier Invoice No,تامین کننده فاکتور بدون
 DocType: Territory,For reference,برای مرجع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",نمی توانید حذف سریال نه {0}، آن را به عنوان در معاملات سهام مورد استفاده
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),بسته شدن (کروم)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),بسته شدن (کروم)
 DocType: Serial No,Warranty Period (Days),دوره گارانتی (روز)
 DocType: Installation Note Item,Installation Note Item,نصب و راه اندازی توجه داشته باشید مورد
 ,Pending Qty,انتظار تعداد
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,صدور صورت حساب و 
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,مشتریان تکرار
 DocType: Leave Control Panel,Allocate,اختصاص دادن
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,قبلی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,بازگشت فروش
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,بازگشت فروش
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,سفارشات فروش که از آن شما می خواهید برای ایجاد سفارشات تولید را انتخاب کنید.
+DocType: Item,Delivered by Supplier (Drop Ship),تحویل داده شده توسط کننده (قطره کشتی)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,قطعات حقوق و دستمزد.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,پایگاه داده از مشتریان بالقوه است.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,پایگاه داده مشتری می باشد.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,غلت
 DocType: Purchase Order Item,Billed Amt,صورتحساب AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,انبار منطقی که در برابر نوشته های سهام ساخته شده است.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},مرجع بدون مرجع و تاریخ مورد نیاز است برای {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},مرجع بدون مرجع و تاریخ مورد نیاز است برای {0}
 DocType: Event,Wednesday,چهار شنبه
 DocType: Sales Invoice,Customer's Vendor,فروشنده مشتری
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,سفارش تولید الزامی است
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,گیرنده پارامتر
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""بر اساس"" و ""گروه شده توسط"" نمی توانند همسان باشند"
 DocType: Sales Person,Sales Person Targets,اهداف فرد از فروش
-sites/assets/js/form.min.js +271,To,برای
-apps/frappe/frappe/templates/base.html +143,Please enter email address,لطفا آدرس ایمیل را وارد کنید
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,برای
+apps/frappe/frappe/templates/base.html +145,Please enter email address,لطفا آدرس ایمیل را وارد کنید
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,پایان لوله تشکیل
 DocType: Production Order Operation,In minutes,در دقیقهی
 DocType: Issue,Resolution Date,قطعنامه عضویت
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,پروژه های کاربری
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,مصرف
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} در فاکتور جزییات جدول یافت نشد
 DocType: Company,Round Off Cost Center,دور کردن مرکز هزینه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات مشاهده {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات مشاهده {0} باید قبل از لغو این سفارش فروش لغو
 DocType: Material Request,Material Transfer,انتقال مواد
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),افتتاح (دکتر)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},مجوز های ارسال و زمان باید بعد {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,تنظیمات
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,مالیات هزینه فرود آمد و اتهامات
 DocType: Production Order Operation,Actual Start Time,واقعی زمان شروع
 DocType: BOM Operation,Operation Time,زمان عمل
-sites/assets/js/list.min.js +5,More,بیش
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,بیش
 DocType: Pricing Rule,Sales Manager,مدیر فروش
-sites/assets/js/desk.min.js +7673,Rename,تغییر نام
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,تغییر نام
 DocType: Journal Entry,Write Off Amount,ارسال فعال مقدار
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,خم
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,اجازه می دهد کاربر
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,قیچی و برش مستقیم
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,برای پیگیری آیتم در فروش و خرید اسناد بر اساس NOS سریال خود را. این هم می تواند برای پیگیری جزئیات ضمانت محصول استفاده می شود.
 DocType: Purchase Receipt Item Supplied,Current Stock,سهام کنونی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,انبار را رد کرد مقابل آیتم regected الزامی است
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,انبار را رد کرد مقابل آیتم regected الزامی است
 DocType: Account,Expenses Included In Valuation,هزینه های موجود در ارزش گذاری
 DocType: Employee,Provide email id registered in company,ارائه ایمیل شناسه ثبت شده در شرکت
 DocType: Hub Settings,Seller City,فروشنده شهر
 DocType: Email Digest,Next email will be sent on:,ایمیل بعدی خواهد شد در ارسال:
 DocType: Offer Letter Term,Offer Letter Term,ارائه نامه مدت
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,فقره انواع.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,مورد {0} یافت نشد
 DocType: Bin,Stock Value,سهام ارزش
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,نوع درخت
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,خوش آمد
 DocType: Journal Entry,Credit Card Entry,ورود کارت اعتباری
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,وظیفه تم
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,محصولات از تولید کنندگان دریافت کرد.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,محصولات از تولید کنندگان دریافت کرد.
 DocType: Communication,Open,باز
 DocType: Lead,Campaign Name,نام کمپین
 ,Reserved,رزرو شده
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,آیا شما واقعا می خواهید به UNSTOP
 DocType: Purchase Order,Supply Raw Materials,تامین مواد اولیه
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,از تاریخ فاکتور بعدی تولید خواهد شد. این است که در ارائه تولید می شود.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,دارایی های نقد
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,مشتری سفارش خرید بدون
 DocType: Employee,Cell Number,شماره همراه
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,از دست رفته
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,شما می توانید کوپن در حال حاضر در "علیه مجله ورودی" ستون وارد کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,شما می توانید کوپن در حال حاضر در "علیه مجله ورودی" ستون وارد کنید
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,انرژی
 DocType: Opportunity,Opportunity From,فرصت از
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,بیانیه حقوق ماهانه.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,مسئوليت
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,مقدار تحریم نیست می تواند بیشتر از مقدار ادعای در ردیف {0}.
 DocType: Company,Default Cost of Goods Sold Account,به طور پیش فرض هزینه از حساب کالاهای فروخته شده
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,لیست قیمت انتخاب نشده
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,لیست قیمت انتخاب نشده
 DocType: Employee,Family Background,سابقه خانواده
 DocType: Process Payroll,Send Email,ارسال ایمیل
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,بدون اجازه
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,شماره
 DocType: Item,Items with higher weightage will be shown higher,پاسخ همراه با بین وزنها بالاتر خواهد بود بالاتر نشان داده شده است
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,جزئیات مغایرت گیری بانک
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,فاکتورها من
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,بدون کارمند یافت
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,بدون کارمند یافت
 DocType: Purchase Order,Stopped,متوقف
 DocType: Item,If subcontracted to a vendor,اگر به یک فروشنده واگذار شده
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,انتخاب BOM برای شروع
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,تعاد
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,در حال حاضر ارسال
 ,Support Analytics,تجزیه و تحلیل ترافیک پشتیبانی
 DocType: Item,Website Warehouse,انبار وب سایت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,آیا شما واقعا می خواهید برای جلوگیری سفارش تولید:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",روز از ماه که در آن خودکار صورتحساب خواهد شد به عنوان مثال 05، 28 و غیره تولید
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,امتیاز باید کمتر از یا برابر با 5 است
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,سوابق C-فرم
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,نم
 DocType: Features Setup,"To enable ""Point of Sale"" features",برای فعال کردن "نقطه ای از فروش" ویژگی های
 DocType: Bin,Moving Average Rate,میانگین متحرک نرخ
 DocType: Production Planning Tool,Select Items,انتخاب آیتم ها
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
 DocType: Comment,Reference Name,نام مرجع
 DocType: Maintenance Visit,Completion Status,وضعیت تکمیل
 DocType: Sales Invoice Item,Target Warehouse,هدف انبار
 DocType: Item,Allow over delivery or receipt upto this percent,اجازه می دهد بیش از تحویل یا دریافت تا این درصد
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش فروش تاریخ است
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش فروش تاریخ است
 DocType: Upload Attendance,Import Attendance,واردات حضور و غیاب
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,همه گروه مورد
 DocType: Process Payroll,Activity Log,گزارش فعالیت
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,به طور خودکار نگارش پیام در ارائه معاملات.
 DocType: Production Order,Item To Manufacture,آیتم را ساخت
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ریخته گری قالب دائم
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,سفارش خرید به پرداخت
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} وضعیت {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,سفارش خرید به پرداخت
 DocType: Sales Order Item,Projected Qty,پیش بینی تعداد
 DocType: Sales Invoice,Payment Due Date,پرداخت با توجه تاریخ
 DocType: Newsletter,Newsletter Manager,مدیر خبرنامه
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,شماره درخواست شده
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,ارزیابی عملکرد.
 DocType: Sales Invoice Item,Stock Details,جزئیات سهام
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ارزش پروژه
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,نقطه از فروش
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},نمی تواند حمل به جلو {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,نقطه از فروش
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},نمی تواند حمل به جلو {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",مانده حساب در حال حاضر در اعتبار، شما امکان پذیر نیست را به مجموعه "تعادل باید" را بعنوان "اعتباری"
 DocType: Account,Balance must be,موجودی باید
 DocType: Hub Settings,Publish Pricing,قیمت گذاری انتشار
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,رسید خرید
 ,Received Items To Be Billed,دریافت گزینه هایی که صورتحساب
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,شمشیرهای
-sites/assets/js/desk.min.js +3938,Ms,خانم
+DocType: Employee,Ms,خانم
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,نرخ ارز نرخ ارز استاد.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
 DocType: Production Order,Plan material for sub-assemblies,مواد را برای طرح زیر مجموعه
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,محدوده
 DocType: Supplier,Default Payable Accounts,به طور پیش فرض حسابهای پرداختنی
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
 DocType: Features Setup,Item Barcode,بارکد مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,مورد انواع {0} به روز شده
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,خرید فاکتور پیشرفته
 DocType: Address,Shop,فروشگاه
 DocType: Hub Settings,Sync Now,همگام سازی در حال حاضر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},ردیف {0}: ورود اعتباری را نمی توان با مرتبط {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},ردیف {0}: ورود اعتباری را نمی توان با مرتبط {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,به طور پیش فرض حساب بانک / نقدی به طور خودکار در POS فاکتور به روز شده در زمانی که این حالت انتخاب شده است.
 DocType: Employee,Permanent Address Is,آدرس دائمی است
 DocType: Production Order Operation,Operation completed for how many finished goods?,عملیات برای چند کالا به پایان رسید به پایان؟
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,نام تجاری
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,کمک هزینه برای بیش از {0} عبور برای مورد {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,کمک هزینه برای بیش از {0} عبور برای مورد {1}.
 DocType: Employee,Exit Interview Details,جزییات خروج مصاحبه
 DocType: Item,Is Purchase Item,آیا مورد خرید
 DocType: Journal Entry Account,Purchase Invoice,خرید فاکتور
 DocType: Stock Ledger Entry,Voucher Detail No,جزئیات کوپن بدون
 DocType: Stock Entry,Total Outgoing Value,مجموع ارزش خروجی
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,باز کردن تاریخ و بسته شدن تاریخ باید در همان سال مالی می شود
 DocType: Lead,Request for Information,درخواست اطلاعات
 DocType: Payment Tool,Paid,پرداخت
 DocType: Salary Slip,Total in words,مجموع در کلمات
 DocType: Material Request Item,Lead Time Date,سرب زمان عضویت
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,الزامی است. شاید رکورد ارز برای ایجاد نشده است
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},ردیف # {0}: لطفا سریال مشخص نیست برای مورد {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",برای آیتم های 'محصولات بسته نرم افزاری، انبار، سریال و بدون دسته بدون خواهد شد از' بسته بندی فهرست جدول در نظر گرفته. اگر انبار و دسته ای بدون برای همه آیتم ها بسته بندی مورد هر 'محصولات بسته نرم افزاری "هستند، این ارزش ها را می توان در جدول آیتم های اصلی وارد شده، ارزش خواهد شد کپی شده به' بسته بندی فهرست جدول.
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,محموله به مشتریان.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,محموله به مشتریان.
 DocType: Purchase Invoice Item,Purchase Order Item,خرید سفارش مورد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,درآمد غیر مستقیم
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,تنظیم مقدار پرداخت = مقدار برجسته
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,خط 1 آدرس
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,واریانس
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,نام شرکت
 DocType: SMS Center,Total Message(s),پیام ها (بازدید کنندگان)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,نمایش یک لیست از تمام فیلم ها کمک
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,انتخاب سر حساب بانکی است که چک نهشته شده است.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,کاربر مجاز به ویرایش لیست قیمت نرخ در معاملات
 DocType: Pricing Rule,Max Qty,حداکثر تعداد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ردیف {0}: پرداخت در مقابل فروش / سفارش خرید همیشه باید به عنوان پیش مشخص شده باشد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ردیف {0}: پرداخت در مقابل فروش / سفارش خرید همیشه باید به عنوان پیش مشخص شده باشد
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,شیمیایی
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
 DocType: Process Payroll,Select Payroll Year and Month,انتخاب سال و ماه حقوق و دستمزد
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",برو به گروه مناسب (معمولا استفاده از وجوه> دارایی های نقد> حساب های بانکی و ایجاد یک حساب جدید (با کلیک بر روی اضافه کردن کودکان) از نوع "بانک"
 DocType: Workstation,Electricity Cost,هزینه برق
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,سف
 DocType: SMS Center,All Lead (Open),همه سرب (باز)
 DocType: Purchase Invoice,Get Advances Paid,دریافت پیشرفت پرداخت
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ضمیمه تصویر شما
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,ساخت
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ساخت
 DocType: Journal Entry,Total Amount in Words,مقدار کل به عبارت
 DocType: Workflow State,Stop,توقف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,یک خطای وجود دارد. یکی از دلایل احتمالی میتواند این باشد که شما به صورت ذخیره نیست. لطفا support@erpnext.com تماس بگیرید اگر مشکل همچنان ادامه دارد.
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,بسته بندی مورد لغزش
 DocType: POS Profile,Cash/Bank Account,نقد / حساب بانکی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} نمی تواند منفی باشد
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,بایگانی
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',به روز خ
 DocType: Project,Internal,داخلی
 DocType: Task,Urgent,فوری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},لطفا یک ID ردیف معتبر برای ردیف {0} در جدول مشخص {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,برو به دسکتاپ و شروع به استفاده ERPNext
 DocType: Item,Manufacturer,سازنده
 DocType: Landed Cost Item,Purchase Receipt Item,خرید آیتم رسید
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,انبار محفوظ در سفارش فروش / به پایان رسید کالا انبار
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,فروش مقدار
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,زمان ثبت
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب‌کننده هزینه برای این رکورد هستید. لطفاٌ 'وضعیت' را روزآمد و سپس ذخیره نمایید
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب‌کننده هزینه برای این رکورد هستید. لطفاٌ 'وضعیت' را روزآمد و سپس ذخیره نمایید
 DocType: Serial No,Creation Document No,ایجاد سند بدون
 DocType: Issue,Issue,موضوع
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",صفات برای مورد انواع. به عنوان مثال اندازه، رنگ و غیره
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,در برابر
 DocType: Item,Default Selling Cost Center,به طور پیش فرض مرکز فروش هزینه
 DocType: Sales Partner,Implementation Partner,شریک اجرای
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},سفارش فروش {0} است {1}
 DocType: Opportunity,Contact Info,اطلاعات تماس
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,ساخت نوشته های سهام
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,ساخت نوشته های سهام
 DocType: Packing Slip,Net Weight UOM,وزن خالص UOM
 DocType: Item,Default Supplier,به طور پیش فرض تامین کننده
 DocType: Manufacturing Settings,Over Production Allowance Percentage,بر تولید درصد کمک هزینه
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,دریافت هفتگی فعال تاریخ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,تاریخ پایان نمی تواند کمتر از تاریخ شروع
 DocType: Sales Person,Select company name first.,انتخاب نام شرکت برای اولین بار.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,دکتر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,دکتر
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,نقل قول از تولید کنندگان دریافت کرد.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},به {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,به روز شده از طریق زمان گزارش ها
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,شماره ثبت شرکت برای رجوع کنید. شماره مالیاتی و غیره
 DocType: Sales Partner,Distributor,توزیع کننده
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,سبد خرید قانون حمل و نقل
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
 ,Ordered Items To Be Billed,آیتم ها دستور داد تا صورتحساب
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,از محدوده است که به کمتر از به محدوده
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,زمان ثبت را انتخاب کرده و ثبت برای ایجاد یک فاکتور فروش جدید.
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,مالی
 DocType: Lead,Lead,راهبر
 DocType: Email Digest,Payables,حساب های پرداختنی
 DocType: Account,Warehouse,مخزن
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,ردیف # {0}: رد تعداد می توانید در خرید بازگشت نمی شود وارد
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,ردیف # {0}: رد تعداد می توانید در خرید بازگشت نمی شود وارد
 ,Purchase Order Items To Be Billed,سفارش خرید گزینه هایی که صورتحساب
 DocType: Purchase Invoice Item,Net Rate,نرخ خالص
 DocType: Purchase Invoice Item,Purchase Invoice Item,خرید آیتم فاکتور
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,مشخصات پرد
 DocType: Global Defaults,Current Fiscal Year,سال مالی جاری
 DocType: Global Defaults,Disable Rounded Total,غیر فعال کردن گرد مجموع
 DocType: Lead,Call,دعوت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'مطالب' نمی تواند خالی باشد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'مطالب' نمی تواند خالی باشد
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},تکراری ردیف {0} را با همان {1}
 ,Trial Balance,آزمایش تعادل
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,راه اندازی کارکنان
-sites/assets/js/erpnext.min.js +5,"Grid """,شبکه "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,راه اندازی کارکنان
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,شبکه "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,پژوهش
 DocType: Maintenance Visit Purpose,Work Done,کار تمام شد
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,فرستاده
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,مشخصات لجر
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیمیترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
 DocType: Communication,Delivery Status,تحویل وضعیت
 DocType: Production Order,Manufacture against Sales Order,ساخت در برابر سفارش فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,بقیه دنیا
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,بقیه دنیا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
 ,Budget Variance Report,گزارش انحراف از بودجه
 DocType: Salary Slip,Gross Pay,پرداخت ناخالص
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,سود سهام پرداخت
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,حسابداری لجر
 DocType: Stock Reconciliation,Difference Amount,مقدار تفاوت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,سود انباشته
 DocType: BOM Item,Item Description,مورد توضیحات
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,مورد فرصت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,افتتاح موقت
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,کارمند مرخصی تعادل
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
 DocType: Address,Address Type,نوع نشانی
 DocType: Purchase Receipt,Rejected Warehouse,انبار را رد کرد
 DocType: GL Entry,Against Voucher,علیه کوپن
 DocType: Item,Default Buying Cost Center,به طور پیش فرض مرکز هزینه خرید
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",برای دریافت بهترین نتیجه را از ERPNext، توصیه می کنیم که شما را برخی از زمان و تماشای این فیلم ها به کمک.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,مورد {0} باید مورد فروش می شود
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,به
 DocType: Item,Lead Time in days,سرب زمان در روز
 ,Accounts Payable Summary,خلاصه  حسابهای  پرداختنی
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
 DocType: Journal Entry,Get Outstanding Invoices,دریافت فاکتورها برجسته
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,محل صدور
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,قرارداد
 DocType: Report,Disabled,غیر فعال
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM مورد نیاز برای UOM: {0} در مورد: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM مورد نیاز برای UOM: {0} در مورد: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,هزینه های غیر مستقیم
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ردیف {0}: تعداد الزامی است
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,کشاورزی
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,نحوه پرداخت
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
 DocType: Journal Entry Account,Purchase Order,سفارش خرید
 DocType: Warehouse,Warehouse Contact Info,انبار اطلاعات تماس
-sites/assets/js/form.min.js +190,Name is required,نام مورد نیاز است
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,نام مورد نیاز است
 DocType: Purchase Invoice,Recurring Type,تکرار نوع
 DocType: Address,City/Town,شهرستان / شهر
 DocType: Email Digest,Annual Income,درآمد سالانه
 DocType: Serial No,Serial No Details,سریال جزئیات
 DocType: Purchase Invoice Item,Item Tax Rate,مورد نرخ مالیات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,مورد {0} باید مورد-فرعی قرارداد است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,تجهیزات سرمایه
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,ویرایش توضیحات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,انتظار می رود تاریخ تحویل کمتر از برنامه ریزی شده تاریخ شروع است.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,منبع
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,منبع
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تنظیم نوع حساب کمک می کند تا در انتخاب این حساب در معاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),جمع کل (شرکت ارز)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,خروجی ها
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",فقط یک قانون حمل و نقل شرط با 0 یا مقدار خالی برای "به ارزش"
 DocType: Authorization Rule,Transaction,معامله
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,توجه: این مرکز هزینه یک گروه است. می توانید ورودی های حسابداری در برابر گروه های را ندارد.
-apps/erpnext/erpnext/config/projects.py +43,Tools,ابزار
+apps/frappe/frappe/config/desk.py +7,Tools,ابزار
 DocType: Item,Website Item Groups,گروه مورد وب سایت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,تعداد سفارش تولید برای ورود سهام تولید هدف الزامی است
 DocType: Purchase Invoice,Total (Company Currency),مجموع (شرکت ارز)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,نام ایستگاه های کاری
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ایمیل خلاصه:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
 DocType: Sales Partner,Target Distribution,توزیع هدف
-sites/assets/js/desk.min.js +7652,Comments,نظرات
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,نظرات
 DocType: Salary Slip,Bank Account No.,شماره حساب بانکی
 DocType: Naming Series,This is the number of the last created transaction with this prefix,این تعداد از آخرین معامله ایجاد شده با این پیشوند است
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},نرخ گذاری مورد نیاز برای مورد {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,لطفا ی
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,امتیاز مرخصی
 DocType: Purchase Invoice,Supplier Invoice Date,تامین کننده فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,شما نیاز به فعال کردن سبد خرید
-sites/assets/js/form.min.js +212,No Data,بدون اطلاعات
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,بدون اطلاعات
 DocType: Appraisal Template Goal,Appraisal Template Goal,هدف ارزیابی الگو
 DocType: Salary Slip,Earning,سود
 DocType: Payment Tool,Party Account Currency,حزب حساب ارز
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,حزب حساب ارز
 DocType: Purchase Taxes and Charges,Add or Deduct,اضافه کردن و یا کسر
 DocType: Company,If Yearly Budget Exceeded (for expense account),اگر بودجه سالانه بیش از (برای حساب هزینه)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,شرایط با هم تداخل دارند بین:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,علیه مجله ورودی {0} در حال حاضر در برابر برخی از کوپن های دیگر تنظیم
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,علیه مجله ورودی {0} در حال حاضر در برابر برخی از کوپن های دیگر تنظیم
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,مجموع ارزش ترتیب
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,غذا
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,محدوده سالمندی 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,تعداد بازدید ها
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",خبرنامه به مخاطبین، منجر می شود.
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},نرخ ارز از بستن حساب باید {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع امتیاز ها برای تمام اهداف باید 100. شود این است که {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,عملیات نمی تواند خالی باشد.
 ,Delivered Items To Be Billed,آیتم ها تحویل داده شده به صورتحساب می شود
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,انبار می توانید برای شماره سریال نمی تواند تغییر
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},وضعیت به روز شده برای {0}
 DocType: DocField,Description,شرح
 DocType: Authorization Rule,Average Discount,میانگین تخفیف
 DocType: Letter Head,Is Default,آیا پیش فرض
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,مبلغ مالیات مورد
 DocType: Item,Maintain Stock,حفظ سهام
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,مطالب سهام در حال حاضر برای سفارش تولید ایجاد
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالی بگذارید اگر برای همه در نظر گرفته نامگذاریهای
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع 'واقعی' در ردیف {0} نمی تواند در مورد نرخ شامل
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع 'واقعی' در ردیف {0} نمی تواند در مورد نرخ شامل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},حداکثر: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,از تاریخ ساعت
 DocType: Email Digest,For Company,برای شرکت
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,حمل و نقل آدرس
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ساختار حسابها
 DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,گارانتی / AMC وضعیت
 DocType: GL Entry,GL Entry,GL ورود
 DocType: HR Settings,Employee Settings,تنظیمات کارمند
 ,Batch-Wise Balance History,دسته حکیم تاریخچه تعادل
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,فهرست کارهای
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,فهرست کارهای
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,شاگرد
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,تعداد منفی مجاز نیست
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,دفتر اجاره
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,تنظیمات دروازه راه اندازی SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,واردات نشد!
-sites/assets/js/erpnext.min.js +24,No address added yet.,بدون آدرس اضافه نشده است.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,بدون آدرس اضافه نشده است.
 DocType: Workstation Working Hour,Workstation Working Hour,ایستگاه های کاری کار یک ساعت
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,روانکاو
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به مقدار JV {2}
 DocType: Item,Inventory,فهرست
 DocType: Features Setup,"To enable ""Point of Sale"" view",برای فعال کردن "نقطه ای از فروش" مشاهده
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,پرداخت می توانید برای سبد خرید خالی نمی شود ساخته شده
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,پرداخت می توانید برای سبد خرید خالی نمی شود ساخته شده
 DocType: Item,Sales Details,جزییات فروش
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,پین کردن
 DocType: Opportunity,With Items,با اقلام
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",از تاریخ فاکتور بعدی تولید خواهد شد. این است که در ارائه تولید می شود.
 DocType: Item Attribute,Item Attribute,صفت مورد
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,دولت
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,انواع آیتم
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,انواع آیتم
 DocType: Company,Services,خدمات
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),مجموع ({0})
 DocType: Cost Center,Parent Cost Center,مرکز هزینه پدر و مادر
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,مالی سال تاریخ شروع
 DocType: Employee External Work History,Total Experience,تجربه ها
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,حمل و نقل و حمل و نقل اتهامات
 DocType: Material Request Item,Sales Order No,سفارش فروش بدون
 DocType: Item Group,Item Group Name,مورد نام گروه
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,گرفته
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,گرفته
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,انتقال مواد برای تولید
 DocType: Pricing Rule,For Price List,برای اطلاع از قیمت
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,اجرایی جستجو
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,برنامه
 DocType: Purchase Invoice Item,Net Amount,مقدار خالص
 DocType: Purchase Order Item Supplied,BOM Detail No,جزئیات BOM بدون
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),تخفیف اضافی مبلغ (ارز شرکت)
-DocType: Period Closing Voucher,CoA Help,کوآ راهنما
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},خطا: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},خطا: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,لطفا حساب جدید را از نمودار از حساب ایجاد کنید.
 DocType: Maintenance Visit,Maintenance Visit,نگهداری و تعمیرات مشاهده
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,مشتری> مشتری گروه> منطقه
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,فرود هزینه راهنما
 DocType: Event,Tuesday,سهشنبه
 DocType: Leave Block List,Block Holidays on important days.,تعطیلات بلوک در روز مهم است.
 ,Accounts Receivable Summary,خلاصه حسابهای دریافتنی
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},برگ برای نوع {0} در حال حاضر برای کارمند {1} اختصاص داده شده برای دوره {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,لطفا درست ID کاربر در یک پرونده کارمند به مجموعه نقش کارمند تنظیم
 DocType: UOM,UOM Name,نام UOM
 DocType: Top Bar Item,Target,هدف
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,فروش شریک هدف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},ثبت حسابداری برای {0} تنها می تواند در ارز ساخته شده است: {1}
 DocType: Pricing Rule,Pricing Rule,قانون قیمت گذاری
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,اهمیت حیاتی
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,درخواست مواد به خرید سفارش
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,درخواست مواد به خرید سفارش
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ردیف # {0}: برگشتی مورد {1} در وجود دارد نمی {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,حساب های بانکی
 ,Bank Reconciliation Statement,صورتحساب مغایرت گیری بانک
 DocType: Address,Lead Name,نام راهبر
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,باز کردن تعادل سهام
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,باز کردن تعادل سهام
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} باید تنها یک بار به نظر می رسد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},مجاز به tranfer تر {0} از {1} در برابر سفارش خرید {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},برگ با موفقیت برای اختصاص {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},برگ با موفقیت برای اختصاص {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,هیچ آیتمی برای بسته
 DocType: Shipping Rule Condition,From Value,از ارزش
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,ساخت تعداد الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,ساخت تعداد الزامی است
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,مقدار به بانک منعکس نشده است
 DocType: Quality Inspection Reading,Reading 4,خواندن 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ادعای هزینه شرکت.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,تماس با موبایل بدون
 DocType: Production Planning Tool,Select Sales Orders,سفارشات فروش را انتخاب
 ,Material Requests for which Supplier Quotations are not created,درخواست مواد که نقل قول تامین کننده ایجاد نمی
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,برای پیگیری موارد با استفاده از بارکد. شما قادر به ورود به اقلام در توجه داشته باشید تحویل و فاکتور فروش توسط اسکن بارکد مورد خواهد بود.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,علامت گذاری به عنوان تحویل
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,را نقل قول
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,سعی کنید برنامه ریزی عملیات به مدت چند روز X در پیش است.
 DocType: HR Settings,Stop Birthday Reminders,توقف تولد یادآوری
 DocType: SMS Center,Receiver List,فهرست گیرنده
 DocType: Payment Tool Detail,Payment Amount,مبلغ پرداختی
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,مقدار مصرف
-sites/assets/js/erpnext.min.js +51,{0} View,{0} نمایش
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} نمایش
 DocType: Salary Structure Deduction,Salary Structure Deduction,کسر ساختار حقوق و دستمزد
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,پخت لیزر انتخابی
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,واردات موفق!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,هزینه اقلام صادر شده
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,به طور پیش فرض پرداخت
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",تنظیمات برای سبد خرید آنلاین مانند قوانین حمل و نقل، لیست قیمت و غیره
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,راه اندازی کامل
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}٪ صورتحساب
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,این سایت متعلق به تعداد
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,این سایت متعلق به تعداد
 DocType: Party Account,Party Account,حساب حزب
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,منابع انسانی
 DocType: Lead,Upper Income,درآمد بالاتر
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,فعال سبد خرید
 DocType: Employee,Permanent Address,آدرس دائمی
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,مورد {0} باید مورد خدمات باشد.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",پیشرفت در برابر {0} {1} نمی تواند بیشتر پرداخت می شود \ از جمع کل {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,لطفا کد مورد را انتخاب کنید
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),کاهش کسر برای مرخصی بدون حقوق (LWP)
 DocType: Territory,Territory Manager,مدیر منطقه
+DocType: Delivery Note Item,To Warehouse (Optional),به انبار (اختیاری)
 DocType: Sales Invoice,Paid Amount (Company Currency),مبلغ پرداخت شده (شرکت ارز)
 DocType: Purchase Invoice,Additional Discount,تخفیف اضافی
 DocType: Selling Settings,Selling Settings,فروش تنظیمات
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,بین وزنها
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,استخراج معدن
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ریخته گری رزین
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,لطفا {0} انتخاب کنید.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,لطفا {0} انتخاب کنید.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},متن {0}
 DocType: Territory,Parent Territory,سرزمین پدر و مادر
 DocType: Quality Inspection Reading,Reading 2,خواندن 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,دسته بدون
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,اجازه چندین سفارشات فروش در برابر خرید سفارش مشتری
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,اصلی
 DocType: DocPerm,Delete,حذف کردن
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,نوع دیگر
-sites/assets/js/desk.min.js +7971,New {0},جدید {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,نوع دیگر
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},جدید {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,منظور متوقف نمی تواند لغو شود. Unstop برای لغو.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,منظور متوقف نمی تواند لغو شود. Unstop برای لغو.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
 DocType: Employee,Leave Encashed?,ترک نقد شدنی؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت از فیلد اجباری است
 DocType: Item,Variants,انواع
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,کشور
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,نشانی ها
 DocType: Communication,Received,رسیده
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},تکراری سریال بدون برای مورد وارد {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,یک شرط برای یک قانون ارسال کالا
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,مورد مجاز به سفارش تولید.
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,سلام
 DocType: Communication,Rejected,رد
 DocType: Pricing Rule,Brand,مارک
 DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,٪ تحویل شده
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,موارد نرم افزاری در زمان فروش.
 DocType: Sales Order Item,Actual Qty,تعداد واقعی
 DocType: Sales Invoice Item,References,مراجع
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,موی مرا کوتاه کنید
 DocType: Item,Has Variants,دارای انواع
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,در 'را فاکتور فروش' را فشار دهید کلیک کنید برای ایجاد یک فاکتور فروش جدید.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,دوره و دوره به تاریخ اجباری برای دوره ای در محدوده٪ s را
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,بسته بندی و برچسب زدن
 DocType: Monthly Distribution,Name of the Monthly Distribution,نام توزیع ماهانه
 DocType: Sales Person,Parent Sales Person,شخص پدر و مادر فروش
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,لطفا پیش فرض ارز در شرکت استاد و به طور پیش فرض در جهان مشخص
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox به دسترسی راز
 DocType: Purchase Invoice,Recurring Invoice,فاکتور در محدوده زمانی معین
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,مدیریت پروژه
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,مدیریت پروژه
 DocType: Supplier,Supplier of Goods or Services.,تامین کننده کالا یا خدمات.
 DocType: Budget Detail,Fiscal Year,سال مالی
 DocType: Cost Center,Budget,بودجه
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,فروش
 DocType: Employee,Salary Information,اطلاعات حقوق و دستمزد
 DocType: Sales Person,Name and Employee ID,نام و کارمند ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
 DocType: Website Item Group,Website Item Group,وب سایت مورد گروه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,وظایف و مالیات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,لطفا تاریخ مرجع وارد
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} نوشته های پرداخت نمی تواند فیلتر {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,لطفا تاریخ مرجع وارد
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} نوشته های پرداخت نمی تواند فیلتر {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,جدول برای مورد است که در وب سایت نشان داده خواهد شد
 DocType: Purchase Order Item Supplied,Supplied Qty,عرضه تعداد
 DocType: Material Request Item,Material Request Item,مورد درخواست مواد
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,درخت گروه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,می توانید تعداد ردیف بزرگتر یا مساوی به تعداد سطر فعلی برای این نوع شارژ مراجعه نمی
 ,Item-wise Purchase History,تاریخچه خرید مورد عاقلانه
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,قرمز
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا بر روی 'ایجاد برنامه "کلیک کنید و به واکشی سریال بدون برای مورد اضافه شده است {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا بر روی 'ایجاد برنامه "کلیک کنید و به واکشی سریال بدون برای مورد اضافه شده است {0}
 DocType: Account,Frozen,یخ زده
 ,Open Production Orders,سفارشات تولید گسترش
 DocType: Installation Note,Installation Time,زمان نصب و راه اندازی
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,روند نقل قول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",عنوان سفارش تولید می توان برای این آیتم به ساخته شده، آن را باید یک مورد سهام باشد.
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",عنوان سفارش تولید می توان برای این آیتم به ساخته شده، آن را باید یک مورد سهام باشد.
 DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,پیوستن
 DocType: Authorization Rule,Above Value,بالاتر از ارزش 
 ,Pending Amount,در انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,تحویل
+DocType: Purchase Order,Delivered,تحویل
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),راه اندازی سرور های دریافتی برای شغل ایمیل ID. (به عنوان مثال jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,تعداد خودرو
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,از تاریخ تکرار می شود فاکتور را متوقف خواهد کرد
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,توزیع اتهاما
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,حساب {0} باید از نوع 'دارائی های ثابت' به عنوان مورد {1} مورد دارایی است
 DocType: HR Settings,HR Settings,تنظیمات HR
 apps/frappe/frappe/config/setup.py +130,Printing,چاپ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,ادعای هزینه منتظر تأیید است. تنها تصویب هزینه می توانید وضعیت به روز رسانی.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ادعای هزینه منتظر تأیید است. تنها تصویب هزینه می توانید وضعیت به روز رسانی.
 DocType: Purchase Invoice,Additional Discount Amount,تخفیف اضافی مبلغ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده می تعطیلات. شما نیاز به درخواست برای ترک نخواهد کرد.
-sites/assets/js/desk.min.js +7805,and,و
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,و
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,مخفف نمیتواند خالی باشد یا فضای
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,ورزشی
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,نقل قول
 DocType: Salary Slip,Total Deduction,کسر مجموع
 DocType: Quotation,Maintenance User,کاربر نگهداری 
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,هزینه به روز رسانی
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,آیا مطمئن هستید که می خواهید به UNSTOP
 DocType: Employee,Date of Birth,تاریخ تولد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,مورد {0} در حال حاضر بازگشت شده است
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ** سال مالی نشان دهنده یک سال مالی. تمام پست های حسابداری و دیگر معاملات عمده در برابر سال مالی ** ** ردیابی.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",پیگیری فروش مبارزات نگه دارید. آهنگ از آگهی های نقل قول نگه دارید، سفارش فروش و غیره را از مبارزات برای ارزیابی بازگشت سرمایه گذاری.
 DocType: Expense Claim,Approver,تصویب
 ,SO Qty,SO تعداد
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",نوشته های سهام در مقابل انبار وجود داشته باشد {0}، از این رو شما می توانید دوباره اختصاص و یا تغییر انبار
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",نوشته های سهام در مقابل انبار وجود داشته باشد {0}، از این رو شما می توانید دوباره اختصاص و یا تغییر انبار
 DocType: Appraisal,Calculate Total Score,محاسبه مجموع امتیاز
 DocType: Supplier Quotation,Manufacturing Manager,ساخت مدیر
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},سریال بدون {0} است تحت گارانتی تا {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,تقسیم توجه داشته باشید تحویل بسته بندی شده.
 apps/erpnext/erpnext/hooks.py +84,Shipments,محموله
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,قالب ریزی و سازه شیب
+DocType: Purchase Order,To be delivered to customer,به مشتری تحویل
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,زمان ورود وضعیت باید ارائه شود.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,سریال نه {0} به هیچ انبار تعلق ندارد
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,راه اندازی
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,از ارز
 DocType: DocField,Name,نام
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},سفارش فروش مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},سفارش فروش مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,مقدار در سیستم منعکس نشده است
 DocType: Purchase Invoice Item,Rate (Company Currency),نرخ (شرکت ارز)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,دیگران
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,تنظیم به عنوان متوقف
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,می توانید یک آیتم تطبیق پیدا کند. لطفا برخی از ارزش های دیگر برای {0} را انتخاب کنید.
 DocType: POS Profile,Taxes and Charges,مالیات و هزینه
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",یک محصول یا یک سرویس است که خریداری شده، به فروش می رسد و یا نگه داشته در انبار.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,می توانید نوع اتهام به عنوان 'در مقدار قبلی Row را انتخاب کنید و یا' در ردیف قبلی مجموع برای سطر اول
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,انتخاب DOCTYPE
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,لنجرنج
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,بانکداری
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,لطفا بر روی 'ایجاد برنامه' کلیک کنید برای دریافت برنامه
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,مرکز هزینه جدید
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,مرکز هزینه جدید
 DocType: Bin,Ordered Quantity,تعداد دستور داد
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",به عنوان مثال "ابزار برای سازندگان ساخت"
 DocType: Quality Inspection,In Process,در حال انجام
 DocType: Authorization Rule,Itemwise Discount,Itemwise تخفیف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
+DocType: Purchase Order Item,Reference Document Type,مرجع نوع سند
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
 DocType: Account,Fixed Asset,دارائی های ثابت
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,پرسشنامه سریال
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,پرسشنامه سریال
 DocType: Activity Type,Default Billing Rate,به طور پیش فرض نرخ صدور صورت حساب
 DocType: Time Log Batch,Total Billing Amount,کل مقدار حسابداری
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,حساب دریافتنی
 ,Stock Balance,تعادل سهام
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,سفارش فروش به پرداخت
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,سفارش فروش به پرداخت
 DocType: Expense Claim Detail,Expense Claim Detail,هزینه جزئیات درخواست
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,زمان ثبت ایجاد:
 DocType: Item,Weight UOM,وزن UOM
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,اعتبار به حساب باید یک حساب کاربری پرداختنی شود
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
 DocType: Production Order Operation,Completed Qty,تکمیل تعداد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",برای {0}، تنها حساب های بانکی را می توان در برابر ورود اعتباری دیگر مرتبط
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,لیست قیمت {0} غیر فعال است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",برای {0}، تنها حساب های بانکی را می توان در برابر ورود اعتباری دیگر مرتبط
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,لیست قیمت {0} غیر فعال است
 DocType: Manufacturing Settings,Allow Overtime,اجازه اضافه کاری
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,سفارش فروش {0} متوقف شده است
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} شماره سریال مورد نیاز برای مورد {1}. شما فراهم کرده اید {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,نرخ گذاری کنونی
 DocType: Item,Customer Item Codes,کدهای مورد مشتری
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,جوش
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,جدید بورس UOM مورد نیاز است
 DocType: Quality Inspection,Sample Size,اندازهی نمونه
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',لطفا یک معتبر را مشخص 'از مورد شماره'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,مراکز هزینه به علاوه می تواند در زیر گروه ساخته شده اما مطالب را می توان در برابر غیر گروه ساخته شده
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,مراکز هزینه به علاوه می تواند در زیر گروه ساخته شده اما مطالب را می توان در برابر غیر گروه ساخته شده
 DocType: Project,External,خارجی
 DocType: Features Setup,Item Serial Nos,مورد سریال شماره
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,کاربران و ویرایش
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,آدرس و اطلاعات تماس
 DocType: SMS Log,Sender Name,نام فرستنده
 DocType: Page,Title,عنوان
-sites/assets/js/list.min.js +104,Customize,سفارشی
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,سفارشی
 DocType: POS Profile,[Select],[انتخاب]
 DocType: SMS Log,Sent To,فرستادن به
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,را فاکتور فروش
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,پایان زندگی
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,سفر
 DocType: Leave Block List,Allow Users,کاربران اجازه می دهد
+DocType: Purchase Order,Customer Mobile No,مشتری تلفن همراه بدون
 DocType: Sales Invoice,Recurring,در محدوده زمانی معین
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,پیگیری درآمد و هزینه جداگانه برای محصول و یا عمودی بخش.
 DocType: Rename Tool,Rename Tool,ابزار تغییر نام
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,به روز رسانی هزینه
 DocType: Item Reorder,Item Reorder,مورد ترتیب مجدد
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,مواد انتقال
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,مواد انتقال
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",مشخص عملیات، هزینه های عملیاتی و به یک عملیات منحصر به فرد بدون به عملیات خود را.
 DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,کارمند
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,واردات از ایمیل
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,دعوت به عنوان کاربر
 DocType: Features Setup,After Sale Installations,پس از نصب فروش
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب شده است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب شده است
 DocType: Workstation Working Hour,End Time,پایان زمان
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شرایط قرارداد استاندارد برای فروش و یا خرید.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,گروه های کوپن
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,پستی دسته جمعی
 DocType: Page,Standard,استاندارد
 DocType: Rename Tool,File to Rename,فایل برای تغییر نام
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},شماره سفارش Purchse مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,نمایش پرداخت
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM تعیین {0} برای مورد وجود ندارد {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات برنامه {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات برنامه {0} باید قبل از لغو این سفارش فروش لغو
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,اندازه
 DocType: Notification Control,Expense Claim Approved,ادعای هزینه تایید
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,دارویی
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,حضور و غیاب به روز
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),راه اندازی سرور های دریافتی برای ایمیل فروش شناسه. (به عنوان مثال sales@example.com)
 DocType: Warranty Claim,Raised By,مطرح شده توسط
 DocType: Payment Tool,Payment Account,حساب پرداخت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
-sites/assets/js/list.min.js +23,Draft,پیش نویس
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,پیش نویس
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,جبرانی فعال
 DocType: Quality Inspection Reading,Accepted,پذیرفته
 DocType: User,Female,زن
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,قانون حمل و نقل برچسب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
 DocType: Newsletter,Test,تست
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",همانطور که معاملات سهام موجود برای این آیتم به، \ شما می توانید مقادیر تغییر نمی کند ندارد سریال '،' دارای دسته ای بدون '،' آیا مورد سهام "و" روش های ارزش گذاری '
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,شما می توانید نرخ تغییر اگر BOM agianst هر مورد ذکر شده
 DocType: Employee,Previous Work Experience,قبلی سابقه کار
 DocType: Stock Entry,For Quantity,برای کمیت
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} ثبت نشده است
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,درخواست ها برای اقلام است.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} ثبت نشده است
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,درخواست ها برای اقلام است.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سفارش تولید جداگانه خواهد شد برای هر مورد خوب به پایان رسید ساخته شده است.
 DocType: Purchase Invoice,Terms and Conditions1,شرایط و Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,راه اندازی کامل
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,عضویت در 
 DocType: Delivery Note,Transporter Name,نام حمل و نقل
 DocType: Contact,Enter department to which this Contact belongs,بخش وارد کنید که این تماس به آن تعلق
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,مجموع غایب
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,موردی یا انبار ردیف {0} مطابقت ندارد درخواست مواد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,موردی یا انبار ردیف {0} مطابقت ندارد درخواست مواد
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,واحد اندازه گیری
 DocType: Fiscal Year,Year End Date,سال پایان تاریخ
 DocType: Task Depends On,Task Depends On,کار بستگی به
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,قرارداد تاریخ پایان باید از تاریخ پیوستن بیشتر
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,توزیع کننده شخص ثالث / فروشنده / نماینده کمیسیون / وابسته به / نمایندگی فروش که به فروش می رساند محصولات شرکت برای کمیسیون.
 DocType: Customer Group,Has Child Node,دارای گره فرزند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} در برابر سفارش خرید {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} در برابر سفارش خرید {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",پارامترهای URL شخص را اینجا وارد کنید (به عنوان مثال فرستنده = ERPNext، نام کاربری = ERPNext و رمز = 1234 و غیره)
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} در هر سال مالی فعال است. برای جزئیات بیشتر {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,این یک مثال وب سایت خودکار تولید شده از ERPNext
@@ -2021,11 +2032,9 @@ DocType: Note,Note,یادداشت
 DocType: Purchase Receipt Item,Recd Quantity,Recd تعداد
 DocType: Email Account,Email Ids,ایمیل شناسه
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,تنظیم به عنوان Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
 DocType: Payment Reconciliation,Bank / Cash Account,حساب بانک / نقدی
 DocType: Tax Rule,Billing City,صدور صورت حساب شهر
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,این برنامه مرخصی منتظر تأیید است. فقط مرخصی تصویب می توانید وضعیت به روز رسانی.
 DocType: Global Defaults,Hide Currency Symbol,مخفی ارز نماد
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card",به عنوان مثال بانکی، پول نقد، کارت اعتباری
 DocType: Journal Entry,Credit Note,اعتبار توجه داشته باشید
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),مجموع (تعداد
 DocType: Installation Note Item,Installed Qty,نصب تعداد
 DocType: Lead,Fax,فکس
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,ارسال شده
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,ارسال شده
 DocType: Salary Structure,Total Earning,سود مجموع
 DocType: Purchase Receipt,Time at which materials were received,زمانی که در آن مواد دریافت شده
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,آدرس من
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,شاخه سا
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,یا
 DocType: Sales Order,Billing Status,حسابداری وضعیت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,هزینه آب و برق
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-بالاتر از
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-بالاتر از
 DocType: Buying Settings,Default Buying Price List,به طور پیش فرض لیست قیمت خرید
 ,Download Backups,دانلود پشتیبان گیری
 DocType: Notification Control,Sales Order Message,سفارش فروش پیام
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,انتخاب کارمندان
 DocType: Bank Reconciliation,To Date,به روز
 DocType: Opportunity,Potential Sales Deal,معامله فروش بالقوه
-sites/assets/js/form.min.js +308,Details,جزئیات
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,جزئیات
 DocType: Purchase Invoice,Total Taxes and Charges,مجموع مالیات و هزینه
 DocType: Employee,Emergency Contact,تماس اضطراری
 DocType: Item,Quality Parameters,پارامترهای کیفیت
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,دریافت تعداد
 DocType: Stock Entry Detail,Serial No / Batch,سریال بدون / دسته
 DocType: Product Bundle,Parent Item,مورد پدر و مادر
 DocType: Account,Account Type,نوع حساب
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی 'ایجاد برنامه کلیک کنید
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی 'ایجاد برنامه کلیک کنید
 ,To Produce,به تولید
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",برای ردیف {0} در {1}. شامل {2} در مورد نرخ، ردیف {3} نیز باید گنجانده شود
 DocType: Packing Slip,Identification of the package for the delivery (for print),شناسایی بسته برای تحویل (برای چاپ)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,تنظیمات کوپن
 DocType: Account,Income Account,حساب درآمد
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,قالب ریزی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,تحویل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,تحویل
 DocType: Stock Reconciliation Item,Current Qty,تعداد کنونی
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",نگاه کنید به "نرخ مواد بر اساس" در هزینه یابی بخش
 DocType: Appraisal Goal,Key Responsibility Area,منطقه مسئولیت های کلیدی
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,تمام آدرس.
 DocType: Company,Stock Settings,تنظیمات سهام
 DocType: User,Bio,بیوگرافی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,مدیریت مشتری گروه درخت.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,نام مرکز هزینه
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,نام مرکز هزینه
 DocType: Leave Control Panel,Leave Control Panel,ترک کنترل پنل
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,بدون پیش فرض آدرس الگو در بر داشت. لطفا یکی از جدید از راه اندازی> چاپ و نام تجاری> آدرس الگو ایجاد کنید.
 DocType: Appraisal,HR User,HR کاربر
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,جزئیات ابزار پرداخت
 ,Sales Browser,مرورگر فروش
 DocType: Journal Entry,Total Credit,مجموع اعتباری
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,محلی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,محلی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),وام و پیشرفت (دارایی)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,بدهکاران
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,بزرگ
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,بدون کارمند پیدا نشد!
 DocType: C-Form Invoice Detail,Territory,خاک
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
+DocType: Purchase Order,Customer Address Display,آدرس مشتری ها
 DocType: Stock Settings,Default Valuation Method,روش های ارزش گذاری پیش فرض
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,پرداخت
 DocType: Production Order Operation,Planned Start Time,برنامه ریزی زمان شروع
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,اختصاص داده
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,بستن ترازنامه و سود کتاب یا از دست دادن.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",واحد اندازه گیری پیش فرض برای مورد {0} نمی تواند مستقیما تغییر داد، زیرا \ شما در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. به تغییر پیش فرض UOM، \ با استفاده از "UOM جایگزین سودمند 'ابزار تحت ماژول انبار.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,مشخص نرخ ارز برای تبدیل یک ارز به ارز را به یکی دیگر
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,نقل قول {0} لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,نقل قول {0} لغو
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,مجموع مقدار برجسته
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,کارمند {0} در مرخصی بود {1}. آیا می توانم حضور علامت نیست.
 DocType: Sales Partner,Targets,اهداف
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,این یک گروه مشتری ریشه است و نمی تواند ویرایش شود.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,لطفا راه اندازی نمودار خود را از حساب شما قبل از شروع مطالب حسابداری
 DocType: Purchase Invoice,Ignore Pricing Rule,نادیده گرفتن قانون قیمت گذاری
-sites/assets/js/list.min.js +24,Cancelled,لغو شد
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,لغو شد
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,از تاریخ در ساختار حقوق و دستمزد نمی تواند کمتر از کارمند پیوستن به تاریخ.
 DocType: Employee Education,Graduate,فارغ التحصیل
 DocType: Leave Block List,Block Days,بلوک روز
 DocType: Journal Entry,Excise Entry,مالیات غیر مستقیم ورود
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},هشدار: سفارش فروش {0} حال حاضر در برابر خرید سفارش مشتری وجود دارد {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},هشدار: سفارش فروش {0} حال حاضر در برابر خرید سفارش مشتری وجود دارد {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,سهام دریافتی اما ص
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ناخالص پرداخت + تعویق وام مبلغ + Encashment مقدار - کسر مجموع
 DocType: Monthly Distribution,Distribution Name,نام توزیع
 DocType: Features Setup,Sales and Purchase,فروش و خرید
-DocType: Purchase Order Item,Material Request No,درخواست مواد بدون
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
+DocType: Supplier Quotation Item,Material Request No,درخواست مواد بدون
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,سرعت که در آن مشتری ارز به ارز پایه شرکت تبدیل
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} با موفقیت از این لیست لغو شد.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),نرخ خالص (شرکت ارز)
-apps/frappe/frappe/templates/base.html +132,Added,اضافه شده
+apps/frappe/frappe/templates/base.html +134,Added,اضافه شده
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,مدیریت درخت منطقه.
 DocType: Journal Entry Account,Sales Invoice,فاکتور فروش
 DocType: Journal Entry Account,Party Balance,تعادل حزب
 DocType: Sales Invoice Item,Time Log Batch,زمان ورود دسته ای
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,لطفا درخواست تخفیف را انتخاب کنید
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,لطفا درخواست تخفیف را انتخاب کنید
 DocType: Company,Default Receivable Account,به طور پیش فرض دریافتنی حساب
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ایجاد بانک برای ورود به حقوق و دستمزد کل پرداخت شده برای معیارهای فوق انتخاب شده
 DocType: Stock Entry,Material Transfer for Manufacture,انتقال مواد برای تولید
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,دریافت مطالب مرت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,ثبت حسابداری برای انبار
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,ضرب
 DocType: Sales Invoice,Sales Team1,Team1 فروش
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,مورد {0} وجود ندارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,مورد {0} وجود ندارد
 DocType: Sales Invoice,Customer Address,آدرس مشتری
 apps/frappe/frappe/desk/query_report.py +136,Total,کل
 DocType: Purchase Invoice,Apply Additional Discount On,درخواست تخفیف اضافی
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,بازرسی کیفیت
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,بسیار کوچک
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,اسپری تشکیل
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,حساب {0} منجمد است
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,حساب {0} منجمد است
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,حقوقی نهاد / جانبی با نمودار جداگانه حساب متعلق به سازمان.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",مواد غذایی، آشامیدنی و دخانیات
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL یا BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,نرخ کمیسیون نمی تواند بیشتر از 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,حداقل سطح موجودی
 DocType: Stock Entry,Subcontract,مقاطعه کاری فرعی
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,لطفا ابتدا وارد {0}
 DocType: Production Planning Tool,Get Items From Sales Orders,گرفتن اقلام از سفارشات فروش
 DocType: Production Order Operation,Actual End Time,پایان زمان واقعی
 DocType: Production Planning Tool,Download Materials Required,دانلود مواد مورد نیاز
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,برنامه ریزی
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",لطفا آیتم را انتخاب کنید که در آن "آیا مورد سهام" است "نه" و "آیا مورد فروش" است "بله" است و هیچ بسته نرم افزاری محصولات دیگر وجود دارد
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,انتخاب توزیع ماهانه به طور یکنواخت توزیع در سراسر اهداف ماه می باشد.
 DocType: Purchase Invoice Item,Valuation Rate,نرخ گذاری
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,مورد ردیف {0}: رسید خرید {1} در جدول بالا 'خرید رسید' وجود ندارد
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},کارمند {0} در حال حاضر برای اعمال {1} {2} بین و {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},کارمند {0} در حال حاضر برای اعمال {1} {2} بین و {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,پروژه تاریخ شروع
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,تا
 DocType: Rename Tool,Rename Log,تغییر نام ورود
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,تنها برگ در معامله اجازه
 DocType: Expense Claim,Expense Approver,تصویب هزینه
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,مورد رسید خرید عرضه
-sites/assets/js/erpnext.min.js +48,Pay,پرداخت
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,پرداخت
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,به تاریخ ساعت
 DocType: SMS Settings,SMS Gateway URL,URL SMS دروازه
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,سیاهههای مربوط به حفظ وضعیت تحویل اس ام اس
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,پر زحمت
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,کوچک کردن کاغذ بسته بندی
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,فعالیت در انتظار
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,فعالیت در انتظار
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,تایید شده
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,تامین کننده> تامین کننده نوع
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ن
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,روزنامه
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,انتخاب سال مالی
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,قال
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,شما تصویب مرخصی برای این سابقه بوده است. لطفا "وضعیت و ذخیره به روز رسانی
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ترتیب مجدد سطح
 DocType: Attendance,Attendance Date,حضور و غیاب عضویت
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,فروپاشی حقوق و دستمزد بر اساس سود و کسر.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,مرکز هزینه با معاملات موجود می تواند به گروه تبدیل می شود
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,استهلاک
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),تامین کننده (بازدید کنندگان)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,دوره نامعتبر
 DocType: Customer,Credit Limit,محدودیت اعتبار
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,انتخاب نوع معامله
 DocType: GL Entry,Voucher No,کوپن بدون
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,ال
 DocType: Customer,Address and Contact,آدرس و تماس با
 DocType: Customer,Last Day of the Next Month,آخرین روز از ماه آینده
 DocType: Employee,Feedback,باز خورد
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,نگهداری. برنامه
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,نگهداری. برنامه
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ماشینکاری جت ساینده
 DocType: Stock Settings,Freeze Stock Entries,یخ مطالب سهام
 DocType: Website Settings,Website Settings,تنظیمات وب سایت
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,خروجی
 DocType: Material Request,Requested For,درخواست برای
 DocType: Quotation Item,Against Doctype,علیه DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,پیگیری این تحویل توجه داشته باشید در مقابل هر پروژه
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,حساب کاربری ریشه نمی تواند حذف شود
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,حساب کاربری ریشه نمی تواند حذف شود
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,نمایش مطالب سهام
 ,Is Primary Address,آدرس اولیه است
 DocType: Production Order,Work-in-Progress Warehouse,کار در حال پیشرفت انبار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,مدیریت آدرس
 DocType: Pricing Rule,Item Code,کد مورد
 DocType: Production Planning Tool,Create Production Orders,ایجاد سفارشات تولید
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,نکته کاربری
 DocType: Lead,Market Segment,بخش بازار
 DocType: Communication,Phone,تلفن
 DocType: Employee Internal Work History,Employee Internal Work History,کارمند داخلی سابقه کار
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),بسته شدن (دکتر)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),بسته شدن (دکتر)
 DocType: Contact,Passive,غیر فعال
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,سریال بدون {0} در سهام
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,قالب های مالیاتی برای فروش معاملات.
 DocType: Sales Invoice,Write Off Outstanding Amount,ارسال فعال برجسته مقدار
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",اگر شما نیاز به بررسی فاکتورها در محدوده زمانی معین اتوماتیک. پس از ارائه هر فاکتور فروش، دوره بخش قابل مشاهده خواهد بود.
 DocType: Account,Accounts Manager,مدیر حساب
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',زمان ورود {0} باید 'فرستاده'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',زمان ورود {0} باید 'فرستاده'
 DocType: Stock Settings,Default Stock UOM,به طور پیش فرض بورس UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),هزینه یابی نرخ بر اساس نوع فعالیت (در ساعت)
 DocType: Production Planning Tool,Create Material Requests,ایجاد درخواست مواد
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,مغایرت گیری بانک
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,دریافت به روز رسانی
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,اضافه کردن چند پرونده نمونه
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,ترک مدیریت
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,ترک مدیریت
 DocType: Event,Groups,گروه
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,گروه های حساب
 DocType: Sales Order,Fully Delivered,به طور کامل تحویل
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,فروش افزودنیهای پیشنهاد شده
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} بودجه برای حساب {1} در برابر مرکز هزینه {2} خواهد تجاوز {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,برگ فرستاده حمل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
 ,Stock Projected Qty,سهام بینی تعداد
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
 DocType: Sales Order,Customer's Purchase Order,سفارش خرید مشتری
 DocType: Warranty Claim,From Company,از شرکت
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ارزش و یا تعداد
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,خرده فروش
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,انواع تامین کننده
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,نگهداری و تعمیرات برنامه مورد
 DocType: Sales Order,%  Delivered,٪ تحویل شده
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,بانک حساب چک بی محل
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,را لغزش حقوق
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Unstop
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,مرور BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,وام
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,محصولات عالی
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,ارزیابی
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ریخته گری را از دست داده-فوم
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,نقشه کشی
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,تاریخ تکرار شده است
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},ترک تصویب شود باید یکی از {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},ترک تصویب شود باید یکی از {0}
 DocType: Hub Settings,Seller Email,فروشنده ایمیل
 DocType: Project,Total Purchase Cost (via Purchase Invoice),هزینه خرید مجموع (از طریق خرید فاکتور)
 DocType: Workstation Working Hour,Start Time,زمان شروع
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),مبلغ خالص (شرکت ارز)
 DocType: BOM Operation,Hour Rate,یک ساعت یک نرخ
 DocType: Stock Settings,Item Naming By,مورد نامگذاری توسط
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,از عبارت
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},یکی دیگر از ورودی اختتامیه دوره {0} شده است پس از ساخته شده {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,از عبارت
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},یکی دیگر از ورودی اختتامیه دوره {0} شده است پس از ساخته شده {1}
 DocType: Production Order,Material Transferred for Manufacturing,مواد منتقل ساخت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,حساب {0} می کند وجود دارد نمی
 DocType: Purchase Receipt Item,Purchase Order Item No,خرید سفارش هیچ موردی
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,مورد نیاز بازرسی
 DocType: Purchase Invoice Item,PR Detail,PR جزئیات
 DocType: Sales Order,Fully Billed,به طور کامل صورتحساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,پول نقد در دست
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},انبار تحویل مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},انبار تحویل مورد نیاز برای سهام مورد {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),وزن ناخالص از بسته. معمولا وزن خالص + وزن مواد بسته بندی. (برای چاپ)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,کاربران با این نقش ها اجازه تنظیم حساب های یخ زده و ایجاد / تغییر نوشته های حسابداری در برابر حساب منجمد
 DocType: Serial No,Is Cancelled,آیا لغو
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,محموله های من
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,محموله های من
 DocType: Journal Entry,Bill Date,تاریخ صورتحساب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتی اگر قوانین قیمت گذاری های متعدد را با بالاترین اولویت وجود دارد، سپس زیر اولویت های داخلی می شود:
 DocType: Supplier,Supplier Details,اطلاعات بیشتر تامین کننده
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,انتقال سیم
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,لطفا حساب بانکی را انتخاب کنید
 DocType: Newsletter,Create and Send Newsletters,ایجاد و ارسال خبرنامه
-sites/assets/js/report.min.js +107,From Date must be before To Date,از تاریخ باید قبل از به روز می شود
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,از تاریخ باید قبل از به روز می شود
 DocType: Sales Order,Recurring Order,ترتیب در محدوده زمانی معین
 DocType: Company,Default Income Account,حساب پیش فرض درآمد
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,مشتری گروه / مشتریان
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,سهام UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
 ,Projected,بینی
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},سریال بدون {0} به انبار تعلق ندارد {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,توجه: سیستم نمی خواهد بیش از چک زایمان و بیش از رزرو مورد {0} به عنوان مقدار و یا مقدار 0 است
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,توجه: سیستم نمی خواهد بیش از چک زایمان و بیش از رزرو مورد {0} به عنوان مقدار و یا مقدار 0 است
 DocType: Notification Control,Quotation Message,نقل قول پیام
 DocType: Issue,Opening Date,افتتاح عضویت
 DocType: Journal Entry,Remark,اظهار
 DocType: Purchase Receipt Item,Rate and Amount,سرعت و مقدار
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,خسته کننده
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,از سفارش فروش
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,از سفارش فروش
 DocType: Blog Category,Parent Website Route,وب سایت مسیر پدر و مادر
 DocType: Sales Order,Not Billed,صورتحساب نه
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,هر دو انبار باید به همان شرکت تعلق
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,بدون اطلاعات تماس اضافه نشده است.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,بدون اطلاعات تماس اضافه نشده است.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,فعال نیست
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,مجوز های ارسال و علیه فاکتور عضویت
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,هزینه فرود مقدار کوپن
 DocType: Time Log,Batched for Billing,بسته بندی های کوچک برای صدور صورت حساب
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,لوایح مطرح شده توسط تولید کنندگان.
 DocType: POS Profile,Write Off Account,ارسال فعال حساب
-sites/assets/js/erpnext.min.js +26,Discount Amount,مقدار تخفیف
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,مقدار تخفیف
 DocType: Purchase Invoice,Return Against Purchase Invoice,بازگشت علیه خرید فاکتور
 DocType: Item,Warranty Period (in days),دوره گارانتی (در روز)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,به عنوان مثال مالیات بر ارزش افزوده
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,(4 مورد)
 DocType: Journal Entry Account,Journal Entry Account,حساب ورودی دفتر روزنامه
 DocType: Shopping Cart Settings,Quotation Series,نقل قول سری
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,گاز گرم فلز تشکیل
 DocType: Sales Order Item,Sales Order Date,سفارش فروش تاریخ
 DocType: Sales Invoice Item,Delivered Qty,تحویل تعداد
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,مشتری و یا تامین کننده
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,تنظیم
 DocType: Lead,Lead Owner,مالک راهبر
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,انبار مورد نیاز است
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,انبار مورد نیاز است
 DocType: Employee,Marital Status,وضعیت تاهل
 DocType: Stock Settings,Auto Material Request,درخواست مواد خودکار
 DocType: Time Log,Will be updated when billed.,خواهد شد که در صورتحساب یا لیست به روز شد.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,در دسترس تعداد دسته ای در از انبار
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM BOM کنونی و جدید را نمی توان همان
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,تاریخ بازنشستگی باید از تاریخ پیوستن بیشتر
 DocType: Sales Invoice,Against Income Account,به حساب درآمد
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,به روز رسانی سهام
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM مختلف برای اقلام خواهد به نادرست (مجموع) خالص ارزش وزن منجر شود. مطمئن شوید که وزن خالص هر یک از آیتم است در UOM همان.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM نرخ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,لطفا توجه داشته باشید تحویل اقلام از جلو
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,لطفا توجه داشته باشید تحویل اقلام از جلو
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,ورودی های دفتر {0} مشابه نیستند
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",ضبط تمام ارتباطات از نوع ایمیل، تلفن، چت،، و غیره
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,لطفا دور کردن مرکز هزینه در شرکت ذکر
 DocType: Purchase Invoice,Terms,شرایط
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,ایجاد جدید
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,ایجاد جدید
 DocType: Buying Settings,Purchase Order Required,خرید سفارش مورد نیاز
 ,Item-wise Sales History,تاریخچه فروش آیتم و زرنگ
 DocType: Expense Claim,Total Sanctioned Amount,کل مقدار تحریم
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,حقوق و دستمزد ک
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,یادداشت
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,اولین انتخاب یک گره گروه.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},هدف باید یکی از است {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,فرم را پر کنید و آن را ذخیره کنید
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,فرم را پر کنید و آن را ذخیره کنید
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,دانلود گزارش حاوی تمام مواد خام با آخرین وضعیت موجودی خود را
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,نما
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,انجمن
 DocType: Leave Application,Leave Balance Before Application,ترک تعادل قبل از اعمال
 DocType: SMS Center,Send SMS,ارسال اس ام اس
 DocType: Company,Default Letter Head,پیش فرض سر نامه
 DocType: Time Log,Billable,قابل پرداخت
 DocType: Authorization Rule,This will be used for setting rule in HR module,این خواهد شد برای تنظیم قانون در ماژول HR استفاده
 DocType: Account,Rate at which this tax is applied,سرعت که در آن این مالیات اعمال می شود
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,ترتیب مجدد تعداد
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,ترتیب مجدد تعداد
 DocType: Company,Stock Adjustment Account,حساب تنظیم سهام
 DocType: Journal Entry,Write Off,کسر کردن
 DocType: Time Log,Operation ID,عملیات ID
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",زمینه های تخفیف در سفارش خرید، رسید خرید، خرید فاکتور در دسترس خواهد بود
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نام حساب کاربری جدید. توجه: لطفا حساب برای مشتریان و تامین کنندگان ایجاد نمی
 DocType: Report,Report Type,نوع گزارش
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,بارگیری
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,بارگیری
 DocType: BOM Replace Tool,BOM Replace Tool,BOM به جای ابزار
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,کشور به طور پیش فرض عاقلانه آدرس قالب
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
+DocType: Sales Order Item,Supplier delivers to Customer,ارائه کننده به مشتری
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,نمایش مالیاتی تجزیه
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,اطلاعات واردات و صادرات
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',اگر شما در فعالیت های تولید باشد. را قادر می سازد آیتم های تولیدی است
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,فاکتور های ارسال و ویرایش تاریخ
 DocType: Sales Invoice,Rounded Total,گرد مجموع
 DocType: Product Bundle,List items that form the package.,اقلام لیست که به صورت بسته بندی شده.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,درصد تخصیص باید به 100٪ برابر باشد
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
 DocType: Company,Default Cash Account,به طور پیش فرض حساب های نقدی
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,شرکت (و نه مشتری و یا تامین کننده) استاد.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',لطفا "انتظار تاریخ تحویل را وارد
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',لطفا "انتظار تاریخ تحویل را وارد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,مبلغ پرداخت شده + نوشتن کردن مقدار نمی تواند بیشتر از جمع کل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} است تعداد دسته معتبر برای مورد نمی {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},نکته: تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}",ردیف {0}: تعداد در انبار avalable نمی {1} در {2} {3}. در دسترس تعداد: {4}، انتقال تعداد: {5}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3 مورد
+DocType: Purchase Order,Customer Contact Email,مشتریان تماس با ایمیل
 DocType: Event,Sunday,یکشنبه
 DocType: Sales Team,Contribution (%),سهم (٪)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند "نقدی یا حساب بانکی 'مشخص نشده بود
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,مسئولیت
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,قالب
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,قالب
 DocType: Sales Person,Sales Person Name,فروش نام شخص
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,لطفا حداقل 1 فاکتور در جدول وارد کنید
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,اضافه کردن کاربران
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),تاریخ شروع واقعی (
 DocType: Stock Reconciliation Item,Before reconciliation,قبل از آشتی
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},به {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),مالیات و هزینه اضافه شده (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
 DocType: Sales Order,Partly Billed,تا حدودی صورتحساب
 DocType: Item,Default BOM,به طور پیش فرض BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,مجموع برجسته AMT
 DocType: Time Log Batch,Total Hours,جمع ساعت
 DocType: Journal Entry,Printing Settings,تنظیمات چاپ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,خودرو
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},برگ برای نوع {0} در حال حاضر برای کارمند {1} اختصاص داده شده برای سال مالی {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,مورد نیاز است
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,قالب گیری تزریقی ساخته شده از فلز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,از تحویل توجه داشته باشید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,از تحویل توجه داشته باشید
 DocType: Time Log,From Time,از زمان
 DocType: Notification Control,Custom Message,سفارشی پیام
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,بانکداری سرمایه گذاری
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,سرب با این ا
 DocType: Stock Entry,From BOM,از BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,پایه
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} منجمد
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',لطفا بر روی 'ایجاد برنامه کلیک کنید
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,به روز باید برای مرخصی نصف روز از همان تاریخ است
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',لطفا بر روی 'ایجاد برنامه کلیک کنید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,به روز باید برای مرخصی نصف روز از همان تاریخ است
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",به عنوان مثال کیلوگرم، واحد، شماره، متر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,مرجع بدون اجباری است اگر شما وارد مرجع تاریخ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,مرجع بدون اجباری است اگر شما وارد مرجع تاریخ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,تاریخ پیوستن باید بیشتر از تاریخ تولد شود
 DocType: Salary Structure,Salary Structure,ساختار حقوق و دستمزد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",قانون قیمت های متعدد را با معیارهای همان وجود دارد، لطفا \ درگیری با اختصاص اولویت حل و فصل. مشاهده قوانین قیمت: {0}
 DocType: Account,Bank,بانک
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,شرکت هواپیمایی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,مواد شماره
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,مواد شماره
 DocType: Material Request Item,For Warehouse,ذخیره سازی
 DocType: Employee,Offer Date,پیشنهاد عضویت
 DocType: Hub Settings,Access Token,نشانه دسترسی
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,زمان باز شدن
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,از و به تاریخ های الزامی
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,اوراق بهادار و بورس کالا
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
+DocType: Delivery Note Item,From Warehouse,از انبار
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,حفر
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,قالب گیری ضربه
 DocType: Purchase Taxes and Charges,Valuation and Total,ارزش گذاری و مجموع
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,اصلاح از
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,مواد اولیه
 DocType: Leave Application,Follow via Email,از طریق ایمیل دنبال کنید
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,مبلغ مالیات پس از تخفیف مبلغ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,حساب کودک برای این حساب وجود دارد. شما می توانید این حساب را حذف کنید.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,حساب کودک برای این حساب وجود دارد. شما می توانید این حساب را حذف کنید.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,در هر دو صورت تعداد مورد نظر و یا مقدار هدف الزامی است
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
-DocType: Leave Allocation,Carry Forward,حمل به جلو
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,باز کردن تاریخ باید قبل از بسته شدن تاریخ
+DocType: Leave Control Panel,Carry Forward,حمل به جلو
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,مرکز هزینه با معاملات موجود را نمی توان تبدیل به لجر
 DocType: Department,Days for which Holidays are blocked for this department.,روز که تعطیلات برای این بخش مسدود شده است.
 ,Produced,ساخته
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),مجموع (AMT)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,سرگرمی و اوقات فراغت
 DocType: Purchase Order,The date on which recurring order will be stop,از تاریخ تکرار می شود منظور متوقف خواهد شد
 DocType: Quality Inspection,Item Serial No,مورد سریال بدون
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} باید توسط {1} و یا شما باید افزایش تحمل سرریز کاهش می یابد
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} باید توسط {1} و یا شما باید افزایش تحمل سرریز کاهش می یابد
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,در حال حاضر مجموع
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ساعت
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",مورد سریال {0} می تواند \ با استفاده از بورس آشتی نمی شود به روز شده
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,انتقال مواد به تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,انتقال مواد به تامین کننده
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,جدید بدون سریال را می انبار ندارد. انبار باید توسط بورس ورود یا رسید خرید مجموعه
 DocType: Lead,Lead Type,سرب نوع
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,ایجاد استعلام
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,همه این موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,همه این موارد در حال حاضر صورتحساب شده است
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},می توان با تصویب {0}
 DocType: Shipping Rule,Shipping Rule Conditions,حمل و نقل قانون شرایط
 DocType: BOM Replace Tool,The new BOM after replacement,BOM جدید پس از تعویض
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,C-فرم
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID عملیات تنظیم نشده
 DocType: Production Order,Planned Start Date,برنامه ریزی تاریخ شروع
 DocType: Serial No,Creation Document Type,ایجاد نوع سند
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,نگهداری. دیدار
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,نگهداری. دیدار
 DocType: Leave Type,Is Encash,آیا Encash
 DocType: Purchase Invoice,Mobile No,موبایل بدون
 DocType: Payment Tool,Make Journal Entry,مجله را ورود
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,برگ جدید اختصاص دا
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,اطلاعات پروژه و زرنگ در دسترس برای عین نمی
 DocType: Project,Expected End Date,انتظار می رود تاریخ پایان
 DocType: Appraisal Template,Appraisal Template Title,ارزیابی الگو عنوان
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,تجاری
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,تجاری
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,مورد پدر و مادر {0} نباید آیتم سهام
 DocType: Cost Center,Distribution Id,توزیع کد
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات عالی
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ارزش صفت {0} باید در طیف وسیعی از {1} به {2} در بازه {3}
 DocType: Tax Rule,Sales,فروش
 DocType: Stock Entry Detail,Basic Amount,مقدار اولیه
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,کروم
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
+DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,کروم
 DocType: Customer,Default Receivable Accounts,پیش فرض حسابهای دریافتنی
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,اره
 DocType: Tax Rule,Billing State,دولت صدور صورت حساب
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ورقه ورقه
 DocType: Item Reorder,Transfer,انتقال
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
 DocType: Authorization Rule,Applicable To (Employee),به قابل اجرا (کارمند)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,تاریخ الزامی است
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,خرده فروشی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,مشتری {0} وجود ندارد
 DocType: Attendance,Absent,غایب
 DocType: Product Bundle,Product Bundle,بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ردیف {0}: مرجع نامعتبر {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,خرد کن
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,خرید مالیات و هزینه الگو
 DocType: Upload Attendance,Download Template,دانلود الگو
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,سخنان
 DocType: Purchase Order Item Supplied,Raw Material Item Code,مواد اولیه کد مورد
 DocType: Journal Entry,Write Off Based On,ارسال فعال بر اساس
 DocType: Features Setup,POS View,POS مشخصات
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,رکورد نصب و راه اندازی برای یک شماره سریال
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,رکورد نصب و راه اندازی برای یک شماره سریال
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,ریخته گری مداوم
-sites/assets/js/erpnext.min.js +10,Please specify a,لطفا مشخص کنید
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,لطفا مشخص کنید
 DocType: Offer Letter,Awaiting Response,در انتظار پاسخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,در بالا
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,اندازه سرد
 DocType: Salary Slip,Earning & Deduction,سود و کسر
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,حساب {0} نمی تواند یک گروه
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,منطقه
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,اختیاری است. این تنظیم استفاده می شود برای فیلتر کردن در معاملات مختلف است.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,اختیاری است. این تنظیم استفاده می شود برای فیلتر کردن در معاملات مختلف است.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
 DocType: Holiday List,Weekly Off,فعال هفتگی
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",برای مثال 2012، 2012-13
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,بر امده
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ریخته گری تبخیری-الگوی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,هزینه سرگرمی
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,فاکتور فروش {0} باید لغو شود قبل از لغو این سفارش فروش
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,سن
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,فاکتور فروش {0} باید لغو شود قبل از لغو این سفارش فروش
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,سن
 DocType: Time Log,Billing Amount,مقدار حسابداری
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,مقدار نامعتبر مشخص شده برای آیتم {0}. تعداد باید بیشتر از 0 باشد.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,برنامه های کاربردی برای مرخصی.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,حساب با معامله های موجود نمی تواند حذف شود
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,حساب با معامله های موجود نمی تواند حذف شود
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,هزینه های قانونی
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",روز از ماه که در آن منظور خواهد شد به عنوان مثال خودکار 05، 28 و غیره تولید
 DocType: Sales Invoice,Posting Time,مجوز های ارسال و زمان
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,آرم
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,بررسی این اگر شما می خواهید به زور کاربر برای انتخاب یک سری قبل از ذخیره. خواهد شد وجود ندارد به طور پیش فرض اگر شما این تیک بزنید.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},آیتم با سریال بدون هیچ {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,گسترش اطلاعیه
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,گسترش اطلاعیه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,هزینه های مستقیم
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,آیا شما واقعا می خواهید به UNSTOP این درخواست مواد؟
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,جدید درآمد و ضوابط
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,هزینه های سفر
 DocType: Maintenance Visit,Breakdown,تفکیک
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,همانطور که در تاریخ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,حد عالی رساندن
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,عفو مشروط
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,به طور پیش فرض انبار سهام مورد الزامی است.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,به طور پیش فرض انبار سهام مورد الزامی است.
 DocType: Feed,Full Name,نام و نام خانوادگی
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,عقد
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},پرداخت حقوق و دستمزد برای ماه {0} و {1} سال
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,اضافه کر
 DocType: Buying Settings,Default Supplier Type,به طور پیش فرض نوع تامین کننده
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,کانی های با ارزش
 DocType: Production Order,Total Operating Cost,مجموع هزینه های عملیاتی
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,توجه: مورد {0} وارد چندین بار
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,توجه: مورد {0} وارد چندین بار
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,همه اطلاعات تماس.
 DocType: Newsletter,Test Email Id,تست ایمیل کد
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,مخفف شرکت
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,به ن
 DocType: Stock Settings,Role Allowed to edit frozen stock,نقش مجاز به ویرایش سهام منجمد
 ,Territory Target Variance Item Group-Wise,منطقه مورد هدف واریانس گروه حکیم
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,همه گروه های مشتری
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید رکورد ارز برای {1} به {2} ایجاد نمی شود.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید رکورد ارز برای {1} به {2} ایجاد نمی شود.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,قالب مالیات اجباری است.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,حساب {0}: حساب مرجع {1} وجود ندارد
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),لیست قیمت نرخ (شرکت ارز)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} وضعیت 'متوقف' است
 DocType: Account,Temporary,موقت
 DocType: Address,Preferred Billing Address,ترجیح آدرس صورت حساب
 DocType: Monthly Distribution Percentage,Percentage Allocation,درصد تخصیص
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,مورد جزئیات 
 DocType: Purchase Order Item,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,اتو
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} متوقف شده است
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} متوقف شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
 DocType: Lead,Add to calendar on this date,افزودن به تقویم در این تاریخ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,مشاهده قوانین برای اضافه کردن هزینه های حمل و نقل.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,رویدادهای نزدیک
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,رویدادهای نزدیک
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,مشتری مورد نیاز است
 DocType: Letter Head,Letter Head,نامه سر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ورود سریع
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} برای بازگشت الزامی است
 DocType: Purchase Order,To Receive,برای دریافت
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,کوچک کردن اتصالات
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,حداقل یک انبار الزامی است
 DocType: Serial No,Out of Warranty,خارج از ضمانت
 DocType: BOM Replace Tool,Replace,جایگزین کردن
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,لطفا واحد به طور پیش فرض اندازه گیری وارد کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,لطفا واحد به طور پیش فرض اندازه گیری وارد کنید
 DocType: Purchase Invoice Item,Project Name,نام پروژه
 DocType: Supplier,Mention if non-standard receivable account,ذکر است اگر حسابهای دریافتنی غیر استاندارد
 DocType: Workflow State,Edit,ویرایش
 DocType: Journal Entry Account,If Income or Expense,اگر درآمد یا هزینه
 DocType: Features Setup,Item Batch Nos,دسته مورد شماره
 DocType: Stock Ledger Entry,Stock Value Difference,تفاوت ارزش سهام
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,منابع انسانی
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,منابع انسانی
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,آشتی پرداخت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,دارایی های مالیاتی
 DocType: BOM Item,BOM No,BOM بدون
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,مجله ورودی {0} می کند حساب کاربری ندارید {1} یا در حال حاضر همسان در برابر دیگر کوپن
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,مجله ورودی {0} می کند حساب کاربری ندارید {1} یا در حال حاضر همسان در برابر دیگر کوپن
 DocType: Item,Moving Average,میانگین متحرک
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM که جایگزین خواهد شد
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,جدید بورس UOM باید متفاوت از UOM سهام فعلی
 DocType: Account,Debit,بدهی
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,برگ باید در تقسیم عددی بر مضرب 0.5 اختصاص داده
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,برگ باید در تقسیم عددی بر مضرب 0.5 اختصاص داده
 DocType: Production Order,Operation Cost,هزینه عملیات
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,آپلود حضور از یک فایل. CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,برجسته AMT
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,مجم
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",برای تعیین این موضوع، استفاده از "اختصاص" را فشار دهید در نوار کناری.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],سهام یخ قدیمی تر از [روز]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",اگر دو یا چند قوانین قیمت گذاری هستند در بر داشت بر اساس شرایط فوق، اولویت اعمال می شود. اولویت یک عدد بین 0 تا 20 است در حالی که مقدار پیش فرض صفر (خالی) است. تعداد بالاتر به معنی آن خواهد ارجحیت دارد اگر قوانین قیمت گذاری های متعدد را با شرایط مشابه وجود دارد.
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,علیه فاکتور
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,سال مالی: {0} می کند وجود دارد نمی
 DocType: Currency Exchange,To Currency,به ارز
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,اجازه می دهد کاربران زیر به تصویب برنامه های کاربردی را برای روز مسدود کند.
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),نر
 DocType: Stock Entry Detail,Additional Cost,هزینه های اضافی
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,مالی سال پایان تاریخ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",می توانید بر روی کوپن نه فیلتر بر اساس، در صورتی که توسط کوپن گروه بندی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,را عین تامین کننده
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,را عین تامین کننده
 DocType: Quality Inspection,Incoming,وارد شونده
 DocType: BOM,Materials Required (Exploded),مواد مورد نیاز (منفجر شد)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),کاهش سود برای مرخصی بدون حقوق (LWP)
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ردیف # {0}: سریال نه {1} با مطابقت ندارد {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,مرخصی گاه به گاه
 DocType: Batch,Batch ID,دسته ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},توجه: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},توجه: {0}
 ,Delivery Note Trends,روند تحویل توجه داشته باشید
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,خلاصه این هفته
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} باید مورد خریداری شده و یا زیر قرارداد را در ردیف شود {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} باید مورد خریداری شده و یا زیر قرارداد را در ردیف شود {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,حساب: {0} تنها می تواند از طریق معاملات سهام به روز شده
 DocType: GL Entry,Party,حزب
 DocType: Sales Order,Delivery Date,تاریخ تحویل
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,الان متوسط. نرخ خرید
 DocType: Task,Actual Time (in Hours),زمان واقعی (در ساعت)
 DocType: Employee,History In Company,تاریخچه در شرکت
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,خبرنامه
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,خبرنامه
 DocType: Address,Shipping,حمل
 DocType: Stock Ledger Entry,Stock Ledger Entry,سهام لجر ورود
 DocType: Department,Leave Block List,ترک فهرست بلوک
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,ممیز
 DocType: Purchase Order,End date of current order's period,تاریخ پایان دوره منظور فعلی
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,را پیشنهاد نامه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,برگشت
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,واحد اندازه گیری پیش فرض برای متغیر باید همان الگو باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,واحد اندازه گیری پیش فرض برای متغیر باید همان الگو باشد
 DocType: DocField,Fold,تاه
 DocType: Production Order Operation,Production Order Operation,ترتیب عملیات تولید
 DocType: Pricing Rule,Disable,از کار انداختن
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,گزارش به
 DocType: SMS Settings,Enter url parameter for receiver nos,پارامتر آدرس را وارد کنید برای گیرنده NOS
 DocType: Sales Invoice,Paid Amount,مبلغ پرداخت
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',بستن حساب {0} باید از نوع 'مسئولیت "است
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',بستن حساب {0} باید از نوع 'مسئولیت "است
 ,Available Stock for Packing Items,انبار موجود آیتم ها بسته بندی
 DocType: Item Variant,Item Variant,مورد نوع
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,تنظیم این آدرس الگو به عنوان پیش فرض به عنوان پیش فرض هیچ دیگر وجود دارد
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,مدیریت کیفیت
 DocType: Production Planning Tool,Filter based on customer,فیلتر بر اساس مشتری
 DocType: Payment Tool Detail,Against Voucher No,علیه کوپن بدون
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},لطفا مقدار برای آیتم را وارد کنید {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},لطفا مقدار برای آیتم را وارد کنید {0}
 DocType: Employee External Work History,Employee External Work History,کارمند خارجی سابقه کار
 DocType: Tax Rule,Purchase,خرید
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,تعداد موجودی
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials",گروه دانه ها از آیتم ها ** ** 
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},سریال بدون برای مورد الزامی است {0}
 DocType: Item Variant Attribute,Attribute,ویژگی
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,لطفا از مشخص / به محدوده
-sites/assets/js/desk.min.js +7652,Created By,خلق شده توسط
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,خلق شده توسط
 DocType: Serial No,Under AMC,تحت AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,نرخ گذاری مورد محاسبه در نظر دارد فرود هزینه مقدار کوپن
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,تنظیمات پیش فرض برای فروش معاملات.
 DocType: BOM Replace Tool,Current BOM,BOM کنونی
-sites/assets/js/erpnext.min.js +8,Add Serial No,اضافه کردن سریال بدون
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,اضافه کردن سریال بدون
 DocType: Production Order,Warehouses,ساختمان و ذخیره سازی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,چاپ و ثابت
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,گره گروه
 DocType: Payment Reconciliation,Minimum Amount,حداقل مقدار
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,به روز رسانی به پایان رسید کالا
 DocType: Workstation,per hour,در ساعت
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},سری {0} در حال حاضر در مورد استفاده {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},سری {0} در حال حاضر در مورد استفاده {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,حساب برای انبار (موجودی ابدی) خواهد شد تحت این حساب ایجاد شده است.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,انبار نمی تواند حذف شود به عنوان ورودی سهام دفتر برای این انبار وجود دارد.
 DocType: Company,Distribution,توزیع
-sites/assets/js/erpnext.min.js +50,Amount Paid,مبلغ پرداخت شده
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,مبلغ پرداخت شده
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,مدیر پروژه
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,اعزام
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,حداکثر تخفیف را برای آیتم: {0} {1}٪ است
 DocType: Customer,Default Taxes and Charges,مالیات به طور پیش فرض ها و اتهامات
 DocType: Account,Receivable,دریافتنی
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ردیف # {0}: مجاز به تغییر به عنوان کننده سفارش خرید در حال حاضر وجود
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,نقش است که مجاز به ارائه معاملات است که بیش از محدودیت های اعتباری تعیین شده است.
 DocType: Sales Invoice,Supplier Reference,مرجع عرضه کننده کالا
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",در صورت انتخاب، BOM برای اقلام زیر مونتاژ خواهد شد برای گرفتن مواد اولیه در نظر گرفته. در غیر این صورت، تمام آیتم های زیر مونتاژ خواهد شد به عنوان ماده خام درمان می شود.
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,اضافه کردن / حذف دری
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},معامله در برابر تولید متوقف مجاز ترتیب {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",برای تنظیم این سال مالی به عنوان پیش فرض، بر روی "تنظیم به عنوان پیش فرض '
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),راه اندازی سرور های دریافتی برای ایمیل پشتیبانی شناسه. (به عنوان مثال support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,کمبود تعداد
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
 DocType: Salary Slip,Salary Slip,لغزش حقوق و دستمزد
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,چکش
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'تا تاریخ' مورد نیاز است
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",هنگامی که هر یک از معاملات چک می "فرستاده"، یک ایمیل پاپ آپ به طور خودکار باز برای ارسال یک ایمیل به همراه "تماس" در آن معامله، با معامله به عنوان یک پیوست. کاربر ممکن است یا ممکن است ایمیل ارسال کنید.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,تنظیمات جهانی
 DocType: Employee Education,Employee Education,آموزش و پرورش کارمند
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
 DocType: Salary Slip,Net Pay,پرداخت خالص
 DocType: Account,Account,حساب
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,سریال بدون {0} در حال حاضر دریافت شده است
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,ساخت کاربری
 DocType: Purchase Order,Raw Materials Supplied,مواد اولیه عرضه شده
 DocType: Purchase Invoice,Recurring Print Format,تکرار چاپ فرمت
 DocType: Communication,Series,سلسله
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش خرید تاریخ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش خرید تاریخ
 DocType: Appraisal,Appraisal Template,ارزیابی الگو
 DocType: Communication,Email,ایمیل
 DocType: Item Group,Item Classification,طبقه بندی مورد
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,تنظیمات حقوق و دستمزد
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,مطابقت فاکتورها غیر مرتبط و پرداخت.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,محل سفارش
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ریشه می تواند یک مرکز هزینه پدر و مادر ندارد
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,انتخاب نام تجاری ...
 DocType: Sales Invoice,C-Form Applicable,C-فرم قابل استفاده
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
 DocType: Supplier,Address and Contacts,آدرس و اطلاعات تماس
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,دریافت کوپن های برجسته
 DocType: Warranty Claim,Resolved By,حل
 DocType: Appraisal,Start Date,تاریخ شروع
-sites/assets/js/desk.min.js +7629,Value,ارزش
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,ارزش
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,اختصاص برگ برای یک دوره.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,به منظور بررسی اینجا را کلیک کنید
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,حساب {0}: شما نمی توانید خود را به عنوان پدر و مادر اختصاص حساب
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox به دسترسی مجاز
 DocType: Dropbox Backup,Weekly,هفتگی
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,به عنوان مثال. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,دريافت كردن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,دريافت كردن
 DocType: Maintenance Visit,Fully Completed,طور کامل تکمیل شده
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ کامل
 DocType: Employee,Educational Qualification,صلاحیت تحصیلی
 DocType: Workstation,Operating Costs,هزینه های عملیاتی
 DocType: Employee Leave Approver,Employee Leave Approver,کارمند مرخصی تصویب
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} با موفقیت به لیست خبرنامه اضافه شده است.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ماشینکاری پرتو الکترونی
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خرید استاد مدیر
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,DOCTYPE Prevdoc
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,افزودن / ویرایش قیمتها
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,نمودار مراکز هزینه
 ,Requested Items To Be Ordered,آیتم ها درخواست می شود با شماره
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,سفارشهای من
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,سفارشهای من
 DocType: Price List,Price List Name,لیست قیمت نام
 DocType: Time Log,For Manufacturing,برای ساخت
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,مجموع
@@ -3471,7 +3489,7 @@ DocType: Account,Income,درامد
 DocType: Industry Type,Industry Type,نوع صنعت
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,مشکلی!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,فاکتور فروش {0} در حال حاضر ارائه شده است
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,فاکتور فروش {0} در حال حاضر ارائه شده است
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,تاریخ تکمیل
 DocType: Purchase Invoice Item,Amount (Company Currency),مقدار (شرکت ارز)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ریخته گری
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,سال
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,نقطه از فروش مشخصات
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,لطفا تنظیمات SMS به روز رسانی
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,زمان ورود {0} در حال حاضر در صورتحساب یا لیست
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,زمان ورود {0} در حال حاضر در صورتحساب یا لیست
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,نا امن وام
 DocType: Cost Center,Cost Center Name,هزینه نام مرکز
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,مورد {0} با سریال بدون {1} در حال حاضر نصب
 DocType: Maintenance Schedule Detail,Scheduled Date,تاریخ برنامه ریزی شده
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,مجموع پرداخت AMT
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,پیام های بزرگتر از 160 کاراکتر خواهد شد را به چندین پیام را تقسیم
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,دریافت و پذیرف
 ,Serial No Service Contract Expiry,سریال بدون خدمات قرارداد انقضاء
 DocType: Item,Unit of Measure Conversion,واحد تبدیل اندازه گیری
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,کارمند نمی تواند تغییر کند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
 DocType: Naming Series,Help HTML,راهنما HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},کمک هزینه برای بیش از {0} عبور برای مورد {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},کمک هزینه برای بیش از {0} عبور برای مورد {1}
 DocType: Address,Name of person or organization that this address belongs to.,نام و نام خانوادگی شخص و یا سازمانی که این آدرس متعلق به.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,تامین کنندگان شما
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,مبدل
 DocType: Item,Has Serial No,دارای سریال بدون
 DocType: Employee,Date of Issue,تاریخ صدور
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: از {0} برای {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
 DocType: Issue,Content Type,نوع محتوا
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,کامپیوتر
 DocType: Item,List this Item in multiple groups on the website.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,مورد: {0} در سیستم وجود ندارد
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
 DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
@@ -3524,14 +3542,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,به انبار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},حساب {0} است بیش از یک بار برای سال مالی وارد شده است {1}
 ,Average Commission Rate,متوسط ​​نرخ کمیسیون
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
 DocType: Pricing Rule,Pricing Rule Help,قانون قیمت گذاری راهنما
 DocType: Purchase Taxes and Charges,Account Head,سر حساب
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,به روز رسانی هزینه های اضافی برای محاسبه هزینه فرود آمد از اقلام
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,برق
 DocType: Stock Entry,Total Value Difference (Out - In),تفاوت ارزش ها (خارج - در)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID کاربر برای کارمند تنظیم نشده {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,عکاسی
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,از ادعای گارانتی
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,نامگذاری سری
 DocType: Leave Block List,Leave Block List Name,ترک نام فهرست بلوک
 DocType: User,Enabled,فعال
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,دارایی های سهام
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},آیا شما واقعا می خواهید برای ارسال تمام لغزش حقوق برای ماه {0} و {1} سال
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},آیا شما واقعا می خواهید برای ارسال تمام لغزش حقوق برای ماه {0} و {1} سال
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,مشترکین واردات
 DocType: Target Detail,Target Qty,هدف تعداد
 DocType: Attendance,Present,حاضر
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,تحویل توجه داشته باشید {0} باید ارائه شود
 DocType: Notification Control,Sales Invoice Message,فاکتور فروش پیام
 DocType: Authorization Rule,Based On,بر اساس
-,Ordered Qty,دستور داد تعداد
+DocType: Sales Order Item,Ordered Qty,دستور داد تعداد
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},دوره و دوره به تاریخ برای تکرار اجباری {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,فعالیت پروژه / وظیفه.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,تولید حقوق و دستمزد ورقه
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} است یک شناسه ایمیل معتبر نیست
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,بارگذاری حضور و غیاب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM و ساخت تعداد مورد نیاز
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,محدوده سالمندی 2
-DocType: Journal Entry Account,Amount,مقدار
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,مقدار
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,پرچین
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM جایگزین
 ,Sales Analytics,تجزیه و تحلیل ترافیک فروش
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,تاریخ انتظار نمی رود می تواند قبل از درخواست عضویت مواد است
 DocType: Contact Us Settings,City,شهرستان
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ماشینکاری آلتراسونیک
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,خطا: نه یک شناسه معتبر است؟
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,خطا: نه یک شناسه معتبر است؟
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,مورد {0} باید مورد فروش می شود
 DocType: Naming Series,Update Series Number,به روز رسانی سری شماره
 DocType: Account,Equity,انصاف
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,واقعی
 DocType: Authorization Rule,Customerwise Discount,Customerwise تخفیف
 DocType: Purchase Invoice,Against Expense Account,علیه صورتحساب
 DocType: Production Order,Production Order,سفارش تولید
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,نصب و راه اندازی {0} توجه داشته باشید در حال حاضر ارائه شده است
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,نصب و راه اندازی {0} توجه داشته باشید در حال حاضر ارائه شده است
 DocType: Quotation Item,Against Docname,علیه Docname
 DocType: SMS Center,All Employee (Active),همه کارکنان (فعال)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,مشاهده در حال حاضر
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,هزینه مواد خام
 DocType: Item,Re-Order Level,ترتیب سطح
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,اقلام و تعداد برنامه ریزی شده که برای آن شما می خواهید به افزایش سفارشات تولید و یا دانلود کنید مواد خام برای تجزیه و تحلیل را وارد کنید.
-sites/assets/js/list.min.js +174,Gantt Chart,نمودار گانت
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,نمودار گانت
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,پاره وقت
 DocType: Employee,Applicable Holiday List,فهرست تعطیلات قابل اجرا
 DocType: Employee,Cheque,چک
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,سری به روز رسانی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,نوع گزارش الزامی است
 DocType: Item,Serial Number Series,شماره سریال سری
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},انبار سهام مورد {0} در ردیف الزامی است {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},انبار سهام مورد {0} در ردیف الزامی است {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,خرده فروشی و عمده فروشی
 DocType: Issue,First Responded On,اول پاسخ در
 DocType: Website Item Group,Cross Listing of Item in multiple groups,صلیب فهرست مورد در گروه های متعدد
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,حضور
 DocType: Page,No,بدون
 DocType: BOM,Materials,مصالح
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",اگر بررسی نیست، لیست خواهد باید به هر بخش که در آن به کار گرفته شوند اضافه شده است.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,تاریخ ارسال و زمان ارسال الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,تاریخ ارسال و زمان ارسال الزامی است
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,قالب های مالیاتی برای خرید معاملات.
 ,Item Prices,قیمت مورد
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش خرید را نجات دهد.
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,هزینه های اداری
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,مشاور
 DocType: Customer Group,Parent Customer Group,مشتریان پدر و مادر گروه
-sites/assets/js/erpnext.min.js +50,Change,تغییر
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,تغییر
 DocType: Purchase Invoice,Contact Email,تماس با ایمیل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',خرید سفارش {0} است "متوقف"
 DocType: Appraisal Goal,Score Earned,امتیاز کسب
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",به عنوان مثال "من شرکت LLC"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,مقررات دوره
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,وزن UOM
 DocType: Email Digest,Receivables / Payables,مطالبات / بدهی
 DocType: Delivery Note Item,Against Sales Invoice,علیه فاکتور فروش
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,مهر زنی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,حساب اعتباری
 DocType: Landed Cost Item,Landed Cost Item,فرود از اقلام هزینه
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,نمایش صفر ارزش
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,تعداد آیتم به دست آمده پس از تولید / repacking از مقادیر داده شده از مواد خام
 DocType: Payment Reconciliation,Receivable / Payable Account,حساب دریافتنی / پرداختنی
 DocType: Delivery Note Item,Against Sales Order Item,علیه سفارش فروش مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
 DocType: Item,Default Warehouse,به طور پیش فرض انبار
 DocType: Task,Actual End Date (via Time Logs),واقعی پایان تاریخ (از طریق زمان سیاههها)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},بودجه می تواند در برابر حساب گروه اختصاص {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,تیم پشتیبانی
 DocType: Appraisal,Total Score (Out of 5),نمره کل (از 5)
 DocType: Contact Us Settings,State,دولت
 DocType: Batch,Batch,دسته
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,تراز
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,تراز
 DocType: Project,Total Expense Claim (via Expense Claims),مجموع ادعای هزینه (از طریق ادعاهای هزینه)
 DocType: User,Gender,جنس
 DocType: Journal Entry,Debit Note,بدهی توجه داشته باشید
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,وبلاگ مشترک
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,ایجاد قوانین برای محدود کردن معاملات بر اساس ارزش.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",اگر علامت زده شود، هیچ مجموع. از روز کاری شامل تعطیلات، و این خواهد شد که ارزش حقوق پستها در طول روز کاهش
 DocType: Purchase Invoice,Total Advance,جستجوی پیشرفته مجموع
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,درخواست Unstop مواد
 DocType: Workflow State,User,کاربر
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,پردازش حقوق و دستمزد
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,پردازش حقوق و دستمزد
 DocType: Opportunity Item,Basic Rate,نرخ پایه
 DocType: GL Entry,Credit Amount,مقدار وام
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,تنظیم به عنوان از دست رفته
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,روز اعتباری بر اساس
 DocType: Tax Rule,Tax Rule,قانون مالیات
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,حفظ همان نرخ در طول چرخه فروش
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,برنامه ریزی سیاهههای مربوط به زمان در خارج از ساعات کاری ایستگاه کاری.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} در حال حاضر ارائه شده است
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} در حال حاضر ارائه شده است
 ,Items To Be Requested,گزینه هایی که درخواست شده
 DocType: Purchase Order,Get Last Purchase Rate,دریافت آخرین خرید نرخ
 DocType: Time Log,Billing Rate based on Activity Type (per hour),نرخ صدور صورت حساب بر اساس نوع فعالیت (در ساعت)
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",شرکت پست الکترونیک ID یافت نشد، از این رو پست الکترونیکی فرستاده نمی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),استفاده از وجوه (دارایی)
 DocType: Production Planning Tool,Filter based on item,فیلتر در مورد بر اساس
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,حساب بانکی
 DocType: Fiscal Year,Year Start Date,سال تاریخ شروع
 DocType: Attendance,Employee Name,نام کارمند
 DocType: Sales Invoice,Rounded Total (Company Currency),گرد مجموع (شرکت ارز)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,نبلرس
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,مزایای کارکنان
 DocType: Sales Invoice,Is POS,آیا POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
 DocType: Production Order,Manufactured Qty,تولید تعداد
 DocType: Purchase Receipt Item,Accepted Quantity,تعداد پذیرفته شده
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} وجود ندارد
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,لوایح مطرح شده به مشتریان.
 DocType: DocField,Default,پیش فرض
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروژه کد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} مشترک افزوده شد
 DocType: Maintenance Schedule,Schedule,برنامه
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",تعریف بودجه برای این مرکز هزینه. برای تنظیم اقدام بودجه، نگاه کنید به "فهرست شرکت"
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,پدر و مادر حساب
 DocType: Quality Inspection Reading,Reading 3,خواندن 3
 ,Hub,قطب
 DocType: GL Entry,Voucher Type,کوپن نوع
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
 DocType: Expense Claim,Approved,تایید
 DocType: Pricing Rule,Price,قیمت
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,آموزش و پرورش
 DocType: Selling Settings,Campaign Naming By,نامگذاری کمپین توسط
 DocType: Employee,Current Address Is,آدرس فعلی است
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",اختیاری است. مجموعه پیش فرض ارز شرکت، اگر مشخص نشده است.
 DocType: Address,Office,دفتر
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,گزارش استاندارد
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,مطالب مجله حسابداری.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ردیف {0}: حزب / حساب با مطابقت ندارد {1} / {2} در {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,تعداد موجود در انبار از
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ردیف {0}: حزب / حساب با مطابقت ندارد {1} / {2} در {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,برای ایجاد یک حساب مالیاتی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,لطفا هزینه حساب وارد کنید
 DocType: Account,Stock,موجودی
 DocType: Employee,Current Address,آدرس فعلی
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",اگر مورد یک نوع از آیتم دیگری پس از آن توضیحات، تصویر، قیمت گذاری، مالیات و غیره را از قالب مجموعه ای است مگر اینکه صریحا مشخص
 DocType: Serial No,Purchase / Manufacture Details,خرید / جزئیات ساخت
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,دسته پرسشنامه
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,دسته پرسشنامه
 DocType: Employee,Contract End Date,پایان دادن به قرارداد تاریخ
 DocType: Sales Order,Track this Sales Order against any Project,پیگیری این سفارش فروش در مقابل هر پروژه
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,سفارشات فروش کشش (در انتظار برای ارائه) بر اساس معیارهای فوق
 DocType: DocShare,Document Type,نوع سند
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,از عبارت تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,از عبارت تامین کننده
 DocType: Deduction Type,Deduction Type,نوع کسر
 DocType: Attendance,Half Day,نیم روز
 DocType: Pricing Rule,Min Qty,حداقل تعداد
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,برای کمیت (تعداد تولیدی) الزامی است
 DocType: Stock Entry,Default Target Warehouse,به طور پیش فرض هدف انبار
 DocType: Purchase Invoice,Net Total (Company Currency),مجموع خالص (شرکت ارز)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ردیف {0}: حزب نوع و حزب تنها در برابر دریافتنی / حساب پرداختنی قابل اجرا است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ردیف {0}: حزب نوع و حزب تنها در برابر دریافتنی / حساب پرداختنی قابل اجرا است
 DocType: Notification Control,Purchase Receipt Message,خرید دریافت پیام
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,مجموع برگ اختصاص داده بیش از دوره
 DocType: Production Order,Actual Start Date,واقعی تاریخ شروع
 DocType: Sales Order,% of materials delivered against this Sales Order,درصد از مواد در برابر این سفارش فروش تحویل
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,جنبش مورد سابقه بوده است.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,جنبش مورد سابقه بوده است.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,عضویت در خبرنامه لیست مشترک
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,سرویس
 DocType: Hub Settings,Hub Settings,تنظیمات توپی
 DocType: Project,Gross Margin %,حاشیه ناخالص٪
 DocType: BOM,With Operations,با عملیات
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,نوشته حسابداری در حال حاضر در ارز ساخته شده {0} برای شرکت {1}. لطفا یک حساب دریافتنی و یا قابل پرداخت با ارز را انتخاب کنید {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,نوشته حسابداری در حال حاضر در ارز ساخته شده {0} برای شرکت {1}. لطفا یک حساب دریافتنی و یا قابل پرداخت با ارز را انتخاب کنید {0}.
 ,Monthly Salary Register,ماهانه حقوق ثبت نام
-apps/frappe/frappe/website/template.py +123,Next,بعد
+apps/frappe/frappe/website/template.py +140,Next,بعد
 DocType: Warranty Claim,If different than customer address,اگر متفاوت از آدرس مشتری
 DocType: BOM Operation,BOM Operation,عملیات BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,الکتروپولیش
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,تاریخ بعدی
 DocType: Employee Education,Major/Optional Subjects,عمده / موضوع اختیاری
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,لطفا مالیات و هزینه وارد
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,ماشینکاری
+DocType: Sales Invoice Item,Drop Ship,قطره کشتی
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",در اینجا شما می توانید جزئیات خانواده مانند نام و شغل پدر و مادر، همسر و فرزندان حفظ
 DocType: Hub Settings,Seller Name,نام فروشنده
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),مالیات و هزینه کسر (شرکت ارز)
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,برای دریافت و بیل
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,طراح
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,شرایط و ضوابط الگو
 DocType: Serial No,Delivery Details,جزئیات تحویل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,به طور خودکار ایجاد درخواست مواد اگر مقدار می افتد در زیر این سطح
 ,Item-wise Purchase Register,مورد عاقلانه ثبت نام خرید
 DocType: Batch,Expiry Date,تاریخ انقضا
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",برای تنظیم سطح دوباره سفارش دادن، مورد باید مورد خرید و یا مورد ساخت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",برای تنظیم سطح دوباره سفارش دادن، مورد باید مورد خرید و یا مورد ساخت می باشد
 ,Supplier Addresses and Contacts,آدرس منبع و اطلاعات تماس
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,لطفا ابتدا دسته را انتخاب کنید
 apps/erpnext/erpnext/config/projects.py +18,Project master.,کارشناسی ارشد پروژه.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,را نشان نمی مانند هر نماد $ و غیره در کنار ارزهای.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(نیم روز)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(نیم روز)
 DocType: Supplier,Credit Days,روز اعتباری
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,گرفتن اقلام از BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,گرفتن اقلام از BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,سرب زمان روز
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,بیل از مواد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ردیف {0}: حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ردیف {0}: حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {1}
 DocType: Dropbox Backup,Send Notifications To,ارسال اعلانها به
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,کد عکس تاریخ
 DocType: Employee,Reason for Leaving,دلیلی برای ترک
 DocType: Expense Claim Detail,Sanctioned Amount,مقدار تحریم
 DocType: GL Entry,Is Opening,باز
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,حساب {0} وجود ندارد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,حساب {0} وجود ندارد
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,بیوگرافی کوتاه برای وب سایت ها و نشریات دیگر.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},لطفا ساختار حقوق برای کارکنان ایجاد {0}
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 4c7bd32f02..f86d45fc99 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,palkan tila
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",valitse toimitusten kk jaksotus mikäli haluat kausiluonteisen seurannan
 DocType: Employee,Divorced,eronnut
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,varoitus: sama tuote on syötetty useamman kerran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,varoitus: sama tuote on syötetty useamman kerran
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,tuotteet on jo synkronoitu
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Salli Kohta lisätään useita kertoja liiketoimi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,peruuta materiaalikäynti {0} ennen peruutat takuuvaatimuksen
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,koonti plus sintraus
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},valuuttahinnasto vaaditaan {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* lasketaan tapahtumassa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,materiaalipyynnöstä
+DocType: Purchase Order,Customer Contact,Asiakaspalvelu Yhteystiedot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,materiaalipyynnöstä
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} puu
 DocType: Job Applicant,Job Applicant,Työnhakija
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ei enempää tuloksia
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,asiakkaan nimi
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","kaikkiin vientiin liittyviin asakirjoihin kuten lähete, tarjous, tilausvahvistus, myyntilasku, myyntitilaus jne on saatavilla esim valuutta, muuntotaso, vienti yhteensä, viennin loppusumma ym"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"pään, (tai ryhmän), kohdistetut ​kirjanpidon kirjaukset tehdään ja tase säilytetään"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),odottavat {0} ei voi olla alle nolla ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),odottavat {0} ei voi olla alle nolla ({1})
 DocType: Manufacturing Settings,Default 10 mins,oletus 10 min
 DocType: Leave Type,Leave Type Name,"poistu, tyypin nimi"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,sarja päivitetty onnistuneesti
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Useiden Item hinnat.
 DocType: SMS Center,All Supplier Contact,kaikki toimittajan yhteystiedot
 DocType: Quality Inspection Reading,Parameter,parametri
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,odotettu päättymispäivä ei voi olla pienempi kuin odotettu aloituspäivä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,haluatko jatkaa tuotannon tilausta:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,rivi # {0}: taso tulee olla sama kuin {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,uusi poistumissovellus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,uusi poistumissovellus
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,pankki sekki
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. käytä tätä vaihtoehtoa määritelläksesi hakukelpoisen asiakaskohtaisen tuotekoodin
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,näytä malliv
 DocType: Sales Invoice Item,Quantity,Määrä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),lainat (vastattavat)
 DocType: Employee Education,Year of Passing,vuoden syöttö
-sites/assets/js/erpnext.min.js +27,In Stock,varastossa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Voi vain maksun vastaan ​​laskuttamattomia Myyntitilaus
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,varastossa
 DocType: Designation,Designation,nimeäminen
 DocType: Production Plan Item,Production Plan Item,Tuotanto Plan Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},käyttäjä {0} on jo nimetty työsuhteeseen {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Tee uusi POS Profile
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,terveydenhuolto
 DocType: Purchase Invoice,Monthly,Kuukausittain
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,lasku
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Viivästyminen (päivää)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,lasku
 DocType: Maintenance Schedule Item,Periodicity,jaksotus
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,sähköpostiosoite
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,puolustus
 DocType: Company,Abbr,lyhenteet
 DocType: Appraisal Goal,Score (0-5),pisteet (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Rivi # {0}:
 DocType: Delivery Note,Vehicle No,ajoneuvon nro
-sites/assets/js/erpnext.min.js +55,Please select Price List,Ole hyvä ja valitse hinnasto
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Ole hyvä ja valitse hinnasto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,puun työstö
 DocType: Production Order Operation,Work In Progress,työnalla
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-tulostus
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Avaaminen ja työn.
 DocType: Item Attribute,Increment,Lisäys
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Valitse Varasto ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,mainonta
 DocType: Employee,Married,Naimisissa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
 DocType: Payment Reconciliation,Reconcile,yhteensovitus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,päivittäistavara
 DocType: Quality Inspection Reading,Reading 1,Reading 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,tee pankkikirjaus
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,tee pankkikirjaus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,eläkerahastot
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,varasto vaaditaan mikäli tilin tyyppi on varastotili
 DocType: SMS Center,All Sales Person,kaikki myyjät
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,poiston kustannuspaikka
 DocType: Warehouse,Warehouse Detail,Varaston lisätiedot
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan luottoraja on ylitetty {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Tax Tyyppi
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0}
 DocType: Item,Item Image (if not slideshow),tuotekuva (ellei diaesitys)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Asiakkaan olemassa samalla nimellä
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(tuntitaso / 60) * todellinen käytetty aika
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,vieras
 DocType: Quality Inspection,Get Specification Details,hae tekniset lisätiedot
 DocType: Lead,Interested,kiinnostunut
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,materiaalilasku
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Aukko
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Aukko
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},alkaen {0} on {1}
 DocType: Item,Copy From Item Group,kopioi tuoteryhmästä
 DocType: Journal Entry,Opening Entry,avauskirjaus
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,tavara kysely
 DocType: Standard Reply,Owner,Omistaja
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Anna yritys ensin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Ole hyvä ja valitse Company ensin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Ole hyvä ja valitse Company ensin
 DocType: Employee Education,Under Graduate,valmistumisen alla
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,tavoitteeseen
 DocType: BOM,Total Cost,kokonaiskustannukset
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Etuliite
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,käytettävä
 DocType: Upload Attendance,Import Log,tuo loki
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,lähetä
+DocType: Sales Invoice Item,Delivered By Supplier,Toimitetaan Toimittaja
 DocType: SMS Center,All Contact,kaikki yhteystiedot
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,vuosipalkka
 DocType: Period Closing Voucher,Closing Fiscal Year,tilikauden sulkeminen
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,vastakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,näytä aikalokit
 DocType: Journal Entry Account,Credit in Company Currency,Luotto Yritys Valuutta
 DocType: Delivery Note,Installation Status,asennus tila
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},hyväksyttyjen + hylättyjen yksikkömäärä on sama kuin tuotteiden vastaanotettu määrä {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},hyväksyttyjen + hylättyjen yksikkömäärä on sama kuin tuotteiden vastaanotettu määrä {0}
 DocType: Item,Supply Raw Materials for Purchase,toimita raaka-aineita ostoon
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,tuotteen {0} tulee olla ostotuote
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","lataa mallipohja, täytä tarvittavat tiedot ja liitä muokattu tiedosto, kaikki päivämäärä- ja työntekijäyhdistelmät tulee malliin valitun kauden ja olemassaolevien osallistumistietueiden mukaan"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,tuote {0} ei ole aktiivinen tai sen elinkaari loppu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,tuote {0} ei ole aktiivinen tai sen elinkaari loppu
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,päivitetään kun myyntilasku on lähetetty
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,henkilöstömoduulin asetukset
 DocType: SMS Center,SMS Center,tekstiviesti keskus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,suoristus
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,syötä url parametrin vie
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,sääntö hinnoitteluun ja alennuksiin
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},tämä aikaloki erä on ristiriidassa {0}:n {1} {2} kanssa
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,hinnastoa tulee sovelletaa ostamiseen tai myymiseen
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},asennuspäivä ei voi olla ennen tuotteen toimitusaikaa {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},asennuspäivä ei voi olla ennen tuotteen toimitusaikaa {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),hinnaston alennus taso (%)
-sites/assets/js/form.min.js +279,Start,alku
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,alku
 DocType: User,First Name,etunimi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Määritys on nyt valmis. Päivitetään.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,täysimuovaus valu
 DocType: Offer Letter,Select Terms and Conditions,valitse ehdot ja säännöt
 DocType: Production Planning Tool,Sales Orders,myyntitilaukset
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,myyntilaskun kohdistus / tuote
 ,Production Orders in Progress,tuotannon tilaukset on käsittelyssä
 DocType: Lead,Address & Contact,osoitteet ja yhteystiedot
+DocType: Leave Allocation,Add unused leaves from previous allocations,Lisää käyttämättömät lähtee edellisestä määrärahoista
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
 DocType: Newsletter List,Total Subscribers,alihankkijat yhteensä
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,"yhteystiedot, nimi"
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,odottavat myyntitilaukset yksikköm
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,tee palkkalaskelma edellä mainittujen kriteerien mukaan
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pyydä ostaa.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,tuplakotelointi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lievittää Date on oltava suurempi kuin päivämäärä Liittymisen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,poistumiset vuodessa
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,nimeä sarjat {0} määritykset> asetukset> nimeä sarjat
 DocType: Time Log,Will be updated when batched.,päivitetään keräilyssä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"rivi {0}: täppää 'ennakko' kohdistettu tilille {1}, mikäli tämä on ennakkokirjaus"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"rivi {0}: täppää 'ennakko' kohdistettu tilille {1}, mikäli tämä on ennakkokirjaus"
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1}
 DocType: Bulk Email,Message,Viesti
 DocType: Item Website Specification,Item Website Specification,tuote verkkosivujen asetukset
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox pääsy tunnus
 DocType: Payment Tool,Reference No,Viitenumero
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,poistuminen estetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,poistuminen estetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,"varaston täsmäytys, tuote"
 DocType: Stock Entry,Sales Invoice No,"myyntilasku, nro"
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,minimi tilaus yksikkömäärä
 DocType: Pricing Rule,Supplier Type,toimittaja tyyppi
 DocType: Item,Publish in Hub,Julkaista Hub
 ,Terretory,alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,tuote {0} on peruutettu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,materiaalipyyntö
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,tuote {0} on peruutettu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,materiaalipyyntö
 DocType: Bank Reconciliation,Update Clearance Date,päivitä tilityspäivä
 DocType: Item,Purchase Details,oston lisätiedot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},tuotetta {0} ei löydy 'raaka-aineet toimitettu' ostotilaus taulukko {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Ilmoittaminen Ohjaus
 DocType: Lead,Suggestions,ehdotuksia
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"tuoteryhmä työkalu, aseta budjetit tällä, voit tehdä kausiluonteisen budjetin asettamalla jaksotuksen"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},syötä emotiliryhmä varastolle {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksu vastaan ​​{0} {1} ei voi olla suurempi kuin jäljellä {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksu vastaan ​​{0} {1} ei voi olla suurempi kuin jäljellä {2}
 DocType: Supplier,Address HTML,osoite HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,muodosta aikataulu
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,uusi varasto UOM
 DocType: Period Closing Voucher,Closing Account Head,tilin otsikon sulkeminen
 DocType: Employee,External Work History,ulkoinen työhistoria
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,kiertoviite vihke
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,haluatko todella lopettaa
 DocType: Communication,Closed,suljettu
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"sanat näkyvät, (vienti) kun tallennat lähetteen"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Oletko varma, että haluat lopettaa"
 DocType: Lead,Industry,teollisuus
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Tiedote
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,lähete
 DocType: Dropbox Backup,Allow Dropbox Access,salli Dropbox pääsy
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,verojen perusmääritykset
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"maksukirjausta on muutettu siirron jälkeen, siirrä se uudelleen"
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Yhteenveto tällä viikolla ja keskeneräisten toimien
 DocType: Workstation,Rent Cost,vuokrakustannukset
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Ole hyvä ja valitse kuukausi ja vuosi
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"taso, jolla asiakkaan valuutta muunnetaan asiakkaan käyttämäksi perusvaluutaksi"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM on saatavana, lähetteessä, ostolaskussa, tuotannon tilauksessa, ostotilauksessa, ostokuitissa, myyntilaskussa, myyntilauksessa, varaston kirjauksessa ja aikataulukossa"
 DocType: Item Tax,Tax Rate,vero taso
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,valitse tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,valitse tuote
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","tuote: {0} hallinnoidaan eräkohtaisesti, eikä sitä voi päivittää käyttämällä varaston täsmäytystä, käytä varaston kirjausta"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,muunna pois ryhmästä
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ostokuitti on lähetettävä
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,nykyinen varasto UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,erä (erä-tuote) tuotteesta
 DocType: C-Form Invoice Detail,Invoice Date,laskun päiväys
 DocType: GL Entry,Debit Amount,Debit Määrä
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Ei voi olla vain 1 tilini kohden Yhtiö {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Ei voi olla vain 1 tilini kohden Yhtiö {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Sähköpostiosoitteesi
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,katso liitetiedosto
 DocType: Purchase Order,% Received,% vastaanotettu
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,ohjeet
 DocType: Quality Inspection,Inspected By,tarkastanut
 DocType: Maintenance Visit,Maintenance Type,"huolto, tyyppi"
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},sarjanumero {0} ei kuulu lähetteeseen {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},sarjanumero {0} ei kuulu lähetteeseen {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,tuotteen laatutarkistus parametrit
 DocType: Leave Application,Leave Approver Name,poistumis hyväksyjän nimi
 ,Schedule Date,"aikataulu, päivä"
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Osto Rekisteröidy
 DocType: Landed Cost Item,Applicable Charges,sovellettavat maksut
 DocType: Workstation,Consumable Cost,käytettävät kustannukset
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'poistumisen hyväksyjä'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'poistumisen hyväksyjä'
 DocType: Purchase Receipt,Vehicle Date,Ajoneuvo Päivämäärä
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Lääketieteellinen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,häviön syy
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% asennettu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Anna yrityksen nimi ensin
 DocType: BOM,Item Desription,tuote selite
 DocType: Purchase Invoice,Supplier Name,toimittajan nimi
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lue ERPNext Manual
 DocType: Account,Is Group,on ryhmä
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaattisesti Serial nro perustuu FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,tarkista toimittajan laskunumeron yksilöllisyys
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,"myynninhallinta,
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,yleiset asetukset valmistusprosesseille
 DocType: Accounts Settings,Accounts Frozen Upto,tilit jäädytetty toistaiseksi / asti
 DocType: SMS Log,Sent On,lähetetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,lomien valvonta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,kuoren muovaus
 DocType: Material Request Item,Required Date,pyydetty päivä
 DocType: Delivery Note,Billing Address,laskutusosoite
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,syötä tuotekoodi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,syötä tuotekoodi
 DocType: BOM,Costing,kustannuslaskenta
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",täpättäessä veron arvomäärää pidetään jo sisällettynä tulostetasoon / tulostemäärään
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,yksikkömäärä yhteensä
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),toimintojen v
 DocType: Customer,Buyer of Goods and Services.,ostaja tavarat ja palvelut
 DocType: Journal Entry,Accounts Payable,maksettava tilit
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,lisätä tilaajia
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" ei ole olemassa"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" ei ole olemassa"
 DocType: Pricing Rule,Valid Upto,voimassa asti
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Luetella muutamia asiakkaisiin. Ne voivat olla organisaatioita tai yksilöitä.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,suorat tulot
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",ei voi suodattaa tileittäin mkäli ryhmitelty tileittäin
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,hallintovirkailija
 DocType: Payment Tool,Received Or Paid,Vastaanotettu tai maksettu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Ole hyvä ja valitse Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Ole hyvä ja valitse Company
 DocType: Stock Entry,Difference Account,erotili
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"ei voi sulkea sillä se on toisesta riippuvainen tehtävä {0}, tehtävää ei ole suljettu"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,syötä varasto jonne materiaalipyyntö ohjataan
 DocType: Production Order,Additional Operating Cost,lisätoimintokustannukset
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,kosmetiikka
 DocType: DocField,Type,tyyppi
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
 DocType: Communication,Subject,aihe
 DocType: Shipping Rule,Net Weight,Netto
 DocType: Employee,Emergency Phone,hätänumero
 ,Serial No Warranty Expiry,sarjanumeron takuu on päättynyt
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,haluatko peruuttaa tämän materiaalipyynnön
 DocType: Sales Order,To Deliver,toimitukseen
 DocType: Purchase Invoice Item,Item,tuote
 DocType: Journal Entry,Difference (Dr - Cr),erotus (€ - TV)
 DocType: Account,Profit and Loss,tuloslaskelma
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Toimitusjohtaja Alihankinta
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Toimitusjohtaja Alihankinta
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,uusi UOM ei voi olla tyyppi kokonaisluku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,kalusteet ja tarvikkeet
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"taso, jolla hinnasto valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lisää / muokkaa veroja
 DocType: Purchase Invoice,Supplier Invoice No,toimittajan laskun nro
 DocType: Territory,For reference,viitteeseen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Voi poistaa Sarjanumero {0}, koska sitä käytetään varastotapahtumat"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),sulku (cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),sulku (cr)
 DocType: Serial No,Warranty Period (Days),takuuaika (päivää)
 DocType: Installation Note Item,Installation Note Item,asennus huomautus tuote
 ,Pending Qty,Odottaa Kpl
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Laskutus ja Toiminnan tila
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Toista asiakkaat
 DocType: Leave Control Panel,Allocate,Jakaa
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Edellinen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Myynti Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Myynti Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"valitse ne myyntitilaukset, josta haluat tehdä tuotannon tilauksen"
+DocType: Item,Delivered by Supplier (Drop Ship),Toimitetaan Toimittaja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,palkkakomponentteja
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,tietokanta potentiaalisista asiakkaista
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,asiakasrekisteri
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,rumpuhionta
 DocType: Purchase Order Item,Billed Amt,"laskutettu, pankkipääte"
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"perustettu varasto, minne ​varastokirjaukset tehdään"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},viitenumero ja viitepäivä vaaditaan{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},viitenumero ja viitepäivä vaaditaan{0}
 DocType: Event,Wednesday,keskiviikko
 DocType: Sales Invoice,Customer's Vendor,asiakkaan tosite
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,tuotannon tilaus vaaditaan
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,vastaanottoparametri
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'perustaja' ja 'ryhmä' ei voi olla samat
 DocType: Sales Person,Sales Person Targets,myyjän tavoitteet
-sites/assets/js/form.min.js +271,To,(lle)
-apps/frappe/frappe/templates/base.html +143,Please enter email address,syötä sähköpostiosoite
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,(lle)
+apps/frappe/frappe/templates/base.html +145,Please enter email address,syötä sähköpostiosoite
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,putkenmuotoilun loppu
 DocType: Production Order Operation,In minutes,minuutteina
 DocType: Issue,Resolution Date,johtopäätös päivä
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,Projektit Käyttäjä
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,käytetty
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ei löydy laskun lisätiedot taulukosta
 DocType: Company,Round Off Cost Center,pyöristys kustannuspaikka
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,huoltokäynti {0} on peruttava ennen myyntitilauksen perumista
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,huoltokäynti {0} on peruttava ennen myyntitilauksen perumista
 DocType: Material Request,Material Transfer,materiaalisiirto
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),perustaminen (€)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Kirjoittamisen aikaleima on sen jälkeen {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,asetukset
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,kohdistuneet kustannukset verot ja maksut
 DocType: Production Order Operation,Actual Start Time,todellinen aloitusaika
 DocType: BOM Operation,Operation Time,Operation Time
-sites/assets/js/list.min.js +5,More,Lisää
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Lisää
 DocType: Pricing Rule,Sales Manager,myynninhallinta
-sites/assets/js/desk.min.js +7673,Rename,Nimetä uudelleen
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Nimetä uudelleen
 DocType: Journal Entry,Write Off Amount,poiston arvomäärä
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Taipuva
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Salli Käyttäjä
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,suora jako
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"jäljitä tuotteen myynti- ja ostotositteet sarjanumeron mukaan, tätä käytetään myös tavaran takuutietojen jäljitykseen"
 DocType: Purchase Receipt Item Supplied,Current Stock,nykyinen varasto
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Hylätty Warehouse on pakollista vastaan ​​regected kohde
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Hylätty Warehouse on pakollista vastaan ​​regected kohde
 DocType: Account,Expenses Included In Valuation,"kulut, jotka sisältyy arvoon"
 DocType: Employee,Provide email id registered in company,tarkista sähköpostitunnuksen rekisteröinti yritykselle
 DocType: Hub Settings,Seller City,myyjä kaupunki
 DocType: Email Digest,Next email will be sent on:,Seuraava sähköpostiviesti lähetetään:
 DocType: Offer Letter Term,Offer Letter Term,Tarjoa Kirje Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,tuotteella on useampia malleja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,tuotetta {0} ei löydy
 DocType: Bin,Stock Value,varastoarvo
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,tyyppipuu
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,tervetuloa
 DocType: Journal Entry,Credit Card Entry,luottokorttikirjaus
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,tehtävän aihe
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,tavarat tastaanotettu toimittajilta
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,tavarat tastaanotettu toimittajilta
 DocType: Communication,Open,Avoin
 DocType: Lead,Campaign Name,Kampanjan nimi
 ,Reserved,Varattu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,haluatko todella jatkaa
 DocType: Purchase Order,Supply Raw Materials,toimita raaka-aineita
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,laskun luontipäivä muodostuu lähettäessä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,lyhytaikaiset vastaavat
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,asiakkaan ostotilaus numero
 DocType: Employee,Cell Number,solunumero
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Menetetty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,tilaisuuteen
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,kuukausipalkka tosite
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,vastattavat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,sanktioitujen arvomäärä ei voi olla suurempi kuin vaatimuksien arvomäärä rivillä {0}.
 DocType: Company,Default Cost of Goods Sold Account,oletus myytyjen tuotteiden arvo tili
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Hinnasto ei valittu
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Hinnasto ei valittu
 DocType: Employee,Family Background,taustaperhe
 DocType: Process Payroll,Send Email,lähetä sähköposti
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ei oikeuksia
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,tuotteet joilla on korkeampi painoarvo nätetään ylempänä
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,pankin täsmäytys lisätiedot
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,omat laskut
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Yksikään työntekijä ei löytynyt
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Yksikään työntekijä ei löytynyt
 DocType: Purchase Order,Stopped,pysäytetty
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,aloittaaksesi valitse BOM
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,lataa var
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,lähetä nyt
 ,Support Analytics,tuki Analytics
 DocType: Item,Website Warehouse,verkkosivujen varasto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,haluatko keskeyttää tuotannon tilauksen:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","kuukauden päivä jolloin automaattinen lasku muodostetaan, esim 05, 28 jne"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,pisteet on oltava pienempi tai yhtä suuri kuin 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-muoto tietue
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,asiak
 DocType: Features Setup,"To enable ""Point of Sale"" features",Jotta "Point of Sale" ominaisuuksia
 DocType: Bin,Moving Average Rate,liukuva keskiarvo taso
 DocType: Production Planning Tool,Select Items,valitse tuotteet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} ​​päivätty {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} ​​päivätty {2}
 DocType: Comment,Reference Name,Viite Name
 DocType: Maintenance Visit,Completion Status,katselmus tila
 DocType: Sales Invoice Item,Target Warehouse,tavoite varasto
 DocType: Item,Allow over delivery or receipt upto this percent,Salli yli toimitus- tai kuitti lähetettävään tähän prosenttia
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,odotettu toimituspäivä ei voi olla ennen myyntitilauksen päivää
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,odotettu toimituspäivä ei voi olla ennen myyntitilauksen päivää
 DocType: Upload Attendance,Import Attendance,tuo osallistuminen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,kaikki tuoteryhmät
 DocType: Process Payroll,Activity Log,aktiivisuus loki
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,muodosta automaattinen viesti toiminnon lähetyksessä
 DocType: Production Order,Item To Manufacture,tuote valmistukseen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Pysyvä muotti valu
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Ostotilaus to Payment
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} tila on {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ostotilaus to Payment
 DocType: Sales Order Item,Projected Qty,ennustettu yksikkömäärä
 DocType: Sales Invoice,Payment Due Date,maksun eräpäivä
 DocType: Newsletter,Newsletter Manager,uutiskirjehallinta
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,vaaditut numerot
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Arviointikertomusta.
 DocType: Sales Invoice Item,Stock Details,Varastossa Tiedot
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekti Arvo
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},ei voi siirtää {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},ei voi siirtää {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","tilin tase on jo kredit, syötetyn arvon tulee olla 'tasapainossa' eli 'debet'"
 DocType: Account,Balance must be,taseen on oltava
 DocType: Hub Settings,Publish Pricing,Julkaise Hinnoittelu
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Ostokuitti
 ,Received Items To Be Billed,Saivat kohteet laskuttamat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,räjäytys
-sites/assets/js/desk.min.js +3938,Ms,Ms
+DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,valuuttataso valvonta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
 DocType: Production Order,Plan material for sub-assemblies,suunnittele materiaalit alituotantoon
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,Alue
 DocType: Supplier,Default Payable Accounts,oletus maksettava tilit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,työntekijä {0} ei ole aktiivinen tai ei ole olemassa
 DocType: Features Setup,Item Barcode,tuote viivakoodi
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,tuotemallit {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,tuotemallit {0} päivitetty
 DocType: Quality Inspection Reading,Reading 6,Lukeminen 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,"ostolasku, edistynyt"
 DocType: Address,Shop,osta
 DocType: Hub Settings,Sync Now,synkronoi nyt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},rivi {0}: kredit kirjausta ei voi kohdistaa {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},rivi {0}: kredit kirjausta ei voi kohdistaa {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"oletuspankki / rahatililleen päivittyy automaattisesti POS laskussa, kun tila on valittuna"
 DocType: Employee,Permanent Address Is,pysyvä osoite on
 DocType: Production Order Operation,Operation completed for how many finished goods?,Toiminto suoritettu kuinka monta valmiit tavarat?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,brändi
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Avustus yli- {0} ristissä Kohta {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Avustus yli- {0} ristissä Kohta {1}.
 DocType: Employee,Exit Interview Details,poistu haastattelun lisätiedoista
 DocType: Item,Is Purchase Item,on ostotuote
 DocType: Journal Entry Account,Purchase Invoice,ostolasku
 DocType: Stock Ledger Entry,Voucher Detail No,tosite lisätiedot nro
 DocType: Stock Entry,Total Outgoing Value,"kokonaisarvo, lähtevä"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Aukiolopäivä ja Päättymisaika olisi oltava sama Tilikausi
 DocType: Lead,Request for Information,tietopyyntö
 DocType: Payment Tool,Paid,Maksettu
 DocType: Salary Slip,Total in words,sanat yhteensä
 DocType: Material Request Item,Lead Time Date,"virtausaika, päiväys"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,on pakollinen. Ehkä Valuutanvaihto tietuetta ei luotu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Rivi # {0}: Ilmoittakaa Sarjanumero alamomentin {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","tuotteet 'tavarakokonaisuudessa' varasto, sarjanumero ja eränumero pidetään olevan samasta 'pakkausluettelosta' taulukossa, mikäli sarja- ja eränumero on sama kaikille tuotteille tai 'tuotekokonaisuus' tuotteelle, (arvoja voi kirjata tuotteen päätaulukossa), arvot kopioidaan 'pakkausluettelo' taulukkoon"
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,toimitukset asiakkaille
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,toimitukset asiakkaille
 DocType: Purchase Invoice Item,Purchase Order Item,Ostotilaus Kohde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,välilliset tulot
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Aseta Maksusumma = jäljellä
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,osoiterivi 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,vaihtelu
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Yrityksen nimi
 DocType: SMS Center,Total Message(s),viestit yhteensä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,talitse siirrettävä tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,talitse siirrettävä tuote
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Katso luettelo kaikista ohjevideot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"valitse pankin tilin otsikko, minne shekki/takaus talletetaan"
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,salli käyttäjän muokata hinnaston tasoa tapahtumissa
 DocType: Pricing Rule,Max Qty,max yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,rivi {0}: maksu kohdistettuna ​​myynti- / ostotilaukseen tulee aina merkitä ennakkomaksuksi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,rivi {0}: maksu kohdistettuna ​​myynti- / ostotilaukseen tulee aina merkitä ennakkomaksuksi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,kemiallinen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
 DocType: Process Payroll,Select Payroll Year and Month,valitse palkkaluettelo vuosi ja kuukausi
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","siirry kyseiseen ryhmään (yleensä kohteessa rahastot> lyhytaikaiset vastaavat> pankkitilit ja tee uusi tili (valitsemalla lisää alasidos) ""pankki"""
 DocType: Workstation,Electricity Cost,sähkön kustannukset
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,valk
 DocType: SMS Center,All Lead (Open),kaikki vihjeet (avoimet)
 DocType: Purchase Invoice,Get Advances Paid,hae maksetut ennakot
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Liitä Picture
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Tehdä
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Tehdä
 DocType: Journal Entry,Total Amount in Words,sanat kokonaisarvomäärä
 DocType: Workflow State,Stop,pysäytä
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"tapahui virhe: todennäköinen syy on ettet ole tallentanut lomakketta, mikäli ongelma jatkuu ota yhteyttä sähköpostiin support@erpnext.com"
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,"pakkauslappu, tuote"
 DocType: POS Profile,Cash/Bank Account,kassa- / pankkitili
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
 DocType: Delivery Note,Delivery To,toimitus (lle)
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Taito pöytä on pakollinen
 DocType: Production Planning Tool,Get Sales Orders,hae myyntitilaukset
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ei voi olla negatiivinen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,arkistointi
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"päivitetään
 DocType: Project,Internal,sisäinen
 DocType: Task,Urgent,kiireellinen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Määritä kelvollinen Rivi tunnus rivin {0} taulukossa {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Siirry työpöydälle ja alkaa käyttää ERPNext
 DocType: Item,Manufacturer,Valmistaja
 DocType: Landed Cost Item,Purchase Receipt Item,Ostokuitti Kohde
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,varattu varastosta myyntitilaukseen / valmiit tuotteet varastoon
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,myynnin arvomäärä
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,aikalokit
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"olet hyväksyjä tälle tietueelle, päivitä 'tila' ja tallenna"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"olet hyväksyjä tälle tietueelle, päivitä 'tila' ja tallenna"
 DocType: Serial No,Creation Document No,asiakirjan luonti nro
 DocType: Issue,Issue,aihe
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","määritä tuotemallien tuntomerkit, kuten koko, väri jne."
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,kohdistus
 DocType: Item,Default Selling Cost Center,myyntien oletuskustannuspaikka
 DocType: Sales Partner,Implementation Partner,sovelluskumppani
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Myyntitilaus {0} on {1}
 DocType: Opportunity,Contact Info,"yhteystiedot, info"
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Making Stock Viestit
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Making Stock Viestit
 DocType: Packing Slip,Net Weight UOM,Nettopaino UOM
 DocType: Item,Default Supplier,oletus toimittaja
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ylituotannon rajoitusprosentti
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,hae viikottaiset poissa päivät
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,päättymispäivä ei voi olla ennen aloituspäivää
 DocType: Sales Person,Select company name first.,valitse yrityksen nimi ensin.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,€
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,€
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,toimittajan tarjous vastaanotettu
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},(lle) {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,päivitetty aikalokin kautta
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"yrityksen rekisterinumero viitteeksi, vero numerot jne"
 DocType: Sales Partner,Distributor,jakelija
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ostoskori toimitus sääntö
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,tuotannon tilaus {0} tulee peruuttaa ennen myyntitilauksen peruutusta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,tuotannon tilaus {0} tulee peruuttaa ennen myyntitilauksen peruutusta
 ,Ordered Items To Be Billed,tilatut laskutettavat tuotteet
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Vuodesta Range on oltava vähemmän kuin laitumelle
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,valitse aikaloki ja lähetä tehdäksesi uuden myyntilaskun
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,verot- j
 DocType: Lead,Lead,vihje
 DocType: Email Digest,Payables,maksettavat
 DocType: Account,Warehouse,Varasto
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
 ,Purchase Order Items To Be Billed,Ostotilaus Items laskuttamat
 DocType: Purchase Invoice Item,Net Rate,nettotaso
 DocType: Purchase Invoice Item,Purchase Invoice Item,"ostolasku, tuote"
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,kohdistamattomien m
 DocType: Global Defaults,Current Fiscal Year,nykyinen tilikausi
 DocType: Global Defaults,Disable Rounded Total,poista 'pyöristys yhteensä' käytöstä
 DocType: Lead,Call,pyyntö
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'kirjaukset' ei voi olla tyhjä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'kirjaukset' ei voi olla tyhjä
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
 ,Trial Balance,tasekokeilu
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,työntekijän perusmääritykset
-sites/assets/js/erpnext.min.js +5,"Grid ""","raja """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,työntekijän perusmääritykset
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","raja """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Ole hyvä ja valitse etuliite ensin
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Tutkimus
 DocType: Maintenance Visit Purpose,Work Done,työ tehty
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,lähetetty
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,näytä tilikirja
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
 DocType: Communication,Delivery Status,toimituksen tila
 DocType: Production Order,Manufacture against Sales Order,valmistus kohdistus myyntitilaukseen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,tuote {0} ei voi olla erä
 ,Budget Variance Report,budjettivaihtelu raportti
 DocType: Salary Slip,Gross Pay,bruttomaksu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,maksetut osingot
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Kirjanpito Ledger
 DocType: Stock Reconciliation,Difference Amount,eron arvomäärä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Kertyneet voittovarat
 DocType: BOM Item,Item Description,tuotteen kuvaus
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,"tilaisuus, tuote"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,tilapäinen avaus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,kryomuovaus
 ,Employee Leave Balance,työntekijän poistumistase
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},tilin tase {0} on oltava {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},tilin tase {0} on oltava {1}
 DocType: Address,Address Type,osoitteen tyyppi
 DocType: Purchase Receipt,Rejected Warehouse,Hylätty Warehouse
 DocType: GL Entry,Against Voucher,kuitin kohdistus
 DocType: Item,Default Buying Cost Center,ostojen oletuskustannuspaikka
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Jotta saat parhaan pois ERPNext, suosittelemme, että otat aikaa ja katsella näitä apua videoita."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,tuotteen {0} tulee olla myyntituote
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,että
 DocType: Item,Lead Time in days,"virtausaika, päivinä"
 ,Accounts Payable Summary,maksettava tilien yhteenveto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},jäädytettyä tiliä {0} ei voi muokata
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},jäädytettyä tiliä {0} ei voi muokata
 DocType: Journal Entry,Get Outstanding Invoices,hae odottavat laskut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,myyntitilaus {0} ei ole kelvollinen
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,aiheen alue
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,sopimus
 DocType: Report,Disabled,poistettu käytöstä
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM muuntokerroin vaaditaan UOM {0}:lle tuotteessa: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM muuntokerroin vaaditaan UOM {0}:lle tuotteessa: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,välilliset kulut
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,rivi {0}: yksikkömäärä vaaditaan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Maatalous
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,maksutapa
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,tämä on kantatuoteryhmä eikä sitä voi muokata
 DocType: Journal Entry Account,Purchase Order,Ostotilaus
 DocType: Warehouse,Warehouse Contact Info,Varaston yhteystiedot
-sites/assets/js/form.min.js +190,Name is required,nimi vaaditaan
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,nimi vaaditaan
 DocType: Purchase Invoice,Recurring Type,toistuva tyyppi
 DocType: Address,City/Town,kaupunki/kunta
 DocType: Email Digest,Annual Income,Vuositulot
 DocType: Serial No,Serial No Details,sarjanumeron lisätiedot
 DocType: Purchase Invoice Item,Item Tax Rate,tuotteen verotaso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,tuote {0} on alihankintatuote
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,käyttöomaisuuspääoma
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,tavoite
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,odotettu toimituspäivä on pienempi kuin suunniteltu aloituspäivä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,toimittajalle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,toimittajalle
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,tilityypin asetukset auttaa valitsemaan oikean tilin tapahtumaan
 DocType: Purchase Invoice,Grand Total (Company Currency),kokonaissumma (yrityksen valuutta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,lähtevät yhteensä
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","vain yksi toimitussääntö voi olla 0 tai tyhjä ""arvoon"":ssa"
 DocType: Authorization Rule,Transaction,tapahtuma
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,"huom, tämä kustannuspaikka on ryhmä eikä ryhmää kohtaan voi tehdä kirjanpidon kirjauksia"
-apps/erpnext/erpnext/config/projects.py +43,Tools,työkalut
+apps/frappe/frappe/config/desk.py +7,Tools,työkalut
 DocType: Item,Website Item Groups,tuoteryhmien verkkosivu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,tuotannon tilausnumero vaaditaan valmistuneiden tuotteiden varaston kirjausen osalta
 DocType: Purchase Invoice,Total (Company Currency),yhteensä (yrityksen valuutta)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,työaseman nimi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,tiedote:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
 DocType: Sales Partner,Target Distribution,"toimitus, tavoitteet"
-sites/assets/js/desk.min.js +7652,Comments,kommentit
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,kommentit
 DocType: Salary Slip,Bank Account No.,pankkitilin nro
 DocType: Naming Series,This is the number of the last created transaction with this prefix,viimeinen tapahtuma on tehty tällä numerolla ja tällä etuliitteellä
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},arvotaso vaaditaan tuotteelle {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Valitse Yrit
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,poistumisoikeus
 DocType: Purchase Invoice,Supplier Invoice Date,toimittajan laskun päiväys
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sinun tulee aktivoida ostoskori
-sites/assets/js/form.min.js +212,No Data,No Data
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,"arviointi, mallipohja tavoite"
 DocType: Salary Slip,Earning,ansio
 DocType: Payment Tool,Party Account Currency,PartyAccount Valuutta
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,PartyAccount Valuutta
 DocType: Purchase Taxes and Charges,Add or Deduct,lisää tai vähennä
 DocType: Company,If Yearly Budget Exceeded (for expense account),Jos vuotuinen talousarvio ylitetty (varten kululaskelma)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Päällekkäiset olosuhteisiin välillä:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,päiväkirjan kohdistettu kirjaus {0} on jo säädetty muuhun tositteeseen
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,päiväkirjan kohdistettu kirjaus {0} on jo säädetty muuhun tositteeseen
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,tilausten arvo yhteensä
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,ruoka
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,vanhentumisen skaala 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Ei annettu Vierailut
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","uutiskirjeet yhteystiedoiksi, vihjeiksi"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuutta sulkeminen on otettava {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},"kaikista tavoitteiden pisteiden summa  tulee olla 100, nyt se on {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Toimintoja ei voi jättää tyhjäksi.
 ,Delivered Items To Be Billed,"toimitettu, laskuttamat"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,sarjanumerolle ei voi muuttaa varastoa
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},tila päivitetty {0}
 DocType: DocField,Description,kuvaus
 DocType: Authorization Rule,Average Discount,Keskimääräinen alennus
 DocType: Letter Head,Is Default,on oletus
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,tuotteen veroarvomäärä
 DocType: Item,Maintain Stock,huolla varastoa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
 DocType: Leave Control Panel,Leave blank if considered for all designations,tyhjä mikäli se pidetään vihtoehtona kaikille nimityksille
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,alkaen aikajana
 DocType: Email Digest,For Company,yritykselle
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,toimitusosoitteen nimi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,tilikartta
 DocType: Material Request,Terms and Conditions Content,ehdot ja säännöt sisältö
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
 DocType: Maintenance Visit,Unscheduled,ei aikataulutettu
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Takuu / AMC tila
 DocType: GL Entry,GL Entry,päätilikirjakirjaus
 DocType: HR Settings,Employee Settings,työntekijän asetukset
 ,Batch-Wise Balance History,"erä työkalu, tasehistoria"
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,To Do - tehtävät luettelo
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do - tehtävät luettelo
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,opettelu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatiivinen Määrä ei ole sallittua
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Toimisto Rent
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,tekstiviestin reititinmääritykset
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,tuonti epäonnistui!
-sites/assets/js/erpnext.min.js +24,No address added yet.,osoitetta ei ole vielä lisätty
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,osoitetta ei ole vielä lisätty
 DocType: Workstation Working Hour,Workstation Working Hour,työaseman työaika
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analyytikko
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},rivi {0}: kohdennettavan arvomäärä {1} on oltava suurempi tai yhtä suuri kuin tosite arvomäärä {2}
 DocType: Item,Inventory,inventaario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Jotta "Point of Sale" näkymä
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,maksua ei voi tehdä tyhjällä ostoskorilla
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,maksua ei voi tehdä tyhjällä ostoskorilla
 DocType: Item,Sales Details,myynnin lisätiedot
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,tuotteilla
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",laskun luontipäivä muodostuu lähettäessä
 DocType: Item Attribute,Item Attribute,tuotetuntomerkki
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,hallinto
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,tuotemallit
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,tuotemallit
 DocType: Company,Services,palvelut
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),yhteensä ({0})
 DocType: Cost Center,Parent Cost Center,pääkustannuspaikka
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,tilikauden aloituspäivä
 DocType: Employee External Work History,Total Experience,kustannukset yhteensä
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,vastaupotus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,pakkauslaput peruttu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,pakkauslaput peruttu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,rahdin ja huolinnan maksut
 DocType: Material Request Item,Sales Order No,"myyntitilaus, numero"
 DocType: Item Group,Item Group Name,"tuoteryhmä, nimi"
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,otettu
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,otettu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,materiaalisiirto tuotantoon
 DocType: Pricing Rule,For Price List,hinnastoon
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,edistynyt haku
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,aikataulut
 DocType: Purchase Invoice Item,Net Amount,netto arvomäärä
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM yksittäisnumero
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),lisäalennuksen arvomäärä (yrityksen valuutta)
-DocType: Period Closing Voucher,CoA Help,"CoA, ohje"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},virhe: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},virhe: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"tee uusi tili, tilikartasta"
 DocType: Maintenance Visit,Maintenance Visit,"huolto, käynti"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,asiakas> asiakasryhmä> alue
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,"kohdistetut kustannukset, ohje"
 DocType: Event,Tuesday,tiistai
 DocType: Leave Block List,Block Holidays on important days.,estölomat tärkeinä päivinä
 ,Accounts Receivable Summary,saatava tilien yhteenveto
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lehdet tyyppi {0} on jo myönnetty Työsuhde {1} kauden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,kirjoita käyttäjätunnus työntekijä tietue kenttään  valitaksesi työntekijän roolin
 DocType: UOM,UOM Name,UOM nimi
 DocType: Top Bar Item,Target,tavoite
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,myyntikumppani tavoite
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kirjaus {0} voidaan tehdä vain valuutassa: {1}
 DocType: Pricing Rule,Pricing Rule,Hinnoittelu Rule
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Kulminta
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,ostotilaus materiaalipyynnöstä
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ostotilaus materiaalipyynnöstä
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},rivi # {0}: palautettava tuote {1} ei löydy {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,pankkitilit
 ,Bank Reconciliation Statement,pankin täsmäytystosite
 DocType: Address,Lead Name,vihje nimi
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,avaa varastotase
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,avaa varastotase
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} saa esiintyä vain kerran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ei saa tranfer enemmän {0} kuin {1} vastaan ​​Ostotilaus {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},poistumiset kohdennettu {0}:n
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},poistumiset kohdennettu {0}:n
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ei pakattavia tuotteita
 DocType: Shipping Rule Condition,From Value,arvosta
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,arvomäärät eivät heijastu pankkiin
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,yrityksen kuluvaatimukset
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,"yhteystiedot, puhelin"
 DocType: Production Planning Tool,Select Sales Orders,valitse myyntitilaukset
 ,Material Requests for which Supplier Quotations are not created,materiaalipyynnöt joita ei löydy toimittajan tarjouskyselyistä
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"seuraa tuotteita viivakoodia käyttämällä, löydät tuotteet lähetteeltä ja myyntilaskulta skannaamalla tuotteen viivakoodin"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Merkitse Toimitetaan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,tee tarjous
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} ei voi olla pidempi kuin {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} ei voi olla pidempi kuin {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,kokeile suunnitella toimia X päivää etukäteen
 DocType: HR Settings,Stop Birthday Reminders,lopeta syntymäpäivämuistutukset
 DocType: SMS Center,Receiver List,Vastaanotin List
 DocType: Payment Tool Detail,Payment Amount,maksun arvomäärä
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,käytetty arvomäärä
-sites/assets/js/erpnext.min.js +51,{0} View,{0} näytä
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} näytä
 DocType: Salary Structure Deduction,Salary Structure Deduction,"palkkarakenne, vähennys"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Valikoiva lasersintraus
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,tuonti onnistunut!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,aiheen tuotteiden kustannukset
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Määrä saa olla enintään {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,oletus maksettava tili
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","online-ostoskorin asetukset, kuten toimitustavat, hinnastot jne"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,määritys valmis
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% laskutettu
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,varattu yksikkömäärä
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,varattu yksikkömäärä
 DocType: Party Account,Party Account,osapuolitili
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,henkilöstöresurssit
 DocType: Lead,Upper Income,ylemmät tulot
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,aktivoi ostoskori
 DocType: Employee,Permanent Address,pysyvä osoite
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,tuote {0} on palvelutuote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Maksettu ennakko vastaan ​​{0} {1} ei voi olla suurempi \ kuin Grand Yhteensä {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,valitse tuotekoodi
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),pienennä vähennystä poistuttaessa ilman palkkaa (LWP)
 DocType: Territory,Territory Manager,aluehallinta
+DocType: Delivery Note Item,To Warehouse (Optional),Varastoon (valinnainen)
 DocType: Sales Invoice,Paid Amount (Company Currency),Maksettu määrä (Yrityksen valuutta)
 DocType: Purchase Invoice,Additional Discount,Lisäalennuksen
 DocType: Selling Settings,Selling Settings,myynnin asetukset
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,painoarvo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Kaivostoiminta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin valu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"saman niminen asiakasryhmä on jo olemassa, vaihda asiakkaan nimi tai nimeä asiakasryhmä uudelleen"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Ole hyvä ja valitse {0} ensin.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Ole hyvä ja valitse {0} ensin.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},teksti {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,erän nro
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Salli useat Myyntitilaukset vastaan ​​Asiakkaan Ostotilauksen
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Tärkein
 DocType: DocPerm,Delete,poista
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,malli
-sites/assets/js/desk.min.js +7971,New {0},Uusi {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,malli
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Uusi {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,aseta sarjojen numeroinnin etuliite tapahtumiin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,"pysäytettyä tilausta ei voi peruuttaa peruuttaa, käynnistä se jotta voit peruuttaa"
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"pysäytettyä tilausta ei voi peruuttaa peruuttaa, käynnistä se jotta voit peruuttaa"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
 DocType: Employee,Leave Encashed?,perintä?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,tilaisuuteen kenttä vaaditaan
 DocType: Item,Variants,mallit
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,maa
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,osoitteet
 DocType: Communication,Received,Vastaanotettu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,päiväkirjaan kohdistus {0} ei täsmäämättömiä {1} kirjauksia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,päiväkirjaan kohdistus {0} ei täsmäämättömiä {1} kirjauksia
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},monista tuotteelle kirjattu sarjanumero {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,edellyttää toimitustapaa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,tuotteella ei voi olla tuotannon tilausta
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,titteli/tervehdys
 DocType: Communication,Rejected,Hylätty
 DocType: Pricing Rule,Brand,brändi
 DocType: Item,Will also apply for variants,sovelletaan myös muissa malleissa
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% toimitettu
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,kokoa tuotteet myyntihetkellä
 DocType: Sales Order Item,Actual Qty,todellinen yksikkömäärä
 DocType: Sales Invoice Item,References,Viitteet
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,t
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,leikkauslujuus
 DocType: Item,Has Variants,on useita malleja
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,valitse 'tee myyntilasku' painike ja tee uusi myyntilasku
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,kaudesta ja kauteen päivät vaaditaan toistuvalle %:lle
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,pakkaukset ja merkinnät
 DocType: Monthly Distribution,Name of the Monthly Distribution,"toimitus kuukaudessa, nimi"
 DocType: Sales Person,Parent Sales Person,emomyyjä
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,syötä yrityksen oletusvaluutta kohdassa yrityksen valvonta ja yleiset oletusasetukset
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox pääsy salaus
 DocType: Purchase Invoice,Recurring Invoice,toistuva Lasku
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Toimitusjohtaja Projektit
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Toimitusjohtaja Projektit
 DocType: Supplier,Supplier of Goods or Services.,toimittaja tavarat tai palvelut
 DocType: Budget Detail,Fiscal Year,tilikausi
 DocType: Cost Center,Budget,budjetti
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,myynti
 DocType: Employee,Salary Information,palkkatietoja
 DocType: Sales Person,Name and Employee ID,Nimi ja Employee ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspäivää
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspäivää
 DocType: Website Item Group,Website Item Group,tuoteryhmän verkkosivu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,tullit ja verot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Anna Viiteajankohta
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} maksukirjauksia ei voida suodattaa {1}:lla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Anna Viiteajankohta
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} maksukirjauksia ei voida suodattaa {1}:lla
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,verkkosivuilla näkyvien tuotteiden taulukko
 DocType: Purchase Order Item Supplied,Supplied Qty,yksikkömäärä toimitettu
 DocType: Material Request Item,Material Request Item,tuote materiaalipyyntö
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,tuoteryhmien puu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"rivi ei voi viitata nykyistä suurempaan tai nykyisen rivin numeroon, vaihda maksun tyyppiä"
 ,Item-wise Purchase History,"tuote työkalu, ostohistoria"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,punainen
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"klikkaa ""muodosta aikataulu"" ja syötä tuotteen sarjanumero {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"klikkaa ""muodosta aikataulu"" ja syötä tuotteen sarjanumero {0}"
 DocType: Account,Frozen,jäädytetty
 ,Open Production Orders,avoimet tuotannon tilausket
 DocType: Installation Note,Installation Time,asennus aika
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,"tarjous, trendit"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},tuotteen {0} tuoteryhmää ei ole mainittu kohdassa tuote työkalu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",mikäli tälle tuotteelle sallitaan tuotannon tilaus sen tulee olla varastotuote
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",mikäli tälle tuotteelle sallitaan tuotannon tilaus sen tulee olla varastotuote
 DocType: Shipping Rule Condition,Shipping Amount,toimituskustannus arvomäärä
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Liittyminen
 DocType: Authorization Rule,Above Value,yläarvo
 ,Pending Amount,odottaa arvomäärä
 DocType: Purchase Invoice Item,Conversion Factor,muuntokerroin
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,toimitettu
+DocType: Purchase Order,Delivered,toimitettu
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),määritä työpaikkahaun sähköpostin saapuvan palvelimen asetukset (esim ura@example.com)
 DocType: Purchase Receipt,Vehicle Number,Ajoneuvojen lukumäärä
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,päivä jolloin toistuva lasku lakkaa
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,toimitusmaksut perustue
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,tili {0} tulee olla 'pitkaikaiset vastaavat' tili sillä tuotella {1} on tasearvo
 DocType: HR Settings,HR Settings,henkilöstön asetukset
 apps/frappe/frappe/config/setup.py +130,Printing,Painaminen
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,"kuluvaatimus odottaa hyväksyntää, vain kulujen hyväksyjä voi päivittää tilan"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,"kuluvaatimus odottaa hyväksyntää, vain kulujen hyväksyjä voi päivittää tilan"
 DocType: Purchase Invoice,Additional Discount Amount,lisäalennuksen arvomäärä
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"anotut poissaolopäivät lomapäiviä, sinun ei tarvitse anoa lupaa"
-sites/assets/js/desk.min.js +7805,and,ja
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ja
 DocType: Leave Block List Allow,Leave Block List Allow,"poistu estoluettelo, salli"
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,urheilu
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,tarjous
 DocType: Salary Slip,Total Deduction,vähennys yhteensä
 DocType: Quotation,Maintenance User,"huolto, käyttäjä"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,kustannukset päivitetty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,"Oletko varma, että haluat UNSTOP"
 DocType: Employee,Date of Birth,syntymäpäivä
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,tuote {0} on palautettu
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**tilikausi** kaikki tilikauden kirjanpitoon kirjatut tositteet ja päätapahtumat on jäljitetty **tilikausi**
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","seuraa myyntikampankoita, seuraa vihjeitä, -tarjouksia, myyntitilauksia ym mitataksesi kampanjaan sijoitetun pääoman tuoton"
 DocType: Expense Claim,Approver,hyväksyjä
 ,SO Qty,myyntitilaukset yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",varaston kirjauksia on kohdistettuna ​​varastoon {0} joten uudelleenmääritys tai muokkaus ei onnistu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",varaston kirjauksia on kohdistettuna ​​varastoon {0} joten uudelleenmääritys tai muokkaus ei onnistu
 DocType: Appraisal,Calculate Total Score,laske yhteispisteet
 DocType: Supplier Quotation,Manufacturing Manager,valmistuksenhallinta
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},sarjanumerolla {0} on takuu {1} asti
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,jaa lähete pakkauksien kesken
 apps/erpnext/erpnext/hooks.py +84,Shipments,toimitukset
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,kastomuovaus
+DocType: Purchase Order,To be delivered to customer,Toimitetaan asiakkaalle
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,aikalokin tila pitää lähettää
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sarjanumero {0} ei kuulu mihinkään Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,perusmääritykset
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,valuutasta
 DocType: DocField,Name,Nimi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,arvomäärät eivät heijastu järjestelmässä
 DocType: Purchase Invoice Item,Rate (Company Currency),taso (yrityksen valuutta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Muut
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,aseta pysäytetyksi
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ei löydä vastaavia Tuote. Valitse jokin muu arvo {0}.
 DocType: POS Profile,Taxes and Charges,verot ja maksut
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","tavara tai palvelu joka ostetaan, myydään tai varastoidaan"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"ei voi valita maksun tyyppiä, kuten 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä' ensimmäiseksi riviksi"
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,valitse asiakirjatyyppi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,lähesty /avaa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,pankkitoiminta
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"klikkaa ""muodosta aikataulu"" saadaksesi aikataulun"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,uusi kustannuspaikka
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,uusi kustannuspaikka
 DocType: Bin,Ordered Quantity,tilattu määrä
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
 DocType: Quality Inspection,In Process,prosessissa
 DocType: Authorization Rule,Itemwise Discount,"tuote työkalu, alennus"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
+DocType: Purchase Order Item,Reference Document Type,Viite Asiakirjan tyyppi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
 DocType: Account,Fixed Asset,pitkaikaiset vastaavat
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serialized Inventory
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Inventory
 DocType: Activity Type,Default Billing Rate,Oletus laskutustaksa
 DocType: Time Log Batch,Total Billing Amount,laskutuksen kokomaisarvomäärä
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,saatava tili
 ,Stock Balance,varastotase
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,myyntitilauksesta maksuun
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,myyntitilauksesta maksuun
 DocType: Expense Claim Detail,Expense Claim Detail,kuluvaatimus lisätiedot
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,aikaloki on luotu:
 DocType: Item,Weight UOM,paino UOM
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM palautus: {0} ei voi pää tai alasidos {2}
 DocType: Production Order Operation,Completed Qty,valmiit yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","{0}, vain debet tili voidaan kohdistaa kredit kirjaukseen"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,hinnasto {0} on poistettu käytöstä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, vain debet tili voidaan kohdistaa kredit kirjaukseen"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,hinnasto {0} on poistettu käytöstä
 DocType: Manufacturing Settings,Allow Overtime,Salli Ylityöt
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,myyntitilaus {0} on pysäytetty
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sarjanumerot tarvitaan Tuote {1}. Olet antanut {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,nykyinen arvotaso
 DocType: Item,Customer Item Codes,asiakkaan tuotekoodit
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,hitsata
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,uusi varasto UOM vaaditaan
 DocType: Quality Inspection,Sample Size,näytteen koko
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,kaikki tuotteet on jo laskutettu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,kaikki tuotteet on jo laskutettu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Määritä kelvollinen "Case No."
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"lisää kustannuspaikkoja voidaan tehdä kohdassa ryhmät, mutta pelkät merkinnät voi kohdistaa ilman ryhmiä"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"lisää kustannuspaikkoja voidaan tehdä kohdassa ryhmät, mutta pelkät merkinnät voi kohdistaa ilman ryhmiä"
 DocType: Project,External,ulkoinen
 DocType: Features Setup,Item Serial Nos,tuote sarjanumerot
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,käyttäjät ja käyttöoikeudet
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,t
 DocType: Sales Partner,Address & Contacts,osoitteet ja yhteystiedot
 DocType: SMS Log,Sender Name,lähettäjän nimi
 DocType: Page,Title,otsikko
-sites/assets/js/list.min.js +104,Customize,muokata
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,muokata
 DocType: POS Profile,[Select],[valitse]
 DocType: SMS Log,Sent To,lähetetty kenelle
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,tee myyntilasku
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,elinkaaren loppu
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,matka
 DocType: Leave Block List,Allow Users,Salli Käyttäjät
+DocType: Purchase Order,Customer Mobile No,Asiakas Mobile Ei
 DocType: Sales Invoice,Recurring,Toistuva
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,seuraa tavaran erillisiä tuloja ja kuluja  toimialoittain tai osastoittain
 DocType: Rename Tool,Rename Tool,Nimeä Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,päivitä kustannukset
 DocType: Item Reorder,Item Reorder,tuote tiedostot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,materiaalisiirto
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,materiaalisiirto
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","määritä toiminnot, käyttökustannukset ja anna toiminnoille oma uniikki numero"
 DocType: Purchase Invoice,Price List Currency,"hinnasto, valuutta"
 DocType: Naming Series,User must always select,käyttäjän tulee aina valita
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,työntekijä
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,tuo sähköposti mistä
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Kutsu Käyttäjä
 DocType: Features Setup,After Sale Installations,jälkimarkkinointi asennukset
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} on kokonaan laskutettu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} on kokonaan laskutettu
 DocType: Workstation Working Hour,End Time,ajan loppu
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,"perussopimusehdot, myynti tai osto"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,tositteen ryhmä
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Page,Standard,perus
 DocType: Rename Tool,File to Rename,uudelleennimettävä tiedosto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Näytä Maksut
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},määriteltyä BOM:ia {0} ei löydy tuotteelle {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,huoltoaikataulu {0} on peruttava ennen myyntitilauksen perumista
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,huoltoaikataulu {0} on peruttava ennen myyntitilauksen perumista
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,koko
 DocType: Notification Control,Expense Claim Approved,kuluvaatimus hyväksytty
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Lääkealan
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,osallistuminen päivään
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),määritä myynnin sähköpostin saapuvan palvelimen asetukset (esim myynti@example.com)
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,maksutili
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
-sites/assets/js/list.min.js +23,Draft,luonnos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,luonnos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,korvaava on pois
 DocType: Quality Inspection Reading,Accepted,hyväksytyt
 DocType: User,Female,nainen
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,toimitus sääntö etiketti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
 DocType: Newsletter,Test,testi
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","tuotteella on varastotapahtumia \ ei voi muuttaa arvoja ""sarjanumero"", ""eränumero"", ""varastotuote"" ja ""arvomenetelmä"""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Nopea Päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"tasoa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
 DocType: Employee,Previous Work Experience,Edellinen Työkokemus
 DocType: Stock Entry,For Quantity,yksikkömäärään
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},syötä suunniteltu yksikkömäärä tuotteelle {0} rivillä {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} ei ole lähetetty
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Pyynnöt kohteita.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} ei ole lähetetty
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Pyynnöt kohteita.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,erillinen tuotannon tilaus luodaan jokaiselle valmistuneelle tuotteelle
 DocType: Purchase Invoice,Terms and Conditions1,ehdot ja säännöt 1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,määritykset suoritettu loppuun
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Uutiskirje Postit
 DocType: Delivery Note,Transporter Name,kuljetusyritys nimi
 DocType: Contact,Enter department to which this Contact belongs,"syötä osasto, johon tämä yhteystieto kuuluu"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,"yhteensä, puuttua"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,tuote tai varastorivi {0} ei täsmää materiaalipyynnön kanssa
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,tuote tai varastorivi {0} ei täsmää materiaalipyynnön kanssa
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,mittayksikkö
 DocType: Fiscal Year,Year End Date,Vuoden lopetuspäivä
 DocType: Task Depends On,Task Depends On,tehtävä riippuu
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"kolmas osapuoli kuten välittäjä / edustaja / agentti / jälleenmyyjä, joka myy tavaraa yrityksille provisiolla"
 DocType: Customer Group,Has Child Node,alasidoksessa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","syötä staattiset url parametrit tähän (esim, lähettäjä = ERPNext, käyttäjätunnus = ERPNext, salasana = 1234 jne)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ei ole millään aktiivisella tilikaudella, täppää {2} saadaksesi lisätietoja"
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"tämä on demo verkkosivu, joka on muodostettu automaattisesti ERPNext:ssä"
@@ -2021,11 +2032,9 @@ DocType: Note,Note,Huomata
 DocType: Purchase Receipt Item,Recd Quantity,RECD Määrä
 DocType: Email Account,Email Ids,sähköpostitunnukset
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ei voi valmistaa suurempaa määrää tuotteita {0} kuin myyntitilauksen määrä {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,aseta jatkavaksi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
 DocType: Payment Reconciliation,Bank / Cash Account,pankki / kassa
 DocType: Tax Rule,Billing City,Laskutus Kaupunki
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,"tämä poistumissovellus odottaa hyväksyntää, vain valtuutettu käyttäjä voi hyväksyä sen"
 DocType: Global Defaults,Hide Currency Symbol,piilota valuuttasymbooli
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","esim, pankki, kassa, luottokortti"
 DocType: Journal Entry,Credit Note,hyvityslasku
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),yhteensä (yksikkömä
 DocType: Installation Note Item,Installed Qty,asennettu yksikkömäärä
 DocType: Lead,Fax,faksi
 DocType: Purchase Taxes and Charges,Parenttype,emotyyppi
-sites/assets/js/list.min.js +26,Submitted,lähetetty
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,lähetetty
 DocType: Salary Structure,Total Earning,ansiot yhteensä
 DocType: Purchase Receipt,Time at which materials were received,vaihtomateriaalien vastaanottoaika
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,omat osoitteet
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,"organisaatio
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,tai
 DocType: Sales Order,Billing Status,Laskutus tila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,hyödykekulut
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-yli
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-yli
 DocType: Buying Settings,Default Buying Price List,"oletus hinnasto, osto"
 ,Download Backups,lataa varmuuskopiot
 DocType: Notification Control,Sales Order Message,"myyntitilaus, viesti"
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,valitse työntekijät
 DocType: Bank Reconciliation,To Date,päivään
 DocType: Opportunity,Potential Sales Deal,Potentiaaliset Myynti Deal
-sites/assets/js/form.min.js +308,Details,lisätiedot
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,lisätiedot
 DocType: Purchase Invoice,Total Taxes and Charges,verot ja maksut yhteensä
 DocType: Employee,Emergency Contact,hätäyhteydenotto
 DocType: Item,Quality Parameters,laatuparametrit
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,saapuneet yksikkömäärä
 DocType: Stock Entry Detail,Serial No / Batch,sarjanumero / erä
 DocType: Product Bundle,Parent Item,Parent Kohde
 DocType: Account,Account Type,Tilin tyyppi
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"huoltuaikataulua ei ole luotu kaikille tuotteille, klikkaa ""muodosta aikataulu"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"huoltuaikataulua ei ole luotu kaikille tuotteille, klikkaa ""muodosta aikataulu"""
 ,To Produce,tuotantoon
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","riviin {0}:ssa {1} sisällytä {2} tuotetasolle, rivit {3} tulee myös sisällyttää"
 DocType: Packing Slip,Identification of the package for the delivery (for print),pakkauksen tunnistus toimitukseen (tulostus)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,tasoitus
 DocType: Account,Income Account,tulotili
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Reunus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Toimitus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Toimitus
 DocType: Stock Reconciliation Item,Current Qty,nykyinen yksikkömäärä
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","katso ""materiaaleihin perustuva arvo"" kustannuslaskenta osiossa"
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastuu Area
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,kaikki osoitteet
 DocType: Company,Stock Settings,varastoasetukset
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","yhdistäminen on mahdollista vain, jos seuraavat arvot ovat samoja molemmissa tietueissa, kantatyyppi, ryhmä, viite, yritys"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","yhdistäminen on mahdollista vain, jos seuraavat arvot ovat samoja molemmissa tietueissa, kantatyyppi, ryhmä, viite, yritys"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,hallitse asiakasryhmäpuuta
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,uuden kustannuspaikan nimi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,uuden kustannuspaikan nimi
 DocType: Leave Control Panel,Leave Control Panel,"poistu, ohjauspaneeli"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"oletus osoite, mallipohjaa ei löytynyt, luo uusi mallipohja kohdassa määritykset> tulostus ja brändäys> osoitemallipohja"
 DocType: Appraisal,HR User,henkilöstön käyttäjä
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,maksutyökalu lisätiedot
 ,Sales Browser,myyntiselain
 DocType: Journal Entry,Total Credit,kredit yhteensä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Paikallinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Paikallinen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),lainat ja ennakot (vastaavat)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,velalliset
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Suuri
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Yksikään työntekijä ei löytynyt!
 DocType: C-Form Invoice Detail,Territory,alue
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,vierailujen määrä vaaditaan
+DocType: Purchase Order,Customer Address Display,Asiakkaan osoite Näyttö
 DocType: Stock Settings,Default Valuation Method,oletus arvomenetelmä
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Kiillotus
 DocType: Production Order Operation,Planned Start Time,Suunnitellut Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,kohdennettu
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,sulje tase ja tuloslaskelma kirja
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska \ olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Oletusasetusten UOM, \ käyttö "UOM Vaihda Utility" työkalu alla Stock moduuli."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,määritä valuutan muunnostaso vaihtaaksesi valuutan toiseen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,tarjous {0} on peruttu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,tarjous {0} on peruttu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,odottava arvomäärä yhteensä
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"työntekijä {0} on poissa {1}, ei voi merkitä osallistumista"
 DocType: Sales Partner,Targets,tavoitteet
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,tämä on kanta-asiakasryhmä eikä sitä voi muokata
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,määritä tilikartta ennen kirjanpidon kirjausten aloittamista
 DocType: Purchase Invoice,Ignore Pricing Rule,ohita hinnoittelu sääntö
-sites/assets/js/list.min.js +24,Cancelled,peruttu
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,peruttu
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,päivästä ei voi olla pienempi kuin työntekijän aloituspäivä palkkarakenteessa
 DocType: Employee Education,Graduate,valmistunut
 DocType: Leave Block List,Block Days,estopäivää
 DocType: Journal Entry,Excise Entry,aksiisikirjaus
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Varoitus: Myyntitilaus {0} on jo olemassa vastaan ​​Asiakkaan Ostotilaus {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Varoitus: Myyntitilaus {0} on jo olemassa vastaan ​​Asiakkaan Ostotilaus {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,varasto vastaanotettu mutta ei la
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,bruttomaksu + jäännösarvomäärä + perintä määrä - vähennys yhteensä
 DocType: Monthly Distribution,Distribution Name,"toimitus, nimi"
 DocType: Features Setup,Sales and Purchase,myynti ja osto
-DocType: Purchase Order Item,Material Request No,materiaalipyyntö nro
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},tuotteelle {0} laatutarkistus
+DocType: Supplier Quotation Item,Material Request No,materiaalipyyntö nro
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},tuotteelle {0} laatutarkistus
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"taso, jolla asiakkaan valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} on poistettu tästä luettelosta.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),nettotaso (yrityksen valuutta)
-apps/frappe/frappe/templates/base.html +132,Added,lisätty
+apps/frappe/frappe/templates/base.html +134,Added,lisätty
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,hallitse aluepuuta
 DocType: Journal Entry Account,Sales Invoice,myyntilasku
 DocType: Journal Entry Account,Party Balance,osatase
 DocType: Sales Invoice Item,Time Log Batch,aikaloki erä
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,valitse käytä alennusta
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,valitse käytä alennusta
 DocType: Company,Default Receivable Account,oletus saatava tili
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,tee pankkikirjaus maksetusta kokonaispalkasta edellä valituin kriteerein
 DocType: Stock Entry,Material Transfer for Manufacture,materiaalisiirto tuotantoon
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,hae tarvittavat kirjaukset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,kirjanpidon varaston kirjaus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,lyönti
 DocType: Sales Invoice,Sales Team1,myyntitiimi 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,tuotetta {0} ei ole olemassa
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Sales Invoice,Customer Address,asiakkaan osoite
 apps/frappe/frappe/desk/query_report.py +136,Total,yhteensä
 DocType: Purchase Invoice,Apply Additional Discount On,käytä lisäalennusta
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,laatutarkistus
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,erittäin suuri
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ruisku muovaaminen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,tili {0} on jäädytetty
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,tili {0} on jäädytetty
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"juridinen hlö / tytäryhtiö, jolla on erillinen tilikartta kuuluu organisaatioon"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","ruoka, juoma ja tupakka"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL tai BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Voi vain maksun vastaan ​​laskuttamattomia {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,provisio taso ei voi olla suurempi kuin 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Pienin Inventory Level
 DocType: Stock Entry,Subcontract,alihankinta
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Kirjoita {0} ensimmäisen
 DocType: Production Planning Tool,Get Items From Sales Orders,hae tuotteet myyntitilauksesta
 DocType: Production Order Operation,Actual End Time,todellinen päättymisaika
 DocType: Production Planning Tool,Download Materials Required,lataa tarvittavien materiaalien lista
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,aikataulutettu
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","valitse tuote joka ""varastotuote"", ""numero"" ja ""myyntituote"" valinnat täpätty kohtaan ""kyllä"", tuotteella ole muuta tavarakokonaisuutta"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,valitse toimitusten kk jaksotus tehdäksesi kausiluonteiset toimitusttavoitteet
 DocType: Purchase Invoice Item,Valuation Rate,arvotaso
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,"hinnasto, valuutta ole valittu"
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,"hinnasto, valuutta ole valittu"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,tuotetta rivillä {0}: ostokuittilla {1} ei ole olemassa ylläolevassa 'ostokuitit' taulukossa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti aloituspäivä
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,asti
 DocType: Rename Tool,Rename Log,Nimeä Log
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,vain jatkosidokset ovat sallittuja tapahtumassa
 DocType: Expense Claim,Expense Approver,kulujen hyväksyjä
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,tuote ostokuitti toimitettu
-sites/assets/js/erpnext.min.js +48,Pay,Maksaa
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Maksaa
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,aikajana
 DocType: SMS Settings,SMS Gateway URL,tekstiviesti reititin URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Lokit ylläpitämiseksi sms toimituksen tila
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,hionta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,kutistekalvopakkaus
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Odottaa Aktiviteetit
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Odottaa Aktiviteetit
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Vahvistettu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,toimittaja> toimittaja tyyppi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Syötä lievittää päivämäärä.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,sy
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,valitse tilikausi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,sulatus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"olet poissaolojen hyväksyjä tälle tietueelle, päivitä 'tila' ja tallenna"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Level
 DocType: Attendance,Attendance Date,"osallistuminen, päivä"
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,palkkaerittelyn kohdistetut ansiot ja vähennykset
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa ryhmäksi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,arvonalennus
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),toimittaja/toimittajat
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Virheellinen ajanjakso
 DocType: Customer,Credit Limit,luottoraja
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,valitse tapahtuman tyyppi
 DocType: GL Entry,Voucher No,tosite nro
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,sopim
 DocType: Customer,Address and Contact,Osoite ja yhteystiedot
 DocType: Customer,Last Day of the Next Month,Viimeinen päivä Seuraava kuukausi
 DocType: Employee,Feedback,palaute
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Aikataulu
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Aikataulu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,koneellinen työstö
 DocType: Stock Settings,Freeze Stock Entries,jäädytä varaston kirjaukset
 DocType: Website Settings,Website Settings,verkkosivujen asetukset
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,Lähtevä
 DocType: Material Request,Requested For,Pyydetty For
 DocType: Quotation Item,Against Doctype,asiakirjan tyyppi kohdistus
 DocType: Delivery Note,Track this Delivery Note against any Project,seuraa tätä lähetettä kohdistettuna projektiin
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,kantaa ei voi poistaa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,kantaa ei voi poistaa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,näytä varaston kirjaukset
 ,Is Primary Address,On Ensisijainen osoite
 DocType: Production Order,Work-in-Progress Warehouse,työnalla varasto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Viite # {0} päivätty {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Viite # {0} päivätty {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Hallitse Osoitteet
 DocType: Pricing Rule,Item Code,tuotekoodi
 DocType: Production Planning Tool,Create Production Orders,tee tuotannon tilaus
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,käyttäjä huomautus
 DocType: Lead,Market Segment,Market Segment
 DocType: Communication,Phone,Puhelin
 DocType: Employee Internal Work History,Employee Internal Work History,työntekijän sisäinen työhistoria
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),sulku (dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),sulku (dr)
 DocType: Contact,Passive,Passiivinen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,sarjanumero {0} ei varastossa
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,veromallipohja myyntitapahtumiin
 DocType: Sales Invoice,Write Off Outstanding Amount,poiston odottava arvomäärä
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","täppää mikäli haluat automaattisesti toistuvan laskun, laskun lähetyksen jälkeen pääset toistuvan laskun määrityksiin"
 DocType: Account,Accounts Manager,tilien hallinta
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',"aikaloki {0} pitää ""lähettää"""
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"aikaloki {0} pitää ""lähettää"""
 DocType: Stock Settings,Default Stock UOM,oletus varasto UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Maksaa Hinta perustuu Toimintalaji (tunnissa)
 DocType: Production Planning Tool,Create Material Requests,tee materiaalipyyntö
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,pankin täsmäytys
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,hae päivitykset
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,materiaalipyyntö {0} on peruttu tai keskeytetty
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Lisää muutama esimerkkitietue
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,poistumishallinto
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,poistumishallinto
 DocType: Event,Groups,ryhmät
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,tilin ryhmä
 DocType: Sales Order,Fully Delivered,täysin toimitettu
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,myynnin ekstrat
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} tilin budjetti {1} kustannuspaikkaa kohtaan {2} ylittyy {3}:lla
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,siirrä välitetyt poistumiset
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','aloituspäivä' tulee olla ennen 'päättymispäivää'
 ,Stock Projected Qty,ennustettu varaston yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
 DocType: Sales Order,Customer's Purchase Order,Asiakkaan Ostotilaus
 DocType: Warranty Claim,From Company,yrityksestä
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,arvo tai yksikkömäärä
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Jälleenmyyjä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kiitos tilin on oltava Tase tili
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,kaikki toimittajatyypit
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"tuotekoodi vaaditaan, sillä tuotetta ei numeroida automaattisesti"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},tarjous {0} ei ole tyyppiä {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"tuotekoodi vaaditaan, sillä tuotetta ei numeroida automaattisesti"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},tarjous {0} ei ole tyyppiä {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,"huoltoaikataulu, tuote"
 DocType: Sales Order,%  Delivered,% toimitettu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,pankin tilinylitystili
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,tee palkkalaskelma
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,jatka
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,selaa BOM:a
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,taatut lainat
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,hyvät tavarat
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,arviointi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Kadonnut-vaahto valu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,piirto
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,päivä toistetaan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
 DocType: Hub Settings,Seller Email,myyjä sähköposti
 DocType: Project,Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista)
 DocType: Workstation Working Hour,Start Time,aloitusaika
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),netto arvomäärä (yrityksen valuutta)
 DocType: BOM Operation,Hour Rate,tuntitaso
 DocType: Stock Settings,Item Naming By,tuotteen nimeäjä
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,tarjouksesta
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},toinen jakson sulkukirjaus {0} on tehty {1} jälkeen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,tarjouksesta
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},toinen jakson sulkukirjaus {0} on tehty {1} jälkeen
 DocType: Production Order,Material Transferred for Manufacturing,materiaali siirretty tuotantoon
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Tiliä {0} ei löydy
 DocType: Purchase Receipt Item,Purchase Order Item No,Ostotilaus Tuote nro
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,tarkistus vaaditaan
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,täysin laskutettu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,käsirahat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Toimitus varasto tarvitaan varastonimike {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Toimitus varasto tarvitaan varastonimike {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"pakkauksen bruttopaino, yleensä tuotteen nettopaino + pakkausmateriaalin paino  (tulostukseen)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"roolin käyttäjät ei voi jäädyttää tilejä, tai luoda / muokata kirjanpidon kirjauksia jäädytettyillä tileillä"
 DocType: Serial No,Is Cancelled,on peruutettu
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Omat lähetykset
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Omat lähetykset
 DocType: Journal Entry,Bill Date,Bill Date
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",vaikka useita hinnoittelusääntöjä on olemassa korkeimmalla prioriteetilla seuraavia sisäisiä prioriteettejä noudatetaan
 DocType: Supplier,Supplier Details,toimittajan lisätiedot
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,johdotus siirto
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,valitse pankkitili
 DocType: Newsletter,Create and Send Newsletters,tee ja lähetä uutiskirjeitä
-sites/assets/js/report.min.js +107,From Date must be before To Date,alkaen päivä on ennen päättymispäivää
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,alkaen päivä on ennen päättymispäivää
 DocType: Sales Order,Recurring Order,Toistuvat Order
 DocType: Company,Default Income Account,oletus tulotili
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,asiakasryhmä / asiakas
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,varasto UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
 ,Projected,ennustus
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},sarjanumero {0} ei kuulu varastoon {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
 DocType: Notification Control,Quotation Message,"tarjous, viesti"
 DocType: Issue,Opening Date,Opening Date
 DocType: Journal Entry,Remark,Huomautus
 DocType: Purchase Receipt Item,Rate and Amount,taso ja arvomäärä
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Tylsä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,myyntitilauksesta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,myyntitilauksesta
 DocType: Blog Category,Parent Website Route,Parent Verkkosivujen Route
 DocType: Sales Order,Not Billed,Ei laskuteta
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Molemmat Warehouse on kuuluttava samaan Company
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,yhteystietoja ei ole lisätty
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,yhteystietoja ei ole lisätty
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ei aktiivinen
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,laskun kohdistus lähetyspäivän mukaan
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,"kohdistetut kustannukset, arvomäärä"
 DocType: Time Log,Batched for Billing,Annosteltiin for Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Laskut esille Toimittajat.
 DocType: POS Profile,Write Off Account,poistotili
-sites/assets/js/erpnext.min.js +26,Discount Amount,alennus arvomäärä
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,alennus arvomäärä
 DocType: Purchase Invoice,Return Against Purchase Invoice,"ostolasku, palautuksen kohdistus"
 DocType: Item,Warranty Period (in days),takuuaika (päivinä)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"esim, alv"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,tuote 4
 DocType: Journal Entry Account,Journal Entry Account,päiväkirjakirjaus tili
 DocType: Shopping Cart Settings,Quotation Series,"tarjous, sarjat"
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","samanniminen tuote on jo olemassa ({0}), vaihda tuoteryhmän nimeä tai nimeä tuote uudelleen"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","samanniminen tuote on jo olemassa ({0}), vaihda tuoteryhmän nimeä tai nimeä tuote uudelleen"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,kuuma metallikaasu muovaus
 DocType: Sales Order Item,Sales Order Date,"myyntitilaus, päivä"
 DocType: Sales Invoice Item,Delivered Qty,toimitettu yksikkömäärä
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Asiakkaan tai tavarantoimittajan Tietoja
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,aseta
 DocType: Lead,Lead Owner,vihjeen omistaja
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,varastolta vaaditaan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,varastolta vaaditaan
 DocType: Employee,Marital Status,Siviilisääty
 DocType: Stock Settings,Auto Material Request,automaattinen materiaalipyynto
 DocType: Time Log,Will be updated when billed.,päivitetään laskutettaessa
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Saatavilla Erä Kpl osoitteessa varastosta
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,nykyinen BOM ja uusi BOM ei voi olla samoja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,eläkkepäivän on oltava suurempi kuin liittymispäivä
 DocType: Sales Invoice,Against Income Account,tulotilin kodistus
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,päivitä varasto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,super viimeistely
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"tuotteiden eri UOM johtaa virheellisiin (kokonais) painoarvon, varmista, että tuotteiden nettopainot on samassa UOM:ssa"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM taso
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,siirrä tuotteita lähetteeltä
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,siirrä tuotteita lähetteeltä
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,päiväkirjakirjauksia {0} ei ole kohdistettu
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Kirjaa kaikista viestinnän tyypin sähköposti, puhelin, chatti, käynti, jne."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,määritä yrityksen pyöristys kustannuspaikka
 DocType: Purchase Invoice,Terms,ehdot
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,tee uusi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,tee uusi
 DocType: Buying Settings,Purchase Order Required,ostotilaus vaaditaan
 ,Item-wise Sales History,"tuote työkalu, myyntihistoria"
 DocType: Expense Claim,Total Sanctioned Amount,sanktioarvomäärä yhteensä
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,"palkkalaskelma, vähennys"
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Huomautuksia
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,valitse ensin ryhmä sidos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tarkoitus on oltava yksi {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,täytä muoto ja tallenna se
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,täytä muoto ja tallenna se
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"lataa raportti, joka  sisältää kaikki raaka-aineet viimeisimmän varastotaseen mukaan"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,kohtaaminen
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Yhteisön Forum
 DocType: Leave Application,Leave Balance Before Application,poistu taseesta ennen sovellusta
 DocType: SMS Center,Send SMS,lähetä tekstiviesti
 DocType: Company,Default Letter Head,oletus kirjeen otsikko
 DocType: Time Log,Billable,Laskutettava
 DocType: Authorization Rule,This will be used for setting rule in HR module,tätä käytetään sääntöjen asetuksissa henkilöstömoduulin
 DocType: Account,Rate at which this tax is applied,taso jolla tätä veroa sovelletaan
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,uudellentilattu yksikkömäärä
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,uudellentilattu yksikkömäärä
 DocType: Company,Stock Adjustment Account,varastonsäätötili
 DocType: Journal Entry,Write Off,poisto
 DocType: Time Log,Operation ID,Operation ID
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","alennuskentät saatavilla ostotilauksella, ostokuitilla ja ostolaskulla"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nimi uusi tili. Huomautus: Älä luo asiakastilejä ja Toimittajat
 DocType: Report,Report Type,raportin tyyppi
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Ladataan
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Ladataan
 DocType: BOM Replace Tool,BOM Replace Tool,BOM korvaustyökalu
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,"maa työkalu, oletus osoite, mallipohja"
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
+DocType: Sales Order Item,Supplier delivers to Customer,Toimittaja toimittaa Asiakkaalle
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Näytä vero hajottua
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,tietojen tuonti ja vienti
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"mikäli valmistutoiminta on käytössä aktivoituu tuote ""valmistettu"""
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Laskun julkaisupäivä
 DocType: Sales Invoice,Rounded Total,pyöristys yhteensä
 DocType: Product Bundle,List items that form the package.,luetteloi tuotteet jotka muodostavat pakkauksen
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosenttiosuuden jako tulisi olla yhtä suuri 100%
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
 DocType: Company,Default Cash Account,oletus kassatili
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Anna "Expected Delivery Date"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Anna "Expected Delivery Date"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,maksettu arvomäärä + poistotilin summa ei voi olla suurempi kuin kokonaissumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ei sallittu eränumero tuotteelle {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},"huom, jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta"
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","rivi {0}: yksikkömäärä ei ole saatavana varastossa {1}:ssa {2} {3}:n, saatava yksikkömäärä: {4}, siirrä yksikkömäärä: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,tuote 3
+DocType: Purchase Order,Customer Contact Email,Asiakas Sähköpostiosoite
 DocType: Event,Sunday,sunnuntai
 DocType: Sales Team,Contribution (%),panostus (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,huom: maksukirjausta ei synny sillä 'kassa- tai pankkitiliä' ei ole määritetty
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Vastuut
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,mallipohja
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,mallipohja
 DocType: Sales Person,Sales Person Name,myyjän nimi
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,syötä taulukkoon vähintään yksi lasku
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Lisää käyttäjiä
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),todellinen aloituspäivä (aikal
 DocType: Stock Reconciliation Item,Before reconciliation,ennen täsmäytystä
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},(lle) {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),verot ja maksut lisätty (yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
 DocType: Sales Order,Partly Billed,Osittain Laskutetaan
 DocType: Item,Default BOM,oletus BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,kaareutuma
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"odottaa, pankkipääte yhteensä"
 DocType: Time Log Batch,Total Hours,tunnit yhteensä
 DocType: Journal Entry,Printing Settings,Asetusten tulostaminen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},"debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},poistumis tyyppi {0} on jo kohdennettu työntekijälle {1} tilikaudella {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,tuote vaaditaan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal ruiskuvalu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,lähetteestä
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,lähetteestä
 DocType: Time Log,From Time,ajasta
 DocType: Notification Control,Custom Message,oma viesti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,sijoitukset pankki
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,kyseisen sähköposti
 DocType: Stock Entry,From BOM,BOM:sta
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,perustiedot
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ennen {0} rekisteröidyt varastotapahtumat on jäädytetty
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"klikkaa ""muodosta aikataulu"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,päivä tulee olla sama kuin 1/2 päivä poistumisessa
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"klikkaa ""muodosta aikataulu"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,päivä tulee olla sama kuin 1/2 päivä poistumisessa
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","esim, kg, m, ym"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,viitenumero vaaditaan mykäli viitepäivä on annettu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,viitenumero vaaditaan mykäli viitepäivä on annettu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,liittymispäivä tulee olla syntymäpäivän jälkeen
 DocType: Salary Structure,Salary Structure,palkkarakenne
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","useampi hintasääntö löytyy samoilla kriteereillä, selvitä \ konflikti antamalla prioriteett, hintasäännöt: {0}"
 DocType: Account,Bank,pankki
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,lentoyhtiö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,materiaali aihe
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,materiaali aihe
 DocType: Material Request Item,For Warehouse,varastoon
 DocType: Employee,Offer Date,Tarjous Date
 DocType: Hub Settings,Access Token,Access Token
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,Aukeamisaika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,alkaen- ja päätyen päivä vaaditaan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,arvopaperit & hyödykkeet vaihto
 DocType: Shipping Rule,Calculate Based On,"laske, perusteet"
+DocType: Delivery Note Item,From Warehouse,Varastosta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,poraus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Puhallusmuovaus
 DocType: Purchase Taxes and Charges,Valuation and Total,arvo ja summa
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,muutettu mistä
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,raaka-aine
 DocType: Leave Application,Follow via Email,seuraa sähköpostitse
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,veron arvomäärä alennuksen jälkeen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,"tällä tilillä on alatili, et voi poistaa tätä tiliä"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,"tällä tilillä on alatili, et voi poistaa tätä tiliä"
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,tavoite yksikkömäärä tai tavoite arvomäärä vaaditaan
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},tuotteelle {0} ei ole olemassa oletus BOM:ia
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Valitse julkaisupäivä ensimmäinen
-DocType: Leave Allocation,Carry Forward,siirrä
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},tuotteelle {0} ei ole olemassa oletus BOM:ia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Valitse julkaisupäivä ensimmäinen
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Aukiolopäivä pitäisi olla ennen Tarjouksentekijä
+DocType: Leave Control Panel,Carry Forward,siirrä
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa tilikirjaksi
 DocType: Department,Days for which Holidays are blocked for this department.,päivät jolloin lomat on estetty tälle osastolle
 ,Produced,Valmistettu
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),yhteensä (pankkipää
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
 DocType: Purchase Order,The date on which recurring order will be stop,päivä jolloin toistuva tilaus lakkaa
 DocType: Quality Inspection,Item Serial No,tuote sarjanumero
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} on alennettava {1} tai määrittää suurempi virtaustoleranssiarvo
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} on alennettava {1} tai määrittää suurempi virtaustoleranssiarvo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,esillä yhteensä
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,tunti
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",sarjanumerollista tuottetta {0} ei voi päivittää varaston täsmäytyksellä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,materiaalisiirto toimittajalle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,materiaalisiirto toimittajalle
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"uusi sarjanumero voi olla varastossa, sarjanumero muodoruu varaston kirjauksella tai ostokuitilla"
 DocType: Lead,Lead Type,vihjeen tyyppi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,tee tarjous
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},hyväksyjä on {0}
 DocType: Shipping Rule,Shipping Rule Conditions,toimitus sääntö ehdot
 DocType: BOM Replace Tool,The new BOM after replacement,uusi BOM korvauksen jälkeen
@@ -2859,7 +2874,7 @@ DocType: C-Form,C-Form,C-muoto
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ei ole asetettu
 DocType: Production Order,Planned Start Date,Suunnitellut aloituspäivä
 DocType: Serial No,Creation Document Type,asiakirjantyypin luonti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Vierailu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Vierailu
 DocType: Leave Type,Is Encash,on perintä
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,tee päiväkirjakirjaus
@@ -2867,7 +2882,7 @@ DocType: Leave Allocation,New Leaves Allocated,uusi poistumisten kohdennus
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,"projekti työkalu, tietoja ei ole saatavilla tarjousvaiheessa"
 DocType: Project,Expected End Date,odotettu päättymispäivä
 DocType: Appraisal Template,Appraisal Template Title,"arviointi, mallipohja otsikko"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,kaupallinen
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,kaupallinen
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Kohta {0} ei saa olla Kanta Tuote
 DocType: Cost Center,Distribution Id,"toimitus, tunnus"
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,hyvät palvelut
@@ -2883,14 +2898,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vastinetta Taito {0} on oltava alueella {1} ja {2} vuonna välein {3}
 DocType: Tax Rule,Sales,myynti
 DocType: Stock Entry Detail,Basic Amount,Perusmäärät
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},varastolta vaaditaan varastotuotteelle {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},varastolta vaaditaan varastotuotteelle {0}
+DocType: Leave Allocation,Unused leaves,Käyttämättömät lehdet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,oletus saatava tilit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,sahaus
 DocType: Tax Rule,Billing State,Laskutus valtion
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminointi
 DocType: Item Reorder,Transfer,siirto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),nouda BOM räjäytys (mukaan lukien alikokoonpanot)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),nouda BOM räjäytys (mukaan lukien alikokoonpanot)
 DocType: Authorization Rule,Applicable To (Employee),sovellettavissa (työntekijä)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,eräpäivä vaaditaan
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
@@ -2906,6 +2922,7 @@ DocType: Company,Retail,Vähittäiskauppa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,asiakasta {0} ei ole olemassa
 DocType: Attendance,Absent,puuttua
 DocType: Product Bundle,Product Bundle,tavarakokonaisuus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rivi {0}: Virheellinen viittaus {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,murskaava
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,oston verojen ja maksujen mallipohja
 DocType: Upload Attendance,Download Template,lataa mallipohja
@@ -2913,16 +2930,16 @@ DocType: GL Entry,Remarks,Huomautuksia
 DocType: Purchase Order Item Supplied,Raw Material Item Code,raaka-aineen tuotekoodi
 DocType: Journal Entry,Write Off Based On,poisto perustuu
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,sarjanumeron asennustietue
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,sarjanumeron asennustietue
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,jatkuva osajako
-sites/assets/js/erpnext.min.js +10,Please specify a,Ilmoitathan
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ilmoitathan
 DocType: Offer Letter,Awaiting Response,Odottaa vastausta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Yläpuolella
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,kylmä mitoitus
 DocType: Salary Slip,Earning & Deduction,ansio & vähennys
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,tili {0} ei voi ryhmä
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Alue
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,"valinnainen, asetusta käytetään suodatettaessa eri tapahtumia"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"valinnainen, asetusta käytetään suodatettaessa eri tapahtumia"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
 DocType: Holiday List,Weekly Off,viikottain pois
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","esim 2012, 2012-13"
@@ -2966,12 +2983,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,pullistua
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,haihduttava-rutiini valu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,edustuskulut
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,myyntilasku {0} tulee peruuttaa ennen myyntitilauksen perumista
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,ikä
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,myyntilasku {0} tulee peruuttaa ennen myyntitilauksen perumista
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,ikä
 DocType: Time Log,Billing Amount,laskutuksen arvomäärä
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,virheellinen yksikkömäärä on määritetty tuotteelle {0} se tulee olla suurempi kuin 0
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,poistumishakemukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,tilin tapahtumaa ei voi poistaa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,tilin tapahtumaa ei voi poistaa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,juridiset kulut
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","kuukauden päivä jolloin automaattinen uusi tilaus muodostetaan, esim 05, 28 jne"
 DocType: Sales Invoice,Posting Time,Kirjoittamisen aika
@@ -2980,9 +2997,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"täppää mikäli haluat pakottaa käyttäjän valitsemaan sarjan ennen tallennusta, täpästä ei synny oletusta"
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ei Kohta Serial Ei {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Avaa Ilmoitukset
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Avaa Ilmoitukset
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,suorat kulut
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,haluatko jatkaa tätä materiaalipyyntöä
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Uusi asiakas Liikevaihto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,matkakulut
 DocType: Maintenance Visit,Breakdown,hajoitus
@@ -2993,7 +3009,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kuin Päivämäärä
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,hoonaus
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Koeaika
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,oletus Varasto vaaditaan varastotuotteelle
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,oletus Varasto vaaditaan varastotuotteelle
 DocType: Feed,Full Name,kokonimi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,ratkaisija
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
@@ -3016,7 +3032,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,lisää rivejä
 DocType: Buying Settings,Default Supplier Type,oletus toimittajatyyppi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Louhinta
 DocType: Production Order,Total Operating Cost,käyttökustannukset yhteensä
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,kaikki yhteystiedot
 DocType: Newsletter,Test Email Id,testi sähköposti
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,yrityksen lyhenne
@@ -3040,11 +3056,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,noteera
 DocType: Stock Settings,Role Allowed to edit frozen stock,rooli saa muokata jäädytettyä varastoa
 ,Territory Target Variance Item Group-Wise,"aluetavoite vaihtelu, tuoteryhmä työkalu"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,kaikki asiakasryhmät
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Vero malli on pakollinen.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,tili {0}: emotili {1} ei ole olemassa
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),"hinnasto, taso (yrityksen valuutta)"
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} tila on 'pysäytetty'
 DocType: Account,Temporary,väliaikainen
 DocType: Address,Preferred Billing Address,suositeltu laskutusosoite
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentti Allocation
@@ -3062,13 +3077,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,"tuote työkalu, veroti
 DocType: Purchase Order Item,Supplier Quotation,toimittajan tarjouskysely
 DocType: Quotation,In Words will be visible once you save the Quotation.,"sanat näkyvät, kun tallennat tarjouksen"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,silitys
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} on pysäytetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} on pysäytetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
 DocType: Lead,Add to calendar on this date,lisää kalenteriin (tämä päivä)
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,toimituskustannusten lisäys säännöt
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Tulevat tapahtumat
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Tulevat tapahtumat
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,asiakasta velvoitetaan
 DocType: Letter Head,Letter Head,Kirje Head
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Pikasyöttö
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} on pakollinen palautukseen
 DocType: Purchase Order,To Receive,vastaanottoon
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,kutistekalvosovitus
@@ -3091,25 +3107,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Ainakin yksi varasto on pakollinen
 DocType: Serial No,Out of Warranty,Out of Takuu
 DocType: BOM Replace Tool,Replace,Korvata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} myyntilaskua vastaan ​{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,syötä oletus mittayksikkö
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} myyntilaskua vastaan ​{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,syötä oletus mittayksikkö
 DocType: Purchase Invoice Item,Project Name,Hankkeen nimi
 DocType: Supplier,Mention if non-standard receivable account,Mainitse jos ei-standardi velalliset
 DocType: Workflow State,Edit,muokkaa
 DocType: Journal Entry Account,If Income or Expense,mikäli tulot tai kulut
 DocType: Features Setup,Item Batch Nos,tuote erä nro
 DocType: Stock Ledger Entry,Stock Value Difference,"varastoarvo, ero"
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,henkilöstöresurssi
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,henkilöstöresurssi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,maksun täsmäytys toiseen maksuun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,"vero, vastaavat"
 DocType: BOM Item,BOM No,BOM nro
 DocType: Contact Us Settings,Pincode,PIN koodi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,päiväkirjakirjauksella {0} ei ole tiliä {1} tai on täsmätty toiseen tositteeseen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,päiväkirjakirjauksella {0} ei ole tiliä {1} tai on täsmätty toiseen tositteeseen
 DocType: Item,Moving Average,Liukuva keskiarvo
 DocType: BOM Replace Tool,The BOM which will be replaced,korvattava BOM
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,uusi varasto UOM tulee olla eri kuin nykyinen varasto UOM
 DocType: Account,Debit,debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"poistumiset tulee kohdentaa luvun 0,5 kerrannaisina"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"poistumiset tulee kohdentaa luvun 0,5 kerrannaisina"
 DocType: Production Order,Operation Cost,toiminnan kustannus
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,lataa osallistumislomake .csv-tiedostoon
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,"odottaa, pankkipääte"
@@ -3117,7 +3133,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,"tuoter
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","voit nimetä tämän aiheen, paina sivupalkin ""nimeä"" painiketta"
 DocType: Stock Settings,Freeze Stocks Older Than [Days],jäädytä yli [päivää] vanhat varastot
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","yllämainituilla ehdoilla löytyy kaksi tai useampia hinnoittelusääntöjä ja prioriteettia tarvitaan, prioriteettinumero luku 0-20:n välillä, oletusarvona se on nolla (tyhjä), mitä korkeampi luku sitä suurempi prioriteetti"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,laskun kohdistus
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,tilikautta: {0} ei ole olemassa
 DocType: Currency Exchange,To Currency,valuuttakursseihin
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,salli seuraavien käyttäjien hyväksyä poistumissovelluksen estopäivät
@@ -3146,7 +3161,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),taso
 DocType: Stock Entry Detail,Additional Cost,Muita Kustannukset
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,tilikauden lopetuspäivä
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",ei voi suodattaa tositenumero pohjalta mikäli tosite on ryhmässä
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,tee toimittajan tarjouskysely
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,tee toimittajan tarjouskysely
 DocType: Quality Inspection,Incoming,saapuva
 DocType: BOM,Materials Required (Exploded),materiaalitarve (räjäytys)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),pienennä ansiota poistuttaessa ilman palkkaa (LWP)
@@ -3154,10 +3169,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rivi # {0}: Sarjanumero {1} ei vastaa {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,tavallinen poistuminen
 DocType: Batch,Batch ID,erän tunnus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Huomautus: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Huomautus: {0}
 ,Delivery Note Trends,lähete trendit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Viikon yhteenveto
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} on ostettu tai alihankintatuotteena rivillä {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} on ostettu tai alihankintatuotteena rivillä {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,tiliä: {0} voi päivittää vain varastotapahtumien kautta
 DocType: GL Entry,Party,Puolue
 DocType: Sales Order,Delivery Date,toimituspäivä
@@ -3170,7 +3185,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,U
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,keskimääräinen ostamisen taso
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
 DocType: Employee,History In Company,yrityksen historia
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Uutiskirjeet
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Uutiskirjeet
 DocType: Address,Shipping,toimitus
 DocType: Stock Ledger Entry,Stock Ledger Entry,varaston tilikirjakirjaus
 DocType: Department,Leave Block List,poistu estoluettelo
@@ -3189,7 +3204,7 @@ DocType: Account,Auditor,Tilintarkastaja
 DocType: Purchase Order,End date of current order's period,nykyisen tilauskauden päättymispäivä
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Tee tarjous Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,paluu
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Oletus mittayksikkö Variant on oltava sama kuin malli
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Oletus mittayksikkö Variant on oltava sama kuin malli
 DocType: DocField,Fold,taitos
 DocType: Production Order Operation,Production Order Operation,tuotannon tilauksen toimenpiteet
 DocType: Pricing Rule,Disable,poista käytöstä
@@ -3221,7 +3236,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,raportoi
 DocType: SMS Settings,Enter url parameter for receiver nos,syötä url parametrin vastaanottonro
 DocType: Sales Invoice,Paid Amount,maksettu arvomäärä
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',sulkutilin {0} tulee olla tyyppiä 'vastattavat'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',sulkutilin {0} tulee olla tyyppiä 'vastattavat'
 ,Available Stock for Packing Items,pakattavat tuotteet saatavissa varastosta
 DocType: Item Variant,Item Variant,tuotemalli
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"tämä osoite mallipohjaa on asetettu oletukseksi, sillä muuta pohjaa ei ole valittu"
@@ -3229,7 +3244,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,määrähallinta
 DocType: Production Planning Tool,Filter based on customer,suodata asiakkaisiin perustuen
 DocType: Payment Tool Detail,Against Voucher No,kuitin nro kohdistus
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Kirjoita kpl määrä Tuote {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Kirjoita kpl määrä Tuote {0}
 DocType: Employee External Work History,Employee External Work History,työntekijän muu työkokemus
 DocType: Tax Rule,Purchase,Osto
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,taseyksikkömäärä
@@ -3267,28 +3282,29 @@ huom: BOM = materiaalien laskutus"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},sarjanumero vaaditaan tuotteelle {0}
 DocType: Item Variant Attribute,Attribute,tuntomerkki
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ilmoitathan mistä / vaihtelevan
-sites/assets/js/desk.min.js +7652,Created By,tekijä
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,tekijä
 DocType: Serial No,Under AMC,AMC:n alla
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,tuotteen arvon taso on päivitetty kohdistettujen tositteiden arvomäärä kustannuksen mukaan
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,myynnin oletusasetukset
 DocType: BOM Replace Tool,Current BOM,nykyinen BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,lisää sarjanumero
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,lisää sarjanumero
 DocType: Production Order,Warehouses,varastot
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Tulosta ja Paikallaan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,sidoksen ryhmä
 DocType: Payment Reconciliation,Minimum Amount,minimi arvomäärä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,päivitä valmiit tavarat
 DocType: Workstation,per hour,tunnissa
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},sarjat {0} on käytetty {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},sarjat {0} on käytetty {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,varaston (jatkuva inventaario) tehdään tälle tilille.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Varastoa ei voi poistaa, sillä kohdistettuja varaston tilikirjan kirjauksia on olemassa."
 DocType: Company,Distribution,toimitus
-sites/assets/js/erpnext.min.js +50,Amount Paid,maksettu arvomäärä
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,maksettu arvomäärä
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,projektihallinta
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,lähetys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max alennus sallittua item: {0} on {1}%
 DocType: Customer,Default Taxes and Charges,Oletus Verot ja maksut
 DocType: Account,Receivable,saatava
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rivi # {0}: Ei saa muuttaa Toimittaja kuten ostotilaus on jo olemassa
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,roolilla jolla voi lähettää tapamtumia pääsee luottoraja asetuksiin
 DocType: Sales Invoice,Supplier Reference,toimittajan viite
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","täpättynä alikokoonpanon BOM tuotteita pidetään raaka-ainehankinnoissa, muutoin kaikkia alikokoonpanon tuotteita käsitellään yhtenä raaka-aineena"
@@ -3325,8 +3341,8 @@ DocType: Email Digest,Add/Remove Recipients,lisää / poista vastaanottajia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},tapahtumat tuotannon tilaukseen {0} on estetty
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","asettaaksesi tämän tilikaudenoletukseksi, klikkaa ""aseta oletukseksi"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),määritä teknisen tuen sähköpostin saapuvan palvelimen asetukset (esim tekniikka@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,yksikkömäärä vähissä
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,yksikkömäärä vähissä
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
 DocType: Salary Slip,Salary Slip,palkkalaskelma
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,siivous
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'päättymispäivä' vaaditaan
@@ -3339,6 +3355,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","täpättäessä sähköposti-ikkuna avautuu välittömästi kun tapahtuma ""lähetetty"", oletus vastaanottajana on tapahtuman ""yhteyshenkilö"" ja tapahtuma liitteenä, voit valita lähetätkö tapahtuman sähköpostilla"
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,yleiset asetukset
 DocType: Employee Education,Employee Education,työntekijä koulutus
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,tili
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,sarjanumero {0} on jo saapunut
@@ -3371,7 +3388,7 @@ DocType: BOM,Manufacturing User,Valmistus Käyttäjä
 DocType: Purchase Order,Raw Materials Supplied,raaka-aineet toimitettu
 DocType: Purchase Invoice,Recurring Print Format,toistuvat tulostusmuodot
 DocType: Communication,Series,sarjat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,odotettu toimituspäivä ei voi olla ennen ostotilauksen päivää
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,odotettu toimituspäivä ei voi olla ennen ostotilauksen päivää
 DocType: Appraisal,Appraisal Template,"arviointi, mallipohja"
 DocType: Communication,Email,sähköposti
 DocType: Item Group,Item Classification,tuote luokittelu
@@ -3416,6 +3433,7 @@ DocType: HR Settings,Payroll Settings,palkanlaskennan asetukset
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,täsmää linkittämättömät maksut ja laskut
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Tee tilaus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,kannalla ei voi olla pääkustannuspaikkaa
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Valitse Merkki ...
 DocType: Sales Invoice,C-Form Applicable,C-muotoa sovelletaan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
 DocType: Supplier,Address and Contacts,Osoite ja yhteystiedot
@@ -3426,7 +3444,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,hae odottavat tositteet
 DocType: Warranty Claim,Resolved By,ratkaissut
 DocType: Appraisal,Start Date,aloituspäivä
-sites/assets/js/desk.min.js +7629,Value,arvo
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,arvo
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,kohdistaa poistumisen kaudelle
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,vahvistaaksesi klikkaa tästä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,tili {0}: et voi nimetä tätä tiliä emotiliksi
@@ -3442,14 +3460,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox pääsy sallittu
 DocType: Dropbox Backup,Weekly,viikoittain
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"esim, smsgateway.com/api/send_sms.cgi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Vastaanottaa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Vastaanottaa
 DocType: Maintenance Visit,Fully Completed,täysin valmis
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% valmis
 DocType: Employee,Educational Qualification,koulutusksen arviointi
 DocType: Workstation,Operating Costs,käyttökustannukset
 DocType: Employee Leave Approver,Employee Leave Approver,työntekijän poistumis hyväksyjä
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} on lisätty uutiskirje luetteloon.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,elektronisädekoneistus
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,"ostojenhallinta, valvonta"
@@ -3462,7 +3480,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,esihallitse asiakirjatyyppi
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Lisää / muokkaa hintoja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,kustannuspaikkakaavio
 ,Requested Items To Be Ordered,tilattavat pyydetyt tuotteet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Omat tilaukset
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Omat tilaukset
 DocType: Price List,Price List Name,Hinnasto Name
 DocType: Time Log,For Manufacturing,valmistukseen
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,summat
@@ -3473,7 +3491,7 @@ DocType: Account,Income,tulo
 DocType: Industry Type,Industry Type,teollisuus tyyppi
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,jokin meni pieleen!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,varoitus: poistumissovellus sisältää seuraavat estopäivät
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,myyntilasku {0} on lähetetty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,myyntilasku {0} on lähetetty
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,katselmus päivä
 DocType: Purchase Invoice Item,Amount (Company Currency),arvomäärä (yrityksen valuutta)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,die valu
@@ -3487,10 +3505,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Vuosi
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,päivitä teksiviestiasetukset
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,aikaloki {0} on jo laskutettu
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,aikaloki {0} on jo laskutettu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,vakuudettomat lainat
 DocType: Cost Center,Cost Center Name,kustannuspaikan nimi
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,tuote {0} sarjanumerolla {1} on jo asennettu
 DocType: Maintenance Schedule Detail,Scheduled Date,"aikataulutettu, päivä"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,"maksettu, pankkipääte yhteensä"
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Viestit yli 160 merkkiä jaetaan useita viestejä
@@ -3498,10 +3515,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Saanut ja hyväksynyt
 ,Serial No Service Contract Expiry,palvelusopimuksen päättyminen sarjanumerolle
 DocType: Item,Unit of Measure Conversion,mittayksikön muunto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,työntekijää ei voi muuttaa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,kredit / debet kirjausta ei voi tehdä samalle tilille yhtäaikaa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,kredit / debet kirjausta ei voi tehdä samalle tilille yhtäaikaa
 DocType: Naming Series,Help HTML,"HTML, ohje"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},nimetty painoarvo yhteensä tulee olla 100% nyt se on {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Avustus yli- {0} ristissä Kohta {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Avustus yli- {0} ristissä Kohta {1}
 DocType: Address,Name of person or organization that this address belongs to.,henkilön- tai organisaation nimi kenelle tämä osoite kuuluu
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,omat toimittajat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
@@ -3512,10 +3529,11 @@ DocType: Lead,Converted,muunnettu
 DocType: Item,Has Serial No,on sarjanumero
 DocType: Employee,Date of Issue,aiheen päivä
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: valitse {0} on {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
 DocType: Issue,Content Type,sisällön tyyppi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Tarkista usean valuutan mahdollisuuden sallia tilejä muu valuutta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Tarkista usean valuutan mahdollisuuden sallia tilejä muu valuutta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,tuote: {0} ei ole järjestelmässä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,sinulla ei ole oikeutta asettaa jäätymis arva
 DocType: Payment Reconciliation,Get Unreconciled Entries,hae täsmäämättömät kirjaukset
@@ -3526,14 +3544,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,varastoon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},"tilillä {0} on useampi, kuin yksi kirjaus tilikaudella {1}"
 ,Average Commission Rate,keskimääräinen provisio taso
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'on sarjanumero' joka voi olla ainoastaan varastotuote
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'on sarjanumero' joka voi olla ainoastaan varastotuote
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"hinnoittelusääntö, ohjeet"
 DocType: Purchase Taxes and Charges,Account Head,tilin otsikko
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,päivitä lisäkustannukset jotta tuotteisiin kohdistuneet kustannukset voidaan laskea
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,sähköinen
 DocType: Stock Entry,Total Value Difference (Out - In),arvoero (ulos-sisään) yhteensä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},käyttäjätunnusta ei asetettu työntekijälle {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Aineenpoistopuhalluksella
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,takuuvaatimukseen
@@ -3547,15 +3565,17 @@ DocType: Buying Settings,Naming Series,nimeä sarjat
 DocType: Leave Block List,Leave Block List Name,"poistu estoluettelo, nimi"
 DocType: User,Enabled,aktivoi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"varasto, vastaavat"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},haluatko varmasti lähettää kaikkii kuukausi {0} vuosi {1} palkkalaskelmat 
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},haluatko varmasti lähettää kaikkii kuukausi {0} vuosi {1} palkkalaskelmat 
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,tuo tilaajat
 DocType: Target Detail,Target Qty,tavoite yksikkömäärä
 DocType: Attendance,Present,Nykyinen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,lähetettä {0} ei saa lähettää
 DocType: Notification Control,Sales Invoice Message,"myyntilasku, viesti"
 DocType: Authorization Rule,Based On,perustuu
-,Ordered Qty,tilattu yksikkömäärä
+DocType: Sales Order Item,Ordered Qty,tilattu yksikkömäärä
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Tuote {0} on poistettu käytöstä
 DocType: Stock Settings,Stock Frozen Upto,varasto jäädytetty asti
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Ajanjaksona ja AIKA Voit päivämäärät pakollinen toistuvia {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Hanketoimintaa / tehtävä.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,muodosta palkkalaskelmat
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ei sallittu sähköpostitunnus
@@ -3594,7 +3614,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,lataa osallistuminen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ja valmistusmäärä tarvitaan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,vanhentumisen skaala 2
-DocType: Journal Entry Account,Amount,arvomäärä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,arvomäärä
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Mukaansatempaava
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM korvattu
 ,Sales Analytics,myyntianalyysi
@@ -3621,7 +3641,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,odotettu päivä ei voi olla ennen materiaalipyynnön päiväystä
 DocType: Contact Us Settings,City,Kaupunki
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ultraäänityöstö
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,virhe: tunnus ei ole kelvollinen
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,virhe: tunnus ei ole kelvollinen
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,tuotteen {0} tulee olla myyntituote
 DocType: Naming Series,Update Series Number,päivitä sarjanumerot
 DocType: Account,Equity,oma pääoma
@@ -3636,7 +3656,7 @@ DocType: Purchase Taxes and Charges,Actual,todellinen
 DocType: Authorization Rule,Customerwise Discount,asiakaskohtainen alennus
 DocType: Purchase Invoice,Against Expense Account,kulutilin kohdistus
 DocType: Production Order,Production Order,tuotannon tilaus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,asennus huomautus {0} on jo lähetetty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,asennus huomautus {0} on jo lähetetty
 DocType: Quotation Item,Against Docname,asiakirjan nimi kohdistus
 DocType: SMS Center,All Employee (Active),kaikki työntekijät (aktiiviset)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,näytä nyt
@@ -3644,14 +3664,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,raaka-ainekustannukset
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"syötä tuotteet ja suunniteltu yksikkömäärä, joille haluat lisätä tuotantotilauksia tai joista haluat ladata raaka-aine analyysin"
-sites/assets/js/list.min.js +174,Gantt Chart,gantt kaavio
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,gantt kaavio
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Osa-aikainen
 DocType: Employee,Applicable Holiday List,sovellettava lomalista
 DocType: Employee,Cheque,takaus/shekki
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,sarja päivitetty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,raportin tyyppi vaaditaan
 DocType: Item,Serial Number Series,sarjanumero sarjat
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},varasto vaaditaan varastotuotteelle {0} rivillä {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},varasto vaaditaan varastotuotteelle {0} rivillä {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Vähittäismyynti & Tukkukauppa
 DocType: Issue,First Responded On,ensimmäiset vastaavat
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ristiluettelo tuotteille jotka on useammissa ryhmissä
@@ -3666,7 +3686,7 @@ DocType: Attendance,Attendance,osallistuminen
 DocType: Page,No,Ei
 DocType: BOM,Materials,materiaalit
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ellei ole täpättynä luettelo on lisättävä jokaiseen osastoon, jossa sitä sovelletaan"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Lähettämistä päivämäärä ja lähettämistä aika on pakollista
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Lähettämistä päivämäärä ja lähettämistä aika on pakollista
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,veromallipohja ostotapahtumiin
 ,Item Prices,tuote hinnat
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"sanat näkyvät, kun tallennat ostotilauksen"
@@ -3686,9 +3706,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,hallinnolliset kulut
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,konsultointi
 DocType: Customer Group,Parent Customer Group,Parent Asiakasryhmä
-sites/assets/js/erpnext.min.js +50,Change,muutos
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,muutos
 DocType: Purchase Invoice,Contact Email,"yhteystiedot, sähköposti"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Ostotilaus {0} on "pois päältä"
 DocType: Appraisal Goal,Score Earned,ansaitut pisteet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","esim, ""minunyritys LLC"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Irtisanomisaika
@@ -3698,12 +3717,13 @@ DocType: Packing Slip,Gross Weight UOM,bruttopaino UOM
 DocType: Email Digest,Receivables / Payables,saatavat / maksettavat
 DocType: Delivery Note Item,Against Sales Invoice,​myyntilaskun kohdistus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,leimaus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Luottotili
 DocType: Landed Cost Item,Landed Cost Item,"kohdistetut kustannukset, tuote"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,näytä nolla-arvot
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,tuotemääräarvio valmistuksen- / uudelleenpakkauksen jälkeen annetuista raaka-aineen määristä
 DocType: Payment Reconciliation,Receivable / Payable Account,saatava / maksettava tili
 DocType: Delivery Note Item,Against Sales Order Item,myyntitilauksen kohdistus / tuote
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
 DocType: Item,Default Warehouse,oletus varasto
 DocType: Task,Actual End Date (via Time Logs),todellinen päättymispäivä (aikalokin mukaan)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},budjettia ei voi nimetä ryhmätiliin {0}
@@ -3717,7 +3737,7 @@ DocType: Issue,Support Team,tukitiimi
 DocType: Appraisal,Total Score (Out of 5),osumat (5:stä) yhteensä
 DocType: Contact Us Settings,State,asema
 DocType: Batch,Batch,erä
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,tase
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,tase
 DocType: Project,Total Expense Claim (via Expense Claims),kuluvaatimus yhteensä (kuluvaatimuksesta)
 DocType: User,Gender,sukupuoli
 DocType: Journal Entry,Debit Note,debet viesti
@@ -3733,9 +3753,8 @@ DocType: Lead,Blog Subscriber,Blogi Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,tee tapahtumien arvoon perustuvia rajoitussääntöjä
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",täpättäessä lomapäivät sisältyvät työpäiviin ja tämä lisää palkan avoa / päivä
 DocType: Purchase Invoice,Total Advance,"yhteensä, ennakko"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,jatka materiaalipyyntöä
 DocType: Workflow State,User,käyttäjä
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Käsittely Payroll
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Käsittely Payroll
 DocType: Opportunity Item,Basic Rate,perustaso
 DocType: GL Entry,Credit Amount,Luoton määrä
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,aseta kadonneeksi
@@ -3743,7 +3762,7 @@ DocType: Customer,Credit Days Based On,"kredit päivää, perustuen"
 DocType: Tax Rule,Tax Rule,Verosääntöön
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,ylläpidä samaa tasoa läpi myyntisyklin
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Suunnittele aikaa lokit ulkopuolella Workstation työaikalain.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} on jo lähetetty
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} on jo lähetetty
 ,Items To Be Requested,tuotteet joita on pyydettävä
 DocType: Purchase Order,Get Last Purchase Rate,hae viimeisin ostotaso
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Laskutus Hinta perustuu Toimintalaji (tunnissa)
@@ -3752,6 +3771,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",sähköpostia ei lähetetty sillä yrityksen sähköpostitunnusta ei löytyny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),sovellus varat (vastaavat)
 DocType: Production Planning Tool,Filter based on item,suodata tuotteeseen perustuen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Luottotililtä
 DocType: Fiscal Year,Year Start Date,Vuoden aloituspäivä
 DocType: Attendance,Employee Name,työntekijän nimi
 DocType: Sales Invoice,Rounded Total (Company Currency),pyöristys yhteensä (yrityksen  valuutta)
@@ -3763,14 +3783,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Sammutus
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,työntekijä etuudet
 DocType: Sales Invoice,Is POS,on POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
 DocType: Production Order,Manufactured Qty,valmistettu yksikkömäärä
 DocType: Purchase Receipt Item,Accepted Quantity,hyväksytyt määrä
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ei löydy
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Laskut nostetaan asiakkaille.
 DocType: DocField,Default,oletus
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"rivi nro {0}: arvomäärä ei voi olla suurempi kuin odottava kuluvaatimus {1}, odottavien arvomäärä on {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"rivi nro {0}: arvomäärä ei voi olla suurempi kuin odottava kuluvaatimus {1}, odottavien arvomäärä on {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} luettelo lisätty
 DocType: Maintenance Schedule,Schedule,aikataulu
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Määritä budjetti tälle Kustannuspaikka. Asettaa budjetti toiminta, katso "Yhtiö List""
@@ -3778,7 +3798,7 @@ DocType: Account,Parent Account,emotili
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,hubi
 DocType: GL Entry,Voucher Type,tosite tyyppi
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä
 DocType: Expense Claim,Approved,hyväksytty
 DocType: Pricing Rule,Price,Hinta
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
@@ -3787,23 +3807,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,koulutus
 DocType: Selling Settings,Campaign Naming By,kampanja nimennyt
 DocType: Employee,Current Address Is,nykyinen osoite on
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Vapaaehtoinen. Asettaa yhtiön oletusvaluuttaa, jos ei ole määritelty."
 DocType: Address,Office,Toimisto
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,perusraportit
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,valitse työntekijä tietue ensin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rivi {0}: Party / Tili ei vastaa {1} / {2} ja {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Available Kpl at varastosta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,valitse työntekijä tietue ensin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rivi {0}: Party / Tili ei vastaa {1} / {2} ja {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,voit luoda verotilin
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,syötä kulutili
 DocType: Account,Stock,varasto
 DocType: Employee,Current Address,nykyinen osoite
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","mikäli tuote on toisen tuotteen malli tulee tuotteen kuvaus, kuva, hinnoittelu, verot ja muut tiedot oletuksena mallipohjasta ellei oletusta ole erikseen poistettu"
 DocType: Serial No,Purchase / Manufacture Details,oston/valmistuksen lisätiedot
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Erä Inventory
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Erä Inventory
 DocType: Employee,Contract End Date,sopimuksen päättymispäivä
 DocType: Sales Order,Track this Sales Order against any Project,seuraa tätä myyntitilausta projektissa
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,siillä myyntitilaukset (odottaa toimitusta) perustuen kriteereihin yllä
 DocType: DocShare,Document Type,asiakirja tyyppi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,toimittajan tarjouksesta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,toimittajan tarjouksesta
 DocType: Deduction Type,Deduction Type,vähennyksen tyyppi
 DocType: Attendance,Half Day,1/2 päivä
 DocType: Pricing Rule,Min Qty,min yksikkömäärä
@@ -3814,20 +3836,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,yksikkömäärään (valmistettu yksikkömäärä) vaaditaan
 DocType: Stock Entry,Default Target Warehouse,oletus tavoite varasto
 DocType: Purchase Invoice,Net Total (Company Currency),netto yhteensä (yrityksen valuutta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,rivi {0}: osapuolityyppi ja osapuoli on kohdistettavissa ​​saatava / maksettava tilille
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,rivi {0}: osapuolityyppi ja osapuoli on kohdistettavissa ​​saatava / maksettava tilille
 DocType: Notification Control,Purchase Receipt Message,Ostokuitti Message
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Yhteensä myönnetty lehdet ovat enemmän kuin kaudella
 DocType: Production Order,Actual Start Date,todellinen aloituspäivä
 DocType: Sales Order,% of materials delivered against this Sales Order,% materiaaleja toimitettu tätä myyntitilausta vastaan
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,tietueessa on tuotemuutoksia
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,tietueessa on tuotemuutoksia
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Uutiskirje List Subscriber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,palvelu
 DocType: Hub Settings,Hub Settings,hubi asetukset
 DocType: Project,Gross Margin %,bruttokate %
 DocType: BOM,With Operations,toiminnoilla
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
 ,Monthly Salary Register,"kuukausipalkka, rekisteri"
-apps/frappe/frappe/website/template.py +123,Next,Seuraava
+apps/frappe/frappe/website/template.py +140,Next,Seuraava
 DocType: Warranty Claim,If different than customer address,mikäli eri kuin asiakkan osoite
 DocType: BOM Operation,BOM Operation,BOM käyttö
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,elektrolyyttisen
@@ -3858,6 +3881,7 @@ DocType: Purchase Invoice,Next Date,Seuraava päivä
 DocType: Employee Education,Major/Optional Subjects,Major / Vapaaehtoinen Aiheet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,syötä verot ja maksut
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Koneistus
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","talleta tähän esim. perheen lisätiedot, kuten vanhempien nimi ja ammatti, puoliso ja lapset "
 DocType: Hub Settings,Seller Name,myyjä nimi
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),verot ja maksut vähennetty (yrityksen valuutta)
@@ -3884,29 +3908,29 @@ DocType: Purchase Order,To Receive and Bill,vastaanottoon ja laskutukseen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,suunnittelija
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ehdot ja säännöt mallipohja
 DocType: Serial No,Delivery Details,"toimitus, lisätiedot"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,tee materiaalipyyntö automaattisesti mikäli määrä laskee alle asetetun tason
 ,Item-wise Purchase Register,"tuote työkalu, ostorekisteri"
 DocType: Batch,Expiry Date,vanhenemis päivä
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Asettaa reorder tasolla, kohde on osto Tuote tai valmistus Tuote"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Asettaa reorder tasolla, kohde on osto Tuote tai valmistus Tuote"
 ,Supplier Addresses and Contacts,toimittajien osoitteet ja yhteystiedot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ole hyvä ja valitse Luokka ensin
 apps/erpnext/erpnext/config/projects.py +18,Project master.,projekti valvonta
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"älä käytä symbooleita,  $ jne valuuttojen vieressä"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(1/2 päivä)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(1/2 päivä)
 DocType: Supplier,Credit Days,kredit päivää
 DocType: Leave Type,Is Carry Forward,siirretääkö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,hae tuotteita BOM:sta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,hae tuotteita BOM:sta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,"virtausaika, päivää"
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,materiaalien lasku
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},rivi {0}: osapuolityyppi ja osapuoli vaaditaan ​​saatava / maksettava tilille {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},rivi {0}: osapuolityyppi ja osapuoli vaaditaan ​​saatava / maksettava tilille {1}
 DocType: Dropbox Backup,Send Notifications To,lähetä ilmoituksia
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Date
 DocType: Employee,Reason for Leaving,poistumisen syy
 DocType: Expense Claim Detail,Sanctioned Amount,sanktioitujen arvomäärä
 DocType: GL Entry,Is Opening,on avaus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,tiliä {0} ei löydy
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,tiliä {0} ei löydy
 DocType: Account,Cash,Käteinen
 DocType: Employee,Short biography for website and other publications.,lyhyt historiikki verkkosivuille ja muihin julkaisuihin
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},tee työntekijöille palkkarakenne {0}
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 7d437405b5..7eaa1e7bbf 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Mode de rémunération
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Sélectionnez une distribution mensuelle, si vous voulez suivre basée sur la saisonnalité."
 DocType: Employee,Divorced,Divorcé
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Attention: même élément a été saisi plusieurs fois.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Attention: même élément a été saisi plusieurs fois.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Articles déjà synchronisés
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Autorisera à être ajouté à plusieurs reprises dans une transaction
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuler Matériau Visitez {0} avant d'annuler cette revendication de garantie
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactage ainsi frittage
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Devise est nécessaire pour Liste de prix {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sera calculé lors de la transaction.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,De Demande de Matériel
+DocType: Purchase Order,Customer Contact,Contact client
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,De Demande de Matériel
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Demandeur d'emploi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Plus de résultats.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Nom du client
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Tous les champs liés à l'exportation comme monnaie , taux de conversion , l'exportation totale , l'exportation totale grandiose etc sont disponibles dans Bon de livraison , Point de Vente , Devis, Factures, Bons de commandes etc"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Chefs (ou groupes) contre lequel les entrées comptables sont faites et les soldes sont maintenus.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Participation pour les employés {0} est déjà marqué
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Participation pour les employés {0} est déjà marqué
 DocType: Manufacturing Settings,Default 10 mins,Par défaut 10 minutes
 DocType: Leave Type,Leave Type Name,Laisser Nom Type
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,prix règle
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Prix ​​des ouvrages multiples.
 DocType: SMS Center,All Supplier Contact,Tous les contacts fournisseur
 DocType: Quality Inspection Reading,Parameter,Paramètre
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Date prévue de la fin ne peut être inférieure à Date de début prévue
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Vous ne voulez vraiment déboucher ordre de fabrication:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Taux doit être le même que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Nouvelle demande d'autorisation
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nouvelle demande d'autorisation
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Projet de la Banque
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Pour maintenir le code de référence du client et de les rendre consultables en fonction de leur code, utiliser cette option"
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de compte de paiement
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Voir les varia
 DocType: Sales Invoice Item,Quantity,Quantité
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Prêts ( passif)
 DocType: Employee Education,Year of Passing,Année de passage
-sites/assets/js/erpnext.min.js +27,In Stock,En Stock
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Ne peut effectuer le paiement contre les ventes non facturés Ordre
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En Stock
 DocType: Designation,Designation,Désignation
 DocType: Production Plan Item,Production Plan Item,Élément du plan de production
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilisateur {0} est déjà attribué à l'employé {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Faites nouveau profil de POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,soins de santé
 DocType: Purchase Invoice,Monthly,Mensuel
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Facture
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retard de paiement (jours)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Facture
 DocType: Maintenance Schedule Item,Periodicity,Périodicité
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adresse E-mail
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,défense
 DocType: Company,Abbr,Abréviation
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Rangée {0}: {1} {2} ne correspond pas à {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rangée {0}: {1} {2} ne correspond pas à {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,No du véhicule
-sites/assets/js/erpnext.min.js +55,Please select Price List,S'il vous plaît sélectionnez Liste des Prix
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,S'il vous plaît sélectionnez Liste des Prix
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Travail du bois
 DocType: Production Order Operation,Work In Progress,Work In Progress
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impression en 3D
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,DocName Détail Parent
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Ouverture d'un emploi.
 DocType: Item Attribute,Increment,Incrément
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Sélectionnez Entrepôt ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,publicité
 DocType: Employee,Married,Marié
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},désactiver
 DocType: Payment Reconciliation,Reconcile,réconcilier
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,épicerie
 DocType: Quality Inspection Reading,Reading 1,Lecture 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Assurez accès des banques
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Assurez accès des banques
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Les fonds de pension
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Entrepôt est obligatoire si le type de compte est Entrepôt
 DocType: SMS Center,All Sales Person,Tous les commerciaux
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Ecrire Off Centre de coûts
 DocType: Warehouse,Warehouse Detail,Détail de l'entrepôt
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Limite de crédit a été franchi pour le client {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Type d'impôt
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Vous n'êtes pas autorisé à ajouter ou faire une mise à jour des entrées avant {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Vous n'êtes pas autorisé à ajouter ou faire une mise à jour des entrées avant {0}
 DocType: Item,Item Image (if not slideshow),Image Article (si ce n'est diaporama)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Il existe un client avec le même nom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Le tarif à l'heure / 60) * le temps réel d'opération
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Invité
 DocType: Quality Inspection,Get Specification Details,Obtenez les détails Spécification
 DocType: Lead,Interested,Intéressé
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,De la valeur doit être inférieure à la valeur à la ligne {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Ouverture
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Ouverture
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Du {0} au {1}
 DocType: Item,Copy From Item Group,Copy From Group article
 DocType: Journal Entry,Opening Entry,Entrée ouverture
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Demande d'information produit
 DocType: Standard Reply,Owner,propriétaire
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,S'il vous plaît entrez première entreprise
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Se il vous plaît sélectionnez Société premier
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Se il vous plaît sélectionnez Société premier
 DocType: Employee Education,Under Graduate,Sous Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,cible sur
 DocType: BOM,Total Cost,Coût total
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Préfixe
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,consommable
 DocType: Upload Attendance,Import Log,Importer Connexion
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Envoyer
+DocType: Sales Invoice Item,Delivered By Supplier,Livré Par Fournisseur
 DocType: SMS Center,All Contact,Tout contact
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salaire Annuel
 DocType: Period Closing Voucher,Closing Fiscal Year,Clôture de l'exercice
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra Entrée
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Crédit Entreprise Devise
 DocType: Delivery Note,Installation Status,Etat de l'installation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},La quantité acceptée + rejetée doit être égale à la quantité reçue pour l'Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},La quantité acceptée + rejetée doit être égale à la quantité reçue pour l'Item {0}
 DocType: Item,Supply Raw Materials for Purchase,Approvisionnement en matières premières pour l'achat
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Parent Site Route
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Télécharger le modèle, remplissez les données appropriées et joindre le fichier modifié.
  Toutes les dates et employé combinaison dans la période choisie viendra dans le modèle, avec des records de fréquentation existants"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,« À jour» est nécessaire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,« À jour» est nécessaire
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Sera mis à jour après la facture de vente est soumise.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","D'inclure la taxe dans la ligne {0} dans le prix de l'article , les impôts dans les lignes {1} doivent également être inclus"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","D'inclure la taxe dans la ligne {0} dans le prix de l'article , les impôts dans les lignes {1} doivent également être inclus"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Utilisateur {0} est désactivé
 DocType: SMS Center,SMS Center,Centre SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Redressement
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Entrez le paramètre url p
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Tous ces éléments ont déjà été facturés
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Cette fois identifier des conflits avec {0} pour {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Compte {0} doit être SAMES comme crédit du compte dans la facture d'achat en ligne {0}
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Date d'installation ne peut pas être avant la date de livraison pour l'article {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Date d'installation ne peut pas être avant la date de livraison pour l'article {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Remise sur la liste des prix Taux (%)
-sites/assets/js/form.min.js +279,Start,Démarrer
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Démarrer
 DocType: User,First Name,Prénom
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Votre installation est terminée. Actualisation.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-coulée en moule
 DocType: Offer Letter,Select Terms and Conditions,Sélectionnez Termes et Conditions
 DocType: Production Planning Tool,Sales Orders,Commandes clients
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Sur l'objet de la facture de vente
 ,Production Orders in Progress,Les commandes de produits en cours
 DocType: Lead,Address & Contact,Adresse et coordonnées
+DocType: Leave Allocation,Add unused leaves from previous allocations,Ajouter les feuilles inutilisées d'attributions antérieures
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Suivant récurrent {0} sera créé sur {1}
 DocType: Newsletter List,Total Subscribers,Nombre total d'abonnés
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Contact Nom
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO attente Qté
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crée le bulletin de salaire pour les critères mentionnés ci-dessus.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Demande d'achat.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double logement
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Seul le congé approbateur sélectionné peut soumettre cette demande de congé
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Seul le congé approbateur sélectionné peut soumettre cette demande de congé
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Vous n'êtes pas autorisé à ajouter ou mettre à jour les entrées avant {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,De feuilles par année
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,S'il vous plaît mettre Naming série pour {0} via Configuration> Paramètres> Série Naming
 DocType: Time Log,Will be updated when batched.,Sera mis à jour lorsque lots.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Se il vous plaît vérifier 'Est Advance' contre compte {1} si ce est une entrée avance.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Se il vous plaît vérifier 'Est Advance' contre compte {1} si ce est une entrée avance.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Entrepôt {0} n'appartient pas à la société {1}
 DocType: Bulk Email,Message,Message
 DocType: Item Website Specification,Item Website Specification,Spécification Site élément
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Clé d'accès
 DocType: Payment Tool,Reference No,No de référence
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Laisser Bloqué
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},dépenses
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Laisser Bloqué
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},dépenses
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock réconciliation article
 DocType: Stock Entry,Sales Invoice No,Aucune facture de vente
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Quantité de commande minimum
 DocType: Pricing Rule,Supplier Type,Type de fournisseur
 DocType: Item,Publish in Hub,Publier dans Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Nom de la campagne est nécessaire
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Demande de matériel
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Nom de la campagne est nécessaire
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Demande de matériel
 DocType: Bank Reconciliation,Update Clearance Date,Mettre à jour Date de Garde
 DocType: Item,Purchase Details,Détails de l'achat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} introuvable dans 'matières premières Fournies' table dans la commande d'achat {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Contrôle de notification
 DocType: Lead,Suggestions,Suggestions
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Point du Groupe sages budgets sur ce territoire. Vous pouvez également inclure la saisonnalité en réglant la distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Se il vous plaît entrer parent groupe compte pour l'entrepôt {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Paiement contre {0} {1} ne peut pas être supérieure à Encours {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Paiement contre {0} {1} ne peut pas être supérieure à Encours {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,N° mobile.
 DocType: Maintenance Schedule,Generate Schedule,Générer annexe
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nouveau stock UDM
 DocType: Period Closing Voucher,Closing Account Head,Fermeture chef Compte
 DocType: Employee,External Work History,Histoire de travail externe
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Référence circulaire erreur
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Voulez-vous vraiment arrêter
 DocType: Communication,Closed,Fermé
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dans Words (Exportation) sera visible une fois que vous enregistrez le bon de livraison.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Etes-vous sûr que vous voulez arrêter
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Profil d'emploi
 DocType: Newsletter,Newsletter,Bulletin
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Bon de livraison
 DocType: Dropbox Backup,Allow Dropbox Access,Autoriser l'accès au Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Mise en place d'impôts
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Paiement entrée a été modifié après que vous avez tiré il. Se il vous plaît tirez encore.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Résumé pour cette semaine et les activités en suspens
 DocType: Workstation,Rent Cost,louer coût
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,S'il vous plaît sélectionner le mois et l'année
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Vitesse à laquelle la devise du client est converti en devise de base du client
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en nomenclature , bon de livraison , facture d'achat , ordre de production, bon de commande , bon de réception , la facture de vente , Sales Order , Stock entrée , des feuilles de temps"
 DocType: Item Tax,Tax Rate,Taux d'imposition
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Sélectionner un élément
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Sélectionner un élément
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} discontinu, ne peut être conciliée utilisant \
  Stock réconciliation, utiliser à la place l'entrée en stock géré"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Voulez-vous vraiment de soumettre tout bulletin de salaire pour le mois {0} et {1} an
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Voulez-vous vraiment de soumettre tout bulletin de salaire pour le mois {0} et {1} an
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: N ° de lot doit être le même que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir en groupe non-
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Reçu d'achat doit être présentée
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Emballage Stock actuel
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lot d'un article.
 DocType: C-Form Invoice Detail,Invoice Date,Date de la facture
 DocType: GL Entry,Debit Amount,Débit Montant
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir 1 compte par la société dans {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir 1 compte par la société dans {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Votre adress email
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,S'il vous plaît voir la pièce jointe
 DocType: Purchase Order,% Received,% reçus
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instructions
 DocType: Quality Inspection,Inspected By,Inspecté par
 DocType: Maintenance Visit,Maintenance Type,Type d'entretien
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},N ° de série {0} ne fait pas partie de la livraison Remarque {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},N ° de série {0} ne fait pas partie de la livraison Remarque {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Paramètre d'inspection Article de qualité
 DocType: Leave Application,Leave Approver Name,Laissez Nom approbateur
 ,Schedule Date,calendrier Date
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Achat S'inscrire
 DocType: Landed Cost Item,Applicable Charges,Frais applicables
 DocType: Workstation,Consumable Cost,Coût de consommable
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) doit avoir le rôle «Approbateur de congé'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) doit avoir le rôle «Approbateur de congé'
 DocType: Purchase Receipt,Vehicle Date,Date de véhicule
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Numéro de référence est obligatoire si vous avez entré date de référence
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Raison pour perdre
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,Installé%
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,S'il vous plaît entrez le nom de l'entreprise d'abord
 DocType: BOM,Item Desription,Desription article
 DocType: Purchase Invoice,Supplier Name,Nom du fournisseur
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lisez le manuel ERPNext
 DocType: Account,Is Group,Est un groupe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Réglage automatique de série n ° basé sur FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Vérifiez Fournisseur numéro de facture Unicité
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Gestionnaire de M
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Paramètres globaux pour tous les processus de fabrication.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes gelés jusqu'au
 DocType: SMS Log,Sent On,Sur envoyé
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionnée à plusieurs reprises dans le tableau Attributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionnée à plusieurs reprises dans le tableau Attributs
 DocType: Sales Order,Not Applicable,Non applicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Débit doit être égal à crédit . La différence est {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moulage Shell
 DocType: Material Request Item,Required Date,Requis Date
 DocType: Delivery Note,Billing Address,Adresse de facturation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,S'il vous plaît entrez le code d'article .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,S'il vous plaît entrez le code d'article .
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si elle est cochée, le montant de la taxe sera considéré comme déjà inclus dans le tarif Imprimer / Print Montant"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantité totale
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre le
 DocType: Customer,Buyer of Goods and Services.,Lors de votre achat des biens et services.
 DocType: Journal Entry,Accounts Payable,Comptes à payer
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Ajouter abonnés
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" N'existe pas"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" N'existe pas"
 DocType: Pricing Rule,Valid Upto,Jusqu'à valide
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Énumérer quelques-unes de vos clients . Ils pourraient être des organisations ou des individus .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Choisissez votre langue
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur les compte , si regroupées par compte"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Agent administratif
 DocType: Payment Tool,Received Or Paid,Reçus ou payés
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,S'il vous plaît sélectionnez Société
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,S'il vous plaît sélectionnez Société
 DocType: Stock Entry,Difference Account,Compte de la différence
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Impossible de fermer sa tâche en tant que tâche dépendante {0} est pas fermée.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,S'il vous plaît entrer Entrepôt à qui demande de matériel sera porté
 DocType: Production Order,Additional Operating Cost,Coût de fonctionnement supplémentaires
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,produits de beauté
 DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Pour fusionner , les propriétés suivantes doivent être les mêmes pour les deux articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Pour fusionner , les propriétés suivantes doivent être les mêmes pour les deux articles"
 DocType: Communication,Subject,Sujet
 DocType: Shipping Rule,Net Weight,Poids net
 DocType: Employee,Emergency Phone,téléphone d'urgence
 ,Serial No Warranty Expiry,N ° de série expiration de garantie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Voulez-vous vraiment arrêter cette Demande de Matériel ?
 DocType: Sales Order,To Deliver,A Livrer
 DocType: Purchase Invoice Item,Item,Article
 DocType: Journal Entry,Difference (Dr - Cr),Différence (Dr - Cr )
 DocType: Account,Profit and Loss,Pertes et profits
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Gestion de la sous-traitance
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestion de la sous-traitance
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nouveau UDM doit pas être de type entier Nombre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Meubles et articles d'ameublement
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taux auquel la monnaie Liste de prix est converti en devise de base entreprise
@@ -489,7 +489,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ajouter / Modifier Taxes
 DocType: Purchase Invoice,Supplier Invoice No,Fournisseur facture n
 DocType: Territory,For reference,Pour référence
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Vous ne pouvez pas supprimer de série n {0}, tel qu'il est utilisé dans les transactions d'achat d'actions"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Fermeture (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Fermeture (Cr)
 DocType: Serial No,Warranty Period (Days),Période de garantie (jours)
 DocType: Installation Note Item,Installation Note Item,Article Remarque Installation
 ,Pending Qty,En attente Quantité
@@ -523,8 +523,9 @@ DocType: Sales Order,Billing and Delivery Status,Facturation et de livraison Sta
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Répéter les clients
 DocType: Leave Control Panel,Allocate,Allouer
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Précedent
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Retour de Ventes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Retour de Ventes
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Sélectionnez les commandes clients à partir de laquelle vous souhaitez créer des ordres de fabrication.
+DocType: Item,Delivered by Supplier (Drop Ship),Livré par le Fournisseur (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Éléments du salaire.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de données de clients potentiels.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de données clients.
@@ -535,7 +536,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Bec Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Entrepôt logique dans lequel les entrées en stocks sont faites.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},contacts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},contacts
 DocType: Event,Wednesday,Mercredi
 DocType: Sales Invoice,Customer's Vendor,Client Fournisseur
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordre de fabrication est obligatoire
@@ -568,8 +569,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Paramètre récepteur
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basé sur' et 'Groupé par' ne peuvent pas être identiques
 DocType: Sales Person,Sales Person Targets,Personne objectifs de vente
-sites/assets/js/form.min.js +271,To,à
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Veuillez entrer une adresse E-mail .
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,à
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Veuillez entrer une adresse E-mail .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Le tube du bout formant
 DocType: Production Order Operation,In minutes,En quelques minutes
 DocType: Issue,Resolution Date,Date de Résolution
@@ -586,7 +587,7 @@ DocType: Activity Cost,Projects User,Projets utilisateur
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consommé
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} introuvable pas dans les Détails de la facture
 DocType: Company,Round Off Cost Center,Arrondir Centre de coûts
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Doublons {0} avec la même {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Doublons {0} avec la même {1}
 DocType: Material Request,Material Transfer,De transfert de matériel
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),{0} doit être inférieur ou égal à {1}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Horodatage affichage doit être après {0}
@@ -594,9 +595,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Réglages
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taxes et frais de Landed Cost
 DocType: Production Order Operation,Actual Start Time,Heure de début réelle
 DocType: BOM Operation,Operation Time,Temps de fonctionnement
-sites/assets/js/list.min.js +5,More,Plus
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Plus
 DocType: Pricing Rule,Sales Manager,Directeur des ventes
-sites/assets/js/desk.min.js +7673,Rename,Renommer
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Renommer
 DocType: Journal Entry,Write Off Amount,Ecrire Off Montant
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Fléchissement
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permettre à l'utilisateur
@@ -612,13 +613,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,c
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Cisaillement droite
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Pour suivre pièce documents de vente et d'achat en fonction de leurs numéros de série. Ce n'est peut également être utilisé pour suivre les détails de la garantie du produit.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock actuel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Entrepôt rejeté est obligatoire contre l'article regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Entrepôt rejeté est obligatoire contre l'article regected
 DocType: Account,Expenses Included In Valuation,Frais inclus dans l'évaluation
 DocType: Employee,Provide email id registered in company,Fournir id e-mail enregistrée dans la société
 DocType: Hub Settings,Seller City,Vendeur Ville
 DocType: Email Digest,Next email will be sent on:,Email sera envoyé le:
 DocType: Offer Letter Term,Offer Letter Term,Offrez Lettre terme
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Point a variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Point a variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} introuvable
 DocType: Bin,Stock Value,Valeur de l'action
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Type d' arbre
@@ -633,11 +634,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenue
 DocType: Journal Entry,Credit Card Entry,Entrée de carte de crédit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tâche Objet
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Marchandises reçues des fournisseurs.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Marchandises reçues des fournisseurs.
 DocType: Communication,Open,Ouvert
 DocType: Lead,Campaign Name,Nom de la campagne
 ,Reserved,réservé
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Voulez-vous vraiment à déboucher
 DocType: Purchase Order,Supply Raw Materials,Raw Materials Supply
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La date à laquelle prochaine facture sera générée. Il est généré sur soumettre.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actif à court terme
@@ -653,7 +653,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Bon de commande du client Non
 DocType: Employee,Cell Number,Nombre de cellules
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perdu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer coupon courant dans «Contre Journal Entry 'colonne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer coupon courant dans «Contre Journal Entry 'colonne
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,énergie
 DocType: Opportunity,Opportunity From,De opportunité
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Fiche de salaire mensuel.
@@ -722,7 +722,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,responsabilité
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montant sanctionné ne peut pas être supérieure à la revendication Montant en ligne {0}.
 DocType: Company,Default Cost of Goods Sold Account,Par défaut Coût des marchandises vendues compte
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Barcode valide ou N ° de série
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Barcode valide ou N ° de série
 DocType: Employee,Family Background,Antécédents familiaux
 DocType: Process Payroll,Send Email,Envoyer un E-mail
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Aucune autorisation
@@ -733,7 +733,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Transactio
 DocType: Item,Items with higher weightage will be shown higher,Articles avec weightage supérieur seront affichés supérieur
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Détail du rapprochement bancaire
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mes factures
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Aucun employé trouvé
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Aucun employé trouvé
 DocType: Purchase Order,Stopped,Arrêté
 DocType: Item,If subcontracted to a vendor,Si en sous-traitance à un fournisseur
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Sélectionnez BOM pour commencer
@@ -742,7 +742,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Télécha
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Envoyer maintenant
 ,Support Analytics,Analyse du support
 DocType: Item,Website Warehouse,Entrepôt site web
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Voulez-vous vraiment à l'ordre d'arrêt de production:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Le jour du mois où la facture automatique sera généré par exemple 05, 28 etc"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score doit être inférieur ou égal à 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Enregistrements C -Form
@@ -752,12 +751,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,En ch
 DocType: Features Setup,"To enable ""Point of Sale"" features",Pour activer "Point de vente" caractéristiques
 DocType: Bin,Moving Average Rate,Moving Prix moyen
 DocType: Production Planning Tool,Select Items,Sélectionner les objets
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
 DocType: Comment,Reference Name,Nom de référence
 DocType: Maintenance Visit,Completion Status,L'état d'achèvement
 DocType: Sales Invoice Item,Target Warehouse,Cible d'entrepôt
 DocType: Item,Allow over delivery or receipt upto this percent,autoriser plus de livraison ou de réception jusqu'à ce pour cent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,"Stock réconciliation peut être utilisé pour mettre à jour le stock à une date donnée , généralement selon l'inventaire physique ."
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Stock réconciliation peut être utilisé pour mettre à jour le stock à une date donnée , généralement selon l'inventaire physique ."
 DocType: Upload Attendance,Import Attendance,Importer Participation
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tous les groupes d'article
 DocType: Process Payroll,Activity Log,Journal d'activité
@@ -765,7 +764,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Composer automatiquement un message sur la soumission de transactions .
 DocType: Production Order,Item To Manufacture,Point à la fabrication de
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Coulée en moule permanent
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Achetez commande au paiement
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statut est {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Achetez commande au paiement
 DocType: Sales Order Item,Projected Qty,Qté projeté
 DocType: Sales Invoice,Payment Due Date,Date d'échéance
 DocType: Newsletter,Newsletter Manager,Bulletin Gestionnaire
@@ -789,8 +789,8 @@ DocType: SMS Log,Requested Numbers,Numéros demandés
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,L'évaluation des performances.
 DocType: Sales Invoice Item,Stock Details,Stock Détails
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valeur du projet
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Point de vente
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Point {0} doit être un achat article
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point de vente
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Point {0} doit être un achat article
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà en crédit, vous n'êtes pas autorisé à mettre en 'Doit être en équilibre' comme 'débit'"
 DocType: Account,Balance must be,Solde doit être
 DocType: Hub Settings,Publish Pricing,Publier Prix
@@ -812,7 +812,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Achat Réception
 ,Received Items To Be Billed,Articles reçus à être facturé
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Grenaillage
-sites/assets/js/desk.min.js +3938,Ms,Mme
+DocType: Employee,Ms,Mme
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Campagne . # # # #
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver slot Temps dans les prochaines {0} jours pour l'opération {1}
 DocType: Production Order,Plan material for sub-assemblies,matériau de plan pour les sous-ensembles
@@ -834,29 +834,31 @@ DocType: Purchase Receipt,Range,Gamme
 DocType: Supplier,Default Payable Accounts,Comptes créditeurs par défaut
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Employé {0} n'est pas actif , ou n'existe pas"
 DocType: Features Setup,Item Barcode,Barcode article
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Point variantes {0} mis à jour
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Point variantes {0} mis à jour
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Paiement à l'avance Facture
 DocType: Address,Shop,Magasiner
 DocType: Hub Settings,Sync Now,Synchroniser maintenant
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrée de crédit ne peut pas être lié à un {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrée de crédit ne peut pas être lié à un {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Par défaut Banque / argent compte sera automatiquement mis à jour dans la facture POS lorsque ce mode est sélectionné.
 DocType: Employee,Permanent Address Is,Adresse permanente est
 DocType: Production Order Operation,Operation completed for how many finished goods?,Opération terminée pour combien de produits finis?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marque
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Allocation pour les plus de {0} franchi pour objet {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Allocation pour les plus de {0} franchi pour objet {1}.
 DocType: Employee,Exit Interview Details,Quittez Détails Interview
 DocType: Item,Is Purchase Item,Est-Item
 DocType: Journal Entry Account,Purchase Invoice,Facture achat
 DocType: Stock Ledger Entry,Voucher Detail No,Détail volet n °
 DocType: Stock Entry,Total Outgoing Value,Valeur totale sortant
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Date et Date de fermeture et d'ouverture devrait être au sein même exercice
 DocType: Lead,Request for Information,Demande de renseignements
 DocType: Payment Tool,Paid,Payé
 DocType: Salary Slip,Total in words,Total en mots
 DocType: Material Request Item,Lead Time Date,Plomb Date Heure
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,est obligatoire. Peut-être fiche de change est pas créé pour
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Ligne # {0}: S'il vous plaît spécifier Pas de série pour objet {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pour les articles, de stockage, de série et de lot »Aucun produit Bundle 'Aucune sera considérée comme de la table" Packing List'. Si Entrepôt et Batch Non sont les mêmes pour tous les éléments d'emballage pour un objet quelconque 'Bundle produit', ces valeurs peuvent être saisies dans le tableau principal de l'article, les valeurs seront copiés sur "Packing List 'table."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Les livraisons aux clients.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Les livraisons aux clients.
 DocType: Purchase Invoice Item,Purchase Order Item,Achat Passer commande
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,{0} {1} statut est débouchées
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Réglez montant du paiement = Encours
@@ -864,13 +866,14 @@ DocType: Contact Us Settings,Address Line 1,Adresse ligne 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variance
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nom de l'entreprise
 DocType: SMS Center,Total Message(s),Comptes temporaires ( actif)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Sélectionner un élément de transfert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Sélectionner un élément de transfert
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Afficher la liste de toutes les vidéos d'aide
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Sélectionnez tête compte de la banque où chèque a été déposé.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permettre à l'utilisateur d'éditer Prix List Noter dans les transactions
 DocType: Pricing Rule,Max Qty,Qté Max
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Paiement contre Ventes / bon de commande doit toujours être marqué comme avance
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Paiement contre Ventes / bon de commande doit toujours être marqué comme avance
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,chimique
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Tous les éléments ont déjà été transférés pour cet ordre de production.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tous les éléments ont déjà été transférés pour cet ordre de production.
 DocType: Process Payroll,Select Payroll Year and Month,Sélectionnez paie Année et mois
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Aller au groupe approprié (généralement l'utilisation des fonds> Actif à court terme> Comptes bancaires et de créer un nouveau compte (en cliquant sur Ajouter un enfant) de type «Banque»
 DocType: Workstation,Electricity Cost,Coût de l'électricité
@@ -885,7 +888,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blan
 DocType: SMS Center,All Lead (Open),Toutes les pistes (Ouvertes)
 DocType: Purchase Invoice,Get Advances Paid,Obtenez Avances et acomptes versés
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Joindre votre photo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Faire
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Faire
 DocType: Journal Entry,Total Amount in Words,Montant total en mots
 DocType: Workflow State,Stop,arrêtez
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Il y avait une erreur . Une raison probable pourrait être que vous n'avez pas enregistré le formulaire. S'il vous plaît contacter support@erpnext.com si le problème persiste .
@@ -909,7 +912,7 @@ DocType: Packing Slip Item,Packing Slip Item,Emballage article Slip
 DocType: POS Profile,Cash/Bank Account,Trésorerie / Compte bancaire
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Les articles retirés avec aucun changement dans la quantité ou la valeur.
 DocType: Delivery Note,Delivery To,Livrer à
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Table attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Table attribut est obligatoire
 DocType: Production Planning Tool,Get Sales Orders,Obtenez des commandes clients
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne peut pas être négatif
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Dépôt
@@ -920,12 +923,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Sera mis à jou
 DocType: Project,Internal,Interne
 DocType: Task,Urgent,Urgent
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},S'il vous plaît spécifier une Row ID valide pour la ligne {0} de la table {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Accédez au bureau et commencer à utiliser ERPNext
 DocType: Item,Manufacturer,Fabricant
 DocType: Landed Cost Item,Purchase Receipt Item,Achat d'article de réception
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Entrepôt réservé à des commandes clients / entrepôt de produits finis
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Montant de vente
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vous êtes l'approbateur de dépenses pour cet enregistrement . S'il vous plaît mettre à jour le «Status» et Save
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vous êtes l'approbateur de dépenses pour cet enregistrement . S'il vous plaît mettre à jour le «Status» et Save
 DocType: Serial No,Creation Document No,Création document n
 DocType: Issue,Issue,Question
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour objet variantes. par exemple la taille, la couleur, etc."
@@ -940,8 +944,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Contre
 DocType: Item,Default Selling Cost Center,Coût des marchandises vendues
 DocType: Sales Partner,Implementation Partner,Partenaire de mise en œuvre
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} {1} est
 DocType: Opportunity,Contact Info,Information de contact
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Faire Stock entrées
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Faire Stock entrées
 DocType: Packing Slip,Net Weight UOM,Emballage Poids Net
 DocType: Item,Default Supplier,Par défaut Fournisseur
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Surproduction Allocation Pourcentage
@@ -950,7 +955,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Obtenez hebdomadaires Dates Off
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Évaluation de l'objet mis à jour
 DocType: Sales Person,Select company name first.,Sélectionnez le nom de la première entreprise.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Devis reçus des fournisseurs.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},A {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,mise à jour via Time Logs
@@ -978,7 +983,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Numéros d'immatriculation de l’entreprise pour votre référence. Numéros de taxes, etc"
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Panier Livraison règle
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
 ,Ordered Items To Be Billed,Articles commandés à facturer
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gamme doit être inférieure à la gamme
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Sélectionnez registres de temps et de soumettre à créer une nouvelle facture de vente.
@@ -1026,7 +1031,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,De l'
 DocType: Lead,Lead,Conduire
 DocType: Email Digest,Payables,Dettes
 DocType: Account,Warehouse,entrepôt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeté Quantité ne peut pas être entré en Achat retour
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeté Quantité ne peut pas être entré en Achat retour
 ,Purchase Order Items To Be Billed,Purchase Order articles qui lui seront facturées
 DocType: Purchase Invoice Item,Net Rate,Taux net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Achat d'article de facture
@@ -1041,11 +1046,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Non rapprochés dé
 DocType: Global Defaults,Current Fiscal Year,Exercice en cours
 DocType: Global Defaults,Disable Rounded Total,Désactiver totale arrondie
 DocType: Lead,Call,Appeler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Pièces de journal {0} sont non liée
 ,Trial Balance,Balance
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Mise en place d'employés
-sites/assets/js/erpnext.min.js +5,"Grid ""","grille """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Mise en place d'employés
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","grille """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,nourriture
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,recherche
 DocType: Maintenance Visit Purpose,Work Done,Travaux effectués
@@ -1055,14 +1060,15 @@ DocType: Communication,Sent,expédié
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Voir Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,plus tôt
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Un groupe d'article existe avec le même nom, changez le nom de l'article ou renommez le groupe d'article SVP"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Un groupe d'article existe avec le même nom, changez le nom de l'article ou renommez le groupe d'article SVP"
 DocType: Communication,Delivery Status,Statut de la livraison
 DocType: Production Order,Manufacture against Sales Order,Fabrication à l'encontre des commandes clients
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,revenu indirect
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,revenu indirect
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Le Point {0} ne peut pas avoir lot
 ,Budget Variance Report,Rapport sur les écarts du budget
 DocType: Salary Slip,Gross Pay,Salaire brut
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendes payés
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Comptabilité Ledger
 DocType: Stock Reconciliation,Difference Amount,Différence Montant
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Bénéfices non répartis
 DocType: BOM Item,Item Description,Description de l'objet
@@ -1076,15 +1082,17 @@ DocType: Opportunity Item,Opportunity Item,Article occasion
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Ouverture temporaire
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Congé employé Solde
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Solde pour le compte {0} doit toujours être {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Solde pour le compte {0} doit toujours être {1}
 DocType: Address,Address Type,Type d'adresse
 DocType: Purchase Receipt,Rejected Warehouse,Entrepôt rejetée
 DocType: GL Entry,Against Voucher,Sur le bon
 DocType: Item,Default Buying Cost Center,Centre de coûts d'achat par défaut
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Pour tirer le meilleur parti de ERPNext, nous vous recommandons de prendre un peu de temps et de regarder ces vidéos d'aide."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Point {0} doit être objet de vente
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,à
 DocType: Item,Lead Time in days,Délai en jours
 ,Accounts Payable Summary,Le résumé des comptes à payer
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Message totale (s )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Message totale (s )
 DocType: Journal Entry,Get Outstanding Invoices,Obtenez Factures en souffrance
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Company ( pas client ou fournisseur ) maître .
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
@@ -1100,7 +1108,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Lieu d'émission
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,contrat
 DocType: Report,Disabled,Desactivé
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Facteur de coversion Emballage requis pour Emballage: {0} dans l'article: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Facteur de coversion Emballage requis pour Emballage: {0} dans l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,N ° de série {0} créé
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ligne {0}: Quantité est obligatoire
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,agriculture
@@ -1109,13 +1117,13 @@ DocType: Mode of Payment,Mode of Payment,Mode de paiement
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ceci est un groupe d'élément de racine et ne peut être modifié .
 DocType: Journal Entry Account,Purchase Order,Bon de commande
 DocType: Warehouse,Warehouse Contact Info,Entrepôt Info Contact
-sites/assets/js/form.min.js +190,Name is required,Le nom est obligatoire
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Le nom est obligatoire
 DocType: Purchase Invoice,Recurring Type,Type de courant
 DocType: Address,City/Town,Ville
 DocType: Email Digest,Annual Income,Revenu annuel
 DocType: Serial No,Serial No Details,Détails Pas de série
 DocType: Purchase Invoice Item,Item Tax Rate,Taux de la Taxe sur l'Article
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre entrée de débit"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre entrée de débit"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Livraison Remarque {0} n'est pas soumis
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Exercice Date de début
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipements de capitaux
@@ -1126,14 +1134,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Objectif
 DocType: Sales Invoice Item,Edit Description,Modifier la description
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Date de livraison prévue est moindre que prévue Date de début.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,pour fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,pour fournisseur
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Type de compte Configuration aide à sélectionner ce compte dans les transactions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (Société Monnaie)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortant total
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Il ne peut y avoir une règle de livraison Etat avec 0 ou valeur vide pour "" To Value """
 DocType: Authorization Rule,Transaction,Transaction
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Prix ​​règle pour l'escompte
-apps/erpnext/erpnext/config/projects.py +43,Tools,Outils
+apps/frappe/frappe/config/desk.py +7,Tools,Outils
 DocType: Item,Website Item Groups,Groupes d'articles Site web
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,numéro d'ordre de production est obligatoire pour l'entrée en stock but fabrication
 DocType: Purchase Invoice,Total (Company Currency),Total (Société devise)
@@ -1143,7 +1151,7 @@ DocType: Workstation,Workstation Name,Nom de la station de travail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Envoyer Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ne appartient pas à l'article {1}
 DocType: Sales Partner,Target Distribution,Distribution cible
-sites/assets/js/desk.min.js +7652,Comments,Commentaires
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Commentaires
 DocType: Salary Slip,Bank Account No.,No. de compte bancaire
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Il s'agit du numéro de la dernière transaction créée par ce préfixe
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},{0} {1} est l'état 'arrêté'
@@ -1158,7 +1166,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,S'il vou
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Point {0} doit être fonction Point
 DocType: Purchase Invoice,Supplier Invoice Date,Date de la facture fournisseur
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Vous devez activer Panier
-sites/assets/js/form.min.js +212,No Data,Aucune donnée
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Aucune donnée
 DocType: Appraisal Template Goal,Appraisal Template Goal,Objectif modèle d'évaluation
 DocType: Salary Slip,Earning,Revenus
 DocType: Payment Tool,Party Account Currency,Compte Parti devise
@@ -1166,7 +1174,7 @@ DocType: Payment Tool,Party Account Currency,Compte Parti devise
 DocType: Purchase Taxes and Charges,Add or Deduct,Ajouter ou déduire
 DocType: Company,If Yearly Budget Exceeded (for expense account),Si le budget annuel dépassé (pour compte de dépenses)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,condition qui se coincide touvée
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Sur le Journal des entrées {0} est déjà ajusté par un autre bon
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Sur le Journal des entrées {0} est déjà ajusté par un autre bon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Ordre Valeur totale
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Alimentation
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamme de vieillissement 3
@@ -1174,11 +1182,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Pas de visites
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Bulletins aux contacts, prospects."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Devise de la clôture des comptes doit être {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somme des points pour tous les objectifs devraient être 100. Il est {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Opérations ne peuvent pas être laissés en blanc.
 ,Delivered Items To Be Billed,Les items livrés à être facturés
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Entrepôt ne peut être modifié pour le numéro de série
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Etat mis à jour à {0}
 DocType: DocField,Description,Description
 DocType: Authorization Rule,Average Discount,Remise moyenne
 DocType: Letter Head,Is Default,Est défaut
@@ -1206,7 +1214,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Montant de la Taxe sur l'Article
 DocType: Item,Maintain Stock,Maintenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock entrées déjà créés pour ordre de fabrication
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laisser vide si cela est jugé pour toutes les désignations
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans l'article Noter
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans l'article Noter
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,De Datetime
 DocType: Email Digest,For Company,Pour l'entreprise
@@ -1216,7 +1224,7 @@ DocType: Sales Invoice,Shipping Address Name,Adresse Nom d'expédition
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan comptable
 DocType: Material Request,Terms and Conditions Content,Termes et Conditions de contenu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Point {0} n'est pas un stock Article
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Point {0} n'est pas un stock Article
 DocType: Maintenance Visit,Unscheduled,Non programmé
 DocType: Employee,Owned,Détenue
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Dépend de congé non payé
@@ -1229,7 +1237,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garantie / Statut AMC
 DocType: GL Entry,GL Entry,Entrée GL
 DocType: HR Settings,Employee Settings,Réglages des employés
 ,Batch-Wise Balance History,Discontinu Histoire de la balance
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Liste de tâches à faire
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Liste de tâches à faire
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Apprenti
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Quantité négatif n'est pas autorisé
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1262,13 +1270,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,POS Global Setting {0} déjà créé pour la compagnie {1}
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,paramètres de la passerelle SMS de configuration
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importation a échoué!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Aucune adresse encore ajouté.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Aucune adresse encore ajouté.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation heures de travail
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analyste
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant JV {2}
 DocType: Item,Inventory,Inventaire
 DocType: Features Setup,"To enable ""Point of Sale"" view",Pour activer "Point de vente" vue
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Le paiement ne peut être fait pour le chariot vide
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Le paiement ne peut être fait pour le chariot vide
 DocType: Item,Sales Details,Détails ventes
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Épinglant
 DocType: Opportunity,With Items,Avec Articles
@@ -1278,7 +1286,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",La date à laquelle prochaine facture sera générée. Il est généré sur soumettre.
 DocType: Item Attribute,Item Attribute,Point Attribute
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Si différente de l'adresse du client
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Des variantes de l'article
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Des variantes de l'article
 DocType: Company,Services,Services
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de coûts Parent
@@ -1288,11 +1296,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Date de Début de l'exercice financier
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Chanfrainage
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Point {0} doit être un élément de sous- traitance
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Point {0} doit être un élément de sous- traitance
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fret et d'envoi en sus
 DocType: Material Request Item,Sales Order No,Ordonnance n ° de vente
 DocType: Item Group,Item Group Name,Nom du groupe d'article
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Pris
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Pris
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Matériaux de transfert pour la fabrication
 DocType: Pricing Rule,For Price List,Annuler matériaux Visites {0} avant l'annulation de cette visite d'entretien
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1301,8 +1309,7 @@ DocType: Maintenance Schedule,Schedules,Horaires
 DocType: Purchase Invoice Item,Net Amount,Montant Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Numéro du détail BOM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montant de réduction supplémentaire (devise Société)
-DocType: Period Closing Voucher,CoA Help,Aide CoA
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Erreur: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Erreur: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,S'il vous plaît créer un nouveau compte de plan comptable .
 DocType: Maintenance Visit,Maintenance Visit,Visite de maintenance
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Groupe de clientèle> Territoire
@@ -1313,6 +1320,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Aide Landed Cost
 DocType: Event,Tuesday,Mardi
 DocType: Leave Block List,Block Holidays on important days.,Bloc Vacances sur les jours importants.
 ,Accounts Receivable Summary,Le résumé de comptes débiteurs
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Feuilles pour le type {0} déjà alloué pour les employés {1} pour la période {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Se il vous plaît mettre champ ID de l'utilisateur dans un dossier de l'employé pour définir le rôle des employés
 DocType: UOM,UOM Name,Nom UDM
 DocType: Top Bar Item,Target,Cible
@@ -1333,19 +1341,19 @@ DocType: Sales Partner,Sales Partner Target,Cible Sales Partner
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrée de comptabilité pour {0} ne peut être effectué en monnaie: {1}
 DocType: Pricing Rule,Pricing Rule,Provision pour plus - livraison / facturation excessive franchi pour objet {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Encocheuse
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Demande de Matériel à Bon de commande
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Demande de Matériel à Bon de commande
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: article retourné {1} ne existe pas dans {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes bancaires
 ,Bank Reconciliation Statement,Énoncé de rapprochement bancaire
 DocType: Address,Lead Name,Nom du chef de
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Ouverture Stock Solde
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Ouverture Stock Solde
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} doit apparaître qu'une seule fois
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non autorisé à tranférer plus que {0} {1} contre Purchase Order {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Forums
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Forums
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Pas d'éléments pour emballer
 DocType: Shipping Rule Condition,From Value,De la valeur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Fabrication Quantité est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Fabrication Quantité est obligatoire
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Les montants ne figurent pas dans la banque
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Les réclamations pour frais de la société.
@@ -1358,19 +1366,20 @@ DocType: Opportunity,Contact Mobile No,Contact Mobile Aucune
 DocType: Production Planning Tool,Select Sales Orders,Sélectionnez les commandes clients
 ,Material Requests for which Supplier Quotations are not created,Les demandes significatives dont les cotes des fournisseurs ne sont pas créés
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Pour suivre les éléments à l'aide de code à barres. Vous serez en mesure d'entrer dans les articles bon de livraison et la facture de vente par balayage de code à barres de l'article.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marquer comme Livré
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faire offre
 DocType: Dependent Task,Dependent Task,Tâche dépendante
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},revenu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Les entrées en stocks existent contre entrepôt {0} ne peut pas réaffecter ou modifier Maître Nom '
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},revenu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Les entrées en stocks existent contre entrepôt {0} ne peut pas réaffecter ou modifier Maître Nom '
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Essayez opérations de X jours de la planification à l'avance.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter anniversaire rappels
 DocType: SMS Center,Receiver List,Liste des récepteurs
 DocType: Payment Tool Detail,Payment Amount,Montant du paiement
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantité consommée
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Voir
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Voir
 DocType: Salary Structure Deduction,Salary Structure Deduction,Déduction structure salariale
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Frittage sélectif par laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de mesure {0} a été saisi plus d'une fois dans facteur de conversion de table
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de mesure {0} a été saisi plus d'une fois dans facteur de conversion de table
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importez réussie !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Coût de documents publiés
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
@@ -1391,7 +1400,7 @@ DocType: Company,Default Payable Account,Compte à payer par défaut
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Réglages pour panier en ligne telles que les règles d'expédition, liste de prix, etc."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuration terminée
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturé
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Quantité réservés
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Quantité réservés
 DocType: Party Account,Party Account,Compte Parti
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ressources humaines
 DocType: Lead,Upper Income,Revenu élevé
@@ -1434,11 +1443,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Activer Panier
 DocType: Employee,Permanent Address,Adresse permanente
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Point {0} doit être un service Point .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Avance versée contre {0} {1} ne peut pas être supérieure \ que Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Etes-vous sûr de vouloir unstop
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Réduire la déduction de congé sans solde (PLT)
 DocType: Territory,Territory Manager,Territory Manager
+DocType: Delivery Note Item,To Warehouse (Optional),Pour Entrepôt (Facultatif)
 DocType: Sales Invoice,Paid Amount (Company Currency),Montant payé (Société devise)
 DocType: Purchase Invoice,Additional Discount,Remise supplémentaires
 DocType: Selling Settings,Selling Settings,Réglages de vente
@@ -1461,7 +1471,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Exploitation minière
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Résine de coulée
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,BOM récursivité : {0} ne peut pas être le parent ou l'enfant de {2}
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,S'il vous plaît sélectionnez {0} en premier.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,S'il vous plaît sélectionnez {0} en premier.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texte {0}
 DocType: Territory,Parent Territory,Territoire Parent
 DocType: Quality Inspection Reading,Reading 2,Lecture 2
@@ -1489,11 +1499,11 @@ DocType: Sales Invoice Item,Batch No,Numéro du lot
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Autoriser plusieurs commandes clients contre bon de commande d'un client
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
 DocType: DocPerm,Delete,Supprimer
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
-sites/assets/js/desk.min.js +7971,New {0},Nouvelle {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nouvelle {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe de numérotation des séries sur vos transactions
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Compte des parents ne peut pas être un grand livre
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Par défaut BOM ({0}) doit être actif pour ce produit ou de son modèle
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Compte des parents ne peut pas être un grand livre
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Par défaut BOM ({0}) doit être actif pour ce produit ou de son modèle
 DocType: Employee,Leave Encashed?,Laisser encaissés?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunité champ est obligatoire
 DocType: Item,Variants,Variantes
@@ -1511,7 +1521,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Pays
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresses
 DocType: Communication,Received,reçu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Sur le Journal des entrées {0} n'a pas d'entrée {1} non associée
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Sur le Journal des entrées {0} n'a pas d'entrée {1} non associée
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupliquer N ° de série entré pour objet {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Une condition pour une règle de livraison
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item est pas autorisé à avoir ordre de fabrication.
@@ -1532,7 +1542,6 @@ DocType: Employee,Salutation,Salutation
 DocType: Communication,Rejected,Rejeté
 DocType: Pricing Rule,Brand,Marque
 DocType: Item,Will also apply for variants,Se appliquera également pour les variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,Livré %
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Regrouper des envois au moment de la vente.
 DocType: Sales Order Item,Actual Qty,Quantité réelle
 DocType: Sales Invoice Item,References,Références
@@ -1570,14 +1579,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,F
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Tonte
 DocType: Item,Has Variants,A Variantes
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Cliquez sur le bouton pour créer une nouvelle facture de vente «Facture de vente Make '.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Période De et période Pour dates obligatoires pour% s récurrents
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballage et l'étiquetage
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la distribution mensuelle
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,N ° de série {0} n'existe pas
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox accès secrète
 DocType: Purchase Invoice,Recurring Invoice,Facture récurrente
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Gestion de projets
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gestion de projets
 DocType: Supplier,Supplier of Goods or Services.,Fournisseur de biens ou services.
 DocType: Budget Detail,Fiscal Year,Exercice
 DocType: Cost Center,Budget,Budget
@@ -1606,11 +1614,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Vente
 DocType: Employee,Salary Information,Information sur le salaire
 DocType: Sales Person,Name and Employee ID,Nom et ID employé
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,La date d'échéance ne peut être antérieure Date de publication
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,La date d'échéance ne peut être antérieure Date de publication
 DocType: Website Item Group,Website Item Group,Groupe Article Site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Frais et taxes
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,S'il vous plaît entrer Date de référence
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} entrées de paiement ne peuvent pas être filtrées par {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,S'il vous plaît entrer Date de référence
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entrées de paiement ne peuvent pas être filtrées par {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tableau pour le point qui sera affiché dans le site Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Quantité fournie
 DocType: Material Request Item,Material Request Item,Article demande de matériel
@@ -1618,7 +1626,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Arbre de groupes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nos série requis pour Serialized article {0}
 ,Item-wise Purchase History,Historique des achats (par Article)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rouge
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"S'il vous plaît cliquer sur "" Générer annexe ' pour aller chercher de série n ° ajouté pour objet {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"S'il vous plaît cliquer sur "" Générer annexe ' pour aller chercher de série n ° ajouté pour objet {0}"
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Commandes ouverte de production
 DocType: Installation Note,Installation Time,Temps d'installation
@@ -1662,13 +1670,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Devis Tendances
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Le groupe d'articles ne sont pas mentionnés dans le maître de l'article pour l'article {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Débit Pour compte doit être un compte à recevoir
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Comme ordre de fabrication peut être faite de cet élément, il doit être un article en stock ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Comme ordre de fabrication peut être faite de cet élément, il doit être un article en stock ."
 DocType: Shipping Rule Condition,Shipping Amount,Montant de livraison
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Adhésion
 DocType: Authorization Rule,Above Value,Au-dessus de la valeur
 ,Pending Amount,Montant en attente
 DocType: Purchase Invoice Item,Conversion Factor,Facteur de conversion
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Livré
+DocType: Purchase Order,Delivered,Livré
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuration serveur entrant pour les emplois id e-mail . (par exemple jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Nombre de véhicules
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La date à laquelle la facture récurrente sera arrêter
@@ -1685,10 +1693,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuer accusations
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Le compte {0} doit être de type 'Actif ', l'objet {1} étant un article Actif"
 DocType: HR Settings,HR Settings,Paramètrages RH
 apps/frappe/frappe/config/setup.py +130,Printing,Impression
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Remboursement de frais est en attente d'approbation . Seulement l'approbateur des frais peut mettre à jour le statut .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Remboursement de frais est en attente d'approbation . Seulement l'approbateur des frais peut mettre à jour le statut .
 DocType: Purchase Invoice,Additional Discount Amount,Montant de réduction supplémentaire
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,S'il vous plaît entrer comptes débiteurs groupe / à payer en master de l'entreprise
-sites/assets/js/desk.min.js +7805,and,et
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,et
 DocType: Leave Block List Allow,Leave Block List Allow,Laisser Block List Autoriser
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abr ne peut être vide ou l'espace
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportif
@@ -1725,7 +1733,6 @@ DocType: Opportunity,Quotation,Devis
 DocType: Salary Slip,Total Deduction,Déduction totale
 DocType: Quotation,Maintenance User,Maintenance utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Coût Mise à jour
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Êtes-vous sûr de vouloir déboucher
 DocType: Employee,Date of Birth,Date de naissance
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Nouveau Stock UDM doit être différent de stock actuel Emballage
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Exercice ** représente un exercice. Toutes les écritures comptables et autres transactions majeures sont suivis dans ** Exercice **.
@@ -1741,13 +1748,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Garder une trace des campagnes de vente. Gardez une trace de Leads, Citations, Sales Order etc de campagnes de mesurer le retour sur investissement. "
 DocType: Expense Claim,Approver,Approbateur
 ,SO Qty,SO Quantité
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Les entrées en stocks existent contre entrepôt {0}, donc vous ne pouvez pas réaffecter ou modifier Entrepôt"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Les entrées en stocks existent contre entrepôt {0}, donc vous ne pouvez pas réaffecter ou modifier Entrepôt"
 DocType: Appraisal,Calculate Total Score,Calculer Score total
 DocType: Supplier Quotation,Manufacturing Manager,Responsable de la fabrication
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Compte {0} n'appartient pas à la Société {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Séparer le bon de livraison dans des packages.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Livraisons
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moulage par immersion
+DocType: Purchase Order,To be delivered to customer,Pour être livré à la clientèle
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Log Time Etat doit être soumis.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N ° de série {0} ne fait pas partie de tout entrepôt
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuration
@@ -1772,11 +1780,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,De Monnaie
 DocType: DocField,Name,Nom
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Se il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Commande requis pour objet {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Commande requis pour objet {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Les montants ne figurent pas dans le système
 DocType: Purchase Invoice Item,Rate (Company Currency),Taux (Monnaie de la société)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,autres
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Définir comme Arrêtée
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Vous ne trouvez pas un produit trouvé. S'il vous plaît sélectionner une autre valeur pour {0}.
 DocType: POS Profile,Taxes and Charges,Impôts et taxes
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un produit ou un service qui est acheté, vendu ou conservé en stock."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Point {0} a été saisi plusieurs fois avec la même description ou la date
@@ -1785,19 +1793,20 @@ DocType: Web Form,Select DocType,Sélectionnez DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Abordant
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bancaire
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"S'il vous plaît cliquer sur "" Générer annexe » pour obtenir le calendrier"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nouveau centre de coût
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nouveau centre de coût
 DocType: Bin,Ordered Quantity,Quantité commandée
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","par exemple "" Construire des outils pour les constructeurs """
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Remise (par Article)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
+DocType: Purchase Order Item,Reference Document Type,Référence Type de document
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
 DocType: Account,Fixed Asset,Actifs immobilisés
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Stocks en série
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Stocks en série
 DocType: Activity Type,Default Billing Rate,Par défaut taux de facturation
 DocType: Time Log Batch,Total Billing Amount,Montant total de la facturation
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Compte à recevoir
 ,Stock Balance,Solde Stock
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Classement des ventes au paiement
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Classement des ventes au paiement
 DocType: Expense Claim Detail,Expense Claim Detail,Détail remboursement des dépenses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs créé:
 DocType: Item,Weight UOM,Poids Emballage
@@ -1833,10 +1842,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédit du compte doit être un compte à payer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},S'il vous plaît entrer une adresse valide Id
 DocType: Production Order Operation,Completed Qty,Quantité complétée
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Pour {0}, seuls les comptes de débit peuvent être liés avec une autre entrée de crédit"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Série {0} déjà utilisé dans {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Pour {0}, seuls les comptes de débit peuvent être liés avec une autre entrée de crédit"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Série {0} déjà utilisé dans {1}
 DocType: Manufacturing Settings,Allow Overtime,Autoriser heures supplémentaires
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Commande {0} est arrêté
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numéros de série requis pour objet {1}. Vous avez fourni {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Valorisation Taux actuel
 DocType: Item,Customer Item Codes,Codes de référence du client
@@ -1845,9 +1853,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soudage
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nouveau stock UDM est requis
 DocType: Quality Inspection,Sample Size,Taille de l'échantillon
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Tous les articles ont déjà été facturés
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Tous les articles ont déjà été facturés
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',S'il vous plaît indiquer une valide »De Affaire n '
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"D'autres centres de coûts peuvent être réalisées dans les groupes, mais les entrées peuvent être faites contre les non-Groupes"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"D'autres centres de coûts peuvent être réalisées dans les groupes, mais les entrées peuvent être faites contre les non-Groupes"
 DocType: Project,External,Externe
 DocType: Features Setup,Item Serial Nos,N° de série
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilisateurs et autorisations
@@ -1874,7 +1882,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Adresse & Coordonnées
 DocType: SMS Log,Sender Name,Nom de l'expéditeur
 DocType: Page,Title,Titre
-sites/assets/js/list.min.js +104,Customize,Personnaliser
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personnaliser
 DocType: POS Profile,[Select],[Choisir ]
 DocType: SMS Log,Sent To,Envoyé À
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Faire la facture de vente
@@ -1899,12 +1907,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Fin de vie
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Quantité ne peut pas être une fraction dans la ligne {0}
 DocType: Leave Block List,Allow Users,Autoriser les utilisateurs
+DocType: Purchase Order,Customer Mobile No,Client Mobile Pas
 DocType: Sales Invoice,Recurring,Récurrent
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Suivre les revenus et dépenses de séparée verticales ou divisions produits.
 DocType: Rename Tool,Rename Tool,Outil de renommage
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,mise à jour des coûts
 DocType: Item Reorder,Item Reorder,Réorganiser article
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,transfert de matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,transfert de matériel
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Précisez les activités, le coût d'exploitation et de donner une opération unique, non à vos opérations ."
 DocType: Purchase Invoice,Price List Currency,Devise Prix
 DocType: Naming Series,User must always select,L'utilisateur doit toujours sélectionner
@@ -1927,7 +1936,7 @@ DocType: Appraisal,Employee,Employé
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importer Email De
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Inviter en tant qu'utilisateur
 DocType: Features Setup,After Sale Installations,Installations Après Vente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} est entièrement facturé
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} est entièrement facturé
 DocType: Workstation Working Hour,End Time,Heure de fin
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Date prévue d'achèvement ne peut pas être inférieure à projet Date de début
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Règles pour ajouter les frais d'envoi .
@@ -1936,8 +1945,9 @@ DocType: Sales Invoice,Mass Mailing,Mailing de masse
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Fichier à Renommer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Ordre de fabrication {0} doit être annulée avant d'annuler cette commande client
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Afficher les paiements
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Divulgué BOM {0} ne existe pas pour objet {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programme de maintenance {0} doit être annulée avant d'annuler cette commande client
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programme de maintenance {0} doit être annulée avant d'annuler cette commande client
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Taille
 DocType: Notification Control,Expense Claim Approved,Demande d'indemnité Approuvé
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,pharmaceutique
@@ -1956,8 +1966,8 @@ DocType: Upload Attendance,Attendance To Date,La participation à ce jour
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Cas No (s ) en cours d'utilisation . Essayez de l'affaire n ° {0}
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Compte de paiement
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Veuillez indiquer Société de procéder
-sites/assets/js/list.min.js +23,Draft,Avant-projet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Veuillez indiquer Société de procéder
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Avant-projet
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,faire
 DocType: Quality Inspection Reading,Accepted,Accepté
 DocType: User,Female,Femme
@@ -1970,14 +1980,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Livraison règle étiquette
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Comme il ya des transactions sur actions existants pour cet article, \ vous ne pouvez pas modifier les valeurs de 'A Numéro de série "," A lot Non »,« Est-Stock Item »et« Méthode d'évaluation »"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Journal Entrée rapide
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
 DocType: Employee,Previous Work Experience,L'expérience de travail antérieure
 DocType: Stock Entry,For Quantity,Pour Quantité
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Vous ne pouvez pas sélectionner le type de charge comme « Sur la ligne précédente Montant » ou « Le précédent Row totale » pour l'évaluation . Vous ne pouvez sélectionner que l'option «Total» pour le montant de la ligne précédente ou total de la ligne précédente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} n'a pas été soumis
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Gestion des demandes d'articles.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} n'a pas été soumis
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Gestion des demandes d'articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pour la production séparée sera créée pour chaque article produit fini.
 DocType: Purchase Invoice,Terms and Conditions1,Termes et conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,installation terminée
@@ -1989,7 +2000,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bulletin Liste de
 DocType: Delivery Note,Transporter Name,Nom Transporteur
 DocType: Contact,Enter department to which this Contact belongs,Entrez département auquel appartient ce contact
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Absent total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Une autre entrée de clôture de la période {0} a été faite après {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Une autre entrée de clôture de la période {0} a été faite après {1}
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unité de mesure
 DocType: Fiscal Year,Year End Date,Date de Fin de l'exercice
 DocType: Task Depends On,Task Depends On,Groupe dépend
@@ -2015,7 +2026,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Fin du contrat La date doit être supérieure à date d'adhésion
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un tiers distributeur / commerçant / commissionnaire / affilié / revendeur qui vend les produits de l'entreprise en échange d'une commission.
 DocType: Customer Group,Has Child Node,A Node enfant
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Entrez les paramètres url statiques (par exemple ici sender = ERPNext, username = ERPNext, mot de passe = 1234 etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} dans aucun exercice actif. Pour plus de détails, consultez {2}."
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Par défaut Warehouse est obligatoire pour les stock Article .
@@ -2066,11 +2077,9 @@ DocType: Note,Note,Remarque
 DocType: Purchase Receipt Item,Recd Quantity,Quantité recd
 DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},effondrement
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Définir comme débouchées
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock entrée {0} est pas soumis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock entrée {0} est pas soumis
 DocType: Payment Reconciliation,Bank / Cash Account,Compte en Banque / trésorerie
 DocType: Tax Rule,Billing City,Facturation Ville
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Cette application congé est en attente d'approbation. Seul le congé approbateur peut mettre à jour le statut.
 DocType: Global Defaults,Hide Currency Symbol,Masquer le symbole monétaire
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","par exemple, bancaire, Carte de crédit"
 DocType: Journal Entry,Credit Note,Note de crédit
@@ -2091,7 +2100,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantité)
 DocType: Installation Note Item,Installed Qty,Qté installée
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-sites/assets/js/list.min.js +26,Submitted,Soumis
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Soumis
 DocType: Salary Structure,Total Earning,Gains totale
 DocType: Purchase Receipt,Time at which materials were received,Heure à laquelle les matériaux ont été reçues
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mes adresses
@@ -2100,7 +2109,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Point impôt
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ou
 DocType: Sales Order,Billing Status,Statut de la facturation
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Commande {0} n'est pas soumis
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-dessus
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-dessus
 DocType: Buying Settings,Default Buying Price List,Défaut d'achat Liste des Prix
 ,Download Backups,Télécharger sauvegardes
 DocType: Notification Control,Sales Order Message,Message de commande client
@@ -2109,7 +2118,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Sélectionnez employés
 DocType: Bank Reconciliation,To Date,À ce jour
 DocType: Opportunity,Potential Sales Deal,Offre de vente potentiels
-sites/assets/js/form.min.js +308,Details,Détails
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Détails
 DocType: Purchase Invoice,Total Taxes and Charges,Total Taxes et frais
 DocType: Employee,Emergency Contact,En cas d'urgence
 DocType: Item,Quality Parameters,Paramètres de qualité
@@ -2124,7 +2133,7 @@ DocType: Purchase Order Item,Received Qty,Quantité reçue
 DocType: Stock Entry Detail,Serial No / Batch,N ° de série / lot
 DocType: Product Bundle,Parent Item,Article Parent
 DocType: Account,Account Type,Type de compte
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Sélectionnez à télécharger:
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Sélectionnez à télécharger:
 ,To Produce,A Produire
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pour la ligne {0} dans {1}. Pour inclure {2} dans le prix de l'article, les lignes {3} doivent également être inclus"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identification de l'emballage pour la livraison (pour l'impression)
@@ -2135,7 +2144,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplanissement
 DocType: Account,Income Account,Compte de revenu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Moulage
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Accouchement
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Accouchement
 DocType: Stock Reconciliation Item,Current Qty,Quantité actuelle
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Voir «Taux de matériaux à base de« coûts dans la section
 DocType: Appraisal Goal,Key Responsibility Area,Section à responsabilité importante
@@ -2166,9 +2175,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Toutes les adresses.
 DocType: Company,Stock Settings,Paramètres de stock
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusion est seulement possible si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, type de racine, Société"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusion est seulement possible si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, type de racine, Société"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gérer l'arborescence de groupe de clients .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nouveau centre de coûts Nom
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nouveau centre de coûts Nom
 DocType: Leave Control Panel,Leave Control Panel,Laisser le Panneau de configuration
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Aucune valeur par défaut Adresse modèle trouvé. S'il vous plaît créer un nouveau à partir de Configuration> Presse et Branding> Adresse modèle.
 DocType: Appraisal,HR User,Utilisateur HR
@@ -2187,24 +2196,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Paiement outil Détail
 ,Sales Browser,Exceptionnelle pour {0} ne peut pas être inférieur à zéro ( {1} )
 DocType: Journal Entry,Total Credit,Crédit total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l'entrée en stock {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,arrondis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l'entrée en stock {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,arrondis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Prêts et avances ( actif)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Débiteurs
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grand
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Aucun employé trouvé!
 DocType: C-Form Invoice Detail,Territory,Territoire
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Paiement du salaire pour le mois {0} et {1} an
+DocType: Purchase Order,Customer Address Display,Adresse du client Affichage
 DocType: Stock Settings,Default Valuation Method,Méthode d'évaluation par défaut
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polissage
 DocType: Production Order Operation,Planned Start Time,Heure de début prévue
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Alloué
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Fermer Bilan et livre Bénéfice ou perte .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unité de mesure pour le point de défaut {0} ne peut pas être modifié directement parce que \ vous avez déjà fait une transaction (s) avec une autre unité de mesure. Pour changer UOM par défaut, \ 'utilisation' UOM Remplacer Utility 'outil sous module de Stock."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spécifiez Taux de change pour convertir une monnaie en une autre
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Devis {0} est annulée
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Devis {0} est annulée
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Encours total
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employé {0} a été en congé de {1} . Vous ne pouvez pas marquer la fréquentation .
 DocType: Sales Partner,Targets,Cibles
@@ -2219,12 +2228,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Il s'agit d'un groupe de clients de la racine et ne peut être modifié .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,S'il vous plaît configurer votre plan de comptes avant de commencer Écritures comptables
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorez règle de prix
-sites/assets/js/list.min.js +24,Cancelled,Annulé
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Annulé
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,De date dans la structure des salaires ne peut pas être moindre que l'employé Date de démarrage.
 DocType: Employee Education,Graduate,Diplômé
 DocType: Leave Block List,Block Days,Bloquer les jours
 DocType: Journal Entry,Excise Entry,Entrée accise
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Attention: Sales Order {0} existe déjà contre la commande d'achat du client {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Attention: Sales Order {0} existe déjà contre la commande d'achat du client {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2281,17 +2290,17 @@ DocType: Account,Stock Received But Not Billed,Stock reçus mais non facturés
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salaire brut + + Montant Montant échu Encaissement - Déduction totale
 DocType: Monthly Distribution,Distribution Name,Nom distribution
 DocType: Features Setup,Sales and Purchase,Vente et achat
-DocType: Purchase Order Item,Material Request No,Demande de Support Aucun
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0} 
+DocType: Supplier Quotation Item,Material Request No,Demande de Support Aucun
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0} 
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Vitesse à laquelle la devise du client est converti en devise de base entreprise
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} a été désabonné avec succès de cette liste.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux net (Société devise)
-apps/frappe/frappe/templates/base.html +132,Added,Ajouté
+apps/frappe/frappe/templates/base.html +134,Added,Ajouté
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gérer l'arboressence des territoirs.
 DocType: Journal Entry Account,Sales Invoice,Facture de vente
 DocType: Journal Entry Account,Party Balance,Solde Parti
 DocType: Sales Invoice Item,Time Log Batch,Temps connecter Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,S'il vous plaît sélectionnez Appliquer Remise Sur
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,S'il vous plaît sélectionnez Appliquer Remise Sur
 DocType: Company,Default Receivable Account,Compte à recevoir par défaut
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Créer une entrée de la Banque pour le salaire total payé pour les critères ci-dessus sélectionnés
 DocType: Stock Entry,Material Transfer for Manufacture,Transfert de matériel pour Fabrication
@@ -2302,7 +2311,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Obtenez les entrées pertinent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entrée comptable pour Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Ventes Equipe1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Point {0} n'existe pas
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Point {0} n'existe pas
 DocType: Sales Invoice,Customer Address,Adresse du client
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Appliquer de remise supplémentaire sur
@@ -2317,13 +2326,15 @@ DocType: Quality Inspection,Quality Inspection,Inspection de la Qualité
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Très Petit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Vaporiser former
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Attention: Matériel requis Quantité est inférieure Quantité minimum à commander
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Le compte {0} est gelé
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Le compte {0} est gelé
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entité juridique / Filiale avec un tableau distinct des comptes appartenant à l'Organisation.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentation , boissons et tabac"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ou BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Ne peut effectuer le paiement contre non facturés {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveau de Stock Minimal
 DocType: Stock Entry,Subcontract,Sous-traiter
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,S'il vous plaît entrer {0} premier
 DocType: Production Planning Tool,Get Items From Sales Orders,Obtenir des éléments de Sales Orders
 DocType: Production Order Operation,Actual End Time,Fin du temps réel
 DocType: Production Planning Tool,Download Materials Required,Télécharger Matériel requis
@@ -2340,9 +2351,9 @@ DocType: Maintenance Visit,Scheduled,Prévu
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",S'il vous plaît sélectionner Point où "Est Stock Item" est "Non" et "est le point de vente" est "Oui" et il n'y a pas d'autre groupe de produits
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Sélectionnez une distribution mensuelle de distribuer inégalement cibles à travers les mois.
 DocType: Purchase Invoice Item,Valuation Rate,Taux d'évaluation
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Liste des Prix devise sélectionné
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Liste des Prix devise sélectionné
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Point Row {0}: Reçu d'achat {1} ne existe pas dans le tableau ci-dessus 'achat reçus »
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Employé {0} a déjà appliqué pour {1} entre {2} et {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employé {0} a déjà appliqué pour {1} entre {2} et {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Date de début du projet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Jusqu'à
 DocType: Rename Tool,Rename Log,Renommez identifiez-vous
@@ -2369,13 +2380,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Seuls les noeuds feuilles sont autorisées dans une transaction
 DocType: Expense Claim,Expense Approver,Dépenses approbateur
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Article reçu d'achat fournis
-sites/assets/js/erpnext.min.js +48,Pay,Payer
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Payer
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Pour La date du 
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs pour le maintien du statut de livraison de sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Broyage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Mise sous film rétractable
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Activités en attente
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activités en attente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmé
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fournisseur> Type de fournisseur
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Type de partie de Parent
@@ -2386,7 +2397,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Ent
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Éditeurs de journaux
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Sélectionner exercice
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fonte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Vous êtes l'approbateur congé pour cet enregistrement . S'il vous plaît mettre à jour le «Status» et Save
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Réorganiser Niveau
 DocType: Attendance,Attendance Date,Date de Participation
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,rupture des salaires basée sur l'obtention et la déduction.
@@ -2422,6 +2432,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,S'il vous plaît entrer les détails de l' article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Actifs d'impôt
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fournisseur (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Période non valide
 DocType: Customer,Credit Limit,Limite de crédit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Sélectionner le type de transaction
 DocType: GL Entry,Voucher No,No du bon
@@ -2431,8 +2442,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Modè
 DocType: Customer,Address and Contact,Adresse et contact
 DocType: Customer,Last Day of the Next Month,Dernier jour du mois prochain
 DocType: Employee,Feedback,Commentaire
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque: En raison / Date de référence dépasse autorisés jours de crédit client par {0} jour (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Calendrier
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque: En raison / Date de référence dépasse autorisés jours de crédit client par {0} jour (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Calendrier
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrasive jet usinage
 DocType: Stock Settings,Freeze Stock Entries,Congeler entrées en stocks
 DocType: Website Settings,Website Settings,Réglages Site web
@@ -2446,11 +2457,11 @@ DocType: Quality Inspection,Outgoing,Sortant
 DocType: Material Request,Requested For,Demandée pour
 DocType: Quotation Item,Against Doctype,Contre Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Suivre ce bon de livraison contre tout projet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Prix ​​ou à prix réduits
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Prix ​​ou à prix réduits
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Voir les entrées en stocks
 ,Is Primary Address,Est-Adresse primaire
 DocType: Production Order,Work-in-Progress Warehouse,Entrepôt Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Référence #{0} daté {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Référence #{0} daté {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gérer les adresses
 DocType: Pricing Rule,Item Code,Code de l'article
 DocType: Production Planning Tool,Create Production Orders,Créer des ordres de fabrication
@@ -2459,14 +2470,14 @@ DocType: Journal Entry,User Remark,Remarque l'utilisateur
 DocType: Lead,Market Segment,Segment de marché
 DocType: Communication,Phone,Téléphone
 DocType: Employee Internal Work History,Employee Internal Work History,Antécédents de travail des employés internes
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Fermeture (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Fermeture (Dr)
 DocType: Contact,Passive,Passif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,N ° de série {0} pas en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modèle de la taxe pour la vente de transactions .
 DocType: Sales Invoice,Write Off Outstanding Amount,Ecrire Off Encours
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Vérifiez si vous avez besoin automatiques factures récurrentes. Après avoir présenté la facture de vente, l'article récurrent sera visible."
 DocType: Account,Accounts Manager,Gestionnaire de comptes
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',« Pertes et profits » compte de type {0} n'est pas autorisé dans l'ouverture d'entrée
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',« Pertes et profits » compte de type {0} n'est pas autorisé dans l'ouverture d'entrée
 DocType: Stock Settings,Default Stock UOM,Stock défaut Emballage
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Costing Tarif basé sur le type d'activité (par heure)
 DocType: Production Planning Tool,Create Material Requests,Créer des demandes de matériel
@@ -2477,7 +2488,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Rapprochement bancaire
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Mises à jour
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Ajouter quelque exemple de dossier
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Gestion des congés
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestion des congés
 DocType: Event,Groups,Groupes
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groupe par compte
 DocType: Sales Order,Fully Delivered,Entièrement Livré
@@ -2489,11 +2500,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Extras ventes
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Le budget {0} pour le compte {1} va excéder le poste de coût {2} de {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte de différence doit être un compte de type actif / passif, puisque cette Stock réconciliation est une entrée d'ouverture"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Effectuer Feuilles Transmises
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','La date due' doit être antérieure à la 'Date'
 ,Stock Projected Qty,Stock projeté Quantité
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
 DocType: Sales Order,Customer's Purchase Order,Bon de commande du client
 DocType: Warranty Claim,From Company,De Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valeur ou Quantité
@@ -2506,13 +2516,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Détaillant
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Crédit du compte doit être un compte de bilan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tous les types de fournisseurs
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Code de l'article est obligatoire, car l'article n'est pas numéroté automatiquement"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Activer / désactiver les monnaies .
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Code de l'article est obligatoire, car l'article n'est pas numéroté automatiquement"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Activer / désactiver les monnaies .
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Article calendrier d'entretien
 DocType: Sales Order,%  Delivered,Livré%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Compte du découvert bancaire
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Faire fiche de salaire
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,déboucher
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Parcourir BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pas de nomenclature par défaut existe pour objet {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produits impressionnants
@@ -2522,7 +2531,7 @@ DocType: Appraisal,Appraisal,Évaluation
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Coulée à mousse perdue
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dessin
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,La date est répétée
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Abréviation ne peut pas avoir plus de 5 caractères
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Abréviation ne peut pas avoir plus de 5 caractères
 DocType: Hub Settings,Seller Email,Vendeur Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coût d'achat total (via la facture d'achat)
 DocType: Workstation Working Hour,Start Time,Heure de début
@@ -2536,8 +2545,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Montant net (Société devise)
 DocType: BOM Operation,Hour Rate,Taux horraire
 DocType: Stock Settings,Item Naming By,Point de noms en
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,De offre
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Point Wise impôt Détail
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,De offre
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Point Wise impôt Détail
 DocType: Production Order,Material Transferred for Manufacturing,Matériel transféré pour la fabrication
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Le compte {0} ne existe pas
 DocType: Purchase Receipt Item,Purchase Order Item No,Achetez article ordonnance n
@@ -2550,11 +2559,11 @@ DocType: Item,Inspection Required,Inspection obligatoire
 DocType: Purchase Invoice Item,PR Detail,Détail PR
 DocType: Sales Order,Fully Billed,Entièrement Qualifié
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Votre exercice social commence le
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Entrepôt de livraison requise pour stock pièce {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Entrepôt de livraison requise pour stock pièce {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Le poids brut du colis. Habituellement poids net + poids du matériau d'emballage. (Pour l'impression)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Les utilisateurs ayant ce rôle sont autorisés à fixer les comptes gelés et de créer / modifier des entrées comptables contre les comptes gelés
 DocType: Serial No,Is Cancelled,Est annulée
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Mes envois
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mes envois
 DocType: Journal Entry,Bill Date,Date de la facture
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Même s'il existe plusieurs règles de tarification avec la plus haute priorité, les priorités internes alors suivantes sont appliquées:"
 DocType: Supplier,Supplier Details,Détails de produit
@@ -2567,7 +2576,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Virement
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,S'il vous plaît sélectionner compte bancaire
 DocType: Newsletter,Create and Send Newsletters,Créer et envoyer des newsletters
-sites/assets/js/report.min.js +107,From Date must be before To Date,Partir de la date doit être antérieure à ce jour
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Partir de la date doit être antérieure à ce jour
 DocType: Sales Order,Recurring Order,Ordre récurrent
 DocType: Company,Default Income Account,Compte d'exploitation
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Groupe de client / client
@@ -2582,31 +2591,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Stock UDM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,entrer une valeur
 ,Projected,Projection
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Les paramètres par défaut pour les transactions boursières .
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifie pas sur - livraison et la sur- réservation pour objet {0} que la quantité ou le montant est égal à 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifie pas sur - livraison et la sur- réservation pour objet {0} que la quantité ou le montant est égal à 0
 DocType: Notification Control,Quotation Message,Message du devis
 DocType: Issue,Opening Date,Date d'ouverture
 DocType: Journal Entry,Remark,Remarque
 DocType: Purchase Receipt Item,Rate and Amount,Taux et le montant
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Ennuyeux
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,De Sales Order
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,De Sales Order
 DocType: Blog Category,Parent Website Route,Montant de l'impôt après réduction Montant
 DocType: Sales Order,Not Billed,Non Facturé
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Les deux Entrepôt doivent appartenir à la même entreprise
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Aucun contact encore ajouté.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Aucun contact encore ajouté.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Non actif
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Sur la date de publication de la facture
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Bon Montant
 DocType: Time Log,Batched for Billing,Par lots pour la facturation
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Factures reçues des fournisseurs.
 DocType: POS Profile,Write Off Account,Ecrire Off compte
-sites/assets/js/erpnext.min.js +26,Discount Amount,S'il vous plaît tirer des articles de livraison Note
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,S'il vous plaît tirer des articles de livraison Note
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retour contre la facture d'achat
 DocType: Item,Warranty Period (in days),Période de garantie (en jours)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,par exemple TVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Point 4
 DocType: Journal Entry Account,Journal Entry Account,Compte Entrée Journal
 DocType: Shopping Cart Settings,Quotation Series,Devis série
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Un article existe avec le même nom ({0}), changez le groupe de l'article ou renommez l'article SVP"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Un article existe avec le même nom ({0}), changez le groupe de l'article ou renommez l'article SVP"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot gaz de formage des métaux
 DocType: Sales Order Item,Sales Order Date,Date de Commande
 DocType: Sales Invoice Item,Delivered Qty,Qté livrée
@@ -2638,10 +2646,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Client ou fournisseur détails
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Série est obligatoire
 DocType: Lead,Lead Owner,Conduire du propriétaire
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Entrepôt est nécessaire
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Entrepôt est nécessaire
 DocType: Employee,Marital Status,État civil
 DocType: Stock Settings,Auto Material Request,Auto Demande de Matériel
 DocType: Time Log,Will be updated when billed.,Sera mis à jour lorsqu'ils sont facturés.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponible lot Quantité à partir de l'entrepôt
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Référence # {0} {1} du
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Date de la retraite doit être supérieure à date d'adhésion
 DocType: Sales Invoice,Against Income Account,Sur le compte des revenus
@@ -2658,12 +2667,12 @@ DocType: POS Profile,Update Stock,Mise à jour Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinition
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Différents Emballage des articles mènera à incorrects (Total ) Valeur de poids . Assurez-vous que poids net de chaque article se trouve dans la même unité de mesure .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taux BOM
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,POS- Cadre . #
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,POS- Cadre . #
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Entrées de journal {0} sont non liée
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Enregistrement de toutes les communications de type de mail, téléphone, chat, visite, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,S'il vous plaît mentionner Centre de coûts Round Off dans Société
 DocType: Purchase Invoice,Terms,termes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,créer un nouveau
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,créer un nouveau
 DocType: Buying Settings,Purchase Order Required,Bon de commande requis
 ,Item-wise Sales History,Historique des ventes (par Article)
 DocType: Expense Claim,Total Sanctioned Amount,Montant total sanctionné
@@ -2680,16 +2689,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Déduction bulletin de sala
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Remarques
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Sélectionnez un noeud de premier groupe.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},L'objectif doit être l'un des {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Remplissez le formulaire et l'enregistrer
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Remplissez le formulaire et l'enregistrer
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Télécharger un rapport contenant toutes les matières premières avec leur dernier état des stocks
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Parement
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Communauté Forum
 DocType: Leave Application,Leave Balance Before Application,Laisser Solde Avant d'application
 DocType: SMS Center,Send SMS,Envoyer un SMS
 DocType: Company,Default Letter Head,Par défaut Lettre Head
 DocType: Time Log,Billable,Facturable
 DocType: Authorization Rule,This will be used for setting rule in HR module,Il sera utilisé pour la règle de réglage dans le module RH
 DocType: Account,Rate at which this tax is applied,Vitesse à laquelle cet impôt est appliqué
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Réorganiser Quantité
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Réorganiser Quantité
 DocType: Company,Stock Adjustment Account,Compte d'ajustement de stock
 DocType: Journal Entry,Write Off,Effacer
 DocType: Time Log,Operation ID,ID. de l'opération
@@ -2700,12 +2710,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Les champs d'actualisation sera disponible en commande, reçu d'achat, facture d'achat"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom du nouveau compte. Note: S'il vous plaît ne créez pas de comptes clients et fournisseurs
 DocType: Report,Report Type,Rapport Genre
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Chargement
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Chargement
 DocType: BOM Replace Tool,BOM Replace Tool,Outil Remplacer BOM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modèles pays sage d'adresses par défaut
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},En raison / Date de référence ne peut pas être après {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Fournisseur fournit au client
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Afficher impôt rupture
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},En raison / Date de référence ne peut pas être après {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importer des données et de l'Exportation
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Invalid Nom d'utilisateur Mot de passe ou de soutien . S'il vous plaît corriger et essayer à nouveau.
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Facture Date de publication
 DocType: Sales Invoice,Rounded Total,Totale arrondie
 DocType: Product Bundle,List items that form the package.,Liste des articles qui composent le paquet.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Pourcentage allocation doit être égale à 100 %
@@ -2716,8 +2729,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Se il vous plaît contacter à l'utilisateur qui ont Sales Master Chef {0} rôle
 DocType: Company,Default Cash Account,Compte caisse
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuration de l'entreprise 
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',S'il vous plaît entrer « Date de livraison prévue '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Quantité en ligne {0} ( {1} ) doit être la même que la quantité fabriquée {2}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',S'il vous plaît entrer « Date de livraison prévue '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Quantité en ligne {0} ( {1} ) doit être la même que la quantité fabriquée {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Comptes provisoires ( passif)
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} n'est pas un numéro de lot valable pour l'objet {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},S'il vous plaît spécifier un ID de ligne valide pour {0} en ligne {1}
@@ -2739,11 +2752,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Quantité pas avalable dans l'entrepôt {1} sur {2} {3}.
  Disponible Quantité: {4}, transfert Quantité: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Point 3
+DocType: Purchase Order,Customer Contact Email,Client Contact Courriel
 DocType: Event,Sunday,Dimanche
 DocType: Sales Team,Contribution (%),Contribution (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Casual congé
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilités
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Modèle
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modèle
 DocType: Sales Person,Sales Person Name,Nom Sales Person
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,recevable
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Ajouter des utilisateurs
@@ -2752,7 +2766,7 @@ DocType: Task,Actual Start Date (via Time Logs),Date de début réelle (via Time
 DocType: Stock Reconciliation Item,Before reconciliation,Avant la réconciliation
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},A {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Les impôts et les frais supplémentaires (Société Monnaie)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"La ligne ""Taxe sur l'Article"" {0} doit indiquer un compte de type Revenu ou Dépense ou Facturable"
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"La ligne ""Taxe sur l'Article"" {0} doit indiquer un compte de type Revenu ou Dépense ou Facturable"
 DocType: Sales Order,Partly Billed,Présentée en partie
 DocType: Item,Default BOM,Nomenclature par défaut
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2760,12 +2774,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Encours total Amt
 DocType: Time Log Batch,Total Hours,Total des heures
 DocType: Journal Entry,Printing Settings,Réglages d'impression
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Débit total doit être égal au total du crédit .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Débit total doit être égal au total du crédit .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,automobile
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Vous ne pouvez pas produire plus d'article {0} que la quantité de commande client {1}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Point n'est nécessaire
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,moulage par injection de métal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,De bon de livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De bon de livraison
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Message personnalisé
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banques d'investissement
@@ -2781,10 +2794,10 @@ DocType: Newsletter,A Lead with this email id should exist,Un responsable de cet
 DocType: Stock Entry,From BOM,De BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,de base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,transactions d'actions avant {0} sont gelés
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"S'il vous plaît cliquer sur "" Générer annexe '"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Pour la date doit être le même que Date d' autorisation pour une demi-journée
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"S'il vous plaît cliquer sur "" Générer annexe '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Pour la date doit être le même que Date d' autorisation pour une demi-journée
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","kg par exemple, l'unité, n, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Centre de coûts est nécessaire pour compte » de profits et pertes "" {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Centre de coûts est nécessaire pour compte » de profits et pertes "" {0}"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,enregistrement précédent
 DocType: Salary Structure,Salary Structure,Grille des salaires
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2792,7 +2805,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  conflit en attribuant des priorités. Règles Prix: {0}"
 DocType: Account,Bank,Banque
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,compagnie aérienne
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Pour Entrepôt
 DocType: Employee,Offer Date,Date de l'offre
 DocType: Hub Settings,Access Token,Jeton d'accès
@@ -2815,6 +2828,7 @@ DocType: Issue,Opening Time,Ouverture Heure
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De et la date exigée
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction
+DocType: Delivery Note Item,From Warehouse,De Entrepôt
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Forage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Soufflage
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total
@@ -2836,11 +2850,12 @@ DocType: C-Form,Amended From,Modifié depuis
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matières premières
 DocType: Leave Application,Follow via Email,Suivez par e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Aucun article avec Barcode {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Les matières premières ne peut pas être le même que l'article principal
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Les matières premières ne peut pas être le même que l'article principal
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Voulez-vous vraiment arrêter
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},services impressionnants
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,S'il vous plaît sélectionnez Date de publication abord
-DocType: Leave Allocation,Carry Forward,Reporter
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},services impressionnants
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,S'il vous plaît sélectionnez Date de publication abord
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Date d'ouverture devrait être avant la date de clôture
+DocType: Leave Control Panel,Carry Forward,Reporter
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Point {0} a atteint sa fin de vie sur {1}
 DocType: Department,Days for which Holidays are blocked for this department.,Jours fériés pour lesquels sont bloqués pour ce département.
 ,Produced,produit
@@ -2861,17 +2876,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Montant)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,La date à laquelle commande récurrente sera arrêter
 DocType: Quality Inspection,Item Serial No,N° de série
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} doit être réduite par {1} ou vous devez augmenter la tolérance de dépassement
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} doit être réduite par {1} ou vous devez augmenter la tolérance de dépassement
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Présent total
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,heure
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Point sérialisé {0} ne peut pas être mis à jour en utilisant \
  Stock réconciliation"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transfert de matériel au fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfert de matériel au fournisseur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,S'il vous plaît créer clientèle de plomb {0}
 DocType: Lead,Lead Type,Type de câbles
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,créer offre
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Tous ces articles ont déjà été facturés
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tous ces articles ont déjà été facturés
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Peut être approuvé par {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Règle expédition Conditions
 DocType: BOM Replace Tool,The new BOM after replacement,La nouvelle nomenclature après le remplacement
@@ -2919,7 +2934,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Opération carte d'identité pas réglé
 DocType: Production Order,Planned Start Date,Date de début prévue
 DocType: Serial No,Creation Document Type,Type de document de création
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Visite
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Visite
 DocType: Leave Type,Is Encash,Est encaisser
 DocType: Purchase Invoice,Mobile No,N° mobile
 DocType: Payment Tool,Make Journal Entry,Assurez Journal Entrée
@@ -2927,7 +2942,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nouvelle Feuilles alloué
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,alloué avec succès
 DocType: Project,Expected End Date,Date de fin prévue
 DocType: Appraisal Template,Appraisal Template Title,Titre modèle d'évaluation
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Reste du monde
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Reste du monde
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} ne doit pas être un élément de Stock
 DocType: Cost Center,Distribution Id,Id distribution
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Services impressionnants
@@ -2943,14 +2958,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valeur pour l'attribut {0} doit être dans la gamme de {1} à {2} dans les incréments de {3}
 DocType: Tax Rule,Sales,Ventes
 DocType: Stock Entry Detail,Basic Amount,Montant de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},{0} est obligatoire
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},{0} est obligatoire
+DocType: Leave Allocation,Unused leaves,Feuilles inutilisées
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Par défaut Débiteurs
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sciage
 DocType: Tax Rule,Billing State,État de facturation
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminage
 DocType: Item Reorder,Transfer,Transférer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch nomenclature éclatée ( y compris les sous -ensembles )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch nomenclature éclatée ( y compris les sous -ensembles )
 DocType: Authorization Rule,Applicable To (Employee),Applicable aux (Employé)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Date d'échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incrément pour attribut {0} ne peut pas être 0
@@ -2966,6 +2982,7 @@ DocType: Company,Retail,Détail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Client {0} n'existe pas
 DocType: Attendance,Absent,Absent
 DocType: Product Bundle,Product Bundle,Bundle de produit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: référence non valide {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Écrasement
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Achetez Taxes et frais Template
 DocType: Upload Attendance,Download Template,Télécharger le modèle
@@ -2973,16 +2990,16 @@ DocType: GL Entry,Remarks,Remarques
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Numéro d'article de la matériel première
 DocType: Journal Entry,Write Off Based On,Ecrire Off Basé sur
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,N° de série pour un dossier d'installation 
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,N° de série pour un dossier d'installation 
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Coulée continue
-sites/assets/js/erpnext.min.js +10,Please specify a,Veuillez spécifier un
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Veuillez spécifier un
 DocType: Offer Letter,Awaiting Response,En attente de réponse
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Au dessus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionnement froide
 DocType: Salary Slip,Earning & Deduction,Gains et déduction
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Compte {0} ne peut pas être un groupe
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Région
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer dans diverses opérations .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer dans diverses opérations .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Négatif évaluation Taux n'est pas autorisé
 DocType: Holiday List,Weekly Off,Hebdomadaire Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pour exemple, 2012, 2012-13"
@@ -3026,12 +3043,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Renflé
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Évaporation motif coulée
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Frais de représentation
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Montant du rabais
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Âge
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Montant du rabais
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Âge
 DocType: Time Log,Billing Amount,Montant de facturation
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantité spécifiée non valide pour l'élément {0} . Quantité doit être supérieur à 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Les demandes de congé.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Un compte contenant une transaction ne peut pas être supprimé
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Un compte contenant une transaction ne peut pas être supprimé
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Actifs stock
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Le jour du mois au cours duquel l'ordre automatique sera généré par exemple 05, 28 etc"
 DocType: Sales Invoice,Posting Time,Affichage Temps
@@ -3040,9 +3057,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Cochez cette case si vous voulez forcer l'utilisateur à sélectionner une série avant de l'enregistrer. Il n'y aura pas défaut si vous cochez cette.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},non autorisé
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Notifications ouvertes
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Notifications ouvertes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,{0} {1} a été modifié . S'il vous plaît rafraîchir .
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Voulez-vous vraiment à ce unstop Demande de Matériel ?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Revenu clientèle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Code article nécessaire au rang n ° {0}
 DocType: Maintenance Visit,Breakdown,Panne
@@ -3053,7 +3069,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Comme le Date
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,{0} {1} contre le projet de loi {2} du {3}
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,{0} {1} contre le projet de loi {2} du {3}
 DocType: Feed,Full Name,Nom et Prénom
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinchage
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Centre de coûts est nécessaire à la ligne {0} dans le tableau des impôts pour le type {1}
@@ -3076,7 +3092,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Ajoutez des lig
 DocType: Buying Settings,Default Supplier Type,Fournisseur Type par défaut
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Carrières
 DocType: Production Order,Total Operating Cost,Coût d'exploitation total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Stock ne peut pas être mis à jour contre livraison Remarque {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Stock ne peut pas être mis à jour contre livraison Remarque {0}
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tous les contacts.
 DocType: Newsletter,Test Email Id,Id Test Email
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abréviation de l'entreprise
@@ -3100,11 +3116,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citatio
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock congelé
 ,Territory Target Variance Item Group-Wise,Entretien Visitez {0} doit être annulée avant d'annuler cette commande client
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tous les groupes client
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Modèle d'impôt est obligatoire.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Compte {0}: Le Compte parent {1} n'existe pas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifs Taux (Société Monnaie)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} l'état est 'Arrêté'
 DocType: Account,Temporary,Temporaire
 DocType: Address,Preferred Billing Address,Préféré adresse de facturation
 DocType: Monthly Distribution Percentage,Percentage Allocation,Répartition en pourcentage
@@ -3122,13 +3137,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Liste des Prix doit êt
 DocType: Purchase Order Item,Supplier Quotation,Devis Fournisseur
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dans les mots seront visibles une fois que vous enregistrez le devis.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Repassage
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} est arrêté
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Le code barre {0} est déjà utilisé dans l'article {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} est arrêté
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Le code barre {0} est déjà utilisé dans l'article {1}
 DocType: Lead,Add to calendar on this date,Ajouter cette date au calendrier
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,S'il vous plaît entrer atleast une facture dans le tableau
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,évènements à venir
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,évènements à venir
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Approuver rôle ne peut pas être même que le rôle de l'État est applicable aux
 DocType: Letter Head,Letter Head,A en-tête
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrée rapide
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} est obligatoire pour le retour
 DocType: Purchase Order,To Receive,A Recevoir
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Frettage
@@ -3152,25 +3168,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
 DocType: Serial No,Out of Warranty,Hors garantie
 DocType: BOM Replace Tool,Replace,Remplacer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Entrepôt de cible dans la ligne {0} doit être la même que la production de commande
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Entrepôt de cible dans la ligne {0} doit être la même que la production de commande
 DocType: Purchase Invoice Item,Project Name,Nom du projet
 DocType: Supplier,Mention if non-standard receivable account,Mentionner si créance non standard
 DocType: Workflow State,Edit,Modifier
 DocType: Journal Entry Account,If Income or Expense,Si les produits ou charges
 DocType: Features Setup,Item Batch Nos,Nos lots d'articles
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Différence
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Ressources Humaines
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Ressources Humaines
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Rapprochement des paiements Paiement
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,avec les groupes
 DocType: BOM Item,BOM No,Numéro BOM
 DocType: Contact Us Settings,Pincode,Code Postal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal entrée {0} n'a pas compte {1} ou déjà en correspondance avec une autre pièce justificative
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal entrée {0} n'a pas compte {1} ou déjà en correspondance avec une autre pièce justificative
 DocType: Item,Moving Average,Moyenne mobile
 DocType: BOM Replace Tool,The BOM which will be replaced,La nomenclature qui sera remplacé
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nouveau stock UDM doit être different de l'actuel stock UDM
 DocType: Account,Debit,Débit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Les feuilles doivent être alloués par multiples de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Les feuilles doivent être alloués par multiples de 0,5"
 DocType: Production Order,Operation Cost,Coût de l'opération
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Téléchargez la présence d'un fichier. Csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Exceptionnelle Amt
@@ -3178,7 +3194,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fixer d
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Pour attribuer ce problème, utilisez le bouton "Affecter" dans la barre latérale."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Vous ne pouvez pas entrer bon actuelle dans «Contre Journal Voucher ' colonne
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si deux ou plusieurs règles de tarification sont trouvés sur la base des conditions ci-dessus, la priorité est appliqué. Priorité est un nombre compris entre 0 à 20 tandis que la valeur par défaut est zéro (blanc). Nombre plus élevé signifie qu'il sera prioritaire se il ya plusieurs règles de tarification avec mêmes conditions."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Sur la facture
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Exercice: {0} ne existe pas
 DocType: Currency Exchange,To Currency,Pour Devise
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Autoriser les utilisateurs suivants d'approuver demandes d'autorisation pour les jours de bloc.
@@ -3207,7 +3222,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Taux
 DocType: Stock Entry Detail,Additional Cost,Supplément
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Date de fin de l'exercice financier
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base Bon Non, si regroupés par Chèque"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Faire Fournisseur offre
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Faire Fournisseur offre
 DocType: Quality Inspection,Incoming,Nouveau
 DocType: BOM,Materials Required (Exploded),Matériel nécessaire (éclatée)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Réduire Gagner de congé sans solde (PLT)
@@ -3215,10 +3230,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: N ° de série {1} ne correspond pas à {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Règles d'application des prix et de ristournes .
 DocType: Batch,Batch ID,ID. du lot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Compte avec des nœuds enfants ne peut pas être converti en livre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Compte avec des nœuds enfants ne peut pas être converti en livre
 ,Delivery Note Trends,Bordereau de livraison Tendances
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Résumé de la semaine
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} doit être un article ""Acheté"" ou ""Sous-traité"" à la ligne {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} doit être un article ""Acheté"" ou ""Sous-traité"" à la ligne {1}"
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Compte: {0} ne peut être mis à jour via les transactions boursières
 DocType: GL Entry,Party,Intervenants
 DocType: Sales Order,Delivery Date,Date de livraison
@@ -3231,7 +3246,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,t
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Moy. Taux d'achat
 DocType: Task,Actual Time (in Hours),Temps réel (en heures)
 DocType: Employee,History In Company,Dans l'histoire de l'entreprise
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Bulletins
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Bulletins
 DocType: Address,Shipping,Livraison
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,Laisser Block List
@@ -3250,7 +3265,7 @@ DocType: Account,Auditor,Auditeur
 DocType: Purchase Order,End date of current order's period,Date de fin de la période de commande en cours
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Assurez Lettre d'offre
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retour
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Unité de mesure pour la variante par défaut doit être la même comme modèle
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unité de mesure pour la variante par défaut doit être la même comme modèle
 DocType: DocField,Fold,Plier
 DocType: Production Order Operation,Production Order Operation,Production ordre d'opération
 DocType: Pricing Rule,Disable,"Groupe ajoutée, rafraîchissant ..."
@@ -3282,7 +3297,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Rapports au
 DocType: SMS Settings,Enter url parameter for receiver nos,Entrez le paramètre url pour nos récepteurs
 DocType: Sales Invoice,Paid Amount,Montant payé
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',S'il vous plaît sélectionner valide volet n ° de procéder
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',S'il vous plaît sélectionner valide volet n ° de procéder
 ,Available Stock for Packing Items,Disponible en stock pour l'emballage Articles
 DocType: Item Variant,Item Variant,Point Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"La définition de cette adresse modèle par défaut, car il n'ya pas d'autre défaut"
@@ -3290,7 +3305,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestion de la qualité
 DocType: Production Planning Tool,Filter based on customer,Filtre basé sur le client
 DocType: Payment Tool Detail,Against Voucher No,Sur le bon n°
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Point {0} est annulée
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Point {0} est annulée
 DocType: Employee External Work History,Employee External Work History,Antécédents de travail des employés externe
 DocType: Tax Rule,Purchase,Achat
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Qté soldée
@@ -3327,28 +3342,29 @@ Note: BOM = Bill of Materials","Un groupe total d' **Articles** dans un autre **
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Pas de série est obligatoire pour objet {0}
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,S'il vous plaît préciser à partir de / à la gamme
-sites/assets/js/desk.min.js +7652,Created By,Etabli par
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Etabli par
 DocType: Serial No,Under AMC,En vertu de l'AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,taux d'évaluation d'objet est recalculé compte tenu montant du bon de prix au débarquement
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,principal
 DocType: BOM Replace Tool,Current BOM,Nomenclature actuelle
-sites/assets/js/erpnext.min.js +8,Add Serial No,Ajouter Numéro de série
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Ajouter Numéro de série
 DocType: Production Order,Warehouses,Entrepôts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Appréciation {0} créé pour les employés {1} dans la plage de date donnée
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Noeud de groupe
 DocType: Payment Reconciliation,Minimum Amount,Montant minimum
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Marchandises mise à jour terminée
 DocType: Workstation,per hour,par heure
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},La date à laquelle la prochaine facture sera générée . Il est généré lors de la soumission .
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},La date à laquelle la prochaine facture sera générée . Il est généré lors de la soumission .
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Compte de l'entrepôt ( de l'inventaire permanent ) sera créé sous ce compte .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Descendre : {0}
 DocType: Company,Distribution,Répartition
-sites/assets/js/erpnext.min.js +50,Amount Paid,Montant payé
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Montant payé
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Chef de projet
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,envoi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Réduction de Max permis pour l'article: {0} {1} est%
 DocType: Customer,Default Taxes and Charges,Taxes et frais de défaut
 DocType: Account,Receivable,Impression et image de marque
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: pas autorisé à changer de fournisseur que la commande d'achat existe déjà
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rôle qui est autorisé à soumettre des transactions qui dépassent les limites de crédit fixées.
 DocType: Sales Invoice,Supplier Reference,Référence fournisseur
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Si elle est cochée, la nomenclature des sous-ensembles points seront examinés pour obtenir des matières premières. Sinon, tous les éléments du sous-ensemble sera traitée comme une matière première."
@@ -3385,8 +3401,8 @@ DocType: Email Digest,Add/Remove Recipients,Ajouter / supprimer des destinataire
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},installation terminée
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pour définir cette Année financière que par défaut , cliquez sur "" Définir par défaut """
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuration serveur entrant de soutien id e-mail . (par exemple support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Qté non couverte
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Variante d'objet {0} existe avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Qté non couverte
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Variante d'objet {0} existe avec les mêmes caractéristiques
 DocType: Salary Slip,Salary Slip,Fiche de paye
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunissage
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'La date' est requise
@@ -3399,6 +3415,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Lorsque l'une des opérations contrôlées sont «soumis», un e-mail pop-up s'ouvre automatiquement pour envoyer un courrier électronique à l'associé "Contact" dans cette transaction, la transaction en pièce jointe. L'utilisateur peut ou ne peut pas envoyer l'e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Paramètres globaux
 DocType: Employee Education,Employee Education,Formation des employés
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Il est nécessaire d'aller chercher de l'article Détails.
 DocType: Salary Slip,Net Pay,Salaire net
 DocType: Account,Account,Compte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Négatif Stock erreur ( {6} ) pour le point {0} dans {1} Entrepôt sur ​​{2} {3} {4} en {5}
@@ -3431,7 +3448,7 @@ DocType: BOM,Manufacturing User,Fabrication utilisateur
 DocType: Purchase Order,Raw Materials Supplied,Des matières premières fournies
 DocType: Purchase Invoice,Recurring Print Format,Format d'impression récurrent
 DocType: Communication,Series,série
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Une autre structure salariale {0} est active pour les employés {0} . S'il vous plaît faire son statut « inactif » pour continuer.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Une autre structure salariale {0} est active pour les employés {0} . S'il vous plaît faire son statut « inactif » pour continuer.
 DocType: Appraisal,Appraisal Template,Modèle d'évaluation
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Point Classification
@@ -3487,6 +3504,7 @@ DocType: HR Settings,Payroll Settings,Paramètres de la paie
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Correspondre non liées factures et paiements.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Passer la commande
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Racine ne peut pas avoir un centre de coûts parent
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Sélectionnez une marque ...
 DocType: Sales Invoice,C-Form Applicable,C-Form applicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Temps de fonctionnement doit être supérieure à 0 pour l'opération {0}
 DocType: Supplier,Address and Contacts,Adresse et contacts
@@ -3497,7 +3515,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Obtenez suspens Chèques
 DocType: Warranty Claim,Resolved By,Résolu par
 DocType: Appraisal,Start Date,Date de début
-sites/assets/js/desk.min.js +7629,Value,Valeur
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valeur
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Compte temporaire ( actif)
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Cliquez ici pour vérifier
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Compte {0}: Vous ne pouvez pas assigner un compte comme son propre parent
@@ -3513,14 +3531,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox accès autorisé
 DocType: Dropbox Backup,Weekly,Hebdomadaire
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Par exemple. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Recevoir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Recevoir
 DocType: Maintenance Visit,Fully Completed,Entièrement complété
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complète
 DocType: Employee,Educational Qualification,Qualification pour l'éducation
 DocType: Workstation,Operating Costs,Coûts d'exploitation
 DocType: Employee Leave Approver,Employee Leave Approver,Congé employé approbateur
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} a été ajouté avec succès à notre liste de diffusion.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Une entrée Réorganiser existe déjà pour cet entrepôt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Une entrée Réorganiser existe déjà pour cet entrepôt {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Vous ne pouvez pas déclarer comme perdu , parce offre a été faite."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Usinage par faisceau d'électrons
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Achat Maître Gestionnaire
@@ -3533,7 +3551,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Ajouter / Modifier Prix
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Carte des centres de coûts
 ,Requested Items To Be Ordered,Articles demandés à commander
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Mes Commandes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mes Commandes
 DocType: Price List,Price List Name,Nom Liste des Prix
 DocType: Time Log,For Manufacturing,Pour Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaux
@@ -3544,7 +3562,7 @@ DocType: Account,Income,Revenu
 DocType: Industry Type,Industry Type,Secteur d'activité
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Quelque chose a mal tourné !
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Attention: la demande d'autorisation contient les dates de blocs suivants
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Date d'achèvement
 DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Devise de la Société)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Moulage sous pression
@@ -3558,10 +3576,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Année
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,S'il vous plaît Mettre à jour les paramètres de SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Heure du journal {0} déjà facturée
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Heure du journal {0} déjà facturée
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Les prêts non garantis
 DocType: Cost Center,Cost Center Name,Coût Nom du centre
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Projets Système
 DocType: Maintenance Schedule Detail,Scheduled Date,Date prévue
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Amt total payé
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Un message de plus de 160 caractères sera découpé en plusieurs mesage
@@ -3569,10 +3586,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Reçus et acceptés
 ,Serial No Service Contract Expiry,N ° de série expiration du contrat de service
 DocType: Item,Unit of Measure Conversion,Unité de conversion de Mesure
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Employé ne peut être modifié
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Vous ne pouvez pas crédit et de débit même compte en même temps
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Vous ne pouvez pas crédit et de débit même compte en même temps
 DocType: Naming Series,Help HTML,Aide HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage totale attribuée devrait être de 100 % . Il est {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Allocation pour les plus de {0} croisés pour objet {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Allocation pour les plus de {0} croisés pour objet {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nom de la personne ou de l'organisation que cette adresse appartient.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,vos fournisseurs
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossible de définir aussi perdu que les ventes décret.
@@ -3583,10 +3600,11 @@ DocType: Lead,Converted,Converti
 DocType: Item,Has Serial No,N ° de série a
 DocType: Employee,Date of Issue,Date d'émission
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Du {0} pour {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Réglez Fournisseur pour le point {1}
 DocType: Issue,Content Type,Type de contenu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,ordinateur
 DocType: Item,List this Item in multiple groups on the website.,Liste cet article dans plusieurs groupes sur le site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,S'il vous plaît vérifier l'option multi-devises pour permettre comptes avec autre monnaie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,S'il vous plaît vérifier l'option multi-devises pour permettre comptes avec autre monnaie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} ne existe pas dans le système
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à mettre en valeur Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obtenez non rapprochés entrées
@@ -3597,14 +3615,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Pour Entrepôt
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Le compte {0} a été renseigné plus d'une fois pour l'année fiscale {1}
 ,Average Commission Rate,Taux moyen de la commission
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'A un numéro de série' ne peut pas être 'Oui' pour un article non-stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'A un numéro de série' ne peut pas être 'Oui' pour un article non-stock
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La participation ne peut pas être marqué pour les dates à venir
 DocType: Pricing Rule,Pricing Rule Help,Prix règle Aide
 DocType: Purchase Taxes and Charges,Account Head,Responsable du compte
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Mettre à jour les coûts supplémentaires pour calculer le coût au débarquement des articles
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,local
 DocType: Stock Entry,Total Value Difference (Out - In),Valeur totale Différence (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Row {0}: Taux de change est obligatoire
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Taux de change est obligatoire
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utilisateur non défini pour les employés {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Grenaillage
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De la revendication de garantie
@@ -3618,15 +3636,17 @@ DocType: Buying Settings,Naming Series,Nommer Série
 DocType: Leave Block List,Leave Block List Name,Laisser Nom de la liste de blocage
 DocType: User,Enabled,Activé
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,payable
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},"Statut du document de transition {0} {1}, n'est pas autorisé"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Statut du document de transition {0} {1}, n'est pas autorisé"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Abonnés à l'importation
 DocType: Target Detail,Target Qty,Qté cible
 DocType: Attendance,Present,Présent
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Pas de clients ou fournisseurs Comptes trouvé
 DocType: Notification Control,Sales Invoice Message,Message facture de vente
 DocType: Authorization Rule,Based On,Basé sur
-,Ordered Qty, Quantité commandée
+DocType: Sales Order Item,Ordered Qty, Quantité commandée
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Point {0} est désactivé
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Jusqu'à
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Période De et période dates obligatoires pour récurrents {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activité de projet / tâche.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Générer les bulletins de salaire
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} n'est pas un identifiant de courriel valide
@@ -3666,7 +3686,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Téléchargez Participation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM et fabrication Quantité sont nécessaires
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamme de vieillissement 2
-DocType: Journal Entry Account,Amount,Montant
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Montant
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Rivetage
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM remplacé
 ,Sales Analytics,Analytics Sales
@@ -3693,7 +3713,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Date prévu ne peut pas être avant Matériel Date de la demande
 DocType: Contact Us Settings,City,Ville
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Usinage par ultrasons
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Erreur: Pas un identifiant valide?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Erreur: Pas un identifiant valide?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Point {0} doit être un élément de ventes
 DocType: Naming Series,Update Series Number,Numéro de série mise à jour
 DocType: Account,Equity,Opération {0} est répété dans le tableau des opérations
@@ -3708,7 +3728,7 @@ DocType: Purchase Taxes and Charges,Actual,Réel
 DocType: Authorization Rule,Customerwise Discount,Remise Customerwise
 DocType: Purchase Invoice,Against Expense Account,Sur le compte des dépenses
 DocType: Production Order,Production Order,Ordre de fabrication
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Les demandes matérielles {0} créé
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Les demandes matérielles {0} créé
 DocType: Quotation Item,Against Docname,Contre docName
 DocType: SMS Center,All Employee (Active),Tous les employés (Actif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,voir maintenant
@@ -3716,14 +3736,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Raw Material Coût
 DocType: Item,Re-Order Level,Re-commande de niveau
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduisez les articles et qté planifiée pour laquelle vous voulez soulever ordres de fabrication ou de télécharger des matières premières pour l'analyse.
-sites/assets/js/list.min.js +174,Gantt Chart,Diagramme de Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagramme de Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,À temps partiel
 DocType: Employee,Applicable Holiday List,Liste de vacances applicable
 DocType: Employee,Cheque,Chèque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Mise à jour de la série
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Bulletin de salaire de l'employé {0} déjà créé pour ce mois-ci
 DocType: Item,Serial Number Series,Série Série Nombre
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Facteur de conversion ne peut pas être dans les fractions
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Facteur de conversion ne peut pas être dans les fractions
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,D'abord répondu le
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croix Listing des articles dans plusieurs groupes
@@ -3738,7 +3758,7 @@ DocType: Attendance,Attendance,Présence
 DocType: Page,No,Aucun
 DocType: BOM,Materials,Matériels
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si ce n'est pas cochée, la liste devra être ajouté à chaque département où il doit être appliqué."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Date d'affichage et l'affichage est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Date d'affichage et l'affichage est obligatoire
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Modèle d'impôt pour l'achat d' opérations .
 ,Item Prices,Prix ​​du lot
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dans les mots seront visibles une fois que vous enregistrez le bon de commande.
@@ -3758,9 +3778,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Dépenses administratives
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,consultant
 DocType: Customer Group,Parent Customer Group,Groupe Client parent
-sites/assets/js/erpnext.min.js +50,Change,Changement
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Changement
 DocType: Purchase Invoice,Contact Email,Contact Courriel
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Poster n'existe pas . S'il vous plaît ajoutez poste !
 DocType: Appraisal Goal,Score Earned,Score gagné
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","par exemple "" Mon Company LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Période De Préavis
@@ -3770,12 +3789,13 @@ DocType: Packing Slip,Gross Weight UOM,Emballage Poids brut
 DocType: Email Digest,Receivables / Payables,Créances / dettes
 DocType: Delivery Note Item,Against Sales Invoice,Sur la facture de vente
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampillage
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Compte créditeur
 DocType: Landed Cost Item,Landed Cost Item,Article coût en magasin
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Afficher les valeurs nulles
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantité de produit obtenue après fabrication / reconditionnement des quantités données de matières premières
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte à recevoir / payer
 DocType: Delivery Note Item,Against Sales Order Item,Sur l'objet de la commande
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},S'il vous plaît spécifier Attribut Valeur pour l'attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},S'il vous plaît spécifier Attribut Valeur pour l'attribut {0}
 DocType: Item,Default Warehouse,Entrepôt de défaut
 DocType: Task,Actual End Date (via Time Logs),Date réelle de fin (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget ne peut pas être attribué à l'encontre du compte de groupe {0}
@@ -3789,7 +3809,7 @@ DocType: Issue,Support Team,Équipe de soutien
 DocType: Appraisal,Total Score (Out of 5),Score total (sur 5)
 DocType: Contact Us Settings,State,État
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Demande d'indemnité totale (via Remboursement des dépenses)
 DocType: User,Gender,Sexe
 DocType: Journal Entry,Debit Note,Note de débit
@@ -3805,9 +3825,8 @@ DocType: Lead,Blog Subscriber,Abonné Blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Créer des règles pour restreindre les transactions fondées sur des valeurs .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si elle est cochée, aucune totale. des jours de travail comprennent vacances, ce qui réduira la valeur de salaire par jour"
 DocType: Purchase Invoice,Total Advance,Advance totale
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Unstop Demande de Matériel
 DocType: Workflow State,User,Utilisateurs
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Traitement de la paie
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Traitement de la paie
 DocType: Opportunity Item,Basic Rate,Taux de base
 DocType: GL Entry,Credit Amount,Le montant du crédit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Définir comme perdu
@@ -3815,7 +3834,7 @@ DocType: Customer,Credit Days Based On,Jours de crédit basée sur
 DocType: Tax Rule,Tax Rule,Règle d'impôt
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Maintenir même taux long cycle de vente
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifiez les journaux de temps en dehors des heures de travail Workstation.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} a déjà été soumis
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} a déjà été soumis
 ,Items To Be Requested,Articles à demander
 DocType: Purchase Order,Get Last Purchase Rate,Obtenez Purchase Rate Dernière
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Taux de facturation basé sur le type d'activité (par heure)
@@ -3824,6 +3843,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",Remarque: Il n'est pas assez solde de congés d'autorisation de type {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),utilisation des fonds (Actifs)
 DocType: Production Planning Tool,Filter based on item,Filtre basé sur l'article
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Compte de débit
 DocType: Fiscal Year,Year Start Date,Date de début Année
 DocType: Attendance,Employee Name,Nom de l'employé
 DocType: Sales Invoice,Rounded Total (Company Currency),Totale arrondie (Société Monnaie)
@@ -3835,14 +3855,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Obturation
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Avantages du personnel
 DocType: Sales Invoice,Is POS,Est-POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Emballé quantité doit être égale à la quantité pour l'article {0} à la ligne {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Emballé quantité doit être égale à la quantité pour l'article {0} à la ligne {1}
 DocType: Production Order,Manufactured Qty,Quantité fabriquée
 DocType: Purchase Receipt Item,Accepted Quantity,Quantité acceptés
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne existe pas
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factures émises aux clients.
 DocType: DocField,Default,Par défaut
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Référence du projet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Non {0}: montant ne peut être supérieur à l'attente Montant contre remboursement de frais {1}. Montant attente est {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Non {0}: montant ne peut être supérieur à l'attente Montant contre remboursement de frais {1}. Montant attente est {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnés ajoutés
 DocType: Maintenance Schedule,Schedule,Calendrier
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Définir budget pour ce centre de coûts. Pour définir l'action budgétaire, voir «Liste des entreprises»"
@@ -3850,7 +3870,7 @@ DocType: Account,Parent Account,Compte Parent
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Moyeu
 DocType: GL Entry,Voucher Type,Type de Bon
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Liste de prix introuvable ou desactivé
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Liste de prix introuvable ou desactivé
 DocType: Expense Claim,Approved,Approuvé
 DocType: Pricing Rule,Price,Profil de l'organisation
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',S'il vous plaît entrer unité de mesure par défaut
@@ -3859,23 +3879,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,éducation
 DocType: Selling Settings,Campaign Naming By,Campagne Naming par
 DocType: Employee,Current Address Is,Adresse actuelle
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Optionnel. Définit la devise par défaut de l'entreprise, si non spécifié."
 DocType: Address,Office,Bureau
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Rapports standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Les écritures comptables.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,S'il vous plaît sélectionnez dossier de l'employé en premier.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Fête / compte ne correspond pas à {1} / {2} en {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantité à partir de l'entrepôt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,S'il vous plaît sélectionnez dossier de l'employé en premier.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Fête / compte ne correspond pas à {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Pour créer un compte d'impôt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,S'il vous plaît entrer Compte de dépenses
 DocType: Account,Stock,Stock
 DocType: Employee,Current Address,Adresse actuelle
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article est une variante d'un autre élément, puis la description, image, prix, taxes etc sera fixé à partir du modèle à moins explicitement spécifiée"
 DocType: Serial No,Purchase / Manufacture Details,Achat / Fabrication Détails
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch Inventaire
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventaire
 DocType: Employee,Contract End Date,Date de fin du contrat
 DocType: Sales Order,Track this Sales Order against any Project,Suivre ce décret ventes contre tout projet
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tirez les ordres de vente (en attendant de livrer) sur la base des critères ci-dessus
 DocType: DocShare,Document Type,Type de document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,De Fournisseur offre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,De Fournisseur offre
 DocType: Deduction Type,Deduction Type,Type de déduction
 DocType: Attendance,Half Day,Demi-journée
 DocType: Pricing Rule,Min Qty,Compte {0} est gelé
@@ -3886,20 +3908,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pour Quantité (Fabriqué Quantité) est obligatoire
 DocType: Stock Entry,Default Target Warehouse,Cible d'entrepôt par défaut
 DocType: Purchase Invoice,Net Total (Company Currency),Total net (Société Monnaie)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type et le Parti est applicable uniquement contre débiteurs / Comptes fournisseurs
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type et le Parti est applicable uniquement contre débiteurs / Comptes fournisseurs
 DocType: Notification Control,Purchase Receipt Message,Achat message de réception
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Nombre de feuilles alloués sont plus que la durée
 DocType: Production Order,Actual Start Date,Date de début réelle
-DocType: Sales Order,% of materials delivered against this Sales Order,% Des matériaux livrés sur cette ordonnance de vente
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Gestion des mouvements du stock.
+DocType: Sales Order,% of materials delivered against this Sales Order,% De matériaux livrés sur cette Commande vente
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gestion des mouvements du stock.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Bulletin Liste abonné
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortaiseuse
 DocType: Email Account,Service,service
 DocType: Hub Settings,Hub Settings,Paramètres de Hub
 DocType: Project,Gross Margin %,Marge brute%
 DocType: BOM,With Operations,Avec des opérations
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Les écritures comptables ont déjà été réalisés en monnaie {0} pour la société {1}. S'il vous plaît sélectionner un compte à recevoir ou à payer avec de la monnaie {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Les écritures comptables ont déjà été réalisés en monnaie {0} pour la société {1}. S'il vous plaît sélectionner un compte à recevoir ou à payer avec de la monnaie {0}.
 ,Monthly Salary Register,S'enregistrer Salaire mensuel
-apps/frappe/frappe/website/template.py +123,Next,Suivant
+apps/frappe/frappe/website/template.py +140,Next,Suivant
 DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
 DocType: BOM Operation,BOM Operation,Opération BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Électrolytique
@@ -3930,6 +3953,7 @@ DocType: Purchase Invoice,Next Date,Date suivante
 DocType: Employee Education,Major/Optional Subjects,Sujets principaux / en option
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Se il vous plaît entrer Taxes et frais
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Usinage
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ici vous pouvez conserver les détails de famille comme nom et la profession des parents, le conjoint et les enfants"
 DocType: Hub Settings,Seller Name,Vendeur Nom
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impôts et Charges déduites (Société Monnaie)
@@ -3956,29 +3980,29 @@ DocType: Purchase Order,To Receive and Bill,Pour recevoir et le projet de loi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,créateur
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termes et Conditions modèle
 DocType: Serial No,Delivery Details,Détails de la livraison
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
 DocType: Item,Automatically create Material Request if quantity falls below this level,Créer automatiquement Demande de Matériel si la quantité tombe en dessous de ce niveau
 ,Item-wise Purchase Register,S'enregistrer Achat point-sage
 DocType: Batch,Expiry Date,Date d'expiration
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pour définir le niveau de réapprovisionnement, item doit être un objet d'achat ou de fabrication de l'article"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pour définir le niveau de réapprovisionnement, item doit être un objet d'achat ou de fabrication de l'article"
 ,Supplier Addresses and Contacts,Adresses des fournisseurs et contacts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,S'il vous plaît sélectionnez d'abord Catégorie
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projet de master.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne plus afficher n'importe quel symbole comme $ etc à côté de devises.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Demi-journée)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Demi-journée)
 DocType: Supplier,Credit Days,Jours de crédit
 DocType: Leave Type,Is Carry Forward,Est-Report
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obtenir des éléments de nomenclature
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtenir des éléments de nomenclature
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Diriger jours Temps
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type et le Parti est nécessaire pour recevoir / payer compte {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type et le Parti est nécessaire pour recevoir / payer compte {1}
 DocType: Dropbox Backup,Send Notifications To,Envoyer des notifications aux
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Réf date
 DocType: Employee,Reason for Leaving,Raison du départ
 DocType: Expense Claim Detail,Sanctioned Amount,Montant sanctionné
 DocType: GL Entry,Is Opening,Est l'ouverture
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débit d'entrée ne peut pas être lié à un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Compte {0} n'existe pas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débit d'entrée ne peut pas être lié à un {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Compte {0} n'existe pas
 DocType: Account,Cash,Espèces
 DocType: Employee,Short biography for website and other publications.,Courte biographie pour le site Web et d'autres publications.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},« Date de début prévue » ne peut être supérieur à ' Date de fin prévue '
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index 943dd0bd38..107720c19e 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,שכר Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","בחר בחתך חודשי, אם אתה רוצה לעקוב אחר המבוסס על עונתיות."
 DocType: Employee,Divorced,גרוש
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,אזהרה: פריט אותו הוזן מספר פעמים.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,אזהרה: פריט אותו הוזן מספר פעמים.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,פריטים כבר סונכרנו
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,הרשה פריט שיתווסף מספר פעמים בעסקה
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,לבטל חומר בקר {0} לפני ביטול תביעת אחריות זו
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,דחיסה בתוספת sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},מטבע נדרש למחיר המחירון {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* יחושב בעסקה.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,מבקשת חומר
+DocType: Purchase Order,Customer Contact,צור קשר עם לקוחות
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,מבקשת חומר
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} עץ
 DocType: Job Applicant,Job Applicant,עבודת מבקש
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,אין יותר תוצאות.
@@ -37,7 +38,7 @@ DocType: Purchase Order,% Billed,% שחויבו
 DocType: Sales Invoice,Customer Name,שם לקוח
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","כל התחומים הקשורים ליצוא כמו מטבע, שער המרה, סך יצוא, וכו 'הסכום כולל יצוא זמינים בתעודת משלוח, POS, הצעת המחיר, מכירות חשבונית, להזמין מכירות וכו'"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ראשים (או קבוצות) נגד שרישומים חשבונאיים נעשים ומתוחזקים יתרות.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),יוצא מן הכלל עבור {0} אינם יכולים להיות פחות מאפס ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),יוצא מן הכלל עבור {0} אינם יכולים להיות פחות מאפס ({1})
 DocType: Manufacturing Settings,Default 10 mins,ברירת מחדל 10 דקות
 DocType: Leave Type,Leave Type Name,השאר סוג שם
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,סדרת עדכון בהצלחה
@@ -48,9 +49,8 @@ DocType: Item Price,Multiple Item prices.,מחירי פריט מרובים.
 DocType: SMS Center,All Supplier Contact,כל לתקשר עם הספק
 DocType: Quality Inspection Reading,Parameter,פרמטר
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,תאריך הסיום צפוי לא יכול להיות פחות מתאריך ההתחלה צפויה
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,האם באמת רוצה מגופת הזמנת ייצור:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# השורה {0}: שיעור חייב להיות זהה {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,החדש Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,החדש Leave Application
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,המחאה בנקאית
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. כדי לשמור את קוד פריט החכם לקוחות ולגרום להם לחיפוש על סמך שימוש הקוד שלהם באפשרות זו
 DocType: Mode of Payment Account,Mode of Payment Account,מצב של חשבון תשלומים
@@ -58,24 +58,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,גרסאות 
 DocType: Sales Invoice Item,Quantity,כמות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),הלוואות (התחייבויות)
 DocType: Employee Education,Year of Passing,שנה של פטירה
-sites/assets/js/erpnext.min.js +27,In Stock,במלאי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,יכול רק לבצע את התשלום נגד להזמין מכירות סרק."
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,במלאי
 DocType: Designation,Designation,ייעוד
 DocType: Production Plan Item,Production Plan Item,פריט תכנית ייצור
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},משתמש {0} כבר הוקצה לעובדי {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,פרופיל קופה חדש
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,בריאות
 DocType: Purchase Invoice,Monthly,חודשי
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,חשבונית
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),עיכוב בתשלום (ימים)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,חשבונית
 DocType: Maintenance Schedule Item,Periodicity,תְקוּפָתִיוּת
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,"כתובת דוא""ל"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ביטחון
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ציון (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,# השורה {0}:
 DocType: Delivery Note,Vehicle No,רכב לא
-sites/assets/js/erpnext.min.js +55,Please select Price List,אנא בחר מחירון
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,אנא בחר מחירון
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,עיבוד עץ
 DocType: Production Order Operation,Work In Progress,עבודה בתהליך
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,הדפסת 3D
@@ -98,13 +98,14 @@ DocType: Packed Item,Parent Detail docname,docname פרט הורה
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,קילוגרם
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,פתיחה לעבודה.
 DocType: Item Attribute,Increment,תוספת
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,בחר מחסן ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,פרסום
 DocType: Employee,Married,נשוי
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,מכולת
 DocType: Quality Inspection Reading,Reading 1,קריאת 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,הפוך בנק כניסה
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,הפוך בנק כניסה
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,קרנות פנסיה
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,מחסן הוא חובה אם סוג החשבון הוא מחסן
 DocType: SMS Center,All Sales Person,כל איש המכירות
@@ -117,7 +118,7 @@ DocType: POS Profile,Write Off Cost Center,לכתוב את מרכז עלות
 DocType: Warehouse,Warehouse Detail,פרט מחסן
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},מסגרת אשראי נחצתה ללקוחות {0} {1} / {2}
 DocType: Tax Rule,Tax Type,סוג המס
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},אין לך ההרשאה להוסיף או עדכון ערכים לפני {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},אין לך ההרשאה להוסיף או עדכון ערכים לפני {0}
 DocType: Item,Item Image (if not slideshow),תמונת פריט (אם לא מצגת)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,לקוחות קיימים עם אותו שם
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(שעת דרג / 60) * בפועל מבצע זמן
@@ -127,7 +128,7 @@ DocType: Blog Post,Guest,אורח
 DocType: Quality Inspection,Get Specification Details,קבל מפרט פרטים
 DocType: Lead,Interested,מעוניין
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ביל החומר
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,פתיחה
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,פתיחה
 DocType: Item,Copy From Item Group,העתק מ קבוצת פריט
 DocType: Journal Entry,Opening Entry,כניסת פתיחה
 apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} הוא חובה
@@ -136,7 +137,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,חקירה מוצר
 DocType: Standard Reply,Owner,בעלים
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,אנא ראשון להיכנס החברה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,אנא בחר החברה ראשונה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,אנא בחר החברה ראשונה
 DocType: Employee Education,Under Graduate,תחת בוגר
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,יעד ב
 DocType: BOM,Total Cost,עלות כוללת
@@ -154,6 +155,7 @@ DocType: Naming Series,Prefix,קידומת
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,מתכלה
 DocType: Upload Attendance,Import Log,יבוא יומן
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,שלח
+DocType: Sales Invoice Item,Delivered By Supplier,נמסר על ידי ספק
 DocType: SMS Center,All Contact,כל הקשר
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,משכורת שנתית
 DocType: Period Closing Voucher,Closing Fiscal Year,סגירת שנת כספים
@@ -163,14 +165,14 @@ DocType: Journal Entry,Contra Entry,קונטרה כניסה
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,יומני זמן השידור
 DocType: Journal Entry Account,Credit in Company Currency,אשראי במטבע החברה
 DocType: Delivery Note,Installation Status,מצב התקנה
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ מקובל שנדחו הכמות חייבת להיות שווה לכמות שהתקבל עבור פריט {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ מקובל שנדחו הכמות חייבת להיות שווה לכמות שהתקבל עבור פריט {0}
 DocType: Item,Supply Raw Materials for Purchase,חומרי גלם לאספקת רכישה
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,פריט {0} חייב להיות פריט רכישה
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","הורד את התבנית, למלא נתונים מתאימים ולצרף את הקובץ הנוכחי. כל שילוב התאריכים ועובדים בתקופה שנבחרה יבוא בתבנית, עם רישומי נוכחות קיימים"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,פריט {0} אינו פעיל או שהגיע הסוף של חיים
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,פריט {0} אינו פעיל או שהגיע הסוף של חיים
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,יעודכן לאחר חשבונית מכירות הוגשה.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,הגדרות עבור מודול HR
 DocType: SMS Center,SMS Center,SMS מרכז
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,מיישר
@@ -195,11 +197,10 @@ DocType: SMS Settings,Enter url parameter for message,הזן פרמטר url לה
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,כללים ליישום תמחור והנחה.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},קונפליקטים התחבר הפעם עם {0} עבור {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,מחיר המחירון חייב להיות ישים עבור קנייה או מכירה
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},תאריך התקנה לא יכול להיות לפני מועד אספקה ​​לפריט {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},תאריך התקנה לא יכול להיות לפני מועד אספקה ​​לפריט {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),הנחה על מחיר מחירון שיעור (%)
-sites/assets/js/form.min.js +279,Start,התחל
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,התחל
 DocType: User,First Name,שם פרטים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,ההתקנה שלך היא מלאה. מרענן.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ליהוק מלא עובש
 DocType: Offer Letter,Select Terms and Conditions,תנאים והגבלות בחרו
 DocType: Production Planning Tool,Sales Orders,הזמנות ומכירות
@@ -225,6 +226,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,נגד פריט מכירות חשבונית
 ,Production Orders in Progress,הזמנות ייצור בהתקדמות
 DocType: Lead,Address & Contact,כתובת ולתקשר
+DocType: Leave Allocation,Add unused leaves from previous allocations,להוסיף עלים שאינם בשימוש מהקצאות קודמות
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},הבא חוזר {0} ייווצר על {1}
 DocType: Newsletter List,Total Subscribers,סה"כ מנויים
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,שם איש קשר
@@ -232,18 +234,18 @@ DocType: Production Plan Item,SO Pending Qty,SO המתנת כמות
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,יוצר תלוש משכורת לקריטריונים שהוזכרו לעיל.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,בקש לרכישה.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,דיור זוגי
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,להקלה על התאריך חייבת להיות גדולה מ תאריך ההצטרפות
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,עלים בכל שנה
 DocType: Time Log,Will be updated when batched.,יעודכן כאשר לכלך.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,שורת {0}: בדוק את 'האם Advance' נגד חשבון {1} אם זה כניסה מראש.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,שורת {0}: בדוק את 'האם Advance' נגד חשבון {1} אם זה כניסה מראש.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},מחסן {0} אינו שייך לחברת {1}
 DocType: Bulk Email,Message,הודעה
 DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox מפתח הגישה
 DocType: Payment Tool,Reference No,אסמכתא
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,השאר חסימה
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
 DocType: Stock Entry,Sales Invoice No,מכירות חשבונית לא
@@ -255,8 +257,8 @@ DocType: Item,Minimum Order Qty,להזמין כמות מינימום
 DocType: Pricing Rule,Supplier Type,סוג ספק
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,פריט {0} יבוטל
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,בקשת חומר
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,בקשת חומר
 DocType: Bank Reconciliation,Update Clearance Date,תאריך שחרור עדכון
 DocType: Item,Purchase Details,פרטי רכישה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה "חומרי גלם מסופקת 'בהזמנת רכש {1}
@@ -272,7 +274,7 @@ DocType: Notification Control,Notification Control,בקרת הודעה
 DocType: Lead,Suggestions,הצעות
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,תקציבי סט פריט קבוצה חכמה על טריטוריה זו. אתה יכול לכלול גם עונתיות על ידי הגדרת ההפצה.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},נא להזין את קבוצת חשבון הורה למחסן {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},תשלום כנגד {0} {1} לא יכול להיות גדול מהסכום מצטיין {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},תשלום כנגד {0} {1} לא יכול להיות גדול מהסכום מצטיין {2}
 DocType: Supplier,Address HTML,כתובת HTML
 DocType: Lead,Mobile No.,מס 'נייד
 DocType: Maintenance Schedule,Generate Schedule,צור לוח זמנים
@@ -298,10 +300,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,החדש במלאי של אונ
 DocType: Period Closing Voucher,Closing Account Head,סגירת חשבון ראש
 DocType: Employee,External Work History,חיצוני היסטוריה עבודה
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,שגיאת הפניה מעגלית
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,האם אתה באמת רוצה להפסיק
 DocType: Communication,Closed,סגור
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,במילים (יצוא) יהיה גלוי לאחר שתשמרו את תעודת המשלוח.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,האם אתה בטוח שאתה רוצה להפסיק
 DocType: Lead,Industry,תעשייה
 DocType: Employee,Job Profile,פרופיל עבודה
 DocType: Newsletter,Newsletter,עלון
@@ -316,7 +316,7 @@ DocType: Sales Invoice Item,Delivery Note,תעודת משלוח
 DocType: Dropbox Backup,Allow Dropbox Access,אפשר גישה Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,הגדרת מסים
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,סיכום השבוע הזה ופעילויות תלויות ועומדות
 DocType: Workstation,Rent Cost,עלות השכרה
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,אנא בחר חודש והשנה
@@ -333,10 +333,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,קצב שבו מטבע לקוחות מומר למטבע הבסיס של הלקוח
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","זמין בBOM, תעודת משלוח, חשבוניות רכש, ייצור להזמין, הזמנת רכש, קבלת רכישה, מכירות חשבונית, הזמנת מכירות, מלאי כניסה, גליון"
 DocType: Item Tax,Tax Rate,שיעור מס
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,פריט בחר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,פריט בחר
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","פריט: {0} הצליח אצווה-חכם, לא ניתן ליישב באמצעות מניות \ פיוס, במקום להשתמש במלאי כניסה"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},# השורה {0}: אצווה לא חייב להיות זהה {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,המרת שאינה קבוצה
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,קבלת רכישה יש להגיש
@@ -353,7 +353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,הוראות
 DocType: Quality Inspection,Inspected By,נבדק על ידי
 DocType: Maintenance Visit,Maintenance Type,סוג התחזוקה
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},מספר סידורי {0} אינו שייך לתעודת משלוח {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},מספר סידורי {0} אינו שייך לתעודת משלוח {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,פריט איכות פיקוח פרמטר
 DocType: Leave Application,Leave Approver Name,השאר שם מאשר
 ,Schedule Date,תאריך לוח זמנים
@@ -372,7 +372,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,רכישת הרשמה
 DocType: Landed Cost Item,Applicable Charges,חיובים החלים
 DocType: Workstation,Consumable Cost,עלות מתכלה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
 DocType: Purchase Receipt,Vehicle Date,תאריך רכב
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,רפואי
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,סיבה לאיבוד
@@ -393,6 +393,7 @@ DocType: Delivery Note,% Installed,% מותקן
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,אנא ראשון להזין את שם חברה
 DocType: BOM,Item Desription,Desription פריט
 DocType: Purchase Invoice,Supplier Name,שם ספק
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,לקרוא את מדריך ERPNext
 DocType: Account,Is Group,קבוצה
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,הגדר סידורי מס באופן אוטומטי על בסיס FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ספק בדוק חשבונית מספר הייחוד
@@ -408,13 +409,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,מנהל המכי
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,הגדרות גלובליות עבור כל תהליכי הייצור.
 DocType: Accounts Settings,Accounts Frozen Upto,חשבונות קפואים Upto
 DocType: SMS Log,Sent On,נשלח ב
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
 DocType: Sales Order,Not Applicable,לא ישים
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,אב חג.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,דפוס פגז
 DocType: Material Request Item,Required Date,תאריך הנדרש
 DocType: Delivery Note,Billing Address,כתובת לחיוב
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,נא להזין את קוד פריט.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,נא להזין את קוד פריט.
 DocType: BOM,Costing,תמחיר
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","אם מסומן, את סכום המס ייחשב כפי שכבר כלול במחיר ההדפסה / סכום ההדפסה"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,"סה""כ כמות"
@@ -437,31 +438,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),זמן בין
 DocType: Customer,Buyer of Goods and Services.,קונה של מוצרים ושירותים.
 DocType: Journal Entry,Accounts Payable,חשבונות לתשלום
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,להוסיף מנויים
-sites/assets/js/erpnext.min.js +5,""" does not exists","""לא קיים"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""לא קיים"
 DocType: Pricing Rule,Valid Upto,Upto חוקי
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,רשימה כמה מהלקוחות שלך. הם יכולים להיות ארגונים או יחידים.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,הכנסה ישירה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","לא יכול לסנן על פי חשבון, אם מקובצים לפי חשבון"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,קצין מנהלי
 DocType: Payment Tool,Received Or Paid,התקבל או שולם
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,אנא בחר חברה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,אנא בחר חברה
 DocType: Stock Entry,Difference Account,חשבון הבדל
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,לא יכולה לסגור משימה כמשימה התלויה {0} אינה סגורה.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
 DocType: Production Order,Additional Operating Cost,עלות הפעלה נוספות
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,קוסמטיקה
 DocType: DocField,Type,סוג
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
 DocType: Communication,Subject,נושא
 DocType: Shipping Rule,Net Weight,משקל נטו
 DocType: Employee,Emergency Phone,טל 'חירום
 ,Serial No Warranty Expiry,Serial No תפוגה אחריות
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,האם אתה באמת רוצה להפסיק בקשת חומר זה?
 DocType: Sales Order,To Deliver,כדי לספק
 DocType: Purchase Invoice Item,Item,פריט
 DocType: Journal Entry,Difference (Dr - Cr),"הבדל (ד""ר - Cr)"
 DocType: Account,Profit and Loss,רווח והפסד
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,קבלנות משנה ניהול
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,קבלנות משנה ניהול
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,החדש של אוני 'מישגן לא חייבים להיות של מספר שלם סוג
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,ריהוט ומחברים
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,קצב שבו רשימת מחיר המטבע מומר למטבע הבסיס של החברה
@@ -481,7 +481,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,להוסיף מסים / 
 DocType: Purchase Invoice,Supplier Invoice No,ספק חשבונית לא
 DocType: Territory,For reference,לעיון
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","לא יכול למחוק את מספר סידורי {0}, כפי שהוא משמש בעסקות מניות"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),סגירה (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),סגירה (Cr)
 DocType: Serial No,Warranty Period (Days),תקופת אחריות (ימים)
 DocType: Installation Note Item,Installation Note Item,פריט הערה התקנה
 ,Pending Qty,בהמתנה כמות
@@ -513,8 +513,9 @@ DocType: Sales Order,Billing and Delivery Status,סטטוס חיוב ומשלו
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,חזרו על לקוחות
 DocType: Leave Control Panel,Allocate,להקצות
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,קודם
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,חזור מכירות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,חזור מכירות
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,בחר הזמנות ומכירות ממנו ברצונך ליצור הזמנות ייצור.
+DocType: Item,Delivered by Supplier (Drop Ship),נמסר על ידי ספק (זרוק משלוח)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,רכיבי שכר.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,מסד הנתונים של לקוחות פוטנציאליים.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,מאגר מידע על לקוחות.
@@ -525,7 +526,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,מתגלגל
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,מחסן לוגי שנגדו מרשמו רשומות מלאי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},התייחסות לא & תאריך הפניה נדרש עבור {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},התייחסות לא & תאריך הפניה נדרש עבור {0}
 DocType: Event,Wednesday,יום רביעי
 DocType: Sales Invoice,Customer's Vendor,הספק של הלקוח
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ייצור להזמין מנדטורי
@@ -557,8 +558,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,מקלט פרמטר
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""בהתבסס על 'ו' קבוצה על ידי 'אינו יכול להיות זהה"
 DocType: Sales Person,Sales Person Targets,מטרות איש מכירות
-sites/assets/js/form.min.js +271,To,ל
-apps/frappe/frappe/templates/base.html +143,Please enter email address,אנא הכנס את כתובת דואר אלקטרוני
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ל
+apps/frappe/frappe/templates/base.html +145,Please enter email address,אנא הכנס את כתובת דואר אלקטרוני
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,צינור סוף יצירה
 DocType: Production Order Operation,In minutes,בדקות
 DocType: Issue,Resolution Date,תאריך החלטה
@@ -575,7 +576,7 @@ DocType: Activity Cost,Projects User,משתמש פרויקטים
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,נצרך
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} לא נמצא בטבלת פרטי החשבונית
 DocType: Company,Round Off Cost Center,לעגל את מרכז עלות
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,בקרו תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,בקרו תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
 DocType: Material Request,Material Transfer,העברת חומר
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),"פתיחה (ד""ר)"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},חותמת זמן פרסום חייבת להיות אחרי {0}
@@ -583,9 +584,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,הגדרות
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,מסים עלות נחתו וחיובים
 DocType: Production Order Operation,Actual Start Time,בפועל זמן התחלה
 DocType: BOM Operation,Operation Time,מבצע זמן
-sites/assets/js/list.min.js +5,More,יותר
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,יותר
 DocType: Pricing Rule,Sales Manager,מנהל מכירות
-sites/assets/js/desk.min.js +7673,Rename,שינוי שם
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,שינוי שם
 DocType: Journal Entry,Write Off Amount,לכתוב את הסכום
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,כיפוף
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,לאפשר למשתמש
@@ -601,13 +602,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,גז ישר
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,כדי לעקוב אחר פריט במכירות ובמסמכי רכישה מבוססת על nos הסידורי שלהם. זה גם יכול להשתמש כדי לעקוב אחר פרטי אחריות של המוצר.
 DocType: Purchase Receipt Item Supplied,Current Stock,המניה נוכחית
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,מחסן שנדחו הוא חובה נגד פריט regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,מחסן שנדחו הוא חובה נגד פריט regected
 DocType: Account,Expenses Included In Valuation,הוצאות שנכללו בהערכת שווי
 DocType: Employee,Provide email id registered in company,"לספק id הדוא""ל רשום בחברה"
 DocType: Hub Settings,Seller City,מוכר עיר
 DocType: Email Digest,Next email will be sent on:,"הדוא""ל הבא יישלח על:"
 DocType: Offer Letter Term,Offer Letter Term,להציע מכתב לטווח
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,יש פריט גרסאות.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,פריט {0} לא נמצא
 DocType: Bin,Stock Value,מניית ערך
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,סוג העץ
@@ -622,11 +623,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ברוכים הבאים
 DocType: Journal Entry,Credit Card Entry,כניסת כרטיס אשראי
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,נושא משימה
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,מוצרים שהתקבלו מספקים.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,מוצרים שהתקבלו מספקים.
 DocType: Communication,Open,פתוח
 DocType: Lead,Campaign Name,שם מסע פרסום
 ,Reserved,שמורות
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,האם אתה באמת רוצה מגופה
 DocType: Purchase Order,Supply Raw Materials,חומרי גלם אספקה
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,התאריך שבו החשבונית הבאה תופק. הוא נוצר על שליחה.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,נכסים שוטפים
@@ -642,7 +642,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,להזמין ללא הרכישה של הלקוח
 DocType: Employee,Cell Number,מספר סלולארי
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,איבדתי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,אתה לא יכול להיכנס לשובר נוכחי ב'נגד תנועת יומן 'טור
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,אתה לא יכול להיכנס לשובר נוכחי ב'נגד תנועת יומן 'טור
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,אנרגיה
 DocType: Opportunity,Opportunity From,הזדמנות מ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,הצהרת משכורת חודשית.
@@ -691,7 +691,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,אחריות
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,סכום גושפנקא לא יכול להיות גדול מסכום תביעה בשורה {0}.
 DocType: Company,Default Cost of Goods Sold Account,עלות ברירת מחדל של חשבון מכר
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,מחיר המחירון לא נבחר
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,מחיר המחירון לא נבחר
 DocType: Employee,Family Background,רקע משפחתי
 DocType: Process Payroll,Send Email,שלח אי-מייל
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,אין אישור
@@ -702,7 +702,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,מס
 DocType: Item,Items with higher weightage will be shown higher,פריטים עם weightage גבוה יותר תוכלו לראות גבוהים יותר
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,פרט בנק פיוס
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,חשבוניות שלי
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,אף עובדים מצא
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,אף עובדים מצא
 DocType: Purchase Order,Stopped,נעצר
 DocType: Item,If subcontracted to a vendor,אם קבלן לספקים
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,בחר BOM להתחיל
@@ -711,7 +711,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,העלה
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,שלח עכשיו
 ,Support Analytics,Analytics תמיכה
 DocType: Item,Website Warehouse,מחסן אתר
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,האם אתה באמת רוצה להפסיק הזמנת ייצור:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","היום בחודש שבו חשבונית אוטומטית תיווצר למשל 05, 28 וכו '"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ציון חייב להיות קטן או שווה ל 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,רשומות C-טופס
@@ -721,12 +720,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,שא
 DocType: Features Setup,"To enable ""Point of Sale"" features",כדי לאפשר "נקודת המכירה" תכונות
 DocType: Bin,Moving Average Rate,נע תעריף ממוצע
 DocType: Production Planning Tool,Select Items,פריטים בחרו
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
 DocType: Comment,Reference Name,שם התייחסות
 DocType: Maintenance Visit,Completion Status,סטטוס השלמה
 DocType: Sales Invoice Item,Target Warehouse,יעד מחסן
 DocType: Item,Allow over delivery or receipt upto this percent,לאפשר על משלוח או קבלת upto אחוזים זה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,תאריך אספקה ​​צפוי לא יכול להיות לפני תאריך הזמנת המכירות
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,תאריך אספקה ​​צפוי לא יכול להיות לפני תאריך הזמנת המכירות
 DocType: Upload Attendance,Import Attendance,נוכחות יבוא
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,בכל קבוצות הפריט
 DocType: Process Payroll,Activity Log,יומן פעילות
@@ -734,7 +733,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,באופן אוטומטי לחבר את ההודעה על הגשת עסקות.
 DocType: Production Order,Item To Manufacture,פריט לייצור
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ליהוק עובש קבוע
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,הזמנת רכש לתשלום
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} המצב הוא {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,הזמנת רכש לתשלום
 DocType: Sales Order Item,Projected Qty,כמות חזויה
 DocType: Sales Invoice,Payment Due Date,מועד תשלום
 DocType: Newsletter,Newsletter Manager,מנהל עלון
@@ -757,8 +757,8 @@ DocType: SMS Log,Requested Numbers,מספרים מבוקשים
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,הערכת ביצועים.
 DocType: Sales Invoice Item,Stock Details,מניית פרטים
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,פרויקט ערך
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,נקודת מכירה
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},לא יכול לשאת קדימה {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,נקודת מכירה
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},לא יכול לשאת קדימה {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","יתרת חשבון כבר בקרדיט, שאינך מורשה להגדרה 'יתרה חייבים להיות' כמו 'חיוב'"
 DocType: Account,Balance must be,איזון חייב להיות
 DocType: Hub Settings,Publish Pricing,פרסם תמחור
@@ -780,7 +780,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,קבלת רכישה
 ,Received Items To Be Billed,פריטים שהתקבלו לחיוב
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,פיצוץ שוחקים
-sites/assets/js/desk.min.js +3938,Ms,גב '
+DocType: Employee,Ms,גב '
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,שער חליפין של מטבע שני.
 DocType: Production Order,Plan material for sub-assemblies,חומר תכנית לתת מכלולים
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} חייב להיות פעיל
@@ -801,29 +801,31 @@ DocType: Purchase Receipt,Range,טווח
 DocType: Supplier,Default Payable Accounts,חשבונות לתשלום ברירת מחדל
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
 DocType: Features Setup,Item Barcode,ברקוד פריט
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,פריט גרסאות {0} מעודכן
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,לרכוש חשבונית מראש
 DocType: Address,Shop,חנות
 DocType: Hub Settings,Sync Now,Sync עכשיו
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},שורת {0}: כניסת אשראי לא יכולה להיות מקושרת עם {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},שורת {0}: כניסת אשראי לא יכולה להיות מקושרת עם {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,חשבון בנק / מזומנים ברירת מחדל יהיה מעודכן באופן אוטומטי בקופת חשבונית כאשר מצב זה נבחר.
 DocType: Employee,Permanent Address Is,כתובת קבע
 DocType: Production Order Operation,Operation completed for how many finished goods?,מבצע הושלם לכמה מוצרים מוגמרים?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,המותג
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,הפרשה ליתר {0} חצה לפריט {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,הפרשה ליתר {0} חצה לפריט {1}.
 DocType: Employee,Exit Interview Details,פרטי ראיון יציאה
 DocType: Item,Is Purchase Item,האם פריט הרכישה
 DocType: Journal Entry Account,Purchase Invoice,רכישת חשבוניות
 DocType: Stock Ledger Entry,Voucher Detail No,פרט שובר לא
 DocType: Stock Entry,Total Outgoing Value,"ערך יוצא סה""כ"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,פתיחת תאריך ותאריך סגירה צריכה להיות באותה שנת כספים
 DocType: Lead,Request for Information,בקשה לקבלת מידע
 DocType: Payment Tool,Paid,בתשלום
 DocType: Salary Slip,Total in words,"סה""כ במילים"
 DocType: Material Request Item,Lead Time Date,תאריך עופרת זמן
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,הוא חובה. אולי שיא המרה לא נוצר ל
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},# שורה {0}: נא לציין את מספר סידורי לפריט {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","לפריטים 'מוצרי Bundle', מחסן, מספר סידורי ויצוו לא ייחשב מהשולחן "רשימת האריזה". אם מחסן ויצוו אין הם זהים עבור כל פריטי האריזה עבור כל הפריט "מוצרים Bundle ', ניתן להזין ערכים אלה בטבלת הפריט העיקרית, ערכים יועתקו ל'אריזת רשימה' שולחן."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,משלוחים ללקוחות.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,משלוחים ללקוחות.
 DocType: Purchase Invoice Item,Purchase Order Item,לרכוש פריט להזמין
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,הכנסות עקיפות
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,סכום תשלום שנקבע = סכום מצטיין
@@ -831,13 +833,14 @@ DocType: Contact Us Settings,Address Line 1,שורת כתובת 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,שונות
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,שם חברה
 DocType: SMS Center,Total Message(s),מסר כולל (ים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,פריט בחר להעברה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,פריט בחר להעברה
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,הצגת רשימה של כל סרטי וידאו העזרה
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ראש בחר חשבון של הבנק שבו הופקד שיק.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,לאפשר למשתמש לערוך מחירון שיעור בעסקות
 DocType: Pricing Rule,Max Qty,מקס כמות
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,שורת {0}: תשלום נגד מכירות / הזמנת רכש תמיד צריך להיות מסומן כמראש
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,שורת {0}: תשלום נגד מכירות / הזמנת רכש תמיד צריך להיות מסומן כמראש
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,כימיה
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
 DocType: Process Payroll,Select Payroll Year and Month,בחר שכר שנה וחודש
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",עבור לקבוצה המתאימה (בדרך כלל יישום של קרנות> נכסים שוטפים> חשבונות בנק וליצור חשבון חדש (על ידי לחיצה על הוסף לילדים) מסוג "בנק"
 DocType: Workstation,Electricity Cost,עלות חשמל
@@ -852,7 +855,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,לב
 DocType: SMS Center,All Lead (Open),כל עופרת (הפתוח)
 DocType: Purchase Invoice,Get Advances Paid,קבלו תשלום מקדמות
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,צרף התמונה שלך
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,הפוך
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,הפוך
 DocType: Journal Entry,Total Amount in Words,סכתי-הכל סכום מילים
 DocType: Workflow State,Stop,להפסיק
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,הייתה שגיאה. סיבה סבירה אחת יכולה להיות שלא שמרת את הטופס. אנא צור קשר עם support@erpnext.com אם הבעיה נמשכת.
@@ -874,7 +877,7 @@ DocType: Packing Slip Item,Packing Slip Item,פריט Slip אריזה
 DocType: POS Profile,Cash/Bank Account,מזומנים / חשבון בנק
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
 DocType: Delivery Note,Delivery To,משלוח ל
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Planning Tool,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} אינו יכול להיות שלילי
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,הגשה
@@ -885,12 +888,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',יעודכן ר
 DocType: Project,Internal,פנימי
 DocType: Task,Urgent,דחוף
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},נא לציין מספר שורה תקפה לשורה {0} בטבלת {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,עבור לשולחן העבודה ולהתחיל להשתמש ERPNext
 DocType: Item,Manufacturer,יצרן
 DocType: Landed Cost Item,Purchase Receipt Item,פריט קבלת רכישה
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,מחסן שמורות במכירות להזמין / סיום מוצרי מחסן
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,סכום מכירה
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,יומני זמן
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,אתה המאשר ההוצאה לתקליט הזה. אנא עדכן את 'הסטטוס' ושמור
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,אתה המאשר ההוצאה לתקליט הזה. אנא עדכן את 'הסטטוס' ושמור
 DocType: Serial No,Creation Document No,יצירת מסמך לא
 DocType: Issue,Issue,נושא
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","תכונות לפריט גרסאות. למשל גודל, צבע וכו '"
@@ -905,8 +909,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,נגד
 DocType: Item,Default Selling Cost Center,מרכז עלות מכירת ברירת מחדל
 DocType: Sales Partner,Implementation Partner,שותף יישום
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},להזמין מכירות {0} הוא {1}
 DocType: Opportunity,Contact Info,יצירת קשר
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,מה שהופך את ערכי המלאי
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,מה שהופך את ערכי המלאי
 DocType: Packing Slip,Net Weight UOM,Net משקל של אוני 'מישגן
 DocType: Item,Default Supplier,ספק ברירת מחדל
 DocType: Manufacturing Settings,Over Production Allowance Percentage,מעל אחוז ההפרשה הפקה
@@ -915,7 +920,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,קבל תאריכי מנוחה שבועיים
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,תאריך סיום לא יכול להיות פחות מתאריך ההתחלה
 DocType: Sales Person,Select company name first.,שם חברה בחר ראשון.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,"ד""ר"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,"ד""ר"
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ציטוטים המתקבלים מספקים.
 DocType: Time Log Batch,updated via Time Logs,מעודכן באמצעות יומני זמן
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,גיל ממוצע
@@ -942,7 +947,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,מספרי רישום חברה לעיונך. מספרי מס וכו '
 DocType: Sales Partner,Distributor,מפיץ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,כלל משלוח סל קניות
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
 ,Ordered Items To Be Billed,פריטים שהוזמנו להיות מחויב
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,מהטווח צריך להיות פחות מטווח
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,בחר יומני זמן ושלח ליצור חשבונית מכירות חדשה.
@@ -990,7 +995,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,מס ו
 DocType: Lead,Lead,עופרת
 DocType: Email Digest,Payables,זכאי
 DocType: Account,Warehouse,מחסן
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,# השורה {0}: נדחו לא ניתן להזין כמות ברכישת חזרה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,# השורה {0}: נדחו לא ניתן להזין כמות ברכישת חזרה
 ,Purchase Order Items To Be Billed,פריטים הזמנת רכש לחיוב
 DocType: Purchase Invoice Item,Net Rate,שיעור נטו
 DocType: Purchase Invoice Item,Purchase Invoice Item,לרכוש פריט החשבונית
@@ -1005,11 +1010,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,פרטי תשלום
 DocType: Global Defaults,Current Fiscal Year,שנת כספים נוכחית
 DocType: Global Defaults,Disable Rounded Total,"להשבית מעוגל סה""כ"
 DocType: Lead,Call,שיחה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'הערכים' לא יכולים להיות ריקים
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'הערכים' לא יכולים להיות ריקים
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},שורה כפולה {0} עם אותו {1}
 ,Trial Balance,מאזן בוחן
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,הגדרת עובדים
-sites/assets/js/erpnext.min.js +5,"Grid ""","רשת """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,הגדרת עובדים
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","רשת """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,אנא בחר תחילה קידומת
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,מחקר
 DocType: Maintenance Visit Purpose,Work Done,מה נעשה
@@ -1019,14 +1024,15 @@ DocType: Communication,Sent,נשלח
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,צפה לדג'ר
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
 DocType: Communication,Delivery Status,סטטוס משלוח
 DocType: Production Order,Manufacture against Sales Order,ייצור נגד להזמין מכירות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,שאר העולם
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,שאר העולם
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,פריט {0} לא יכול להיות אצווה
 ,Budget Variance Report,תקציב שונות דווח
 DocType: Salary Slip,Gross Pay,חבילת גרוס
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,דיבידנדים ששולם
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,החשבונאות לדג'ר
 DocType: Stock Reconciliation,Difference Amount,סכום הבדל
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,עודפים
 DocType: BOM Item,Item Description,תיאור פריט
@@ -1040,15 +1046,17 @@ DocType: Opportunity Item,Opportunity Item,פריט הזדמנות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,פתיחה זמנית
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,עובד חופשת מאזן
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},מאזן לחשבון {0} חייב תמיד להיות {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},מאזן לחשבון {0} חייב תמיד להיות {1}
 DocType: Address,Address Type,סוג הכתובת
 DocType: Purchase Receipt,Rejected Warehouse,מחסן שנדחו
 DocType: GL Entry,Against Voucher,נגד שובר
 DocType: Item,Default Buying Cost Center,מרכז עלות רכישת ברירת מחדל
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","כדי לקבל את הטוב ביותר של ERPNext, אנו ממליצים שתיקחו קצת זמן ולצפות בקטעי וידאו עזרה אלה."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,פריט {0} חייב להיות פריט מכירות
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,ל
 DocType: Item,Lead Time in days,עופרת זמן בימים
 ,Accounts Payable Summary,חשבונות לתשלום סיכום
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
 DocType: Journal Entry,Get Outstanding Invoices,קבל חשבוניות מצטיינים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
@@ -1064,7 +1072,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,מקום ההנפקה
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,חוזה
 DocType: Report,Disabled,נכים
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},גורם coversion של אוני 'מישגן נדרש לאונים' מישגן: {0} בפריט: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},גורם coversion של אוני 'מישגן נדרש לאונים' מישגן: {0} בפריט: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,הוצאות עקיפות
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,שורת {0}: הכמות היא חובה
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,חקלאות
@@ -1073,13 +1081,13 @@ DocType: Mode of Payment,Mode of Payment,מצב של תשלום
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
 DocType: Journal Entry Account,Purchase Order,הזמנת רכש
 DocType: Warehouse,Warehouse Contact Info,מחסן פרטים ליצירת קשר
-sites/assets/js/form.min.js +190,Name is required,שם נדרש
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,שם נדרש
 DocType: Purchase Invoice,Recurring Type,סוג חוזר
 DocType: Address,City/Town,עיר / יישוב
 DocType: Email Digest,Annual Income,הכנסה שנתית
 DocType: Serial No,Serial No Details,Serial No פרטים
 DocType: Purchase Invoice Item,Item Tax Rate,שיעור מס פריט
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,פריט {0} חייב להיות פריט-נדבק Sub
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ציוד הון
@@ -1090,14 +1098,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,מטרה
 DocType: Sales Invoice Item,Edit Description,עריכת תיאור
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,תאריך אספקה ​​צפוי הוא פחותה ממועד המתוכנן התחל.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,לספקים
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,הגדרת סוג החשבון מסייעת בבחירת חשבון זה בעסקות.
 DocType: Purchase Invoice,Grand Total (Company Currency),סך כולל (חברת מטבע)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,"יוצא סה""כ"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","יכול להיות רק אחד משלוח כלל מצב עם 0 או ערך ריק עבור ""לשווי"""
 DocType: Authorization Rule,Transaction,עסקה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,שים לב: מרכז עלות זו קבוצה. לא יכול לעשות רישומים חשבונאיים כנגד קבוצות.
-apps/erpnext/erpnext/config/projects.py +43,Tools,כלים
+apps/frappe/frappe/config/desk.py +7,Tools,כלים
 DocType: Item,Website Item Groups,קבוצות פריט באתר
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,מספר הזמנת ייצור הוא חובה לייצור מטרת כניסת המניה
 DocType: Purchase Invoice,Total (Company Currency),סה"כ (חברת מטבע)
@@ -1107,7 +1115,7 @@ DocType: Workstation,Workstation Name,שם תחנת עבודה
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,"תקציר דוא""ל:"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
 DocType: Sales Partner,Target Distribution,הפצת יעד
-sites/assets/js/desk.min.js +7652,Comments,תגובות
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,תגובות
 DocType: Salary Slip,Bank Account No.,מס 'חשבון הבנק
 DocType: Naming Series,This is the number of the last created transaction with this prefix,זהו המספר של העסקה יצרה האחרונה עם קידומת זו
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},שערי הערכת שווי הנדרשים לפריט {0}
@@ -1122,7 +1130,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,אנא בח
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,זכות Leave
 DocType: Purchase Invoice,Supplier Invoice Date,תאריך חשבונית ספק
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,אתה צריך לאפשר סל קניות
-sites/assets/js/form.min.js +212,No Data,אין נתונים
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,אין נתונים
 DocType: Appraisal Template Goal,Appraisal Template Goal,מטרת הערכת תבנית
 DocType: Salary Slip,Earning,להרוויח
 DocType: Payment Tool,Party Account Currency,מפלגת חשבון מטבע
@@ -1130,7 +1138,7 @@ DocType: Payment Tool,Party Account Currency,מפלגת חשבון מטבע
 DocType: Purchase Taxes and Charges,Add or Deduct,להוסיף או לנכות
 DocType: Company,If Yearly Budget Exceeded (for expense account),אם תקציב שנתי חריגה (לחשבון הוצאות)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,חפיפה בין תנאים מצאו:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,נגד תנועת היומן {0} כבר תואם כמה שובר אחר
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,נגד תנועת היומן {0} כבר תואם כמה שובר אחר
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,"ערך להזמין סה""כ"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,מזון
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,טווח הזדקנות 3
@@ -1138,6 +1146,7 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,אין ביקורים
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","עלונים לאנשי קשר, מוביל."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},מטבע של חשבון הסגירה חייב להיות {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},הסכום של נקודות לכל המטרות צריך להיות 100. זה {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,לא ניתן להשאיר את הפעילות ריקה.
 ,Delivered Items To Be Billed,פריטים נמסרו לחיוב
@@ -1168,7 +1177,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,סכום מס פריט
 DocType: Item,Maintain Stock,לשמור על המלאי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ערכי מניות כבר יצרו להפקה להזמין
 DocType: Leave Control Panel,Leave blank if considered for all designations,שאר ריק אם תיחשב לכל הכינויים
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},מקס: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,מDatetime
 DocType: Email Digest,For Company,לחברה
@@ -1178,7 +1187,7 @@ DocType: Sales Invoice,Shipping Address Name,שם כתובת למשלוח
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,תרשים של חשבונות
 DocType: Material Request,Terms and Conditions Content,תוכן תנאים והגבלות
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1191,7 +1200,7 @@ DocType: Warranty Claim,Warranty / AMC Status,אחריות / מעמד AMC
 DocType: GL Entry,GL Entry,GL כניסה
 DocType: HR Settings,Employee Settings,הגדרות עובד
 ,Batch-Wise Balance History,אצווה-Wise היסטוריה מאזן
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,כדי לעשות את רשימה
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,כדי לעשות את רשימה
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Apprentice
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,כמות שלילית אינה מותרת
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1221,13 +1230,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,השכרת משרד
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,הגדרות שער SMS ההתקנה
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,יבוא נכשל!
-sites/assets/js/erpnext.min.js +24,No address added yet.,אין כתובת הוסיפה עדיין.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,אין כתובת הוסיפה עדיין.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation עבודה שעה
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,אנליסט
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום JV {2}
 DocType: Item,Inventory,מלאי
 DocType: Features Setup,"To enable ""Point of Sale"" view",כדי לאפשר "נקודת מכירה" תצוגה
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,תשלום לא יכול להתבצע על עגלה ריקה
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,תשלום לא יכול להתבצע על עגלה ריקה
 DocType: Item,Sales Details,פרטי מכירות
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,תולה
 DocType: Opportunity,With Items,עם פריטים
@@ -1237,7 +1246,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",התאריך שבו החשבונית הבאה תופק. הוא נוצר על שליחה.
 DocType: Item Attribute,Item Attribute,תכונה פריט
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,ממשלה
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,גרסאות פריט
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,גרסאות פריט
 DocType: Company,Services,שירותים
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),"סה""כ ({0})"
 DocType: Cost Center,Parent Cost Center,מרכז עלות הורה
@@ -1247,11 +1256,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,תאריך כספי לשנה שהתחל
 DocType: Employee External Work History,Total Experience,"ניסיון סה""כ"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,הוצאות הובלה והשילוח
 DocType: Material Request Item,Sales Order No,להזמין ללא מכירות
 DocType: Item Group,Item Group Name,שם קבוצת פריט
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,לקחתי
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,לקחתי
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,העברת חומרים לייצור
 DocType: Pricing Rule,For Price List,למחירון
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,חיפוש הנהלה
@@ -1260,8 +1269,7 @@ DocType: Maintenance Schedule,Schedules,לוחות זמנים
 DocType: Purchase Invoice Item,Net Amount,סכום נטו
 DocType: Purchase Order Item Supplied,BOM Detail No,פרט BOM לא
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),סכום הנחה נוסף (מטבע חברה)
-DocType: Period Closing Voucher,CoA Help,CoA עזרה
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},שגיאה: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},שגיאה: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,צור חשבון חדש מתרשים של חשבונות.
 DocType: Maintenance Visit,Maintenance Visit,תחזוקה בקר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,לקוחות> קבוצת לקוחות> טריטוריה
@@ -1292,17 +1300,17 @@ DocType: Sales Partner,Sales Partner Target,מכירות פרטנר יעד
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},כניסה לחשבונאות {0} יכולה להתבצע רק במטבע: {1}
 DocType: Pricing Rule,Pricing Rule,כלל תמחור
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,חֵרוּק
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,בקשת חומר להזמנת רכש
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,בקשת חומר להזמנת רכש
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,חשבונות בנק
 ,Bank Reconciliation Statement,הצהרת בנק פיוס
 DocType: Address,Lead Name,שם עופרת
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,יתרת מלאי פתיחה
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,יתרת מלאי פתיחה
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} חייבים להופיע רק פעם אחת
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},אסור לי תשלומי העברה יותר {0} מ {1} נגד הזמנת רכש {2}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,אין פריטים לארוז
 DocType: Shipping Rule Condition,From Value,מערך
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,כמות ייצור היא תנאי הכרחית
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,כמות ייצור היא תנאי הכרחית
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,סכומים שלא באו לידי ביטוי בבנק
 DocType: Quality Inspection Reading,Reading 4,קריאת 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,תביעות לחשבון חברה.
@@ -1315,18 +1323,19 @@ DocType: Opportunity,Contact Mobile No,לתקשר נייד לא
 DocType: Production Planning Tool,Select Sales Orders,בחר הזמנות ומכירות
 ,Material Requests for which Supplier Quotations are not created,בקשות מהותיות שלציטוטי ספק הם לא נוצרו
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,כדי לעקוב אחר פריטים באמצעות ברקוד. תוכל להיכנס לפריטים בתעודת משלוח וחשבונית מכירות על ידי סריקת הברקוד של פריט.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,סמן כנמסר
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,הפוך הצעת מחיר
 DocType: Dependent Task,Dependent Task,משימה תלויה
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,נסה לתכנן פעולות לימי X מראש.
 DocType: HR Settings,Stop Birthday Reminders,Stop יום הולדת תזכורות
 DocType: SMS Center,Receiver List,מקלט רשימה
 DocType: Payment Tool Detail,Payment Amount,סכום תשלום
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,כמות הנצרכת
-sites/assets/js/erpnext.min.js +51,{0} View,{0} צפה
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} צפה
 DocType: Salary Structure Deduction,Salary Structure Deduction,ניכוי שכר מבנה
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,sintering לייזר סלקטיבי
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,יבוא מוצלח!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,עלות פריטים הונפק
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
@@ -1347,7 +1356,7 @@ DocType: Company,Default Payable Account,חשבון זכאים ברירת מחד
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","הגדרות לעגלת קניות מקוונות כגון כללי משלוח, מחירון וכו '"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,התקנה מלאה
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% שחויבו
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,שמורות כמות
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,שמורות כמות
 DocType: Party Account,Party Account,חשבון המפלגה
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,משאבי אנוש
 DocType: Lead,Upper Income,עליון הכנסה
@@ -1390,11 +1399,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,אפשר סל קניות
 DocType: Employee,Permanent Address,כתובת קבועה
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,פריט {0} חייב להיות פריט שירות.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",מקדמה ששולם כנגד {0} {1} לא יכול להיות גדול \ מ גרנד סה"כ {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,אנא בחר קוד פריט
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),להפחית ניכוי לחופשה ללא תשלום (LWP)
 DocType: Territory,Territory Manager,מנהל שטח
+DocType: Delivery Note Item,To Warehouse (Optional),למחסן (אופציונאלי)
 DocType: Sales Invoice,Paid Amount (Company Currency),הסכום ששולם (חברת מטבע)
 DocType: Purchase Invoice,Additional Discount,הנחה נוסף
 DocType: Selling Settings,Selling Settings,מכירת הגדרות
@@ -1417,7 +1427,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,כרייה
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ליהוק שרף
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,אנא בחר {0} הראשון.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,אנא בחר {0} הראשון.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},טקסט {0}
 DocType: Territory,Parent Territory,טריטורית הורה
 DocType: Quality Inspection Reading,Reading 2,קריאת 2
@@ -1445,11 +1455,11 @@ DocType: Sales Invoice Item,Batch No,אצווה לא
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,לאפשר הזמנות ומכירות מרובות נגד הלקוח הזמנת הרכש
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,ראשי
 DocType: DocPerm,Delete,מחק
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variant
-sites/assets/js/desk.min.js +7971,New {0},חדש {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},חדש {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,לא ניתן לבטל הזמנה הפסיקה. מגופה כדי לבטל.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,לא ניתן לבטל הזמנה הפסיקה. מגופה כדי לבטל.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
 DocType: Employee,Leave Encashed?,השאר Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,הזדמנות מ השדה היא חובה
 DocType: Item,Variants,גרסאות
@@ -1467,7 +1477,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,מדינה
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,כתובות
 DocType: Communication,Received,קיבלתי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,נגד תנועת היומן {0} אין {1} כניסה ללא תחרות
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,נגד תנועת היומן {0} אין {1} כניסה ללא תחרות
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},לשכפל מספר סידורי נכנס לפריט {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,תנאי עבור כלל משלוח
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,פריט אינו מותר לי הזמנת ייצור.
@@ -1488,7 +1498,6 @@ DocType: Employee,Salutation,שְׁאֵילָה
 DocType: Communication,Rejected,נדחה
 DocType: Pricing Rule,Brand,מותג
 DocType: Item,Will also apply for variants,תחול גם לגרסות
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% נמסר
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,פריטי Bundle בעת מכירה.
 DocType: Sales Order Item,Actual Qty,כמות בפועל
 DocType: Sales Invoice Item,References,אזכור
@@ -1526,14 +1535,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,גְזִיזָה
 DocType: Item,Has Variants,יש גרסאות
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,לחץ על כפתור 'הפוך מכירות חשבונית' כדי ליצור חשבונית מכירות חדשה.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,תקופה ומתקופה לתאריכי חובה עבור חוזר% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,אריזה וסימון
 DocType: Monthly Distribution,Name of the Monthly Distribution,שמו של החתך החודשי
 DocType: Sales Person,Parent Sales Person,איש מכירות הורה
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,נא לציין מטבע ברירת מחדל בחברת מאסטר וברירות מחדלים גלובלית
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox גישה חשאי
 DocType: Purchase Invoice,Recurring Invoice,חשבונית חוזרת
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,ניהול פרויקטים
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,ניהול פרויקטים
 DocType: Supplier,Supplier of Goods or Services.,ספק של מוצרים או שירותים.
 DocType: Budget Detail,Fiscal Year,שנת כספים
 DocType: Cost Center,Budget,תקציב
@@ -1559,11 +1567,11 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table ca
 DocType: Pricing Rule,Selling,מכירה
 DocType: Employee,Salary Information,מידע משכורת
 DocType: Sales Person,Name and Employee ID,שם והעובדים ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
 DocType: Website Item Group,Website Item Group,קבוצת פריט באתר
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,חובות ומסים
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,נא להזין את תאריך הפניה
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},לא יכולים להיות מסוננים {0} ערכי תשלום על ידי {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,נא להזין את תאריך הפניה
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},לא יכולים להיות מסוננים {0} ערכי תשלום על ידי {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,שולחן לפריט שיוצג באתר אינטרנט
 DocType: Purchase Order Item Supplied,Supplied Qty,כמות שסופק
 DocType: Material Request Item,Material Request Item,פריט בקשת חומר
@@ -1571,7 +1579,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,עץ של קבו
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,לא יכול להתייחס מספר השורה גדול או שווה למספר השורה הנוכחי לסוג השעבוד זה
 ,Item-wise Purchase History,היסטוריה רכישת פריט-חכם
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,אדום
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
 DocType: Account,Frozen,קפוא
 ,Open Production Orders,הזמנות ייצור פתוחות
 DocType: Installation Note,Installation Time,זמן התקנה
@@ -1613,13 +1621,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,מגמות ציטוט
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","כהפקה להזמין יכול להתבצע עבור פריט זה, זה חייב להיות פריט במלאי."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","כהפקה להזמין יכול להתבצע עבור פריט זה, זה חייב להיות פריט במלאי."
 DocType: Shipping Rule Condition,Shipping Amount,סכום משלוח
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,הצטרפות
 DocType: Authorization Rule,Above Value,מעל הערך
 ,Pending Amount,סכום תלוי ועומד
 DocType: Purchase Invoice Item,Conversion Factor,המרת פקטור
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,נמסר
+DocType: Purchase Order,Delivered,נמסר
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),"התקנת שרת הנכנס לid הדוא""ל של מקומות עבודה. (למשל jobs@example.com)"
 DocType: Purchase Receipt,Vehicle Number,מספר רכב
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,התאריך שבו חשבונית חוזרת תהיה לעצור
@@ -1636,10 +1644,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,חיובים להפיץ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"חשבון {0} חייב להיות מסוג 'נכסים קבועים ""כפריט {1} הוא פריט רכוש"
 DocType: HR Settings,HR Settings,הגדרות HR
 apps/frappe/frappe/config/setup.py +130,Printing,הדפסה
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,תביעת חשבון ממתינה לאישור. רק המאשר ההוצאות יכול לעדכן את הסטטוס.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,תביעת חשבון ממתינה לאישור. רק המאשר ההוצאות יכול לעדכן את הסטטוס.
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,היום (ים) שבו אתם פונים לקבלת חופשה הוא חופשה. אתה לא צריך להגיש בקשה לחופשה.
-sites/assets/js/desk.min.js +7805,and,ו
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ו
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,ספורט
@@ -1676,7 +1684,6 @@ DocType: Opportunity,Quotation,הצעת מחיר
 DocType: Salary Slip,Total Deduction,סך ניכוי
 DocType: Quotation,Maintenance User,משתמש תחזוקה
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,עלות עדכון
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,האם אתה בטוח שאתה רוצה מגופה
 DocType: Employee,Date of Birth,תאריך לידה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,פריט {0} הוחזר כבר
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** שנת כספים ** מייצגת שנת כספים. כל הרישומים החשבונאיים ועסקות גדולות אחרות מתבצעים מעקב נגד שנת כספים ** **.
@@ -1692,13 +1699,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","עקוב אחר מסעות פרסום מכירות. עקוב אחר הובלות, הצעות מחיר, להזמין מכירות וכו 'ממסעות הפרסום כדי לאמוד את ההחזר על השקעה."
 DocType: Expense Claim,Approver,מאשר
 ,SO Qty,SO כמות
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ערכי מניות קיימים נגד מחסן {0}, ולכן אתה לא יכול להקצות מחדש או לשנות את המחסן"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ערכי מניות קיימים נגד מחסן {0}, ולכן אתה לא יכול להקצות מחדש או לשנות את המחסן"
 DocType: Appraisal,Calculate Total Score,חישוב ציון הכולל
 DocType: Supplier Quotation,Manufacturing Manager,ייצור מנהל
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,תעודת משלוח פצל לחבילות.
 apps/erpnext/erpnext/hooks.py +84,Shipments,משלוחים
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,דפוס טובלים
+DocType: Purchase Order,To be delivered to customer,שיימסר ללקוח
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,סטטוס זמן יומן יש להגיש.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,מספר סידורי {0} אינו שייך לכל מחסן
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,הגדרה
@@ -1723,11 +1731,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,ממטבע
 DocType: DocField,Name,שם
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},להזמין מכירות הנדרשים לפריט {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},להזמין מכירות הנדרשים לפריט {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,סכומים שלא באו לידי ביטוי במערכת
 DocType: Purchase Invoice Item,Rate (Company Currency),שיעור (חברת מטבע)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,אחרים
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,קבע כהפסיק
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,לא ניתן למצוא את הפריט מתאים. אנא בחר ערך אחר עבור {0}.
 DocType: POS Profile,Taxes and Charges,מסים והיטלים ש
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","מוצר או שירות שהוא קנה, מכר או החזיק במלאי."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"לא ניתן לבחור סוג תשלום כ'בסכום שורה הקודם ""או"" בסך הכל שורה הקודם 'לשורה הראשונה"
@@ -1736,19 +1744,20 @@ DocType: Web Form,Select DocType,DOCTYPE בחר
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,קידוח
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,בנקאות
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,אנא לחץ על 'צור לוח זמנים' כדי לקבל לוח זמנים
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,מרכז עלות חדש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,מרכז עלות חדש
 DocType: Bin,Ordered Quantity,כמות מוזמנת
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","לדוגמא: ""לבנות כלים לבונים"""
 DocType: Quality Inspection,In Process,בתהליך
 DocType: Authorization Rule,Itemwise Discount,Itemwise דיסקונט
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
+DocType: Purchase Order Item,Reference Document Type,התייחסות סוג המסמך
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
 DocType: Account,Fixed Asset,רכוש קבוע
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,מלאי בהמשכים
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,מלאי בהמשכים
 DocType: Activity Type,Default Billing Rate,דרג חיוב ברירת מחדל
 DocType: Time Log Batch,Total Billing Amount,סכום חיוב סה"כ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,חשבון חייבים
 ,Stock Balance,יתרת מניות
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,להזמין מכירות לתשלום
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,להזמין מכירות לתשלום
 DocType: Expense Claim Detail,Expense Claim Detail,פרטי תביעת חשבון
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,זמן יומנים שנוצרו:
 DocType: Item,Weight UOM,המשקל של אוני 'מישגן
@@ -1784,10 +1793,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,אשראי לחשבון חייב להיות חשבון לתשלום
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},רקורסיה BOM: {0} אינה יכולה להיות הורה או ילד של {2}
 DocType: Production Order Operation,Completed Qty,כמות שהושלמה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","עבור {0}, רק חשבונות החיוב יכולים להיות מקושרים נגד כניסת אשראי אחרת"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,מחיר המחירון {0} אינו זמין
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","עבור {0}, רק חשבונות החיוב יכולים להיות מקושרים נגד כניסת אשראי אחרת"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,מחיר המחירון {0} אינו זמין
 DocType: Manufacturing Settings,Allow Overtime,לאפשר שעות נוספות
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,להזמין מכירות {0} הוא הפסיק
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} מספרים סידוריים הנדרשים לפריט {1}. שסיפקת {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,דרג הערכה נוכחי
 DocType: Item,Customer Item Codes,קודי פריט לקוחות
@@ -1796,9 +1804,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ריתוך
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,החדש במלאי של אוני 'מישגן נדרש
 DocType: Quality Inspection,Sample Size,גודל מדגם
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,כל הפריטים כבר בחשבונית
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,כל הפריטים כבר בחשבונית
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',נא לציין חוקי 'מתיק מס' '
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
 DocType: Project,External,חיצוני
 DocType: Features Setup,Item Serial Nos,מס 'סידורי פריט
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,משתמשים והרשאות
@@ -1825,7 +1833,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,כתובת ומגעים
 DocType: SMS Log,Sender Name,שם שולח
 DocType: Page,Title,כותרת
-sites/assets/js/list.min.js +104,Customize,התאמה אישית של
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,התאמה אישית של
 DocType: POS Profile,[Select],[בחר]
 DocType: SMS Log,Sent To,נשלח ל
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,הפוך מכירות חשבונית
@@ -1850,12 +1858,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,סוף החיים
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,נסיעות
 DocType: Leave Block List,Allow Users,אפשר למשתמשים
+DocType: Purchase Order,Customer Mobile No,לקוחות ניידים לא
 DocType: Sales Invoice,Recurring,חוזר
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,עקוב אחר הכנסות והוצאות נפרדות לאנכי מוצר או חטיבות.
 DocType: Rename Tool,Rename Tool,שינוי שם כלי
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,עלות עדכון
 DocType: Item Reorder,Item Reorder,פריט סידור מחדש
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,העברת חומר
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,העברת חומר
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ציין את הפעולות, עלויות הפעלה ולתת מבצע ייחודי לא לפעולות שלך."
 DocType: Purchase Invoice,Price List Currency,מטבע מחירון
 DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
@@ -1878,7 +1887,7 @@ DocType: Appraisal,Employee,עובד
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,דוא"ל יבוא מ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,הזמן כמשתמש
 DocType: Features Setup,After Sale Installations,לאחר התקנות מכירה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} מחויב באופן מלא
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} מחויב באופן מלא
 DocType: Workstation Working Hour,End Time,שעת סיום
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,תנאי חוזה סטנדרטי למכירות או רכש.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,קבוצה על ידי שובר
@@ -1887,8 +1896,9 @@ DocType: Sales Invoice,Mass Mailing,תפוצה המונית
 DocType: Page,Standard,סטנדרטי
 DocType: Rename Tool,File to Rename,קובץ לשינוי השם
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},מספר ההזמנה Purchse נדרש לפריט {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,תשלומי הצג
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM צוין {0} אינו קיימת עבור פריט {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,לוח זמנים תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,לוח זמנים תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,גודל
 DocType: Notification Control,Expense Claim Approved,תביעת הוצאות שאושרה
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,תרופות
@@ -1907,8 +1917,8 @@ DocType: Upload Attendance,Attendance To Date,נוכחות לתאריך
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),"התקנת שרת הנכנס לid הדוא""ל של מכירות. (למשל sales@example.com)"
 DocType: Warranty Claim,Raised By,הועלה על ידי
 DocType: Payment Tool,Payment Account,חשבון תשלומים
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
-sites/assets/js/list.min.js +23,Draft,טיוטה
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,טיוטה
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Off המפצה
 DocType: Quality Inspection Reading,Accepted,קיבלתי
 DocType: User,Female,נקבה
@@ -1921,14 +1931,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,תווית כלל משלוח
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
 DocType: Newsletter,Test,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","כמו שיש עסקות מלאי קיימות עבור פריט זה, \ אתה לא יכול לשנות את הערכים של 'יש מספר סידורי', 'יש אצווה לא', 'האם פריט במלאי "ו-" שיטת הערכה ""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,מהיר יומן
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
 DocType: Employee,Previous Work Experience,ניסיון בעבודה קודם
 DocType: Stock Entry,For Quantity,לכמות
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},נא להזין מתוכננת כמות לפריט {0} בשורת {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} לא יוגש
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,בקשות לפריטים.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} לא יוגש
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,בקשות לפריטים.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,הזמנת ייצור נפרדת תיווצר לכל פריט טוב מוגמר.
 DocType: Purchase Invoice,Terms and Conditions1,תנאים וConditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,התקנה מלאה
@@ -1940,7 +1951,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,רשימת תפו
 DocType: Delivery Note,Transporter Name,שם Transporter
 DocType: Contact,Enter department to which this Contact belongs,הזן מחלקה שלקשר זה שייך
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,"סה""כ נעדר"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,פריט או מחסן לשורת {0} אינו תואם בקשת חומר
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,פריט או מחסן לשורת {0} אינו תואם בקשת חומר
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,יְחִידַת מִידָה
 DocType: Fiscal Year,Year End Date,תאריך סיום שנה
 DocType: Task Depends On,Task Depends On,המשימה תלויה ב
@@ -1966,7 +1977,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,תאריך סיום חוזה חייב להיות גדול מ תאריך ההצטרפות
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,/ סוחר / סוכן / שותפים / משווק עמלת מפיץ הצד שלישי שמוכר את המוצרים עבור חברות בועדה.
 DocType: Customer Group,Has Child Node,יש ילד צומת
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} נגד הזמנת רכש {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} נגד הזמנת רכש {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","הזן הפרמטרים url סטטי כאן (לדוגמא. שולח = ERPNext, שם משתמש = ERPNext, סיסמא = 1234 וכו ')"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} לא בכל שנת כספים פעילה. לפרטים נוספים לבדוק {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,זה אתר דוגמא שנוצר אוטומטית מERPNext
@@ -1997,11 +2008,9 @@ DocType: Note,Note,הערה
 DocType: Purchase Receipt Item,Recd Quantity,כמות Recd
 DocType: Email Account,Email Ids,דוא"ל המזהים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,קבע כUnstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: Payment Reconciliation,Bank / Cash Account,חשבון בנק / מזומנים
 DocType: Tax Rule,Billing City,עיר חיוב
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,זה השאירו Application ממתין לאישור. רק המאשר החופשה יכול לעדכן את הסטטוס.
 DocType: Global Defaults,Hide Currency Symbol,הסתר סמל מטבע
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","למשל בנק, מזומן, כרטיס אשראי"
 DocType: Journal Entry,Credit Note,כְּתַב זְכוּיוֹת
@@ -2022,7 +2031,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),"סה""כ (כמות)"
 DocType: Installation Note Item,Installed Qty,כמות מותקנת
 DocType: Lead,Fax,פקס
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,הוגש
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,הוגש
 DocType: Salary Structure,Total Earning,"צבירה סה""כ"
 DocType: Purchase Receipt,Time at which materials were received,זמן שבו חומרים שהתקבלו
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,הכתובות שלי
@@ -2031,7 +2040,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,אדון סנ
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,או
 DocType: Sales Order,Billing Status,סטטוס חיוב
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,הוצאות שירות
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-מעל
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-מעל
 DocType: Buying Settings,Default Buying Price List,מחיר מחירון קניית ברירת מחדל
 ,Download Backups,גיבויים להורדה
 DocType: Notification Control,Sales Order Message,להזמין הודעת מכירות
@@ -2040,7 +2049,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,עובדים בחרו
 DocType: Bank Reconciliation,To Date,לתאריך
 DocType: Opportunity,Potential Sales Deal,דיל מכירות פוטנציאליות
-sites/assets/js/form.min.js +308,Details,פרטים
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,פרטים
 DocType: Purchase Invoice,Total Taxes and Charges,"סה""כ מסים וחיובים"
 DocType: Employee,Emergency Contact,צור קשר עם חירום
 DocType: Item,Quality Parameters,מדדי איכות
@@ -2055,7 +2064,7 @@ DocType: Purchase Order Item,Received Qty,כמות התקבלה
 DocType: Stock Entry Detail,Serial No / Batch,לא / אצווה סידוריים
 DocType: Product Bundle,Parent Item,פריט הורה
 DocType: Account,Account Type,סוג החשבון
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
 ,To Produce,כדי לייצר
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","לשורה {0} ב {1}. כדי לכלול {2} בשיעור פריט, שורות {3} חייבים להיות כלולות גם"
 DocType: Packing Slip,Identification of the package for the delivery (for print),זיהוי של החבילה למשלוח (להדפסה)
@@ -2066,7 +2075,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,משטח
 DocType: Account,Income Account,חשבון הכנסות
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,דפוס
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,משלוח
 DocType: Stock Reconciliation Item,Current Qty,כמות נוכחית
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ראה ""שיעור חומרים הבוסס על"" בסעיף תמחיר"
 DocType: Appraisal Goal,Key Responsibility Area,פינת אחריות מפתח
@@ -2096,9 +2105,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,כל הכתובות.
 DocType: Company,Stock Settings,הגדרות מניות
 DocType: User,Bio,ביו
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ניהול קבוצת לקוחות עץ.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,שם מרכז העלות חדש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,שם מרכז העלות חדש
 DocType: Leave Control Panel,Leave Control Panel,השאר לוח הבקרה
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,אין תבנית כתובת ברירת מחדל מצאה. אנא ליצור אחד חדש מהגדרה> הדפסה ומיתוג> תבנית כתובת.
 DocType: Appraisal,HR User,משתמש HR
@@ -2117,24 +2126,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,פרט כלי תשלום
 ,Sales Browser,דפדפן מכירות
 DocType: Journal Entry,Total Credit,"סה""כ אשראי"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,מקומי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,מקומי
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),הלוואות ומקדמות (נכסים)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,חייבים
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,גדול
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,אף עובדים מצא!
 DocType: C-Form Invoice Detail,Territory,שטח
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,נא לציין אין ביקורים הנדרשים
+DocType: Purchase Order,Customer Address Display,תצוגת כתובת הלקוח
 DocType: Stock Settings,Default Valuation Method,שיטת הערכת ברירת מחדל
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,פוליש
 DocType: Production Order Operation,Planned Start Time,מתוכנן זמן התחלה
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,הוקצה
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,גיליון קרוב מאזן ורווח או הפסד ספר.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר משום \ יש לך כבר עשה כמה עסקה (ים) עם עוד יחידת מידה. כדי לשנות יחידת מידת ברירת מחדל, שימוש \ 'יחידת מידה החלף שירות' כלי תחת מודול המלאי."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ציין שער חליפין להמיר מטבע אחד לעוד
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,ציטוט {0} יבוטל
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,ציטוט {0} יבוטל
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,סכום חוב סך הכל
 DocType: Sales Partner,Targets,יעדים
 DocType: Price List,Price List Master,מחיר מחירון Master
@@ -2148,12 +2157,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,מדובר בקבוצת לקוחות שורש ולא ניתן לערוך.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,אנא התקנת לוח החשבונות שלך לפני שאתה מתחיל רישומים חשבונאיים
 DocType: Purchase Invoice,Ignore Pricing Rule,התעלם כלל תמחור
-sites/assets/js/list.min.js +24,Cancelled,בוטל
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,בוטל
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,מתאריך בשכר מבנה לא יכול להיות פחותה מתאריך הצטרפות עובדים.
 DocType: Employee Education,Graduate,בוגר
 DocType: Leave Block List,Block Days,ימי בלוק
 DocType: Journal Entry,Excise Entry,בלו כניסה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},אזהרה: מכירות להזמין {0} כבר קיימת נגד הלקוח הזמנת רכש {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},אזהרה: מכירות להזמין {0} כבר קיימת נגד הלקוח הזמנת רכש {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2198,17 +2207,17 @@ DocType: Account,Stock Received But Not Billed,המניה התקבלה אבל ל
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,"סכום ברוטו + חבילת חוֹב הסכום + encashment - ניכוי סה""כ"
 DocType: Monthly Distribution,Distribution Name,שם הפצה
 DocType: Features Setup,Sales and Purchase,מכירות ורכש
-DocType: Purchase Order Item,Material Request No,בקשת חומר לא
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},בדיקת איכות הנדרשת לפריט {0}
+DocType: Supplier Quotation Item,Material Request No,בקשת חומר לא
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},בדיקת איכות הנדרשת לפריט {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,קצב שבו לקוחות של מטבע מומר למטבע הבסיס של החברה
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} היו מנויים בהצלחה מרשימה זו.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),שיעור נטו (חברת מטבע)
-apps/frappe/frappe/templates/base.html +132,Added,נוסף
+apps/frappe/frappe/templates/base.html +134,Added,נוסף
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,ניהול עץ טריטוריה.
 DocType: Journal Entry Account,Sales Invoice,חשבונית מכירות
 DocType: Journal Entry Account,Party Balance,מאזן המפלגה
 DocType: Sales Invoice Item,Time Log Batch,אצווה הזמן התחבר
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,אנא בחר החל דיסקונט ב
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,אנא בחר החל דיסקונט ב
 DocType: Company,Default Receivable Account,חשבון חייבים ברירת מחדל
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,צור בנק כניסה לשכר הכולל ששולם לקריטריונים לעיל נבחרים
 DocType: Stock Entry,Material Transfer for Manufacture,העברת חומר לייצור
@@ -2219,7 +2228,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,קבל ערכים רלוונט
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,כניסה לחשבונאות במלאי
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,הַטבָּעָה
 DocType: Sales Invoice,Sales Team1,Team1 מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,פריט {0} אינו קיים
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,פריט {0} אינו קיים
 DocType: Sales Invoice,Customer Address,כתובת הלקוח
 apps/frappe/frappe/desk/query_report.py +136,Total,"סה""כ"
 DocType: Purchase Invoice,Apply Additional Discount On,החל נוסף דיסקונט ב
@@ -2234,13 +2243,15 @@ DocType: Quality Inspection,Quality Inspection,איכות פיקוח
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,קטן במיוחד
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ריסוס יוצרים
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,חשבון {0} הוא קפוא
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,חשבון {0} הוא קפוא
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ישות / בת משפטית עם תרשים נפרד של חשבונות השייכים לארגון.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","מזון, משקאות וטבק"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL או BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,שיעור עמלה לא יכול להיות גדול מ -100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,רמת מלאי מינימאלית
 DocType: Stock Entry,Subcontract,בקבלנות משנה
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,נא להזין את {0} הראשון
 DocType: Production Planning Tool,Get Items From Sales Orders,לקבל פריטים מהזמנות ומכירות
 DocType: Production Order Operation,Actual End Time,בפועל שעת סיום
 DocType: Production Planning Tool,Download Materials Required,הורד חומרים הנדרש
@@ -2257,7 +2268,7 @@ DocType: Maintenance Visit,Scheduled,מתוכנן
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",אנא בחר פריט שבו "האם פריט במלאי" הוא "לא" ו- "האם פריט מכירות" הוא "כן" ואין Bundle מוצרים אחר
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,בחר בחתך חודשי להפיץ בצורה לא אחידה על פני מטרות חודשים.
 DocType: Purchase Invoice Item,Valuation Rate,שערי הערכת שווי
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,מטבע מחירון לא נבחר
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,מטבע מחירון לא נבחר
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"פריט שורת {0}: קבלת רכישת {1} אינו קיימת בטבלה לעיל ""רכישת הקבלות"""
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,תאריך התחלת פרויקט
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,עד
@@ -2285,13 +2296,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,רק צמתים עלה מותר בעסקה
 DocType: Expense Claim,Expense Approver,מאשר חשבון
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,פריט קבלת רכישה מסופק
-sites/assets/js/erpnext.min.js +48,Pay,שלם
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,שלם
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,לDatetime
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,יומנים לשמירה על סטטוס משלוח SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,טחינה
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,פסיכולוג גלישה
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,פעילויות ממתינות ל
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,פעילויות ממתינות ל
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,אישר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ספק> סוג ספק
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,נא להזין את הקלת מועד.
@@ -2302,7 +2313,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"ה
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,מוציאים לאור עיתון
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,בחר שנת כספים
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,התכה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,אתה המאשר לצאת לתקליט הזה. אנא עדכן את 'הסטטוס' ושמור
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,הזמנה חוזרת רמה
 DocType: Attendance,Attendance Date,תאריך נוכחות
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,פרידה שכר על בסיס צבירה וניכוי.
@@ -2338,6 +2348,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,מרכז עלות בעסקות קיימות לא ניתן להמיר לקבוצה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,פחת
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ספק (ים)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,תקופה לא חוקית
 DocType: Customer,Credit Limit,מגבלת אשראי
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,בחר סוג העסקה
 DocType: GL Entry,Voucher No,שובר לא
@@ -2347,8 +2358,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,תב
 DocType: Customer,Address and Contact,כתובת ולתקשר
 DocType: Customer,Last Day of the Next Month,היום האחרון של החודש הבא
 DocType: Employee,Feedback,משוב
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,שימור. לוח זמנים
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,שימור. לוח זמנים
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,עיבוד סילון שיוף
 DocType: Stock Settings,Freeze Stock Entries,ערכי מלאי הקפאה
 DocType: Website Settings,Website Settings,הגדרות אתר
@@ -2362,11 +2373,11 @@ DocType: Quality Inspection,Outgoing,יוצא
 DocType: Material Request,Requested For,ביקש ל
 DocType: Quotation Item,Against Doctype,נגד Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,עקוב אחר תעודת משלוח זה נגד כל פרויקט
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,חשבון שורש לא ניתן למחוק
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,חשבון שורש לא ניתן למחוק
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,ערכי Stock הצג
 ,Is Primary Address,האם כתובת ראשית
 DocType: Production Order,Work-in-Progress Warehouse,עבודה ב-התקדמות מחסן
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},# התייחסות {0} יום {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},# התייחסות {0} יום {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ניהול כתובות
 DocType: Pricing Rule,Item Code,קוד פריט
 DocType: Production Planning Tool,Create Production Orders,צור הזמנות ייצור
@@ -2375,14 +2386,14 @@ DocType: Journal Entry,User Remark,הערה משתמש
 DocType: Lead,Market Segment,פלח שוק
 DocType: Communication,Phone,טלפון
 DocType: Employee Internal Work History,Employee Internal Work History,העובד פנימי היסטוריה עבודה
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),"סגירה (ד""ר)"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),"סגירה (ד""ר)"
 DocType: Contact,Passive,פסיבי
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,מספר סידורי {0} לא במלאי
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,תבנית מס לעסקות מכירה.
 DocType: Sales Invoice,Write Off Outstanding Amount,לכתוב את הסכום מצטיין
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","בדקו אם אתה צריך חשבוניות חוזרות אוטומטיות. לאחר הגשת כל חשבונית מכירות, חוזר סעיף יהיה גלוי."
 DocType: Account,Accounts Manager,מנהל חשבונות
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',זמן יומן {0} חייב להיות 'הוגש'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',זמן יומן {0} חייב להיות 'הוגש'
 DocType: Stock Settings,Default Stock UOM,ברירת מחדל במלאי של אוני 'מישגן
 DocType: Time Log,Costing Rate based on Activity Type (per hour),תמחיר דרג מבוסס על סוג הפעילות (לשעה)
 DocType: Production Planning Tool,Create Material Requests,צור בקשות חומר
@@ -2393,7 +2404,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,בנק פיוס
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,קבל עדכונים
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,הוסף כמה תקליטי מדגם
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,השאר ניהול
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,השאר ניהול
 DocType: Event,Groups,קבוצות
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,קבוצה על ידי חשבון
 DocType: Sales Order,Fully Delivered,נמסר באופן מלא
@@ -2405,11 +2416,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,תוספות מכירות
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} תקציב לחשבון {1} נגד מרכז עלות {2} יעלה על ידי {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","חשבון הבדל חייב להיות חשבון סוג הנכס / התחייבות, מאז מניית הפיוס הזה הוא כניסת פתיחה"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},לרכוש מספר ההזמנה נדרש לפריט {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,לשאת עלים שהועברו
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},לרכוש מספר ההזמנה נדרש לפריט {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""מתאריך"" חייב להיות לאחר 'עד תאריך'"
 ,Stock Projected Qty,המניה צפויה כמות
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
 DocType: Sales Order,Customer's Purchase Order,הלקוח הזמנת הרכש
 DocType: Warranty Claim,From Company,מחברה
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ערך או כמות
@@ -2422,13 +2432,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,הקמעונאית
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,כל סוגי הספק
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"קוד פריט חובה, כי הפריט לא ממוספר באופן אוטומטי"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"קוד פריט חובה, כי הפריט לא ממוספר באופן אוטומטי"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,פריט לוח זמנים תחזוקה
 DocType: Sales Order,%  Delivered,% נמסר
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,בנק משייך יתר חשבון
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,הפוך שכר Slip
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,לְהוֹצִיא מְגוּפָה
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,העיון BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,הלוואות מובטחות
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,מוצרים מדהים
@@ -2451,8 +2460,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),סכום נטו (חברת מטבע)
 DocType: BOM Operation,Hour Rate,שעה שערי
 DocType: Stock Settings,Item Naming By,פריט מתן שמות על ידי
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,מהצעת המחיר
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},עוד כניסת סגירת תקופת {0} נעשתה לאחר {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,מהצעת המחיר
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},עוד כניסת סגירת תקופת {0} נעשתה לאחר {1}
 DocType: Production Order,Material Transferred for Manufacturing,חומר הועבר לייצור
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,חשבון {0} אינו קיים
 DocType: Purchase Receipt Item,Purchase Order Item No,לרכוש פריט לא להזמין
@@ -2465,11 +2474,11 @@ DocType: Item,Inspection Required,בדיקה הנדרשת
 DocType: Purchase Invoice Item,PR Detail,פרט יחסי הציבור
 DocType: Sales Order,Fully Billed,שחויב במלואו
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,מזומן ביד
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},מחסן אספקה ​​הנדרש לפריט המניה {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},מחסן אספקה ​​הנדרש לפריט המניה {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),המשקל הכולל של החבילה. בדרך כלל משקל נטו + משקל חומרי אריזה. (להדפסה)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,משתמשים עם תפקיד זה מותר להגדיר חשבונות קפוא וליצור / לשנות רישומים חשבונאיים נגד חשבונות מוקפאים
 DocType: Serial No,Is Cancelled,האם בוטל
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,המשלוחים שלי
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,המשלוחים שלי
 DocType: Journal Entry,Bill Date,תאריך ביל
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","גם אם יש כללי תמחור מרובים עם העדיפות הגבוהה ביותר, סדרי עדיפויות פנימיים אז להלן מיושמות:"
 DocType: Supplier,Supplier Details,פרטי ספק
@@ -2482,7 +2491,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,העברה בנקאית
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,אנא בחר חשבון בנק
 DocType: Newsletter,Create and Send Newsletters,ידיעונים ליצור ולשלוח
-sites/assets/js/report.min.js +107,From Date must be before To Date,מתאריך חייב להיות לפני תאריך כדי
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,מתאריך חייב להיות לפני תאריך כדי
 DocType: Sales Order,Recurring Order,להזמין חוזר
 DocType: Company,Default Income Account,חשבון הכנסות ברירת מחדל
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,קבוצת לקוחות / לקוחות
@@ -2497,31 +2506,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,המניה של אוני 'מיש
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
 ,Projected,צפוי
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},מספר סידורי {0} אינו שייך למחסן {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,הערה: מערכת לא תבדוק על-אספקה ​​ועל-הזמנה לפריט {0} ככמות או כמות היא 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,הערה: מערכת לא תבדוק על-אספקה ​​ועל-הזמנה לפריט {0} ככמות או כמות היא 0
 DocType: Notification Control,Quotation Message,הודעת ציטוט
 DocType: Issue,Opening Date,תאריך פתיחה
 DocType: Journal Entry,Remark,הערה
 DocType: Purchase Receipt Item,Rate and Amount,שיעור והסכום
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,משעמם
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,מלהזמין מכירות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,מלהזמין מכירות
 DocType: Blog Category,Parent Website Route,הורה אתר כביש
 DocType: Sales Order,Not Billed,לא חויב
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,שניהם המחסן חייב להיות שייך לאותה חברה
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,אין אנשי קשר הוסיפו עדיין.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,אין אנשי קשר הוסיפו עדיין.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,לא פעיל
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,נגד תאריך פרסום חשבונית
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,הסכום שובר עלות נחתה
 DocType: Time Log,Batched for Billing,לכלך לחיוב
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,הצעות חוק שהועלה על ידי ספקים.
 DocType: POS Profile,Write Off Account,לכתוב את החשבון
-sites/assets/js/erpnext.min.js +26,Discount Amount,סכום הנחה
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,סכום הנחה
 DocType: Purchase Invoice,Return Against Purchase Invoice,חזור נגד רכישת חשבונית
 DocType: Item,Warranty Period (in days),תקופת אחריות (בימים)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"למשל מע""מ"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,פריט 4
 DocType: Journal Entry Account,Journal Entry Account,חשבון כניסת Journal
 DocType: Shopping Cart Settings,Quotation Series,סדרת ציטוט
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","פריט קיים באותו שם ({0}), בבקשה לשנות את שם קבוצת פריט או לשנות את שם הפריט"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","פריט קיים באותו שם ({0}), בבקשה לשנות את שם קבוצת פריט או לשנות את שם הפריט"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,גז מתכת חם להרכיב
 DocType: Sales Order Item,Sales Order Date,תאריך הזמנת מכירות
 DocType: Sales Invoice Item,Delivered Qty,כמות נמסרה
@@ -2552,10 +2560,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,פרטי לקוח או ספק
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,הגדר
 DocType: Lead,Lead Owner,בעלי עופרת
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,המחסן נדרש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,המחסן נדרש
 DocType: Employee,Marital Status,מצב משפחתי
 DocType: Stock Settings,Auto Material Request,בקשת Auto חומר
 DocType: Time Log,Will be updated when billed.,יעודכן כאשר חיוב.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,כמות אצווה זמינה ממחסן
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM הנוכחי והחדש BOM אינו יכולים להיות זהים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,מועד הפרישה חייב להיות גדול מ תאריך ההצטרפות
 DocType: Sales Invoice,Against Income Account,נגד חשבון הכנסות
@@ -2572,12 +2581,12 @@ DocType: POS Profile,Update Stock,בורסת עדכון
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"אוני 'מישגן שונה עבור פריטים יובילו לערך השגוי (סה""כ) נקי במשקל. ודא שמשקל נטו של כל פריט הוא באותו אוני 'מישגן."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM שערי
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,אנא למשוך פריטים מתעודת המשלוח
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,אנא למשוך פריטים מתעודת המשלוח
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,"תנועות היומן {0} הם לא צמוד,"
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","שיא של כל התקשורת של דואר אלקטרוני מסוג, טלפון, צ'אט, ביקור, וכו '"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,נא לציין מרכז העלות לעגל בחברה
 DocType: Purchase Invoice,Terms,תנאים
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,צור חדש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,צור חדש
 DocType: Buying Settings,Purchase Order Required,הזמנת רכש דרוש
 ,Item-wise Sales History,היסטוריה מכירות פריט-חכמה
 DocType: Expense Claim,Total Sanctioned Amount,"הסכום אושר סה""כ"
@@ -2593,16 +2602,17 @@ apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},שיעור: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ניכוי תלוש משכורת
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,הערות
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,בחר צומת קבוצה ראשונה.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,מלא את הטופס ולשמור אותו
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,מלא את הטופס ולשמור אותו
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,הורד דוח המכיל את כל חומרי הגלם עם מצב המלאי האחרון שלהם
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,מול
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,פורום הקהילה
 DocType: Leave Application,Leave Balance Before Application,השאר מאזן לפני היישום
 DocType: SMS Center,Send SMS,שלח SMS
 DocType: Company,Default Letter Head,ברירת מחדל מכתב ראש
 DocType: Time Log,Billable,לחיוב
 DocType: Authorization Rule,This will be used for setting rule in HR module,זה ישמש לקביעת כלל במודול HR
 DocType: Account,Rate at which this tax is applied,קצב שבו מס זה מיושם
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,סדר מחדש כמות
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,סדר מחדש כמות
 DocType: Company,Stock Adjustment Account,חשבון התאמת המניה
 DocType: Journal Entry,Write Off,לכתוב את
 DocType: Time Log,Operation ID,מבצע זיהוי
@@ -2612,12 +2622,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","דיסקונט שדות יהיו זמינים בהזמנת רכש, קבלת רכישה, רכישת חשבונית"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,שם חשבון חדש. הערה: נא לא ליצור חשבונות ללקוחות וספקים
 DocType: Report,Report Type,סוג הדוח
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Loading
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Loading
 DocType: BOM Replace Tool,BOM Replace Tool,BOM החלף כלי
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,תבניות כתובת ברירת מחדל חכם ארץ
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
+DocType: Sales Order Item,Supplier delivers to Customer,ספק מספק ללקוח
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,התפרקות מס הצג
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,נתוני יבוא ויצוא
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',אם כרוך בפעילות ייצור. מאפשר פריט 'מיוצר'
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,תאריך פרסום חשבונית
 DocType: Sales Invoice,Rounded Total,"סה""כ מעוגל"
 DocType: Product Bundle,List items that form the package.,פריטי רשימה היוצרים את החבילה.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,אחוז ההקצאה צריכה להיות שווה ל- 100%
@@ -2628,8 +2641,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
 DocType: Company,Default Cash Account,חשבון מזומנים ברירת מחדל
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',נא להזין את 'תאריך אספקה ​​צפויה של
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',נא להזין את 'תאריך אספקה ​​צפויה של
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,הסכום ששולם + לכתוב את הסכום לא יכול להיות גדול יותר מסך כולל
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} הוא לא מספר אצווה תקף לפריט {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},הערה: אין איזון חופשה מספיק לחופשת סוג {0}
@@ -2650,11 +2663,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","שורת {0}: כמות לא avalable במחסן {1} על {2} {3}. כמות זמינה: {4}, העבר את הכמות: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,פריט 3
+DocType: Purchase Order,Customer Contact Email,דוא"ל ליצירת קשר של לקוחות
 DocType: Event,Sunday,יום ראשון
 DocType: Sales Team,Contribution (%),תרומה (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,אחריות
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,תבנית
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,תבנית
 DocType: Sales Person,Sales Person Name,שם איש מכירות
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,נא להזין atleast חשבונית 1 בטבלה
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,הוסף משתמשים
@@ -2662,7 +2676,7 @@ DocType: Pricing Rule,Item Group,קבוצת פריט
 DocType: Task,Actual Start Date (via Time Logs),תאריך התחלה בפועל (באמצעות זמן יומנים)
 DocType: Stock Reconciliation Item,Before reconciliation,לפני הפיוס
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),מסים והיטלים נוסף (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
 DocType: Sales Order,Partly Billed,בחלק שחויב
 DocType: Item,Default BOM,BOM ברירת המחדל
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2670,11 +2684,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"סה""כ מצטיין Amt"
 DocType: Time Log Batch,Total Hours,"סה""כ שעות"
 DocType: Journal Entry,Printing Settings,הגדרות הדפסה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,רכב
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,הפריט נדרש
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,הזרקת מתכת
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,מתעודת משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,מתעודת משלוח
 DocType: Time Log,From Time,מזמן
 DocType: Notification Control,Custom Message,הודעה מותאמת אישית
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,בנקאות השקעות
@@ -2690,17 +2704,17 @@ DocType: Newsletter,A Lead with this email id should exist," ליד עם  דוא
 DocType: Stock Entry,From BOM,מBOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,בסיסי
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,עסקות המניה לפני {0} קפואים
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"אנא לחץ על 'צור לוח זמנים """
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,לתאריך צריך להיות זהה מתאריך לחופשה חצי יום
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"אנא לחץ על 'צור לוח זמנים """
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,לתאריך צריך להיות זהה מתאריך לחופשה חצי יום
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","למשל ק""ג, יחידה, מס, מ '"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,תאריך ההצטרפות חייב להיות גדול מ תאריך לידה
 DocType: Salary Structure,Salary Structure,שכר מבנה
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","כלל מחיר מרובה קיים באותם קריטריונים, אנא לפתור \ סכסוך על ידי הקצאת עדיפות. כללי מחיר: {0}"
 DocType: Account,Bank,בנק
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,חברת תעופה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,חומר נושא
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,חומר נושא
 DocType: Material Request Item,For Warehouse,למחסן
 DocType: Employee,Offer Date,תאריך הצעה
 DocType: Hub Settings,Access Token,גישת אסימון
@@ -2723,6 +2737,7 @@ DocType: Issue,Opening Time,מועד פתיחה
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ומכדי התאריכים מבוקשים ל
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
 DocType: Shipping Rule,Calculate Based On,חישוב המבוסס על
+DocType: Delivery Note Item,From Warehouse,ממחסן
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,קידוח
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ניפוח
 DocType: Purchase Taxes and Charges,Valuation and Total,"הערכת שווי וסה""כ"
@@ -2744,11 +2759,12 @@ DocType: C-Form,Amended From,תוקן מ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,חומר גלם
 DocType: Leave Application,Follow via Email,"עקוב באמצעות דוא""ל"
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,סכום מס לאחר סכום הנחה
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,חשבון ילד קיים עבור חשבון זה. אתה לא יכול למחוק את החשבון הזה.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,חשבון ילד קיים עבור חשבון זה. אתה לא יכול למחוק את החשבון הזה.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,כך או כמות היעד או סכום היעד היא חובה
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,אנא בחר תחילה תאריך פרסום
-DocType: Leave Allocation,Carry Forward,לְהַעֲבִיר הָלְאָה
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,אנא בחר תחילה תאריך פרסום
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,פתיחת תאריך צריכה להיות לפני סגירת תאריך
+DocType: Leave Control Panel,Carry Forward,לְהַעֲבִיר הָלְאָה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,מרכז עלות בעסקות קיימות לא ניתן להמיר לדג'ר
 DocType: Department,Days for which Holidays are blocked for this department.,ימים בי החגים חסומים למחלקה זו.
 ,Produced,מיוצר
@@ -2769,16 +2785,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),"סה""כ (AMT)"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,בידור ופנאי
 DocType: Purchase Order,The date on which recurring order will be stop,המועד שבו על מנת חוזר יהיה לעצור
 DocType: Quality Inspection,Item Serial No,מספר סידורי פריט
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} חייב להיות מופחת על ידי {1} או שאתה צריך להגדיל את סובלנות הגלישה
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} חייב להיות מופחת על ידי {1} או שאתה צריך להגדיל את סובלנות הגלישה
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,"הווה סה""כ"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,שעה
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",פריט בהמשכים {0} לא ניתן לעדכן \ באמצעות בורסת פיוס
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,העברת חומר לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,העברת חומר לספקים
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,מספר סידורי חדש לא יכול להיות מחסן. מחסן חייב להיות מוגדר על ידי Stock כניסה או קבלת רכישה
 DocType: Lead,Lead Type,סוג עופרת
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,צור הצעת מחיר
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,כל הפריטים הללו כבר חשבונית
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,כל הפריטים הללו כבר חשבונית
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},יכול להיות מאושר על ידי {0}
 DocType: Shipping Rule,Shipping Rule Conditions,משלוח תנאי Rule
 DocType: BOM Replace Tool,The new BOM after replacement,BOM החדש לאחר החלפה
@@ -2826,7 +2842,7 @@ DocType: C-Form,C-Form,C-טופס
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,זיהוי מבצע לא קבע
 DocType: Production Order,Planned Start Date,תאריך התחלה מתוכנן
 DocType: Serial No,Creation Document Type,סוג מסמך יצירה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,שימור. בקר ב
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,שימור. בקר ב
 DocType: Leave Type,Is Encash,האם encash
 DocType: Purchase Invoice,Mobile No,נייד לא
 DocType: Payment Tool,Make Journal Entry,הפוך יומן
@@ -2834,7 +2850,7 @@ DocType: Leave Allocation,New Leaves Allocated,עלים חדשים שהוקצו
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,נתוני פרויקט-חכם אינם זמינים להצעת מחיר
 DocType: Project,Expected End Date,תאריך סיום צפוי
 DocType: Appraisal Template,Appraisal Template Title,הערכת תבנית כותרת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,מסחרי
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,מסחרי
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,פריט הורה {0} לא חייב להיות פריט במלאי
 DocType: Cost Center,Distribution Id,הפצת זיהוי
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,שירותים מדהים
@@ -2850,14 +2866,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ערך תמורת תכונה {0} חייב להיות בטווח של {1} {2} במרווחים של {3}
 DocType: Tax Rule,Sales,מכירות
 DocType: Stock Entry Detail,Basic Amount,סכום בסיסי
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
+DocType: Leave Allocation,Unused leaves,עלים שאינם בשימוש
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,ברירת מחדל חשבונות חייבים
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,ניסור
 DocType: Tax Rule,Billing State,מדינת חיוב
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,למינציה
 DocType: Item Reorder,Transfer,העברה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Authorization Rule,Applicable To (Employee),כדי ישים (עובד)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
@@ -2873,6 +2890,7 @@ DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,לקוח {0} אינו קיים
 DocType: Attendance,Absent,נעדר
 DocType: Product Bundle,Product Bundle,Bundle מוצר
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},שורת {0}: התייחסות לא חוקית {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ריסוק
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,לרכוש תבנית מסים והיטלים
 DocType: Upload Attendance,Download Template,תבנית להורדה
@@ -2880,16 +2898,16 @@ DocType: GL Entry,Remarks,הערות
 DocType: Purchase Order Item Supplied,Raw Material Item Code,קוד פריט חומר הגלם
 DocType: Journal Entry,Write Off Based On,לכתוב את מבוסס על
 DocType: Features Setup,POS View,POS צפה
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,שיא התקנה למס 'סידורי
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,שיא התקנה למס 'סידורי
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,יציקה רציפה
-sites/assets/js/erpnext.min.js +10,Please specify a,אנא ציין
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,אנא ציין
 DocType: Offer Letter,Awaiting Response,ממתין לתגובה
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,מעל
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,שינוי גודל קר
 DocType: Salary Slip,Earning & Deduction,השתכרות וניכוי
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,חשבון {0} אינו יכול להיות קבוצה
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,אזור
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,אופציונאלי. הגדרה זו תשמש לסינון בעסקות שונות.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,אופציונאלי. הגדרה זו תשמש לסינון בעסקות שונות.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
 DocType: Holiday List,Weekly Off,Off השבועי
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","לדוגמה: 2012, 2012-13"
@@ -2932,12 +2950,12 @@ DocType: Production Order,Expected Delivery Date,תאריך אספקה ​​צ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,בולט
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ליהוק אידוי-דפוס
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,הוצאות בידור
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,מכירות חשבונית {0} יש לבטל לפני ביטול הזמנת מכירות זה
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,גיל
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,מכירות חשבונית {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,גיל
 DocType: Time Log,Billing Amount,סכום חיוב
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,כמות לא חוקית שצוינה עבור פריט {0}. כמות צריכה להיות גדולה מ -0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,בקשות לחופשה.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,חשבון עם עסקה הקיימת לא ניתן למחוק
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,חשבון עם עסקה הקיימת לא ניתן למחוק
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,הוצאות משפטיות
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","היום בחודש שבו על מנת אוטומטי ייווצר למשל 05, 28 וכו '"
 DocType: Sales Invoice,Posting Time,זמן פרסום
@@ -2946,9 +2964,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,לוגו
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,לבדוק את זה אם אתה רוצה להכריח את המשתמש לבחור סדרה לפני השמירה. לא יהיה ברירת מחדל אם תבדקו את זה.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},אין פריט עם מספר סידורי {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,הודעות פתוחות
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,הודעות פתוחות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,הוצאות ישירות
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,האם אתה באמת רוצה מגופת בקשת חומר זה?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,הכנסות מלקוחות חדשות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,הוצאות נסיעה
 DocType: Maintenance Visit,Breakdown,התפלגות
@@ -2959,7 +2976,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,כבתאריך
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,השחזה
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,מחסן ברירת מחדל הוא חובה עבור פריט המניה.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,מחסן ברירת מחדל הוא חובה עבור פריט המניה.
 DocType: Feed,Full Name,שם מלא
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,קטפתי
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},תשלום השכר עבור החודש {0} ושנה {1}
@@ -2982,7 +2999,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,להוסיף ש
 DocType: Buying Settings,Default Supplier Type,סוג ספק ברירת מחדל
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,חציבה
 DocType: Production Order,Total Operating Cost,"עלות הפעלה סה""כ"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,הערה: פריט {0} נכנסה מספר פעמים
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,הערה: פריט {0} נכנסה מספר פעמים
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,כל אנשי הקשר.
 DocType: Newsletter,Test Email Id,"דוא""ל מבחן זיהוי"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,קיצור חברה
@@ -3006,11 +3023,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ציט
 DocType: Stock Settings,Role Allowed to edit frozen stock,תפקיד מחמד לערוך המניה קפוא
 ,Territory Target Variance Item Group-Wise,פריט יעד שונות טריטורית קבוצה-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,בכל קבוצות הלקוחות
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,תבנית מס היא חובה.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,חשבון {0}: הורה חשבון {1} לא קיימת
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),מחיר מחירון שיעור (חברת מטבע)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} מצב הוא 'הפסיק'
 DocType: Account,Temporary,זמני
 DocType: Address,Preferred Billing Address,כתובת חיוב מועדפת
 DocType: Monthly Distribution Percentage,Percentage Allocation,אחוז ההקצאה
@@ -3028,13 +3044,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,פריט Detail המס
 DocType: Purchase Order Item,Supplier Quotation,הצעת מחיר של ספק
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,גיהוץ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} הוא הפסיק
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} הוא הפסיק
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
 DocType: Lead,Add to calendar on this date,הוסף ללוח שנה בתאריך זה
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,כללים להוספת עלויות משלוח.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,אירועים קרובים
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,אירועים קרובים
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,הלקוח נדרש
 DocType: Letter Head,Letter Head,מכתב ראש
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,כניסה מהירה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} הוא חובה עבור שבות
 DocType: Purchase Order,To Receive,לקבל
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,פסיכולוג הולם
@@ -3057,25 +3074,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast מחסן אחד הוא חובה
 DocType: Serial No,Out of Warranty,מתוך אחריות
 DocType: BOM Replace Tool,Replace,החלף
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,נא להזין את ברירת מחדל של יחידת מדידה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,נא להזין את ברירת מחדל של יחידת מדידה
 DocType: Purchase Invoice Item,Project Name,שם פרויקט
 DocType: Supplier,Mention if non-standard receivable account,להזכיר אם חשבון חייבים שאינם סטנדרטי
 DocType: Workflow State,Edit,עריכה
 DocType: Journal Entry Account,If Income or Expense,אם הכנסה או הוצאה
 DocType: Features Setup,Item Batch Nos,אצווה פריט מס '
 DocType: Stock Ledger Entry,Stock Value Difference,הבדל ערך המניה
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,משאבי אנוש
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,משאבי אנוש
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,תשלום פיוס תשלום
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,נכסי מסים
 DocType: BOM Item,BOM No,BOM לא
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,היומן {0} אין חשבון {1} או שכבר מתאים נגד שובר אחר
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,היומן {0} אין חשבון {1} או שכבר מתאים נגד שובר אחר
 DocType: Item,Moving Average,ממוצע נע
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM אשר יוחלף
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,החדש במלאי של אוני 'מישגן חייב להיות שונים משל אוני' מישגן המניה הנוכחי
 DocType: Account,Debit,חיוב
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,עלים חייבים להיות מוקצים בכפולות של 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,עלים חייבים להיות מוקצים בכפולות של 0.5
 DocType: Production Order,Operation Cost,עלות מבצע
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,העלה נוכחות מקובץ csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt מצטיין
@@ -3083,7 +3100,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,קבו
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","כדי להקצות נושא זה, להשתמש בלחצן ""הקצאה"" בסרגל הצדדי."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],מניות הקפאת Older Than [ימים]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","אם שניים או יותר כללי תמחור נמצאים בהתבסס על התנאים לעיל, עדיפות מיושם. עדיפות היא מספר בין 0 ל 20, וערך ברירת מחדל הוא אפס (ריק). מספר גבוה יותר פירושו הם הקובעים אם יש כללי תמחור מרובים עם אותם תנאים."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,נגד חשבונית
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,שנת כספים: {0} אינו קיים
 DocType: Currency Exchange,To Currency,למטבע
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,לאפשר למשתמשים הבאים לאשר בקשות לצאת לימי גוש.
@@ -3112,7 +3128,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),שי
 DocType: Stock Entry Detail,Additional Cost,עלות נוספת
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,תאריך הפיננסי סוף השנה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","לא לסנן מבוססים על השובר לא, אם מקובצים לפי שובר"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,הפוך הצעת מחיר של ספק
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,הפוך הצעת מחיר של ספק
 DocType: Quality Inspection,Incoming,נכנסים
 DocType: BOM,Materials Required (Exploded),חומרים דרושים (התפוצצו)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),להפחית צבירה לחופשה ללא תשלום (LWP)
@@ -3120,10 +3136,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},# השורה {0}: סידורי לא {1} אינו תואם עם {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,חופשה מזדמנת
 DocType: Batch,Batch ID,זיהוי אצווה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},הערה: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},הערה: {0}
 ,Delivery Note Trends,מגמות תעודת משלוח
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,סיכום זה של השבוע
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} חייב להיות פריט שנרכש או-חוזה Sub בשורת {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} חייב להיות פריט שנרכש או-חוזה Sub בשורת {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,חשבון: {0} ניתן לעדכן רק דרך עסקות במלאי
 DocType: GL Entry,Party,מפלגה
 DocType: Sales Order,Delivery Date,תאריך לידה
@@ -3136,7 +3152,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ממוצע. שיעור קנייה
 DocType: Task,Actual Time (in Hours),זמן בפועל (בשעות)
 DocType: Employee,History In Company,ההיסטוריה בחברה
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,ידיעונים
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,ידיעונים
 DocType: Address,Shipping,משלוח
 DocType: Stock Ledger Entry,Stock Ledger Entry,מניית דג'ר כניסה
 DocType: Department,Leave Block List,השאר בלוק רשימה
@@ -3155,7 +3171,7 @@ DocType: Account,Auditor,מבקר
 DocType: Purchase Order,End date of current order's period,תאריך סיום של התקופה של הצו הנוכחי
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,הפוך מכתב הצעת
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,חזור
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,ברירת מחדל של יחידת מדידה ולריאנט חייבת להיות זהה לתבנית
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,ברירת מחדל של יחידת מדידה ולריאנט חייבת להיות זהה לתבנית
 DocType: DocField,Fold,מקפלים
 DocType: Production Order Operation,Production Order Operation,להזמין מבצע ייצור
 DocType: Pricing Rule,Disable,בטל
@@ -3187,7 +3203,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,דיווחים ל
 DocType: SMS Settings,Enter url parameter for receiver nos,הזן פרמטר url למקלט nos
 DocType: Sales Invoice,Paid Amount,סכום ששולם
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',סגירת חשבון {0} חייבת להיות מהסוג 'אחריות'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',סגירת חשבון {0} חייבת להיות מהסוג 'אחריות'
 ,Available Stock for Packing Items,מלאי זמין לפריטי אריזה
 DocType: Item Variant,Item Variant,פריט Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,הגדרת תבנית כתובת זו כברירת מחדל כפי שאין ברירת מחדל אחרת
@@ -3195,7 +3211,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,ניהול איכות
 DocType: Production Planning Tool,Filter based on customer,מסנן המבוסס על לקוחות
 DocType: Payment Tool Detail,Against Voucher No,נגד שובר לא
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},נא להזין את הכמות לפריט {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},נא להזין את הכמות לפריט {0}
 DocType: Employee External Work History,Employee External Work History,העובד חיצוני היסטוריה עבודה
 DocType: Tax Rule,Purchase,רכישה
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,יתרת כמות
@@ -3231,12 +3247,12 @@ Note: BOM = Bill of Materials","קבוצה כוללת של פריטים ** ** ל
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},מספר סידורי הוא חובה עבור פריט {0}
 DocType: Item Variant Attribute,Attribute,תכונה
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,נא לציין מ / אל נעים
-sites/assets/js/desk.min.js +7652,Created By,נוצר על-ידי
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,נוצר על-ידי
 DocType: Serial No,Under AMC,תחת AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,שיעור הערכת שווי פריט מחושב מחדש שוקל סכום שובר עלות נחת
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,הגדרות ברירת מחדל עבור עסקות מכירה.
 DocType: BOM Replace Tool,Current BOM,BOM הנוכחי
-sites/assets/js/erpnext.min.js +8,Add Serial No,להוסיף מספר סידורי
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,להוסיף מספר סידורי
 DocType: Production Order,Warehouses,מחסנים
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,הדפסה ונייחת
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,צומת קבוצה
@@ -3246,12 +3262,13 @@ DocType: Workstation,per hour,לשעה
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,חשבון למחסן (מלאי תמידי) ייווצר תחת חשבון זה.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה.
 DocType: Company,Distribution,הפצה
-sites/assets/js/erpnext.min.js +50,Amount Paid,הסכום ששולם
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,הסכום ששולם
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,מנהל פרויקט
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,שדר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,הנחה מרבית המוותרת עבור פריט: {0} היא% {1}
 DocType: Customer,Default Taxes and Charges,מסים והיטלים שברירת מחדל
 DocType: Account,Receivable,חייבים
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,# השורה {0}: לא הורשו לשנות ספק כהזמנת רכש כבר קיימת
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,תפקיד שמותר להגיש עסקות חריגות ממסגרות אשראי שנקבע.
 DocType: Sales Invoice,Supplier Reference,הפניה ספק
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","אם מסומן, BOM לפריטים תת-הרכבה ייחשב להשגת חומרי גלם. אחרת, יטופלו כל הפריטים תת-ההרכבה כחומר גלם."
@@ -3288,8 +3305,8 @@ DocType: Email Digest,Add/Remove Recipients,הוספה / הסרה של מקבל
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},עסקה לא אפשרה נגד הפקה הפסיקה להזמין {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","כדי להגדיר שנת כספים זו כברירת מחדל, לחץ על 'קבע כברירת מחדל'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),"התקנת שרת הנכנס לid הדוא""ל של תמיכה. (למשל support@example.com)"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,מחסור כמות
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: Salary Slip,Salary Slip,שכר Slip
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,צִחצוּחַ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'עד תאריך' נדרש
@@ -3302,6 +3319,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","כאשר כל אחת מהעסקאות בדקו ""הוגש"", מוקפץ הדוא""ל נפתח באופן אוטומטי לשלוח דואר אלקטרוני לקשורים ""צור קשר"" בעסקה ש, עם העסקה כקובץ מצורף. המשתמשים יכולים או לא יכולים לשלוח הדואר האלקטרוני."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,הגדרות גלובליות
 DocType: Employee Education,Employee Education,חינוך לעובדים
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
 DocType: Salary Slip,Net Pay,חבילת נקי
 DocType: Account,Account,חשבון
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,מספר סידורי {0} כבר קיבל
@@ -3334,7 +3352,7 @@ DocType: BOM,Manufacturing User,משתמש ייצור
 DocType: Purchase Order,Raw Materials Supplied,חומרי גלם הסופק
 DocType: Purchase Invoice,Recurring Print Format,פורמט הדפסה חוזר
 DocType: Communication,Series,סדרה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,תאריך אספקה ​​צפוי לא יכול להיות לפני תאריך הזמנת הרכש
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,תאריך אספקה ​​צפוי לא יכול להיות לפני תאריך הזמנת הרכש
 DocType: Appraisal,Appraisal Template,הערכת תבנית
 DocType: Communication,Email,"דוא""ל"
 DocType: Item Group,Item Classification,סיווג פריט
@@ -3379,6 +3397,7 @@ DocType: HR Settings,Payroll Settings,הגדרות שכר
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,התאם חשבוניות ותשלומים הלא צמוד.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,להזמין מקום
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,שורש לא יכול להיות מרכז עלות הורה
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,מותג בחר ...
 DocType: Sales Invoice,C-Form Applicable,C-טופס ישים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
 DocType: Supplier,Address and Contacts,כתובת ומגעים
@@ -3389,7 +3408,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,קבל שוברים מצטיינים
 DocType: Warranty Claim,Resolved By,נפתר על ידי
 DocType: Appraisal,Start Date,תאריך ההתחלה
-sites/assets/js/desk.min.js +7629,Value,ערך
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,ערך
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,להקצות עלים לתקופה.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,לחץ כאן כדי לאמת
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,חשבון {0}: לא ניתן להקצות את עצמו כחשבון אב
@@ -3405,14 +3424,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox גישה מחמד
 DocType: Dropbox Backup,Weekly,שבועי
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,לדוגמא. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,קבל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,קבל
 DocType: Maintenance Visit,Fully Completed,הושלם במלואו
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,הכשרה חינוכית
 DocType: Workstation,Operating Costs,עלויות תפעול
 DocType: Employee Leave Approver,Employee Leave Approver,עובד חופשה מאשר
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} נוספו בהצלחה לרשימת הדיוור שלנו.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,עיבוד אלומת אלקטרונים
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,רכישת Master מנהל
@@ -3425,7 +3444,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,DOCTYPE Prevdoc
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,להוסיף מחירים / עריכה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,תרשים של מרכזי עלות
 ,Requested Items To Be Ordered,פריטים מבוקשים כדי להיות הורה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,ההזמנות שלי
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,ההזמנות שלי
 DocType: Price List,Price List Name,שם מחיר המחירון
 DocType: Time Log,For Manufacturing,לייצור
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,סיכומים
@@ -3436,7 +3455,7 @@ DocType: Account,Income,הכנסה
 DocType: Industry Type,Industry Type,סוג התעשייה
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,משהו השתבש!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,מכירות חשבונית {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,מכירות חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,תאריך סיום
 DocType: Purchase Invoice Item,Amount (Company Currency),הסכום (חברת מטבע)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ליהוק למות
@@ -3450,10 +3469,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,שנה
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,נקודה-של-מכירת פרופיל
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,אנא עדכן את הגדרות SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,הזמן התחבר {0} כבר מחויב
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,הזמן התחבר {0} כבר מחויב
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,"הלוואות בחו""ל"
 DocType: Cost Center,Cost Center Name,שם מרכז עלות
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,פריט {0} עם מספר סידורי {1} כבר מותקן
 DocType: Maintenance Schedule Detail,Scheduled Date,תאריך מתוכנן
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,"Amt שילם סה""כ"
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,הודעות יותר מ -160 תווים יפוצלו למספר הודעות
@@ -3461,10 +3479,10 @@ DocType: Purchase Receipt Item,Received and Accepted,קיבלתי ואשר
 ,Serial No Service Contract Expiry,שירות סידורי חוזה תפוגה
 DocType: Item,Unit of Measure Conversion,יחידה של המרת מדד
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,העובד אינו ניתן לשינוי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,אתה לא יכול אשראי וכרטיסי חיובו חשבון באותו הזמן
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,אתה לא יכול אשראי וכרטיסי חיובו חשבון באותו הזמן
 DocType: Naming Series,Help HTML,העזרה HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},"weightage סה""כ הוקצה צריך להיות 100%. זה {0}"
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},הפרשה ליתר {0} חצה לפריט {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},הפרשה ליתר {0} חצה לפריט {1}
 DocType: Address,Name of person or organization that this address belongs to.,שמו של אדם או ארגון שכתובת זו שייכת ל.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,הספקים שלך
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,לא ניתן להגדיר כאבודים כלהזמין מכירות נעשה.
@@ -3474,10 +3492,11 @@ DocType: Features Setup,Exports,יצוא
 DocType: Lead,Converted,המרה
 DocType: Item,Has Serial No,יש מספר סידורי
 DocType: Employee,Date of Issue,מועד ההנפקה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
 DocType: Issue,Content Type,סוג תוכן
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,מחשב
 DocType: Item,List this Item in multiple groups on the website.,רשימת פריט זה במספר קבוצות באתר.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,פריט: {0} אינו קיים במערכת
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
 DocType: Payment Reconciliation,Get Unreconciled Entries,קבל ערכים לא מותאמים
@@ -3488,14 +3507,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,למחסן
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},חשבון {0} כבר נכנס יותר מפעם אחת בשנת הכספים {1}
 ,Average Commission Rate,העמלה ממוצעת שערי
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,נוכחות לא יכולה להיות מסומנת עבור תאריכים עתידיים
 DocType: Pricing Rule,Pricing Rule Help,עזרה כלל תמחור
 DocType: Purchase Taxes and Charges,Account Head,חשבון ראש
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,עדכון עלויות נוספות לחישוב עלות נחתה של פריטים
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,חשמל
 DocType: Stock Entry,Total Value Difference (Out - In),הבדל ערך כולל (Out - ב)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,שורת {0}: שער החליפין הוא חובה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,שורת {0}: שער החליפין הוא חובה
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},זיהוי משתמש לא נקבע לעובדים {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,מתביעת אחריות
@@ -3508,15 +3527,17 @@ DocType: Buying Settings,Naming Series,סדרת שמות
 DocType: Leave Block List,Leave Block List Name,השאר שם בלוק רשימה
 DocType: User,Enabled,מופעל
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,נכסים במלאי
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},האם אתה באמת רוצה להגיש את כל תלוש המשכורת עבור חודש {0} ושנה {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},האם אתה באמת רוצה להגיש את כל תלוש המשכורת עבור חודש {0} ושנה {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,מנויים יבוא
 DocType: Target Detail,Target Qty,יעד כמות
 DocType: Attendance,Present,הווה
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,תעודת משלוח {0} אסור תוגש
 DocType: Notification Control,Sales Invoice Message,מסר חשבונית מכירות
 DocType: Authorization Rule,Based On,המבוסס על
-,Ordered Qty,כמות הורה
+DocType: Sales Order Item,Ordered Qty,כמות הורה
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},תקופה ומתקופה לתאריכי חובה עבור חוזר {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,פעילות פרויקט / משימה.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,צור תלושי שכר
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,"{0} אינו מזהה דוא""ל חוקי"
@@ -3555,7 +3576,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,נוכחות העלאה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM וכמות הייצור נדרשים
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,טווח הזדקנות 2
-DocType: Journal Entry Account,Amount,הסכום
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,הסכום
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,מרתק
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM הוחלף
 ,Sales Analytics,Analytics מכירות
@@ -3582,7 +3603,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,תאריך צפוי לא יכול להיות לפני תאריך בקשת חומר
 DocType: Contact Us Settings,City,עיר
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,עיבוד קולי
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,שגיאה: לא מזהה בתוקף?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,שגיאה: לא מזהה בתוקף?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,פריט {0} חייב להיות פריט מכירות
 DocType: Naming Series,Update Series Number,עדכון סדרת מספר
 DocType: Account,Equity,הון עצמי
@@ -3597,7 +3618,7 @@ DocType: Purchase Taxes and Charges,Actual,בפועל
 DocType: Authorization Rule,Customerwise Discount,Customerwise דיסקונט
 DocType: Purchase Invoice,Against Expense Account,נגד חשבון הוצאות
 DocType: Production Order,Production Order,הזמנת ייצור
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,הערה התקנת {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,הערה התקנת {0} כבר הוגשה
 DocType: Quotation Item,Against Docname,נגד Docname
 DocType: SMS Center,All Employee (Active),כל העובד (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,צפה עכשיו
@@ -3605,14 +3626,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,עלות חומרי גלם
 DocType: Item,Re-Order Level,סדר מחדש רמה
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,הזן פריטים וכמות מתוכננת עבורו ברצון להעלות הזמנות ייצור או להוריד חומרי גלם לניתוח.
-sites/assets/js/list.min.js +174,Gantt Chart,תרשים גנט
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,תרשים גנט
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,במשרה חלקית
 DocType: Employee,Applicable Holiday List,רשימת Holiday ישימה
 DocType: Employee,Cheque,המחאה
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,סדרת עדכון
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,סוג הדוח הוא חובה
 DocType: Item,Serial Number Series,סדרת מספר סידורי
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},המחסן הוא חובה עבור פריט המניה {0} בשורת {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},המחסן הוא חובה עבור פריט המניה {0} בשורת {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,קמעונאות וסיטונאות
 DocType: Issue,First Responded On,הגיב בראשון
 DocType: Website Item Group,Cross Listing of Item in multiple groups,רישום צלב של פריט בקבוצות מרובות
@@ -3627,7 +3648,7 @@ DocType: Attendance,Attendance,נוכחות
 DocType: Page,No,לא
 DocType: BOM,Materials,חומרים
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","אם לא בדק, הרשימה תצטרך להוסיף לכל מחלקה שבה יש ליישם."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,תאריך הפרסום ופרסום הזמן הוא חובה
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,תאריך הפרסום ופרסום הזמן הוא חובה
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,תבנית מס בעסקות קנייה.
 ,Item Prices,מחירי פריט
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,במילים יהיו גלוי לאחר שתשמרו את הזמנת הרכש.
@@ -3647,9 +3668,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,הוצאות הנהלה
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ייעוץ
 DocType: Customer Group,Parent Customer Group,קבוצת לקוחות הורה
-sites/assets/js/erpnext.min.js +50,Change,שינוי
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,שינוי
 DocType: Purchase Invoice,Contact Email,"דוא""ל ליצירת קשר"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',"הזמנת רכש {0} היא ""הפסיקה"""
 DocType: Appraisal Goal,Score Earned,הציון שנצבר
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","לדוגמא: ""החברה LLC שלי"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,תקופת הודעה
@@ -3659,12 +3679,13 @@ DocType: Packing Slip,Gross Weight UOM,משקלים של אוני 'מישגן
 DocType: Email Digest,Receivables / Payables,חייבים / זכאי
 DocType: Delivery Note Item,Against Sales Invoice,נגד חשבונית מכירות
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,הטבעה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,חשבון אשראי
 DocType: Landed Cost Item,Landed Cost Item,פריט עלות נחת
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,הצג אפס ערכים
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,כמות של פריט המתקבלת לאחר ייצור / אריזה מחדש מכמויות מסוימות של חומרי גלם
 DocType: Payment Reconciliation,Receivable / Payable Account,חשבון לקבל / לשלם
 DocType: Delivery Note Item,Against Sales Order Item,נגד פריט להזמין מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
 DocType: Item,Default Warehouse,מחסן ברירת מחדל
 DocType: Task,Actual End Date (via Time Logs),תאריך סיום בפועל (באמצעות זמן יומנים)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},תקציב לא ניתן להקצות נגד קבוצת חשבון {0}
@@ -3678,7 +3699,7 @@ DocType: Issue,Support Team,צוות תמיכה
 DocType: Appraisal,Total Score (Out of 5),ציון כולל (מתוך 5)
 DocType: Contact Us Settings,State,מדינה
 DocType: Batch,Batch,אצווה
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,מאזן
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,מאזן
 DocType: Project,Total Expense Claim (via Expense Claims),תביעת הוצאות כוללת (באמצעות תביעות הוצאות)
 DocType: User,Gender,מין
 DocType: Journal Entry,Debit Note,הערה חיוב
@@ -3694,9 +3715,8 @@ DocType: Lead,Blog Subscriber,Subscriber בלוג
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,יצירת כללים להגבלת עסקות המבוססות על ערכים.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","אם מסומן, אין סך הכל. של ימי עבודה יכלול חגים, וזה יקטין את הערך של יום בממוצע שכר"
 DocType: Purchase Invoice,Total Advance,"Advance סה""כ"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,בקשת מגופת חומר
 DocType: Workflow State,User,משתמש
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,עיבוד שכר
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,עיבוד שכר
 DocType: Opportunity Item,Basic Rate,שיעור בסיסי
 DocType: GL Entry,Credit Amount,סכום אשראי
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,קבע כאבוד
@@ -3704,7 +3724,7 @@ DocType: Customer,Credit Days Based On,ימי אשראי לפי
 DocType: Tax Rule,Tax Rule,כלל מס
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,לשמור על שיעור זהה לכל אורך מחזור מכירות
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,מתכנן יומני זמן מחוץ לשעתי עבודה תחנת עבודה.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} כבר הוגש
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} כבר הוגש
 ,Items To Be Requested,פריטים להידרש
 DocType: Purchase Order,Get Last Purchase Rate,קבל אחרון תעריף רכישה
 DocType: Time Log,Billing Rate based on Activity Type (per hour),דרג חיוב המבוסס על סוג הפעילות (לשעה)
@@ -3713,6 +3733,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","זיהוי חברת דוא""ל לא נמצא, ומכאן אלקטרוניים לא נשלח"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),יישום של קרנות (נכסים)
 DocType: Production Planning Tool,Filter based on item,מסנן המבוסס על פריט
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,חשבון חיוב
 DocType: Fiscal Year,Year Start Date,תאריך התחלת שנה
 DocType: Attendance,Employee Name,שם עובד
 DocType: Sales Invoice,Rounded Total (Company Currency),"סה""כ מעוגל (חברת מטבע)"
@@ -3724,14 +3745,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,לתלייה
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,הטבות לעובדים
 DocType: Sales Invoice,Is POS,האם קופה
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
 DocType: Production Order,Manufactured Qty,כמות שיוצרה
 DocType: Purchase Receipt Item,Accepted Quantity,כמות מקובלת
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} לא קיים
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,הצעות חוק שהועלו ללקוחות.
 DocType: DocField,Default,ברירת מחדל
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,פרויקט זיהוי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} מנויים הוסיפו
 DocType: Maintenance Schedule,Schedule,לוח זמנים
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","להגדיר תקציב עבור מרכז עלות זו. כדי להגדיר פעולת תקציב, ראה "חברת רשימה""
@@ -3739,7 +3760,7 @@ DocType: Account,Parent Account,חשבון הורה
 DocType: Quality Inspection Reading,Reading 3,רידינג 3
 ,Hub,רכזת
 DocType: GL Entry,Voucher Type,סוג שובר
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
 DocType: Expense Claim,Approved,אושר
 DocType: Pricing Rule,Price,מחיר
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
@@ -3748,22 +3769,24 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,חינוך
 DocType: Selling Settings,Campaign Naming By,Naming קמפיין ב
 DocType: Employee,Current Address Is,כתובת הנוכחית
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","אופציונאלי. סטי ברירת מחדל המטבע של החברה, אם לא צוין."
 DocType: Address,Office,משרד
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,דוחות סטנדרטיים
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,כתב עת חשבונאות ערכים.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
+DocType: Delivery Note Item,Available Qty at From Warehouse,כמות זמינה ממחסן
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,כדי ליצור חשבון מס
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,נא להזין את חשבון הוצאות
 DocType: Account,Stock,המניה
 DocType: Employee,Current Address,כתובת נוכחית
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","אם פריט הנו נגזר של פריט נוסף לאחר מכן תיאור, תמונה, תמחור, וכו 'ייקבעו מסים מהתבנית אלא אם צוין במפורש"
 DocType: Serial No,Purchase / Manufacture Details,רכישה / פרטי ייצור
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,מלאי אצווה
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,מלאי אצווה
 DocType: Employee,Contract End Date,תאריך החוזה End
 DocType: Sales Order,Track this Sales Order against any Project,עקוב אחר הזמנת מכירות זה נגד כל פרויקט
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,הזמנות משיכה (תלויות ועומדות כדי לספק) המבוסס על הקריטריונים לעיל
 DocType: DocShare,Document Type,סוג המסמך
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,מהצעת המחיר של ספק
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,מהצעת המחיר של ספק
 DocType: Deduction Type,Deduction Type,סוג הניכוי
 DocType: Attendance,Half Day,חצי יום
 DocType: Pricing Rule,Min Qty,דקות כמות
@@ -3774,20 +3797,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,לכמות (מיוצר כמות) הוא חובה
 DocType: Stock Entry,Default Target Warehouse,מחסן יעד ברירת מחדל
 DocType: Purchase Invoice,Net Total (Company Currency),"סה""כ נקי (חברת מטבע)"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,שורת {0}: מפלגת סוג והמפלגה הוא ישים רק נגד חייבים / חשבון לתשלום
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,שורת {0}: מפלגת סוג והמפלגה הוא ישים רק נגד חייבים / חשבון לתשלום
 DocType: Notification Control,Purchase Receipt Message,מסר קבלת רכישה
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,עלים שהוקצו סה"כ יותר מ תקופה
 DocType: Production Order,Actual Start Date,תאריך התחלה בפועל
 DocType: Sales Order,% of materials delivered against this Sales Order,% מחומרים מועברים נגד הזמנת מכירה זה
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,תנועת פריט שיא.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,תנועת פריט שיא.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,עלון רשימה מנוי
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,שירות
 DocType: Hub Settings,Hub Settings,הגדרות Hub
 DocType: Project,Gross Margin %,% שיעור רווח גולמי
 DocType: BOM,With Operations,עם מבצעים
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,רישומים חשבונאיים כבר נעשו במטבע {0} לחברת {1}. אנא בחר חשבון לקבל או לשלם במטבע {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,רישומים חשבונאיים כבר נעשו במטבע {0} לחברת {1}. אנא בחר חשבון לקבל או לשלם במטבע {0}.
 ,Monthly Salary Register,חודשי שכר הרשמה
-apps/frappe/frappe/website/template.py +123,Next,הבא
+apps/frappe/frappe/website/template.py +140,Next,הבא
 DocType: Warranty Claim,If different than customer address,אם שונה מכתובת הלקוח
 DocType: BOM Operation,BOM Operation,BOM מבצע
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,אלקטרו
@@ -3818,6 +3842,7 @@ DocType: Purchase Invoice,Next Date,התאריך הבא
 DocType: Employee Education,Major/Optional Subjects,נושאים עיקריים / אופציונליים
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,נא להזין את המסים והיטלים ש
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,עיבוד שבבי
+DocType: Sales Invoice Item,Drop Ship,זרוק משלוח
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","כאן אתה יכול לשמור על פרטים כמו שם וכיבוש של הורה, בן זוג וילדי משפחה"
 DocType: Hub Settings,Seller Name,שם מוכר
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),מסים והיטלים שנוכה (חברת מטבע)
@@ -3844,29 +3869,29 @@ DocType: Purchase Order,To Receive and Bill,כדי לקבל וביל
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,מעצב
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,תבנית תנאים והגבלות
 DocType: Serial No,Delivery Details,פרטי משלוח
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,ליצור באופן אוטומטי בקשת חומר אם כמות נופלת מתחת לרמה זו
 ,Item-wise Purchase Register,הרשם רכישת פריט-חכם
 DocType: Batch,Expiry Date,תַאֲרִיך תְפוּגָה
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","כדי להגדיר רמת הזמנה חוזרת, פריט חייב להיות פריט רכישה או פריט ייצור"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","כדי להגדיר רמת הזמנה חוזרת, פריט חייב להיות פריט רכישה או פריט ייצור"
 ,Supplier Addresses and Contacts,כתובות ספק ומגעים
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,אנא בחר תחילה קטגוריה
 apps/erpnext/erpnext/config/projects.py +18,Project master.,אדון פרויקט.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,לא מראה שום סימן כמו $$ וכו 'הבא למטבעות.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(חצי יום)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(חצי יום)
 DocType: Supplier,Credit Days,ימי אשראי
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,קבל פריטים מBOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,קבל פריטים מBOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,להוביל ימי זמן
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,הצעת חוק של חומרים
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},שורת {0}: מפלגת סוג והמפלגה נדרשים לבקל / חשבון זכאים {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},שורת {0}: מפלגת סוג והמפלגה נדרשים לבקל / חשבון זכאים {1}
 DocType: Dropbox Backup,Send Notifications To,לשלוח הודעות ל
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,תאריך אסמכתא
 DocType: Employee,Reason for Leaving,סיבה להשארה
 DocType: Expense Claim Detail,Sanctioned Amount,סכום גושפנקא
 DocType: GL Entry,Is Opening,האם פתיחה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},שורת {0}: כניסת חיוב לא יכולה להיות מקושרת עם {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,חשבון {0} אינו קיים
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},שורת {0}: כניסת חיוב לא יכולה להיות מקושרת עם {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,חשבון {0} אינו קיים
 DocType: Account,Cash,מזומנים
 DocType: Employee,Short biography for website and other publications.,ביוגרפיה קצרות באתר האינטרנט של ופרסומים אחרים.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},אנא ליצור מבנה שכר לעובד {0}
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 0f4d4cbb19..6f312cbfd8 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,वेतन साधन
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","आप मौसम के आधार पर नज़र रखने के लिए चाहते हैं, तो मासिक वितरण चुनें।"
 DocType: Employee,Divorced,तलाकशुदा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,चेतावनी: एक ही मद कई बार दर्ज किया गया है।
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,चेतावनी: एक ही मद कई बार दर्ज किया गया है।
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,आइटम पहले से ही synced
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,आइटम एक सौदे में कई बार जोड़े जाने की अनुमति दें
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,सामग्री भेंट {0} इस वारंटी का दावा रद्द करने से पहले रद्द
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,संघनन से अधिक है sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},मुद्रा मूल्य सूची के लिए आवश्यक है {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* लेनदेन में गणना की जाएगी.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,सामग्री अनुरोध से
+DocType: Purchase Order,Customer Contact,ग्राहक से संपर्क
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,सामग्री अनुरोध से
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ट्री
 DocType: Job Applicant,Job Applicant,नौकरी आवेदक
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,कोई और अधिक परिणाम है।
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,ग्राहक का नाम
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","मुद्रा , रूपांतरण दर , निर्यात , कुल , निर्यात महायोग आदि की तरह सभी निर्यात संबंधित क्षेत्रों डिलिवरी नोट , स्थिति , कोटेशन , बिक्री चालान , बिक्री आदेश आदि में उपलब्ध हैं"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,प्रमुखों (या समूह) के खिलाफ जो लेखांकन प्रविष्टियों बना रहे हैं और संतुलन बनाए रखा है।
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),बकाया {0} शून्य से भी कम नहीं किया जा सकता है के लिए ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),बकाया {0} शून्य से भी कम नहीं किया जा सकता है के लिए ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 मिनट चूक
 DocType: Leave Type,Leave Type Name,प्रकार का नाम छोड़ दो
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,सीरीज सफलतापूर्वक अपडेट
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,एकाधिक आइटम की
 DocType: SMS Center,All Supplier Contact,सभी आपूर्तिकर्ता संपर्क
 DocType: Quality Inspection Reading,Parameter,प्राचल
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,उम्मीद अंत तिथि अपेक्षित प्रारंभ तिथि से कम नहीं हो सकता है
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,वास्तव में उत्पादन क्रम आगे बढ़ाना चाहते हैं:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,पंक्ति # {0}: दर के रूप में ही किया जाना चाहिए {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,नई छुट्टी के लिए अर्जी
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,नई छुट्टी के लिए अर्जी
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,बैंक ड्राफ्ट
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. इस विकल्प का उपयोग ग्राहक वार आइटम कोड को बनाए रखने और कोड के आधार पर विकल्प खोज के लिए करे
 DocType: Mode of Payment Account,Mode of Payment Account,भुगतान खाता का तरीका
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,दिखा
 DocType: Sales Invoice Item,Quantity,मात्रा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ऋण (देनदारियों)
 DocType: Employee Education,Year of Passing,पासिंग का वर्ष
-sites/assets/js/erpnext.min.js +27,In Stock,स्टॉक में
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,केवल unbilled बिक्री आदेश के खिलाफ भुगतान कर सकते हैं
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,स्टॉक में
 DocType: Designation,Designation,पदनाम
 DocType: Production Plan Item,Production Plan Item,उत्पादन योजना मद
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},प्रयोक्ता {0} पहले से ही कर्मचारी को सौंपा है {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,नई पीओएस प्रोफाइल बनाने
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,स्वास्थ्य देखभाल
 DocType: Purchase Invoice,Monthly,मासिक
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,बीजक
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),भुगतान में देरी (दिन)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,बीजक
 DocType: Maintenance Schedule Item,Periodicity,आवधिकता
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ईमेल पता
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,रक्षा
 DocType: Company,Abbr,संक्षिप्त
 DocType: Appraisal Goal,Score (0-5),कुल (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},पंक्ति {0}: {1} {2} के साथ मेल नहीं खाता {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},पंक्ति {0}: {1} {2} के साथ मेल नहीं खाता {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,पंक्ति # {0}:
 DocType: Delivery Note,Vehicle No,वाहन नहीं
-sites/assets/js/erpnext.min.js +55,Please select Price List,मूल्य सूची का चयन करें
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,मूल्य सूची का चयन करें
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,लकड़ी
 DocType: Production Order Operation,Work In Progress,अर्धनिर्मित उत्पादन
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3 डी मुद्रण
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,माता - पिता विस
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,किलो
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,एक नौकरी के लिए खोलना.
 DocType: Item Attribute,Increment,वेतन वृद्धि
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,गोदाम का चयन करें ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,विज्ञापन
 DocType: Employee,Married,विवाहित
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
 DocType: Payment Reconciliation,Reconcile,समाधान करना
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,किराना
 DocType: Quality Inspection Reading,Reading 1,1 पढ़ना
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,बैंक एंट्री बनाओ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,बैंक एंट्री बनाओ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,पेंशन फंड
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,खाता प्रकार गोदाम है अगर वेयरहाउस अनिवार्य है
 DocType: SMS Center,All Sales Person,सभी बिक्री व्यक्ति
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,ऑफ लागत केंद्
 DocType: Warehouse,Warehouse Detail,वेअरहाउस विस्तार
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट सीमा ग्राहक के लिए पार किया गया है {0} {1} / {2}
 DocType: Tax Rule,Tax Type,टैक्स प्रकार
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},इससे पहले कि आप प्रविष्टियों को जोड़ने या अद्यतन करने के लिए अधिकृत नहीं हैं {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},इससे पहले कि आप प्रविष्टियों को जोड़ने या अद्यतन करने के लिए अधिकृत नहीं हैं {0}
 DocType: Item,Item Image (if not slideshow),छवि (यदि नहीं स्लाइड शो)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,एक ग्राहक एक ही नाम के साथ मौजूद है
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(घंटा दर / 60) * वास्तविक ऑपरेशन टाइम
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,अतिथि
 DocType: Quality Inspection,Get Specification Details,विशिष्टता विवरण
 DocType: Lead,Interested,इच्छुक
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,सामग्री का बिल
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,प्रारंभिक
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,प्रारंभिक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},से {0} को {1}
 DocType: Item,Copy From Item Group,आइटम समूह से कॉपी
 DocType: Journal Entry,Opening Entry,एंट्री खुलने
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,उत्पाद पूछताछ
 DocType: Standard Reply,Owner,स्वामी
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,पहली कंपनी दाखिल करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,पहले कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,पहले कंपनी का चयन करें
 DocType: Employee Education,Under Graduate,पूर्व - स्नातक
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,योजनापूर्ण
 DocType: BOM,Total Cost,कुल लागत
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,उपसर्ग
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,उपभोज्य
 DocType: Upload Attendance,Import Log,प्रवेश करें आयात
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,भेजें
+DocType: Sales Invoice Item,Delivered By Supplier,प्रदायक द्वारा वितरित
 DocType: SMS Center,All Contact,सभी संपर्क
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,वार्षिक वेतन
 DocType: Period Closing Voucher,Closing Fiscal Year,वित्तीय वर्ष और समापन
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,कॉन्ट्रा एंट्री
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,शो टाइम लॉग्स
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी मुद्रा में ऋण
 DocType: Delivery Note,Installation Status,स्थापना स्थिति
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},स्वीकृत + अस्वीकृत मात्रा मद के लिए प्राप्त मात्रा के बराबर होना चाहिए {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},स्वीकृत + अस्वीकृत मात्रा मद के लिए प्राप्त मात्रा के बराबर होना चाहिए {0}
 DocType: Item,Supply Raw Materials for Purchase,आपूर्ति कच्चे माल की खरीद के लिए
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,आइटम {0} एक क्रय मद होना चाहिए
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", टेम्पलेट डाउनलोड उपयुक्त डेटा को भरने और संशोधित फ़ाइल देते हैं।
  चयनित अवधि में सभी तिथियों और कर्मचारी संयोजन मौजूदा उपस्थिति रिकॉर्ड के साथ, टेम्पलेट में आ जाएगा"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,आइटम {0} सक्रिय नहीं है या जीवन के अंत तक पहुँच गया है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,आइटम {0} सक्रिय नहीं है या जीवन के अंत तक पहुँच गया है
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,बिक्री चालान प्रस्तुत होने के बाद अद्यतन किया जाएगा.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,सीधे
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,संदेश के ल
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,मूल्य निर्धारण और छूट लागू करने के लिए नियम.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},के साथ इस बार प्रवेश संघर्ष {0} के लिए {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,मूल्य सूची खरीदने या बेचने के लिए लागू किया जाना चाहिए
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},स्थापना दिनांक मद के लिए डिलीवरी की तारीख से पहले नहीं किया जा सकता {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},स्थापना दिनांक मद के लिए डिलीवरी की तारीख से पहले नहीं किया जा सकता {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),मूल्य सूची दर पर डिस्काउंट (%)
-sites/assets/js/form.min.js +279,Start,प्रारंभ
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,प्रारंभ
 DocType: User,First Name,प्रथम नाम
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,अपनी स्थापना के पूरा हो गया है। ताज़ा।
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,पूर्ण मोल्ड कास्टिंग
 DocType: Offer Letter,Select Terms and Conditions,का चयन नियम और शर्तें
 DocType: Production Planning Tool,Sales Orders,बिक्री के आदेश
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,बिक्री चालान आइटम के खिलाफ
 ,Production Orders in Progress,प्रगति में उत्पादन के आदेश
 DocType: Lead,Address & Contact,पता और संपर्क
+DocType: Leave Allocation,Add unused leaves from previous allocations,पिछले आवंटन से अप्रयुक्त पत्ते जोड़ें
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},अगला आवर्ती {0} पर बनाया जाएगा {1}
 DocType: Newsletter List,Total Subscribers,कुल ग्राहकों
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,संपर्क का नाम
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,तो मात्रा लंब
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,उपरोक्त मानदंडों के लिए वेतन पर्ची बनाता है.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,खरीद के लिए अनुरोध.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,डबल आवास
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,तिथि राहत शामिल होने की तिथि से अधिक होना चाहिए
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,प्रति वर्ष पत्तियां
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} सेटअप> सेटिंग के माध्यम से> नामकरण सीरीज के लिए सीरीज का नामकरण सेट करें
 DocType: Time Log,Will be updated when batched.,Batched जब अद्यतन किया जाएगा.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,पंक्ति {0}: कृपया जाँच खाते के खिलाफ 'अग्रिम है' {1} यह एक अग्रिम प्रविष्टि है।
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,पंक्ति {0}: कृपया जाँच खाते के खिलाफ 'अग्रिम है' {1} यह एक अग्रिम प्रविष्टि है।
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},वेयरहाउस {0} से संबंधित नहीं है कंपनी {1}
 DocType: Bulk Email,Message,संदेश
 DocType: Item Website Specification,Item Website Specification,आइटम वेबसाइट विशिष्टता
 DocType: Dropbox Backup,Dropbox Access Key,ड्रॉपबॉक्स प्रवेश कुंजी
 DocType: Payment Tool,Reference No,संदर्भ संक्या
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,अवरुद्ध छोड़ दो
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
 DocType: Stock Entry,Sales Invoice No,बिक्री चालान नहीं
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,न्यूनतम आदेश मात्
 DocType: Pricing Rule,Supplier Type,प्रदायक प्रकार
 DocType: Item,Publish in Hub,हब में प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,सामग्री अनुरोध
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
 DocType: Item,Purchase Details,खरीद विवरण
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरीद आदेश में 'कच्चे माल की आपूर्ति' तालिका में नहीं मिला मद {0} {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,अधिसूचना न
 DocType: Lead,Suggestions,सुझाव
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,इस क्षेत्र पर आइटम ग्रुप - वाईस बजट निर्धारित करें. तुम भी वितरण की स्थापना द्वारा मौसमी शामिल कर सकते हैं.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},गोदाम के लिए माता पिता के खाते समूह दर्ज करें {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},के खिलाफ भुगतान {0} {1} बकाया राशि से अधिक नहीं हो सकता {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},के खिलाफ भुगतान {0} {1} बकाया राशि से अधिक नहीं हो सकता {2}
 DocType: Supplier,Address HTML,HTML पता करने के लिए
 DocType: Lead,Mobile No.,मोबाइल नंबर
 DocType: Maintenance Schedule,Generate Schedule,कार्यक्रम तय करें उत्पन्न
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,नई स्टॉक UOM
 DocType: Period Closing Voucher,Closing Account Head,बंद लेखाशीर्ष
 DocType: Employee,External Work History,बाहरी काम इतिहास
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,परिपत्र संदर्भ त्रुटि
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,आप वास्तव में बंद करना चाहते हैं
 DocType: Communication,Closed,बंद
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,शब्दों में (निर्यात) दिखाई हो सकता है एक बार आप डिलिवरी नोट बचाने के लिए होगा.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,आप आप बंद करना चाहते हैं
 DocType: Lead,Industry,उद्योग
 DocType: Employee,Job Profile,नौकरी प्रोफाइल
 DocType: Newsletter,Newsletter,न्यूज़लैटर
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,बिलटी
 DocType: Dropbox Backup,Allow Dropbox Access,ड्रॉपबॉक्स पहुँच की अनुमति
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,करों की स्थापना
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,इस सप्ताह और लंबित गतिविधियों के लिए सारांश
 DocType: Workstation,Rent Cost,बाइक किराए मूल्य
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,माह और वर्ष का चयन करें
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,जिस पर दर ग्राहक की मुद्रा ग्राहक आधार मुद्रा में परिवर्तित किया जाता है
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","बीओएम , डिलिवरी नोट , खरीद चालान , उत्पादन का आदेश , खरीद आदेश , खरीद रसीद , बिक्री चालान , बिक्री आदेश , स्टॉक एंट्री , timesheet में उपलब्ध"
 DocType: Item Tax,Tax Rate,कर की दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,वस्तु चुनें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,वस्तु चुनें
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","आइटम: {0} बैच वार, बजाय का उपयोग स्टॉक एंट्री \
  स्टॉक सुलह का उपयोग कर समझौता नहीं किया जा सकता है कामयाब"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच नहीं के रूप में ही किया जाना चाहिए {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,गैर-समूह कन्वर्ट करने के लिए
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,खरीद रसीद प्रस्तुत किया जाना चाहिए
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,वर्तमान स
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,एक आइटम के बैच (बहुत).
 DocType: C-Form Invoice Detail,Invoice Date,चालान तिथि
 DocType: GL Entry,Debit Amount,निकाली गई राशि
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,आपका ईमेल पता
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,लगाव को देखने के लिए धन्यवाद
 DocType: Purchase Order,% Received,% प्राप्त
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,निर्देश
 DocType: Quality Inspection,Inspected By,द्वारा निरीक्षण किया
 DocType: Maintenance Visit,Maintenance Type,रखरखाव के प्रकार
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},धारावाहिक नहीं {0} डिलिवरी नोट से संबंधित नहीं है {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},धारावाहिक नहीं {0} डिलिवरी नोट से संबंधित नहीं है {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,आइटम गुणवत्ता निरीक्षण पैरामीटर
 DocType: Leave Application,Leave Approver Name,अनुमोदनकर्ता छोड़ दो नाम
 ,Schedule Date,नियत तिथि
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,इन पंजीकृत खरीद
 DocType: Landed Cost Item,Applicable Charges,लागू शुल्कों
 DocType: Workstation,Consumable Cost,उपभोज्य लागत
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
 DocType: Purchase Receipt,Vehicle Date,वाहन की तारीख
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,चिकित्सा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,खोने के लिए कारण
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% स्थापित
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,पहले कंपनी का नाम दर्ज करें
 DocType: BOM,Item Desription,आइटम desription
 DocType: Purchase Invoice,Supplier Name,प्रदायक नाम
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext मैनुअल पढ़ें
 DocType: Account,Is Group,समूह के
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,स्वचालित रूप से फीफो पर आधारित नग सीरियल सेट
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,चेक आपूर्तिकर्ता चालान संख्या अद्वितीयता
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,बिक्र
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,सभी विनिर्माण प्रक्रियाओं के लिए वैश्विक सेटिंग्स।
 DocType: Accounts Settings,Accounts Frozen Upto,लेखा तक जमे हुए
 DocType: SMS Log,Sent On,पर भेजा
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
 DocType: Sales Order,Not Applicable,लागू नहीं
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,अवकाश मास्टर .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,शैल ढलाई
 DocType: Material Request Item,Required Date,आवश्यक तिथि
 DocType: Delivery Note,Billing Address,बिलिंग पता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,मद कोड दर्ज करें.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,मद कोड दर्ज करें.
 DocType: BOM,Costing,लागत
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","अगर जाँच की है, कर की राशि के रूप में पहले से ही प्रिंट दर / प्रिंट राशि में शामिल माना जाएगा"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,कुल मात्रा
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),(मिनट
 DocType: Customer,Buyer of Goods and Services.,सामान और सेवाओं के खरीदार।
 DocType: Journal Entry,Accounts Payable,लेखा देय
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,सदस्य जोड़ें
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" मौजूद नहीं है"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" मौजूद नहीं है"
 DocType: Pricing Rule,Valid Upto,विधिमान्य
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,अपने ग्राहकों के कुछ सूची . वे संगठनों या व्यक्तियों हो सकता है.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,प्रत्यक्ष आय
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","खाता से वर्गीकृत किया है , तो खाते के आधार पर फ़िल्टर नहीं कर सकते"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,प्रशासनिक अधिकारी
 DocType: Payment Tool,Received Or Paid,प्राप्त या भुगतान
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,कंपनी का चयन करें
 DocType: Stock Entry,Difference Account,अंतर खाता
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,उसकी निर्भर कार्य {0} बंद नहीं है के रूप में बंद काम नहीं कर सकते हैं।
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
 DocType: Production Order,Additional Operating Cost,अतिरिक्त ऑपरेटिंग कॉस्ट
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
 DocType: DocField,Type,टाइप
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
 DocType: Communication,Subject,विषय
 DocType: Shipping Rule,Net Weight,निवल भार
 DocType: Employee,Emergency Phone,आपातकालीन फोन
 ,Serial No Warranty Expiry,धारावाहिक नहीं वारंटी समाप्ति
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,आप वास्तव में इस सामग्री अनुरोध बंद करना चाहते हैं ?
 DocType: Sales Order,To Deliver,पहुँचाना
 DocType: Purchase Invoice Item,Item,मद
 DocType: Journal Entry,Difference (Dr - Cr),अंतर ( डॉ. - सीआर )
 DocType: Account,Profit and Loss,लाभ और हानि
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,प्रबंध उप
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,प्रबंध उप
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,नई UOM प्रकार पूर्ण संख्या का नहीं होना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,फर्नीचर और जुड़नार
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,दर जिस पर मूल्य सूची मुद्रा कंपनी के बेस मुद्रा में परिवर्तित किया जाता है
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर और प्र
 DocType: Purchase Invoice,Supplier Invoice No,प्रदायक चालान नहीं
 DocType: Territory,For reference,संदर्भ के लिए
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","नहीं हटा सकते सीरियल नहीं {0}, यह शेयर लेनदेन में इस्तेमाल किया जाता है के रूप में"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),समापन (सीआर)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),समापन (सीआर)
 DocType: Serial No,Warranty Period (Days),वारंटी अवधि (दिन)
 DocType: Installation Note Item,Installation Note Item,अधिष्ठापन नोट आइटम
 ,Pending Qty,विचाराधीन मात्रा
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,बिलिंग और ड
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ग्राहकों को दोहराने
 DocType: Leave Control Panel,Allocate,आवंटित
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,पिछला
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,बिक्री लौटें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,बिक्री लौटें
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,विक्रय आदेश का चयन करें जिसमें से आप उत्पादन के आदेश बनाना चाहते.
+DocType: Item,Delivered by Supplier (Drop Ship),प्रदायक द्वारा वितरित (ड्रॉप जहाज)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,वेतन घटकों.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,संभावित ग्राहकों के लिए धन्यवाद.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,ग्राहक डेटाबेस.
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,शेयर प्रविष्टियों बना रहे हैं जिसके खिलाफ एक तार्किक वेयरहाउस।
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},संदर्भ कोई और संदर्भ तिथि के लिए आवश्यक है {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},संदर्भ कोई और संदर्भ तिथि के लिए आवश्यक है {0}
 DocType: Event,Wednesday,बुधवार
 DocType: Sales Invoice,Customer's Vendor,ग्राहक विक्रेता
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,उत्पादन का आदेश अनिवार्य है
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,रिसीवर पैरामीटर
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'पर आधारित ' और ' समूह द्वारा ' ही नहीं किया जा सकता है
 DocType: Sales Person,Sales Person Targets,बिक्री व्यक्ति लक्ष्य
-sites/assets/js/form.min.js +271,To,को
-apps/frappe/frappe/templates/base.html +143,Please enter email address,ईमेल पता दर्ज करें
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,को
+apps/frappe/frappe/templates/base.html +145,Please enter email address,ईमेल पता दर्ज करें
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,बनाने की समाप्ति ट्यूब
 DocType: Production Order Operation,In minutes,मिनटों में
 DocType: Issue,Resolution Date,संकल्प तिथि
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,परियोजनाओं उपयो
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,प्रयुक्त
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0} {1} चालान विवरण तालिका में नहीं मिला
 DocType: Company,Round Off Cost Center,लागत केंद्र बंद दौर
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,रखरखाव भेंट {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,रखरखाव भेंट {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 DocType: Material Request,Material Transfer,सामग्री स्थानांतरण
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),उद्घाटन ( डॉ. )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},पोस्टिंग टाइमस्टैम्प के बाद होना चाहिए {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,सेटिंग्स
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,उतरा लागत करों और शुल्कों
 DocType: Production Order Operation,Actual Start Time,वास्तविक प्रारंभ समय
 DocType: BOM Operation,Operation Time,संचालन समय
-sites/assets/js/list.min.js +5,More,अधिक
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,अधिक
 DocType: Pricing Rule,Sales Manager,बिक्री प्रबंधक
-sites/assets/js/desk.min.js +7673,Rename,नाम बदलें
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,नाम बदलें
 DocType: Journal Entry,Write Off Amount,बंद राशि लिखें
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,झुका
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,उपयोगकर्ता की अनुमति
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,सीधे बाल काटना
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,बिक्री और खरीद के दस्तावेजों के आधार पर उनके धारावाहिक नग में आइटम पर नज़र रखने के लिए. यह भी उत्पाद की वारंटी के विवरण को ट्रैक करने के लिए प्रयोग किया जाता है.
 DocType: Purchase Receipt Item Supplied,Current Stock,मौजूदा स्टॉक
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,अस्वीकृत वेयरहाउस regected मद के खिलाफ अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,अस्वीकृत वेयरहाउस regected मद के खिलाफ अनिवार्य है
 DocType: Account,Expenses Included In Valuation,व्यय मूल्यांकन में शामिल
 DocType: Employee,Provide email id registered in company,कंपनी में पंजीकृत ईमेल आईडी प्रदान
 DocType: Hub Settings,Seller City,विक्रेता सिटी
 DocType: Email Digest,Next email will be sent on:,अगले ईमेल पर भेजा जाएगा:
 DocType: Offer Letter Term,Offer Letter Term,पत्र टर्म प्रस्ताव
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,आइटम वेरिएंट है।
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आइटम {0} नहीं मिला
 DocType: Bin,Stock Value,शेयर मूल्य
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,पेड़ के प्रकार
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,आपका स्वागत है
 DocType: Journal Entry,Credit Card Entry,क्रेडिट कार्ड एंट्री
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,कार्य विषय
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,माल आपूर्तिकर्ता से प्राप्त किया.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,माल आपूर्तिकर्ता से प्राप्त किया.
 DocType: Communication,Open,खुला
 DocType: Lead,Campaign Name,अभियान का नाम
 ,Reserved,आरक्षित
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,आप वास्तव में आगे बढ़ाना करना चाहते हैं
 DocType: Purchase Order,Supply Raw Materials,कच्चे माल की आपूर्ति
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"अगले चालान उत्पन्न हो जाएगा, जिस पर तारीख। इसे प्रस्तुत पर उत्पन्न होता है।"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,वर्तमान संपत्तियाँ
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,ग्राहक की खरीद आदेश नहीं
 DocType: Employee,Cell Number,सेल नंबर
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,खोया
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ 'जर्नल प्रवेश के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ 'जर्नल प्रवेश के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,अवसर से
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,मासिक वेतन बयान.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,दायित्व
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,स्वीकृत राशि पंक्ति में दावा राशि से अधिक नहीं हो सकता है {0}।
 DocType: Company,Default Cost of Goods Sold Account,माल बेच खाते की डिफ़ॉल्ट लागत
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,मूल्य सूची चयनित नहीं
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,मूल्य सूची चयनित नहीं
 DocType: Employee,Family Background,पारिवारिक पृष्ठभूमि
 DocType: Process Payroll,Send Email,ईमेल भेजें
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,अनुमति नहीं है
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,ओपन
 DocType: Item,Items with higher weightage will be shown higher,उच्च वेटेज के साथ आइटम उच्च दिखाया जाएगा
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बैंक सुलह विस्तार
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,मेरा चालान
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,नहीं मिला कर्मचारी
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,नहीं मिला कर्मचारी
 DocType: Purchase Order,Stopped,रोक
 DocType: Item,If subcontracted to a vendor,एक विक्रेता के लिए subcontracted हैं
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,शुरू करने के लिए बीओएम का चयन करें
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Csv क
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,अब भेजें
 ,Support Analytics,समर्थन विश्लेषिकी
 DocType: Item,Website Warehouse,वेबसाइट वेअरहाउस
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,क्या तुम सच में उत्पादन क्रम को रोकने के लिए चाहते हैं:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो चालान 05, 28 आदि जैसे उत्पन्न हो जाएगा, जिस पर इस महीने के दिन"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,स्कोर से कम या 5 के बराबर होना चाहिए
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,सी फार्म रिकॉर्ड
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,ग
 DocType: Features Setup,"To enable ""Point of Sale"" features","बिक्री के प्वाइंट" सुविधाओं को सक्षम करने के लिए
 DocType: Bin,Moving Average Rate,मूविंग औसत दर
 DocType: Production Planning Tool,Select Items,आइटम का चयन करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
 DocType: Comment,Reference Name,संदर्भ नाम
 DocType: Maintenance Visit,Completion Status,समापन स्थिति
 DocType: Sales Invoice Item,Target Warehouse,लक्ष्य वेअरहाउस
 DocType: Item,Allow over delivery or receipt upto this percent,इस प्रतिशत तक प्रसव या रसीद से अधिक की अनुमति दें
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,उम्मीद की डिलीवरी की तारीख से पहले बिक्री आदेश तिथि नहीं हो सकता
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,उम्मीद की डिलीवरी की तारीख से पहले बिक्री आदेश तिथि नहीं हो सकता
 DocType: Upload Attendance,Import Attendance,आयात उपस्थिति
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,सभी आइटम समूहों
 DocType: Process Payroll,Activity Log,गतिविधि लॉग
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,स्वचालित रूप से लेनदेन के प्रस्तुत करने पर संदेश लिखें .
 DocType: Production Order,Item To Manufacture,आइटम करने के लिए निर्माण
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,स्थायी मोल्ड कास्टिंग
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,भुगतान करने के लिए क्रय आदेश
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिति {2} है
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,भुगतान करने के लिए क्रय आदेश
 DocType: Sales Order Item,Projected Qty,अनुमानित मात्रा
 DocType: Sales Invoice,Payment Due Date,भुगतान की नियत तिथि
 DocType: Newsletter,Newsletter Manager,न्यूज़लैटर प्रबंधक
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,अनुरोधित नंबर
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,प्रदर्शन मूल्यांकन.
 DocType: Sales Invoice Item,Stock Details,स्टॉक विवरण
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,परियोजना मूल्य
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,बिक्री केन्द्र
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},आगे नहीं ले जा सकता {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,बिक्री केन्द्र
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},आगे नहीं ले जा सकता {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","खाते की शेष राशि पहले से ही क्रेडिट में है, कृपया आप शेष राशि को डेबिट के रूप में ही रखें "
 DocType: Account,Balance must be,बैलेंस होना चाहिए
 DocType: Hub Settings,Publish Pricing,मूल्य निर्धारण प्रकाशित करें
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,रसीद खरीद
 ,Received Items To Be Billed,बिल करने के लिए प्राप्त आइटम
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,घर्षण नष्ट करना
-sites/assets/js/desk.min.js +3938,Ms,सुश्री
+DocType: Employee,Ms,सुश्री
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,मुद्रा विनिमय दर मास्टर .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
 DocType: Production Order,Plan material for sub-assemblies,उप असेंबलियों के लिए योजना सामग्री
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,रेंज
 DocType: Supplier,Default Payable Accounts,डिफ़ॉल्ट लेखा देय
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
 DocType: Features Setup,Item Barcode,आइटम बारकोड
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चालान अग्रिम खरीद
 DocType: Address,Shop,दुकान
 DocType: Hub Settings,Sync Now,अभी सिंक करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},पंक्ति {0}: क्रेडिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है एक {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},पंक्ति {0}: क्रेडिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है एक {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,डिफ़ॉल्ट खाता / बैंक कैश स्वतः स्थिति चालान में अद्यतन किया जाएगा जब इस मोड का चयन किया जाता है.
 DocType: Employee,Permanent Address Is,स्थायी पता है
 DocType: Production Order Operation,Operation completed for how many finished goods?,ऑपरेशन कितने तैयार माल के लिए पूरा?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ब्रांड
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,भत्ता खत्म-{0} मद के लिए पार कर लिए {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,भत्ता खत्म-{0} मद के लिए पार कर लिए {1}.
 DocType: Employee,Exit Interview Details,साक्षात्कार विवरण से बाहर निकलें
 DocType: Item,Is Purchase Item,खरीद आइटम है
 DocType: Journal Entry Account,Purchase Invoice,चालान खरीद
 DocType: Stock Ledger Entry,Voucher Detail No,वाउचर विस्तार नहीं
 DocType: Stock Entry,Total Outgoing Value,कुल निवर्तमान मूल्य
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,दिनांक और अंतिम तिथि खुलने एक ही वित्तीय वर्ष के भीतर होना चाहिए
 DocType: Lead,Request for Information,सूचना के लिए अनुरोध
 DocType: Payment Tool,Paid,भुगतान किया
 DocType: Salary Slip,Total in words,शब्दों में कुल
 DocType: Material Request Item,Lead Time Date,लीड दिनांक और समय
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,अनिवार्य है। हो सकता है कि मुद्रा विनिमय रिकार्ड के लिए नहीं बनाई गई है
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: आइटम के लिए धारावाहिक नहीं निर्दिष्ट करें {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'उत्पाद बंडल' आइटम, गोदाम, सीरियल कोई और बैच के लिए नहीं 'पैकिंग सूची' मेज से विचार किया जाएगा। गोदाम और बैच कोई 'किसी भी उत्पाद बंडल' आइटम के लिए सभी मदों की पैकिंग के लिए ही कर रहे हैं, तो उन मूल्यों को मुख्य मद तालिका में दर्ज किया जा सकता है, मूल्यों की मेज 'पैकिंग सूची' में कॉपी किया जाएगा।"
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,ग्राहकों के लिए लदान.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ग्राहकों के लिए लदान.
 DocType: Purchase Invoice Item,Purchase Order Item,खरीद आदेश आइटम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,अप्रत्यक्ष आय
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,सेट भुगतान राशि = बकाया राशि
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,पता पंक्ति 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,झगड़ा
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,कंपनी का नाम
 DocType: SMS Center,Total Message(s),कुल संदेश (ओं )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,सभी की मदद वीडियो की एक सूची देखें
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,बैंक के खाते में जहां चेक जमा किया गया था सिर का चयन करें.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,उपयोगकर्ता लेनदेन में मूल्य सूची दर को संपादित करने की अनुमति दें
 DocType: Pricing Rule,Max Qty,अधिकतम मात्रा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,पंक्ति {0}: बिक्री / खरीद आदेश के खिलाफ भुगतान हमेशा अग्रिम के रूप में चिह्नित किया जाना चाहिए
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,पंक्ति {0}: बिक्री / खरीद आदेश के खिलाफ भुगतान हमेशा अग्रिम के रूप में चिह्नित किया जाना चाहिए
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,रासायनिक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
 DocType: Process Payroll,Select Payroll Year and Month,पेरोल वर्ष और महीने का चयन करें
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",उपयुक्त समूह (आम तौर पर फंड के लिए आवेदन> वर्तमान एसेट्स> बैंक खातों में जाओ और प्रकार की) चाइल्ड जोड़ने पर क्लिक करके (एक नया खाता बनाने के "बैंक"
 DocType: Workstation,Electricity Cost,बिजली की लागत
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,स
 DocType: SMS Center,All Lead (Open),सभी लीड (ओपन)
 DocType: Purchase Invoice,Get Advances Paid,भुगतान किए गए अग्रिम जाओ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,आपका चित्र संलग्न
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,मेक
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,मेक
 DocType: Journal Entry,Total Amount in Words,शब्दों में कुल राशि
 DocType: Workflow State,Stop,रोक
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,कोई त्रुटि हुई थी . एक संभावित कारण यह है कि आप प्रपत्र को बचाया नहीं किया है कि हो सकता है. यदि समस्या बनी रहती support@erpnext.com से संपर्क करें.
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,पैकिंग स्लिप
 DocType: POS Profile,Cash/Bank Account,नकद / बैंक खाता
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
 DocType: Delivery Note,Delivery To,करने के लिए डिलिवरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Planning Tool,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,फाइलिंग
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"समय ल
 DocType: Project,Internal,आंतरिक
 DocType: Task,Urgent,अत्यावश्यक
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},तालिका में पंक्ति {0} के लिए एक वैध पंक्ति आईडी निर्दिष्ट करें {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,डेस्कटॉप के लिए जाना और ERPNext का उपयोग शुरू
 DocType: Item,Manufacturer,निर्माता
 DocType: Landed Cost Item,Purchase Receipt Item,रसीद आइटम खरीद
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,बिक्री आदेश / तैयार माल गोदाम में सुरक्षित गोदाम
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,बेच राशि
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,टाइम लॉग्स
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,आप इस रिकॉर्ड के लिए खर्च अनुमोदक हैं . 'स्थिति' अद्यतन और बचा लो
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,आप इस रिकॉर्ड के लिए खर्च अनुमोदक हैं . 'स्थिति' अद्यतन और बचा लो
 DocType: Serial No,Creation Document No,निर्माण का दस्तावेज़
 DocType: Issue,Issue,मुद्दा
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","आइटम वेरिएंट के लिए जिम्मेदार बताते हैं। जैसे आकार, रंग आदि"
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
 DocType: Opportunity,Contact Info,संपर्क जानकारी
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
 DocType: Item,Default Supplier,डिफ़ॉल्ट प्रदायक
 DocType: Manufacturing Settings,Over Production Allowance Percentage,उत्पादन भत्ता प्रतिशत से अधिक
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,साप्ताहिक ऑफ तिथियां
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,समाप्ति तिथि आरंभ तिथि से कम नहीं हो सकता
 DocType: Sales Person,Select company name first.,कंपनी 1 नाम का चयन करें.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,डा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,डा
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,कोटेशन आपूर्तिकर्ता से प्राप्त किया.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,टाइम लॉग्स के माध्यम से अद्यतन
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,कंपनी अपने संदर्भ के लिए पंजीकरण संख्या. टैक्स आदि संख्या
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,शॉपिंग कार्ट नौवहन नियम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 ,Ordered Items To Be Billed,हिसाब से बिलिंग किए आइटम
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,सीमा कम हो गया है से की तुलना में श्रृंखला के लिए
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,समय लॉग्स का चयन करें और एक नया बिक्री चालान बनाने के लिए भेजें.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,टै
 DocType: Lead,Lead,नेतृत्व
 DocType: Email Digest,Payables,देय
 DocType: Account,Warehouse,गोदाम
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,पंक्ति # {0}: मात्रा क्रय वापसी में दर्ज नहीं किया जा सकता अस्वीकृत
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,पंक्ति # {0}: मात्रा क्रय वापसी में दर्ज नहीं किया जा सकता अस्वीकृत
 ,Purchase Order Items To Be Billed,बिल के लिए खरीद आदेश आइटम
 DocType: Purchase Invoice Item,Net Rate,असल दर
 DocType: Purchase Invoice Item,Purchase Invoice Item,चालान आइटम खरीद
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled भु
 DocType: Global Defaults,Current Fiscal Year,चालू वित्त वर्ष
 DocType: Global Defaults,Disable Rounded Total,गोल कुल अक्षम
 DocType: Lead,Call,कॉल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},डुप्लिकेट पंक्ति {0} के साथ एक ही {1}
 ,Trial Balance,शेष - परीक्षण
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,कर्मचारी की स्थापना
-sites/assets/js/erpnext.min.js +5,"Grid ""","ग्रिड """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,कर्मचारी की स्थापना
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","ग्रिड """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,पहले उपसर्ग का चयन करें
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,अनुसंधान
 DocType: Maintenance Visit Purpose,Work Done,करेंकिया गया काम
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,भेजे गए
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,देखें खाता बही
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,शीघ्रातिशीघ्र
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
 DocType: Communication,Delivery Status,डिलिवरी स्थिति
 DocType: Production Order,Manufacture against Sales Order,बिक्री आदेश के खिलाफ निर्माण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,शेष विश्व
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,शेष विश्व
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आइटम {0} बैच नहीं हो सकता
 ,Budget Variance Report,बजट विचरण रिपोर्ट
 DocType: Salary Slip,Gross Pay,सकल वेतन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,सूद अदा किया
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,लेखा बही
 DocType: Stock Reconciliation,Difference Amount,अंतर राशि
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,प्रतिधारित कमाई
 DocType: BOM Item,Item Description,आइटम विवरण
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,अवसर आइटम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,अस्थाई उद्घाटन
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,कर्मचारी लीव बैलेंस
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},{0} हमेशा होना चाहिए खाता के लिए शेष {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} हमेशा होना चाहिए खाता के लिए शेष {1}
 DocType: Address,Address Type,पता प्रकार
 DocType: Purchase Receipt,Rejected Warehouse,अस्वीकृत वेअरहाउस
 DocType: GL Entry,Against Voucher,वाउचर के खिलाफ
 DocType: Item,Default Buying Cost Center,डिफ़ॉल्ट ख़रीदना लागत केंद्र
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext के बाहर का सबसे अच्छा पाने के लिए, हम आपको कुछ समय लगेगा और इन की मदद से वीडियो देखने के लिए सलाह देते हैं।"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,आइटम {0} बिक्री आइटम होना चाहिए
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,को
 DocType: Item,Lead Time in days,दिनों में लीड समय
 ,Accounts Payable Summary,लेखा देय सारांश
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},जमे खाता संपादित करने के लिए अधिकृत नहीं {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},जमे खाता संपादित करने के लिए अधिकृत नहीं {0}
 DocType: Journal Entry,Get Outstanding Invoices,बकाया चालान
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,जारी करने की जगह
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,अनुबंध
 DocType: Report,Disabled,विकलांग
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM के लिए आवश्यक UOM coversion पहलू: {0} मद में: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM के लिए आवश्यक UOM coversion पहलू: {0} मद में: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,अप्रत्यक्ष व्यय
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,पंक्ति {0}: मात्रा अनिवार्य है
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,कृषि
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,भुगतान की रीति
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,यह एक रूट आइटम समूह है और संपादित नहीं किया जा सकता है .
 DocType: Journal Entry Account,Purchase Order,आदेश खरीद
 DocType: Warehouse,Warehouse Contact Info,वेयरहाउस संपर्क जानकारी
-sites/assets/js/form.min.js +190,Name is required,नाम आवश्यक है
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,नाम आवश्यक है
 DocType: Purchase Invoice,Recurring Type,आवर्ती प्रकार
 DocType: Address,City/Town,शहर / नगर
 DocType: Email Digest,Annual Income,वार्षिक आय
 DocType: Serial No,Serial No Details,धारावाहिक नहीं विवरण
 DocType: Purchase Invoice Item,Item Tax Rate,आइटम कर की दर
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,राजधानी उपकरणों
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,संपादित करें] वर्णन
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,उम्मीद की डिलीवरी की तिथि नियोजित प्रारंभ तिथि की तुलना में कम है।
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,सप्लायर के लिए
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,सप्लायर के लिए
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,की स्थापना खाता प्रकार के लेनदेन में इस खाते का चयन करने में मदद करता है.
 DocType: Purchase Invoice,Grand Total (Company Currency),महायोग (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,कुल निवर्तमान
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","केवल "" मूल्य "" के लिए 0 या रिक्त मान के साथ एक शिपिंग शासन की स्थिति नहीं हो सकता"
 DocType: Authorization Rule,Transaction,लेन - देन
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,नोट : इस लागत केंद्र एक समूह है . समूहों के खिलाफ लेखांकन प्रविष्टियों नहीं कर सकता.
-apps/erpnext/erpnext/config/projects.py +43,Tools,उपकरण
+apps/frappe/frappe/config/desk.py +7,Tools,उपकरण
 DocType: Item,Website Item Groups,वेबसाइट आइटम समूह
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,उत्पादन क्रम संख्या स्टॉक प्रविष्टि उद्देश्य निर्माण के लिए अनिवार्य है
 DocType: Purchase Invoice,Total (Company Currency),कुल (कंपनी मुद्रा)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,वर्कस्टेशन नाम
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,डाइजेस्ट ईमेल:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
-sites/assets/js/desk.min.js +7652,Comments,टिप्पणियां
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,टिप्पणियां
 DocType: Salary Slip,Bank Account No.,बैंक खाता नहीं
 DocType: Naming Series,This is the number of the last created transaction with this prefix,यह इस उपसर्ग के साथ पिछले बनाई गई लेन - देन की संख्या
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},आइटम के लिए आवश्यक मूल्यांकन दर {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,एक क
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,विशेषाधिकार छुट्टी
 DocType: Purchase Invoice,Supplier Invoice Date,प्रदायक चालान तिथि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,आप खरीदारी की टोकरी में सक्रिय करने की जरूरत
-sites/assets/js/form.min.js +212,No Data,कोई डेटा नहीं
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,कोई डेटा नहीं
 DocType: Appraisal Template Goal,Appraisal Template Goal,मूल्यांकन टेम्पलेट लक्ष्य
 DocType: Salary Slip,Earning,कमाई
 DocType: Payment Tool,Party Account Currency,पार्टी खाता मुद्रा
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,पार्टी खाता म
 DocType: Purchase Taxes and Charges,Add or Deduct,जोड़ें या घटा
 DocType: Company,If Yearly Budget Exceeded (for expense account),"वार्षिक बजट (व्यय खाते के लिए) से अधिक है, तो"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,बीच पाया ओवरलैपिंग की स्थिति :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल के खिलाफ एंट्री {0} पहले से ही कुछ अन्य वाउचर के खिलाफ निकाला जाता है
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल के खिलाफ एंट्री {0} पहले से ही कुछ अन्य वाउचर के खिलाफ निकाला जाता है
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,कुल ऑर्डर मूल्य
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,भोजन
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,बूढ़े रेंज 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,यात्राओं की संख्या
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","संपर्क करने के लिए समाचार पत्र, होता है."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},समापन खाते की मुद्रा होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सभी लक्ष्यों के लिए अंक का योग यह है 100. होना चाहिए {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,संचालन खाली नहीं छोड़ा जा सकता।
 ,Delivered Items To Be Billed,बिल के लिए दिया आइटम
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,वेयरहाउस सीरियल नंबर के लिए बदला नहीं जा सकता
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},स्थिति को अद्यतन {0}
 DocType: DocField,Description,विवरण
 DocType: Authorization Rule,Average Discount,औसत छूट
 DocType: Letter Head,Is Default,डिफ़ॉल्ट है
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,आइटम कर राशि
 DocType: Item,Maintain Stock,स्टॉक बनाए रखें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,पहले से ही उत्पादन आदेश के लिए बनाया स्टॉक प्रविष्टियां
 DocType: Leave Control Panel,Leave blank if considered for all designations,रिक्त छोड़ अगर सभी पदनाम के लिए विचार
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},मैक्स: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime से
 DocType: Email Digest,For Company,कंपनी के लिए
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,शिपिंग पता ना
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,खातों का चार्ट
 DocType: Material Request,Terms and Conditions Content,नियम और शर्तें सामग्री
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,वारंटी / एएमस
 DocType: GL Entry,GL Entry,जीएल एंट्री
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्स
 ,Batch-Wise Balance History,बैच वार बैलेंस इतिहास
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,सूची
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,सूची
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,शिक्षु
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,नकारात्मक मात्रा की अनुमति नहीं है
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,कार्यालय का किराया
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,सेटअप एसएमएस के प्रवेश द्वार सेटिंग्स
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात विफल!
-sites/assets/js/erpnext.min.js +24,No address added yet.,कोई पता अभी तक जोड़ा।
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,कोई पता अभी तक जोड़ा।
 DocType: Workstation Working Hour,Workstation Working Hour,कार्य केंद्र घंटे काम
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या जेवी राशि के बराबर होना चाहिए {2}
 DocType: Item,Inventory,इनवेंटरी
 DocType: Features Setup,"To enable ""Point of Sale"" view",दृश्य "बिक्री के प्वाइंट" सक्षम करने के लिए
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,भुगतान खाली गाड़ी के लिए नहीं बनाया जा सकता
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,भुगतान खाली गाड़ी के लिए नहीं बनाया जा सकता
 DocType: Item,Sales Details,बिक्री विवरण
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,लगाए
 DocType: Opportunity,With Items,आइटम के साथ
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","अगले चालान उत्पन्न हो जाएगा, जिस पर तारीख। इसे प्रस्तुत पर उत्पन्न होता है।"
 DocType: Item Attribute,Item Attribute,आइटम गुण
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,सरकार
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,आइटम वेरिएंट
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,आइटम वेरिएंट
 DocType: Company,Services,सेवाएं
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),कुल ({0})
 DocType: Cost Center,Parent Cost Center,माता - पिता लागत केंद्र
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,वित्तीय वर्ष प्रारंभ दिनांक
 DocType: Employee External Work History,Total Experience,कुल अनुभव
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,फ्रेट और अग्रेषण शुल्क
 DocType: Material Request Item,Sales Order No,बिक्री आदेश नहीं
 DocType: Item Group,Item Group Name,आइटम समूह का नाम
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,में ले ली
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,में ले ली
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,निर्माण के लिए हस्तांतरण सामग्री
 DocType: Pricing Rule,For Price List,मूल्य सूची के लिए
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,कार्यकारी खोज
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,अनुसूचियों
 DocType: Purchase Invoice Item,Net Amount,शुद्ध राशि
 DocType: Purchase Order Item Supplied,BOM Detail No,बीओएम विस्तार नहीं
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),अतिरिक्त छूट राशि (कंपनी मुद्रा)
-DocType: Period Closing Voucher,CoA Help,सीओए मदद
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},त्रुटि: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},त्रुटि: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,खातों का चार्ट से नया खाता बनाने के लिए धन्यवाद.
 DocType: Maintenance Visit,Maintenance Visit,रखरखाव भेंट
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ग्राहक> ग्राहक समूह> टेरिटरी
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,उतरा लागत सह
 DocType: Event,Tuesday,मंगलवार
 DocType: Leave Block List,Block Holidays on important days.,महत्वपूर्ण दिन पर ब्लॉक छुट्टियाँ।
 ,Accounts Receivable Summary,लेखा प्राप्य सारांश
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},पहले से ही अवधि के लिए कर्मचारी {1} के लिए आवंटित प्रकार {0} के लिए छोड़ देता {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका निर्धारित करने के लिए एक कर्मचारी रिकॉर्ड में यूजर आईडी क्षेत्र सेट करें
 DocType: UOM,UOM Name,UOM नाम
 DocType: Top Bar Item,Target,लक्ष्य
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,बिक्री साथी ल
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} के लिए लेखा प्रविष्टि केवल मुद्रा में बनाया जा सकता है: {1}
 DocType: Pricing Rule,Pricing Rule,मूल्य निर्धारण नियम
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,निशाना साधना
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,क्रय आदेश के लिए सामग्री का अनुरोध
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,क्रय आदेश के लिए सामग्री का अनुरोध
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},पंक्ति # {0}: वापस आ मद {1} नहीं में मौजूद है {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,बैंक खातों
 ,Bank Reconciliation Statement,बैंक समाधान विवरण
 DocType: Address,Lead Name,नाम लीड
 ,POS,पीओएस
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,खुलने का स्टॉक बैलेंस
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,खुलने का स्टॉक बैलेंस
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} केवल एक बार दिखाई देना चाहिए
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},अधिक tranfer करने के लिए अनुमति नहीं है {0} की तुलना में {1} खरीद आदेश के खिलाफ {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},पत्तियों के लिए सफलतापूर्वक आवंटित {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},पत्तियों के लिए सफलतापूर्वक आवंटित {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,पैक करने के लिए कोई आइटम नहीं
 DocType: Shipping Rule Condition,From Value,मूल्य से
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,विनिर्माण मात्रा अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,विनिर्माण मात्रा अनिवार्य है
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,बैंक में परिलक्षित नहीं मात्रा में
 DocType: Quality Inspection Reading,Reading 4,4 पढ़ना
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,कंपनी के खर्च के लिए दावा.
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,मोबाइल संपर्क न
 DocType: Production Planning Tool,Select Sales Orders,विक्रय आदेश का चयन करें
 ,Material Requests for which Supplier Quotations are not created,"प्रदायक कोटेशन नहीं बनाई गई हैं , जिसके लिए सामग्री अनुरोध"
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,बारकोड का उपयोग करके आइटम्स ट्रैक. आप आइटम के बारकोड स्कैनिंग द्वारा डिलिवरी नोट और बिक्री चालान में आइटम दर्ज करने में सक्षम हो जाएगा.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,मार्क के रूप में दिया
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,कोटेशन बनाओ
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,अग्रिम में एक्स दिनों के लिए आपरेशन की योजना बना प्रयास करें।
 DocType: HR Settings,Stop Birthday Reminders,बंद करो जन्मदिन अनुस्मारक
 DocType: SMS Center,Receiver List,रिसीवर सूची
 DocType: Payment Tool Detail,Payment Amount,भुगतान राशि
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,खपत राशि
-sites/assets/js/erpnext.min.js +51,{0} View,{0} देखें
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} देखें
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कटौती
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,चयनित लेजर Sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,सफल आयात !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी मदों की लागत
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,डिफ़ॉल्ट देय ख
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ऐसे शिपिंग नियम, मूल्य सूची आदि के रूप में ऑनलाइन शॉपिंग कार्ट के लिए सेटिंग"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,सेटअप पूरा हुआ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% बिल
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,सुरक्षित मात्रा
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,सुरक्षित मात्रा
 DocType: Party Account,Party Account,पार्टी खाता
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,मानवीय संसाधन
 DocType: Lead,Upper Income,ऊपरी आय
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,शॉपिंग कार्ट सक्षम करें
 DocType: Employee,Permanent Address,स्थायी पता
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,आइटम {0} एक सेवा आइटम होना चाहिए .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",महायोग से \ {0} {1} अधिक से अधिक नहीं हो सकता है के खिलाफ अग्रिम भुगतान कर दिया {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,आइटम कोड का चयन करें
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),बिना वेतन छुट्टी के लिए कटौती में कमी (LWP)
 DocType: Territory,Territory Manager,क्षेत्र प्रबंधक
+DocType: Delivery Note Item,To Warehouse (Optional),गोदाम के लिए (वैकल्पिक)
 DocType: Sales Invoice,Paid Amount (Company Currency),भुगतान की गई राशि (कंपनी मुद्रा)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त छूट
 DocType: Selling Settings,Selling Settings,सेटिंग्स बेचना
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,महत्व
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,खनन
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,राल कास्टिंग
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,पहला {0} का चयन करें.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,पहला {0} का चयन करें.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},पाठ {0}
 DocType: Territory,Parent Territory,माता - पिता टेरिटरी
 DocType: Quality Inspection Reading,Reading 2,2 पढ़ना
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,कोई बैच
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक की खरीद के आदेश के खिलाफ कई विक्रय आदेश की अनुमति दें
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,मुख्य
 DocType: DocPerm,Delete,हटाना
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,प्रकार
-sites/assets/js/desk.min.js +7971,New {0},नई {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,प्रकार
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},नई {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,रूका आदेश को रद्द नहीं किया जा सकता . रद्द करने के लिए आगे बढ़ाना .
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,रूका आदेश को रद्द नहीं किया जा सकता . रद्द करने के लिए आगे बढ़ाना .
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
 DocType: Employee,Leave Encashed?,भुनाया छोड़ दो?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,क्षेत्र से मौके अनिवार्य है
 DocType: Item,Variants,वेरिएंट
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,देश
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,पतों
 DocType: Communication,Received,प्राप्त
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},डुप्लीकेट सीरियल मद के लिए दर्ज किया गया {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक नौवहन नियम के लिए एक शर्त
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,आइटम उत्पादन का आदेश दिया है करने के लिए अनुमति नहीं है।
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,अभिवादन
 DocType: Communication,Rejected,अस्वीकृत
 DocType: Pricing Rule,Brand,ब्रांड
 DocType: Item,Will also apply for variants,यह भी वेरिएंट के लिए लागू होगी
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% वितरित
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,बिक्री के समय में आइटम बंडल.
 DocType: Sales Order Item,Actual Qty,वास्तविक मात्रा
 DocType: Sales Invoice Item,References,संदर्भ
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,बाल काटना
 DocType: Item,Has Variants,वेरिएंट है
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,एक नया बिक्री चालान बनाने के लिए बटन 'बिक्री चालान करें' पर क्लिक करें.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,से और अवधि% की आवर्ती के लिए अनिवार्य तारीखों की अवधि
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,पैकेजिंग और लेबलिंग
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण का नाम
 DocType: Sales Person,Parent Sales Person,माता - पिता बिक्री व्यक्ति
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,कंपनी मास्टर और वैश्विक मूलभूत में डिफ़ॉल्ट मुद्रा निर्दिष्ट करें
 DocType: Dropbox Backup,Dropbox Access Secret,ड्रॉपबॉक्स पहुँच गुप्त
 DocType: Purchase Invoice,Recurring Invoice,आवर्ती चालान
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,परियोजनाओं के प्रबंधन
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,परियोजनाओं के प्रबंधन
 DocType: Supplier,Supplier of Goods or Services.,वस्तुओं या सेवाओं के आपूर्तिकर्ता है।
 DocType: Budget Detail,Fiscal Year,वित्तीय वर्ष
 DocType: Cost Center,Budget,बजट
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,विक्रय
 DocType: Employee,Salary Information,वेतन की जानकारी
 DocType: Sales Person,Name and Employee ID,नाम और कर्मचारी ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
 DocType: Website Item Group,Website Item Group,वेबसाइट आइटम समूह
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,शुल्कों और करों
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,संदर्भ तिथि दर्ज करें
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} भुगतान प्रविष्टियों द्वारा फिल्टर नहीं किया जा सकता है {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,संदर्भ तिथि दर्ज करें
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} भुगतान प्रविष्टियों द्वारा फिल्टर नहीं किया जा सकता है {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,वेब साइट में दिखाया जाएगा कि आइटम के लिए टेबल
 DocType: Purchase Order Item Supplied,Supplied Qty,आपूर्ति मात्रा
 DocType: Material Request Item,Material Request Item,सामग्री अनुरोध आइटम
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,आइटम स
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,इस आरोप प्रकार के लिए अधिक से अधिक या वर्तमान पंक्ति संख्या के बराबर पंक्ति संख्या का उल्लेख नहीं कर सकते
 ,Item-wise Purchase History,आइटम के लिहाज से खरीदारी इतिहास
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,लाल
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सीरियल मद के लिए जोड़ा लाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सीरियल मद के लिए जोड़ा लाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें {0}
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,ओपन उत्पादन के आदेश
 DocType: Installation Note,Installation Time,अधिष्ठापन काल
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,कोटेशन रुझान
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","उत्पादन का आदेश इस मद के लिए बनाया जा सकता है, यह एक शेयर मद होना चाहिए ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","उत्पादन का आदेश इस मद के लिए बनाया जा सकता है, यह एक शेयर मद होना चाहिए ."
 DocType: Shipping Rule Condition,Shipping Amount,नौवहन राशि
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,एकजूट
 DocType: Authorization Rule,Above Value,ऊपर मूल्य
 ,Pending Amount,लंबित राशि
 DocType: Purchase Invoice Item,Conversion Factor,परिवर्तनकारक तत्व
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,दिया गया
+DocType: Purchase Order,Delivered,दिया गया
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),जॉब ईमेल आईडी के लिए सेटअप आवक सर्वर . (जैसे jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,वाहन संख्या
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"तारीख, जिस पर आवर्ती चालान रोकने के लिए किया जाएगा"
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,बांटो आर
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आइटम {1} एक एसेट आइटम के रूप में खाते {0} प्रकार की ' फिक्स्ड एसेट ' होना चाहिए
 DocType: HR Settings,HR Settings,मानव संसाधन सेटिंग्स
 apps/frappe/frappe/config/setup.py +130,Printing,मुद्रण
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च का दावा अनुमोदन के लिए लंबित है . केवल खर्च अनुमोदक स्थिति अपडेट कर सकते हैं .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च का दावा अनुमोदन के लिए लंबित है . केवल खर्च अनुमोदक स्थिति अपडेट कर सकते हैं .
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त छूट राशि
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,आप छुट्टी के लिए आवेदन कर रहे हैं जिस दिन (ओं ) अवकाश हैं . तुम्हें छोड़ के लिए लागू की जरूरत नहीं .
-sites/assets/js/desk.min.js +7805,and,और
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,और
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,खेल
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,उद्धरण
 DocType: Salary Slip,Total Deduction,कुल कटौती
 DocType: Quotation,Maintenance User,रखरखाव उपयोगकर्ता
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,मूल्य अपडेट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,क्या आप आगे बढ़ाना करना चाहते हैं
 DocType: Employee,Date of Birth,जन्म तिथि
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,आइटम {0} पहले से ही लौटा दिया गया है
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** वित्त वर्ष ** एक वित्तीय वर्ष का प्रतिनिधित्व करता है। सभी लेखा प्रविष्टियों और अन्य प्रमुख लेनदेन ** ** वित्त वर्ष के खिलाफ ट्रैक किए गए हैं।
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","बिक्री अभियान का ट्रैक रखें। बिक्रीसूत्र, कोटेशन का ट्रैक रखें, बिक्री आदेश आदि अभियानों से निवेश पर लौटें गेज करने के लिए। "
 DocType: Expense Claim,Approver,सरकारी गवाह
 ,SO Qty,अतः मात्रा
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेयर प्रविष्टियों गोदाम के खिलाफ मौजूद {0}, इसलिए आप फिर से आवंटित करने या गोदाम को संशोधित नहीं कर सकते हैं"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेयर प्रविष्टियों गोदाम के खिलाफ मौजूद {0}, इसलिए आप फिर से आवंटित करने या गोदाम को संशोधित नहीं कर सकते हैं"
 DocType: Appraisal,Calculate Total Score,कुल स्कोर की गणना
 DocType: Supplier Quotation,Manufacturing Manager,विनिर्माण प्रबंधक
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},धारावाहिक नहीं {0} तक वारंटी के अंतर्गत है {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,संकुल में डिलिवरी नोट भाजित.
 apps/erpnext/erpnext/hooks.py +84,Shipments,लदान
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,डुबकी मोल्डिंग
+DocType: Purchase Order,To be delivered to customer,ग्राहक के लिए दिया जाना
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,समय लॉग स्थिति प्रस्तुत किया जाना चाहिए.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सीरियल नहीं {0} किसी भी गोदाम से संबंधित नहीं है
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,की स्थापना
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,मुद्रा से
 DocType: DocField,Name,नाम
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},आइटम के लिए आवश्यक बिक्री आदेश {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},आइटम के लिए आवश्यक बिक्री आदेश {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,प्रणाली में परिलक्षित नहीं मात्रा में
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी मुद्रा)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,दूसरों
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,रूका रूप में सेट करें
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,एक मेल आइटम नहीं मिल सकता। के लिए {0} कुछ अन्य मूल्य का चयन करें।
 DocType: POS Profile,Taxes and Charges,करों और प्रभार
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","एक उत्पाद या, खरीदा या बेचा स्टॉक में रखा जाता है कि एक सेवा।"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"पहली पंक्ति के लिए ' पिछली पंक्ति कुल पर ', ' पिछली पंक्ति पर राशि ' या के रूप में कार्यभार प्रकार का चयन नहीं कर सकते"
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,Doctype का चयन करें
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,बैंकिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,अनुसूची पाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,नई लागत केंद्र
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,नई लागत केंद्र
 DocType: Bin,Ordered Quantity,आदेशित मात्रा
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",उदाहरणार्थ
 DocType: Quality Inspection,In Process,इस प्रक्रिया में
 DocType: Authorization Rule,Itemwise Discount,Itemwise डिस्काउंट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} बिक्री आदेश के खिलाफ {1}
+DocType: Purchase Order Item,Reference Document Type,संदर्भ दस्तावेज़ प्रकार
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} बिक्री आदेश के खिलाफ {1}
 DocType: Account,Fixed Asset,स्थायी परिसम्पत्ति
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,श्रृंखलाबद्ध इन्वेंटरी
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,श्रृंखलाबद्ध इन्वेंटरी
 DocType: Activity Type,Default Billing Rate,डिफ़ॉल्ट बिलिंग दर
 DocType: Time Log Batch,Total Billing Amount,कुल बिलिंग राशि
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,प्राप्य खाता
 ,Stock Balance,बाकी स्टाक
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,भुगतान करने के लिए बिक्री आदेश
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,भुगतान करने के लिए बिक्री आदेश
 DocType: Expense Claim Detail,Expense Claim Detail,व्यय दावा विवरण
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,टाइम लॉग्स बनाया:
 DocType: Item,Weight UOM,वजन UOM
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,खाते में जमा एक देय खाता होना चाहिए
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
 DocType: Production Order Operation,Completed Qty,पूरी की मात्रा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","{0}, केवल डेबिट खातों एक और क्रेडिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,मूल्य सूची {0} अक्षम है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, केवल डेबिट खातों एक और क्रेडिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,मूल्य सूची {0} अक्षम है
 DocType: Manufacturing Settings,Allow Overtime,ओवरटाइम की अनुमति दें
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,बिक्री आदेश {0} बंद कर दिया गया है
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} मद के लिए आवश्यक सीरियल नंबर {1}। आपके द्वारा दी गई {2}।
 DocType: Stock Reconciliation Item,Current Valuation Rate,वर्तमान मूल्यांकन दर
 DocType: Item,Customer Item Codes,ग्राहक आइटम संहिताओं
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,वेल्डिंग
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,नया स्टॉक UOM आवश्यक है
 DocType: Quality Inspection,Sample Size,नमूने का आकार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.','केस नंबर से' एक वैध निर्दिष्ट करें
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,इसके अलावा लागत केन्द्रों समूह के तहत बनाया जा सकता है लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,इसके अलावा लागत केन्द्रों समूह के तहत बनाया जा सकता है लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है
 DocType: Project,External,बाहरी
 DocType: Features Setup,Item Serial Nos,आइटम सीरियल नं
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,उपयोगकर्ता और अनुमतियाँ
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,पता और संपर्क
 DocType: SMS Log,Sender Name,प्रेषक का नाम
 DocType: Page,Title,शीर्षक
-sites/assets/js/list.min.js +104,Customize,को मनपसंद
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,को मनपसंद
 DocType: POS Profile,[Select],[ चुनें ]
 DocType: SMS Log,Sent To,भेजा
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,बिक्री चालान बनाएं
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,जीवन का अंत
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,यात्रा
 DocType: Leave Block List,Allow Users,उपयोगकर्ताओं को अनुमति दें
+DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
 DocType: Sales Invoice,Recurring,आवर्ती
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,अलग आय को ट्रैक और उत्पाद कार्यक्षेत्र या डिवीजनों के लिए खर्च।
 DocType: Rename Tool,Rename Tool,उपकरण का नाम बदलें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,अद्यतन लागत
 DocType: Item Reorder,Item Reorder,आइटम पुनः क्रमित करें
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,हस्तांतरण सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,हस्तांतरण सामग्री
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","संचालन, परिचालन लागत निर्दिष्ट और अपने संचालन के लिए एक अनूठा आपरेशन नहीं दे ."
 DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,कर्मचारी
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,से आयात ईमेल
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,उपयोगकर्ता के रूप में आमंत्रित
 DocType: Features Setup,After Sale Installations,बिक्री के प्रतिष्ठान के बाद
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} पूरी तरह से बिल भेजा है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} पूरी तरह से बिल भेजा है
 DocType: Workstation Working Hour,End Time,अंतिम समय
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,बिक्री या खरीद के लिए मानक अनुबंध शर्तों .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,वाउचर द्वारा समूह
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,मास मेलिंग
 DocType: Page,Standard,मानक
 DocType: Rename Tool,File to Rename,नाम बदलने के लिए फ़ाइल
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse आदेश संख्या मद के लिए आवश्यक {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,दिखाएँ भुगतान
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,रखरखाव अनुसूची {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,रखरखाव अनुसूची {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,आकार
 DocType: Notification Control,Expense Claim Approved,व्यय दावे को मंजूरी
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,औषधि
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,तिथि उपस्थित
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),बिक्री ईमेल आईडी के लिए सेटअप आवक सर्वर . (जैसे sales@example.com )
 DocType: Warranty Claim,Raised By,द्वारा उठाए गए
 DocType: Payment Tool,Payment Account,भुगतान खाता
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
-sites/assets/js/list.min.js +23,Draft,मसौदा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,मसौदा
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,प्रतिपूरक बंद
 DocType: Quality Inspection Reading,Accepted,स्वीकार किया
 DocType: User,Female,महिला
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,नौवहन नियम लेबल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
 DocType: Newsletter,Test,परीक्षण
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","मौजूदा स्टॉक लेनदेन आप के मूल्यों को बदल नहीं सकते \ इस मद के लिए वहाँ के रूप में 'सीरियल नहीं है', 'बैच है,' नहीं 'शेयर मद है' और 'मूल्यांकन पद्धति'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
 DocType: Employee,Previous Work Experience,पिछले कार्य अनुभव
 DocType: Stock Entry,For Quantity,मात्रा के लिए
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},आइटम के लिए योजना बनाई मात्रा दर्ज करें {0} पंक्ति में {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} प्रस्तुत नहीं किया गया है
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,आइटम के लिए अनुरोध.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,आइटम के लिए अनुरोध.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,अलग उत्पादन का आदेश प्रत्येक समाप्त अच्छा आइटम के लिए बनाया जाएगा.
 DocType: Purchase Invoice,Terms and Conditions1,नियम और Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,पूरा सेटअप
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,न्यूज
 DocType: Delivery Note,Transporter Name,ट्रांसपोर्टर नाम
 DocType: Contact,Enter department to which this Contact belongs,विभाग को जो इस संपर्क के अंतर्गत आता दर्ज करें
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,कुल अनुपस्थित
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,पंक्ति के लिए आइटम या वेयरहाउस {0} सामग्री अनुरोध मेल नहीं खाता
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,पंक्ति के लिए आइटम या वेयरहाउस {0} सामग्री अनुरोध मेल नहीं खाता
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,माप की इकाई
 DocType: Fiscal Year,Year End Date,वर्षांत तिथि
 DocType: Task Depends On,Task Depends On,काम पर निर्भर करता है
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,एक आयोग के लिए कंपनियों के उत्पादों को बेचता है एक तीसरे पक्ष जो वितरक / डीलर / कमीशन एजेंट / सहबद्ध / पुनर्विक्रेता।
 DocType: Customer Group,Has Child Node,बाल नोड है
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} खरीद आदेश के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} खरीद आदेश के खिलाफ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","स्थैतिक यूआरएल यहाँ मानकों (Eg. प्रेषक = ERPNext, username = ERPNext, पासवर्ड = 1234 आदि) दर्ज करें"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} नहीं किसी भी सक्रिय वित्त वर्ष में। अधिक विवरण की जाँच के लिए {2}।
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,इस ERPNext से ऑटो उत्पन्न एक उदाहरण वेबसाइट है
@@ -2067,11 +2078,9 @@ DocType: Note,Note,नोट
 DocType: Purchase Receipt Item,Recd Quantity,रिसी डी मात्रा
 DocType: Email Account,Email Ids,ईमेल आईडी
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Unstopped रूप में सेट करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
 DocType: Payment Reconciliation,Bank / Cash Account,बैंक / रोकड़ लेखा
 DocType: Tax Rule,Billing City,बिलिंग शहर
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,इस छुट्टी के लिए अर्जी अनुमोदन के लिए लंबित है। केवल लीव अनुमोदनकर्ता स्थिति को अद्यतन कर सकते हैं।
 DocType: Global Defaults,Hide Currency Symbol,मुद्रा प्रतीक छुपाएँ
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","जैसे बैंक, नकद, क्रेडिट कार्ड"
 DocType: Journal Entry,Credit Note,जमापत्र
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),कुल मात्
 DocType: Installation Note Item,Installed Qty,स्थापित मात्रा
 DocType: Lead,Fax,फैक्स
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,पेश
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,पेश
 DocType: Salary Structure,Total Earning,कुल अर्जन
 DocType: Purchase Receipt,Time at which materials were received,जो समय पर सामग्री प्राप्त हुए थे
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,मेरे पते
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,संगठ
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,या
 DocType: Sales Order,Billing Status,बिलिंग स्थिति
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,उपयोगिता व्यय
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 से ऊपर
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 से ऊपर
 DocType: Buying Settings,Default Buying Price List,डिफ़ॉल्ट खरीद मूल्य सूची
 ,Download Backups,डाउनलोड बैकअप
 DocType: Notification Control,Sales Order Message,बिक्री आदेश संदेश
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,चयन करें कर्मचारी
 DocType: Bank Reconciliation,To Date,तिथि करने के लिए
 DocType: Opportunity,Potential Sales Deal,संभावित बिक्री डील
-sites/assets/js/form.min.js +308,Details,विवरण
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,विवरण
 DocType: Purchase Invoice,Total Taxes and Charges,कुल कर और शुल्क
 DocType: Employee,Emergency Contact,आपातकालीन संपर्क
 DocType: Item,Quality Parameters,गुणवत्ता के मानकों
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,प्राप्त मात्र
 DocType: Stock Entry Detail,Serial No / Batch,धारावाहिक नहीं / बैच
 DocType: Product Bundle,Parent Item,मूल आइटम
 DocType: Account,Account Type,खाता प्रकार
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
 ,To Produce,निर्माण करने के लिए
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","पंक्ति के लिए {0} में {1}। आइटम दर में {2} में शामिल करने के लिए, पंक्तियों {3} भी शामिल किया जाना चाहिए"
 DocType: Packing Slip,Identification of the package for the delivery (for print),प्रसव के लिए पैकेज की पहचान (प्रिंट के लिए)
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,सपाट
 DocType: Account,Income Account,आय खाता
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ढलाई
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,वितरण
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,वितरण
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान मात्रा
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",धारा लागत में "सामग्री के आधार पर दर" देखें
 DocType: Appraisal Goal,Key Responsibility Area,कुंजी जिम्मेदारी क्षेत्र
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,सभी पते.
 DocType: Company,Stock Settings,स्टॉक सेटिंग्स
 DocType: User,Bio,जैव
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ग्राहक समूह ट्री प्रबंधन .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,नए लागत केन्द्र का नाम
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,नए लागत केन्द्र का नाम
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण कक्ष छोड़ दो
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,कोई डिफ़ॉल्ट पता खाका पाया. सेटअप> मुद्रण और ब्रांडिंग से एक नया एक> पता टेम्पलेट बनाने के लिए धन्यवाद.
 DocType: Appraisal,HR User,मानव संसाधन उपयोगकर्ता
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,भुगतान टूल विस्तार
 ,Sales Browser,बिक्री ब्राउज़र
 DocType: Journal Entry,Total Credit,कुल क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,स्थानीय
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,स्थानीय
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ऋण और अग्रिम ( संपत्ति)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,देनदार
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,बड़ा
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,कोई कर्मचारी पाया !
 DocType: C-Form Invoice Detail,Territory,क्षेत्र
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,कृपया उल्लेख आवश्यक यात्राओं की कोई
+DocType: Purchase Order,Customer Address Display,ग्राहक पता प्रदर्शन
 DocType: Stock Settings,Default Valuation Method,डिफ़ॉल्ट मूल्यन विधि
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,चमकाने
 DocType: Production Order Operation,Planned Start Time,नियोजित प्रारंभ समय
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,आवंटित
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,बंद बैलेंस शीट और पुस्तक लाभ या हानि .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि \ मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। डिफ़ॉल्ट UoM को बदलने के लिए, \ उपयोग स्टॉक मॉड्यूल के तहत उपकरण 'UoM उपयोगिता बदलें'।"
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,विनिमय दर दूसरे में एक मुद्रा में परिवर्तित करने के लिए निर्दिष्ट करें
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,कोटेशन {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,कोटेशन {0} को रद्द कर दिया गया है
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,कुल बकाया राशि
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,कर्मचारी {0} {1} को छुट्टी पर था . उपस्थिति को चिह्नित नहीं किया जा सकता .
 DocType: Sales Partner,Targets,लक्ष्य
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,यह एक रूट ग्राहक समूह है और संपादित नहीं किया जा सकता है .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,आप लेखांकन प्रविष्टियों शुरू होने से पहले सेटअप खातों की चार्ट कृपया
 DocType: Purchase Invoice,Ignore Pricing Rule,मूल्य निर्धारण नियम की अनदेखी
-sites/assets/js/list.min.js +24,Cancelled,रद्द
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,रद्द
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,वेतन ढांचे में दिनांक से कर्मचारी शामिल होने की तिथि से कम नहीं हो सकता।
 DocType: Employee Education,Graduate,परिवर्धित
 DocType: Leave Block List,Block Days,ब्लॉक दिन
 DocType: Journal Entry,Excise Entry,आबकारी एंट्री
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},चेतावनी: बिक्री आदेश {0} पहले से ही ग्राहकों की खरीद आदेश के खिलाफ मौजूद {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},चेतावनी: बिक्री आदेश {0} पहले से ही ग्राहकों की खरीद आदेश के खिलाफ मौजूद {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,स्टॉक प्राप
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,सकल वेतन + बकाया राशि + नकदीकरण राशि कुल कटौती
 DocType: Monthly Distribution,Distribution Name,वितरण नाम
 DocType: Features Setup,Sales and Purchase,बिक्री और खरीद
-DocType: Purchase Order Item,Material Request No,सामग्री अनुरोध नहीं
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
+DocType: Supplier Quotation Item,Material Request No,सामग्री अनुरोध नहीं
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,जिस पर दर ग्राहक की मुद्रा कंपनी के बेस मुद्रा में परिवर्तित किया जाता है
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} इस सूची से सफलतापूर्वक सदस्यता वापस कर दिया गया है।
 DocType: Purchase Invoice Item,Net Rate (Company Currency),शुद्ध दर (कंपनी मुद्रा)
-apps/frappe/frappe/templates/base.html +132,Added,जोड़ा गया
+apps/frappe/frappe/templates/base.html +134,Added,जोड़ा गया
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,टेरिटरी ट्री प्रबंधन .
 DocType: Journal Entry Account,Sales Invoice,बिक्री चालान
 DocType: Journal Entry Account,Party Balance,पार्टी बैलेंस
 DocType: Sales Invoice Item,Time Log Batch,समय प्रवेश बैच
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,डिस्काउंट पर लागू होते हैं का चयन करें
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,डिस्काउंट पर लागू होते हैं का चयन करें
 DocType: Company,Default Receivable Account,डिफ़ॉल्ट प्राप्य खाता
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ऊपर चयनित मानदंड के लिए भुगतान की गई कुल वेतन के लिए बैंक प्रविष्टि बनाएँ
 DocType: Stock Entry,Material Transfer for Manufacture,निर्माण के लिए सामग्री हस्तांतरण
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,प्रासंगिक 
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Team1 बिक्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,आइटम {0} मौजूद नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,आइटम {0} मौजूद नहीं है
 DocType: Sales Invoice,Customer Address,ग्राहक पता
 apps/frappe/frappe/desk/query_report.py +136,Total,संपूर्ण
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त छूट पर लागू होते हैं
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,गुणवत्ता नि
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त छोटा
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,गठन स्प्रे
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,खाते {0} जमे हुए है
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,खाते {0} जमे हुए है
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संगठन से संबंधित खातों की एक अलग चार्ट के साथ कानूनी इकाई / सहायक।
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","खाद्य , पेय और तंबाकू"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,पी एल या बी एस
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,आयोग दर 100 से अधिक नहीं हो सकता
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,न्यूनतम सूची स्तर
 DocType: Stock Entry,Subcontract,उपपट्टा
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,1 {0} दर्ज करें
 DocType: Production Planning Tool,Get Items From Sales Orders,विक्रय आदेश से आइटम प्राप्त करें
 DocType: Production Order Operation,Actual End Time,वास्तविक अंत समय
 DocType: Production Planning Tool,Download Materials Required,आवश्यक सामग्री डाउनलोड करें
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,अनुसूचित
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","नहीं" और "बिक्री मद है" "स्टॉक मद है" कहाँ है "हाँ" है आइटम का चयन करें और कोई अन्य उत्पाद बंडल नहीं है कृपया
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असमान महीने भर में लक्ष्य को वितरित करने के लिए मासिक वितरण चुनें।
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,आइटम पंक्ति {0}: {1} के ऊपर 'खरीद प्राप्तियां' तालिका में मौजूद नहीं है खरीद रसीद
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} पहले से ही दोनों के बीच {1} के लिए आवेदन किया है {2} और {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} पहले से ही दोनों के बीच {1} के लिए आवेदन किया है {2} और {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,परियोजना प्रारंभ दिनांक
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,जब तक
 DocType: Rename Tool,Rename Log,प्रवेश का नाम बदलें
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,केवल पत्ता नोड्स के लेनदेन में की अनुमति दी जाती है
 DocType: Expense Claim,Expense Approver,व्यय अनुमोदनकर्ता
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरीद रसीद आइटम की आपूर्ति
-sites/assets/js/erpnext.min.js +48,Pay,वेतन
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,वेतन
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime करने के लिए
 DocType: SMS Settings,SMS Gateway URL,एसएमएस गेटवे URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,एसएमएस वितरण की स्थिति बनाए रखने के लिए लॉग
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,पिसाई
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,लपेटकर हटना
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,गतिविधियों में लंबित
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,गतिविधियों में लंबित
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,पुष्टि
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,प्रदायक> प्रदायक प्रकार
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,तारीख से राहत दर्ज करें.
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,अ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,अखबार के प्रकाशक
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,वित्तीय वर्ष का चयन करें
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,प्रगलन
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,आप इस रिकॉर्ड के लिए छोड़ अनुमोदक हैं . 'स्थिति' अद्यतन और बचा लो
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,स्तर पुनः क्रमित करें
 DocType: Attendance,Attendance Date,उपस्थिति तिथि
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,वेतन गोलमाल अर्जन और कटौती पर आधारित है.
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,मौजूदा लेनदेन के साथ लागत केंद्र समूह परिवर्तित नहीं किया जा सकता है
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ह्रास
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),प्रदायक (ओं)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,अमान्य अवधि
 DocType: Customer,Credit Limit,साख सीमा
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,लेन-देन प्रकार का चयन करें
 DocType: GL Entry,Voucher No,कोई वाउचर
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,श
 DocType: Customer,Address and Contact,पता और संपर्क
 DocType: Customer,Last Day of the Next Month,अगले महीने के आखिरी दिन
 DocType: Employee,Feedback,प्रतिपुष्टि
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint। अनुसूची
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint। अनुसूची
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,घर्षण जेट मशीनिंग
 DocType: Stock Settings,Freeze Stock Entries,स्टॉक प्रविष्टियां रुक
 DocType: Website Settings,Website Settings,वेबसाइट सेटिंग
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,बाहर जाने वाला
 DocType: Material Request,Requested For,के लिए अनुरोध
 DocType: Quotation Item,Against Doctype,Doctype के खिलाफ
 DocType: Delivery Note,Track this Delivery Note against any Project,किसी भी परियोजना के खिलाफ इस डिलिवरी नोट हुए
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,रुट खाता हटाया नहीं जा सकता
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,रुट खाता हटाया नहीं जा सकता
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,दिखाएँ स्टॉक प्रविष्टियां
 ,Is Primary Address,प्राथमिक पता है
 DocType: Production Order,Work-in-Progress Warehouse,कार्य में प्रगति गोदाम
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,पतों का प्रबंधन
 DocType: Pricing Rule,Item Code,आइटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन के आदेश बनाएँ
@@ -2460,14 +2471,14 @@ DocType: Journal Entry,User Remark,उपयोगकर्ता के टि
 DocType: Lead,Market Segment,बाजार खंड
 DocType: Communication,Phone,फ़ोन
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी आंतरिक कार्य इतिहास
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),समापन (डॉ.)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),समापन (डॉ.)
 DocType: Contact,Passive,निष्क्रिय
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,धारावाहिक नहीं {0} नहीं स्टॉक में
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,लेनदेन को बेचने के लिए टैक्स टेम्पलेट .
 DocType: Sales Invoice,Write Off Outstanding Amount,ऑफ बकाया राशि लिखें
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","यदि आप स्वत: आवर्ती चालान की जरूरत की जाँच करें. किसी भी बिक्री चालान प्रस्तुत करने के बाद, आवर्ती अनुभाग दिखाई जाएगी."
 DocType: Account,Accounts Manager,अकाउंट मैनेजर
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',समय लॉग {0} ' प्रस्तुत ' होना चाहिए
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',समय लॉग {0} ' प्रस्तुत ' होना चाहिए
 DocType: Stock Settings,Default Stock UOM,Default स्टॉक UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),गतिविधि प्रकार के आधार पर दर की लागत (प्रति घंटा)
 DocType: Production Planning Tool,Create Material Requests,सामग्री अनुरोध बनाएँ
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,बैंक समाधान
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,अपडेट प्राप्त करे
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द कर दिया है या बंद कर दिया गया है
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,कुछ नमूना रिकॉर्ड को जोड़ें
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,प्रबंधन छोड़ दो
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,प्रबंधन छोड़ दो
 DocType: Event,Groups,समूह
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाता द्वारा समूह
 DocType: Sales Order,Fully Delivered,पूरी तरह से वितरित
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,बिक्री अतिरिक्त
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} खाते के लिए बजट {1} लागत केंद्र के खिलाफ {2} {3} से अधिक होगा
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,कैर्री अग्रेषित पत्तियां
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तिथि तक' 'तिथि से'  के बाद होनी चाहिए
 ,Stock Projected Qty,शेयर मात्रा अनुमानित
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
 DocType: Sales Order,Customer's Purchase Order,ग्राहक के क्रय आदेश
 DocType: Warranty Claim,From Company,कंपनी से
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,मूल्य या मात्रा
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,खुदरा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सभी आपूर्तिकर्ता के प्रकार
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,आइटम स्वचालित रूप से गिने नहीं है क्योंकि मद कोड अनिवार्य है
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,आइटम स्वचालित रूप से गिने नहीं है क्योंकि मद कोड अनिवार्य है
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,रखरखाव अनुसूची आइटम
 DocType: Sales Order,%  Delivered,% वितरित
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,बैंक ओवरड्राफ्ट खाता
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,वेतन पर्ची बनाओ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,आगे बढ़ाना
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ब्राउज़ बीओएम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,सुरक्षित कर्जे
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,बहुत बढ़िया उत्पाद
@@ -2523,7 +2532,7 @@ DocType: Appraisal,Appraisal,मूल्यांकन
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,खोया-फोम कास्टिंग
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ड्राइंग
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,तिथि दोहराया है
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},छोड़ दो सरकारी गवाह से एक होना चाहिए {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},छोड़ दो सरकारी गवाह से एक होना चाहिए {0}
 DocType: Hub Settings,Seller Email,विक्रेता ईमेल
 DocType: Project,Total Purchase Cost (via Purchase Invoice),कुल खरीद मूल्य (खरीद चालान के माध्यम से)
 DocType: Workstation Working Hour,Start Time,समय शुरू
@@ -2537,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),शुद्ध राशि (कंपनी मुद्रा)
 DocType: BOM Operation,Hour Rate,घंटा दर
 DocType: Stock Settings,Item Naming By,द्वारा नामकरण आइटम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,से उद्धरण
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},अन्य समयावधि अंतिम लेखा {0} के बाद किया गया है {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,से उद्धरण
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},अन्य समयावधि अंतिम लेखा {0} के बाद किया गया है {1}
 DocType: Production Order,Material Transferred for Manufacturing,सामग्री विनिर्माण के लिए स्थानांतरित
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,खाता {0} करता नहीं मौजूद है
 DocType: Purchase Receipt Item,Purchase Order Item No,आदेश आइटम नहीं खरीद
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,आवश्यक निरीक्षण
 DocType: Purchase Invoice Item,PR Detail,पीआर विस्तार
 DocType: Sales Order,Fully Billed,पूरी तरह से किसी तरह का बिल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,रोकड़ शेष
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},वितरण गोदाम स्टॉक आइटम के लिए आवश्यक {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},वितरण गोदाम स्टॉक आइटम के लिए आवश्यक {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),पैकेज के कुल वजन. आमतौर पर शुद्ध + वजन पैकेजिंग सामग्री के वजन. (प्रिंट के लिए)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,इस भूमिका के साथ उपयोक्ता जमे हुए खातों के खिलाफ लेखांकन प्रविष्टियों को संशोधित / जमे हुए खातों सेट और बनाने के लिए अनुमति दी जाती है
 DocType: Serial No,Is Cancelled,क्या Cancelled
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,मेरा लदान
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,मेरा लदान
 DocType: Journal Entry,Bill Date,बिल की तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","सर्वोच्च प्राथमिकता के साथ कई मूल्य निर्धारण नियम हैं, भले ही उसके बाद निम्न आंतरिक प्राथमिकताओं लागू कर रहे हैं:"
 DocType: Supplier,Supplier Details,आपूर्तिकर्ता विवरण
@@ -2568,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,वायर ट्रांसफर
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,बैंक खाते का चयन करें
 DocType: Newsletter,Create and Send Newsletters,बनाने और भेजने समाचार
-sites/assets/js/report.min.js +107,From Date must be before To Date,दिनांक से पहले तिथि करने के लिए होना चाहिए
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,दिनांक से पहले तिथि करने के लिए होना चाहिए
 DocType: Sales Order,Recurring Order,आवर्ती आदेश
 DocType: Company,Default Income Account,डिफ़ॉल्ट आय खाता
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ग्राहक समूह / ग्राहक
@@ -2583,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,स्टॉक UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
 ,Projected,प्रक्षेपित
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},धारावाहिक नहीं {0} वेयरहाउस से संबंधित नहीं है {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,नोट : सिस्टम मद के लिए वितरण और अधिक से अधिक बुकिंग की जांच नहीं करेगा {0} मात्रा या राशि के रूप में 0 है
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,नोट : सिस्टम मद के लिए वितरण और अधिक से अधिक बुकिंग की जांच नहीं करेगा {0} मात्रा या राशि के रूप में 0 है
 DocType: Notification Control,Quotation Message,कोटेशन संदेश
 DocType: Issue,Opening Date,तिथि खुलने की
 DocType: Journal Entry,Remark,टिप्पणी
 DocType: Purchase Receipt Item,Rate and Amount,दर और राशि
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,बोरिंग
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,बिक्री आदेश से
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,बिक्री आदेश से
 DocType: Blog Category,Parent Website Route,जनक वेबसाइट ट्रेन
 DocType: Sales Order,Not Billed,नहीं बिल
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,दोनों गोदाम एक ही कंपनी से संबंधित होना चाहिए
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,कोई संपर्क नहीं अभी तक जोड़ा।
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,कोई संपर्क नहीं अभी तक जोड़ा।
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,सक्रिय नहीं
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,चालान पोस्टिंग तारीख के खिलाफ
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,उतरा लागत वाउचर राशि
 DocType: Time Log,Batched for Billing,बिलिंग के लिए batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,विधेयकों आपूर्तिकर्ता द्वारा उठाए गए.
 DocType: POS Profile,Write Off Account,ऑफ खाता लिखें
-sites/assets/js/erpnext.min.js +26,Discount Amount,छूट राशि
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,छूट राशि
 DocType: Purchase Invoice,Return Against Purchase Invoice,के खिलाफ खरीद चालान लौटें
 DocType: Item,Warranty Period (in days),वारंटी अवधि (दिनों में)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,उदाहरणार्थ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,आइटम 4
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रविष्टि खाता
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन सीरीज
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","एक आइटम ( {0}) , मद समूह का नाम बदलने के लिए या आइटम का नाम बदलने के लिए कृपया एक ही नाम के साथ मौजूद है"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","एक आइटम ( {0}) , मद समूह का नाम बदलने के लिए या आइटम का नाम बदलने के लिए कृपया एक ही नाम के साथ मौजूद है"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,गठन गर्म धातु गैस
 DocType: Sales Order Item,Sales Order Date,बिक्री आदेश दिनांक
 DocType: Sales Invoice Item,Delivered Qty,वितरित मात्रा
@@ -2639,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,ग्राहक या आपूर्तिकर्ता विवरण
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,समूह
 DocType: Lead,Lead Owner,मालिक लीड
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,गोदाम की आवश्यकता है
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,गोदाम की आवश्यकता है
 DocType: Employee,Marital Status,वैवाहिक स्थिति
 DocType: Stock Settings,Auto Material Request,ऑटो सामग्री अनुरोध
 DocType: Time Log,Will be updated when billed.,बिल भेजा जब अद्यतन किया जाएगा.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,गोदाम से पर उपलब्ध बैच मात्रा
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,वर्तमान बीओएम और नई बीओएम ही नहीं किया जा सकता है
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,सेवानिवृत्ति की तिथि शामिल होने की तिथि से अधिक होना चाहिए
 DocType: Sales Invoice,Against Income Account,आय खाता के खिलाफ
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,स्टॉक अद्यतन
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,मदों के लिए अलग UOM गलत ( कुल ) नेट वजन मूल्य को बढ़ावा मिलेगा. प्रत्येक आइटम का शुद्ध वजन ही UOM में है कि सुनिश्चित करें.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,बीओएम दर
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,डिलिवरी नोट से आइटम खींच कृपया
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,डिलिवरी नोट से आइटम खींच कृपया
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,जर्नल प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हुए हैं
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","प्रकार ईमेल, फोन, चैट, यात्रा, आदि के सभी संचार के रिकार्ड"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,कंपनी में गोल लागत से केंद्र का उल्लेख करें
 DocType: Purchase Invoice,Terms,शर्तें
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,नई बनाएँ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,नई बनाएँ
 DocType: Buying Settings,Purchase Order Required,खरीदने के लिए आवश्यक आदेश
 ,Item-wise Sales History,आइटम के लिहाज से बिक्री इतिहास
 DocType: Expense Claim,Total Sanctioned Amount,कुल स्वीकृत राशि
@@ -2681,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,वेतनपर्ची
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,नोट्स
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,पहले एक समूह नोड का चयन करें।
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},उद्देश्य से एक होना चाहिए {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,फार्म भरें और इसे बचाने के लिए
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,फार्म भरें और इसे बचाने के लिए
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,उनकी नवीनतम सूची की स्थिति के साथ सभी कच्चे माल युक्त रिपोर्ट डाउनलोड करें
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,सामना
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,सामुदायिक फोरम
 DocType: Leave Application,Leave Balance Before Application,आवेदन से पहले शेष छोड़ो
 DocType: SMS Center,Send SMS,एसएमएस भेजें
 DocType: Company,Default Letter Head,लेटर हेड चूक
 DocType: Time Log,Billable,बिल
 DocType: Authorization Rule,This will be used for setting rule in HR module,इस मॉड्यूल में मानव संसाधन सेटिंग शासन के लिए इस्तेमाल किया जाएगा
 DocType: Account,Rate at which this tax is applied,दर जिस पर इस कर को लागू किया जाता है
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Reorder मात्रा
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reorder मात्रा
 DocType: Company,Stock Adjustment Account,स्टॉक समायोजन खाता
 DocType: Journal Entry,Write Off,ख़ारिज करना
 DocType: Time Log,Operation ID,ऑपरेशन आईडी
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","डिस्काउंट फील्ड्स खरीद आदेश, खरीद रसीद, खरीद चालान में उपलब्ध हो जाएगा"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नए खाते का नाम। नोट: ग्राहकों और आपूर्तिकर्ताओं के लिए खातों मत बनाएँ
 DocType: Report,Report Type,टाइप रिपोर्ट
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,लदान
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,लदान
 DocType: BOM Replace Tool,BOM Replace Tool,बीओएम बदलें उपकरण
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,देश बुद्धिमान डिफ़ॉल्ट पता टेम्पलेट्स
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
+DocType: Sales Order Item,Supplier delivers to Customer,आपूर्तिकर्ता ग्राहक को बचाता है
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,शो कर तोड़-अप
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,डाटा आयात और निर्यात
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',आप विनिर्माण गतिविधि में शामिल हैं .
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,चालान पोस्ट दिनांक
 DocType: Sales Invoice,Rounded Total,गोल कुल
 DocType: Product Bundle,List items that form the package.,सूची आइटम है कि पैकेज का फार्म.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,प्रतिशत आवंटन 100 % के बराबर होना चाहिए
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
 DocType: Company,Default Cash Account,डिफ़ॉल्ट नकद खाता
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,कंपनी ( नहीं ग्राहक या प्रदायक) मास्टर .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',' उम्मीद की डिलीवरी तिथि ' दर्ज करें
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',' उम्मीद की डिलीवरी तिथि ' दर्ज करें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,भुगतान की गई राशि + राशि से लिखने के कुल योग से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} आइटम के लिए एक वैध बैच नंबर नहीं है {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},नोट : छोड़ किस्म के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
@@ -2740,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","पंक्ति {0}: मात्रा गोदाम में उपलब्ध नहीं {1} को {2} {3}।
  उपलब्ध मात्रा: {4}, मात्रा स्थानांतरण: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आइटम 3
+DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Event,Sunday,रविवार
 DocType: Sales Team,Contribution (%),अंशदान (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,जिम्मेदारियों
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,टेम्पलेट
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,टेम्पलेट
 DocType: Sales Person,Sales Person Name,बिक्री व्यक्ति का नाम
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,तालिका में कम से कम 1 चालान दाखिल करें
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,उपयोगकर्ता जोड़ें
@@ -2753,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),वास्तविक प्
 DocType: Stock Reconciliation Item,Before reconciliation,सुलह से पहले
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),करों और शुल्कों जोड़ा (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
 DocType: Sales Order,Partly Billed,आंशिक रूप से बिल
 DocType: Item,Default BOM,Default बीओएम
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2761,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,कुल बकाया राशि
 DocType: Time Log Batch,Total Hours,कुल घंटे
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्स
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,मोटर वाहन
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},पत्तियां प्रकार के लिए {0} पहले से ही कर्मचारी के लिए आवंटित {1} वित्त वर्ष के लिए {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,आइटम आवश्यक है
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,धातु इंजेक्शन मोल्डिंग
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,डिलिवरी नोट से
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,डिलिवरी नोट से
 DocType: Time Log,From Time,समय से
 DocType: Notification Control,Custom Message,कस्टम संदेश
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,निवेश बैंकिंग
@@ -2782,10 +2795,10 @@ DocType: Newsletter,A Lead with this email id should exist,इस ईमेल 
 DocType: Stock Entry,From BOM,बीओएम से
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,बुनियादी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} से पहले शेयर लेनदेन जमे हुए हैं
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule','उत्पन्न अनुसूची' पर क्लिक करें
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,तिथि करने के लिए आधे दिन की छुट्टी के लिए तिथि से ही होना चाहिए
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','उत्पन्न अनुसूची' पर क्लिक करें
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,तिथि करने के लिए आधे दिन की छुट्टी के लिए तिथि से ही होना चाहिए
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","जैसे किलोग्राम, यूनिट, ओपन स्कूल, मीटर"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"आप संदर्भ तिथि में प्रवेश किया , तो संदर्भ कोई अनिवार्य है"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"आप संदर्भ तिथि में प्रवेश किया , तो संदर्भ कोई अनिवार्य है"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,शामिल होने की तिथि जन्म तिथि से अधिक होना चाहिए
 DocType: Salary Structure,Salary Structure,वेतन संरचना
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,7 +2806,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  संघर्ष का समाधान करें। मूल्य नियम: {0}"
 DocType: Account,Bank,बैंक
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,एयरलाइन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,मुद्दा सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,मुद्दा सामग्री
 DocType: Material Request Item,For Warehouse,गोदाम के लिए
 DocType: Employee,Offer Date,प्रस्ताव की तिथि
 DocType: Hub Settings,Access Token,एक्सेस टोकन
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,समय खुलने की
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,दिनांक से और
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,प्रतिभूति एवं कमोडिटी एक्सचेंजों
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
+DocType: Delivery Note Item,From Warehouse,गोदाम से
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ड्रिलिंग
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,उड़ा ढलाई
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन और कुल
@@ -2837,11 +2851,12 @@ DocType: C-Form,Amended From,से संशोधित
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,कच्चे माल
 DocType: Leave Application,Follow via Email,ईमेल के माध्यम से पालन करें
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सबसे कम राशि के बाद टैक्स राशि
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,चाइल्ड खाता इस खाते के लिए मौजूद है. आप इस खाते को नष्ट नहीं कर सकते .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,चाइल्ड खाता इस खाते के लिए मौजूद है. आप इस खाते को नष्ट नहीं कर सकते .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,लक्ष्य मात्रा या लक्ष्य राशि या तो अनिवार्य है
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
-DocType: Leave Allocation,Carry Forward,आगे ले जाना
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,दिनांक खोलने की तिथि बंद करने से पहले किया जाना चाहिए
+DocType: Leave Control Panel,Carry Forward,आगे ले जाना
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,मौजूदा लेनदेन के साथ लागत केंद्र लेज़र परिवर्तित नहीं किया जा सकता है
 DocType: Department,Days for which Holidays are blocked for this department.,दिन छुट्टियाँ जिसके लिए इस विभाग के लिए अवरुद्ध कर रहे हैं.
 ,Produced,उत्पादित
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),कुल (राश
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,मनोरंजन और आराम
 DocType: Purchase Order,The date on which recurring order will be stop,"आवर्ती आदेश रोक दिया जाएगा, जिस पर तारीख"
 DocType: Quality Inspection,Item Serial No,आइटम कोई धारावाहिक
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} से कम किया जाना चाहिए या आप अतिप्रवाह सहिष्णुता में वृद्धि करनी चाहिए
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} से कम किया जाना चाहिए या आप अतिप्रवाह सहिष्णुता में वृद्धि करनी चाहिए
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,कुल वर्तमान
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,घंटा
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","धारावाहिक मद {0} शेयर सुलह का उपयोग कर \
  अद्यतन नहीं किया जा सकता है"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,प्रदायक के लिए सामग्री हस्तांतरण
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,प्रदायक के लिए सामग्री हस्तांतरण
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नया धारावाहिक कोई गोदाम नहीं कर सकते हैं . गोदाम स्टॉक एंट्री या खरीद रसीद द्वारा निर्धारित किया जाना चाहिए
 DocType: Lead,Lead Type,प्रकार लीड
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,कोटेशन बनाएँ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,इन सभी मदों पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,इन सभी मदों पहले से चालान कर दिया गया है
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} द्वारा अनुमोदित किया जा सकता
 DocType: Shipping Rule,Shipping Rule Conditions,नौवहन नियम शर्तें
 DocType: BOM Replace Tool,The new BOM after replacement,बदलने के बाद नए बीओएम
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,सी - फार्म
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ऑपरेशन आईडी सेट नहीं
 DocType: Production Order,Planned Start Date,नियोजित प्रारंभ दिनांक
 DocType: Serial No,Creation Document Type,निर्माण दस्तावेज़ प्रकार
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint। भेंट
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint। भेंट
 DocType: Leave Type,Is Encash,तुड़ाना है
 DocType: Purchase Invoice,Mobile No,नहीं मोबाइल
 DocType: Payment Tool,Make Journal Entry,जर्नल प्रविष्टि बनाने
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,नई आवंटित पत
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,परियोजना के लिहाज से डेटा उद्धरण के लिए उपलब्ध नहीं है
 DocType: Project,Expected End Date,उम्मीद समाप्ति तिथि
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन टेम्पलेट शीर्षक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,वाणिज्यिक
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,वाणिज्यिक
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,मूल आइटम {0} एक शेयर मद नहीं होना चाहिए
 DocType: Cost Center,Distribution Id,वितरण आईडी
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,बहुत बढ़िया सेवाएं
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} विशेषता के लिए मान की सीमा के भीतर होना चाहिए {1} को {2} की वेतन वृद्धि में {3}
 DocType: Tax Rule,Sales,विक्रय
 DocType: Stock Entry Detail,Basic Amount,मूल राशि
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,सीआर
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
+DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,सीआर
 DocType: Customer,Default Receivable Accounts,प्राप्य लेखा चूक
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,काटने का कार्य
 DocType: Tax Rule,Billing State,बिलिंग राज्य
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,हस्तांतरण
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
 DocType: Authorization Rule,Applicable To (Employee),के लिए लागू (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,नियत तिथि अनिवार्य है
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,खुदरा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ग्राहक {0} मौजूद नहीं है
 DocType: Attendance,Absent,अनुपस्थित
 DocType: Product Bundle,Product Bundle,उत्पाद बंडल
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},पंक्ति {0}: अमान्य संदर्भ {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,क्रशिंग
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,करों और शुल्कों टेम्पलेट खरीद
 DocType: Upload Attendance,Download Template,टेम्पलेट डाउनलोड करें
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,टिप्पणियाँ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,कच्चे माल के मद कोड
 DocType: Journal Entry,Write Off Based On,के आधार पर बंद लिखने के लिए
 DocType: Features Setup,POS View,स्थिति देखें
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,एक सीरियल नंबर के लिए स्थापना रिकॉर्ड
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,एक सीरियल नंबर के लिए स्थापना रिकॉर्ड
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,निरंतर ढलाई
-sites/assets/js/erpnext.min.js +10,Please specify a,कृपया बताएं एक
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,कृपया बताएं एक
 DocType: Offer Letter,Awaiting Response,प्रतिक्रिया की प्रतीक्षा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ऊपर
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,शीत नौकरशाही का आकार घटाने
 DocType: Salary Slip,Earning & Deduction,अर्जन कटौती
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,खाते {0} एक समूह नहीं हो सकता
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,प्रदेश
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,वैकल्पिक . यह सेटिंग विभिन्न लेनदेन में फिल्टर करने के लिए इस्तेमाल किया जाएगा .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,वैकल्पिक . यह सेटिंग विभिन्न लेनदेन में फिल्टर करने के लिए इस्तेमाल किया जाएगा .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
 DocType: Holiday List,Weekly Off,ऑफ साप्ताहिक
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","जैसे 2012, 2012-13 के लिए"
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,उभड़ा हुआ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,बाष्पीकरणीय पैटर्न कास्टिंग
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,मनोरंजन खर्च
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,बिक्री चालान {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,आयु
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,बिक्री चालान {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,आयु
 DocType: Time Log,Billing Amount,बिलिंग राशि
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,आइटम के लिए निर्दिष्ट अमान्य मात्रा {0} . मात्रा 0 से अधिक होना चाहिए .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,छुट्टी के लिए आवेदन.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,मौजूदा लेन - देन के साथ खाता हटाया नहीं जा सकता
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,मौजूदा लेन - देन के साथ खाता हटाया नहीं जा सकता
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,विधि व्यय
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ऑटो आदेश 05, 28 आदि जैसे उत्पन्न हो जाएगा, जिस पर इस महीने के दिन"
 DocType: Sales Invoice,Posting Time,बार पोस्टिंग
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,लोगो
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,यह जाँच लें कि आप उपयोगकर्ता बचत से पहले एक श्रृंखला का चयन करने के लिए मजबूर करना चाहते हैं. कोई डिफ़ॉल्ट हो सकता है अगर आप इस जाँच करेगा.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},धारावाहिक नहीं के साथ कोई आइटम {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,ओपन सूचनाएं
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ओपन सूचनाएं
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,प्रत्यक्ष खर्च
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,आप वास्तव में इस सामग्री अनुरोध आगे बढ़ाना चाहते हैं?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,नया ग्राहक राजस्व
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,यात्रा व्यय
 DocType: Maintenance Visit,Breakdown,भंग
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,आज की तारीख में
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,परिवीक्षा
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,डिफ़ॉल्ट गोदाम स्टॉक मद के लिए अनिवार्य है .
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,डिफ़ॉल्ट गोदाम स्टॉक मद के लिए अनिवार्य है .
 DocType: Feed,Full Name,पूरा नाम
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,जकड़ना
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},महीने के वेतन का भुगतान {0} और वर्ष {1}
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,पंक्त
 DocType: Buying Settings,Default Supplier Type,डिफ़ॉल्ट प्रदायक प्रकार
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,उत्खनन
 DocType: Production Order,Total Operating Cost,कुल परिचालन लागत
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,नोट : आइटम {0} कई बार प्रवेश किया
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,नोट : आइटम {0} कई बार प्रवेश किया
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,सभी संपर्क.
 DocType: Newsletter,Test Email Id,टेस्ट ईमेल आईडी
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,कंपनी संक्षिप्त
@@ -3101,11 +3117,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,सु
 DocType: Stock Settings,Role Allowed to edit frozen stock,जमे हुए शेयर संपादित करने के लिए रख सकते है भूमिका
 ,Territory Target Variance Item Group-Wise,क्षेत्र को लक्षित विचरण मद समूहवार
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,सभी ग्राहक समूहों
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,टैक्स खाका अनिवार्य है।
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,खाते {0}: माता पिता के खाते {1} मौजूद नहीं है
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),मूल्य सूची दर (कंपनी मुद्रा)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} स्थिति ' रूका ' है
 DocType: Account,Temporary,अस्थायी
 DocType: Address,Preferred Billing Address,पसंदीदा बिलिंग पता
 DocType: Monthly Distribution Percentage,Percentage Allocation,प्रतिशत आवंटन
@@ -3123,13 +3138,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,मद वार कर
 DocType: Purchase Order Item,Supplier Quotation,प्रदायक कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,शब्दों में दिखाई हो सकता है एक बार आप उद्धरण बचाने के लिए होगा.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,इस्त्री
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} बंद कर दिया है
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} बंद कर दिया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
 DocType: Lead,Add to calendar on this date,इस तिथि पर कैलेंडर में जोड़ें
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,शिपिंग लागत को जोड़ने के लिए नियम.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,आगामी कार्यक्रम
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,आगामी कार्यक्रम
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ग्राहक की आवश्यकता है
 DocType: Letter Head,Letter Head,पत्रशीर्ष
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,त्वरित एंट्री
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} वापसी के लिए अनिवार्य है
 DocType: Purchase Order,To Receive,प्राप्त करने के लिए
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,फिटिंग हटना
@@ -3153,25 +3169,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
 DocType: Serial No,Out of Warranty,वारंटी के बाहर
 DocType: BOM Replace Tool,Replace,बदलें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,उपाय की मूलभूत इकाई दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,उपाय की मूलभूत इकाई दर्ज करें
 DocType: Purchase Invoice Item,Project Name,इस परियोजना का नाम
 DocType: Supplier,Mention if non-standard receivable account,"मेंशन अमानक प्राप्य खाते है, तो"
 DocType: Workflow State,Edit,संपादित करें
 DocType: Journal Entry Account,If Income or Expense,यदि आय या व्यय
 DocType: Features Setup,Item Batch Nos,आइटम बैच Nos
 DocType: Stock Ledger Entry,Stock Value Difference,स्टॉक मूल्य अंतर
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,मानव संसाधन
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,मानव संसाधन
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,भुगतान सुलह भुगतान
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,कर संपत्ति
 DocType: BOM Item,BOM No,नहीं बीओएम
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रविष्टि {0} {1} या पहले से ही अन्य वाउचर के खिलाफ मिलान खाता नहीं है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रविष्टि {0} {1} या पहले से ही अन्य वाउचर के खिलाफ मिलान खाता नहीं है
 DocType: Item,Moving Average,चलायमान औसत
 DocType: BOM Replace Tool,The BOM which will be replaced,बीओएम जो प्रतिस्थापित किया जाएगा
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,नया स्टॉक UOM मौजूदा स्टॉक UOM से अलग होना चाहिए
 DocType: Account,Debit,नामे
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,पत्तियां 0.5 के गुणकों में आवंटित किया जाना चाहिए
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,पत्तियां 0.5 के गुणकों में आवंटित किया जाना चाहिए
 DocType: Production Order,Operation Cost,संचालन लागत
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,. Csv फ़ाइल से उपस्थिति अपलोड करें
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,बकाया राशि
@@ -3179,7 +3195,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,से
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","इस मुद्दे को असाइन करने के लिए, साइडबार में "निरुपित" बटन का उपयोग करें."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],रुक स्टॉक से अधिक उम्र [ दिन]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","दो या दो से अधिक मूल्य निर्धारण नियमों उपरोक्त शर्तों के आधार पर पाए जाते हैं, प्राथमिकता लागू किया जाता है। डिफ़ॉल्ट मान शून्य (रिक्त) है, जबकि प्राथमिकता 0-20 के बीच एक नंबर है। अधिक संख्या में एक ही शर्तों के साथ एकाधिक मूल्य निर्धारण नियम हैं अगर यह पूर्वता ले जाएगा मतलब है।"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,चालान के खिलाफ
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,वित्तीय वर्ष: {0} करता नहीं मौजूद है
 DocType: Currency Exchange,To Currency,मुद्रा के लिए
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,निम्नलिखित उपयोगकर्ता ब्लॉक दिनों के लिए छोड़ एप्लीकेशन को स्वीकृत करने की अनुमति दें.
@@ -3208,7 +3223,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),द
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त लागत
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,वित्तीय वर्ष की समाप्ति तिथि
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","वाउचर के आधार पर फ़िल्टर नहीं कर सकते नहीं, वाउचर के आधार पर समूहीकृत अगर"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
 DocType: Quality Inspection,Incoming,आवक
 DocType: BOM,Materials Required (Exploded),माल आवश्यक (विस्फोट)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),वेतन (LWP) के बिना छुट्टी लिए कमाई कम करें
@@ -3216,10 +3231,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},पंक्ति # {0}: सीरियल नहीं {1} के साथ मेल नहीं खाता {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,आकस्मिक छुट्टी
 DocType: Batch,Batch ID,बैच आईडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},नोट : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},नोट : {0}
 ,Delivery Note Trends,डिलिवरी नोट रुझान
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,इस सप्ताह की सारांश
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} पंक्ति में एक खरीदे या उप अनुबंधित आइटम होना चाहिए {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} पंक्ति में एक खरीदे या उप अनुबंधित आइटम होना चाहिए {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,खाता: {0} केवल शेयर लेनदेन के माध्यम से अद्यतन किया जा सकता है
 DocType: GL Entry,Party,पार्टी
 DocType: Sales Order,Delivery Date,प्रसव की तारीख
@@ -3232,7 +3247,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,औसत। क्रय दर
 DocType: Task,Actual Time (in Hours),(घंटे में) वास्तविक समय
 DocType: Employee,History In Company,कंपनी में इतिहास
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,समाचारपत्रिकाएँ
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,समाचारपत्रिकाएँ
 DocType: Address,Shipping,शिपिंग
 DocType: Stock Ledger Entry,Stock Ledger Entry,स्टॉक खाता प्रविष्टि
 DocType: Department,Leave Block List,ब्लॉक सूची छोड़ दो
@@ -3251,7 +3266,7 @@ DocType: Account,Auditor,आडिटर
 DocType: Purchase Order,End date of current order's period,वर्तमान आदेश की अवधि की समाप्ति की तारीख
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,प्रस्ताव पत्र बनाओ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,वापसी
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,संस्करण के लिए उपाय की मूलभूत इकाई टेम्पलेट के रूप में ही किया जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,संस्करण के लिए उपाय की मूलभूत इकाई टेम्पलेट के रूप में ही किया जाना चाहिए
 DocType: DocField,Fold,गुना
 DocType: Production Order Operation,Production Order Operation,उत्पादन का आदेश ऑपरेशन
 DocType: Pricing Rule,Disable,असमर्थ
@@ -3283,7 +3298,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,करने के लिए रिपोर्ट
 DocType: SMS Settings,Enter url parameter for receiver nos,रिसीवर ओपन स्कूल के लिए url पैरामीटर दर्ज करें
 DocType: Sales Invoice,Paid Amount,राशि भुगतान
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',खाते {0} समापन प्रकार की देयता ' का होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',खाते {0} समापन प्रकार की देयता ' का होना चाहिए
 ,Available Stock for Packing Items,आइटम पैकिंग के लिए उपलब्ध स्टॉक
 DocType: Item Variant,Item Variant,आइटम संस्करण
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,कोई अन्य डिफ़ॉल्ट रूप में वहाँ डिफ़ॉल्ट के रूप में इस का पता खाका स्थापना
@@ -3291,7 +3306,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता प्रबंधन
 DocType: Production Planning Tool,Filter based on customer,ग्राहकों के आधार पर फ़िल्टर
 DocType: Payment Tool Detail,Against Voucher No,वाउचर नहीं अगेंस्ट
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},आइटम के लिए मात्रा दर्ज करें {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},आइटम के लिए मात्रा दर्ज करें {0}
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाहरी काम इतिहास
 DocType: Tax Rule,Purchase,क्रय
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,शेष मात्रा
@@ -3328,28 +3343,29 @@ Note: BOM = Bill of Materials","एक और ** मद में ** आइट
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},सीरियल मद के लिए अनिवार्य है {0}
 DocType: Item Variant Attribute,Attribute,गुण
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,सीमा होती है / से निर्दिष्ट करें
-sites/assets/js/desk.min.js +7652,Created By,द्वारा बनाया गया
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,द्वारा बनाया गया
 DocType: Serial No,Under AMC,एएमसी के तहत
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,आइटम वैल्यूएशन दर उतरा लागत वाउचर राशि पर विचार पुनर्गणना है
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,लेनदेन को बेचने के लिए डिफ़ॉल्ट सेटिंग्स .
 DocType: BOM Replace Tool,Current BOM,वर्तमान बीओएम
-sites/assets/js/erpnext.min.js +8,Add Serial No,धारावाहिक नहीं जोड़ें
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,धारावाहिक नहीं जोड़ें
 DocType: Production Order,Warehouses,गोदामों
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,प्रिंट और स्टेशनरी
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,समूह नोड
 DocType: Payment Reconciliation,Minimum Amount,न्यूनतम राशि
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,अद्यतन तैयार माल
 DocType: Workstation,per hour,प्रति घंटा
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},सीरीज {0} पहले से ही प्रयोग किया जाता में {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},सीरीज {0} पहले से ही प्रयोग किया जाता में {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,गोदाम ( सदा सूची ) के लिए खाते में इस खाते के तहत बनाया जाएगा .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,शेयर खाता प्रविष्टि इस गोदाम के लिए मौजूद वेयरहाउस हटाया नहीं जा सकता .
 DocType: Company,Distribution,वितरण
-sites/assets/js/erpnext.min.js +50,Amount Paid,राशि का भुगतान
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,राशि का भुगतान
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,परियोजना प्रबंधक
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,प्रेषण
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,अधिकतम छूट मद के लिए अनुमति दी: {0} {1}% है
 DocType: Customer,Default Taxes and Charges,डिफ़ॉल्ट करों और शुल्कों
 DocType: Account,Receivable,प्राप्य
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,पंक्ति # {0}: खरीद आदेश पहले से मौजूद है के रूप में आपूर्तिकर्ता बदलने की अनुमति नहीं
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,निर्धारित ऋण सीमा से अधिक लेनदेन है कि प्रस्तुत करने की अनुमति दी है कि भूमिका.
 DocType: Sales Invoice,Supplier Reference,प्रदायक संदर्भ
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","अगर चेक्ड उप विधानसभा आइटम के लिए बीओएम कच्चे माल प्राप्त करने के लिए विचार किया जाएगा. अन्यथा, सभी उप विधानसभा वस्तुओं एक कच्चे माल के रूप में इलाज किया जाएगा."
@@ -3386,8 +3402,8 @@ DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ता
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},लेन - देन बंद कर दिया प्रोडक्शन आदेश के खिलाफ अनुमति नहीं {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","डिफ़ॉल्ट रूप में इस वित्तीय वर्ष में सेट करने के लिए , 'मूलभूत रूप में सेट करें ' पर क्लिक करें"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),समर्थन ईमेल आईडी के लिए सेटअप आवक सर्वर . (जैसे support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,कमी मात्रा
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
 DocType: Salary Slip,Salary Slip,वेतनपर्ची
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,तिथि करने के लिए आवश्यक है
@@ -3400,6 +3416,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",", एक चेक किए गए लेनदेन के किसी भी "प्रस्तुत कर रहे हैं" पॉप - अप ईमेल स्वचालित रूप से जुड़े है कि सौदे में "संपर्क" के लिए एक ईमेल भेजने के लिए, एक अनुलग्नक के रूप में लेन - देन के साथ खोला. उपयोगकर्ता या ईमेल भेजने के लिए नहीं हो सकता."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,वैश्विक सेटिंग्स
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षा
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
 DocType: Salary Slip,Net Pay,शुद्ध वेतन
 DocType: Account,Account,खाता
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,धारावाहिक नहीं {0} पहले से ही प्राप्त हो गया है
@@ -3432,7 +3449,7 @@ DocType: BOM,Manufacturing User,विनिर्माण प्रयोक
 DocType: Purchase Order,Raw Materials Supplied,कच्चे माल की आपूर्ति
 DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट प्रारूप
 DocType: Communication,Series,कई
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,उम्मीद की डिलीवरी तिथि खरीद आदेश तिथि से पहले नहीं हो सकता
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,उम्मीद की डिलीवरी तिथि खरीद आदेश तिथि से पहले नहीं हो सकता
 DocType: Appraisal,Appraisal Template,मूल्यांकन टेम्पलेट
 DocType: Communication,Email,ईमेल
 DocType: Item Group,Item Classification,आइटम वर्गीकरण
@@ -3488,6 +3505,7 @@ DocType: HR Settings,Payroll Settings,पेरोल सेटिंग्स
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,गैर जुड़े चालान और भुगतान का मिलान.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,आदेश देना
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,रूट एक माता पिता लागत केंद्र नहीं कर सकते
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,चुनें ब्रांड ...
 DocType: Sales Invoice,C-Form Applicable,लागू सी फार्म
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
 DocType: Supplier,Address and Contacts,पता और संपर्क
@@ -3498,7 +3516,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,बकाया वाउचर जाओ
 DocType: Warranty Claim,Resolved By,द्वारा हल किया
 DocType: Appraisal,Start Date,प्रारंभ दिनांक
-sites/assets/js/desk.min.js +7629,Value,मूल्य
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,मूल्य
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,एक अवधि के लिए पत्तियों का आवंटन .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,सत्यापित करने के लिए यहां क्लिक करें
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,खाते {0}: तुम माता पिता के खाते के रूप में खुद को आवंटन नहीं कर सकते
@@ -3514,14 +3532,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,ड्रॉपबॉक्स उपयोग की अनुमति दी
 DocType: Dropbox Backup,Weekly,साप्ताहिक
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,उदा. एपीआई smsgateway.com / / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,प्राप्त
 DocType: Maintenance Visit,Fully Completed,पूरी तरह से पूरा
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% पूर्ण
 DocType: Employee,Educational Qualification,शैक्षिक योग्यता
 DocType: Workstation,Operating Costs,परिचालन लागत
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी छुट्टी अनुमोदक
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} सफलतापूर्वक हमारे न्यूज़लेटर की सूची में जोड़ा गया है।
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,इलेक्ट्रॉन बीम मशीनिंग
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,क्रय मास्टर प्रबंधक
@@ -3534,7 +3552,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc doctype
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,लागत केंद्र के चार्ट
 ,Requested Items To Be Ordered,आदेश दिया जा करने के लिए अनुरोध आइटम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,मेरे आदेश
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,मेरे आदेश
 DocType: Price List,Price List Name,मूल्य सूची का नाम
 DocType: Time Log,For Manufacturing,विनिर्माण के लिए
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,योग
@@ -3545,7 +3563,7 @@ DocType: Account,Income,आय
 DocType: Industry Type,Industry Type,उद्योग के प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,कुछ गलत हो गया!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,बिक्री चालान {0} पहले से ही प्रस्तुत किया गया है
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,बिक्री चालान {0} पहले से ही प्रस्तुत किया गया है
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,पूरा करने की तिथि
 DocType: Purchase Invoice Item,Amount (Company Currency),राशि (कंपनी मुद्रा)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,कास्टिंग मरो
@@ -3559,10 +3577,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,वर्ष
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,प्वाइंट-ऑफ-सेल प्रोफ़ाइल
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,एसएमएस सेटिंग को अपडेट करें
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,पहले से ही बिल भेजा टाइम प्रवेश {0}
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,पहले से ही बिल भेजा टाइम प्रवेश {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,असुरक्षित ऋण
 DocType: Cost Center,Cost Center Name,लागत केन्द्र का नाम
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,आइटम {0} धारावाहिक नहीं के साथ {1} पहले से ही स्थापित है
 DocType: Maintenance Schedule Detail,Scheduled Date,अनुसूचित तिथि
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,कुल भुगतान राशि
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 चरित्र से अधिक संदेश कई mesage में split जाएगा
@@ -3570,10 +3587,10 @@ DocType: Purchase Receipt Item,Received and Accepted,प्राप्त औ
 ,Serial No Service Contract Expiry,धारावाहिक नहीं सेवा अनुबंध समाप्ति
 DocType: Item,Unit of Measure Conversion,उपाय रूपांतरण की इकाई
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,कर्मचारी बदला नहीं जा सकता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
 DocType: Naming Series,Help HTML,HTML मदद
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},कुल आवंटित वेटेज 100 % होना चाहिए . यह है {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},भत्ता खत्म-{0} मद के लिए पार कर लिए {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},भत्ता खत्म-{0} मद के लिए पार कर लिए {1}
 DocType: Address,Name of person or organization that this address belongs to.,कि इस पते पर संबधित व्यक्ति या संगठन का नाम.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,अपने आपूर्तिकर्ताओं
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
@@ -3584,10 +3601,11 @@ DocType: Lead,Converted,परिवर्तित
 DocType: Item,Has Serial No,नहीं सीरियल गया है
 DocType: Employee,Date of Issue,जारी करने की तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} के लिए {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,कंप्यूटर
 DocType: Item,List this Item in multiple groups on the website.,कई समूहों में वेबसाइट पर इस मद की सूची.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,आइटम: {0} सिस्टम में मौजूद नहीं है
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled प्रविष्टियां प्राप्त करें
@@ -3598,14 +3616,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,गोदाम के लिए
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},खाते {0} अधिक वित्तीय वर्ष के लिए एक बार से अधिक दर्ज किया गया है {1}
 ,Average Commission Rate,औसत कमीशन दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,उपस्थिति भविष्य तारीखों के लिए चिह्नित नहीं किया जा सकता
 DocType: Pricing Rule,Pricing Rule Help,मूल्य निर्धारण नियम मदद
 DocType: Purchase Taxes and Charges,Account Head,लेखाशीर्ष
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,मदों की उतरा लागत की गणना करने के लिए अतिरिक्त लागत अद्यतन
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,विद्युत
 DocType: Stock Entry,Total Value Difference (Out - In),कुल मूल्य का अंतर (आउट - में)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},यूजर आईडी कर्मचारी के लिए सेट नहीं {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,वारंटी दावे से
@@ -3619,15 +3637,17 @@ DocType: Buying Settings,Naming Series,श्रृंखला का नाम
 DocType: Leave Block List,Leave Block List Name,ब्लॉक सूची नाम छोड़ दो
 DocType: User,Enabled,Enabled
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,शेयर एसेट्स
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},आप वास्तव में {0} और वर्ष {1} माह के लिए सभी वेतन पर्ची प्रस्तुत करना चाहते हैं
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},आप वास्तव में {0} और वर्ष {1} माह के लिए सभी वेतन पर्ची प्रस्तुत करना चाहते हैं
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,आयात सदस्य
 DocType: Target Detail,Target Qty,लक्ष्य मात्रा
 DocType: Attendance,Present,पेश
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया जाना चाहिए
 DocType: Notification Control,Sales Invoice Message,बिक्री चालान संदेश
 DocType: Authorization Rule,Based On,के आधार पर
-,Ordered Qty,मात्रा का आदेश दिया
+DocType: Sales Order Item,Ordered Qty,मात्रा का आदेश दिया
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},से और अवधि आवर्ती के लिए अनिवार्य तिथियाँ तक की अवधि के {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,परियोजना / कार्य कार्य.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,वेतन स्लिप्स उत्पन्न
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} एक मान्य ईमेल आईडी नहीं है
@@ -3667,7 +3687,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,उपस्थिति अपलोड
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,बीओएम और विनिर्माण मात्रा की आवश्यकता होती है
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,बूढ़े रेंज 2
-DocType: Journal Entry Account,Amount,राशि
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,राशि
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,बीओएम प्रतिस्थापित
 ,Sales Analytics,बिक्री विश्लेषिकी
@@ -3694,7 +3714,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,उम्मीद की तारीख सामग्री अनुरोध तिथि से पहले नहीं हो सकता
 DocType: Contact Us Settings,City,शहर
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,अल्ट्रासोनिक मशीनिंग
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,त्रुटि: नहीं एक वैध पहचान?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,त्रुटि: नहीं एक वैध पहचान?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,आइटम {0} एक बिक्री आइटम होना चाहिए
 DocType: Naming Series,Update Series Number,अद्यतन सीरीज नंबर
 DocType: Account,Equity,इक्विटी
@@ -3709,7 +3729,7 @@ DocType: Purchase Taxes and Charges,Actual,वास्तविक
 DocType: Authorization Rule,Customerwise Discount,Customerwise डिस्काउंट
 DocType: Purchase Invoice,Against Expense Account,व्यय खाते के खिलाफ
 DocType: Production Order,Production Order,उत्पादन का आदेश
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले से ही प्रस्तुत किया गया है
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले से ही प्रस्तुत किया गया है
 DocType: Quotation Item,Against Docname,Docname खिलाफ
 DocType: SMS Center,All Employee (Active),सभी कर्मचारी (सक्रिय)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,अब देखें
@@ -3717,14 +3737,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,कच्चे माल की लागत
 DocType: Item,Re-Order Level,स्तर पुनः क्रमित करें
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"वस्तुओं और योजना बनाई मात्रा दर्ज करें, जिसके लिए आप उत्पादन के आदेश को बढ़ाने या विश्लेषण के लिए कच्चे माल के डाउनलोड करना चाहते हैं."
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt चार्ट
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt चार्ट
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,अंशकालिक
 DocType: Employee,Applicable Holiday List,लागू अवकाश सूची
 DocType: Employee,Cheque,चैक
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,सीरीज नवीनीकृत
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,रिपोर्ट प्रकार अनिवार्य है
 DocType: Item,Serial Number Series,सीरियल नंबर सीरीज
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},गोदाम स्टॉक मद के लिए अनिवार्य है {0} पंक्ति में {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},गोदाम स्टॉक मद के लिए अनिवार्य है {0} पंक्ति में {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,खुदरा और थोक
 DocType: Issue,First Responded On,पर पहले जवाब
 DocType: Website Item Group,Cross Listing of Item in multiple groups,कई समूहों में आइटम के क्रॉस लिस्टिंग
@@ -3739,7 +3759,7 @@ DocType: Attendance,Attendance,उपस्थिति
 DocType: Page,No,नहीं
 DocType: BOM,Materials,सामग्री
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","अगर जाँच नहीं किया गया है, इस सूची के लिए प्रत्येक विभाग है जहां इसे लागू किया गया है के लिए जोड़ा जा होगा."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,पोस्ट दिनांक और पोस्टिंग समय अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,पोस्ट दिनांक और पोस्टिंग समय अनिवार्य है
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,लेनदेन खरीदने के लिए टैक्स टेम्पलेट .
 ,Item Prices,आइटम के मूल्य
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,शब्दों में दिखाई हो सकता है एक बार आप खरीद आदेश को बचाने के लिए होगा.
@@ -3759,9 +3779,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,प्रशासन - व्यय
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,परामर्श
 DocType: Customer Group,Parent Customer Group,माता - पिता ग्राहक समूह
-sites/assets/js/erpnext.min.js +50,Change,परिवर्तन
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,परिवर्तन
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',{0} ' रूका ' है क्रय आदेश
 DocType: Appraisal Goal,Score Earned,स्कोर अर्जित
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",उदाहरणार्थ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,नोटिस की अवधि
@@ -3771,12 +3790,13 @@ DocType: Packing Slip,Gross Weight UOM,सकल वजन UOM
 DocType: Email Digest,Receivables / Payables,प्राप्तियों / देय
 DocType: Delivery Note Item,Against Sales Invoice,बिक्री चालान के खिलाफ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,मुद्रांकन
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,क्रेडिट खाता
 DocType: Landed Cost Item,Landed Cost Item,आयातित माल की लागत मद
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,शून्य मूल्यों को दिखाने
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,वस्तु की मात्रा विनिर्माण / कच्चे माल की दी गई मात्रा से repacking के बाद प्राप्त
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्य / देय खाता
 DocType: Delivery Note Item,Against Sales Order Item,बिक्री आदेश आइटम के खिलाफ
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
 DocType: Item,Default Warehouse,डिफ़ॉल्ट गोदाम
 DocType: Task,Actual End Date (via Time Logs),वास्तविक अंत की तारीख (टाइम लॉग्स के माध्यम से)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},बजट समूह खाते के खिलाफ नहीं सौंपा जा सकता {0}
@@ -3790,7 +3810,7 @@ DocType: Issue,Support Team,टीम का समर्थन
 DocType: Appraisal,Total Score (Out of 5),कुल स्कोर (5 से बाहर)
 DocType: Contact Us Settings,State,राज्य
 DocType: Batch,Batch,बैच
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,संतुलन
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,संतुलन
 DocType: Project,Total Expense Claim (via Expense Claims),कुल खर्च दावा (खर्च का दावा के माध्यम से)
 DocType: User,Gender,लिंग
 DocType: Journal Entry,Debit Note,डेबिट नोट
@@ -3806,9 +3826,8 @@ DocType: Lead,Blog Subscriber,ब्लॉग सब्सक्राइबर
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,मूल्यों पर आधारित लेनदेन को प्रतिबंधित करने के नियम बनाएँ .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","जाँच की, तो कुल नहीं. कार्य दिवस की छुट्टियों में शामिल होगा, और यह प्रति दिन वेतन का मूल्य कम हो जाएगा"
 DocType: Purchase Invoice,Total Advance,कुल अग्रिम
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,आगे बढ़ाना सामग्री अनुरोध
 DocType: Workflow State,User,उपयोगकर्ता
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,प्रसंस्करण पेरोल
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,प्रसंस्करण पेरोल
 DocType: Opportunity Item,Basic Rate,मूल दर
 DocType: GL Entry,Credit Amount,राशि क्रेडिट करें
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,खोया के रूप में सेट करें
@@ -3816,7 +3835,7 @@ DocType: Customer,Credit Days Based On,क्रेडिट दिनों प
 DocType: Tax Rule,Tax Rule,टैक्स नियम
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,बिक्री चक्र के दौरान एक ही दर बनाए रखें
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,कार्य केंद्र के कार्य के घंटे के बाहर समय लॉग्स की योजना बनाएँ।
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} पहले से ही प्रस्तुत किया गया है
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} पहले से ही प्रस्तुत किया गया है
 ,Items To Be Requested,अनुरोध किया जा करने के लिए आइटम
 DocType: Purchase Order,Get Last Purchase Rate,पिछले खरीद दर
 DocType: Time Log,Billing Rate based on Activity Type (per hour),गतिविधि प्रकार के आधार पर बिलिंग दर (प्रति घंटा)
@@ -3825,6 +3844,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आईडी नहीं मिला , इसलिए नहीं भेजा मेल"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),फंड के अनुप्रयोग ( संपत्ति)
 DocType: Production Planning Tool,Filter based on item,आइटम के आधार पर फ़िल्टर
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,डेबिट अकाउंट
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ दिनांक
 DocType: Attendance,Employee Name,कर्मचारी का नाम
 DocType: Sales Invoice,Rounded Total (Company Currency),गोल कुल (कंपनी मुद्रा)
@@ -3836,14 +3856,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,ब्लैंकिंग
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी लाभ
 DocType: Sales Invoice,Is POS,स्थिति है
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
 DocType: Production Order,Manufactured Qty,निर्मित मात्रा
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकार किए जाते हैं मात्रा
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} करता नहीं मौजूद है
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,बिलों ग्राहकों के लिए उठाया.
 DocType: DocField,Default,चूक
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,परियोजना ईद
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} ग्राहक जोड़े
 DocType: Maintenance Schedule,Schedule,अनुसूची
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","इस लागत केंद्र के लिए बजट को परिभाषित करें। बजट कार्रवाई निर्धारित करने के लिए, देखने के लिए "कंपनी सूची""
@@ -3851,7 +3871,7 @@ DocType: Account,Parent Account,खाते के जनक
 DocType: Quality Inspection Reading,Reading 3,3 पढ़ना
 ,Hub,हब
 DocType: GL Entry,Voucher Type,वाउचर प्रकार
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
 DocType: Expense Claim,Approved,अनुमोदित
 DocType: Pricing Rule,Price,कीमत
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
@@ -3860,23 +3880,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,शिक्षा
 DocType: Selling Settings,Campaign Naming By,अभियान नामकरण से
 DocType: Employee,Current Address Is,वर्तमान पता है
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","वैकल्पिक। निर्दिष्ट नहीं किया है, तो कंपनी के डिफ़ॉल्ट मुद्रा सेट करता है।"
 DocType: Address,Office,कार्यालय
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,मानक रिपोर्ट
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,लेखा पत्रिका प्रविष्टियों.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},पंक्ति {0}: पार्टी / खाते के साथ मैच नहीं करता है {1} / {2} में {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,गोदाम से पर उपलब्ध मात्रा
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},पंक्ति {0}: पार्टी / खाते के साथ मैच नहीं करता है {1} / {2} में {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,एक टैक्स खाता बनाने के लिए
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,व्यय खाते में प्रवेश करें
 DocType: Account,Stock,स्टॉक
 DocType: Employee,Current Address,वर्तमान पता
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","स्पष्ट रूप से जब तक निर्दिष्ट मद तो विवरण, छवि, मूल्य निर्धारण, करों टेम्पलेट से निर्धारित किया जाएगा आदि एक और आइटम का एक प्रकार है, तो"
 DocType: Serial No,Purchase / Manufacture Details,खरीद / निर्माण विवरण
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,बैच इन्वेंटरी
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,बैच इन्वेंटरी
 DocType: Employee,Contract End Date,अनुबंध समाप्ति तिथि
 DocType: Sales Order,Track this Sales Order against any Project,किसी भी परियोजना के खिलाफ हुए इस बिक्री आदेश
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,उपरोक्त मानदंडों के आधार पर बिक्री के आदेश (वितरित करने के लिए लंबित) खींचो
 DocType: DocShare,Document Type,दस्तावेज़ प्रकार
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,प्रदायक से उद्धरण
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,प्रदायक से उद्धरण
 DocType: Deduction Type,Deduction Type,कटौती के प्रकार
 DocType: Attendance,Half Day,आधे दिन
 DocType: Pricing Rule,Min Qty,न्यूनतम मात्रा
@@ -3887,20 +3909,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,मात्रा के लिए (मात्रा निर्मित) अनिवार्य है
 DocType: Stock Entry,Default Target Warehouse,डिफ़ॉल्ट लक्ष्य वेअरहाउस
 DocType: Purchase Invoice,Net Total (Company Currency),नेट कुल (कंपनी मुद्रा)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के विरुद्ध ही लागू है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के विरुद्ध ही लागू है
 DocType: Notification Control,Purchase Receipt Message,खरीद रसीद संदेश
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,कुल आवंटित पत्ते अवधि की तुलना में अधिक कर रहे हैं
 DocType: Production Order,Actual Start Date,वास्तविक प्रारंभ दिनांक
 DocType: Sales Order,% of materials delivered against this Sales Order,% सामग्री को​ इस बिक्री आदेश के सहारे​ सुपुर्द किया गया है
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,आइटम आंदोलन रिकार्ड.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,आइटम आंदोलन रिकार्ड.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,न्यूज़लेटर सूची सब्सक्राइबर
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,सेवा
 DocType: Hub Settings,Hub Settings,हब सेटिंग्स
 DocType: Project,Gross Margin %,सकल मार्जिन%
 DocType: BOM,With Operations,आपरेशनों के साथ
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखांकन प्रविष्टियों पहले से ही मुद्रा में किया गया है {0} कंपनी के लिए {1}। मुद्रा के साथ एक प्राप्य या देय खाते का चयन करें {0}।
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखांकन प्रविष्टियों पहले से ही मुद्रा में किया गया है {0} कंपनी के लिए {1}। मुद्रा के साथ एक प्राप्य या देय खाते का चयन करें {0}।
 ,Monthly Salary Register,मासिक वेतन रेजिस्टर
-apps/frappe/frappe/website/template.py +123,Next,अगला
+apps/frappe/frappe/website/template.py +140,Next,अगला
 DocType: Warranty Claim,If different than customer address,यदि ग्राहक पते से अलग
 DocType: BOM Operation,BOM Operation,बीओएम ऑपरेशन
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3931,6 +3954,7 @@ DocType: Purchase Invoice,Next Date,अगली तारीख
 DocType: Employee Education,Major/Optional Subjects,मेजर / वैकल्पिक विषय
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,करों और शुल्कों दर्ज करें
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,मशीनिंग
+DocType: Sales Invoice Item,Drop Ship,ड्रॉप जहाज
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","यहाँ आप परिवार और माता - पिता, पति या पत्नी और बच्चों के नाम, व्यवसाय की तरह बनाए रख सकते हैं"
 DocType: Hub Settings,Seller Name,विक्रेता का नाम
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),कर और शुल्क कटौती (कंपनी मुद्रा)
@@ -3957,29 +3981,29 @@ DocType: Purchase Order,To Receive and Bill,प्राप्त करें 
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,डिज़ाइनर
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,नियमों और शर्तों टेम्पलेट
 DocType: Serial No,Delivery Details,वितरण विवरण
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,मात्रा इस स्तर से नीचे गिरता है तो स्वतः सामग्री अनुरोध बनाने
 ,Item-wise Purchase Register,आइटम के लिहाज से खरीद पंजीकृत करें
 DocType: Batch,Expiry Date,समाप्ति दिनांक
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनःक्रमित स्तर सेट करने के लिए, आइटम एक क्रय मद या विनिर्माण आइटम होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनःक्रमित स्तर सेट करने के लिए, आइटम एक क्रय मद या विनिर्माण आइटम होना चाहिए"
 ,Supplier Addresses and Contacts,प्रदायक पते और संपर्क
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,प्रथम श्रेणी का चयन करें
 apps/erpnext/erpnext/config/projects.py +18,Project master.,मास्टर परियोजना.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,$ मुद्राओं की बगल आदि की तरह किसी भी प्रतीक नहीं दिखा.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(आधा दिन)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(आधा दिन)
 DocType: Supplier,Credit Days,क्रेडिट दिन
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,बीओएम से आइटम प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,बीओएम से आइटम प्राप्त
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,लीड समय दिन
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,सामग्री के बिल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {1}
 DocType: Dropbox Backup,Send Notifications To,करने के लिए सूचनाएं भेजें
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,रेफरी की तिथि
 DocType: Employee,Reason for Leaving,छोड़ने के लिए कारण
 DocType: Expense Claim Detail,Sanctioned Amount,स्वीकृत राशि
 DocType: GL Entry,Is Opening,है खोलने
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},पंक्ति {0}: डेबिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है एक {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,खाते {0} मौजूद नहीं है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},पंक्ति {0}: डेबिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है एक {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,खाते {0} मौजूद नहीं है
 DocType: Account,Cash,नकद
 DocType: Employee,Short biography for website and other publications.,वेबसाइट और अन्य प्रकाशनों के लिए लघु जीवनी.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},कर्मचारी के लिए वेतन संरचना बनाने कृपया {0}
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 6011413dea..92e20eabaa 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Plaća način
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Odaberite mjesečna distribucija, ako želite pratiti temelji na sezonalnost."
 DocType: Employee,Divorced,Rastavljen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Upozorenje: Isti predmet je ušao više puta.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozorenje: Isti predmet je ušao više puta.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Stavke već sinkronizirane
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dopusti Stavka biti dodan više puta u transakciji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal Posjetite {0} prije otkazivanja ovog jamstva se
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Priključci uz sinteriranje
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebno za Cjenika {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bit će izračunata u transakciji.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Od materijala zahtjev
+DocType: Purchase Order,Customer Contact,Kupac Kontakt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od materijala zahtjev
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Naziv klijenta
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Sve izvoz srodnih područja poput valute , stopa pretvorbe , izvoz ukupno , izvoz sveukupnom itd su dostupni u Dostavnica, POS , ponude, prodaje fakture , prodajnog naloga i sl."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Šefovi (ili skupine) od kojih računovodstvenih unosa su i sredstva su održavani.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Naziv vrste odsustva
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija je uspješno ažurirana
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Višestruke cijene proizvoda.
 DocType: SMS Center,All Supplier Contact,Svi kontakti dobavljača
 DocType: Quality Inspection Reading,Parameter,Parametar
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Očekivani datum završetka ne može biti manji od očekivanog početka Datum
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Da li stvarno želite odčepiti proizvodnje red:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Red # {0}: Ocijenite mora biti ista kao {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Novi dopust Primjena
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati ​​na temelju svog koda koristiti ovu opciju
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Pokaži varija
 DocType: Sales Invoice Item,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Godina Prolazeći
-sites/assets/js/erpnext.min.js +27,In Stock,Na lageru
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Može napraviti samo plaćanje protiv još nije izdana dostavnica prodajni nalog
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na lageru
 DocType: Designation,Designation,Oznaka
 DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Napravite novi POS profil
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Health Care
 DocType: Purchase Invoice,Monthly,Mjesečno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faktura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kašnjenje u plaćanju (dani)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email adresa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Kratica
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Red # {0}:
 DocType: Delivery Note,Vehicle No,Ne vozila
-sites/assets/js/erpnext.min.js +55,Please select Price List,Molimo odaberite Cjenik
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Molimo odaberite Cjenik
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Stolarstvo
 DocType: Production Order Operation,Work In Progress,Radovi u tijeku
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ispis
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Nadređeni detalj docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otvaranje za posao.
 DocType: Item Attribute,Increment,Pomak
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Odaberite Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Oglašavanje
 DocType: Employee,Married,Oženjen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 DocType: Payment Reconciliation,Reconcile,pomiriti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Provjerite banke unos
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Provjerite banke unos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Mirovinski fondovi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je Vrsta račun Skladište
 DocType: SMS Center,All Sales Person,Svi prodavači
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Otpis troška
 DocType: Warehouse,Warehouse Detail,Detalji o skladištu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešao na kupca {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Porezna Tip
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Niste ovlašteni dodavati ili ažurirati unose prije {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Niste ovlašteni dodavati ili ažurirati unose prije {0}
 DocType: Item,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kupac postoji s istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Broj sati / 60) * Stvarno trajanje operacije
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Gost
 DocType: Quality Inspection,Get Specification Details,Kreiraj detalje specifikacija
 DocType: Lead,Interested,Zainteresiran
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Sastavnica
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvaranje
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvaranje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Primjerak iz točke Group
 DocType: Journal Entry,Opening Entry,Otvaranje - ulaz
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Upit
 DocType: Standard Reply,Owner,vlasnik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Unesite tvrtka prva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Odaberite tvrtka prvi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Odaberite tvrtka prvi
 DocType: Employee Education,Under Graduate,Pod diplomski
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefiks
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,potrošni
 DocType: Upload Attendance,Import Log,Uvoz Prijavite
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Poslati
+DocType: Sales Invoice Item,Delivered By Supplier,Isporučio dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Godišnja plaća
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra Stupanje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Pokaži Trupci vrijeme
 DocType: Journal Entry Account,Credit in Company Currency,Kredit u trgovačkim društvima valuti
 DocType: Delivery Note,Installation Status,Status instalacije
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
 DocType: Item,Supply Raw Materials for Purchase,Nabava sirovine za kupnju
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Stavka {0} mora bitikupnja artikla
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite predložak, ispunite odgovarajuće podatke i priložiti izmijenjene datoteke.
  Sve datume i zaposlenika kombinacija u odabranom razdoblju doći će u predlošku s postojećim pohađanje evidencije"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Proizvod {0} nije aktivan ili nije došao do kraja roka valjanosti
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Proizvod {0} nije aktivan ili nije došao do kraja roka valjanosti
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Hoće li se obnavljaju nakon prodaje fakture je Prijavljen.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Postavke za HR modula
 DocType: SMS Center,SMS Center,SMS centar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ravnanje
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Unesite URL parametar za p
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Pravila za primjenu cijena i popusta.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Ovaj put Prijava sukobi s {0} od {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na Cjenik postotak (%)
-sites/assets/js/form.min.js +279,Start,početak
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,početak
 DocType: User,First Name,Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Vaše postavke su uređene. Osvježavanje ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Cijeli plijesni lijevanje
 DocType: Offer Letter,Select Terms and Conditions,Odaberite Uvjeti
 DocType: Production Planning Tool,Sales Orders,Narudžbe kupca
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje dostavnice točke
 ,Production Orders in Progress,Radni nalozi u tijeku
 DocType: Lead,Address & Contact,Adresa i kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorištenih lišće iz prethodnih dodjela
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Sljedeći ponavljajući {0} bit će izrađen na {1}
 DocType: Newsletter List,Total Subscribers,Ukupno Pretplatnici
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt ime
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO čekanju Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zahtjev za kupnju.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dvostruko kućište
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Samo osoba ovlaštena za odobrenje odsustva može potvrditi zahtjev za odsustvom
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Samo osoba ovlaštena za odobrenje odsustva može potvrditi zahtjev za odsustvom
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ostavlja godišnje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Molimo postavite Imenovanje serije za {0} preko Postavljanje> Postavke> Imenovanje serije
 DocType: Time Log,Will be updated when batched.,Hoće li biti ažurirani kada izmiješane.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Red {0}: Provjerite 'Je li Advance ""protiv nalog {1} Ako je to unaprijed ulaz."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Red {0}: Provjerite 'Je li Advance ""protiv nalog {1} Ako je to unaprijed ulaz."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
 DocType: Bulk Email,Message,Poruka
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice proizvoda
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox pristupni ključ
 DocType: Payment Tool,Reference No,Referentni broj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Neodobreno odsustvo
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock pomirenje točka
 DocType: Stock Entry,Sales Invoice No,Prodajni račun br
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Minimalna količina narudžbe
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Item,Publish in Hub,Objavi na Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Proizvod {0} je otkazan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Zahtjev za robom
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u "sirovina nabavlja se 'stol narudžbenice {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Obavijest kontrole
 DocType: Lead,Suggestions,Prijedlozi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Postavite proračun za grupu proizvoda na ovom području. Također možete uključiti sezonalnost postavljanjem distribucije.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Unesite nadređenu skupinu računa za skladište {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veća od preostali iznos {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veća od preostali iznos {2}
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel br.
 DocType: Maintenance Schedule,Generate Schedule,Generiranje Raspored
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Novi skladišni UOM
 DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa
 DocType: Employee,External Work History,Vanjski Povijest Posao
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kružni Referentna Greška
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Da li stvarno želite prestati
 DocType: Communication,Closed,Zatvoreno
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Jeste li sigurni da želite prestati
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,Profil posla
 DocType: Newsletter,Newsletter,Bilten
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Otpremnica
 DocType: Dropbox Backup,Allow Dropbox Access,Dopusti pristup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Ulazak Plaćanje je izmijenjen nakon što ga je izvukao. Ponovno izvucite ga.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Sažetak za ovaj tjedan i tijeku aktivnosti
 DocType: Workstation,Rent Cost,Rent cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Molimo odaberite mjesec i godinu
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostupno u sastavnicama, otpremnicama, računu kupnje, nalogu za proizvodnju, narudžbi kupnje, primci, prodajnom računu, narudžbi kupca, ulaznog naloga i kontrolnoj kartici"
 DocType: Item Tax,Tax Rate,Porezna stopa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Odaberite stavku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Odaberite stavku
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Stavka: {0} uspio turi, ne mogu se pomiriti pomoću \
  skladišta pomirenje, umjesto da koristite Stock unos"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Batch Ne mora biti ista kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Pretvori u ne-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kupnja Potvrda mora biti podnesen
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Trenutni kataloški UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Duguje iznos
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po društvo u {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po društvo u {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaša e-mail adresa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Zaprimljeno
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Pregledati
 DocType: Maintenance Visit,Maintenance Type,Tip održavanja
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametar provjere kvalitete proizvoda
 DocType: Leave Application,Leave Approver Name,Ime osobe ovlaštene za odobrenje odsustva
 ,Schedule Date,Raspored Datum
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Kupnja Registracija
 DocType: Landed Cost Item,Applicable Charges,Troškove u
 DocType: Workstation,Consumable Cost,potrošni cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
 DocType: Purchase Receipt,Vehicle Date,Datum vozila
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Liječnički
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog gubitka
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% Instalirano
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Unesite ime tvrtke prvi
 DocType: BOM,Item Desription,Opis proizvoda
 DocType: Purchase Invoice,Supplier Name,Dobavljač Ime
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Pročitajte ERPNext priručnik
 DocType: Account,Is Group,Je grupe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatski Postavljanje Serijski broj na temelju FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Provjerite Dobavljač Račun broj Jedinstvenost
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Prodaja Master Ma
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globalne postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslan Na
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Majstor za odmor .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell moulding
 DocType: Material Request Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ako je označeno, iznos poreza će se smatrati već uključena u Print Rate / Ispis Iznos"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupna količina
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme izmeđ
 DocType: Customer,Buyer of Goods and Services.,Kupac robe i usluga.
 DocType: Journal Entry,Accounts Payable,Naplativi računi
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj Pretplatnici
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" ne postoji"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" ne postoji"
 DocType: Pricing Rule,Valid Upto,Vrijedi Upto
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Izravni dohodak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa, ako je grupirano po računu"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativni službenik
 DocType: Payment Tool,Received Or Paid,Primiti ili platiti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Odaberite tvrtke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Odaberite tvrtke
 DocType: Stock Entry,Difference Account,Račun razlike
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Ne može zatvoriti zadatak kao njegova ovisna zadatak {0} nije zatvoren.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni trošak
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,kozmetika
 DocType: DocField,Type,Vrsta
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Communication,Subject,Predmet
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Telefon hitne službe
 ,Serial No Warranty Expiry,Istek jamstva serijskog broja
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Želite li stvarno stopirati ovaj zahtjev za materijalom?
 DocType: Sales Order,To Deliver,Za isporuku
 DocType: Purchase Invoice Item,Item,Proizvod
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Upravljanje podugovaranje
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Upravljanje podugovaranje
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Novi UOM ne mora biti cijeli broj
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Namještaj i susret
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stopa po kojoj Cjenik valute se pretvaraju u tvrtke bazne valute
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi porez i pri
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati Serijski broj {0}, kao što se koristi na lageru transakcija"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Zatvaranje (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zatvaranje (Cr)
 DocType: Serial No,Warranty Period (Days),Jamstveni period (dani)
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 ,Pending Qty,U tijeku Kom
@@ -522,8 +522,9 @@ DocType: Sales Order,Billing and Delivery Status,Naplate i isporuke status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponoviti kupaca
 DocType: Leave Control Panel,Allocate,Dodijeliti
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,prijašnji
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Povrat robe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Povrat robe
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Odaberite narudžbe iz kojih želite stvoriti radne naloge.
+DocType: Item,Delivered by Supplier (Drop Ship),Dostavlja Dobavljač (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponente plaće
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza kupaca.
@@ -534,7 +535,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Gimnastika
 DocType: Purchase Order Item,Billed Amt,Naplaćeno Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logično Skladište protiv kojih su dionice unosi se.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
 DocType: Event,Wednesday,Srijeda
 DocType: Sales Invoice,Customer's Vendor,Kupca Prodavatelj
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodni nalog je obavezan
@@ -567,8 +568,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Temelji se na' i 'Grupiranje po' ne mogu biti isti
 DocType: Sales Person,Sales Person Targets,Prodajni plan prodavača
-sites/assets/js/form.min.js +271,To,za
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Molimo unesite e-mail adresu
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,za
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Molimo unesite e-mail adresu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Kraj cijevi tvore
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
@@ -585,7 +586,7 @@ DocType: Activity Cost,Projects User,Projekti za korisnike
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Konzumira
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
 DocType: Company,Round Off Cost Center,Zaokružiti troška
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 DocType: Material Request,Material Transfer,Transfer robe
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Otvaranje (DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Objavljivanje timestamp mora biti poslije {0}
@@ -593,9 +594,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Postavke
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Porezi i pristojbe zavisnog troška
 DocType: Production Order Operation,Actual Start Time,Stvarni Vrijeme početka
 DocType: BOM Operation,Operation Time,Operacija vrijeme
-sites/assets/js/list.min.js +5,More,Više
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Više
 DocType: Pricing Rule,Sales Manager,Sales Manager
-sites/assets/js/desk.min.js +7673,Rename,Preimenuj
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Preimenuj
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Savijanje
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Dopusti korisnika
@@ -611,13 +612,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Ravno šišanje
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Za praćenje stavke u prodaji i kupnji dokumenata na temelju njihovih serijskih br. To je također može koristiti za praćenje jamstvene podatke o proizvodu.
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutačno stanje skladišta
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 DocType: Employee,Provide email id registered in company,Osigurati e id registriran u tvrtki
 DocType: Hub Settings,Seller City,Prodavač Grad
 DocType: Email Digest,Next email will be sent on:,Sljedeći email će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda pismo Pojam
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -632,11 +633,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,dobrodošli
 DocType: Journal Entry,Credit Card Entry,Credit Card Stupanje
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Zadatak Tema
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Roba dobijena od dobavljača.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Roba dobijena od dobavljača.
 DocType: Communication,Open,Otvoreno
 DocType: Lead,Campaign Name,Naziv kampanje
 ,Reserved,Rezervirano
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Želite li zaista da odčepiti
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datum na koji pored faktura će biti generiran. Ona nastaje na dostavi.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Dugotrajna imovina
@@ -652,7 +652,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Employee,Cell Number,Mobitel Broj
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni nalog u stupac 'u odnosu na temeljnicu'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni nalog u stupac 'u odnosu na temeljnicu'
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mjesečna plaća izjava.
@@ -721,7 +721,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kažnjeni Iznos ne može biti veći od Zahtjeva Iznos u nizu {0}.
 DocType: Company,Default Cost of Goods Sold Account,Zadana vrijednost prodane robe računa
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Popis Cijena ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Process Payroll,Send Email,Pošaljite e-poštu
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemate dopuštenje
@@ -732,7 +732,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Kom
 DocType: Item,Items with higher weightage will be shown higher,Stavke sa višim weightage će se prikazati više
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moji Računi
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Nisu pronađeni zaposlenici
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nisu pronađeni zaposlenici
 DocType: Purchase Order,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Odaberite BOM za početak
@@ -741,7 +741,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Prenesi d
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošalji odmah
 ,Support Analytics,Analitike podrške
 DocType: Item,Website Warehouse,Skladište web stranice
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Da li stvarno želite da se zaustavi proizvodnja red:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dan u mjesecu na koji auto faktura će biti generiran npr 05, 28 itd"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultat mora biti manja od ili jednaka 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-obrazac zapisi
@@ -751,12 +750,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Upiti
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da biste omogućili "prodajno mjesto" značajke
 DocType: Bin,Moving Average Rate,Stopa prosječne ponderirane cijene
 DocType: Production Planning Tool,Select Items,Odaberite proizvode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
 DocType: Comment,Reference Name,Referenca Ime
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljana galerija
 DocType: Item,Allow over delivery or receipt upto this percent,Dopustite preko isporuka ili primitak upto ovim posto
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Očekuje se dostava Datum ne može biti prije prodajnog naloga Datum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Očekuje se dostava Datum ne može biti prije prodajnog naloga Datum
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Sve skupine proizvoda
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
@@ -764,7 +763,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatski napravi poruku pri podnošenju transakcije.
 DocType: Production Order,Item To Manufacture,Proizvod za proizvodnju
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Stalni kalupa za lijevanje
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Narudžbenica za plaćanje
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Narudžbenica za plaćanje
 DocType: Sales Order Item,Projected Qty,Predviđena količina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Upravitelj
@@ -788,8 +788,8 @@ DocType: SMS Log,Requested Numbers,Traženi brojevi
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Ocjenjivanje.
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost projekta
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Prodajno mjesto
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Ne može se prenositi {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Prodajno mjesto
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Ne može se prenositi {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 DocType: Account,Balance must be,Bilanca mora biti
 DocType: Hub Settings,Publish Pricing,Objavi Cijene
@@ -811,7 +811,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Račun kupnje
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Pjeskarenje
-sites/assets/js/desk.min.js +3938,Ms,Gospođa
+DocType: Employee,Ms,Gospođa
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Majstor valute .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći termin u narednih {0} dana za rad {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materijal za pod-sklopova
@@ -833,29 +833,31 @@ DocType: Purchase Receipt,Range,Domet
 DocType: Supplier,Default Payable Accounts,Zadane naplativo račune
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Features Setup,Item Barcode,Barkod proizvoda
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kupnja fakture Predujam
 DocType: Address,Shop,Dućan
 DocType: Hub Settings,Sync Now,Sync Sada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Red {0}: Kredit unos ne može biti povezan s {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Red {0}: Kredit unos ne može biti povezan s {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
 DocType: Employee,Permanent Address Is,Stalna adresa je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacija završena za koliko gotovih proizvoda?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
 DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
 DocType: Journal Entry Account,Purchase Invoice,Kupnja fakture
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detalj Ne
 DocType: Stock Entry,Total Outgoing Value,Ukupna odlazna vrijednost
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Otvaranje i zatvaranje Datum datum mora biti unutar iste fiskalne godine
 DocType: Lead,Request for Information,Zahtjev za informacije
 DocType: Payment Tool,Paid,Plaćen
 DocType: Salary Slip,Total in words,Ukupno je u riječima
 DocType: Material Request Item,Lead Time Date,Potencijalni kupac - datum
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je obavezno. Možda Mjenjačnica zapis nije stvoren za
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Za 'proizvod Bundle' predmeta, skladište, rednim i hrpa Ne smatrat će se iz "Popis pakiranja 'stol. Ako Skladište i serije ne su isti za sve pakiranje predmeta za bilo 'proizvod Bundle' točke, te vrijednosti može se unijeti u glavnoj točki stol, vrijednosti će se kopirati u 'pakiranje popis' stol."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Isporuke kupcima.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Isporuke kupcima.
 DocType: Purchase Invoice Item,Purchase Order Item,Narudžbenica predmet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Neizravni dohodak
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Postavi Iznos Plaćanje = Izvanredna Iznos
@@ -863,13 +865,14 @@ DocType: Contact Us Settings,Address Line 1,Adresa - linija 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varijacija
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Ime tvrtke
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pregled popisa svih pomoć videa
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopustite korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Maksimalna količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Red {0}: Plaćanje protiv prodaje / narudžbenice treba uvijek biti označena kao unaprijed
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Red {0}: Plaćanje protiv prodaje / narudžbenice treba uvijek biti označena kao unaprijed
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,kemijski
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
 DocType: Process Payroll,Select Payroll Year and Month,Odaberite Platne godina i mjesec
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idi na odgovarajućoj skupini (obično Application fondova> kratkotrajne imovine> bankovne račune i stvoriti novi račun (klikom na Dodaj dijete) tipa "Banka"
 DocType: Workstation,Electricity Cost,Troškovi struje
@@ -884,7 +887,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bije
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Učvrstite svoju sliku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Napraviti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Napraviti
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 DocType: Workflow State,Stop,zaustaviti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi .
@@ -908,7 +911,7 @@ DocType: Packing Slip Item,Packing Slip Item,Odreskom predmet
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Uklonjene stvari bez promjena u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Osobina stol je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne može biti negativna
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podnošenje
@@ -919,12 +922,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Će se ažurira
 DocType: Project,Internal,Interni
 DocType: Task,Urgent,Hitan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Navedite valjanu Row ID za redom {0} u tablici {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Idi na radnu površinu i početi koristiti ERPNext
 DocType: Item,Manufacturer,Proizvođač
 DocType: Landed Cost Item,Purchase Receipt Item,Kupnja Potvrda predmet
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Prodaja Iznos
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Vrijeme Trupci
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vi ste osoba za odobrenje rashoda za ovaj zapis. Molimo ažurirajte status i spremite
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vi ste osoba za odobrenje rashoda za ovaj zapis. Molimo ažurirajte status i spremite
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
 DocType: Issue,Issue,Izdanje
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za stavku varijanti. npr Veličina, boja i sl"
@@ -939,8 +943,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Prodaja Naručite {0} {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Izrada Stock unose
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Izrada Stock unose
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
 DocType: Item,Default Supplier,Glavni dobavljač
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Tijekom Postotak proizvodnje doplatku
@@ -949,7 +954,7 @@ DocType: Features Setup,Miscelleneous,Razno
 DocType: Holiday List,Get Weekly Off Dates,Nabavite Tjedno Off datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv tvrtke.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Doktor
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Doktor
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobivene od dobavljača.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Za {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,ažurirati putem Vrijeme Trupci
@@ -977,7 +982,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Tvrtka registracijski brojevi za svoju referencu. Porezni brojevi itd.
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodni nalog {0} mora biti poništen prije nego se poništi ova prodajna narudžba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodni nalog {0} mora biti poništen prije nego se poništi ova prodajna narudžba
 ,Ordered Items To Be Billed,Naručeni proizvodi za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od Raspon mora biti manji od u rasponu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Odaberite vrijeme Evidencije i slanje stvoriti novi prodajni fakture.
@@ -1025,7 +1030,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Porez i
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Plativ
 DocType: Account,Warehouse,Skladište
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 DocType: Purchase Invoice Item,Purchase Invoice Item,Kupnja fakture predmet
@@ -1040,11 +1045,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Nesaglašen Detalji
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
 DocType: Lead,Call,Poziv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Ulazi' ne može biti prazno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Ulazi' ne može biti prazno
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Postavljanje zaposlenika
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavljanje zaposlenika
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Odaberite prefiks prvi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,istraživanje
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
@@ -1054,14 +1059,15 @@ DocType: Communication,Sent,Poslano
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Pogledaj Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 DocType: Communication,Delivery Status,Status isporuke
 DocType: Production Order,Manufacture against Sales Order,Proizvodnja protiv prodaje Reda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Hrpa
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Plaćeni Dividende
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Računovodstvo knjiga
 DocType: Stock Reconciliation,Difference Amount,Razlika Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Zadržana dobit
 DocType: BOM Item,Item Description,Opis proizvoda
@@ -1075,15 +1081,17 @@ DocType: Opportunity Item,Opportunity Item,Prilika proizvoda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Privremeni Otvaranje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaposlenik napuste balans
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Bilanca računa {0} uvijek mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilanca računa {0} uvijek mora biti {1}
 DocType: Address,Address Type,Tip adrese
 DocType: Purchase Receipt,Rejected Warehouse,Odbijen galerija
 DocType: GL Entry,Against Voucher,Protiv Voucheru
 DocType: Item,Default Buying Cost Center,Zadani trošak kupnje
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Da biste dobili najbolje iz ERPNext, preporučamo da odvojite malo vremena i gledati te pomoći videa."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Stavka {0} mora biti Prodaja artikla
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,za
 DocType: Item,Lead Time in days,Olovo Vrijeme u danima
 ,Accounts Payable Summary,Obveze Sažetak
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Niste ovlašteni za uređivanje zamrznutog računa {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Niste ovlašteni za uređivanje zamrznutog računa {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
@@ -1099,7 +1107,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Mjesto izdavanja
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ugovor
 DocType: Report,Disabled,Ugašeno
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Poljoprivreda
@@ -1108,13 +1116,13 @@ DocType: Mode of Payment,Mode of Payment,Način plaćanja
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
-sites/assets/js/form.min.js +190,Name is required,Ime je potrebno
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Ime je potrebno
 DocType: Purchase Invoice,Recurring Type,Ponavljajući Tip
 DocType: Address,City/Town,Grad / Mjesto
 DocType: Email Digest,Annual Income,Godišnji prihod
 DocType: Serial No,Serial No Details,Serijski nema podataka
 DocType: Purchase Invoice Item,Item Tax Rate,Porezna stopa proizvoda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kreditne računi se mogu povezati protiv drugog ulaska debitnom"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kreditne računi se mogu povezati protiv drugog ulaska debitnom"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalni oprema
@@ -1125,14 +1133,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekivani isporuke Datum manji od planiranog početka Datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Ukupno odlazni
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tu može biti samo jedan Dostava Pravilo Stanje sa 0 ili prazni vrijednost za "" Da Value """
 DocType: Authorization Rule,Transaction,Transakcija
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Napomena : Ovaj troškovni centar je grupa. Nije moguće napraviti računovodstvene unose od grupe.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Alati
+apps/frappe/frappe/config/desk.py +7,Tools,Alati
 DocType: Item,Website Item Groups,Grupe proizvoda web stranice
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Broj proizvodnoga naloga je obvezan za proizvodnju ulazne robe
 DocType: Purchase Invoice,Total (Company Currency),Ukupno (Društvo valuta)
@@ -1142,7 +1150,7 @@ DocType: Workstation,Workstation Name,Ime Workstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pošta:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
-sites/assets/js/desk.min.js +7652,Comments,Komentari
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentari
 DocType: Salary Slip,Bank Account No.,Žiro račun broj
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je broj zadnjeg stvorio transakcije s ovim prefiksom
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Stopa vrednovanja potrebna za proizvod {0}
@@ -1157,7 +1165,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Odaberite tv
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Morate omogućiti košaricu
-sites/assets/js/form.min.js +212,No Data,Nema podataka
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nema podataka
 DocType: Appraisal Template Goal,Appraisal Template Goal,Procjena Predložak cilja
 DocType: Salary Slip,Earning,Zarada
 DocType: Payment Tool,Party Account Currency,Strana valuta računa
@@ -1165,7 +1173,7 @@ DocType: Payment Tool,Party Account Currency,Strana valuta računa
 DocType: Purchase Taxes and Charges,Add or Deduct,Zbrajanje ili oduzimanje
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ako Godišnji proračun Prebačen (za reprezentaciju)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Preklapanje uvjeti nalaze između :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Temeljnica {0} već usklađuje se neki drugi bon
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Temeljnica {0} već usklađuje se neki drugi bon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Ukupna vrijednost narudžbe
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Raspon 3
@@ -1173,11 +1181,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Broj pregleda
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Bilteni za kontakte, potencijalne kupce."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zatvaranja računa mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Zbroj bodova svih ciljeva trebao biti 100. To je {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacije se ne može ostati prazno.
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status obnovljeno za {0}
 DocType: DocField,Description,Opis
 DocType: Authorization Rule,Average Discount,Prosječni popust
 DocType: Letter Head,Is Default,Je zadani
@@ -1205,7 +1213,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Iznos poreza proizvoda
 DocType: Item,Maintain Stock,Upravljanje zalihama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Prijave su već stvorene za proizvodnju reda
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako se odnosi na sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Maksimalno: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za tvrtke
@@ -1215,7 +1223,7 @@ DocType: Sales Invoice,Shipping Address Name,Dostava Adresa Ime
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontnog
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Ovisi o ostaviti bez platiti
@@ -1228,7 +1236,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Jamstveni / AMC Status
 DocType: GL Entry,GL Entry,GL ulaz
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 ,Batch-Wise Balance History,Batch-Wise povijest bilance
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Popis podsjetnika
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Popis podsjetnika
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,šegrt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativna količina nije dopuštena
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1261,13 +1269,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Najam ureda
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Postavke SMS pristupnika
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio !
-sites/assets/js/erpnext.min.js +24,No address added yet.,Adresa još nije dodana.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Adresa još nije dodana.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analitičar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak iznosu JV {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili "Point of Sale" pogled
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
 DocType: Item,Sales Details,Prodajni detalji
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Zapinjanje
 DocType: Opportunity,With Items,S Stavke
@@ -1277,7 +1285,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",Datum na koji pored faktura će biti generiran. Ona nastaje na dostavi.
 DocType: Item Attribute,Item Attribute,Stavka značajke
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vlada
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Stavka Varijante
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Ukupno ({0})
 DocType: Cost Center,Parent Cost Center,Nadređeni troškovni centar
@@ -1287,11 +1295,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Financijska godina - početni datum
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Upuštanje
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Material Request Item,Sales Order No,Broj narudžbe kupca
 DocType: Item Group,Item Group Name,Proizvod - naziv grupe
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Prijenos Materijali za izradu
 DocType: Pricing Rule,For Price List,Za Cjeniku
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1300,8 +1308,7 @@ DocType: Maintenance Schedule,Schedules,Raspored
 DocType: Purchase Invoice Item,Net Amount,Neto Iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (valuta Društvo)
-DocType: Period Closing Voucher,CoA Help,CoA Pomoć
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Pogreška : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Pogreška : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kupac> Grupa kupaca> Regija
@@ -1312,6 +1319,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Zavisni troškovi - Pomoć
 DocType: Event,Tuesday,Utorak
 DocType: Leave Block List,Block Holidays on important days.,Blok Odmor na važnim danima.
 ,Accounts Receivable Summary,Potraživanja Sažetak
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Ostavlja za vrstu {0} već dodijeljeno za zaposlenika {1} za vrijeme {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisnički ID polje u zapisu zaposlenika za postavljanje uloga zaposlenika
 DocType: UOM,UOM Name,UOM Ime
 DocType: Top Bar Item,Target,Meta
@@ -1332,19 +1340,19 @@ DocType: Sales Partner,Sales Partner Target,Prodajni plan prodajnog partnera
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Ulaz za {0} može biti samo u valuti: {1}
 DocType: Pricing Rule,Pricing Rule,Pravila cijena
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Urezivanje
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materijal Zahtjev za Narudžbenica
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materijal Zahtjev za Narudžbenica
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Red # {0}: Vraćeno Stavka {1} ne postoji u {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovni računi
 ,Bank Reconciliation Statement,Izjava banka pomirenja
 DocType: Address,Lead Name,Ime potencijalnog kupca
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otvaranje kataloški bilanca
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Otvaranje kataloški bilanca
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mora pojaviti samo jednom
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nije dopušteno Prenesite više {0} od {1} protiv narudžbenice {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Odsustvo uspješno dodijeljeno za {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Odsustvo uspješno dodijeljeno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nema proizvoda za pakiranje
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Iznosi koji se ne ogleda u banci
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Potraživanja za tvrtke trošak.
@@ -1357,19 +1365,20 @@ DocType: Opportunity,Contact Mobile No,Kontak GSM
 DocType: Production Planning Tool,Select Sales Orders,Odaberite narudžbe kupca
 ,Material Requests for which Supplier Quotations are not created,Zahtjevi za robom za koje dobavljačeve ponude nisu stvorene
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za praćenje stavki pomoću barkod. Vi ćete biti u mogućnosti da unesete stavke u otpremnici i prodaje Računa skeniranjem barkod stavke.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označi kao Isporučeno
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Napravite citat
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planirati poslovanje za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 DocType: SMS Center,Receiver List,Prijemnik Popis
 DocType: Payment Tool Detail,Payment Amount,Iznos za plaćanje
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Konzumira Iznos
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Pogledaj
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogledaj
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivno lasersko sinteriranje
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Uvoz uspješan!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Trošak izdanih stavki
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne smije biti veća od {0}
@@ -1390,7 +1399,7 @@ DocType: Company,Default Payable Account,Zadana Plaća račun
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Postavke za online košarici, kao što su utovar pravila, cjenika i sl"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Postavljanje dovršeno
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Naplaćeno
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Rezervirano Kol
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun stranke
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
 DocType: Lead,Upper Income,Gornja Prihodi
@@ -1433,11 +1442,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Omogućite Košarica
 DocType: Employee,Permanent Address,Stalna adresa
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Stavka {0} mora bitiusluga artikla .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Unaprijed plaćeni od {0} {1} ne može biti veća \ nego SVEUKUPNO {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Odaberite Šifra
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Smanjite odbitak za ostaviti bez plaća (lwp)
 DocType: Territory,Territory Manager,Upravitelj teritorija
+DocType: Delivery Note Item,To Warehouse (Optional),Za Warehouse (po izboru)
 DocType: Sales Invoice,Paid Amount (Company Currency),Plaćeni iznos (Društvo valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Postavke prodaje
@@ -1460,7 +1470,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Smola lijevanje
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Postoji grupa kupaca sa istim imenom. Promijenite naziv kupca ili naziv grupe kupaca.
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Odaberite {0} na prvom mjestu.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Odaberite {0} na prvom mjestu.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Tekst {0}
 DocType: Territory,Parent Territory,Nadređena teritorija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
@@ -1488,11 +1498,11 @@ DocType: Sales Invoice Item,Batch No,Broj serije
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopusti višestruke prodajne naloge protiv kupca narudžbenice
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Glavni
 DocType: DocPerm,Delete,Izbrisati
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Varijanta
-sites/assets/js/desk.min.js +7971,New {0},Novi dokument {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varijanta
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Novi dokument {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
 DocType: Employee,Leave Encashed?,Odsustvo naplaćeno?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika Od polje je obavezno
 DocType: Item,Variants,Varijante
@@ -1510,7 +1520,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Zemlja
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adrese
 DocType: Communication,Received,primljen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupli serijski broj unešen za proizvod {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Uvjet za pravilu dostava
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Stavka ne smije imati proizvodni nalog.
@@ -1531,7 +1541,6 @@ DocType: Employee,Salutation,Pozdrav
 DocType: Communication,Rejected,Odbijen
 DocType: Pricing Rule,Brand,Brend
 DocType: Item,Will also apply for variants,Također će podnijeti zahtjev za varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Isporučeno
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Hrpa proizvoda u vrijeme prodaje.
 DocType: Sales Order Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
@@ -1569,14 +1578,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,P
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Smicanje
 DocType: Item,Has Variants,Je Varijante
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Kliknite na "Make prodaje Račun 'gumb za stvaranje nove prodaje fakture.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Razdoblje od te razdoblje na datume obvezna za ponavljanje% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakiranje i označavanje
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
 DocType: Sales Person,Parent Sales Person,Nadređeni prodavač
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Navedite zadanu valutu u tvrtki Global Master i zadane
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox tajni pristup
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Upravljanje projektima
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Upravljanje projektima
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač dobara ili usluga.
 DocType: Budget Detail,Fiscal Year,Fiskalna godina
 DocType: Cost Center,Budget,Budžet
@@ -1605,11 +1613,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Prodaja
 DocType: Employee,Salary Information,Informacije o plaći
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Grupa proizvoda web stranice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Carine i porezi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Unesite Referentni datum
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} unosa plaćanja ne može se filtrirati po {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Unesite Referentni datum
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} unosa plaćanja ne može se filtrirati po {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tablica za proizvode koji će biti prikazani na web stranici
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučena količina
 DocType: Material Request Item,Material Request Item,Zahtjev za robom - proizvod
@@ -1617,7 +1625,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Stablo grupe proi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
 ,Item-wise Purchase History,Stavka-mudar Kupnja Povijest
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Crvena
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
 DocType: Account,Frozen,Zaleđeni
 ,Open Production Orders,Otvoreni radni nalozi
 DocType: Installation Note,Installation Time,Vrijeme instalacije
@@ -1661,13 +1669,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Trend ponuda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Stavka proizvoda se ne spominje u master artiklu za artikal {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Kao Production Order može biti za tu stavku , to mora bitipredmet dionica ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Kao Production Order može biti za tu stavku , to mora bitipredmet dionica ."
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Iznos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spajanje
 DocType: Authorization Rule,Above Value,Iznad vrijednosti
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Isporučeno
+DocType: Purchase Order,Delivered,Isporučeno
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Postavke dolaznog servera za e-mail (npr. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
@@ -1684,10 +1692,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuirati optužbi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Račun {0} mora biti tipa 'Nepokretne imovine' kao što je proizvod {1} imovina proizvoda
 DocType: HR Settings,HR Settings,HR postavke
 apps/frappe/frappe/config/setup.py +130,Printing,Tiskanje
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Rashodi Tužba se čeka odobrenje . SamoRashodi Odobritelj može ažurirati status .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Rashodi Tužba se čeka odobrenje . SamoRashodi Odobritelj može ažurirati status .
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dan (a ) na koji se prijavljujete za dopust su odmor . Ne trebaju podnijeti zahtjev za dopust .
-sites/assets/js/desk.min.js +7805,and,i
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ne može biti prazno ili prostora
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportovi
@@ -1724,7 +1732,6 @@ DocType: Opportunity,Quotation,Ponuda
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 DocType: Quotation,Maintenance User,Korisnik održavanja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Trošak Ažurirano
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Jeste li sigurni da želite odčepiti
 DocType: Employee,Date of Birth,Datum rođenja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Proizvod {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Fiskalna godina** predstavlja poslovnu godinu. Svi računovodstvene stavke i druge glavne transakcije su praćene od **Fiskalne godine**.
@@ -1740,13 +1747,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite podatke o prodajnim kampanjama. Vodite zapise o potencijalima, ponudama, narudžbama itd kako bi ste procijenili povrat ulaganje ROI."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovno dodijeliti ili mijenjati skladište"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovno dodijeliti ili mijenjati skladište"
 DocType: Appraisal,Calculate Total Score,Izračunajte ukupni rezultat
 DocType: Supplier Quotation,Manufacturing Manager,Upravitelj proizvodnje
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split otpremnici u paketima.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Pošiljke
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip moulding
+DocType: Purchase Order,To be delivered to customer,Da biste se dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Vrijeme Log Status moraju biti dostavljeni.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada bilo Skladište
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Postavljanje
@@ -1771,11 +1779,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Od novca
 DocType: DocField,Name,Ime
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Odaberite Dodijeljeni iznos, Vrsta računa i broj računa u atleast jednom redu"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Iznosi koji se ne ogleda u sustav
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Ostali
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Postavi kao Zaustavljen
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći odgovarajući stavku. Odaberite neku drugu vrijednost za {0}.
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Proizvoda ili usluge koja je kupio, prodao i zadržao na lageru."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
@@ -1784,19 +1792,20 @@ DocType: Web Form,Select DocType,Odaberite DOCTYPE
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Provlačenje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankarstvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Novi trošak
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novi trošak
 DocType: Bin,Ordered Quantity,Naručena količina
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","na primjer ""Alati za graditelje"""
 DocType: Quality Inspection,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise popust
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} protiv prodajni nalog {1}
+DocType: Purchase Order Item,Reference Document Type,Referentna Tip dokumenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} protiv prodajni nalog {1}
 DocType: Account,Fixed Asset,Dugotrajna imovina
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serijaliziranom Inventar
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serijaliziranom Inventar
 DocType: Activity Type,Default Billing Rate,Zadana naplate stopa
 DocType: Time Log Batch,Total Billing Amount,Ukupno naplate Iznos
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Potraživanja račun
 ,Stock Balance,Skladišna bilanca
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Prodajnog naloga za plaćanje
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Prodajnog naloga za plaćanje
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Vrijeme Evidencije stvorio:
 DocType: Item,Weight UOM,Težina UOM
@@ -1832,10 +1841,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit računa mora biti naplativo račun
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
 DocType: Production Order Operation,Completed Qty,Završen Kol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne računi se mogu povezati protiv druge kreditne stupanja"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Cjenik {0} je onemogućen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne računi se mogu povezati protiv druge kreditne stupanja"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Cjenik {0} je onemogućen
 DocType: Manufacturing Settings,Allow Overtime,Dopusti Prekovremeni
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Prodajnog naloga {0} je zaustavljen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za Artikl {1}. Ti su dali {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Ocijenite
 DocType: Item,Customer Item Codes,Kupac Stavka Kodovi
@@ -1844,9 +1852,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Zavarivanje
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novi skldišni UOM je potreban
 DocType: Quality Inspection,Sample Size,Veličina uzorka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Svi proizvodi su već fakturirani
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Svi proizvodi su već fakturirani
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Navedite važeću 'iz Predmet br'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daljnje troška mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daljnje troška mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
 DocType: Project,External,Vanjski
 DocType: Features Setup,Item Serial Nos,Serijski br proizvoda
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
@@ -1873,7 +1881,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,U
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
 DocType: SMS Log,Sender Name,Pošiljatelj Ime
 DocType: Page,Title,Naslov
-sites/assets/js/list.min.js +104,Customize,Prilagodba
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Prilagodba
 DocType: POS Profile,[Select],[Odaberi]
 DocType: SMS Log,Sent To,Poslano Da
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Napravi prodajni račun
@@ -1898,12 +1906,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Kraj života
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,putovanje
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
+DocType: Purchase Order,Customer Mobile No,Kupac mobilne Ne
 DocType: Sales Invoice,Recurring,Koji se vraća
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Pratite poseban prihodi i rashodi za vertikala proizvoda ili podjele.
 DocType: Rename Tool,Rename Tool,Preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba proizvoda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Prijenos materijala
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 DocType: Purchase Invoice,Price List Currency,Cjenik valuta
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
@@ -1926,7 +1935,7 @@ DocType: Appraisal,Employee,Zaposlenik
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz e od
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Pozovi kao korisnik
 DocType: Features Setup,After Sale Installations,Nakon prodaje postrojenja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} je naplaćen u cijelosti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je naplaćen u cijelosti
 DocType: Workstation Working Hour,End Time,Kraj vremena
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni uvjeti ugovora za prodaju ili kupnju.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupa po jamcu
@@ -1935,8 +1944,9 @@ DocType: Sales Invoice,Mass Mailing,Grupno slanje mailova
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Datoteka za Preimenovanje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Broj kupovne narudžbe potrebno za proizvod {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaži Plaćanja
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Određena BOM {0} ne postoji za točku {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Stavka održavanja {0} mora biti otkazana prije poništenja ove narudžbe kupca
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Stavka održavanja {0} mora biti otkazana prije poništenja ove narudžbe kupca
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Veličina
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutski
@@ -1955,8 +1965,8 @@ DocType: Upload Attendance,Attendance To Date,Gledanost do danas
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Postavke dolaznog servera za prodajni e-mail (npr. sales@example.com)
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Tool,Payment Account,Račun za plaćanje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Navedite Tvrtka postupiti
-sites/assets/js/list.min.js +23,Draft,Nepotvrđeno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Nepotvrđeno
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,Accepted,Prihvaćeno
 DocType: User,Female,Ženski
@@ -1969,14 +1979,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kao što već postoje dionice transakcija za tu stavku, \ ne možete mijenjati vrijednosti 'Je rednim', 'Je batch Ne', 'Je kataloški Stavka "i" Vrednovanje metoda'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Brzo Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
 DocType: Employee,Previous Work Experience,Radnog iskustva
 DocType: Stock Entry,For Quantity,Za Količina
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} nije podnesen
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Zahtjevi za stavke.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} nije podnesen
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zahtjevi za stavke.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Poseban proizvodnja kako će biti izrađen za svakog gotovog dobrom stavke.
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,kompletan Setup
@@ -1988,7 +1999,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bilten Mailing li
 DocType: Delivery Note,Transporter Name,Transporter Ime
 DocType: Contact,Enter department to which this Contact belongs,Unesite odjel na koji se ovaj Kontakt pripada
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Ukupno Odsutni
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Proizvod ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Proizvod ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Jedinica mjere
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
@@ -2014,7 +2025,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Treća strana distributer / trgovac / trgovački zastupnik / affiliate / prodavača koji prodaje tvrtki koje proizvode za proviziju.
 DocType: Customer Group,Has Child Node,Je li čvor dijete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nije bilo aktivne fiskalne godine. Za provjeru više detalja {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
@@ -2065,11 +2076,9 @@ DocType: Note,Note,Zabilješka
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 DocType: Email Account,Email Ids,IDS e-pošte
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Postavi kao Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 DocType: Tax Rule,Billing City,Naplata Grad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Ova aplikacija Ostavite se čeka odobrenje. Samo Ostavite Odobritelj može ažurirati status.
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
 DocType: Journal Entry,Credit Note,Kreditne Napomena
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Kol)
 DocType: Installation Note Item,Installed Qty,Instalirana kol
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Nadređeni tip
-sites/assets/js/list.min.js +26,Submitted,Potvrđeno
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Potvrđeno
 DocType: Salary Structure,Total Earning,Ukupna zarada
 DocType: Purchase Receipt,Time at which materials were received,Vrijeme u kojem su materijali primili
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje Adrese
@@ -2099,7 +2108,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizacija
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,komunalna Troškovi
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Iznad
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Iznad
 DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje
 ,Download Backups,Preuzmite Sigurnosne kopije
 DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca
@@ -2108,7 +2117,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Odaberite Zaposlenici
 DocType: Bank Reconciliation,To Date,Za datum
 DocType: Opportunity,Potential Sales Deal,Potencijalni Prodaja Deal
-sites/assets/js/form.min.js +308,Details,Detalji
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalji
 DocType: Purchase Invoice,Total Taxes and Charges,Ukupno Porezi i naknade
 DocType: Employee,Emergency Contact,Kontakt hitne službe
 DocType: Item,Quality Parameters,Parametri kvalitete
@@ -2123,7 +2132,7 @@ DocType: Purchase Order Item,Received Qty,Pozicija Kol
 DocType: Stock Entry Detail,Serial No / Batch,Serijski Ne / Batch
 DocType: Product Bundle,Parent Item,Nadređeni proizvod
 DocType: Account,Account Type,Vrsta računa
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Raspored održavanja nije generiran za sve proizvode. Molimo kliknite na 'Generiraj raspored'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Raspored održavanja nije generiran za sve proizvode. Molimo kliknite na 'Generiraj raspored'
 ,To Produce,proizvoditi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} {1}. Da su {2} u stopu točke, redovi {3} također moraju biti uključeni"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketa za dostavu (za tisak)
@@ -2134,7 +2143,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Ravnanje
 DocType: Account,Income Account,Račun prihoda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Oblikovanje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Kom
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte "stopa materijali na temelju troškova" u odjeljak
 DocType: Appraisal Goal,Key Responsibility Area,Zona ključnih odgovornosti
@@ -2165,9 +2174,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Postavke skladišta
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeća svojstva su isti u obje evidencije. Je Grupa, korijen Vrsta, Društvo"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeća svojstva su isti u obje evidencije. Je Grupa, korijen Vrsta, Društvo"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Uredi hijerarhiju grupe kupaca.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Novi naziv troškovnog centra
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Novi naziv troškovnog centra
 DocType: Leave Control Panel,Leave Control Panel,Upravljačka ploča odsustava
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ne zadana adresa Predložak pronađena. Molimo stvoriti novu s Setup> Tisak i Branding> adresu predložak.
 DocType: Appraisal,HR User,HR Korisnik
@@ -2186,24 +2195,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Alat Plaćanje Detail
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Veliki
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nisu pronađeni zaposlenici!
 DocType: C-Form Invoice Detail,Territory,Teritorij
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
+DocType: Purchase Order,Customer Address Display,Kupac Adresa prikaz
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poliranje
 DocType: Production Order Operation,Planned Start Time,Planirani početak vremena
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Dodijeljeni
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Zadana mjerna jedinica za točke {0} se ne može mijenjati, jer izravno \ ste već napravili neke transakcije (e) s drugim UOM. Za promjenu zadanog UOM, \ uporabu 'UOM Zamijenite Utility "alat pod burzi modula."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Navedite Tečaj pretvoriti jedne valute u drugu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Ponuda {0} je otkazana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Ponuda {0} je otkazana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Ukupni iznos
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaposlenik {0} je bio na odmoru na {1} . Ne možete označiti dolazak .
 DocType: Sales Partner,Targets,Ciljevi
@@ -2218,12 +2227,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ovo je glavna grupa kupaca i ne može se mijenjati.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Molim postaviti svoj kontni plan prije nego što počnete računovodstvenih unosa
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorirajte Cijene pravilo
-sites/assets/js/list.min.js +24,Cancelled,Otkazano
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Otkazano
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od datuma u Struktura plaća ne može biti manja od zaposlenika Spajanje Datum.
 DocType: Employee Education,Graduate,Diplomski
 DocType: Leave Block List,Block Days,Dani bloka
 DocType: Journal Entry,Excise Entry,Trošarine Stupanje
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozorenje: Prodaja Naručite {0} već postoji protiv Kupca narudžbenice {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozorenje: Prodaja Naručite {0} već postoji protiv Kupca narudžbenice {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2280,17 +2289,17 @@ DocType: Account,Stock Received But Not Billed,Stock primljeni Ali ne Naplaćeno
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plaće + + zaostatak Iznos Iznos Encashment - Ukupno Odbitak
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 DocType: Features Setup,Sales and Purchase,Prodaje i kupnje
-DocType: Purchase Order Item,Material Request No,Zahtjev za robom br.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
+DocType: Supplier Quotation Item,Material Request No,Zahtjev za robom br.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stopa po kojoj se valuta klijenta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} je uspješno poništili pretplatu s ovog popisa.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Neto stopa (Društvo valuta)
-apps/frappe/frappe/templates/base.html +132,Added,Dodano
+apps/frappe/frappe/templates/base.html +134,Added,Dodano
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Uredi teritorijalnu raspodjelu.
 DocType: Journal Entry Account,Sales Invoice,Prodajni račun
 DocType: Journal Entry Account,Party Balance,Bilanca stranke
 DocType: Sales Invoice Item,Time Log Batch,Vrijeme Log Hrpa
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Odaberite Primijeni popusta na
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Odaberite Primijeni popusta na
 DocType: Company,Default Receivable Account,Zadana Potraživanja račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Stvaranje banke ulaz za ukupne plaće isplaćene za prethodno izabrane kriterije
 DocType: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
@@ -2301,7 +2310,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Kreiraj relevantne ulaze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Knjiženje na skladištu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Kovanja
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Proizvod {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Proizvod {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 apps/frappe/frappe/desk/query_report.py +136,Total,Ukupno
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
@@ -2316,13 +2325,15 @@ DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Dodatni Mali
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Sprej za formiranje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal Tražena količina manja nego minimalna narudžba kol
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Račun {0} je zamrznut
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Račun {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna cjelina / Podružnica s odvojenim kontnim planom pripada Organizaciji.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ili BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalna zaliha Razina
 DocType: Stock Entry,Subcontract,Podugovor
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Unesite {0} prvi
 DocType: Production Planning Tool,Get Items From Sales Orders,Kreiraj proizvode iz narudžbe
 DocType: Production Order Operation,Actual End Time,Stvarni End Time
 DocType: Production Planning Tool,Download Materials Required,Preuzmite - Potrebni materijali
@@ -2339,9 +2350,9 @@ DocType: Maintenance Visit,Scheduled,Planiran
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Molimo odaberite stavku u kojoj "Je kataloški Stavka" je "Ne" i "Je Prodaja Stavka" "Da", a ne postoji drugi bala proizvoda"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite mjesečna distribucija na nejednako distribuirati ciljeve diljem mjeseci.
 DocType: Purchase Invoice Item,Valuation Rate,Stopa vrednovanja
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Cjenik valuta ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cjenik valuta ne bira
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Stavka Red {0}: Kupnja Potvrda {1} ne postoji u gornjoj tablici 'kupiti primitaka'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenuj prijavu
@@ -2368,13 +2379,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo lisni čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Odobritelj
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
-sites/assets/js/erpnext.min.js +48,Pay,Platiti
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Platiti
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Za datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Trupci za održavanje statusa isporuke sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Mljevenje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Stisni omatanje
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Aktivnosti na čekanju
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivnosti na čekanju
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrđen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavljač> proizvođač tip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Unesite olakšavanja datum .
@@ -2385,7 +2396,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Un
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Novinski izdavači
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Odaberite Fiskalna godina
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Taljenje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Vi ste soba ovlaštena za odobrenje odsustva za ovaj zapis. Molimo ažurirajte status i spremite
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poredaj Razina
 DocType: Attendance,Attendance Date,Gledatelja Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati ​​i odbitka.
@@ -2421,6 +2431,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Pogrešna razdoblje
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite tip transakcije
 DocType: GL Entry,Voucher No,Bon Ne
@@ -2430,8 +2441,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Predl
 DocType: Customer,Address and Contact,Kontakt
 DocType: Customer,Last Day of the Next Month,Posljednji dan sljedećeg mjeseca
 DocType: Employee,Feedback,Povratna veza
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Raspored
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Raspored
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Brusni jet obrada
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
 DocType: Website Settings,Website Settings,Postavke web stranice
@@ -2445,11 +2456,11 @@ DocType: Quality Inspection,Outgoing,Odlazni
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu isporuke protiv bilo Projekta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Korijen račun ne može biti izbrisan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Korijen račun ne može biti izbrisan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Pokaži ulaz robe
 ,Is Primary Address,Je Osnovna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Reference # {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje adrese
 DocType: Pricing Rule,Item Code,Šifra proizvoda
 DocType: Production Planning Tool,Create Production Orders,Napravi proizvodni nalog
@@ -2458,14 +2469,14 @@ DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenikova interna radna povijest
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Zatvaranje (DR)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zatvaranje (DR)
 DocType: Contact,Passive,Pasiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijski broj {0} nije na skladištu
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Porezni predložak za prodajne transakcije.
 DocType: Sales Invoice,Write Off Outstanding Amount,Otpisati preostali iznos
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Provjerite ako trebate automatske ponavljajuće fakture. Nakon odavanja prodaje fakturu, ponavljajućih sekcija će biti vidljiv."
 DocType: Account,Accounts Manager,Računi Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',"Vrijeme Log {0} mora biti "" Postavio '"
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Vrijeme Log {0} mora biti "" Postavio '"
 DocType: Stock Settings,Default Stock UOM,Zadana kataloška mjerna jedinica
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Obračun troškova Ocijenite temelji na vrstu aktivnosti (po satu)
 DocType: Production Planning Tool,Create Material Requests,Zahtjevnica za nabavu
@@ -2476,7 +2487,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Nabavite ažuriranja
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodaj nekoliko uzorak zapisa
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Ostavite upravljanje
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Ostavite upravljanje
 DocType: Event,Groups,Grupe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa po računu
 DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
@@ -2488,11 +2499,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Prodajni dodaci
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} od troška {2} premašit će po {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Nosi proslijeđen lišće
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti poslije 'Do datuma'
 ,Stock Projected Qty,Stanje skladišta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Sales Order,Customer's Purchase Order,Kupca narudžbenice
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,"Vrijednost, ili Kol"
@@ -2505,13 +2515,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Prodavač na malo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit na računu mora biti bilanca račun
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Sve vrste dobavljača
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Kod proizvoda je obvezan jer artikli nisu automatski numerirani
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kod proizvoda je obvezan jer artikli nisu automatski numerirani
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Stavka rasporeda održavanja
 DocType: Sales Order,%  Delivered,% Isporučeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Prekoračenje računa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Provjerite plaće slip
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,otpušiti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Pretraživanje BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,osigurani krediti
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super proizvodi
@@ -2521,7 +2530,7 @@ DocType: Appraisal,Appraisal,Procjena
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Izgubljeno-pjena lijevanje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Crtanje
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponavlja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Osoba ovlaštena za odobravanje odsustva mora biti jedan od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Osoba ovlaštena za odobravanje odsustva mora biti jedan od {0}
 DocType: Hub Settings,Seller Email,Prodavač Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno troškovi nabave (putem kupnje proizvoda)
 DocType: Workstation Working Hour,Start Time,Vrijeme početka
@@ -2535,8 +2544,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Društvo valuta)
 DocType: BOM Operation,Hour Rate,Cijena sata
 DocType: Stock Settings,Item Naming By,Proizvod imenovan po
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,od kotaciju
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,od kotaciju
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materijal Preneseni za Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Račun {0} ne postoji
 DocType: Purchase Receipt Item,Purchase Order Item No,Narudžbenica Br.
@@ -2549,11 +2558,11 @@ DocType: Item,Inspection Required,Inspekcija Obvezno
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Novac u blagajni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za dionicama stavku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za dionicama stavku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 DocType: Serial No,Is Cancelled,Je otkazan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Moje pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje pošiljke
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Čak i ako postoji više Cijene pravila s najvišim prioritetom, onda sljedeći interni prioriteti primjenjuje se:"
 DocType: Supplier,Supplier Details,Dobavljač Detalji
@@ -2566,7 +2575,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Odaberite bankovni račun
 DocType: Newsletter,Create and Send Newsletters,Kreiraj i pošalji bilten
-sites/assets/js/report.min.js +107,From Date must be before To Date,Od datuma mora biti prije do danas
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Od datuma mora biti prije do danas
 DocType: Sales Order,Recurring Order,Ponavljajući narudžbe
 DocType: Company,Default Income Account,Zadani račun prihoda
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupa kupaca / Kupac
@@ -2581,31 +2590,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
 ,Projected,Predviđeno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
 DocType: Issue,Opening Date,Datum otvaranja
 DocType: Journal Entry,Remark,Primjedba
 DocType: Purchase Receipt Item,Rate and Amount,Kamatna stopa i iznos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Dosadan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Od prodajnog naloga
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od prodajnog naloga
 DocType: Blog Category,Parent Website Route,Nadređeni put web stranice
 DocType: Sales Order,Not Billed,Nije naplaćeno
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istoj tvrtki
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Još uvijek nema dodanih kontakata.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Još uvijek nema dodanih kontakata.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nije aktivan
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Protiv dostavnice datum knjiženja
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Iznos naloga zavisnog troška
 DocType: Time Log,Batched for Billing,Izmiješane za naplatu
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Mjenice podigao dobavljače.
 DocType: POS Profile,Write Off Account,Napišite Off račun
-sites/assets/js/erpnext.min.js +26,Discount Amount,Iznos popusta
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Iznos popusta
 DocType: Purchase Invoice,Return Against Purchase Invoice,Povratak protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Journal Entry Account,Journal Entry Account,Temeljnica račun
 DocType: Shopping Cart Settings,Quotation Series,Ponuda serija
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Vruće metala plin tvore
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe (kupca)
 DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
@@ -2637,10 +2645,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Kupca ili dobavljača Detalji
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,set
 DocType: Lead,Lead Owner,Vlasnik potencijalnog kupca
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Skladište je potrebno
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Skladište je potrebno
 DocType: Employee,Marital Status,Bračni status
 DocType: Stock Settings,Auto Material Request,Auto Materijal Zahtjev
 DocType: Time Log,Will be updated when billed.,Hoće li biti promjena kada je naplaćeno.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostupno Batch Količina u iz skladišta
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
@@ -2657,12 +2666,12 @@ DocType: POS Profile,Update Stock,Ažuriraj zalihe
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM stopa
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Dnevničkih zapisa {0} su UN-povezani
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Snimanje svih komunikacija tipa e-mail, telefon, chat, posjete, itd"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Molimo spomenuti zaokružiti troška u Društvu
 DocType: Purchase Invoice,Terms,Uvjeti
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Kreiraj novi dokument
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Kreiraj novi dokument
 DocType: Buying Settings,Purchase Order Required,Narudžbenica kupnje je obavezna
 ,Item-wise Sales History,Pregled prometa po artiklu
 DocType: Expense Claim,Total Sanctioned Amount,Ukupno kažnjeni Iznos
@@ -2679,16 +2688,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Plaća proklizavanja Odbita
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Zabilješke
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Odaberite grupu čvor na prvom mjestu.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Svrha mora biti jedna od {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Ispunite obrazac i spremite ga
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ispunite obrazac i spremite ga
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Preuzmite izvješće koje sadrži sve sirovine sa svojim najnovijim statusom inventara
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Suočavanje
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
 DocType: Leave Application,Leave Balance Before Application,Bilanca odsustva prije predaje zahtjeva
 DocType: SMS Center,Send SMS,Pošalji SMS
 DocType: Company,Default Letter Head,Default Pismo Head
 DocType: Time Log,Billable,Naplativo
 DocType: Authorization Rule,This will be used for setting rule in HR module,To će se koristiti za postavljanje pravilu u HR modula
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Poredaj Kom
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Poredaj Kom
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
 DocType: Journal Entry,Write Off,Otpisati
 DocType: Time Log,Operation ID,Operacija ID
@@ -2699,12 +2709,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Popust polja će biti dostupna u narudžbenici, primci i računu kupnje"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Naziv novog računa. Napomena: Molimo vas da ne stvaraju račune za kupce i dobavljače
 DocType: Report,Report Type,Prijavi Vid
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Učitavanje
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Učitavanje
 DocType: BOM Replace Tool,BOM Replace Tool,BOM zamijeni alat
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država mudar zadana adresa predlošci
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja Kupcu
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Pokaži porez raspada
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz i izvoz podataka
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Ako uključiti u proizvodnom djelatnošću . Omogućuje stavci je proizveden '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Račun knjiženja Datum
 DocType: Sales Invoice,Rounded Total,Zaokruženi iznos
 DocType: Product Bundle,List items that form the package.,Popis stavki koje čine paket.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Postotak izdvajanja mora biti 100 %
@@ -2715,8 +2728,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte korisniku koji imaju Sales Manager Master {0} ulogu
 DocType: Company,Default Cash Account,Zadani novčani račun
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
@@ -2738,11 +2751,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Red {0}: Količina ne stavi na raspolaganje u skladištu {1} na {2} {3}.
  Dostupno Količina: {4}, prijenos Kol: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
+DocType: Purchase Order,Customer Contact Email,Kupac Kontakt e
 DocType: Event,Sunday,Nedjelja
 DocType: Sales Team,Contribution (%),Doprinos (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Predložak
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime prodajne osobe
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Unesite atleast jedan račun u tablici
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj korisnicima
@@ -2751,7 +2765,7 @@ DocType: Task,Actual Start Date (via Time Logs),Stvarni datum početka (putem Vr
 DocType: Stock Reconciliation Item,Before reconciliation,Prije pomirenja
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično naplaćeno
 DocType: Item,Default BOM,Zadani BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2759,12 +2773,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Ukupni Amt
 DocType: Time Log Batch,Total Hours,Ukupno vrijeme
 DocType: Journal Entry,Printing Settings,Ispis Postavke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilska industrija
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Odsustvo tipa {0} već dodijeljeno za zaposlenika {1} za fiskalnu godinu {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Proizvod je potreban
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal injection moulding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Od otpremnici
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od otpremnici
 DocType: Time Log,From Time,S vremena
 DocType: Notification Control,Custom Message,Prilagođena poruka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
@@ -2780,10 +2793,10 @@ DocType: Newsletter,A Lead with this email id should exist,Kontakt sa ovim e-mai
 DocType: Stock Entry,From BOM,Od sastavnice
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Za datum bi trebao biti isti kao i od datuma za poludnevni dopust
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Za datum bi trebao biti isti kao i od datuma za poludnevni dopust
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","npr. kg, kom, br, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
 DocType: Salary Structure,Salary Structure,Plaća Struktura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2791,7 +2804,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Izdavanje materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Izdavanje materijala
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,Datum ponude
 DocType: Hub Settings,Access Token,Pristup token
@@ -2814,6 +2827,7 @@ DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
+DocType: Delivery Note Item,From Warehouse,Iz skladišta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Bušenje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Puhanje
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
@@ -2835,11 +2849,12 @@ DocType: C-Form,Amended From,Izmijenjena Od
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ili meta Količina ili ciljani iznos je obvezna
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
-DocType: Leave Allocation,Carry Forward,Prenijeti
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije datuma zatvaranja
+DocType: Leave Control Panel,Carry Forward,Prenijeti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Troška s postojećim transakcija ne može pretvoriti u knjizi
 DocType: Department,Days for which Holidays are blocked for this department.,Dani za koje su praznici blokirani za ovaj odjel.
 ,Produced,Proizvedeno
@@ -2860,17 +2875,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (AMT)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Purchase Order,The date on which recurring order will be stop,Datum na koji se ponavlja kako će biti zaustaviti
 DocType: Quality Inspection,Item Serial No,Serijski broj proizvoda
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Ukupno Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Sat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijaliziranom Stavka {0} nije moguće ažurirati pomoću \
  Stock pomirenja"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Prebaci Materijal Dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Prebaci Materijal Dobavljaču
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može biti na skladištu. Skladište mora biti postavljen od strane međuskladišnice ili primke
 DocType: Lead,Lead Type,Tip potencijalnog kupca
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Napravi ponudu
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Svi ovi proizvodi su već fakturirani
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Svi ovi proizvodi su već fakturirani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Koje uvjete
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
@@ -2918,7 +2933,7 @@ DocType: C-Form,C-Form,C-obrazac
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacija ID nije postavljen
 DocType: Production Order,Planned Start Date,Planirani datum početka
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Posjetite
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Posjetite
 DocType: Leave Type,Is Encash,Je li unovčiti
 DocType: Purchase Invoice,Mobile No,Mobitel br
 DocType: Payment Tool,Make Journal Entry,Provjerite Temeljnica
@@ -2926,7 +2941,7 @@ DocType: Leave Allocation,New Leaves Allocated,Novi Leaves Dodijeljeni
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,trgovački
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,trgovački
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti kataloški predmeta
 DocType: Cost Center,Distribution Id,ID distribucije
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super usluge
@@ -2942,14 +2957,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrijednost za Osobina {0} mora biti u rasponu od {1} {2} u koracima od {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default receivable račune
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Piljenje
 DocType: Tax Rule,Billing State,Državna naplate
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Plastificiranje
 DocType: Item Reorder,Transfer,Prijenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum dospijeća je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
@@ -2965,6 +2981,7 @@ DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
 DocType: Product Bundle,Product Bundle,Snop proizvoda
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Red {0}: Pogrešna referentni {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Porazan
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupnja poreze i pristojbe predloška
 DocType: Upload Attendance,Download Template,Preuzmite predložak
@@ -2972,16 +2989,16 @@ DocType: GL Entry,Remarks,Primjedbe
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 DocType: Features Setup,POS View,Prodajno mjesto prikaz
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Instalacijski zapis za serijski broj
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalacijski zapis za serijski broj
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuirano lijevanje
-sites/assets/js/erpnext.min.js +10,Please specify a,Navedite
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Navedite
 DocType: Offer Letter,Awaiting Response,Očekujem odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Iznad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Hladno dimenzioniranje
 DocType: Salary Slip,Earning & Deduction,Zarada & Odbitak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Račun {0} ne može biti grupa
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regija
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
 DocType: Holiday List,Weekly Off,Tjedni Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za npr. 2012, 2012-13"
@@ -3025,12 +3042,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Ispupčen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Isparenja-uzorak lijevanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Troškovi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Doba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Doba
 DocType: Time Log,Billing Amount,Naplata Iznos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Navedena je pogrešna količina za proizvod {0}. Količina treba biti veći od 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Prijave za odmor.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Račun s postojećom transakcijom ne može se izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Račun s postojećom transakcijom ne može se izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Pravni troškovi
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dan u mjesecu na koji auto kako bi se ostvarila npr 05, 28 itd"
 DocType: Sales Invoice,Posting Time,Objavljivanje Vrijeme
@@ -3039,9 +3056,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Nema proizvoda sa serijskim brojem {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Otvoreno Obavijesti
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otvoreno Obavijesti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Izravni troškovi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Želite li stvarno ponovno pokrenuti ovaj zahtjev za materijalom?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Novi prihod kupca
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
@@ -3052,7 +3068,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Brušenje
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probni rad
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
 DocType: Feed,Full Name,Ime i prezime
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Učvrstio
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
@@ -3075,7 +3091,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Dodaj redak za
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Vađenje
 DocType: Production Order,Total Operating Cost,Ukupni trošak
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Napomena : Proizvod {0} je upisan više puta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Napomena : Proizvod {0} je upisan više puta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Svi kontakti.
 DocType: Newsletter,Test Email Id,Test E-mail ID
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Kratica Društvo
@@ -3099,11 +3115,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponude
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
 ,Territory Target Variance Item Group-Wise,Pregled prometa po teritoriji i grupi proizvoda
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Porez Predložak je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} status ' Stopiran '
 DocType: Account,Temporary,Privremen
 DocType: Address,Preferred Billing Address,Željena adresa za naplatu
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak raspodjele
@@ -3121,13 +3136,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Porezna Det
 DocType: Purchase Order Item,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Glačanje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} je zaustavljen
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zaustavljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
 DocType: Lead,Add to calendar on this date,Dodaj u kalendar na ovaj datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodavanje troškova prijevoza.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Nadolazeći događaji
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Nadolazeći događaji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je dužan
 DocType: Letter Head,Letter Head,Zaglavlje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Brzi Ulaz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obvezna za povratak
 DocType: Purchase Order,To Receive,Primiti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Stisni dolikuje
@@ -3151,25 +3167,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
 DocType: Purchase Invoice Item,Project Name,Naziv projekta
 DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
 DocType: Workflow State,Edit,Uredi
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
 DocType: Features Setup,Item Batch Nos,Broj serije proizvoda
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Ljudski Resursi
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Ljudski Resursi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pomirenje Plaćanje Plaćanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,porezna imovina
 DocType: BOM Item,BOM No,BOM br.
 DocType: Contact Us Settings,Pincode,Poštanski broj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Temeljnica {0} nema račun {1} ili već usklađeni protiv drugog bona
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Temeljnica {0} nema račun {1} ili već usklađeni protiv drugog bona
 DocType: Item,Moving Average,Prosječna ponderirana cijena
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novi skladišni UOM mora biti različit od trenutnog UOM-a
 DocType: Account,Debit,Zaduženje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Odsustva moraju biti dodijeljena kao višekratnici od 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Odsustva moraju biti dodijeljena kao višekratnici od 0,5"
 DocType: Production Order,Operation Cost,Operacija troškova
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Prenesi dolazak iz. Csv datoteku
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izvanredna Amt
@@ -3177,7 +3193,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set cil
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Za dodjelu taj problem, koristite "dodijeliti" gumb u sidebar."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Dionice stariji od [ dana ]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ako dva ili više Cijene Pravila nalaze se na temelju gore navedenih uvjeta, Prioritet se primjenjuje. Prioritet je broj između 0 do 20, a zadana vrijednost je nula (prazno). Veći broj znači da će imati prednost ako ima više Cijene pravila s istim uvjetima."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Protiv računa
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskalna godina: {0} ne postoji
 DocType: Currency Exchange,To Currency,Valutno
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Dopusti sljedeći korisnici odobriti ostavite aplikacije za blok dana.
@@ -3206,7 +3221,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stopa
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Financijska godina - zadnji datum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Napravi ponudu dobavljaču
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Napravi ponudu dobavljaču
 DocType: Quality Inspection,Incoming,Dolazni
 DocType: BOM,Materials Required (Exploded),Potrebna roba
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Smanjenje plaća za ostaviti bez plaće (lwp)
@@ -3214,10 +3229,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Red # {0}: Serijski br {1} ne odgovara {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
 DocType: Batch,Batch ID,ID serije
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Napomena: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Napomena: {0}
 ,Delivery Note Trends,Trend otpremnica
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ovaj tjedan Sažetak
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora bitikupljen ili pod-ugovori stavka u nizu {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora bitikupljen ili pod-ugovori stavka u nizu {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Račun: {0} može se ažurirati samo preko Stock promet
 DocType: GL Entry,Party,Stranka
 DocType: Sales Order,Delivery Date,Datum isporuke
@@ -3230,7 +3245,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,R
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,AVG. Kupnja stopa
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Newsletteri
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletteri
 DocType: Address,Shipping,Utovar
 DocType: Stock Ledger Entry,Stock Ledger Entry,Upis u glavnu knjigu
 DocType: Department,Leave Block List,Popis neodobrenih odsustva
@@ -3249,7 +3264,7 @@ DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Datum završetka razdoblja tekuće narudžbe
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Ponudu Pismo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Povratak
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Zadana mjerna jedinica za inačicom mora biti ista kao predložak
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Zadana mjerna jedinica za inačicom mora biti ista kao predložak
 DocType: DocField,Fold,Saviti
 DocType: Production Order Operation,Production Order Operation,Proizvodni nalog Rad
 DocType: Pricing Rule,Disable,Ugasiti
@@ -3281,7 +3296,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Izvješća
 DocType: SMS Settings,Enter url parameter for receiver nos,Unesite URL parametar za prijemnike br
 DocType: Sales Invoice,Paid Amount,Plaćeni iznos
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Zatvaranje računa {0} mora biti tipa ' odgovornosti '
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Zatvaranje računa {0} mora biti tipa ' odgovornosti '
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
@@ -3289,7 +3304,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kvalitetom
 DocType: Production Planning Tool,Filter based on customer,Filtriranje prema kupcima
 DocType: Payment Tool Detail,Against Voucher No,Protiv Voucher br
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Employee External Work History,Employee External Work History,Zaposlenik Vanjski Rad Povijest
 DocType: Tax Rule,Purchase,Kupiti
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilanca kol
@@ -3326,28 +3341,29 @@ Note: BOM = Bill of Materials",Agregat skupina ** Opcije ** u drugom ** ** točk
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serijski Nema je obvezna za točke {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Navedite od / do rasponu
-sites/assets/js/desk.min.js +7652,Created By,Stvorio
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Stvorio
 DocType: Serial No,Under AMC,Pod AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Stopa predmeta vrednovanja preračunava obzirom sletio troškova iznos vaučera
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Zadane postavke za prodajne transakcije.
 DocType: BOM Replace Tool,Current BOM,Trenutni BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Dodaj serijski broj
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Dodaj serijski broj
 DocType: Production Order,Warehouses,Skladišta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Ispis i stacionarnih
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
 DocType: Payment Reconciliation,Minimum Amount,Minimalni iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update gotovih proizvoda
 DocType: Workstation,per hour,na sat
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serija {0} se već koristi u {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serija {0} se već koristi u {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladište ( neprestani inventar) stvorit će se na temelju ovog računa .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Skladište se ne može izbrisati dok postoje upisi u glavnu knjigu za ovo skladište.
 DocType: Company,Distribution,Distribucija
-sites/assets/js/erpnext.min.js +50,Amount Paid,Plaćeni iznos
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plaćeni iznos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni dopušteni popust za proizvod: {0} je {1}%
 DocType: Customer,Default Taxes and Charges,Zadani poreza i naknada
 DocType: Account,Receivable,potraživanja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Red # {0}: Nije dopušteno mijenjati dobavljača kao narudžbenice već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
 DocType: Sales Invoice,Supplier Reference,Dobavljač Referenca
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ako je označeno, BOM za pod-zbor stavke će biti uzeti u obzir za dobivanje sirovine. Inače, sve pod-montaža stavke će biti tretirani kao sirovinu."
@@ -3384,8 +3400,8 @@ DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primatelja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Postavke dolaznog servera za e-mail podrške (npr. support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Nedostatak Kom
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatak Kom
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Poliranje
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Do datuma ' je potrebno
@@ -3398,6 +3414,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kada bilo koji od provjerenih transakcija "Postavio", e-mail pop-up automatski otvorio poslati e-mail na povezane "Kontakt" u toj transakciji, s transakcijom u privitku. Korisnik može ili ne može poslati e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalne postavke
 DocType: Employee Education,Employee Education,Obrazovanje zaposlenika
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
 DocType: Salary Slip,Net Pay,Neto plaća
 DocType: Account,Account,Račun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijski Ne {0} već je primila
@@ -3430,7 +3447,7 @@ DocType: BOM,Manufacturing User,Proizvodni korisnik
 DocType: Purchase Order,Raw Materials Supplied,Sirovine nabavlja
 DocType: Purchase Invoice,Recurring Print Format,Ponavljajući Ispis formata
 DocType: Communication,Series,Serija
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Očekuje se dostava Datum ne može biti prije narudžbenice Datum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Očekuje se dostava Datum ne može biti prije narudžbenice Datum
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Klasifikacija predmeta
@@ -3486,6 +3503,7 @@ DocType: HR Settings,Payroll Settings,Postavke plaće
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Naručiti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Korijen ne mogu imati središte troškova roditelj
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Odaberite brand ...
 DocType: Sales Invoice,C-Form Applicable,Primjenjivi C-obrazac
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
 DocType: Supplier,Address and Contacts,Adresa i kontakti
@@ -3496,7 +3514,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Dobiti izvrsne Vaučeri
 DocType: Warranty Claim,Resolved By,Riješen Do
 DocType: Appraisal,Start Date,Datum početka
-sites/assets/js/desk.min.js +7629,Value,Vrijednost
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Vrijednost
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Dodijeliti lišće za razdoblje .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliknite ovdje da biste potvrdili
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Račun {0}: Ne možeš ga dodijeliti kao nadređeni račun
@@ -3512,14 +3530,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dozvoljen pristup Dropboxu
 DocType: Dropbox Backup,Weekly,Tjedni
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Primite
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Primite
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Cijela
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je uspješno dodana na popis Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronska zraka obrada
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupnja Master Manager
@@ -3532,7 +3550,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Dodaj / Uredi cijene
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon troškovnih centara
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Moje narudžbe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje narudžbe
 DocType: Price List,Price List Name,Cjenik Ime
 DocType: Time Log,For Manufacturing,Za Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Ukupan rezultat
@@ -3543,7 +3561,7 @@ DocType: Account,Income,Prihod
 DocType: Industry Type,Industry Type,Industrija Tip
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nešto je pošlo po krivu!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Završetak Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Iznos (valuta tvrtke)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Lijev
@@ -3557,10 +3575,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Godina
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-prodaju Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Obnovite SMS Settings
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Vrijeme Prijavite {0} već naplaćeno
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Vrijeme Prijavite {0} već naplaćeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Stavka {0} s rednim brojem {1} već instaliran
 DocType: Maintenance Schedule Detail,Scheduled Date,Planirano Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Cjelokupni iznos Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Poruka veća od 160 karaktera bit će izdjeljena u više poruka
@@ -3568,10 +3585,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Primljeni i prihvaćeni
 ,Serial No Service Contract Expiry,Istek ugovora za serijski broj usluge
 DocType: Item,Unit of Measure Conversion,Mjerna jedinica pretvorbe
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaposlenik ne može se mijenjati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
 DocType: Naming Series,Help HTML,HTML pomoć
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
 DocType: Address,Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši dobavljači
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
@@ -3582,10 +3599,11 @@ DocType: Lead,Converted,Pretvoreno
 DocType: Item,Has Serial No,Ima serijski br
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} od {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,računalo
 DocType: Item,List this Item in multiple groups on the website.,Prikaži ovu stavku u više grupa na web stranici.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite više valuta mogućnost dopustiti račune s druge valute
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite više valuta mogućnost dopustiti račune s druge valute
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Stavka: {0} ne postoji u sustavu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje zamrznute vrijednosti
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
@@ -3596,14 +3614,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Za skladište
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Račun {0} je unešen više od jednom za fiskalnu godinu {1}
 ,Average Commission Rate,Prosječna provizija
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Pravila cijena - pomoć
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje računa
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Ažuriranje dodatne troškove za izračun sletio trošak stavke
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Električna
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost razlika (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Red {0}: tečaj je obavezno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Red {0}: tečaj je obavezno
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Korisnik ID nije postavljen za zaposlenika {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od jamstvenog zahtjeva
@@ -3617,15 +3635,17 @@ DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
 DocType: User,Enabled,Omogućeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Želite li zaista podnijeti sve klizne plaće za mjesec {0} i godinu {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Želite li zaista podnijeti sve klizne plaće za mjesec {0} i godinu {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Uvoz Pretplatnici
 DocType: Target Detail,Target Qty,Ciljana Kol
 DocType: Attendance,Present,Sadašnje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
 DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
 DocType: Authorization Rule,Based On,Na temelju
-,Ordered Qty,Naručena kol
+DocType: Sales Order Item,Ordered Qty,Naručena kol
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Stavka {0} je onemogućen
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Razdoblje od razdoblja do datuma obvezna za ponavljajućih {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt aktivnost / zadatak.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generiranje plaće gaćice
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nije ispravan id e-mail
@@ -3665,7 +3685,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Upload Attendance
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina potrebne su
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Raspon 2
-DocType: Journal Entry Account,Amount,Iznos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Iznos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Zakivanje
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
 ,Sales Analytics,Prodajna analitika
@@ -3692,7 +3712,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekivani datum ne može biti prije Materijal Zahtjev Datum
 DocType: Contact Us Settings,City,Grad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvučno obrada
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Pogreška: Nije valjana id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Pogreška: Nije valjana id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Stavka {0} mora bitiProdaja artikla
 DocType: Naming Series,Update Series Number,Update serije Broj
 DocType: Account,Equity,pravičnost
@@ -3707,7 +3727,7 @@ DocType: Purchase Taxes and Charges,Actual,Stvaran
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Protiv Rashodi račun
 DocType: Production Order,Production Order,Proizvodni nalog
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
 DocType: Quotation Item,Against Docname,Protiv Docname
 DocType: SMS Center,All Employee (Active),Svi zaposlenici (aktivni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pogledaj sada
@@ -3715,14 +3735,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Troškova sirovine
 DocType: Item,Re-Order Level,Ponovno bi razini
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
-sites/assets/js/list.min.js +174,Gantt Chart,Gantogram
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantogram
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Privemeno (nepuno radno vrijeme)
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija ažurirana
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvo Odgovorili Na
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Križ Oglas pošiljke u više grupa
@@ -3737,7 +3757,7 @@ DocType: Attendance,Attendance,Pohađanje
 DocType: Page,No,Br
 DocType: BOM,Materials,Materijali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ako nije označeno, popis će biti dodan u svakom odjela gdje se mora primjenjivati."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
 ,Item Prices,Cijene proizvoda
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,U riječi će biti vidljiv nakon što spremite narudžbenice.
@@ -3757,9 +3777,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni troškovi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Nadređena grupa kupaca
-sites/assets/js/erpnext.min.js +50,Change,Promjena
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Narudžbenica {0} je ' zaustavljena '
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Otkaznog roka
@@ -3769,12 +3788,13 @@ DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
 DocType: Email Digest,Receivables / Payables,Potraživanja / obveze
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Žigosanje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Stavka zavisnih troškova
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokaži nulte vrijednosti
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina proizvoda dobivena nakon proizvodnje / pakiranja od navedene količine sirovina
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Plaća račun
 DocType: Delivery Note Item,Against Sales Order Item,Protiv prodaje reda točkom
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 DocType: Task,Actual End Date (via Time Logs),Stvarni datum završetka (preko Vrijeme Trupci)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Proračun se ne može dodijeliti protiv grupe nalog {0}
@@ -3788,7 +3808,7 @@ DocType: Issue,Support Team,Tim za podršku
 DocType: Appraisal,Total Score (Out of 5),Ukupna ocjena (od 5)
 DocType: Contact Us Settings,State,Županija
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Ravnoteža
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Ravnoteža
 DocType: Project,Total Expense Claim (via Expense Claims),Ukupni rashodi Zatraži (preko Rashodi potraživanja)
 DocType: User,Gender,Rod
 DocType: Journal Entry,Debit Note,Rashodi - napomena
@@ -3804,9 +3824,8 @@ DocType: Lead,Blog Subscriber,Blog pretplatnik
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Napravi pravila za ograničavanje prometa na temelju vrijednosti.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ako je označeno, Ukupan broj. radnih dana će uključiti odmor, a to će smanjiti vrijednost plaća po danu"
 DocType: Purchase Invoice,Total Advance,Ukupno predujma
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Otpušiti Materijal Zahtjev
 DocType: Workflow State,User,Korisnik
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Obračun plaća
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Obračun plaća
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Kreditni iznos
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Postavi kao Lost
@@ -3814,7 +3833,7 @@ DocType: Customer,Credit Days Based On,Kreditne dana na temelju
 DocType: Tax Rule,Tax Rule,Porezni Pravilo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Održavaj istu stopu tijekom cijelog prodajnog ciklusa
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planirajte vrijeme za rezanje izvan radne stanice radnog vremena.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} je već poslan
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} je već poslan
 ,Items To Be Requested,Potraživani proizvodi
 DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Naplate stopa temelji se na vrsti aktivnosti (po satu)
@@ -3823,6 +3842,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Tvrtka E-mail ID nije pronađen , pa se ne mail poslan"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 DocType: Production Planning Tool,Filter based on item,Filtriranje prema proizvodima
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Duguje račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Ime zaposlenika
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
@@ -3834,14 +3854,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Zatamnjenja
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
 DocType: Production Order,Manufactured Qty,Proizvedena količina
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} Ne radi postoji
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Mjenice podignuta na kupce.
 DocType: DocField,Default,Zadano
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Dodao {0} pretplatnika
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Odredite proračun za ovu troška. Za postavljanje proračuna akcije, pogledajte "Lista poduzeća""
@@ -3849,7 +3869,7 @@ DocType: Account,Parent Account,Nadređeni račun
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Središte
 DocType: GL Entry,Voucher Type,Bon Tip
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Cjenik nije pronađena ili onemogućena
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cjenik nije pronađena ili onemogućena
 DocType: Expense Claim,Approved,Odobren
 DocType: Pricing Rule,Price,Cijena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
@@ -3858,23 +3878,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Obrazovanje
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Izborni. Postavlja tvrtke zadanu valutu, ako nije navedeno."
 DocType: Address,Office,Ured
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardno izvješće
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Knjigovodstvene temeljnice
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: stranka / računa ne odgovara {1} / {2} u {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina u iz skladišta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: stranka / računa ne odgovara {1} / {2} u {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Za stvaranje porezno
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Lager
 DocType: Employee,Current Address,Trenutna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako predmet je varijanta drugom stavku zatim opis, slika, cijena, porezi itd će biti postavljena od predloška, ​​osim ako je izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Kupnja / Proizvodnja Detalji
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Hrpa Inventar
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Hrpa Inventar
 DocType: Employee,Contract End Date,Ugovor Datum završetka
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Povucite prodajne naloge (na čekanju za isporuku) na temelju navedenih kriterija
 DocType: DocShare,Document Type,Tip dokumenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Od dobavljača kotaciju
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od dobavljača kotaciju
 DocType: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
 DocType: Pricing Rule,Min Qty,Min kol
@@ -3885,20 +3907,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Kol) je obavezno
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Ukupno neto (valuta tvrtke)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Stranka Tip i stranka je primjenjiv samo protiv potraživanja / obveze prema dobavljačima račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Stranka Tip i stranka je primjenjiv samo protiv potraživanja / obveze prema dobavljačima račun
 DocType: Notification Control,Purchase Receipt Message,Poruka primke
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Ukupno dodijeljeni Listovi su više nego razdoblje
 DocType: Production Order,Actual Start Date,Stvarni datum početka
 DocType: Sales Order,% of materials delivered against this Sales Order,% robe od ove narudžbe je isporučeno
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Zabilježite stavku pokret.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Zabilježite stavku pokret.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Bilten popis pretplatnika
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,usluga
 DocType: Hub Settings,Hub Settings,Hub Postavke
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvenih unosa već su napravljene u valuti {0} za poduzeće {1}. Odaberite potraživanja ili dugovanja račun s valutom {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvenih unosa već su napravljene u valuti {0} za poduzeće {1}. Odaberite potraživanja ili dugovanja račun s valutom {0}.
 ,Monthly Salary Register,Mjesečna plaća Registracija
-apps/frappe/frappe/website/template.py +123,Next,Sljedeći
+apps/frappe/frappe/website/template.py +140,Next,Sljedeći
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
 DocType: BOM Operation,BOM Operation,BOM operacija
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropoliranje
@@ -3929,6 +3952,7 @@ DocType: Purchase Invoice,Next Date,Sljedeći datum
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Unesite poreza i pristojbi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Strojna
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
 DocType: Hub Settings,Seller Name,Naziv prodavatelja
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Porezi i naknade Umanjenja (Društvo valuta)
@@ -3955,29 +3979,29 @@ DocType: Purchase Order,To Receive and Bill,Za primanje i Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Uvjeti i odredbe - šprance
 DocType: Serial No,Delivery Details,Detalji isporuke
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatsko stvaranje materijala zahtjev ako količina padne ispod te razine
 ,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
 DocType: Batch,Expiry Date,Datum isteka
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Za postavljanje razine naručivanja točka mora biti Kupnja predmeta ili proizvodnja predmeta
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Za postavljanje razine naručivanja točka mora biti Kupnja predmeta ili proizvodnja predmeta
 ,Supplier Addresses and Contacts,Supplier Adrese i kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt majstor.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol kao $ iza valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Stranka Tip i stranka je potrebno za potraživanja / obveze prema dobavljačima račun {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Stranka Tip i stranka je potrebno za potraživanja / obveze prema dobavljačima račun {1}
 DocType: Dropbox Backup,Send Notifications To,Slanje obavijesti
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Red {0}: debitne unos ne može biti povezan s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Račun {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Red {0}: debitne unos ne može biti povezan s {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Račun {0} ne postoji
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i drugih publikacija.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Molimo stvoriti Plaća Struktura za zaposlenika {0}
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 3f6e092144..ed025e6b51 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Fizetés Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Válassza ki havi megoszlása, ha szeretné nyomon követni alapján a szezonalitás."
 DocType: Employee,Divorced,Elvált
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Figyelmeztetés: ugyanazt a tételt már többször jelenik meg.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Figyelmeztetés: ugyanazt a tételt már többször jelenik meg.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Tételek már szinkronizálva
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Hagyjuk pont, hogy ki többször a tranzakció"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Mégsem Material látogatás {0} törlése előtt ezt a garanciális igény
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Tömörítő plusz szinterezés
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Árfolyam szükséges árlista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* A tranzakcióban lesz kiszámolva.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Az anyagi kérése
+DocType: Purchase Order,Customer Contact,Ügyfélkapcsolati
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Az anyagi kérése
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Fa
 DocType: Job Applicant,Job Applicant,Állásra pályázó
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nincs több eredményt.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Vevő neve
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Minden export kapcsolódó területeken, mint valuta átváltási arányok, az export a teljes export végösszeg stb állnak rendelkezésre a szállítólevél, POS, idézet, Értékesítési számlák, Sales Order stb"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (vagy csoport), amely ellen könyvelési tételek készültek és ellensúlyok tartják."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),"Kiemelkedő {0} nem lehet kevesebb, mint nulla ({1})"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),"Kiemelkedő {0} nem lehet kevesebb, mint nulla ({1})"
 DocType: Manufacturing Settings,Default 10 mins,Default 10 perc
 DocType: Leave Type,Leave Type Name,Hagyja típus neve
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Sorozat sikeresen frissítve
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Több tétel árakat.
 DocType: SMS Center,All Supplier Contact,Minden beszállító Kapcsolat
 DocType: Quality Inspection Reading,Parameter,Paraméter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Várható befejezés dátuma nem lehet kevesebb, mint várható kezdési időpontja"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Ne igazán akar kidugaszol termelés érdekében:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Sor # {0}: Ár kell egyeznie {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Új Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Új Leave Application
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Ahhoz, hogy a megrendelő bölcs cikk-kód és kereshetővé tételéhez alapján kód Ezzel az opcióval"
 DocType: Mode of Payment Account,Mode of Payment Account,Mód Fizetési számla
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mutasd változ
 DocType: Sales Invoice Item,Quantity,Mennyiség
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Hitelekkel (kötelezettségek)
 DocType: Employee Education,Year of Passing,Év Passing
-sites/assets/js/erpnext.min.js +27,In Stock,Raktáron
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Egyszerre csak fizetés ellenében nem számlázott vevői rendelés
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Raktáron
 DocType: Designation,Designation,Titulus
 DocType: Production Plan Item,Production Plan Item,Gyártási terv tétele
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Felhasználó {0} már hozzá van rendelve Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Szerezz új POS Profile
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Egészségügyi ellátás
 DocType: Purchase Invoice,Monthly,Havi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Számla
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Fizetési késedelem (nap)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Számla
 DocType: Maintenance Schedule Item,Periodicity,Időszakosság
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email cím
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Védelem
 DocType: Company,Abbr,Röv.
 DocType: Appraisal Goal,Score (0-5),Pontszám (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nem egyezik a {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nem egyezik a {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Jármű No
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Kérjük, válasszon árjegyzéke"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Kérjük, válasszon árjegyzéke"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Faipari
 DocType: Production Order Operation,Work In Progress,Dolgozunk rajta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D nyomtatás
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Szülő Részlet docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Nyitott állások
 DocType: Item Attribute,Increment,Növekmény
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Válassza Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Hirdetés
 DocType: Employee,Married,Házas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
 DocType: Payment Reconciliation,Reconcile,Összeegyeztetni
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Élelmiszerbolt
 DocType: Quality Inspection Reading,Reading 1,Reading 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Tedd Bank Entry
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Tedd Bank Entry
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse kötelező, ha figyelembe típus Warehouse"
 DocType: SMS Center,All Sales Person,Minden értékesítő
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Írja Off Cost Center
 DocType: Warehouse,Warehouse Detail,Raktár részletek
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeret már átlépte az ügyfél {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Adónem
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Ön nem jogosult hozzáadására és frissítésére bejegyzés előtt {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Ön nem jogosult hozzáadására és frissítésére bejegyzés előtt {0}
 DocType: Item,Item Image (if not slideshow),Elem Kép (ha nem slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Az Ügyfél már létezik ezen a néven
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Órás sebesség / 60) * aktuális üzemidő
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Vendég
 DocType: Quality Inspection,Get Specification Details,Get Specification Részletek
 DocType: Lead,Interested,Érdekelt
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Anyagjegyzék
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Nyílás
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Nyílás
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Re {0} {1}
 DocType: Item,Copy From Item Group,Másolás jogcím-csoport
 DocType: Journal Entry,Opening Entry,Kezdő tétel
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Termék Érdeklődés
 DocType: Standard Reply,Owner,Tulajdonos
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Kérjük, adja cég első"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Kérjük, válasszon Társaság első"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Kérjük, válasszon Társaság első"
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Cél On
 DocType: BOM,Total Cost,Összköltség
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Előtag
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Elhasználható
 DocType: Upload Attendance,Import Log,Importálás naplója
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Küldés
+DocType: Sales Invoice Item,Delivered By Supplier,Megérkezés a Szállító
 DocType: SMS Center,All Contact,Minden Kapcsolattartó
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Éves Fizetés
 DocType: Period Closing Voucher,Closing Fiscal Year,Záró pénzügyi év
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Contra Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Időnaplók mutatása
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company Valuta
 DocType: Delivery Note,Installation Status,Telepítés állapota
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Elfogadott + Elutasított Mennyiség meg kell egyeznie a beérkezett mennyiséget tétel {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Elfogadott + Elutasított Mennyiség meg kell egyeznie a beérkezett mennyiséget tétel {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply nyersanyag beszerzése
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Elem {0} kell a vásárlást tétel
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Töltse le a sablont, töltse megfelelő adatokat és csatolja a módosított fájlt. Minden időpontot és a munkavállalói kombináció a kiválasztott időszakban jön a sablon, a meglévő jelenléti ívek"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,"Elem {0} nem aktív, vagy az elhasználódott elérte"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,"Elem {0} nem aktív, vagy az elhasználódott elérte"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Után felülvizsgálják Sales számla benyújtásának.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hogy tartalmazzák az adót a sorban {0} tétel mértéke, az adók sorokban {1} is fel kell venni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hogy tartalmazzák az adót a sorban {0} tétel mértéke, az adók sorokban {1} is fel kell venni"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Beállításait HR modul
 DocType: SMS Center,SMS Center,SMS Központ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Egyengető
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Adja url paraméter üzene
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Alkalmazási szabályainak árképzés és kedvezmény.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Ez idő Log ütközik {0} {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Árlista kell alkalmazni vétele vagy eladása
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},A telepítés időpontja nem lehet korábbi szállítási határidő jogcím {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},A telepítés időpontja nem lehet korábbi szállítási határidő jogcím {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Kedvezmény a árjegyzéke ráta (%)
-sites/assets/js/form.min.js +279,Start,Start
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Vezetéknév
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,A telepítésnek vége. Frissítés...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-olvadéköntési
 DocType: Offer Letter,Select Terms and Conditions,Válassza ki Feltételek
 DocType: Production Planning Tool,Sales Orders,Vevőmegrendelés
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Ellen Értékesítési számlák Elem
 ,Production Orders in Progress,Folyamatban lévő gyártási rendelések
 DocType: Lead,Address & Contact,Cím és Kapcsolattartó
+DocType: Leave Allocation,Add unused leaves from previous allocations,Add fel nem használt leveleket a korábbi juttatások
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Next Ismétlődő {0} jön létre {1}
 DocType: Newsletter List,Total Subscribers,Összes előfizető
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kapcsolattartó neve
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Folyamatban Mennyiség
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Bérlap létrehozása a fenti kritériumok alapján.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Kérheti a vásárlást.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dupla ház
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Leave Jóváhagyó nyújthatják be ez a szabadság Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Leave Jóváhagyó nyújthatják be ez a szabadság Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Levelek évente
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Kérjük, állítsa elnevezése Series {0} a Setup> Beállítások> elnevezése Series"
 DocType: Time Log,Will be updated when batched.,"Frissíteni kell, ha kötegelt."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Kérjük ellenőrzés ""Advance"" ellen Account {1}, ha ez egy előre bejegyzést."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Kérjük ellenőrzés ""Advance"" ellen Account {1}, ha ez egy előre bejegyzést."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} nem tartozik a cég {1}
 DocType: Bulk Email,Message,Üzenet
 DocType: Item Website Specification,Item Website Specification,Az anyag weboldala
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Hivatkozási szám
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Hagyja Blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Hagyja Blokkolt
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Éves
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Megbékélés Elem
 DocType: Stock Entry,Sales Invoice No,Értékesítési számlák No
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Minimális rendelési menny
 DocType: Pricing Rule,Supplier Type,Beszállító típusa
 DocType: Item,Publish in Hub,Közzéteszi Hub
 ,Terretory,Terület
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,{0} elem törölve
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Anyagigénylés
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,{0} elem törölve
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Frissítés Végső dátum
 DocType: Item,Purchase Details,Vásárlási adatok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Elem {0} nem található "szállított alapanyagok" táblázat Megrendelés {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Notification vezérlés
 DocType: Lead,Suggestions,Javaslatok
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set tétel Group-bölcs költségvetés azon a területen. Akkor is a szezonalitás beállításával Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Kérjük, adja szülő fiókcsoportot raktári {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Fizetési ellen {0} {1} nem lehet nagyobb, mint kint levő összeg {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Fizetési ellen {0} {1} nem lehet nagyobb, mint kint levő összeg {2}"
 DocType: Supplier,Address HTML,HTML Cím
 DocType: Lead,Mobile No.,Mobiltelefon
 DocType: Maintenance Schedule,Generate Schedule,Ütemezés generálása
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Új készlet mértékegysége
 DocType: Period Closing Voucher,Closing Account Head,Záró fiók vezetője
 DocType: Employee,External Work History,Külső munka története
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Körkörös hivatkozás Error
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Tényleg azt akarja állítani
 DocType: Communication,Closed,Lezárva
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Szavakban (Export) lesz látható, ha menteni a szállítólevélen."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Biztosan le szeretné állítani
 DocType: Lead,Industry,Ipar
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Hírlevél
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Szállítólevél
 DocType: Dropbox Backup,Allow Dropbox Access,Dropbox hozzáférés engedélyezése
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Beállítása Adók
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetési Entry módosításra került, miután húzta. Kérjük, húzza meg újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Összefoglaló erre a hétre és a folyamatban lévő tevékenységek
 DocType: Workstation,Rent Cost,Bérleti díj
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Kérjük, válasszon hónapot és évet"
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Arány, amely Customer Valuta átalakul ügyfél alap deviza"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Elérhető a BOM, szállítólevél, beszerzési számla, gyártási utasítás, megrendelés, vásárlási nyugta, Értékesítési számlák, Vevői rendelés, Stock Entry, Időnyilvántartó"
 DocType: Item Tax,Tax Rate,Adókulcs
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Elem kiválasztása
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Elem kiválasztása
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Cikk: {0} sikerült szakaszos, nem lehet összeegyeztetni a \ Stock Megbékélés helyett használja Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Sor # {0}: Batch Nem kell egyeznie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Átalakítás nem Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Vásárlási nyugta kell benyújtani
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Raktárkészlet UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Egy tétel sok mennyisége a köteg.
 DocType: C-Form Invoice Detail,Invoice Date,Számla dátuma
 DocType: GL Entry,Debit Amount,Betéti összeg
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Ott csak 1 fiók per Társaság {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Ott csak 1 fiók per Társaság {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,E-mail címed
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Kérjük, olvassa mellékletet"
 DocType: Purchase Order,% Received,% fogadva
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Utasítások
 DocType: Quality Inspection,Inspected By,Megvizsgálta
 DocType: Maintenance Visit,Maintenance Type,Karbantartás típusa
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nem tartozik szállítólevél {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nem tartozik szállítólevél {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Anyag minőségi vizsgálatának részletei
 DocType: Leave Application,Leave Approver Name,Hagyja Jóváhagyó név
 ,Schedule Date,Menetrend dátuma
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Vásárlási Regisztráció
 DocType: Landed Cost Item,Applicable Charges,Alkalmazandó díjak
 DocType: Workstation,Consumable Cost,Fogyó költség
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) kell szerepet ""Leave Jóváhagyó"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) kell szerepet ""Leave Jóváhagyó"""
 DocType: Purchase Receipt,Vehicle Date,Jármű dátuma
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Orvosi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Veszteség indoka
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% telepítve
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Kérjük adja meg a cégnevet első
 DocType: BOM,Item Desription,Az anyag leírása
 DocType: Purchase Invoice,Supplier Name,Beszállító neve
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Olvassa el a ERPNext kézikönyv
 DocType: Account,Is Group,Is Csoport
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatikusan beállítja Soros számú alapuló FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Ellenőrizze Szállító Számla száma Egyediség
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales mester mene
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globális beállítások minden egyes gyártási folyamat.
 DocType: Accounts Settings,Accounts Frozen Upto,A számlák be vannak fagyasztva eddig
 DocType: SMS Log,Sent On,Elküldve
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
 DocType: Sales Order,Not Applicable,Nem értelmezhető
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Nyaralás mester.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Héjformázás
 DocType: Material Request Item,Required Date,Szükséges dátuma
 DocType: Delivery Note,Billing Address,Számlázási cím
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Kérjük, adja tételkód."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Kérjük, adja tételkód."
 DocType: BOM,Costing,Költség
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ha be van jelölve, az adó összegét kell tekinteni, mint amelyek már szerepelnek a Print Ár / Print Összeg"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Összesen Mennyiség
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between O
 DocType: Customer,Buyer of Goods and Services.,Vevő az áruk és szolgáltatások.
 DocType: Journal Entry,Accounts Payable,Fizethető számlák
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Add előfizetők
-sites/assets/js/erpnext.min.js +5,""" does not exists","""Nem létezik"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Nem létezik"
 DocType: Pricing Rule,Valid Upto,Érvényes eddig:
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Sorolja pár az ügyfelek. Ők lehetnek szervezetek vagy magánszemélyek.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Közvetlen jövedelemtámogatás
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nem tudja kiszűrni alapján Account, ha csoportosítva Account"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Igazgatási tisztviselő
 DocType: Payment Tool,Received Or Paid,Kapott vagy fizetett
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Kérjük, válasszon Társaság"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Kérjük, válasszon Társaság"
 DocType: Stock Entry,Difference Account,Különbség Account
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Nem zárható feladata a függő feladat {0} nincs lezárva.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja Warehouse, amelyek anyaga kérés jelenik meg"
 DocType: Production Order,Additional Operating Cost,További üzemeltetési költség
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kozmetikum
 DocType: DocField,Type,Típus
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
 DocType: Communication,Subject,Tárgy
 DocType: Shipping Rule,Net Weight,Nettó súly
 DocType: Employee,Emergency Phone,Sürgősségi telefon
 ,Serial No Warranty Expiry,Sorozatszám garanciaidő lejárta
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Tényleg azt akarja állítani ezt a Material kérése?
 DocType: Sales Order,To Deliver,Szállít
 DocType: Purchase Invoice Item,Item,Tétel
 DocType: Journal Entry,Difference (Dr - Cr),Különbség (Dr - Cr)
 DocType: Account,Profit and Loss,Eredménykimutatás
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Ügyvezető alvállalkozói munkák
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Ügyvezető alvállalkozói munkák
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Új UOM TILOS típusú egész szám
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Bútor és állvány
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Arány, amely Árlista valuta konvertálja a vállalkozás székhelyén pénznemben"
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adók és költségek hoz
 DocType: Purchase Invoice,Supplier Invoice No,Beszállítói számla száma
 DocType: Territory,For reference,Referenciaként
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nem lehet törölni a sorozatszám {0}, mivel ezt használja a részvény tranzakciók"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Zárás (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zárás (Cr)
 DocType: Serial No,Warranty Period (Days),Garancia idő (nap)
 DocType: Installation Note Item,Installation Note Item,Telepítési feljegyzés Elem
 ,Pending Qty,Folyamatban db
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Számlázási és Delivery Stat
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Törzsvásárlóid
 DocType: Leave Control Panel,Allocate,Osztja
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Előző
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Eladás visszaküldése
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Eladás visszaküldése
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Válassza ki Vevőmegrendelés ahonnan szeretne létrehozni gyártási megrendeléseket.
+DocType: Item,Delivered by Supplier (Drop Ship),Megérkezés a Szállító (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Fizetés alkatrészeket.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Adatbázist a potenciális vásárlók.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Vevői adatbázis.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Bukdácsoló
 DocType: Purchase Order Item,Billed Amt,Számlázott össz.
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logikai Warehouse amely ellen állomány bejegyzések történnek.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Hivatkozási szám és Referencia dátuma szükséges {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Hivatkozási szám és Referencia dátuma szükséges {0}
 DocType: Event,Wednesday,Szerda
 DocType: Sales Invoice,Customer's Vendor,A Vevő szállítója
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Termelési rend Kötelező
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Vevő Paraméter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Az 'alapján' 'és a 'csoport szerint' nem lehet ugyanazon
 DocType: Sales Person,Sales Person Targets,Értékesítői célok
-sites/assets/js/form.min.js +271,To,eddig
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Emailcím megadása
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,eddig
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Emailcím megadása
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Vége csőformázó
 DocType: Production Order Operation,In minutes,Perceken
 DocType: Issue,Resolution Date,Megoldás dátuma
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,Projekt felhasználó
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Fogyasztott
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nem található a Számla részletek táblázatban
 DocType: Company,Round Off Cost Center,Fejezze ki Cost Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Karbantartás látogatás {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Karbantartás látogatás {0} törölni kell lemondása előtt ezt a Vevői rendelés
 DocType: Material Request,Material Transfer,Anyag átrakása
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Megnyitó (Dr.)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},"Kiküldetés timestamp kell lennie, miután {0}"
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Beállítások
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Beszerzési költség adók és illetékek
 DocType: Production Order Operation,Actual Start Time,Tényleges kezdési idő
 DocType: BOM Operation,Operation Time,Működési idő
-sites/assets/js/list.min.js +5,More,Tovább
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Tovább
 DocType: Pricing Rule,Sales Manager,Sales Manager
-sites/assets/js/desk.min.js +7673,Rename,Átnevezés
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Átnevezés
 DocType: Journal Entry,Write Off Amount,Leírt összeg
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Hajlítás
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Felhasználó engedélyezése
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Egyenes nyíró
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Hogy nyomon tétel az értékesítési és beszerzési dokumentumok alapján soros nos. Ez is használják a pálya garanciális részleteket a termék.
 DocType: Purchase Receipt Item Supplied,Current Stock,Raktárkészlet
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Elutasított Warehouse kötelező elleni regected elem
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Elutasított Warehouse kötelező elleni regected elem
 DocType: Account,Expenses Included In Valuation,Költségekből Értékelési
 DocType: Employee,Provide email id registered in company,Adjon email id bejegyzett cég
 DocType: Hub Settings,Seller City,Eladó város
 DocType: Email Digest,Next email will be sent on:,A következő emailt küldjük:
 DocType: Offer Letter Term,Offer Letter Term,Ajánlat Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Tételnek változatok.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elem {0} nem található
 DocType: Bin,Stock Value,Készlet értéke
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Fa Típus
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Üdv
 DocType: Journal Entry,Credit Card Entry,Hitelkártya Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Feladat Téma
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Áruk szállítóktól kapott.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Áruk szállítóktól kapott.
 DocType: Communication,Open,Megnyitva
 DocType: Lead,Campaign Name,Kampány neve
 ,Reserved,Fenntartott
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,"Szeretné, hogy kidugaszol"
 DocType: Purchase Order,Supply Raw Materials,Supply nyersanyagok
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Az időpont, amikor a következő számlán kerül előállításra. Úgy keletkezett benyújtani."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Befektetett eszközök
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,A Vevő rendelésének száma
 DocType: Employee,Cell Number,Mobilszám
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Elveszett
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tud belépni a jelenlegi utalványt ""Against Naplókönyvelés"" oszlopban"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tud belépni a jelenlegi utalványt ""Against Naplókönyvelés"" oszlopban"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Lehetőség tőle
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Havi kimutatást.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Felelősség
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Szentesített összege nem lehet nagyobb, mint igény összegéből sorában {0}."
 DocType: Company,Default Cost of Goods Sold Account,Alapértelmezett önköltség fiók
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Árlista nincs kiválasztva
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Árlista nincs kiválasztva
 DocType: Employee,Family Background,Családi háttér
 DocType: Process Payroll,Send Email,E-mail küldése
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nincs jogosultság
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Tételek magasabb weightage jelenik meg a magasabb
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Megbékélés részlete
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Saját számlák
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Egyetlen dolgozó sem találtam
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Egyetlen dolgozó sem találtam
 DocType: Purchase Order,Stopped,Megállítva
 DocType: Item,If subcontracted to a vendor,Ha alvállalkozásba eladó
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Válassza BOM kezdeni
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Töltsd f
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Küldés most
 ,Support Analytics,Támogatási analitika
 DocType: Item,Website Warehouse,Weboldal Warehouse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,"Tényleg azt szeretnénk, hogy leállítják a termelést érdekében:"
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","A hónap napja, amelyen auto számla jön létre pl 05, 28 stb"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,"Pontszám kell lennie, kisebb vagy egyenlő, mint 5"
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form bejegyzések
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Támo
 DocType: Features Setup,"To enable ""Point of Sale"" features","Annak érdekében, hogy "Point of Sale" funkciók"
 DocType: Bin,Moving Average Rate,Mozgóátlag
 DocType: Production Planning Tool,Select Items,Válassza ki az elemeket
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} ellen Bill {1} ​​kelt {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} ellen Bill {1} ​​kelt {2}
 DocType: Comment,Reference Name,Hivatkozott tétel
 DocType: Maintenance Visit,Completion Status,Készültségi állapot
 DocType: Sales Invoice Item,Target Warehouse,Cél raktár
 DocType: Item,Allow over delivery or receipt upto this percent,Hagyjuk fölött szállítás vagy nyugtát Akár ezt a százalékos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,A Várható szállítás dátuma nem lehet korábbi mint a rendelés dátuma
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,A Várható szállítás dátuma nem lehet korábbi mint a rendelés dátuma
 DocType: Upload Attendance,Import Attendance,Import Nézőszám
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Minden tétel Csoportok
 DocType: Process Payroll,Activity Log,Tevékenység
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatikusan üzenet írása benyújtása tranzakciókat.
 DocType: Production Order,Item To Manufacture,Anyag gyártáshoz
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Állandó olvadéköntési
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Megrendelést Fizetés
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} állapot {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Megrendelést Fizetés
 DocType: Sales Order Item,Projected Qty,Tervezett mennyiség
 DocType: Sales Invoice,Payment Due Date,Fizetési határidő
 DocType: Newsletter,Newsletter Manager,Hírlevél menedzser
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,Kért számok
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Teljesítményértékelési rendszer.
 DocType: Sales Invoice Item,Stock Details,Stock Részletek
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt érték
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Az értékesítés helyén
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Nem lehet tovább folytatni {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Az értékesítés helyén
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nem lehet tovább folytatni {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Számlaegyenleg már Credit, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Tartozik"""
 DocType: Account,Balance must be,Egyensúlyt kell
 DocType: Hub Settings,Publish Pricing,Közzé Pricing
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Vásárlási nyugta
 ,Received Items To Be Billed,Kapott elemek is fizetnie kell
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Szemcseszórás
-sites/assets/js/desk.min.js +3938,Ms,Hölgy
+DocType: Employee,Ms,Hölgy
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizaárfolyam mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Time Slot a következő {0} nap Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Terv anyagot részegységekre
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,Tartomány
 DocType: Supplier,Default Payable Accounts,Alapértelmezett fizetendő számlák
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Employee {0} nem aktív, vagy nem létezik"
 DocType: Features Setup,Item Barcode,Elem vonalkódja
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Elem változatok {0} frissített
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Elem változatok {0} frissített
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vásárlást igazoló számlát Advance
 DocType: Address,Shop,Bolt
 DocType: Hub Settings,Sync Now,Szinkronizálás most
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit bejegyzés nem kapcsolódik a {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit bejegyzés nem kapcsolódik a {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Alapértelmezett Bank / Cash fiók automatikusan frissített POS számla, ha ezt a módot választotta."
 DocType: Employee,Permanent Address Is,Állandó lakhelye
 DocType: Production Order Operation,Operation completed for how many finished goods?,Művelet befejeződött hány késztermékek?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,A Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Engedmény a túl- {0} keresztbe jogcím {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Engedmény a túl- {0} keresztbe jogcím {1}.
 DocType: Employee,Exit Interview Details,Kilépési interjú részletei
 DocType: Item,Is Purchase Item,Beszerzendő tétel?
 DocType: Journal Entry Account,Purchase Invoice,Vásárlási számla
 DocType: Stock Ledger Entry,Voucher Detail No,Utalvány Részlet No
 DocType: Stock Entry,Total Outgoing Value,Összes kimenő Érték
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Megnyitása és határidőt kell belül ugyanazon üzleti év
 DocType: Lead,Request for Information,Információkérés
 DocType: Payment Tool,Paid,Fizetett
 DocType: Salary Slip,Total in words,Összesen szavakban
 DocType: Material Request Item,Lead Time Date,Átfutási idő dátuma
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,kötelező. Talán Pénzváltó rekord nem teremtett
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Kérem adjon meg Serial No jogcím {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Mert "Termék Bundle" tételek, raktár, Serial No és Batch Nem fogják tekinteni a "Csomagolási lista" táblázatban. Ha Warehouse és a Batch Nem vagyunk azonosak az összes csomagoljon bármely "Product Bundle" elemet, ezek az értékek bekerülnek a fő tétel asztal, értékek lesznek másolva "Csomagolási lista" táblázatban."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Kiszállítás a vevő felé.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Kiszállítás a vevő felé.
 DocType: Purchase Invoice Item,Purchase Order Item,Megrendelés Termék
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Közvetett jövedelem
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Állítsa fizetés összege = fennálló összeg
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,1. cím sor
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variancia
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Cég neve
 DocType: SMS Center,Total Message(s),Teljes üzenet (ek)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Válassza ki a tétel a Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Válassza ki a tétel a Transfer
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Listájának megtekintéséhez minden segítséget videók
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Válassza ki a fiók vezetője a bank, ahol check rakódott le."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Lehetővé teszi a felhasználó szerkesztheti árjegyzéke Rate tranzakciókban
 DocType: Pricing Rule,Max Qty,Max Mennyiség
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Fizetés ellenében Sales / Megrendelés mindig fel kell tüntetni, előre"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Fizetés ellenében Sales / Megrendelés mindig fel kell tüntetni, előre"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Vegyi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,"Összes példány már átadott, erre a gyártási utasítás."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,"Összes példány már átadott, erre a gyártási utasítás."
 DocType: Process Payroll,Select Payroll Year and Month,"Válassza bérszámfejtés év, hónap"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Tovább a megfelelő csoportba (általában pénzeszközök felhasználása> forgóeszközök> bankszámlák és új fiók létrehozása (kattintva Add Child) típusú "Bank"
 DocType: Workstation,Electricity Cost,Villamosenergia-költség
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Feh
 DocType: SMS Center,All Lead (Open),Minden Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Kifizetett előlegek átmásolása
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Arcképed csatolása
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Csinál
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Csinál
 DocType: Journal Entry,Total Amount in Words,Teljes összeg kiírva
 DocType: Workflow State,Stop,Megáll
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Hiba történt. Az egyik valószínű oka az lehet, hogy nem mentette formájában. Kérjük, forduljon support@erpnext.com ha a probléma továbbra is fennáll."
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,Csomagjegy tétel
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
 DocType: Delivery Note,Delivery To,Szállítás az
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Attribútum tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attribútum tábla kötelező
 DocType: Production Planning Tool,Get Sales Orders,Get Vevőmegrendelés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nem lehet negatív
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Benyújtás
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"Frissülni fog
 DocType: Project,Internal,Belső
 DocType: Task,Urgent,Sürgős
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Kérem adjon meg egy érvényes Row ID sorban {0} táblázatban {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ugrás az asztali és kezdi el használni ERPNext
 DocType: Item,Manufacturer,Gyártó
 DocType: Landed Cost Item,Purchase Receipt Item,Vásárlási nyugta Elem
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Fenntartva Warehouse Sales Order / készáru raktárba
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Értékesítési összeg
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Idő naplók
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Te vagy a költség Jóváhagyó erre a lemezre. Kérjük, frissítse az ""Állapot"", és mentése"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Te vagy a költség Jóváhagyó erre a lemezre. Kérjük, frissítse az ""Állapot"", és mentése"
 DocType: Serial No,Creation Document No,Creation Document No
 DocType: Issue,Issue,Probléma
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attribútumait tétel változatok. pl méret, szín stb"
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Ellen
 DocType: Item,Default Selling Cost Center,Alapértelmezett Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Kivitelező partner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Vevői {0} {1}
 DocType: Opportunity,Contact Info,Kapcsolattartó infó
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Így Stock bejegyzések
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Így Stock bejegyzések
 DocType: Packing Slip,Net Weight UOM,Nettó súly mértékegysége
 DocType: Item,Default Supplier,Alapértelmezett beszállító
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Több mint Production juttatás aránya
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Egyéb
 DocType: Holiday List,Get Weekly Off Dates,Get Off Heti dátuma
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"A befejezés dátuma nem lehet kevesebb, mint a Start Date"
 DocType: Sales Person,Select company name first.,Válassza ki a cég nevét először.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Idézetek a szállítóktól kapott.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,keresztül frissíthető Time Naplók
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,A cég regisztrált adatai. Pl.: adószám; stb.
 DocType: Sales Partner,Distributor,Nagykereskedő
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Kosár Szállítási szabály
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelés {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelés {0} törölni kell lemondása előtt ezt a Vevői rendelés
 ,Ordered Items To Be Billed,Rendelt mennyiség számlázásra
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Range kell lennie kisebb hatótávolsággal
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Válassza ki a Time Naplók és elküldése hogy hozzon létre egy új Értékesítési számlák.
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Adó és
 DocType: Lead,Lead,Célpont
 DocType: Email Digest,Payables,Kötelezettségek
 DocType: Account,Warehouse,Raktár
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
 ,Purchase Order Items To Be Billed,Megrendelés elemek is fizetnie kell
 DocType: Purchase Invoice Item,Net Rate,Nettó ár
 DocType: Purchase Invoice Item,Purchase Invoice Item,Vásárlási számla tétel
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Nem egyeztetett fiz
 DocType: Global Defaults,Current Fiscal Year,Jelenlegi pénzügyi év
 DocType: Global Defaults,Disable Rounded Total,Kerekített összesen elrejtése
 DocType: Lead,Call,Hívás
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},A {0} duplikált sor azonos ezzel: {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Beállítása Alkalmazottak
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Beállítása Alkalmazottak
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Kérjük, válasszon prefix első"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Kutatás
 DocType: Maintenance Visit Purpose,Work Done,Kész a munka
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,Elküldött
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Kilátás Ledger
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel Group létezik azonos nevű, kérjük, változtassa meg az elem nevét, vagy nevezze át a tétel-csoportban"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel Group létezik azonos nevű, kérjük, változtassa meg az elem nevét, vagy nevezze át a tétel-csoportban"
 DocType: Communication,Delivery Status,Szállítás állapota
 DocType: Production Order,Manufacture against Sales Order,Gyártás ellen Vevői
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,A világ többi része
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,A világ többi része
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,A tétel {0} nem lehet Batch
 ,Budget Variance Report,Költségkeret Variance jelentés
 DocType: Salary Slip,Gross Pay,Bruttó fizetés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,"Az osztalék,"
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Számviteli Ledger
 DocType: Stock Reconciliation,Difference Amount,Eltérés összege
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Eredménytartalék
 DocType: BOM Item,Item Description,Az anyag leírása
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,Lehetőség tétel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Ideiglenes megnyitását
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Munkavállalói Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Mérlegek Account {0} mindig legyen {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Mérlegek Account {0} mindig legyen {1}
 DocType: Address,Address Type,Cím típusa
 DocType: Purchase Receipt,Rejected Warehouse,Elutasított raktár
 DocType: GL Entry,Against Voucher,Ellen utalvány
 DocType: Item,Default Buying Cost Center,Alapértelmezett Vásárlási Cost Center
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Ahhoz, hogy a legjobbat hozza ki ERPNext, azt ajánljuk, hogy időbe telik, és nézni ezeket a videókat segítséget."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Elem {0} kell Sales Elem
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,nak nek
 DocType: Item,Lead Time in days,Átfutási idő nap
 ,Accounts Payable Summary,A szállítói kötelezettségek összefoglalása
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlára {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlára {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get kiváló számlák
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vevői {0} nem érvényes
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok nem lehet összevonni,"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Probléma helye
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Szerződés
 DocType: Report,Disabled,Tiltva
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tényező szükséges UOM: {0} Cikk: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tényező szükséges UOM: {0} Cikk: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Közvetett költségek
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Menny kötelező
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Mezőgazdaság
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,Fizetési mód
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"Ez egy gyökér tétel-csoportban, és nem lehet szerkeszteni."
 DocType: Journal Entry Account,Purchase Order,Megrendelés
 DocType: Warehouse,Warehouse Contact Info,Raktári kapcsolattartó
-sites/assets/js/form.min.js +190,Name is required,Névre van szükség
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Névre van szükség
 DocType: Purchase Invoice,Recurring Type,Gyakoriság
 DocType: Address,City/Town,Város/település
 DocType: Email Digest,Annual Income,Éves jövedelem
 DocType: Serial No,Serial No Details,Sorozatszám adatai
 DocType: Purchase Invoice Item,Item Tax Rate,Az anyag adójának mértéke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","{0}, csak jóváírásokat lehet kapcsolni a másik ellen terheléssel"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, csak jóváírásokat lehet kapcsolni a másik ellen terheléssel"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Szállítólevélen {0} nem nyújtják be
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Elem {0} kell egy Alvállalkozásban Elem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Felszereltség
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Cél
 DocType: Sales Invoice Item,Edit Description,Leírás szerkesztése
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Várható szállítási határidő kisebb, mint a tervezett kezdési dátum."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,A Szállító
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,A Szállító
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Beállítás Account Type segít kiválasztani ezt a számlát a tranzakció.
 DocType: Purchase Invoice,Grand Total (Company Currency),Mindösszesen (Társaság Currency)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Összes kimenő
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Ott csak egyetlen szabály Szállítási állapot 0 vagy üres érték ""to value"""
 DocType: Authorization Rule,Transaction,Tranzakció
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Megjegyzés: Ez a költséghely egy csoport. Nem tud könyvelési tételek csoportokkal szemben.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Eszközök
+apps/frappe/frappe/config/desk.py +7,Tools,Eszközök
 DocType: Item,Website Item Groups,Weboldal Elem Csoportok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Gyártási rendelési szám kötelező készletnövekedést célú gyártás
 DocType: Purchase Invoice,Total (Company Currency),Összesen (a cég pénznemében)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,Munkaállomás neve
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Összefoglaló email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nem tartozik Elem {1}
 DocType: Sales Partner,Target Distribution,Cél Distribution
-sites/assets/js/desk.min.js +7652,Comments,Hozzászólások
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Hozzászólások
 DocType: Salary Slip,Bank Account No.,Bankszámla szám
 DocType: Naming Series,This is the number of the last created transaction with this prefix,"Ez az a szám, az utoljára létrehozott tranzakciós ilyen előtaggal"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Értékelési Rate szükséges Elem {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Kérjük, v
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Beszállítói számla dátuma
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Akkor engedélyezze a kosárba
-sites/assets/js/form.min.js +212,No Data,Nincs adat
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nincs adat
 DocType: Appraisal Template Goal,Appraisal Template Goal,Teljesítmény értékelő sablon célja
 DocType: Salary Slip,Earning,Kereset
 DocType: Payment Tool,Party Account Currency,Fél számla pénzneme
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,Fél számla pénzneme
 DocType: Purchase Taxes and Charges,Add or Deduct,Add vagy le lehet vonni
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ha az éves költségvetés túllépése (a költség számla)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Átfedő feltételei között található:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Ellen Naplókönyvelés {0} már értékével szemben néhány más voucher
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Ellen Naplókönyvelés {0} már értékével szemben néhány más voucher
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Teljes megrendelési érték
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Élelmiszer
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing tartomány 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Nem a látogatások
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Hírlevelek kapcsolatoknak, vezetőknek"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Árfolyam a záró figyelembe kell {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Pontjainak összegeként az összes célokat kell 100. {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Műveletek nem maradt üresen.
 ,Delivered Items To Be Billed,Kiszállított anyag számlázásra
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,A sorozatszámhoz tartozó raktárat nem lehet megváltoztatni.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Állapota frissült {0}
 DocType: DocField,Description,Leírás
 DocType: Authorization Rule,Average Discount,Átlagos kedvezmény
 DocType: Letter Head,Is Default,Default
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Az anyag adójának értéke
 DocType: Item,Maintain Stock,Fenntartani Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock bejegyzés már létrehozott termelési rendelés
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe valamennyi megjelölés"
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Re Datetime
 DocType: Email Digest,For Company,A Társaságnak
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,Szállítási cím Név
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Számlatükör
 DocType: Material Request,Terms and Conditions Content,Általános szerződési feltételek tartalma
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Elem {0} nem Stock tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Elem {0} nem Stock tétel
 DocType: Maintenance Visit,Unscheduled,Nem tervezett
 DocType: Employee,Owned,Tulaj
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,"Attól függ, fizetés nélküli szabadságon"
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garancia és éves karbantartási
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Munkavállalói beállítások
 ,Batch-Wise Balance History,Szakaszos Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Tennivalók listája
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tennivalók listája
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Ipari tanuló
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatív mennyiség nem megengedett
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Beállítás SMS gateway beállítások
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Az importálás nem sikerült!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Nem címre hozzá még.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nem címre hozzá még.
 DocType: Workstation Working Hour,Workstation Working Hour,Munkaállomás munkaideje
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Elemző
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő JV összeget {2}"
 DocType: Item,Inventory,Leltár
 DocType: Features Setup,"To enable ""Point of Sale"" view","Annak érdekében, hogy "Point of Sale" nézet"
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Fizetés nem lehet üres Kosár
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Fizetés nem lehet üres Kosár
 DocType: Item,Sales Details,Értékesítés részletei
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,A tételek
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Az időpont, amikor a következő számlán kerül előállításra. Úgy keletkezett benyújtania."
 DocType: Item Attribute,Item Attribute,Elem Attribútum
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Kormány
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Elem változatok
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Elem változatok
 DocType: Company,Services,Szolgáltatások
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Összesen ({0})
 DocType: Cost Center,Parent Cost Center,Szülő Cost Center
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Pénzügyi év kezdő dátuma
 DocType: Employee External Work History,Total Experience,Összesen Experience
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Süllyesztés
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding és díjak
 DocType: Material Request Item,Sales Order No,Sales Order No
 DocType: Item Group,Item Group Name,Anyagcsoport neve
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer anyagok gyártása
 DocType: Pricing Rule,For Price List,Ezen árlistán
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,Menetrendek
 DocType: Purchase Invoice Item,Net Amount,Nettó Összege
 DocType: Purchase Order Item Supplied,BOM Detail No,Anyagjegyzék részlet száma
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),További kedvezmény összege (Társaság Currency)
-DocType: Period Closing Voucher,CoA Help,CoA Súgó
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Hiba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Hiba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Kérjük, hozzon létre új fiókot a számlatükör."
 DocType: Maintenance Visit,Maintenance Visit,Karbantartási látogatás
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Vásárló > Vásárlói csoport > Terület
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Beszerzési költség Súgó
 DocType: Event,Tuesday,Kedd
 DocType: Leave Block List,Block Holidays on important days.,Blokk Holidays fontos napokon.
 ,Accounts Receivable Summary,VEVÔKÖVETELÉSEK Összefoglaló
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Elhagyja a {0} típusú már elkülönített Employee {1} időszakra {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Kérjük, állítsa User ID mező alkalmazotti rekordot beállítani Employee szerepe"
 DocType: UOM,UOM Name,Mértékegység neve
 DocType: Top Bar Item,Target,Cél
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,Értékesítő partner célja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Számviteli könyvelése {0} csak akkor lehet elvégezni a pénznem: {1}
 DocType: Pricing Rule,Pricing Rule,Árképzési szabály
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Kivágó
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Anyag Kérelem Megrendelés
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Anyag Kérelem Megrendelés
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Sor # {0}: Visszaküldött pont {1} nem létezik {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankszámlák
 ,Bank Reconciliation Statement,Bank Megbékélés nyilatkozat
 DocType: Address,Lead Name,Célpont neve
 ,POS,Értékesítési hely (POS)
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Nyitva Stock Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Nyitva Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} kell csak egyszer jelenik meg
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nem szabad Tranfer több {0}, mint {1} ellen Megrendelés {2}"
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},A levelek foglalás sikeres {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},A levelek foglalás sikeres {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nincsenek tételek csomag
 DocType: Shipping Rule Condition,From Value,Értéktől
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Összegek nem tükröződik bank
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Követelések cég költségén.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,Kapcsolattartó mobilszáma
 DocType: Production Planning Tool,Select Sales Orders,Válassza ki Vevőmegrendelés
 ,Material Requests for which Supplier Quotations are not created,"Anyag kérelmek, amelyek esetében Szállító idézetek nem jönnek létre"
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Hogy nyomon elemeket használja vonalkód. Ön képes lesz arra, hogy belépjen elemek szállítólevél és Értékesítési számlák beolvasásával vonalkód pont."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark kézbesítettnek
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Tedd Idézet
 DocType: Dependent Task,Dependent Task,Függő Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 sorban {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},"Szabadság típusú {0} nem lehet hosszabb, mint {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 sorban {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},"Szabadság típusú {0} nem lehet hosszabb, mint {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Próbálja Tervezési tevékenység X nappal előre.
 DocType: HR Settings,Stop Birthday Reminders,Megállás Születésnapi emlékeztetők
 DocType: SMS Center,Receiver List,Vevő lista
 DocType: Payment Tool Detail,Payment Amount,Kifizetés összege
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Elfogyasztott
-sites/assets/js/erpnext.min.js +51,{0} View,{0} megtekintése
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} megtekintése
 DocType: Salary Structure Deduction,Salary Structure Deduction,Bérszerkeztet levonása
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Szelektív lézeres szinterezés
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} adta meg többször a konverziós tényező táblázat
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} adta meg többször a konverziós tényező táblázat
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import sikeres!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Költsége Kiadott elemek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,Alapértelmezett fizetendő számla
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","A beállítások Online bevásárlókosár mint a hajózás szabályait, árlistát stb"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Telepítés befejezve
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% számlázott
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reserved Mennyiség
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Mennyiség
 DocType: Party Account,Party Account,Párt Account
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Emberi erőforrások
 DocType: Lead,Upper Income,Felső jövedelmi
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Bevásárló kosár engedélyezése
 DocType: Employee,Permanent Address,Állandó lakcím
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Elem {0} kell lennie a szolgáltatás elemet.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","A kifizetett előleg ellen {0} {1} nem lehet nagyobb, \ mint Mindösszesen {2}"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Kérjük, jelölje ki az elemet kódot"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Csökkentse levonás fizetés nélküli szabadságon (LWP)
 DocType: Territory,Territory Manager,Területi igazgató
+DocType: Delivery Note Item,To Warehouse (Optional),A Warehouse (opcionális)
 DocType: Sales Invoice,Paid Amount (Company Currency),Befizetett összeg (Társaság Currency)
 DocType: Purchase Invoice,Additional Discount,További kedvezmény
 DocType: Selling Settings,Selling Settings,Értékesítés beállításai
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,Súlyozás
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Bányászati
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Gyanta casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Az ügyfélszolgálati csoport létezik azonos nevű kérjük, változtassa meg az Ügyfél nevét vagy nevezze át a Vásárlói csoport"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Kérjük, válassza ki a {0} először."
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Kérjük, válassza ki a {0} először."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Szülő Terület
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,Kötegszám
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Hogy több értékesítési megrendelések ellen ügyfél Megrendelés
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Legfontosabb
 DocType: DocPerm,Delete,Törlés
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variáns
-sites/assets/js/desk.min.js +7971,New {0},Új {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variáns
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Új {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Előtagja a számozás sorozat a tranzakciók
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Megállt érdekében nem lehet törölni. Kidugaszol törölni.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablon"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Megállt érdekében nem lehet törölni. Kidugaszol törölni.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablon"
 DocType: Employee,Leave Encashed?,Hagyja beváltásának módjáról?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Lehetőség A mező kitöltése kötelező
 DocType: Item,Variants,Változatok
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Ország
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Címek
 DocType: Communication,Received,Kapott
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Ellen Naplókönyvelés {0} nem rendelkezik páratlan {1} bejegyzést
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Ellen Naplókönyvelés {0} nem rendelkezik páratlan {1} bejegyzést
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplikált sorozatszám lett beírva ehhez a tételhez: {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Ennek feltétele a szállítási szabály
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,"Elem nem engedjük, hogy a gyártási rendelés."
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,Megszólítás
 DocType: Communication,Rejected,Elutasítva
 DocType: Pricing Rule,Brand,Márka
 DocType: Item,Will also apply for variants,Kell alkalmazni a változatok
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% kiszállítva
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle tételek idején eladó.
 DocType: Sales Order Item,Actual Qty,Aktuális db.
 DocType: Sales Invoice Item,References,Referenciák
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,T
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Nyírás
 DocType: Item,Has Variants,Van-e változatok
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Kattints a ""Tedd Értékesítési számlák"" gombra, hogy egy új Értékesítési számlák."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,"Közötti időszakra, és időszakot tizenöt óra kötelező visszatérő% s"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Csomagolás és címkézés
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nevét az havi megoszlása
 DocType: Sales Person,Parent Sales Person,Szülő Értékesítői
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Kérjük, adja meg alapértelmezett pénzneme a Társaság Mester és globális alapértékeit"
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Ismétlődő számla
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Projektek irányítása
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Projektek irányítása
 DocType: Supplier,Supplier of Goods or Services.,Szállító az áruk vagy szolgáltatások.
 DocType: Budget Detail,Fiscal Year,Pénzügyi év
 DocType: Cost Center,Budget,Költségkeret
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Értékesítés
 DocType: Employee,Salary Information,Bérinformáció
 DocType: Sales Person,Name and Employee ID,Neve és dolgozói azonosító
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
 DocType: Website Item Group,Website Item Group,Weboldal Termék Csoport
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Vámok és adók
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} fizetési bejegyzéseket nem lehet szűrni {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} fizetési bejegyzéseket nem lehet szűrni {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Táblázat a tétel, amely megjelenik a Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Mellékelt Mennyiség
 DocType: Material Request Item,Material Request Item,Anyagigénylés tétel
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Fája Elem Csopor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Nem lehet hivatkozni sor száma nagyobb vagy egyenlő, mint aktuális sor számát erre a Charge típusú"
 ,Item-wise Purchase History,Elem-bölcs Vásárlási előzmények
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Piros
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Kérjük, kattintson a ""Létrehoz Menetrend"", hogy hozza Serial No hozzá jogcím {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Kérjük, kattintson a ""Létrehoz Menetrend"", hogy hozza Serial No hozzá jogcím {0}"
 DocType: Account,Frozen,Zárolt
 ,Open Production Orders,Nyitott gyártási rendelések
 DocType: Installation Note,Installation Time,Telepítési idő
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Idézet Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Elem Csoport nem említett elem mestere jogcím {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Megterhelése figyelembe kell venni a követelések között
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Mivel a termelés Megrendelni lehet ezt az elemet, meg kell egy állomány elemet."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Mivel a termelés Megrendelni lehet ezt az elemet, meg kell egy állomány elemet."
 DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Összefogás
 DocType: Authorization Rule,Above Value,Feletti érték
 ,Pending Amount,Függőben lévő összeg
 DocType: Purchase Invoice Item,Conversion Factor,Konverziós tényező
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Kiszállítva
+DocType: Purchase Order,Delivered,Kiszállítva
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Beállítás bejövő kiszolgáló munkahelyek email id. (Pl jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Jármű száma
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Az időpont, amikor az ismétlődő számlát fognak megállítani"
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Terjesztheti alapuló d
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} típusú legyen ""Fixed Asset"" tételként {1} egy eszköz tétele"
 DocType: HR Settings,HR Settings,Munkaügyi beállítások
 apps/frappe/frappe/config/setup.py +130,Printing,Nyomtatás
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Költségén Követelés jóváhagyására vár. Csak a költség Jóváhagyó frissítheti állapotát.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Költségén Követelés jóváhagyására vár. Csak a költség Jóváhagyó frissítheti állapotát.
 DocType: Purchase Invoice,Additional Discount Amount,További kedvezmény összege
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"A nap (ok) on, amelyre pályázik a szabadság ünnep. Nem kell alkalmazni a szabadság."
-sites/assets/js/desk.min.js +7805,and,és
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,és
 DocType: Leave Block List Allow,Leave Block List Allow,Hagyja Block List engedélyezése
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Rövidített nem lehet üres vagy hely
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,Árajánlat
 DocType: Salary Slip,Total Deduction,Összesen levonása
 DocType: Quotation,Maintenance User,Karbantartás Felhasználó
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Költség Frissítve
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Biztosan meg szeretné kidugaszol
 DocType: Employee,Date of Birth,Születési idő
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Elem {0} már visszatért
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"** Pénzügyi év ** az adott pénzügyi évben. Minden könyvelési tétel, és más jelentős tranzakciókat nyomon elleni ** pénzügyi év **."
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Kövesse nyomon az értékesítési kampányok. Kövesse nyomon az érdeklődők, idézetek, vevői rendelés, stb a kampányok felmérni Return on Investment."
 DocType: Expense Claim,Approver,Jóváhagyó
 ,SO Qty,SO Mennyiség
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock bejegyzések létezéséről ellen raktárban {0}, így nem lehet újra rendelhet, illetve módosíthatja Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock bejegyzések létezéséről ellen raktárban {0}, így nem lehet újra rendelhet, illetve módosíthatja Warehouse"
 DocType: Appraisal,Calculate Total Score,Számolja ki Total Score
 DocType: Supplier Quotation,Manufacturing Manager,Gyártási menedzser
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} még garanciális max {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Osztott szállítólevél csomagokat.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Szállítások
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip öntés
+DocType: Purchase Order,To be delivered to customer,Be kell nyújtani az ügyfél
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Idő Log Status kell benyújtani.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Soros {0} nem tartozik semmilyen Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Beállítása
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Deviza-
 DocType: DocField,Name,Név
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Kérjük, válasszon odaítélt összeg, Számla típusa és számlaszámra adni legalább egy sorban"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Vevői szükséges Elem {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Vevői szükséges Elem {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Összegek nem tükröződik rendszer
 DocType: Purchase Invoice Item,Rate (Company Currency),Érték (a cég pénznemében)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Egyéb
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Állítsa Leállt
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Nem találja a megfelelő tétel. Kérjük, válasszon egy másik érték {0}."
 DocType: POS Profile,Taxes and Charges,Adók és költségek
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A termék vagy szolgáltatás, amelyet vásárolt, eladott vagy tartanak raktáron."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nem lehet kiválasztani a felelős típusú ""On előző sor Összeg"" vagy ""On előző sor Total"" az első sorban"
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,Válassza ki DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Átvarratott
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Kérjük, kattintson a ""Létrehoz Menetrend"", hogy menetrend"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Új költségközpont
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Új költségközpont
 DocType: Bin,Ordered Quantity,Rendelt mennyiség
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Kedvezmény
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} ellen Vevői {1}
+DocType: Purchase Order Item,Reference Document Type,Referencia Dokumentum típus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} ellen Vevői {1}
 DocType: Account,Fixed Asset,Az állóeszköz-
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serialized Inventory
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Inventory
 DocType: Activity Type,Default Billing Rate,Alapértelmezett díjszabás
 DocType: Time Log Batch,Total Billing Amount,Összesen Számlázási összeg
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Követelések Account
 ,Stock Balance,Készlet egyenleg
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Vevői rendelés Fizetési
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Vevői rendelés Fizetési
 DocType: Expense Claim Detail,Expense Claim Detail,Béremelés részlete
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Naplók létre:
 DocType: Item,Weight UOM,Súly mértékegysége
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Hitel figyelembe kell venni a fizetendő
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzív: {0} nem lehet a szülő vagy a gyermek {2}
 DocType: Production Order Operation,Completed Qty,Befejezett Mennyiség
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","{0}, csak betéti számlák köthető másik ellen jóváírás"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Árlista {0} van tiltva
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, csak betéti számlák köthető másik ellen jóváírás"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Árlista {0} van tiltva
 DocType: Manufacturing Settings,Allow Overtime,Hagyjuk Túlóra
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Vevői {0} leáll
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sorozatszám szükséges jogcím {1}. Megadta {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuális Értékelés Rate
 DocType: Item,Customer Item Codes,Vásárlói pont kódok
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Hegesztés
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Új készlet mértékegységre szükség van
 DocType: Quality Inspection,Sample Size,A minta mérete
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Összes példány már kiszámlázott
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Összes példány már kiszámlázott
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Kérem adjon meg egy érvényes 'A Case No. """
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,További költség központok tehető alatt Csoportok de bejegyzéseket lehet tenni ellene nem Csoportok
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,További költség központok tehető alatt Csoportok de bejegyzéseket lehet tenni ellene nem Csoportok
 DocType: Project,External,Külső
 DocType: Features Setup,Item Serial Nos,Anyag-sorozatszámok
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Felhasználók és engedélyek
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Címek és Kapcsolattartók
 DocType: SMS Log,Sender Name,Küldő neve
 DocType: Page,Title,Cím
-sites/assets/js/list.min.js +104,Customize,Testreszabás
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Testreszabás
 DocType: POS Profile,[Select],[Válasszon]
 DocType: SMS Log,Sent To,Elküldve
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Értékesítési számla készítése
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Felhasználhatósági idő
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Utazási
 DocType: Leave Block List,Allow Users,Felhasználók engedélyezése
+DocType: Purchase Order,Customer Mobile No,Vásárlói Mobile Nem
 DocType: Sales Invoice,Recurring,Ismétlődő
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Kövesse nyomon külön bevételek és ráfordítások termék függőlegesek vagy körzetekre.
 DocType: Rename Tool,Rename Tool,Átnevezési eszköz
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Költségek újraszámolása
 DocType: Item Reorder,Item Reorder,Anyag újrarendelés
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transfer anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer anyag
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Adja meg a működését, a működési költségek, és hogy egy egyedi Operation nem a műveleteket."
 DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
 DocType: Naming Series,User must always select,Felhasználó mindig válassza
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,Munkavállaló
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import-mail-tól
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Meghívás Felhasználó
 DocType: Features Setup,After Sale Installations,Miután Eladó létesítmények
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} teljesen számlázott
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} teljesen számlázott
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Az általános szerződési feltételek az értékesítési vagy megvásárolható.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Utalvány által csoportosítva
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,Tömeges email
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Fájl átnevezése
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Rendelési szám szükséges Elem {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mutass Kifizetések
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Meghatározott BOM {0} nem létezik jogcím {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Karbantartási ütemterv {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Karbantartási ütemterv {0} törölni kell lemondása előtt ezt a Vevői rendelés
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Méret
 DocType: Notification Control,Expense Claim Approved,Béremelési igény jóváhagyva
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Gyógyszeripari
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,Részvétel a dátum
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Beállítás bejövő kiszolgáló értékesítési email id. (Pl sales@example.com)
 DocType: Warranty Claim,Raised By,Felvetette
 DocType: Payment Tool,Payment Account,Fizetési számla
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Kérjük, adja Társaság a folytatáshoz"
-sites/assets/js/list.min.js +23,Draft,Vázlat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Kérjük, adja Társaság a folytatáshoz"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Vázlat
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzációs Off
 DocType: Quality Inspection Reading,Accepted,Elfogadva
 DocType: User,Female,Nő
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Szállítási lehetőség címkéi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
 DocType: Newsletter,Test,Teszt
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Mivel már meglévő részvény tranzakciók ezt az elemet, \ nem tudja megváltoztatni az értékeket "Has Serial No", "a kötegelt Nem", "Úgy Stock pont" és "értékelési módszer""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Gyors Naplókönyvelés
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni mértéke, ha BOM említett Against olyan tétel"
 DocType: Employee,Previous Work Experience,Korábbi szakmai tapasztalat
 DocType: Stock Entry,For Quantity,Mert Mennyiség
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Kérjük, adja Tervezett Mennyiség jogcím {0} sorban {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} nem nyújtják be
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Kérelmek tételek.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} nem nyújtják be
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Kérelmek tételek.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Külön termelési érdekében jön létre minden kész a jó elemet.
 DocType: Purchase Invoice,Terms and Conditions1,Általános szerződési feltételek1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Teljes beállítás
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Hírlevél levele
 DocType: Delivery Note,Transporter Name,Fuvarozó neve
 DocType: Contact,Enter department to which this Contact belongs,"Adja egysége, ahova a kapcsolattartónak tartozik"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Összesen Hiány
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Elem vagy raktár sorban {0} nem egyezik Material kérése
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Elem vagy raktár sorban {0} nem egyezik Material kérése
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Mértékegység
 DocType: Fiscal Year,Year End Date,Év végi dátum
 DocType: Task Depends On,Task Depends On,A feladat tőle függ:
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint Csatlakozás dátuma"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"A harmadik fél forgalmazó / kereskedő / bizományos / társult / viszonteladó, aki eladja a vállalatok termékek a jutalék."
 DocType: Customer Group,Has Child Node,Lesz gyerek bejegyzése?
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} ellen Megrendelés {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ellen Megrendelés {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Írja be a statikus url paramétereket itt (Pl. A feladó = ERPNext, username = ERPNext, password = 1234 stb)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} sem aktív pénzügyi évben. További részletekért ellenőrizze {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ez egy példa honlapján automatikusan generált a ERPNext
@@ -2021,11 +2032,9 @@ DocType: Note,Note,Jegyzet
 DocType: Purchase Receipt Item,Recd Quantity,RecD Mennyiség
 DocType: Email Account,Email Ids,E-mail azonosítók
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet még több tétel {0}, mint Sales Rendelési mennyiség {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Beállítás Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Account
 DocType: Tax Rule,Billing City,Számlázási város
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Ez Leave Application jóváhagyására vár. Csak a Leave Jóváhagyó frissítheti állapotát.
 DocType: Global Defaults,Hide Currency Symbol,Pénznem szimbólumának elrejtése
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","pl. bank, készpénz, hitelkártya"
 DocType: Journal Entry,Credit Note,Jóváírási értesítő
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Összesen (db)
 DocType: Installation Note Item,Installed Qty,Telepített Mennyiség
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Elküldve
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Elküldve
 DocType: Salary Structure,Total Earning,Összesen Earning
 DocType: Purchase Receipt,Time at which materials were received,Időpontja anyagok érkezett
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Saját címek
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Szervezet ág
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,vagy
 DocType: Sales Order,Billing Status,Számlázási állapot
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Közműben
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 felett
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 felett
 DocType: Buying Settings,Default Buying Price List,Alapértelmezett Vásárlási árjegyzéke
 ,Download Backups,Letöltés mentések
 DocType: Notification Control,Sales Order Message,Vevői Message
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Válassza ki a munkavállalók
 DocType: Bank Reconciliation,To Date,Dátumig
 DocType: Opportunity,Potential Sales Deal,Potenciális értékesítési Deal
-sites/assets/js/form.min.js +308,Details,Részletek
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Részletek
 DocType: Purchase Invoice,Total Taxes and Charges,Összes adók és költségek
 DocType: Employee,Emergency Contact,Sürgősségi Kapcsolat
 DocType: Item,Quality Parameters,Minőségi paraméterek
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,Kapott Mennyiség
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Szülőelem
 DocType: Account,Account Type,Számla típus
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Karbantartási ütemterv nem keletkezik az összes elem. Kérjük, kattintson a ""Létrehoz Menetrend"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Karbantartási ütemterv nem keletkezik az összes elem. Kérjük, kattintson a ""Létrehoz Menetrend"""
 ,To Produce,Termelni
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","A sorban {0} {1}. Márpedig a {2} jogcímben ráta, sorok {3} is fel kell venni"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Azonosítása a csomag szállítására (nyomtatási)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Összelapulás
 DocType: Account,Income Account,Jövedelem számla
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Öntvény
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Szállítás
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Szállítás
 DocType: Stock Reconciliation Item,Current Qty,Jelenlegi Mennyiség
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lásd az 'Anyagköltség számítás módja' a Költség részben
 DocType: Appraisal Goal,Key Responsibility Area,Felelősségi terület
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Minden címek.
 DocType: Company,Stock Settings,Készlet beállítások
 DocType: User,Bio,Életrajz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,A vevői csoport fa.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Új költségközpont neve
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Új költségközpont neve
 DocType: Leave Control Panel,Leave Control Panel,Hagyja Vezérlőpult
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Nincs alapértelmezett Címsablon találhatók. Kérjük, hozzon létre egy újat a Setup> Nyomtatás és Branding> Címsablon."
 DocType: Appraisal,HR User,HR Felhasználó
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Fizetési eszköz Detail
 ,Sales Browser,Értékesítési Browser
 DocType: Journal Entry,Total Credit,Követelés összesen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Helyi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Helyi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),A hitelek és előlegek (Eszközök)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Adósok
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Nagy
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nem alkalmazottja találta!
 DocType: C-Form Invoice Detail,Territory,Terület
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Kérjük beszélve nincs ellenőrzés szükséges
+DocType: Purchase Order,Customer Address Display,Ügyfél Cím megjelenítése
 DocType: Stock Settings,Default Valuation Method,Alapértelmezett készletérték számítási mód
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polírozás
 DocType: Production Order Operation,Planned Start Time,Tervezett kezdési idő
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Lekötött
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bezár Mérleg és a könyv nyereség vagy veszteség.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Alapértelmezett mértékegysége pont {0} nem módosítható közvetlenül, mert \ már tett néhány tranzakció (k) másik UOM. Ha módosítani alapértelmezett mértékegysége, \ use UOM Cserélje Utility "eszköz keretében Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Adja árfolyam átalakítani egy pénznem egy másik
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,{0} ajánlat törölve
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,{0} ajánlat törölve
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Teljes fennálló összege
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} volt szabadságon lévő {1}. Nem jelölhet részvétel.
 DocType: Sales Partner,Targets,Célok
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"Ez egy gyökér vevőkör, és nem lehet szerkeszteni."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Kérjük, állítsa össze a számlatükör mielőtt elkezdi könyvelési tételek"
 DocType: Purchase Invoice,Ignore Pricing Rule,Figyelmen kívül hagyja árképzési szabály
-sites/assets/js/list.min.js +24,Cancelled,Törölve
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Törölve
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"Dátum-tól a fizetési struktúra nem lehet kisebb, mint Employee Összefogás napja."
 DocType: Employee Education,Graduate,Diplomás
 DocType: Leave Block List,Block Days,Blokk Napok
 DocType: Journal Entry,Excise Entry,Jövedéki Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Figyelmeztetés: Vevői {0} már létezik ellene Ügyfél Megrendelés {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Figyelmeztetés: Vevői {0} már létezik ellene Ügyfél Megrendelés {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,"Stock érkezett, de nem számlá
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttó bér + hátralékot összeg + beváltása Összeg - Total levonása
 DocType: Monthly Distribution,Distribution Name,Nagykereskedelem neve
 DocType: Features Setup,Sales and Purchase,Értékesítés és beszerzés
-DocType: Purchase Order Item,Material Request No,Anyagigénylés száma
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Minőség-ellenőrzési szükséges Elem {0}
+DocType: Supplier Quotation Item,Material Request No,Anyagigénylés száma
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Minőség-ellenőrzési szükséges Elem {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Arány, amely ügyfél deviza átalakul cég bázisvalutaként"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} óta sikeresen megszüntette a listából.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettó ár (Társaság Currency)
-apps/frappe/frappe/templates/base.html +132,Added,Hozzáadott
+apps/frappe/frappe/templates/base.html +134,Added,Hozzáadott
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Kezelése Terület fa.
 DocType: Journal Entry Account,Sales Invoice,Eladási számla
 DocType: Journal Entry Account,Party Balance,Párt Balance
 DocType: Sales Invoice Item,Time Log Batch,Időnapló gyűjtő
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Kérjük, válassza az Apply kedvezmény"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Kérjük, válassza az Apply kedvezmény"
 DocType: Company,Default Receivable Account,Alapértelmezett Receivable Account
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Készítse Bank Belépő a teljes bért fizet a fent kiválasztott kritériumoknak
 DocType: Stock Entry,Material Transfer for Manufacture,Anyag átrakása gyártásához
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Get vonatkozó bejegyzései
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Számviteli könyvelése Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Elem {0} nem létezik
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Elem {0} nem létezik
 DocType: Sales Invoice,Customer Address,Vevő címe
 apps/frappe/frappe/desk/query_report.py +136,Total,Összesen
 DocType: Purchase Invoice,Apply Additional Discount On,Alkalmazza További kedvezmény
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,Minőségvizsgálat
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray képező
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag kért Mennyiség kevesebb, mint Minimális rendelési menny"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Account {0} lefagyott
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Account {0} lefagyott
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Jogi személy / leányvállalat külön számlatükör tartozó Szervezet.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Élelmiszerek, italok és dohány"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL vagy BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Egyszerre csak fizetés ellenében nem számlázott {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Jutalék mértéke nem lehet nagyobb, mint a 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum készletszint
 DocType: Stock Entry,Subcontract,Alvállalkozói
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Kérjük, adja {0} első"
 DocType: Production Planning Tool,Get Items From Sales Orders,Hogy elemeket Vevőmegrendelés
 DocType: Production Order Operation,Actual End Time,Tényleges befejezési időpont
 DocType: Production Planning Tool,Download Materials Required,Anyagszükséglet letöltése
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,Ütemezett
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Kérjük, válasszon pont, ahol "Is Stock tétel" "Nem" és "Van Sales Termék" "Igen", és nincs más termék Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Válassza ki havi megoszlása ​​egyenlőtlen osztja célok hónapok között.
 DocType: Purchase Invoice Item,Valuation Rate,Becsült érték
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Árlista Ki nem választott
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Árlista Ki nem választott
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Elem Row {0}: vásárlási nyugta {1} nem létezik a fent 'Vásárlás bevételek ""tábla"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Employee {0} már jelentkezett {1} között {2} és {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employee {0} már jelentkezett {1} között {2} és {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt kezdési dátuma
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Míg
 DocType: Rename Tool,Rename Log,Átnevezési napló
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Csak az ágakat engedélyezettek a tranzakciós
 DocType: Expense Claim,Expense Approver,Költségén Jóváhagyó
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Vásárlási nyugta mellékelt tételek
-sites/assets/js/erpnext.min.js +48,Pay,Fizet
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Fizet
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Hogy Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS átjáró URL-je
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Rönk fenntartása sms szállítási állapot
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Őrlés
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Zsugorfóliázó
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Függő Tevékenységek
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Függő Tevékenységek
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Megerősített
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Szállító> Szállító Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Kérjük, adja enyhíti a dátumot."
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Ad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Hírlevél publikálók
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Válassza ki Fiscal Year
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Te vagy a Leave Jóváhagyó erre a lemezre. Kérjük, frissítse az ""Állapot"", és mentése"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Újra rendelési szint
 DocType: Attendance,Attendance Date,Jelenléti dátuma
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Fizetés szakítás alapján a kereseti és levonás.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Költség Center meglévő tranzakciók nem lehet átalakítani, hogy csoportban"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Értékcsökkenés
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Szállító (k)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Érvénytelen időszakban
 DocType: Customer,Credit Limit,Credit Limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Tranzakció kiválasztása
 DocType: GL Entry,Voucher No,Bizonylatszám
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Sablo
 DocType: Customer,Address and Contact,Cím és kapcsolattartási
 DocType: Customer,Last Day of the Next Month,Last Day of a következő hónapban
 DocType: Employee,Feedback,Visszajelzés
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Mivel / Referencia dátum meghaladja a megengedett ügyfél hitel nap {0} nap (ok)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Karba. Menetrend
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Mivel / Referencia dátum meghaladja a megengedett ügyfél hitel nap {0} nap (ok)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Karba. Menetrend
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazív vízsugaras megmunkálás
 DocType: Stock Settings,Freeze Stock Entries,Készlet zárolás
 DocType: Website Settings,Website Settings,Weboldal beállítások
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,Kimenő
 DocType: Material Request,Requested For,Igényelt
 DocType: Quotation Item,Against Doctype,Ellen Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Kövesse nyomon ezt a szállítólevél ellen Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root fiók nem törölhető
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root fiók nem törölhető
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mutasd Stock bejegyzések
 ,Is Primary Address,Van Elsődleges cím
 DocType: Production Order,Work-in-Progress Warehouse,Work in progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referencia # {0} dátuma {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referencia # {0} dátuma {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Kezelje címek
 DocType: Pricing Rule,Item Code,Tételkód
 DocType: Production Planning Tool,Create Production Orders,Gyártásrendelés létrehozása
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,Felhasználói megjegyzés
 DocType: Lead,Market Segment,Piaci rész
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,A munkavállaló cégen belüli mozgása
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Zárás (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zárás (Dr)
 DocType: Contact,Passive,Passzív
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} nincs raktáron
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Adó sablon eladási ügyleteket.
 DocType: Sales Invoice,Write Off Outstanding Amount,Írja Off fennálló összeg
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Ellenőrizze, hogy szükség van az automatikus visszatérő számlákat. Benyújtása után minden értékesítési számlát, ismétlődő szakasz lesz látható."
 DocType: Account,Accounts Manager,Fiókkezelõ
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',"A(z) {0} időnaplót be kell ""Küldeni"""
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"A(z) {0} időnaplót be kell ""Küldeni"""
 DocType: Stock Settings,Default Stock UOM,Alapértelmezett mértékegység
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Költségszámítás feltüntetett ár tevékenység típusa (óránként)
 DocType: Production Planning Tool,Create Material Requests,Anyagigénylés létrehozása
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Bank Megbékélés
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get frissítések
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adjunk hozzá néhány mintát bejegyzések
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Hagyja Management
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Hagyja Management
 DocType: Event,Groups,Csoportok
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Számla által csoportosítva
 DocType: Sales Order,Fully Delivered,Teljesen szállítva
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Értékesítési Extrák
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} költségvetés Account {1} ellen Cost Center {2} meg fogja haladni a {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség Figyelembe kell lennie Eszköz / Forrás típusú számla, mivel ez a Stock Megbékélés egy Nyitva Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Megrendelés számát szükséges Elem {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Áthozott szabadnapok száma
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Megrendelés számát szükséges Elem {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"a ""Dátumtól"" a ""Dátumig"" után kell állnia"
 ,Stock Projected Qty,Stock kivetített Mennyiség
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Ügyfél Megrendelés
 DocType: Warranty Claim,From Company,Cégtől
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Érték vagy menny
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Kiskereskedő
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Hitel figyelembe kell egy Mérlegszámla
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Minden beszállító típusok
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Elem kód megadása kötelező, mert pont nincs automatikusan számozott"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Idézet {0} nem type {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Elem kód megadása kötelező, mert pont nincs automatikusan számozott"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Idézet {0} nem type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Karbantartandó eszköz
 DocType: Sales Order,%  Delivered,% kiszállítva
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Folyószámlahitel Account
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Bérlap készítése
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Kidugaszol
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Keressen BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zálogkölcsön
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Döbbenetes termékek
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,Teljesítmény értékelés
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-hab öntés
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Rajz
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dátum megismétlődik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Hagyja jóváhagyóhoz közül kell {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Hagyja jóváhagyóhoz közül kell {0}
 DocType: Hub Settings,Seller Email,Eladó Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Beszerzés teljes költségének (via vásárlást igazoló számlát)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettó összeg (Társaság Currency)
 DocType: BOM Operation,Hour Rate,Órás sebesség
 DocType: Stock Settings,Item Naming By,Elem elnevezés típusa
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Árajánlat
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Egy újabb pont a nevezési határidő {0} azután tette {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Árajánlat
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Egy újabb pont a nevezési határidő {0} azután tette {1}
 DocType: Production Order,Material Transferred for Manufacturing,Anyag átrakva gyártáshoz
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Account {0} nem létezik
 DocType: Purchase Receipt Item,Purchase Order Item No,Megrendelés tétel
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,Minőség-ellenőrzés szükséges
 DocType: Purchase Invoice Item,PR Detail,PR részlete
 DocType: Sales Order,Fully Billed,Teljesen számlázott
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,A készpénz
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Szállítási raktárban szükséges állomány elem {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Szállítási raktárban szükséges állomány elem {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),A bruttó tömeg a csomag. Általában a nettó tömeg + csomagolóanyag súlyát. (Nyomtatási)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"A felhasználók ezzel a szereppel megengedett, hogy a befagyasztott számlák és létrehozza / módosítja könyvelési tételek ellen befagyasztott számlák"
 DocType: Serial No,Is Cancelled,ez törölve
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Saját szállítások
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Saját szállítások
 DocType: Journal Entry,Bill Date,Bill dátuma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Még ha több árképzési szabályok kiemelten, akkor a következő belső prioritások kerülnek alkalmazásra:"
 DocType: Supplier,Supplier Details,Beszállító részletei
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Banki átutalás
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Kérjük, válasszon Bank Account"
 DocType: Newsletter,Create and Send Newsletters,Létrehozása és küldése hírlevelek
-sites/assets/js/report.min.js +107,From Date must be before To Date,"Dátum kell, mielőtt To Date"
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,"Dátum kell, mielőtt To Date"
 DocType: Sales Order,Recurring Order,Ismétlődő rendelés
 DocType: Company,Default Income Account,Alapértelmezett bejövő számla
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Vásárlói csoport / Ügyfélszolgálat
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Készlet mértékegysége
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
 ,Projected,Tervezett
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} nem tartozik Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Megjegyzés: A rendszer nem ellenőrzi túlteljesítés és over-foglalás jogcím {0}, mint a mennyiség vagy összeg 0"
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Megjegyzés: A rendszer nem ellenőrzi túlteljesítés és over-foglalás jogcím {0}, mint a mennyiség vagy összeg 0"
 DocType: Notification Control,Quotation Message,Idézet Message
 DocType: Issue,Opening Date,Kezdési dátum
 DocType: Journal Entry,Remark,Megjegyzés
 DocType: Purchase Receipt Item,Rate and Amount,Érték és mennyiség
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Unalmas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Áthozás értékesítési megrendelésből
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Áthozás értékesítési megrendelésből
 DocType: Blog Category,Parent Website Route,Szülő Weboldal Route
 DocType: Sales Order,Not Billed,Nem számlázott
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Mindkét Raktárnak ugyanahhoz a céghez kell tartoznia
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Nem szerepel partner még.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nem szerepel partner még.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nem aktív
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Számla ellenében postára adás dátuma
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Beszerzési költség utalvány összege
 DocType: Time Log,Batched for Billing,Kötegelt a számlázással
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills által felvetett Szállítók.
 DocType: POS Profile,Write Off Account,Leíró számla
-sites/assets/js/erpnext.min.js +26,Discount Amount,Kedvezmény összege
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Kedvezmény összege
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against vásárlási számla
 DocType: Item,Warranty Period (in days),Garancia hossza (napokban)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,pl. ÁFA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. pont
 DocType: Journal Entry Account,Journal Entry Account,Könyvelési tétel számlaszáma
 DocType: Shopping Cart Settings,Quotation Series,Idézet Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Egy elem létezik azonos nevű ({0}), kérjük, változtassa meg a tételt csoport nevét, vagy nevezze át a tételt"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Egy elem létezik azonos nevű ({0}), kérjük, változtassa meg a tételt csoport nevét, vagy nevezze át a tételt"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Forró fém gázt előállító
 DocType: Sales Order Item,Sales Order Date,Vevői rendelés dátuma
 DocType: Sales Invoice Item,Delivered Qty,Kiszállított mennyiség
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Ügyfél vagy beszállító Részletek
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Célpont tulajdonosa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Warehouse van szükség
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse van szükség
 DocType: Employee,Marital Status,Családi állapot
 DocType: Stock Settings,Auto Material Request,Automata anyagrendelés
 DocType: Time Log,Will be updated when billed.,Frissítésre kerül kiszámlázásra.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Elérhető Batch Mennyiség meg a raktárból
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Jelenlegi BOM és a New BOM nem lehet ugyanazon
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"A nyugdíjazás nagyobbnak kell lennie, mint Csatlakozás dátuma"
 DocType: Sales Invoice,Against Income Account,Elleni jövedelem számla
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,Készlet frissítése
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Szuperfiniselési
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Különböző mértékegysége elemek, az helytelen (Total) Nettó súly értéket. Győződjön meg arról, hogy a nettó tömege egyes tételek ugyanabban UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Kérjük, húzza elemeket szállítólevél"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Kérjük, húzza elemeket szállítólevél"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,A naplóbejegyzések {0} un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Rekord minden kommunikáció típusú e-mail, telefon, chat, látogatás, stb"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Kérjük beszélve Round Off Cost Center Company
 DocType: Purchase Invoice,Terms,Feltételek
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Új létrehozása
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Új létrehozása
 DocType: Buying Settings,Purchase Order Required,Megrendelés Kötelező
 ,Item-wise Sales History,Elem-bölcs értékesítési történelem
 DocType: Expense Claim,Total Sanctioned Amount,Összesen Jóváhagyott összeg
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Fizetés Slip levonása
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Jegyzetek
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Válasszon egy csoportot csomópont először.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Ezen célok közül kell választani: {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,"Töltse ki az űrlapot, és mentse el"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,"Töltse ki az űrlapot, és mentse el"
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Töltse le a jelentést, amely tartalmazza az összes nyersanyagot, a legfrissebb Készlet állapot"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Szembenézni
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Közösségi Fórum
 DocType: Leave Application,Leave Balance Before Application,Hagyja Balance alkalmazása előtt
 DocType: SMS Center,Send SMS,SMS küldése
 DocType: Company,Default Letter Head,Alapértelmezett levélfejléc
 DocType: Time Log,Billable,Számlázható
 DocType: Authorization Rule,This will be used for setting rule in HR module,Ez lesz használva beállítására szabály HR modulban
 DocType: Account,Rate at which this tax is applied,"Arány, amely ezt az adót alkalmaznak"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Újra rendelendő mennyiség
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Újra rendelendő mennyiség
 DocType: Company,Stock Adjustment Account,Stock korrekció számla
 DocType: Journal Entry,Write Off,Leíró
 DocType: Time Log,Operation ID,Operation ID
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Kedvezmény Fields lesz kapható Megrendelés, vásárlási nyugta, vásárlási számla"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nevét az új fiók. Megjegyzés: Kérjük, ne hozzon létre ügyfélszámlák és Szolgáltatók"
 DocType: Report,Report Type,Report Type
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Betöltés
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Betöltés
 DocType: BOM Replace Tool,BOM Replace Tool,Anyagjegyzék cserélő eszköz
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Országonként eltérő címlista sablonok
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},A határidő / referencia dátum nem lehet {0} utáni
+DocType: Sales Order Item,Supplier delivers to Customer,Szállító szállít az Ügyfél
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mutass adókedvezmény-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},A határidő / referencia dátum nem lehet {0} utáni
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Az adatok importálása és exportálása
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Ha bevonják a gyártási tevékenység. Engedélyezi tétel ""gyártják"""
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Számla Könyvelési dátum
 DocType: Sales Invoice,Rounded Total,Kerekített összeg
 DocType: Product Bundle,List items that form the package.,A lista elemei alkotják a csomagot.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Százalékos megoszlás egyenlőnek kell lennie a 100%
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználónak, akik Sales mester menedzser {0} szerepe"
 DocType: Company,Default Cash Account,Alapértelmezett pénzforgalmi számlát
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Cég (nem ügyfél vagy szállító) mestere.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Kérjük, írja be a ""szülés várható időpontja"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Szállítólevelek {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Kérjük, írja be a ""szülés várható időpontja"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Szállítólevelek {0} törölni kell lemondása előtt ezt a Vevői rendelés
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Befizetett összeg + Írja egyszeri összeg nem lehet nagyobb, mint a Grand Total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nem érvényes Batch Number jogcím {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég szabadság mérlege Leave Type {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Menny nem avalable raktárban {1} a {2} {3}. Elérhető Mennyiség: {4}, Transzfer Mennyiség: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3. pont
+DocType: Purchase Order,Customer Contact Email,Vásárlói Email
 DocType: Event,Sunday,Vasárnap
 DocType: Sales Team,Contribution (%),Hozzájárulás (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mert ""Készpénz vagy bankszámláját"" nem volt megadva"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Felelősségek
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Sablon
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Sablon
 DocType: Sales Person,Sales Person Name,Értékesítő neve
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Kérjük, adja atleast 1 számlát a táblázatban"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Felhasználók hozzáadása
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),Tényleges kezdési dátum (via
 DocType: Stock Reconciliation Item,Before reconciliation,Mielőtt megbékélés
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és költségek hozzáadása (a cég pénznemében)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Elem Tax Row {0} kell figyelembe típusú adót vagy bevételként vagy ráfordításként vagy fizetős
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Elem Tax Row {0} kell figyelembe típusú adót vagy bevételként vagy ráfordításként vagy fizetős
 DocType: Sales Order,Partly Billed,Részben számlázott
 DocType: Item,Default BOM,Alapértelmezett BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Teljes fennálló Amt
 DocType: Time Log Batch,Total Hours,Össz óraszám
 DocType: Journal Entry,Printing Settings,Nyomtatási beállítások
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},"Összesen Betéti kell egyeznie az összes Credit. A különbség az, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Összesen Betéti kell egyeznie az összes Credit. A különbség az, {0}"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Elhagyja a {0} típusú már elkülönített Employee {1} for Fiscal Year {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Elem szükséges
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Fém fröccsöntés
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Áthozás fuvarlevélből
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Áthozás fuvarlevélből
 DocType: Time Log,From Time,Időtől
 DocType: Notification Control,Custom Message,Egyedi üzenet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,Egy célpont ezzel az
 DocType: Stock Entry,From BOM,Anyagjegyzékből
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Alapvető
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Részvény tranzakciók előtt {0} befagyasztották
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Kérjük, kattintson a ""Létrehoz Menetrend"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,El kellene megegyezik Dátum fél napra szabadságra
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Kérjük, kattintson a ""Létrehoz Menetrend"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,El kellene megegyezik Dátum fél napra szabadságra
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","pl. kg, egység, sz., m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Hivatkozási szám kötelező, amennyiben megadta Referencia dátum"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Hivatkozási szám kötelező, amennyiben megadta Referencia dátum"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,A belépés dátumának nagyobbnak kell lennie a születési dátumnál
 DocType: Salary Structure,Salary Structure,Bérrendszer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Többszörös Ár szabály létezik azonos kritériumok, kérjük, oldja \ konfliktus elsőbbséget. Ár Szabályok: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Légitársaság
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Kérdés Anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Kérdés Anyag
 DocType: Material Request Item,For Warehouse,Ebbe a raktárba
 DocType: Employee,Offer Date,Ajánlat dátum
 DocType: Hub Settings,Access Token,Access Token
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,Kezdési idő
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ettől és időpontok megadása
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdén
 DocType: Shipping Rule,Calculate Based On,A számítás ezen alapul
+DocType: Delivery Note Item,From Warehouse,Raktárról
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Fúrás
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Flakonfúvó
 DocType: Purchase Taxes and Charges,Valuation and Total,Értékelési és Total
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,Módosított től
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Nyersanyag
 DocType: Leave Application,Follow via Email,Kövesse e-mailben
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Adó összege után kedvezmény összege
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Gyermek fiók létezik erre a számlára. Nem törölheti ezt a fiókot.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Gyermek fiók létezik erre a számlára. Nem törölheti ezt a fiókot.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Vagy target Menny vagy előirányzott összeg kötelező
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Nincs alapértelmezett BOM létezik tétel {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátum első"
-DocType: Leave Allocation,Carry Forward,Átvihető a szabadság
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Nincs alapértelmezett BOM létezik tétel {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátum első"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Nyitva Dátum kell, mielőtt zárónapja"
+DocType: Leave Control Panel,Carry Forward,Átvihető a szabadság
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Költség Center meglévő tranzakciók nem lehet átalakítani főkönyvi
 DocType: Department,Days for which Holidays are blocked for this department.,Napok után Holidays blokkolja ez az osztály.
 ,Produced,Készült
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Összesen (AMT)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
 DocType: Purchase Order,The date on which recurring order will be stop,"Az időpont, amikor az ismétlődő rend lesz megállítani"
 DocType: Quality Inspection,Item Serial No,Anyag-sorozatszám
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} csökkenteni kell {1} ​​vagy növelnie kell overflow tolerancia
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} csökkenteni kell {1} ​​vagy növelnie kell overflow tolerancia
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Összesen Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Óra
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized Elem {0} nem lehet frissíteni \ felhasználásával Stock Megbékélés
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Át az anyagot szállító
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Át az anyagot szállító
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Új Serial No nem lehet Warehouse. Warehouse kell beállítani Stock Entry vagy vásárlási nyugta
 DocType: Lead,Lead Type,Célpont típusa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Hozzon létre Idézet
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Mindezen tételek már kiszámlázott
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Mindezen tételek már kiszámlázott
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Lehet jóvá {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Szállítás feltételei
 DocType: BOM Replace Tool,The new BOM after replacement,"Az anyagjegyzék, amire le lesz cserélve mindenhol"
@@ -2859,7 +2874,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID nincs beállítva
 DocType: Production Order,Planned Start Date,Tervezett kezdési dátum
 DocType: Serial No,Creation Document Type,Creation Document Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Karba. Látogassa
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Karba. Látogassa
 DocType: Leave Type,Is Encash,A behajt
 DocType: Purchase Invoice,Mobile No,Mobiltelefon
 DocType: Payment Tool,Make Journal Entry,Tedd Naplókönyvelés
@@ -2867,7 +2882,7 @@ DocType: Leave Allocation,New Leaves Allocated,Új szabadság lefoglalás
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project-bölcs adatok nem állnak rendelkezésre árajánlat
 DocType: Project,Expected End Date,Várható befejezés dátuma
 DocType: Appraisal Template,Appraisal Template Title,Teljesítmény értékelő sablon címe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Kereskedelmi
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kereskedelmi
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Szülőelem {0} nem lehet Stock pont
 DocType: Cost Center,Distribution Id,Nagykereskedelem azonosító
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Döbbenetes szolgáltatások
@@ -2883,14 +2898,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Érték Képesség {0} kell tartományon belül a {1} {2} a lépésekben {3}
 DocType: Tax Rule,Sales,Értékesítés
 DocType: Stock Entry Detail,Basic Amount,Alapösszege
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Warehouse szükséges Stock tétel {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Kr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse szükséges Stock tétel {0}
+DocType: Leave Allocation,Unused leaves,A fel nem használt levelek
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Kr
 DocType: Customer,Default Receivable Accounts,Default Követelés számlák
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Fűrészelés
 DocType: Tax Rule,Billing State,Számlázási állam
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,Átutalás
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Hozz robbant BOM (beleértve a részegységeket)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hozz robbant BOM (beleértve a részegységeket)
 DocType: Authorization Rule,Applicable To (Employee),Alkalmazandó (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date kötelező
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Növekménye Képesség {0} nem lehet 0
@@ -2906,6 +2922,7 @@ DocType: Company,Retail,Kiskereskedelem
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Vásárlói {0} nem létezik
 DocType: Attendance,Absent,Hiányzik
 DocType: Product Bundle,Product Bundle,Termék Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Sor {0}: Érvénytelen hivatkozás {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zúzó
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vásároljon adók és illetékek Template
 DocType: Upload Attendance,Download Template,Sablon letöltése
@@ -2913,16 +2930,16 @@ DocType: GL Entry,Remarks,Megjegyzések
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nyersanyag tételkód
 DocType: Journal Entry,Write Off Based On,Írja Off alapuló
 DocType: Features Setup,POS View,POS megtekintése
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Telepítés rekordot a Serial No.
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Telepítés rekordot a Serial No.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Folyamatos öntés
-sites/assets/js/erpnext.min.js +10,Please specify a,Kérem adjon meg egy
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Kérem adjon meg egy
 DocType: Offer Letter,Awaiting Response,Várom a választ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Fent
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Hideg méretezés
 DocType: Salary Slip,Earning & Deduction,Kereset és levonás
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Account {0} nem lehet Group
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Régió
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,"Opcionális. Ez a beállítás kell használni, a különböző tranzakciókat."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"Opcionális. Ez a beállítás kell használni, a különböző tranzakciókat."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatív értékelési Rate nem megengedett
 DocType: Holiday List,Weekly Off,Heti Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pl 2012, 2012-13"
@@ -2966,12 +2983,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Domború
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,A párolgási-minta casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Reprezentációs költségek
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Értékesítési számlák {0} törölni kell lemondása előtt ezt a Vevői rendelés
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Életkor
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Értékesítési számlák {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Életkor
 DocType: Time Log,Billing Amount,Számlázási Összeg
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Érvénytelen mennyiséget megadott elem {0}. A mennyiség nagyobb, mint 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,A pályázatokat a szabadság.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Véve a meglévő ügylet nem törölhető
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Véve a meglévő ügylet nem törölhető
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Jogi költségek
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","A hónap napja, amelyen auto érdekében jön létre pl 05, 28 stb"
 DocType: Sales Invoice,Posting Time,Rögzítés ideje
@@ -2980,9 +2997,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Jelölje be, ha azt szeretné, hogy a felhasználó kiválaszthatja a sorozatban mentés előtt. Nem lesz alapértelmezett, ha ellenőrizni."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Egyetlen tétel Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Nyílt értesítések
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Nyílt értesítések
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Közvetlen költségek
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Tényleg azt akarjuk kidugaszol ezt a Material kérése?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Új Vásárló Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Utazási költségek
 DocType: Maintenance Visit,Breakdown,Üzemzavar
@@ -2993,7 +3009,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Mivel a dátum
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Hónolás
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Próbaidő
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Alapértelmezett Warehouse kötelező Stock tétel.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Alapértelmezett Warehouse kötelező Stock tétel.
 DocType: Feed,Full Name,Teljes név
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Mezőnyében
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Kifizetését fizetése a hónap {0} és az év {1}
@@ -3016,7 +3032,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Add sorok beál
 DocType: Buying Settings,Default Supplier Type,Alapértelmezett beszállító típus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Kőfejtés
 DocType: Production Order,Total Operating Cost,Teljes működési költség
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Megjegyzés: Elem {0} többször jelenik meg
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Megjegyzés: Elem {0} többször jelenik meg
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Minden Kapcsolattartó.
 DocType: Newsletter,Test Email Id,Teszt email azonosítója
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Cég rövidítése
@@ -3040,11 +3056,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Idézet
 DocType: Stock Settings,Role Allowed to edit frozen stock,Zárolt készlet szerkesztésének engedélyezése ennek a beosztásnak
 ,Territory Target Variance Item Group-Wise,Terület Cél Variance tétel Group-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Minden vásárlói csoport
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán Pénzváltó rekord nem teremtett {1} {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán Pénzváltó rekord nem teremtett {1} {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Adó Sablon kötelező.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Account {0}: Parent véve {1} nem létezik
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Árlista Rate (Társaság Currency)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',"{0} {1} állapota ""áll '"
 DocType: Account,Temporary,Ideiglenes
 DocType: Address,Preferred Billing Address,Ez legyen a számlázási cím is
 DocType: Monthly Distribution Percentage,Percentage Allocation,Százalékos megoszlás
@@ -3062,13 +3077,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Elem Wise Tax részlete
 DocType: Purchase Order Item,Supplier Quotation,Beszállítói ajánlat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"A szavak lesz látható, ha menteni a stringet."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Vasalás
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} megállt
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} megállt
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
 DocType: Lead,Add to calendar on this date,Hozzáadás a naptárhoz ezen a napon
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Szabályok hozzátéve szállítási költségeket.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Közelgő események
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Közelgő események
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Ügyfél köteles
 DocType: Letter Head,Letter Head,Levél fejléc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Gyors bevitel
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} kötelező Return
 DocType: Purchase Order,To Receive,Kapni
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink szerelés
@@ -3091,25 +3107,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Adni legalább egy raktárban kötelező
 DocType: Serial No,Out of Warranty,Garanciaidőn túl
 DocType: BOM Replace Tool,Replace,Csere
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,"Kérjük, adja alapértelmezett mértékegység"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Kérjük, adja alapértelmezett mértékegység"
 DocType: Purchase Invoice Item,Project Name,Projekt neve
 DocType: Supplier,Mention if non-standard receivable account,"Beszélve, ha nem szabványos követelések számla"
 DocType: Workflow State,Edit,Szerkesztés
 DocType: Journal Entry Account,If Income or Expense,Ha bevételként vagy ráfordításként
 DocType: Features Setup,Item Batch Nos,Anyag kötegszáma
 DocType: Stock Ledger Entry,Stock Value Difference,Stock értékkülönbözet
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Emberi Erőforrás
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Emberi Erőforrás
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Fizetési Megbékélés Fizetés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Adó eszközök
 DocType: BOM Item,BOM No,Anyagjegyzék száma
 DocType: Contact Us Settings,Pincode,PIN-kód
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Naplókönyvelés {0} nem veszik {1} vagy már párba utalvány
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Naplókönyvelés {0} nem veszik {1} vagy már párba utalvány
 DocType: Item,Moving Average,Mozgóátlag
 DocType: BOM Replace Tool,The BOM which will be replaced,"Az anyagjegyzék, ami le lesz cserélve mindenhol"
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM különböznie kell a jelenlegi állomány UOM
 DocType: Account,Debit,Tartozás
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"A levelek kell felosztani többszörösei 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"A levelek kell felosztani többszörösei 0,5"
 DocType: Production Order,Operation Cost,Üzemeltetési költségek
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Töltsd fel látogatottsága a CSV-fájl
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Kiemelkedő Amt
@@ -3117,7 +3133,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Célok
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Rendelni ezt a kérdést, használja a ""hozzárendelése"" gombra az oldalsávon."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[napoknál] régebbi készlet zárolása
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ha két vagy több árképzési szabályok megtalálhatók alapján a fenti feltételeknek, Priority alkalmazzák. Prioritás közötti szám 0-20, míg alapértelmezett érték nulla (üres). A magasabb szám azt jelenti, hogy elsőbbséget, ha több árképzési szabályok azonos feltételek mellett."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Számla ellenében
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Pénzügyi év: {0} nem létezik
 DocType: Currency Exchange,To Currency,A devizaárfolyam-
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Hagyja, hogy a következő felhasználók jóváhagyása Leave alkalmazások blokk nap."
@@ -3146,7 +3161,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ráta
 DocType: Stock Entry Detail,Additional Cost,Járulékos költség
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Üzleti év végén dátuma
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja kiszűrni alapján utalvány No, ha csoportosítva utalvány"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Beszállítói ajánlat készítése
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Beszállítói ajánlat készítése
 DocType: Quality Inspection,Incoming,Bejövő
 DocType: BOM,Materials Required (Exploded),Szükséges anyagok (Robbantott)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Csökkentse Megszerezte a fizetés nélküli szabadságon (LWP)
@@ -3154,10 +3169,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Sor # {0}: Sorszám {1} nem egyezik a {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Alkalmi szabadság
 DocType: Batch,Batch ID,Köteg ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Megjegyzés: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Megjegyzés: {0}
 ,Delivery Note Trends,Szállítólevélen Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ezen a héten összefoglalója
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} kell egy megvásárolt vagy alvállalkozásba tétel sorában {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} kell egy megvásárolt vagy alvállalkozásba tétel sorában {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Fiók: {0} csak akkor lehet frissíteni keresztül részvény tranzakciók
 DocType: GL Entry,Party,Fél
 DocType: Sales Order,Delivery Date,Szállítási dátum
@@ -3170,7 +3185,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,D
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Átlagos vásárlási ráta
 DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
 DocType: Employee,History In Company,Előzmények a cégnél
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Hírlevelek
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Hírlevelek
 DocType: Address,Shipping,Szállítás
 DocType: Stock Ledger Entry,Stock Ledger Entry,Készlet könyvelés tétele
 DocType: Department,Leave Block List,Hagyja Block List
@@ -3189,7 +3204,7 @@ DocType: Account,Auditor,Könyvvizsgáló
 DocType: Purchase Order,End date of current order's period,A befejezés dátuma az aktuális rendelés időszaka
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Tedd Ajánlatot Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Visszatérés
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Alapértelmezett mértékegysége Variant meg kell egyeznie a Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Alapértelmezett mértékegysége Variant meg kell egyeznie a Template
 DocType: DocField,Fold,Fold
 DocType: Production Order Operation,Production Order Operation,Gyártási rendelés Operation
 DocType: Pricing Rule,Disable,Tiltva
@@ -3221,7 +3236,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Jelentések
 DocType: SMS Settings,Enter url parameter for receiver nos,Adja url paraméter vevő nos
 DocType: Sales Invoice,Paid Amount,Fizetett összeg
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',"Záró Account {0} típusú legyen ""Felelősség"""
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Záró Account {0} típusú legyen ""Felelősség"""
 ,Available Stock for Packing Items,Elérhető készlet a csomagoláshoz
 DocType: Item Variant,Item Variant,Elem Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Ha ezt Címsablon alapértelmezett, mivel nincs más alapértelmezett"
@@ -3229,7 +3244,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,A szűrő ügyfélen alapul
 DocType: Payment Tool Detail,Against Voucher No,Ellen betétlapjának
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget tétel {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget tétel {0}"
 DocType: Employee External Work History,Employee External Work History,A munkavállaló korábbi munkahelyei
 DocType: Tax Rule,Purchase,Vásárlás
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Mennyiség
@@ -3266,28 +3281,29 @@ Note: BOM = Bill of Materials","Összesített csoport ** ** elemek egy másik **
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serial No kötelező tétel {0}
 DocType: Item Variant Attribute,Attribute,Tulajdonság
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Kérem adjon meg / a tartomány
-sites/assets/js/desk.min.js +7652,Created By,Létrehozta
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Létrehozta
 DocType: Serial No,Under AMC,ÉKSz időn belül
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Elem értékelési kamatlábat újraszámolják tekintve landolt költsége utalvány összegét
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Alapértelmezett beállítások eladási tranzakciókat.
 DocType: BOM Replace Tool,Current BOM,Aktuális anyagjegyzék (mit)
-sites/assets/js/erpnext.min.js +8,Add Serial No,Add Serial No
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Add Serial No
 DocType: Production Order,Warehouses,Raktárak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Nyomtatás és álló
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Csoport Node
 DocType: Payment Reconciliation,Minimum Amount,Minimális összeg
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Késztermék frissítése
 DocType: Workstation,per hour,óránként
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},{0} sorszám már használva van itt: {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},{0} sorszám már használva van itt: {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Véve a raktárban (Perpetual Inventory) jön létre e számla.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Raktár nem lehet törölni a készletek főkönyvi bejegyzés létezik erre a raktárban.
 DocType: Company,Distribution,Nagykereskedelem
-sites/assets/js/erpnext.min.js +50,Amount Paid,Kifizetett Összeg
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Kifizetett Összeg
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projekt menedzser
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,A(z) {0} tételre max. {1}% engedmény adható
 DocType: Customer,Default Taxes and Charges,Alapértelmezett adók és illetékek
 DocType: Account,Receivable,Követelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Sor # {0}: nem szabad megváltoztatni szállító Megrendelés már létezik
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Szerepet, amely lehetővé tette, hogy nyújtson be tranzakciók, amelyek meghaladják hitel határértékeket."
 DocType: Sales Invoice,Supplier Reference,Beszállító ajánlása
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ha be van jelölve, BOM a részegység napirendi pontokat a szerzés nyersanyag. Ellenkező esetben minden részegység elemek fogják kezelni, mint a nyersanyag."
@@ -3324,8 +3340,8 @@ DocType: Email Digest,Add/Remove Recipients,Hozzáadása / eltávolítása címz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},A tranzakció nem megengedett ellen leállította a termelést Megrendelni {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Beállítani a költségvetési évben alapértelmezettként, kattintson a ""Beállítás alapértelmezettként"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Beállítás bejövő kiszolgáló támogatási email id. (Pl support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Hiány Mennyiség
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Hiány Mennyiség
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
 DocType: Salary Slip,Salary Slip,Bérlap
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Palástcsiszoló
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Időpontig"" szükséges"
@@ -3338,6 +3354,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ha bármelyik ellenőrzött tranzakciók ""Beküldő"", egy e-mailt pop-up automatikusan nyílik, hogy küldjön egy e-mailt a kapcsolódó ""Kapcsolat"" hogy ezen ügyletben az ügylet mellékletként. A felhasználó lehet, hogy nem küld e-mailt."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globális beállítások
 DocType: Employee Education,Employee Education,Munkavállaló képzése
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Erre azért van szükség, hogy hozza Termék részletek."
 DocType: Salary Slip,Net Pay,Nettó fizetés
 DocType: Account,Account,Számla
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} már beérkezett
@@ -3370,7 +3387,7 @@ DocType: BOM,Manufacturing User,Gyártás Felhasználó
 DocType: Purchase Order,Raw Materials Supplied,Szállított alapanyagok
 DocType: Purchase Invoice,Recurring Print Format,Ismétlődő Print Format
 DocType: Communication,Series,Sorszám
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,A Várható szállítás dátuma nem lehet korábbi mint a beszerzési rendelés dátuma
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,A Várható szállítás dátuma nem lehet korábbi mint a beszerzési rendelés dátuma
 DocType: Appraisal,Appraisal Template,Teljesítmény értékelő sablon
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Elem osztályozás
@@ -3415,6 +3432,7 @@ DocType: HR Settings,Payroll Settings,Bérszámfejtés Beállítások
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Egyezik összeköttetésben nem álló számlákat és a kifizetéseket.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Place Order
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nem lehet egy szülő költséghely
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Válasszon márkát ...
 DocType: Sales Invoice,C-Form Applicable,C-formában idéztük
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Működési idő nagyobbnak kell lennie, mint 0 Operation {0}"
 DocType: Supplier,Address and Contacts,Cím és Kapcsolatok
@@ -3425,7 +3443,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Kiemelkedő utalványok
 DocType: Warranty Claim,Resolved By,Megoldotta
 DocType: Appraisal,Start Date,Kezdés dátuma
-sites/assets/js/desk.min.js +7629,Value,Érték
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Érték
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Osztja levelek időszakra.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Kattintson ide, hogy ellenőrizze"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Account {0}: Nem rendelhet magának szülői fiók
@@ -3441,14 +3459,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox hozzáférés engedélyezve
 DocType: Dropbox Backup,Weekly,Heti
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Pl. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Kaphat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Kaphat
 DocType: Maintenance Visit,Fully Completed,Teljesen kész
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kész
 DocType: Employee,Educational Qualification,Iskolai végzettség
 DocType: Workstation,Operating Costs,A működési költségek
 DocType: Employee Leave Approver,Employee Leave Approver,Munkavállalói Leave Jóváhagyó
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} sikeresen hozzáadva a hírlevél listán.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Egy Reorder bejegyzés már létezik erre a raktárban {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Egy Reorder bejegyzés már létezik erre a raktárban {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nem jelenthetjük, mint elveszett, mert Idézet történt."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronsugaras megmunkálás
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Vásárlási mester menedzser
@@ -3461,7 +3479,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Add / Edit árak
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Költséghelyek listája
 ,Requested Items To Be Ordered,A kért lapok kell megrendelni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Saját rendelések
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Saját rendelések
 DocType: Price List,Price List Name,Árlista neve
 DocType: Time Log,For Manufacturing,For Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Az összesítések
@@ -3472,7 +3490,7 @@ DocType: Account,Income,Jövedelem
 DocType: Industry Type,Industry Type,Iparág
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Valami hiba történt!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Figyelmeztetés: Hagyjon kérelem tartalmazza a következő blokk húsz óra
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Értékesítési számlák {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Értékesítési számlák {0} már benyújtott
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Teljesítési dátum
 DocType: Purchase Invoice Item,Amount (Company Currency),Összeg (Társaság Currency)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die Casting
@@ -3486,10 +3504,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Év
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Kérjük, frissítsd SMS beállítások"
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,A(z) {0} időnapló már számlázva van
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,A(z) {0} időnapló már számlázva van
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Fedezetlen hitelek
 DocType: Cost Center,Cost Center Name,Költségközpont neve
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Elem {0} Serial No {1} már telepítve
 DocType: Maintenance Schedule Detail,Scheduled Date,Ütemezett dátum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Teljes befizetett Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Üzenetek nagyobb, mint 160 karakter kell bontani több üzenetet"
@@ -3497,10 +3514,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Beérkezett és befogadott
 ,Serial No Service Contract Expiry,Sorozatszám karbantartási szerződés lejárati ideje
 DocType: Item,Unit of Measure Conversion,Mértékegység átváltás
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Nem változtatható meg a munkavállaló
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Egy bejegyzésben nem lehet egyszerre tartozás és követelés is.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Egy bejegyzésben nem lehet egyszerre tartozás és követelés is.
 DocType: Naming Series,Help HTML,Súgó HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Összesen weightage kijelölt kell 100%. Ez {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Engedmény a túl- {0} keresztbe jogcím {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Engedmény a túl- {0} keresztbe jogcím {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Teljes név vagy szervezet, amely ezt a címet tartozik."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ön Szállítók
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nem lehet beállítani elveszett Sales elrendelése esetén.
@@ -3511,10 +3528,11 @@ DocType: Lead,Converted,Átalakított
 DocType: Item,Has Serial No,Lesz sorozatszáma?
 DocType: Employee,Date of Issue,Probléma dátuma
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A {0} az {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Sor # {0}: Állítsa Szállító jogcím {1}
 DocType: Issue,Content Type,Tartalom típusa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Számítógép
 DocType: Item,List this Item in multiple groups on the website.,Sorolja ezt a tárgyat több csoportban a honlapon.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze Több pénznem opciót, hogy számláikat más pénznemben"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze Több pénznem opciót, hogy számláikat más pénznemben"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Cikk: {0} nem létezik a rendszerben
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Ön nem jogosult a beállított értéket Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Nem egyeztetett bejegyzés
@@ -3525,14 +3543,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Raktárba
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Account {0} adta meg többször költségvetési évben {1}
 ,Average Commission Rate,Átlagos jutalék mértéke
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Jelenlétit nem lehet megjelölni a jövőbeli időpontokban
 DocType: Pricing Rule,Pricing Rule Help,Árképzési szabály Súgó
 DocType: Purchase Taxes and Charges,Account Head,Számla fejléc
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Frissítse többletköltségek kiszámítására landolt bekerülési
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektromos
 DocType: Stock Entry,Total Value Difference (Out - In),Összesen értékkülönbözet ​​(Out - A)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Sor {0}: árfolyam kötelező
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Sor {0}: árfolyam kötelező
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Felhasználói azonosító nem állította be az Employee {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Kikalapálás
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Re jótállási igény
@@ -3546,15 +3564,17 @@ DocType: Buying Settings,Naming Series,Sorszámozási csoport
 DocType: Leave Block List,Leave Block List Name,Hagyja Block List név
 DocType: User,Enabled,Engedélyezve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Eszközök
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Szeretné benyújtani minden fizetés Slip a hónapban {0} és az év {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Szeretné benyújtani minden fizetés Slip a hónapban {0} és az év {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import előfizetők
 DocType: Target Detail,Target Qty,Cél menny.
 DocType: Attendance,Present,Jelen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Szállítólevélen {0} nem kell benyújtani
 DocType: Notification Control,Sales Invoice Message,Értékesítési számlák Message
 DocType: Authorization Rule,Based On,Alapuló
-,Ordered Qty,Rendelt menny.
+DocType: Sales Order Item,Ordered Qty,Rendelt menny.
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Elem {0} van tiltva
 DocType: Stock Settings,Stock Frozen Upto,Készlet zárolása eddig
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Közötti időszakra, és időszakról kilenc óra kötelező visszatérő {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt feladatok és tevékenységek.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Bérlap generálása
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nem érvényes e-mail id
@@ -3593,7 +3613,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Feltöltés Nézőszám
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mennyiség van szükség
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing tartomány 2
-DocType: Journal Entry Account,Amount,Összeg
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Összeg
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Szegecselő
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Anyagjegyzék cserélve
 ,Sales Analytics,Értékesítési analítika
@@ -3620,7 +3640,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Várható időpontja nem lehet korábbi Material igénylés dátuma
 DocType: Contact Us Settings,City,Város
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrahangos megmunkálás
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Hiba: Nem érvényes id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Hiba: Nem érvényes id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Elem {0} kell lennie Sales tétel
 DocType: Naming Series,Update Series Number,Sorszám frissítése
 DocType: Account,Equity,Méltányosság
@@ -3635,7 +3655,7 @@ DocType: Purchase Taxes and Charges,Actual,Tényleges
 DocType: Authorization Rule,Customerwise Discount,Customerwise Kedvezmény
 DocType: Purchase Invoice,Against Expense Account,Ellen áfás számlát
 DocType: Production Order,Production Order,Gyártásrendelés
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
 DocType: Quotation Item,Against Docname,Ellen Docname
 DocType: SMS Center,All Employee (Active),Minden dolgozó (Aktív)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Tekintse meg most
@@ -3643,14 +3663,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Nyersanyagköltsége
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Adja tételek és tervezett Mennyiség amelynek meg szeretné emelni a gyártási megrendeléseket, vagy töltse le a nyersanyagok elemzésre."
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt diagram
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt diagram
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Részidős
 DocType: Employee,Applicable Holiday List,Alkalmazható Nyaralás listája
 DocType: Employee,Cheque,Csekk
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sorozat Frissítve
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Report Type kötelező
 DocType: Item,Serial Number Series,Sorozatszám sorozat
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Warehouse kötelező Stock tétel {0} sorban {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse kötelező Stock tétel {0} sorban {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Kis- és nagykereskedelem
 DocType: Issue,First Responded On,Első válasz időpontja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kereszt felsorolása Elem több csoportban
@@ -3665,7 +3685,7 @@ DocType: Attendance,Attendance,Jelenléti
 DocType: Page,No,Nem
 DocType: BOM,Materials,Anyagok
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ha nincs bejelölve, akkor a lista meg kell adni, hogy minden egyes részleg, ahol kell alkalmazni."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Postára adás dátuma és a kiküldetés ideje kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Postára adás dátuma és a kiküldetés ideje kötelező
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Adó sablont vásárol tranzakciókat.
 ,Item Prices,Elem árak
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,A szavak lesz látható mentése után a megrendelés.
@@ -3685,9 +3705,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Igazgatási költségek
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Tanácsadó
 DocType: Customer Group,Parent Customer Group,Szülő Vásárlói csoport
-sites/assets/js/erpnext.min.js +50,Change,Változás
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Változás
 DocType: Purchase Invoice,Contact Email,Kapcsolattartó e-mailcíme
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Megrendelés {0} 'áll'
 DocType: Appraisal Goal,Score Earned,Pontszám Szerzett
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","pl. ""Cégem Kft."""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Felmondási idő
@@ -3697,12 +3716,13 @@ DocType: Packing Slip,Gross Weight UOM,Bruttó tömeg mértékegysége
 DocType: Email Digest,Receivables / Payables,Követelések / Kötelezettségek
 DocType: Delivery Note Item,Against Sales Invoice,Ellen Értékesítési számlák
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Bélyegzés
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Hitelszámla
 DocType: Landed Cost Item,Landed Cost Item,Beszerzési költség tétel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mutasd a nulla értékeket
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,"Mennyiség pont után kapott gyártási / visszacsomagolásánál a megadott alapanyagok mennyiségét,"
 DocType: Payment Reconciliation,Receivable / Payable Account,Követelések / Account
 DocType: Delivery Note Item,Against Sales Order Item,Ellen Vevői Elem
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Kérjük, adja Jellemző értéke az attribútum {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Kérjük, adja Jellemző értéke az attribútum {0}"
 DocType: Item,Default Warehouse,Alapértelmezett raktár
 DocType: Task,Actual End Date (via Time Logs),Tényleges End Date (via Idő Napló)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Költségvetést nem lehet rendelni ellen Group Account {0}
@@ -3716,7 +3736,7 @@ DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Összes pontszám (5–ből)
 DocType: Contact Us Settings,State,Állapot
 DocType: Batch,Batch,Köteg
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Egyensúly
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Egyensúly
 DocType: Project,Total Expense Claim (via Expense Claims),Teljes Költség Követelés (via költségtérítési igényeket)
 DocType: User,Gender,Neme
 DocType: Journal Entry,Debit Note,Terhelési értesítő
@@ -3732,9 +3752,8 @@ DocType: Lead,Blog Subscriber,Blog Előfizető
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Készítse szabályok korlátozzák ügyletek alapján értékek.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ha be van jelölve, a Total sem. munkanapok tartalmazza ünnepek, és ez csökkenti az értékét Fizetés Per Day"
 DocType: Purchase Invoice,Total Advance,Összesen Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Kidugaszol Material kérése
 DocType: Workflow State,User,Használó
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Feldolgozás bérszámfejtés
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Feldolgozás bérszámfejtés
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,A hitel összege
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Beállítás Elveszett
@@ -3742,7 +3761,7 @@ DocType: Customer,Credit Days Based On,"Hitel napokon, attól függően"
 DocType: Tax Rule,Tax Rule,Adójogszabály-
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Fenntartani azonos ütemben Egész értékesítési ciklus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Tervezze idő naplók kívül Workstation munkaidő.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} már benyújtott
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} már benyújtott
 ,Items To Be Requested,Tételek kell kérni
 DocType: Purchase Order,Get Last Purchase Rate,Kap Utolsó Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Díjszabás alapján tevékenység típusa (óránként)
@@ -3751,6 +3770,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Cég E-mail ID nem található, így a levél nem ment"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),A vagyon (eszközök)
 DocType: Production Planning Tool,Filter based on item,A szűrő cikken alapul
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Betéti Számla
 DocType: Fiscal Year,Year Start Date,Év Start Date
 DocType: Attendance,Employee Name,Munkavállalói név
 DocType: Sales Invoice,Rounded Total (Company Currency),Kerekített összeg (a cég pénznemében)
@@ -3762,14 +3782,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Kivágó
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Munkavállalói juttatások
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiséget kell egyezniük a mennyiséget tétel {0} sorban {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiséget kell egyezniük a mennyiséget tétel {0} sorban {1}
 DocType: Production Order,Manufactured Qty,Gyártott menny.
 DocType: Purchase Receipt Item,Accepted Quantity,Elfogadott mennyiség
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nem létezik
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bills emelte az ügyfelek számára.
 DocType: DocField,Default,Alapértelmezett
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt azonosító
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} előfizetők hozzá
 DocType: Maintenance Schedule,Schedule,Ütemezés
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Adjuk költségvetés erre a költséghely. Beállításához költségvetésű akció, lásd a "Társaság List""
@@ -3777,7 +3797,7 @@ DocType: Account,Parent Account,Szülő Account
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Kerékagy
 DocType: GL Entry,Voucher Type,Bizonylat típusa
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,"Árlista nem található, vagy a fogyatékkal"
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,"Árlista nem található, vagy a fogyatékkal"
 DocType: Expense Claim,Approved,Jóváhagyott
 DocType: Pricing Rule,Price,Árazás
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Munkavállalói megkönnyebbült {0} kell beállítani -Bal-
@@ -3786,23 +3806,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Oktatás
 DocType: Selling Settings,Campaign Naming By,Kampány Elnevezése a
 DocType: Employee,Current Address Is,Jelenlegi cím
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Választható. Megadja cég alapértelmezett pénznem, ha nincs megadva."
 DocType: Address,Office,Iroda
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Általános jelentések
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Számviteli naplóbejegyzések.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Sor {0}: Party / fiók nem egyezik {1} / {2} a {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Elérhető Mennyiség a raktárról
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Sor {0}: Party / fiók nem egyezik {1} / {2} a {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Hogy hozzon létre egy adószámlára
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Kérjük, adja áfás számlát"
 DocType: Account,Stock,Készlet
 DocType: Employee,Current Address,Jelenlegi cím
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ha az elem egy változata egy másik elemet, majd leírás, kép, árképzés, adók stb lesz állítva a sablont Ha kifejezetten nincs"
 DocType: Serial No,Purchase / Manufacture Details,Vásárlás / gyártása Részletek
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch Inventory
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventory
 DocType: Employee,Contract End Date,A szerződés End Date
 DocType: Sales Order,Track this Sales Order against any Project,Kövesse nyomon ezt a Vevői ellen Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull megrendelések (folyamatban szállítani) alapján a fenti kritériumok
 DocType: DocShare,Document Type,Dokumentum típusa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,A beszállító Idézet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,A beszállító Idézet
 DocType: Deduction Type,Deduction Type,Levonás típusa
 DocType: Attendance,Half Day,Félnapos
 DocType: Pricing Rule,Min Qty,Min. menny.
@@ -3813,20 +3835,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Mert Mennyiség (gyártott db) kötelező
 DocType: Stock Entry,Default Target Warehouse,Alapértelmezett cél raktár
 DocType: Purchase Invoice,Net Total (Company Currency),Nettó összesen (a cég pénznemében)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party típusa és fél csak akkor alkalmazható elleni követelések / fiók
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party típusa és fél csak akkor alkalmazható elleni követelések / fiók
 DocType: Notification Control,Purchase Receipt Message,Vásárlási nyugta Message
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Összes elkülönített levelek több mint időszakban
 DocType: Production Order,Actual Start Date,Tényleges kezdési dátum
 DocType: Sales Order,% of materials delivered against this Sales Order,% Anyagokat szállított ellen Vevői
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Record elem mozgását.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Record elem mozgását.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Hírlevél előfizető
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Csaplyukvéső
 DocType: Email Account,Service,Szolgáltatás
 DocType: Hub Settings,Hub Settings,Hub Beállítások
 DocType: Project,Gross Margin %,A bruttó árrés %
 DocType: BOM,With Operations,Műveletek is
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént készpénzzel {0} {1} cég. Kérjük, válasszon járó vagy fizetendő számla valuta {0}."
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént készpénzzel {0} {1} cég. Kérjük, válasszon járó vagy fizetendő számla valuta {0}."
 ,Monthly Salary Register,Havi fizetés Regisztráció
-apps/frappe/frappe/website/template.py +123,Next,Következő
+apps/frappe/frappe/website/template.py +140,Next,Következő
 DocType: Warranty Claim,If different than customer address,"Ha más, mint megrendelő címét"
 DocType: BOM Operation,BOM Operation,BOM Operation
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolírozás
@@ -3857,6 +3880,7 @@ DocType: Purchase Invoice,Next Date,Következő dátum
 DocType: Employee Education,Major/Optional Subjects,Fő / választható témák
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Kérjük, adja adók és illetékek"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Megmunkálás
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Itt tart fenn a családi részleteket, mint a neve és foglalkozása szülő, házastárs és a gyermekek"
 DocType: Hub Settings,Seller Name,Értékesítő neve
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Levont adók és költségek (a cég pénznemében)
@@ -3883,29 +3907,29 @@ DocType: Purchase Order,To Receive and Bill,Fogadására és Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Tervező
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Általános szerződési feltételek sablon
 DocType: Serial No,Delivery Details,Szállítási adatok
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatikusan létrehozza Anyag kérése esetén mennyiséget megadott szint alá esik
 ,Item-wise Purchase Register,Elem-bölcs vásárlása Regisztráció
 DocType: Batch,Expiry Date,Lejárat dátuma
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Beállításához újrarendezésből szinten elemet kell a vásárlást pont vagy a gyártási tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Beállításához újrarendezésből szinten elemet kell a vásárlást pont vagy a gyártási tétel
 ,Supplier Addresses and Contacts,Szállító Címek és Kapcsolatok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Kérjük, válasszon Kategória első"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektek.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nem mutatnak szimbólum, mint $$ etc mellett valuták."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Fél Nap)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Fél Nap)
 DocType: Supplier,Credit Days,Credit Napok
 DocType: Leave Type,Is Carry Forward,Van átviszi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Elemek áthozása Anyagjegyzékből
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Elemek áthozása Anyagjegyzékből
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Átfutási idő napokban
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Darabjegyzékben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party típusa és fél köteles a követelések / fiók {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party típusa és fél köteles a követelések / fiók {1}
 DocType: Dropbox Backup,Send Notifications To,Értesítést küld
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref dátuma
 DocType: Employee,Reason for Leaving,Kilépés indoka
 DocType: Expense Claim Detail,Sanctioned Amount,Szentesített Összeg
 DocType: GL Entry,Is Opening,Nyit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Account {0} nem létezik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Account {0} nem létezik
 DocType: Account,Cash,Készpénz
 DocType: Employee,Short biography for website and other publications.,Rövid életrajz honlap és egyéb kiadványok.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Kérjük, hozzon létre bérszerkeztet munkavállalói {0}"
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 75a484d5d4..bb03017634 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Modus Gaji
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Pilih Distribusi Bulanan, jika Anda ingin melacak berdasarkan musim."
 DocType: Employee,Divorced,Bercerai
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Peringatan: Sama item telah memasuki beberapa kali.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Peringatan: Sama item telah memasuki beberapa kali.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Item yang sudah disinkronkan
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Izinkan Barang yang akan ditambahkan beberapa kali dalam suatu transaksi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Kunjungan {0} sebelum membatalkan Garansi Klaim ini
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Pemadatan ditambah sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Mata Uang diperlukan untuk Daftar Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dihitung dalam transaksi.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Dari Material Permintaan
+DocType: Purchase Order,Customer Contact,Kontak Pelanggan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Dari Material Permintaan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Pemohon Job
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Tidak ada lagi hasil.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Nama nasabah
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Semua data berkaitan dengan ekspor seperti mata uang, nilai tukar, total ekspor, nilai total ekspor dll. terdapat di Nota Pengiriman, POS, Penawaran Quotation, Fatkur Penjualan, Order Penjualan, dll."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kelompok) terhadap yang Entri Akuntansi dibuat dan saldo dipertahankan.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Posisi untuk {0} tidak bisa kurang dari nol ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Posisi untuk {0} tidak bisa kurang dari nol ({1})
 DocType: Manufacturing Settings,Default 10 mins,Bawaan 10 menit
 DocType: Leave Type,Leave Type Name,Tinggalkan Type Nama
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seri Diperbarui Berhasil
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Multiple Item harga.
 DocType: SMS Center,All Supplier Contact,Kontak semua pemasok
 DocType: Quality Inspection Reading,Parameter,{0}Para{/0}{1}me{/1}{0}ter{/0}
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Diharapkan Tanggal Berakhir tidak bisa kurang dari yang diharapkan Tanggal Mulai
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Apakah benar-benar ingin unstop pesanan produksi:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tingkat harus sama dengan {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Tinggalkan Aplikasi Baru
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Tinggalkan Aplikasi Baru
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1.5. Untuk menjaga pelanggan bijaksana kode barang dan membuat mereka dicari berdasarkan penggunaan kode mereka pilihan ini
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Rekening Pembayaran
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Tampilkan Vari
 DocType: Sales Invoice Item,Quantity,Kuantitas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredit (Kewajiban)
 DocType: Employee Education,Year of Passing,Tahun Passing
-sites/assets/js/erpnext.min.js +27,In Stock,Dalam Persediaan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan Orde Penjualan
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Dalam Persediaan
 DocType: Designation,Designation,Penunjukan
 DocType: Production Plan Item,Production Plan Item,Rencana Produksi Barang
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Pengguna {0} sudah ditugaskan untuk Karyawan {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Membuat baru Profil POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Perawatan Kesehatan
 DocType: Purchase Invoice,Monthly,Bulanan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faktur
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Keterlambatan pembayaran (Hari)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktur
 DocType: Maintenance Schedule Item,Periodicity,Masa haid
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Alamat Email
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Pertahanan
 DocType: Company,Abbr,Singkatan
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Baris {0}: {1} {2} tidak cocok dengan {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Baris {0}: {1} {2} tidak cocok dengan {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Kendaraan yang
-sites/assets/js/erpnext.min.js +55,Please select Price List,Silakan pilih Daftar Harga
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Silakan pilih Daftar Harga
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Woodworking
 DocType: Production Order Operation,Work In Progress,Bekerja In Progress
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Pencetakan 3D
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Induk Detil docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Membuka untuk Job.
 DocType: Item Attribute,Increment,Kenaikan
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Pilih Gudang ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Periklanan
 DocType: Employee,Married,Belum Menikah
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
 DocType: Payment Reconciliation,Reconcile,Mendamaikan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Toko bahan makanan
 DocType: Quality Inspection Reading,Reading 1,Membaca 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Membuat Bank Masuk
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Membuat Bank Masuk
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Dana pensiun
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Gudang adalah wajib jika jenis account adalah Gudang
 DocType: SMS Center,All Sales Person,Semua Salesmen
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Menulis Off Biaya Pusat
 DocType: Warehouse,Warehouse Detail,Detil Gudang 
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Batas kredit telah menyeberang untuk pelanggan {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Jenis pajak
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Anda tidak diizinkan untuk menambah atau memperbarui entri sebelum {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Anda tidak diizinkan untuk menambah atau memperbarui entri sebelum {0}
 DocType: Item,Item Image (if not slideshow),Barang Gambar (jika tidak slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Sebuah Pelanggan ada dengan nama yang sama
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Nilai per Jam / 60) * Waktu Operasi Sebenarnya
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Tamu
 DocType: Quality Inspection,Get Specification Details,Dapatkan Spesifikasi Detail
 DocType: Lead,Interested,Tertarik
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Pembukaan
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Pembukaan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Dari {0} ke {1}
 DocType: Item,Copy From Item Group,Salin Dari Barang Grup
 DocType: Journal Entry,Opening Entry,Membuka Entri
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Enquiry Produk
 DocType: Standard Reply,Owner,Pemilik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Silahkan masukkan perusahaan pertama
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Silakan pilih Perusahaan pertama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Silakan pilih Perusahaan pertama
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Sasaran On
 DocType: BOM,Total Cost,Total Biaya
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Awalan
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumable
 DocType: Upload Attendance,Import Log,Impor Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Kirim
+DocType: Sales Invoice Item,Delivered By Supplier,Disampaikan Oleh Pemasok
 DocType: SMS Center,All Contact,Semua Kontak
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Gaji Tahunan
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra Masuk
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Log
 DocType: Journal Entry Account,Credit in Company Currency,Kredit di Perusahaan Mata
 DocType: Delivery Note,Installation Status,Status Instalasi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Jumlah Diterima + Ditolak harus sama dengan jumlah yang diterima untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Jumlah Diterima + Ditolak harus sama dengan jumlah yang diterima untuk Item {0}
 DocType: Item,Supply Raw Materials for Purchase,Bahan pasokan baku untuk Pembelian
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} harus Pembelian Barang
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Unduh Template, isi data yang sesuai dan melampirkan gambar yang sudah dimodifikasi.
  Semua tanggal dan karyawan kombinasi dalam jangka waktu yang dipilih akan datang dalam template, dengan catatan kehadiran yang ada"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Item {0} tidak aktif atau akhir hidup telah tercapai
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} tidak aktif atau akhir hidup telah tercapai
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Akan diperbarui setelah Faktur Penjualan yang Dikirim.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Barang, pajak dalam baris {1} juga harus disertakan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Barang, pajak dalam baris {1} juga harus disertakan"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Pengaturan untuk modul HR
 DocType: SMS Center,SMS Center,SMS Center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Meluruskan
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Masukkan parameter url unt
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Aturan untuk menerapkan harga dan diskon.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Waktu ini konflik Log dengan {0} untuk {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Harga List harus berlaku untuk Membeli atau Jual
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Tanggal instalasi tidak bisa sebelum tanggal pengiriman untuk Item {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Tanggal instalasi tidak bisa sebelum tanggal pengiriman untuk Item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Diskon Harga Daftar Rate (%)
-sites/assets/js/form.min.js +279,Start,Mulai
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Mulai
 DocType: User,First Name,Nama Depan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Setup Anda selesai. Menyegarkan.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Pengecoran penuh cetakan
 DocType: Offer Letter,Select Terms and Conditions,Pilih Syarat dan Ketentuan
 DocType: Production Planning Tool,Sales Orders,Penjualan Pesanan
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Penjualan Faktur Barang
 ,Production Orders in Progress,Pesanan produksi di Progress
 DocType: Lead,Address & Contact,Alamat & Kontak
+DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan daun yang tidak terpakai dari alokasi sebelumnya
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Berikutnya Berulang {0} akan dibuat pada {1}
 DocType: Newsletter List,Total Subscribers,Jumlah Pelanggan
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nama Kontak
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Pending Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Membuat Slip gaji untuk kriteria yang disebutkan di atas.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Permintaan pembelian.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Perumahan ganda
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Daun per Tahun
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Silakan set Penamaan Series untuk {0} melalui Pengaturan> Pengaturan> Penamaan Seri
 DocType: Time Log,Will be updated when batched.,Akan diperbarui bila batched.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Baris {0}: Silakan periksa 'Apakah Muka' terhadap Rekening {1} jika ini adalah sebuah entri muka.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Baris {0}: Silakan periksa 'Apakah Muka' terhadap Rekening {1} jika ini adalah sebuah entri muka.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik perusahaan {1}
 DocType: Bulk Email,Message,Pesan
 DocType: Item Website Specification,Item Website Specification,Item Situs Spesifikasi
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referensi Tidak
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Tinggalkan Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Tinggalkan Diblokir
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bursa Rekonsiliasi Barang
 DocType: Stock Entry,Sales Invoice No,Penjualan Faktur ada
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Minimum Order Qty
 DocType: Pricing Rule,Supplier Type,Pemasok Type
 DocType: Item,Publish in Hub,Publikasikan di Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Item {0} dibatalkan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Permintaan Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Permintaan Material
 DocType: Bank Reconciliation,Update Clearance Date,Perbarui Izin Tanggal
 DocType: Item,Purchase Details,Rincian pembelian
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} tidak ditemukan dalam 'Bahan Baku Disediakan' tabel dalam Purchase Order {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Pemberitahuan Kontrol
 DocType: Lead,Suggestions,Saran
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Menetapkan anggaran Group-bijaksana Barang di Wilayah ini. Anda juga bisa memasukkan musiman dengan menetapkan Distribusi.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Cukup masukkan rekening kelompok orang tua untuk gudang {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pembayaran terhadap {0} {1} tidak dapat lebih besar dari Posisi Jumlah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pembayaran terhadap {0} {1} tidak dapat lebih besar dari Posisi Jumlah {2}
 DocType: Supplier,Address HTML,Alamat HTML
 DocType: Lead,Mobile No.,Ponsel Nomor
 DocType: Maintenance Schedule,Generate Schedule,Menghasilkan Jadwal
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Menutup Akun Kepala
 DocType: Employee,External Work History,Eksternal Sejarah Kerja
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referensi Kesalahan melingkar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Apakah Anda benar-benar ingin BERHENTI
 DocType: Communication,Closed,Tertutup
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dalam Kata-kata (Ekspor) akan terlihat sekali Anda menyimpan Delivery Note.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Apakah Anda yakin ingin BERHENTI
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profil Job
 DocType: Newsletter,Newsletter,Laporan berkala
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Pengiriman Note
 DocType: Dropbox Backup,Allow Dropbox Access,Izinkan Akses Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Menyiapkan Pajak
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Masuk pembayaran telah dimodifikasi setelah Anda menariknya. Silakan menariknya lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Barang
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Ringkasan untuk minggu ini dan kegiatan yang tertunda
 DocType: Workstation,Rent Cost,Sewa Biaya
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Silakan pilih bulan dan tahun
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tingkat di mana Pelanggan Mata Uang dikonversi ke mata uang dasar pelanggan
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Tersedia dalam BOM, Pengiriman Catatan, Purchase Invoice, Pesanan Produksi, Purchase Order, Penerimaan Pembelian, Faktur Penjualan, Sales Order, Stock Masuk, Timesheet"
 DocType: Item Tax,Tax Rate,Tarif Pajak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Pilih Barang
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Pilih Barang
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} berhasil batch-bijaksana, tidak dapat didamaikan dengan menggunakan \
  Stock Rekonsiliasi, bukan menggunakan Stock Masuk"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Purchase Invoice {0} sudah disampaikan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Purchase Invoice {0} sudah disampaikan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch ada harus sama {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Dikonversi ke non-Grup
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pembelian Penerimaan harus diserahkan
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Stok saat ini UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (banyak) dari Item.
 DocType: C-Form Invoice Detail,Invoice Date,Faktur Tanggal
 DocType: GL Entry,Debit Amount,Jumlah debit
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Alamat email Anda
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Silakan lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instruksi
 DocType: Quality Inspection,Inspected By,Diperiksa Oleh
 DocType: Maintenance Visit,Maintenance Type,Pemeliharaan Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serial ada {0} bukan milik Pengiriman Note {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serial ada {0} bukan milik Pengiriman Note {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Barang Kualitas Parameter Inspeksi
 DocType: Leave Application,Leave Approver Name,Tinggalkan Nama Approver
 ,Schedule Date,Jadwal Tanggal
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Pembelian Register
 DocType: Landed Cost Item,Applicable Charges,Biaya yang berlaku
 DocType: Workstation,Consumable Cost,Biaya Consumable
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Cuti'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Cuti'
 DocType: Purchase Receipt,Vehicle Date,Kendaraan Tanggal
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medis
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Alasan untuk kehilangan
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% Terpasang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Silahkan masukkan nama perusahaan pertama
 DocType: BOM,Item Desription,Item Desription
 DocType: Purchase Invoice,Supplier Name,Pemasok Nama
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Membaca ERPNext Pedoman
 DocType: Account,Is Group,Apakah Grup
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Otomatis Set Serial Nos berdasarkan FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Periksa Pemasok Faktur Nomor Keunikan
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Penjualan Guru Ma
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Pengaturan global untuk semua proses manufaktur.
 DocType: Accounts Settings,Accounts Frozen Upto,Akun dibekukan sampai dengan
 DocType: SMS Log,Sent On,Dikirim Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
 DocType: Sales Order,Not Applicable,Tidak Berlaku
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master Holiday.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell molding
 DocType: Material Request Item,Required Date,Diperlukan Tanggal
 DocType: Delivery Note,Billing Address,Alamat Penagihan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Masukkan Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Masukkan Item Code.
 DocType: BOM,Costing,Biaya
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Jika dicentang, jumlah pajak akan dianggap sebagai sudah termasuk dalam Jumlah Tingkat Cetak / Print"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Qty
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Waktu Antara O
 DocType: Customer,Buyer of Goods and Services.,Pembeli Barang dan Jasa.
 DocType: Journal Entry,Accounts Payable,Hutang
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tambahkan Pelanggan
-sites/assets/js/erpnext.min.js +5,""" does not exists","""Tidak ada"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Tidak ada"
 DocType: Pricing Rule,Valid Upto,Valid Upto
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Daftar beberapa pelanggan Anda. Mereka bisa menjadi organisasi atau individu.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Penghasilan Langsung
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Tidak dapat memfilter berdasarkan Account, jika dikelompokkan berdasarkan Account"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Petugas Administrasi
 DocType: Payment Tool,Received Or Paid,Diterima Atau Dibayar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Silakan pilih Perusahaan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Silakan pilih Perusahaan
 DocType: Stock Entry,Difference Account,Perbedaan Akun
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Tidak bisa tugas sedekat tugas yang tergantung {0} tidak tertutup.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Masukkan Gudang yang Material Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Tambahan Biaya Operasi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetik
 DocType: DocField,Type,Jenis
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
 DocType: Communication,Subject,Perihal
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Darurat Telepon
 ,Serial No Warranty Expiry,Serial No Garansi kadaluarsa
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Apakah Anda benar-benar ingin BERHENTI Permintaan Bahan ini?
 DocType: Sales Order,To Deliver,Mengantarkan
 DocType: Purchase Invoice Item,Item,Barang
 DocType: Journal Entry,Difference (Dr - Cr),Perbedaan (Dr - Cr)
 DocType: Account,Profit and Loss,Laba Rugi
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Mengelola Subkontrak
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Mengelola Subkontrak
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM TIDAK harus dari jenis Whole Number
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Furniture dan Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tingkat di mana mata uang Daftar Harga dikonversi ke mata uang dasar perusahaan
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Pajak dan B
 DocType: Purchase Invoice,Supplier Invoice No,Pemasok Faktur ada
 DocType: Territory,For reference,Untuk referensi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat menghapus Serial ada {0}, seperti yang digunakan dalam transaksi saham"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Penutup (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Penutup (Cr)
 DocType: Serial No,Warranty Period (Days),Masa Garansi (Hari)
 DocType: Installation Note Item,Installation Note Item,Instalasi Catatan Barang
 ,Pending Qty,Tertunda Qty
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,Penagihan dan Pengiriman Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ulangi Pelanggan
 DocType: Leave Control Panel,Allocate,Alokasi
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Sebelumnya
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Penjualan Kembali
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Penjualan Kembali
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Pilih Penjualan Pesanan dari mana Anda ingin membuat Pesanan Produksi.
+DocType: Item,Delivered by Supplier (Drop Ship),Disampaikan oleh Pemasok (Drop Kapal)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponen gaji.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database pelanggan potensial.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Database pelanggan.
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Jumlah tagihan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Sebuah Gudang logis terhadap entri saham yang dibuat.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referensi ada & Referensi Tanggal diperlukan untuk {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referensi ada & Referensi Tanggal diperlukan untuk {0}
 DocType: Event,Wednesday,Rabu
 DocType: Sales Invoice,Customer's Vendor,Penjual Nasabah
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produksi Order adalah Wajib
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan' dan 'Kelompokkan Dengan' tidak bisa sama
 DocType: Sales Person,Sales Person Targets,Target Penjualan Orang
-sites/assets/js/form.min.js +271,To,untuk
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Masukkan alamat email
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,untuk
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Masukkan alamat email
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tabung akhir membentuk
 DocType: Production Order Operation,In minutes,Dalam menit
 DocType: Issue,Resolution Date,Resolusi Tanggal
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,Proyek Pengguna
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Dikonsumsi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} tidak ditemukan dalam tabel Rincian Tagihan
 DocType: Company,Round Off Cost Center,Bulat Off Biaya Pusat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Pemeliharaan Kunjungan {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Pemeliharaan Kunjungan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Pembukaan (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Posting timestamp harus setelah {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Pengaturan
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Mendarat Pajak Biaya dan Biaya
 DocType: Production Order Operation,Actual Start Time,Realisasi Waktu Mulai
 DocType: BOM Operation,Operation Time,Operasi Waktu
-sites/assets/js/list.min.js +5,More,Lanjut
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Lanjut
 DocType: Pricing Rule,Sales Manager,Sales Manager
-sites/assets/js/desk.min.js +7673,Rename,Ubah nama
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Ubah nama
 DocType: Journal Entry,Write Off Amount,Menulis Off Jumlah
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Pembengkokan
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Izinkan Pengguna
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,P
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Geser lurus
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Untuk melacak item dalam penjualan dan dokumen pembelian berdasarkan nos serial mereka. Hal ini juga dapat digunakan untuk melacak rincian garansi produk.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stok saat ini
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Gudang Ditolak adalah wajib terhadap barang regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Gudang Ditolak adalah wajib terhadap barang regected
 DocType: Account,Expenses Included In Valuation,Biaya Termasuk Dalam Penilaian
 DocType: Employee,Provide email id registered in company,Menyediakan email id yang terdaftar di perusahaan
 DocType: Hub Settings,Seller City,Penjual Kota
 DocType: Email Digest,Next email will be sent on:,Email berikutnya akan dikirim pada:
 DocType: Offer Letter Term,Offer Letter Term,Menawarkan Surat Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Item memiliki varian.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} tidak ditemukan
 DocType: Bin,Stock Value,Nilai saham
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Jenis Pohon
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Selamat Datang
 DocType: Journal Entry,Credit Card Entry,Kartu kredit Masuk
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tugas Subjek
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Barang yang diterima dari pemasok.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Barang yang diterima dari pemasok.
 DocType: Communication,Open,Buka
 DocType: Lead,Campaign Name,Nama Promosi
 ,Reserved,Reserved
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Apakah Anda benar-benar ingin unstop
 DocType: Purchase Order,Supply Raw Materials,Pasokan Bahan Baku
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Tanggal dimana faktur berikutnya akan dihasilkan. Hal ini dihasilkan di submit.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Aset Lancar
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Nasabah Purchase Order No
 DocType: Employee,Cell Number,Nomor Cell
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tersesat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak dapat memasukkan voucher saat ini di kolom 'Atas Journal Entry'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak dapat memasukkan voucher saat ini di kolom 'Atas Journal Entry'
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Peluang Dari
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Pernyataan gaji bulanan.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Kewajiban
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksi Jumlah tidak dapat lebih besar dari Klaim Jumlah dalam Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standar Biaya Rekening Pokok Penjualan
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Daftar Harga tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Daftar Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Process Payroll,Send Email,Kirim Email
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Tidak ada Izin
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Item dengan weightage lebih tinggi akan ditampilkan lebih tinggi
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Rincian Rekonsiliasi Bank
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Faktur saya
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Tidak ada karyawan yang ditemukan
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Tidak ada karyawan yang ditemukan
 DocType: Purchase Order,Stopped,Terhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak ke vendor
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Pilih BOM untuk memulai
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload ke
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Kirim sekarang
 ,Support Analytics,Dukungan Analytics
 DocType: Item,Website Warehouse,Situs Gudang
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Apakah Anda benar-benar ingin berhenti produksi pesanan:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Hari bulan yang otomatis faktur akan dihasilkan misalnya 05, 28 dll"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor harus kurang dari atau sama dengan 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form catatan
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Permi
 DocType: Features Setup,"To enable ""Point of Sale"" features",Untuk mengaktifkan "Point of Sale" fitur
 DocType: Bin,Moving Average Rate,Moving Average Tingkat
 DocType: Production Planning Tool,Select Items,Pilih Produk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} terhadap Bill {1} ​​tanggal {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} terhadap Bill {1} ​​tanggal {2}
 DocType: Comment,Reference Name,Referensi Nama
 DocType: Maintenance Visit,Completion Status,Status Penyelesaian
 DocType: Sales Invoice Item,Target Warehouse,Target Gudang
 DocType: Item,Allow over delivery or receipt upto this percent,Biarkan selama pengiriman atau penerimaan upto persen ini
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Diharapkan Pengiriman Tanggal tidak bisa sebelum Sales Order Tanggal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Diharapkan Pengiriman Tanggal tidak bisa sebelum Sales Order Tanggal
 DocType: Upload Attendance,Import Attendance,Impor Kehadiran
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Grup Barang/Item
 DocType: Process Payroll,Activity Log,Log Aktivitas
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Secara otomatis menulis pesan pada pengajuan transaksi.
 DocType: Production Order,Item To Manufacture,Barang Untuk Industri
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Pengecoran cetakan permanen
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Pembelian Order untuk Pembayaran
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status adalah {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Pembelian Order untuk Pembayaran
 DocType: Sales Order Item,Projected Qty,Proyeksi Jumlah
 DocType: Sales Invoice,Payment Due Date,Tanggal Jatuh Tempo Pembayaran
 DocType: Newsletter,Newsletter Manager,Newsletter Manajer
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,Nomor diminta
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Penilaian kinerja.
 DocType: Sales Invoice Item,Stock Details,Detail saham
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Proyek
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Titik penjualan
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Tidak bisa meneruskan {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Titik penjualan
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Tidak bisa meneruskan {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo rekening telah berada di Kredit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Debit'"
 DocType: Account,Balance must be,Saldo harus
 DocType: Hub Settings,Publish Pricing,Publikasikan Harga
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Penerimaan Pembelian
 ,Received Items To Be Billed,Produk Diterima Akan Ditagih
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Peledakan abrasive
-sites/assets/js/desk.min.js +3938,Ms,Ms
+DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Menguasai nilai tukar mata uang.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat menemukan waktu Slot di {0} hari berikutnya untuk Operasi {1}
 DocType: Production Order,Plan material for sub-assemblies,Bahan rencana sub-rakitan
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,Jarak
 DocType: Supplier,Default Payable Accounts,Standar Account Payable
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Item Varian {0} diperbarui
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pembelian Faktur Muka
 DocType: Address,Shop,Toko
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standar rekening Bank / Cash akan secara otomatis diperbarui di POS Invoice saat mode ini dipilih.
 DocType: Employee,Permanent Address Is,Alamat permanen Apakah
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasi selesai untuk berapa banyak barang jadi?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Merek
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Penyisihan over-{0} menyeberang untuk Item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Penyisihan over-{0} menyeberang untuk Item {1}.
 DocType: Employee,Exit Interview Details,Detail Exit Interview
 DocType: Item,Is Purchase Item,Apakah Pembelian Barang
 DocType: Journal Entry Account,Purchase Invoice,Purchase Invoice
 DocType: Stock Ledger Entry,Voucher Detail No,Detil Voucher ada
 DocType: Stock Entry,Total Outgoing Value,Nilai Total Outgoing
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Tanggal dan Closing Date membuka harus berada dalam Tahun Anggaran yang sama
 DocType: Lead,Request for Information,Request for Information
 DocType: Payment Tool,Paid,Dibayar
 DocType: Salary Slip,Total in words,Jumlah kata
 DocType: Material Request Item,Lead Time Date,Timbal Waktu Tanggal
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,adalah wajib. Mungkin catatan Kurs Mata Uang tidak diciptakan untuk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Silakan tentukan Serial ada untuk Item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Untuk 'Produk Bundle' item, Gudang, Serial No dan Batch ada akan dianggap dari 'Packing List' meja. Jika Gudang dan Batch ada yang sama untuk semua item kemasan untuk setiap item 'Produk Bundle', nilai-nilai dapat dimasukkan dalam tabel Barang utama, nilai akan disalin ke 'Packing List' meja."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Pengiriman ke pelanggan.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Pengiriman ke pelanggan.
 DocType: Purchase Invoice Item,Purchase Order Item,Purchase Order Barang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Penghasilan tidak langsung
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Mengatur Jumlah Pembayaran = Outstanding Jumlah
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,Alamat Baris 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Perbedaan
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Company Name
 DocType: SMS Center,Total Message(s),Total Pesan (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat daftar semua bantuan video
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pilih kepala rekening bank mana cek diendapkan.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Izinkan user/pengguna untuk mengubah rate daftar harga di dalam transaksi
 DocType: Pricing Rule,Max Qty,Max Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Baris {0}: Pembayaran terhadap Penjualan / Purchase Order harus selalu ditandai sebagai muka
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Baris {0}: Pembayaran terhadap Penjualan / Purchase Order harus selalu ditandai sebagai muka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimia
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Pesanan Produksi ini.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Pesanan Produksi ini.
 DocType: Process Payroll,Select Payroll Year and Month,Pilih Payroll Tahun dan Bulan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pergi ke kelompok yang sesuai (biasanya Penerapan Dana> Aset Lancar> Account Bank dan membuat Akun baru (dengan mengklik Tambahkan Anak) tipe "Bank"
 DocType: Workstation,Electricity Cost,Biaya Listrik
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Puti
 DocType: SMS Center,All Lead (Open),Semua Prospektus (Open)
 DocType: Purchase Invoice,Get Advances Paid,Dapatkan Uang Muka Dibayar
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pasang Gambar Anda
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Membuat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Membuat
 DocType: Journal Entry,Total Amount in Words,Jumlah Total Kata
 DocType: Workflow State,Stop,berhenti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Ada kesalahan. Salah satu alasan yang mungkin bisa jadi Anda belum menyimpan formulir. Silahkan hubungi support@erpnext.com jika masalah terus berlanjut.
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,Packing Slip Barang
 DocType: POS Profile,Cash/Bank Account,Rekening Kas / Bank
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai.
 DocType: Delivery Note,Delivery To,Pengiriman Untuk
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabel atribut wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Pesanan Penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} tidak dapat negatif
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Pengajuan
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Akan diperbarui
 DocType: Project,Internal,Internal
 DocType: Task,Urgent,Mendesak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Tentukan Row ID berlaku untuk baris {0} dalam tabel {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Pergi ke Desktop dan mulai menggunakan ERPNext
 DocType: Item,Manufacturer,Pabrikan
 DocType: Landed Cost Item,Purchase Receipt Item,Penerimaan Pembelian Barang
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserved Gudang di Sales Order / Barang Jadi Gudang
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Jual Jumlah
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Waktu Log
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Approver Beban untuk record ini. Silakan Update 'Status' dan Simpan
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Approver Beban untuk record ini. Silakan Update 'Status' dan Simpan
 DocType: Serial No,Creation Document No,Penciptaan Dokumen Tidak
 DocType: Issue,Issue,Isu
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atribut untuk Item Varian. misalnya Ukuran, Warna dll"
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jual Biaya Pusat
 DocType: Sales Partner,Implementation Partner,Implementasi Mitra
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} adalah {1}
 DocType: Opportunity,Contact Info,Informasi Kontak
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Membuat Entri Stock
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Membuat Entri Stock
 DocType: Packing Slip,Net Weight UOM,Berat Bersih UOM
 DocType: Item,Default Supplier,Standar Pemasok
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Selama Penyisihan Produksi Persentase
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Dapatkan Weekly Off Tanggal
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Tanggal akhir tidak boleh kurang dari Tanggal Mulai
 DocType: Sales Person,Select company name first.,Pilih nama perusahaan pertama.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Kutipan yang diterima dari pemasok.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Untuk {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,diperbarui melalui Waktu Log
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Nomor registrasi perusahaan untuk referensi Anda. Nomor pajak dll
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Belanja Pengiriman Aturan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Pesanan produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Pesanan produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
 ,Ordered Items To Be Billed,Memerintahkan Items Akan Ditagih
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Dari Rentang harus kurang dari Untuk Rentang
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Pilih Waktu Log dan Kirim untuk membuat Faktur Penjualan baru.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Pajak da
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Hutang
 DocType: Account,Warehouse,Gudang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak dapat dimasukkan dalam Pembelian Kembali
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak dapat dimasukkan dalam Pembelian Kembali
 ,Purchase Order Items To Be Billed,Purchase Order Items Akan Ditagih
 DocType: Purchase Invoice Item,Net Rate,Tingkat Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Purchase Invoice Barang
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Rincian Pembayaran
 DocType: Global Defaults,Current Fiscal Year,Tahun Anggaran saat ini
 DocType: Global Defaults,Disable Rounded Total,Nonaktifkan Rounded Jumlah
 DocType: Lead,Call,Panggilan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Entries' tidak boleh kosong
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entries' tidak boleh kosong
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Baris duplikat {0} dengan sama {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Menyiapkan Karyawan
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Menyiapkan Karyawan
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Silakan pilih awalan pertama
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Penelitian
 DocType: Maintenance Visit Purpose,Work Done,Pekerjaan Selesai
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,Terkirim
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terlama
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok barang"
 DocType: Communication,Delivery Status,Status Pengiriman
 DocType: Production Order,Manufacture against Sales Order,Industri melawan Sales Order
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Istirahat Of The World
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Istirahat Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
 ,Budget Variance Report,Laporan Perbedaan Anggaran
 DocType: Salary Slip,Gross Pay,Gross Bayar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividen Dibayar
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Akuntansi Ledger
 DocType: Stock Reconciliation,Difference Amount,Perbedaan Jumlah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Laba Ditahan
 DocType: BOM Item,Item Description,Item Description
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,Peluang Barang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Pembukaan sementara
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Cuti Karyawan Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
 DocType: Address,Address Type,Tipe Alamat
 DocType: Purchase Receipt,Rejected Warehouse,Gudang Ditolak
 DocType: GL Entry,Against Voucher,Terhadap Voucher
 DocType: Item,Default Buying Cost Center,Standar Biaya Membeli Pusat
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Untuk mendapatkan yang terbaik dari ERPNext, kami menyarankan Anda mengambil beberapa waktu dan menonton video ini membantu."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Item {0} harus Penjualan Barang
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,untuk
 DocType: Item,Lead Time in days,Waktu memimpin di hari
 ,Accounts Payable Summary,Account Summary Hutang
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Tidak berwenang untuk mengedit Akun frozen {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Tidak berwenang untuk mengedit Akun frozen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Posisi Faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} tidak valid
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Tempat Issue
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrak
 DocType: Report,Disabled,Dinonaktifkan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} di Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} di Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Biaya tidak langsung
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Pertanian
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,Mode Pembayaran
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kelompok barang akar dan tidak dapat diedit.
 DocType: Journal Entry Account,Purchase Order,Purchase Order
 DocType: Warehouse,Warehouse Contact Info,Info Kontak Gudang
-sites/assets/js/form.min.js +190,Name is required,Nama dibutuhkan
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Nama dibutuhkan
 DocType: Purchase Invoice,Recurring Type,Berulang Type
 DocType: Address,City/Town,Kota / Kota
 DocType: Email Digest,Annual Income,Pendapatan tahunan
 DocType: Serial No,Serial No Details,Serial Tidak Detail
 DocType: Purchase Invoice Item,Item Tax Rate,Tarif Pajak Barang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya rekening kredit dapat dihubungkan dengan entri debit lain"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya rekening kredit dapat dihubungkan dengan entri debit lain"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Pengiriman Note {0} tidak disampaikan
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Peralatan Modal
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Sasaran
 DocType: Sales Invoice Item,Edit Description,Mengedit Keterangan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Diharapkan Pengiriman Tanggal adalah lebih rendah daripada Tanggal Rencana Start.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Untuk Pemasok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Untuk Pemasok
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Mengatur Tipe Akun membantu dalam memilih Akun ini dalam transaksi.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Outgoing
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Hanya ada satu Peraturan Pengiriman Kondisi dengan nilai kosong atau 0 untuk ""To Nilai"""
 DocType: Authorization Rule,Transaction,Transaksi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Catatan: Biaya Pusat ini adalah Group. Tidak bisa membuat entri akuntansi terhadap kelompok-kelompok.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Alat-alat
+apps/frappe/frappe/config/desk.py +7,Tools,Alat-alat
 DocType: Item,Website Item Groups,Situs Barang Grup
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Nomor pesanan produksi adalah wajib untuk pembuatan tujuan masuk stok
 DocType: Purchase Invoice,Total (Company Currency),Total (Perusahaan Mata Uang)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,Workstation Nama
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} bukan milik Barang {1}
 DocType: Sales Partner,Target Distribution,Target Distribusi
-sites/assets/js/desk.min.js +7652,Comments,Komentar
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentar
 DocType: Salary Slip,Bank Account No.,Rekening Bank No
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ini adalah jumlah transaksi yang diciptakan terakhir dengan awalan ini
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Penilaian Tingkat diperlukan untuk Item {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Silakan pili
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Cuti
 DocType: Purchase Invoice,Supplier Invoice Date,Pemasok Faktur Tanggal
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Anda harus mengaktifkan Keranjang Belanja
-sites/assets/js/form.min.js +212,No Data,Tidak ada data
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Tidak ada data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Template Penilaian Pencapaian
 DocType: Salary Slip,Earning,Earning
 DocType: Payment Tool,Party Account Currency,Partai Akun Mata Uang
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,Partai Akun Mata Uang
 DocType: Purchase Taxes and Charges,Add or Deduct,Penambahan atau Pengurangan
 DocType: Company,If Yearly Budget Exceeded (for expense account),Jika Anggaran Tahunan Melebihi (untuk akun beban)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Kondisi Tumpang Tindih ditemukan antara:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Jurnal Entri {0} sudah disesuaikan terhadap beberapa voucher lainnya
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Jurnal Entri {0} sudah disesuaikan terhadap beberapa voucher lainnya
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Nilai Total Pesanan
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Makanan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Penuaan Rentang 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Tidak ada Kunjungan
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletter ke kontak, memimpin."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Mata uang dari Rekening Penutupan harus {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Jumlah poin untuk semua tujuan harus 100. Ini adalah {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operasi tidak dapat dibiarkan kosong.
 ,Delivered Items To Be Billed,Produk Disampaikan Akan Ditagih
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Gudang tidak dapat diubah untuk Serial Number
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status diperbarui ke {0}
 DocType: DocField,Description,Deskripsi
 DocType: Authorization Rule,Average Discount,Rata-rata Diskon
 DocType: Letter Head,Is Default,Apakah default
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Jumlah Pajak Barang
 DocType: Item,Maintain Stock,Menjaga Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Saham Entries sudah dibuat untuk Pesanan Produksi
 DocType: Leave Control Panel,Leave blank if considered for all designations,Biarkan kosong jika dipertimbangkan untuk semua sebutan
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Dari Datetime
 DocType: Email Digest,For Company,Untuk Perusahaan
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,Pengiriman Alamat Nama
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Chart of Account
 DocType: Material Request,Terms and Conditions Content,Syarat dan Ketentuan Konten
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Item {0} bukan merupakan saham Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Item {0} bukan merupakan saham Barang
 DocType: Maintenance Visit,Unscheduled,Terjadwal
 DocType: Employee,Owned,Dimiliki
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Tergantung pada Cuti Tanpa Bayar
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garansi / Status AMC
 DocType: GL Entry,GL Entry,GL Entri
 DocType: HR Settings,Employee Settings,Pengaturan Karyawan
 ,Batch-Wise Balance History,Batch-Wise Balance Sejarah
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,To Do List
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Magang
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Jumlah negatif tidak diperbolehkan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kantor Sewa
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Impor Gagal!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Tidak ada alamat belum ditambahkan.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Tidak ada alamat belum ditambahkan.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Jam Kerja
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analis
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan jumlah JV {2}
 DocType: Item,Inventory,Inventarisasi
 DocType: Features Setup,"To enable ""Point of Sale"" view",Untuk mengaktifkan "Point of Sale" tampilan
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Pembayaran tidak dapat dibuat untuk keranjang kosong
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pembayaran tidak dapat dibuat untuk keranjang kosong
 DocType: Item,Sales Details,Detail Penjualan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Menjepit
 DocType: Opportunity,With Items,Dengan Produk
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",Tanggal dimana faktur berikutnya akan dihasilkan. Hal ini dihasilkan di submit.
 DocType: Item Attribute,Item Attribute,Item Atribut
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,pemerintahan
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Item Varian
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varian
 DocType: Company,Services,Layanan
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Jumlah ({0})
 DocType: Cost Center,Parent Cost Center,Parent Biaya Pusat
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Tahun Buku Tanggal mulai
 DocType: Employee External Work History,Total Experience,Jumlah Pengalaman
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya
 DocType: Material Request Item,Sales Order No,Sales Order No
 DocType: Item Group,Item Group Name,Nama Item Grup
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Diambil
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Diambil
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Material untuk Industri
 DocType: Pricing Rule,For Price List,Untuk Daftar Harga
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Pencarian eksekutif
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,Jadwal Pelajaran
 DocType: Purchase Invoice Item,Net Amount,Jumlah Bersih
 DocType: Purchase Order Item Supplied,BOM Detail No,No. Rincian BOM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Tambahan Jumlah Diskon (Perusahaan Mata Uang)
-DocType: Period Closing Voucher,CoA Help,CoA Bantuan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Kesalahan: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Kesalahan: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Silahkan buat akun baru dari Bagan Akun.
 DocType: Maintenance Visit,Maintenance Visit,Pemeliharaan Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Pelanggan> Grup Pelanggan> Wilayah
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Landed Biaya Bantuan
 DocType: Event,Tuesday,Selasa
 DocType: Leave Block List,Block Holidays on important days.,Blok Holidays pada hari-hari penting.
 ,Accounts Receivable Summary,Account Summary Piutang
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Daun untuk jenis {0} sudah dialokasikan untuk Karyawan {1} untuk periode {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Silakan set ID lapangan Pengguna dalam catatan Karyawan untuk mengatur Peran Karyawan
 DocType: UOM,UOM Name,Nama UOM
 DocType: Top Bar Item,Target,Sasaran
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,Penjualan Mitra Sasaran
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Masuk akuntansi untuk {0} hanya dapat dilakukan dalam mata uang: {1}
 DocType: Pricing Rule,Pricing Rule,Aturan Harga
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Bentukan
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Permintaan bahan Pembelian Pesanan
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Permintaan bahan Pembelian Pesanan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Barang {1} tidak ada dalam {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Rekening Bank
 ,Bank Reconciliation Statement,Pernyataan Rekonsiliasi Bank
 DocType: Address,Lead Name,Timbal Nama
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Membuka Stock Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Membuka Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} harus muncul hanya sekali
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Tidak diizinkan untuk tranfer lebih {0} dari {1} terhadap Purchase Order {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Daun Dialokasikan Berhasil untuk {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Daun Dialokasikan Berhasil untuk {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Tidak ada item untuk berkemas
 DocType: Shipping Rule Condition,From Value,Dari Nilai
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Manufaktur Kuantitas adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Manufaktur Kuantitas adalah wajib
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Jumlah yang tidak tercermin di bank
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Klaim untuk biaya perusahaan.
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,Kontak Mobile No
 DocType: Production Planning Tool,Select Sales Orders,Pilih Pesanan Penjualan
 ,Material Requests for which Supplier Quotations are not created,Permintaan Material yang Pemasok Kutipan tidak diciptakan
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Untuk melacak item menggunakan barcode. Anda akan dapat memasukkan item dalam Pengiriman Note dan Faktur Penjualan dengan memindai barcode barang.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Tandai sebagai Disampaikan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Membuat Quotation
 DocType: Dependent Task,Dependent Task,Tugas Dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Tinggalkan jenis {0} tidak boleh lebih dari {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Tinggalkan jenis {0} tidak boleh lebih dari {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Coba operasi untuk hari X perencanaan di muka.
 DocType: HR Settings,Stop Birthday Reminders,Berhenti Ulang Tahun Pengingat
 DocType: SMS Center,Receiver List,Receiver Daftar
 DocType: Payment Tool Detail,Payment Amount,Jumlah pembayaran
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Dikonsumsi Jumlah
-sites/assets/js/erpnext.min.js +51,{0} View,{0} View
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Gaji Pengurangan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Laser sintering selektif
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Impor Sukses!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Biaya Produk Dikeluarkan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,Standar Hutang Akun
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Pengaturan untuk keranjang belanja online seperti aturan pengiriman, daftar harga dll"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Pengaturan Selesai
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Ditagih
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reserved Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,Akun Party
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Sumber Daya Manusia
 DocType: Lead,Upper Income,Atas Penghasilan
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktifkan Keranjang Belanja
 DocType: Employee,Permanent Address,Permanent Alamat
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Item {0} harus Layanan Barang.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Uang muka dibayar terhadap {0} {1} tidak dapat lebih besar \ dari Grand Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Silahkan pilih kode barang
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Mengurangi Pengurangan untuk Tinggalkan Tanpa Bayar (LWP)
 DocType: Territory,Territory Manager,Territory Manager
+DocType: Delivery Note Item,To Warehouse (Optional),Untuk Gudang (pilihan)
 DocType: Sales Invoice,Paid Amount (Company Currency),Dibayar Jumlah (Perusahaan Mata Uang)
 DocType: Purchase Invoice,Additional Discount,Diskon tambahan
 DocType: Selling Settings,Selling Settings,Jual Pengaturan
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Pertambangan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Pengecoran resin
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Pelanggan sudah ada dengan nama yang sama, silakan mengubah nama Pelanggan atau mengubah nama Grup Pelanggan"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Silahkan pilih {0} pertama.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Silahkan pilih {0} pertama.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},teks {0}
 DocType: Territory,Parent Territory,Wilayah Induk
 DocType: Quality Inspection Reading,Reading 2,Membaca 2
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,No. Batch
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Memungkinkan Penjualan beberapa Pesanan terhadap Purchase Order Nasabah
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Utama
 DocType: DocPerm,Delete,Hapus
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variasi
-sites/assets/js/desk.min.js +7971,New {0},New {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variasi
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Agar Berhenti tidak dapat dibatalkan. Unstop untuk membatalkan.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Agar Berhenti tidak dapat dibatalkan. Unstop untuk membatalkan.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
 DocType: Employee,Leave Encashed?,Tinggalkan dicairkan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Dari bidang wajib
 DocType: Item,Variants,Varian
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Negara
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Alamat
 DocType: Communication,Received,Diterima
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Jurnal Entri {0} tidak memiliki tertandingi {1} entri
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Jurnal Entri {0} tidak memiliki tertandingi {1} entri
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Gandakan Serial ada dimasukkan untuk Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Sebuah kondisi untuk Aturan Pengiriman
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item tidak diperbolehkan untuk memiliki Orde Produksi.
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,Salam
 DocType: Communication,Rejected,Ditolak
 DocType: Pricing Rule,Brand,Merek
 DocType: Item,Will also apply for variants,Juga akan berlaku untuk varian
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Terkirim
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundel item pada saat penjualan.
 DocType: Sales Order Item,Actual Qty,Jumlah Aktual
 DocType: Sales Invoice Item,References,Referensi
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Pencukuran
 DocType: Item,Has Variants,Memiliki Varian
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik 'Buat Sales Invoice' tombol untuk membuat Faktur Penjualan baru.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Periode Dari dan Untuk Periode tanggal wajib untuk berulang% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Kemasan dan pelabelan
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Distribusi Bulanan
 DocType: Sales Person,Parent Sales Person,Penjualan Induk Orang
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Silakan tentukan Currency Default dalam Perseroan Guru dan Default global
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Rahasia
 DocType: Purchase Invoice,Recurring Invoice,Faktur Berulang
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Mengelola Proyek
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Mengelola Proyek
 DocType: Supplier,Supplier of Goods or Services.,Pemasok Barang atau Jasa.
 DocType: Budget Detail,Fiscal Year,Tahun Fiskal
 DocType: Cost Center,Budget,Anggaran belanja
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Penjualan
 DocType: Employee,Salary Information,Informasi Gaji
 DocType: Sales Person,Name and Employee ID,Nama dan ID Karyawan
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
 DocType: Website Item Group,Website Item Group,Situs Barang Grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Tugas dan Pajak
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Harap masukkan tanggal Referensi
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} entri pembayaran tidak dapat disaring oleh {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Harap masukkan tanggal Referensi
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entri pembayaran tidak dapat disaring oleh {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabel untuk Item yang akan ditampilkan di Situs Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Disediakan Qty
 DocType: Material Request Item,Material Request Item,Material Permintaan Barang
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Pohon Item Grup.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak dapat merujuk nomor baris yang lebih besar dari atau sama dengan nomor baris saat ini untuk jenis Biaya ini
 ,Item-wise Purchase History,Barang-bijaksana Riwayat Pembelian
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Merah
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Silahkan klik 'Menghasilkan Jadwal' untuk mengambil Serial yang ditambahkan untuk Item {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Silahkan klik 'Menghasilkan Jadwal' untuk mengambil Serial yang ditambahkan untuk Item {0}
 DocType: Account,Frozen,Beku
 ,Open Production Orders,Pesanan terbuka Produksi
 DocType: Installation Note,Installation Time,Instalasi Waktu
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Grup tidak disebutkan dalam master barang untuk item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Seperti Orde Produksi dapat dibuat untuk item ini, itu harus menjadi barang saham."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Seperti Orde Produksi dapat dibuat untuk item ini, itu harus menjadi barang saham."
 DocType: Shipping Rule Condition,Shipping Amount,Pengiriman Jumlah
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Bergabung
 DocType: Authorization Rule,Above Value,Nilai di atas
 ,Pending Amount,Pending Jumlah
 DocType: Purchase Invoice Item,Conversion Factor,Faktor konversi
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Disampaikan
+DocType: Purchase Order,Delivered,Disampaikan
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Pengaturan server masuk untuk pekerjaan email id. (Misalnya jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Jumlah kendaraan
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tanggal dimana berulang faktur akan berhenti
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Mendistribusikan Biaya
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akun {0} harus bertipe 'Aset Tetap' dikarenakan Barang {1} adalah merupakan sebuah Aset Tetap
 DocType: HR Settings,HR Settings,Pengaturan HR
 apps/frappe/frappe/config/setup.py +130,Printing,Pencetakan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Beban Klaim sedang menunggu persetujuan. Hanya Approver Beban dapat memperbarui status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Beban Klaim sedang menunggu persetujuan. Hanya Approver Beban dapat memperbarui status.
 DocType: Purchase Invoice,Additional Discount Amount,Tambahan Jumlah Diskon
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Hari (s) yang Anda lamar untuk cuti adalah liburan. Anda tidak perlu mengajukan cuti.
-sites/assets/js/desk.min.js +7805,and,Dan
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,Dan
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Block List Izinkan
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr tidak boleh kosong atau ruang
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Olahraga
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,Kutipan
 DocType: Salary Slip,Total Deduction,Jumlah Pengurangan
 DocType: Quotation,Maintenance User,Pemeliharaan Pengguna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Biaya Diperbarui
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Apakah Anda yakin ingin unstop
 DocType: Employee,Date of Birth,Tanggal Lahir
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} telah dikembalikan
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Anggaran ** mewakili Tahun Keuangan. Semua entri akuntansi dan transaksi besar lainnya dilacak terhadap Tahun Anggaran ** **.
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pelihara Penjualan Kampanye. Melacak Memimpin, Kutipan, Sales Order dll dari Kampanye untuk mengukur Return on Investment. "
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entri saham ada terhadap gudang {0}, maka Anda tidak dapat menetapkan kembali atau memodifikasi Gudang"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entri saham ada terhadap gudang {0}, maka Anda tidak dapat menetapkan kembali atau memodifikasi Gudang"
 DocType: Appraisal,Calculate Total Score,Hitung Total Skor
 DocType: Supplier Quotation,Manufacturing Manager,Manufaktur Manajer
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial ada {0} masih dalam garansi upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Membagi Pengiriman Catatan ke dalam paket.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Pengiriman
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip molding
+DocType: Purchase Order,To be delivered to customer,Yang akan dikirimkan ke pelanggan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Waktu Log Status harus Dikirim.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial ada {0} bukan milik Gudang setiap
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Pengaturan
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Dari Mata
 DocType: DocField,Name,Nama
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Silakan pilih Jumlah Alokasi, Faktur Jenis dan Faktur Nomor di minimal satu baris"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Sales Order yang diperlukan untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order yang diperlukan untuk Item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Jumlah yang tidak tercermin dalam sistem
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Perusahaan Mata Uang)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Lainnya
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Ditetapkan sebagai Berhenti
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat menemukan yang cocok Item. Silakan pilih beberapa nilai lain untuk {0}.
 DocType: POS Profile,Taxes and Charges,Pajak dan Biaya
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Sebuah Produk atau Jasa yang dibeli, dijual atau disimpan di gudang."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak dapat memilih jenis biaya sebagai 'Pada Row Sebelumnya Jumlah' atau 'On Sebelumnya Row Jumlah' untuk baris pertama
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,Pilih DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Menggerek
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Perbankan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Silahkan klik 'Menghasilkan Jadwal' untuk mendapatkan jadwal
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Biaya Pusat baru
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Biaya Pusat baru
 DocType: Bin,Ordered Quantity,Memerintahkan Kuantitas
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","misalnya ""Membangun alat untuk pembangun """
 DocType: Quality Inspection,In Process,Dalam Proses
 DocType: Authorization Rule,Itemwise Discount,Itemwise Diskon
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} terhadap Sales Order {1}
+DocType: Purchase Order Item,Reference Document Type,Dokumen referensi Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} terhadap Sales Order {1}
 DocType: Account,Fixed Asset,Fixed Asset
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Persediaan serial
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Persediaan serial
 DocType: Activity Type,Default Billing Rate,Standar Tingkat Penagihan
 DocType: Time Log Batch,Total Billing Amount,Jumlah Total Tagihan
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Piutang
 ,Stock Balance,Stock Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Sales Order untuk Pembayaran
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order untuk Pembayaran
 DocType: Expense Claim Detail,Expense Claim Detail,Beban Klaim Detil
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Waktu Log dibuat:
 DocType: Item,Weight UOM,Berat UOM
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit Untuk akun harus rekening Hutang
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
 DocType: Production Order Operation,Completed Qty,Selesai Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, hanya rekening debit dapat dihubungkan dengan entri kredit lain"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, hanya rekening debit dapat dihubungkan dengan entri kredit lain"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
 DocType: Manufacturing Settings,Allow Overtime,Biarkan Lembur
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Sales Order {0} dihentikan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial Number diperlukan untuk Item {1}. Anda telah disediakan {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tingkat Penilaian saat ini
 DocType: Item,Customer Item Codes,Pelanggan Barang Kode
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Pengelasan
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM diperlukan
 DocType: Quality Inspection,Sample Size,Ukuran Sampel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Semua Barang telah tertagih
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Semua Barang telah tertagih
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Silakan tentukan valid 'Dari Kasus No'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat biaya lebih lanjut dapat dibuat di bawah Grup tetapi entri dapat dilakukan terhadap non-Grup
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat biaya lebih lanjut dapat dibuat di bawah Grup tetapi entri dapat dilakukan terhadap non-Grup
 DocType: Project,External,Eksternal
 DocType: Features Setup,Item Serial Nos,Item Serial Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Perizinan
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Alamat & Kontak
 DocType: SMS Log,Sender Name,Pengirim Nama
 DocType: Page,Title,Judul
-sites/assets/js/list.min.js +104,Customize,Sesuaikan
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Sesuaikan
 DocType: POS Profile,[Select],[Pilihan]
 DocType: SMS Log,Sent To,Dikirim Ke
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Membuat Sales Invoice
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Akhir Kehidupan
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Perjalanan
 DocType: Leave Block List,Allow Users,Izinkan Pengguna
+DocType: Purchase Order,Customer Mobile No,Pelanggan Seluler ada
 DocType: Sales Invoice,Recurring,Berulang
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Melacak Penghasilan terpisah dan Beban untuk vertikal produk atau divisi.
 DocType: Rename Tool,Rename Tool,Rename Alat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Pembaruan Biaya
 DocType: Item Reorder,Item Reorder,Item Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Material Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Material Transfer
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tentukan operasi, biaya operasi dan memberikan Operation unik ada pada operasi Anda."
 DocType: Purchase Invoice,Price List Currency,Daftar Harga Mata uang
 DocType: Naming Series,User must always select,Pengguna harus selalu pilih
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,Karyawan
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Impor Email Dari
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Undang sebagai Pengguna
 DocType: Features Setup,After Sale Installations,Pemasangan setelah Penjualan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} telah ditagih sepenuhnya
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} telah ditagih sepenuhnya
 DocType: Workstation Working Hour,End Time,Akhir Waktu
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Ketentuan kontrak standar untuk Penjualan atau Pembelian.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Group by Voucher
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,Mailing massa
 DocType: Page,Standard,Standar
 DocType: Rename Tool,File to Rename,File untuk Ganti nama
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Nomor pesanan purchse diperlukan untuk Item {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Tampilkan Pembayaran
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Ditentukan BOM {0} tidak ada untuk Item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadwal pemeliharaan {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadwal pemeliharaan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Ukuran
 DocType: Notification Control,Expense Claim Approved,Beban Klaim Disetujui
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmasi
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,Kehadiran Sampai Tanggal
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Pengaturan server masuk untuk email penjualan id. (Misalnya sales@example.com)
 DocType: Warranty Claim,Raised By,Dibesarkan Oleh
 DocType: Payment Tool,Payment Account,Akun Pembayaran
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
-sites/assets/js/list.min.js +23,Draft,Konsep
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Konsep
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensasi Off
 DocType: Quality Inspection Reading,Accepted,Diterima
 DocType: User,Female,Perempuan
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Pengiriman Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
 DocType: Newsletter,Test,tes
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Karena ada transaksi saham yang ada untuk item ini, \ Anda tidak dapat mengubah nilai-nilai 'Memiliki Serial No', 'Apakah Batch Tidak', 'Apakah Stok Item' dan 'Metode Penilaian'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Cepat Journal Masuk
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap barang
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
 DocType: Stock Entry,For Quantity,Untuk Kuantitas
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Masukkan Planned Qty untuk Item {0} pada baris {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} tidak di-posting
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Permintaan untuk item.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} tidak di-posting
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Permintaan untuk item.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Order produksi yang terpisah akan dibuat untuk setiap item barang jadi.
 DocType: Purchase Invoice,Terms and Conditions1,Syarat dan Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Pengaturan Lengkap
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailin
 DocType: Delivery Note,Transporter Name,Transporter Nama
 DocType: Contact,Enter department to which this Contact belongs,Memasukkan departemen yang Kontak ini milik
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Jumlah Absen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Item atau Gudang untuk baris {0} Material tidak cocok Permintaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item atau Gudang untuk baris {0} Material tidak cocok Permintaan
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Satuan Ukur
 DocType: Fiscal Year,Year End Date,Tanggal Akhir Tahun
 DocType: Task Depends On,Task Depends On,Tugas Tergantung Pada
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Seorang distributor pihak ketiga / agen / komisi agen / affiliate / reseller yang menjual produk-produk perusahaan untuk komisi.
 DocType: Customer Group,Has Child Node,Memiliki Anak Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Masukkan parameter url statis di sini (Misalnya pengirim = ERPNext, username = ERPNext, password = 1234 dll)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} tidak dalam Tahun Anggaran aktif. Untuk lebih jelasnya lihat {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ini adalah situs contoh auto-dihasilkan dari ERPNext
@@ -2067,11 +2078,9 @@ DocType: Note,Note,Catatan
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kuantitas
 DocType: Email Account,Email Ids,Email Id
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Tidak dapat menghasilkan lebih Barang {0} daripada kuantitas Sales Order {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Ditetapkan sebagai unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Masuk Bursa {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Masuk Bursa {0} tidak disampaikan
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Rekening Kas
 DocType: Tax Rule,Billing City,Penagihan Kota
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Aplikasi Cuti ini menunggu persetujuan. Hanya Cuti Approver dapat memperbarui status.
 DocType: Global Defaults,Hide Currency Symbol,Sembunyikan Currency Symbol
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","misalnya Bank, Kas, Kartu Kredit"
 DocType: Journal Entry,Credit Note,Nota Kredit
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Installation Note Item,Installed Qty,Terpasang Qty
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Dikirim
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Dikirim
 DocType: Salary Structure,Total Earning,Total Penghasilan
 DocType: Purchase Receipt,Time at which materials were received,Waktu di mana bahan yang diterima
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Alamat saya
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Cabang master
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,atau
 DocType: Sales Order,Billing Status,Status Penagihan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Beban utilitas
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-ke atas
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-ke atas
 DocType: Buying Settings,Default Buying Price List,Standar Membeli Daftar Harga
 ,Download Backups,Download Backup
 DocType: Notification Control,Sales Order Message,Sales Order Pesan
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Pilih Karyawan
 DocType: Bank Reconciliation,To Date,Untuk Tanggal
 DocType: Opportunity,Potential Sales Deal,Kesepakatan potensial Penjualan
-sites/assets/js/form.min.js +308,Details,Penjelasan
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Penjelasan
 DocType: Purchase Invoice,Total Taxes and Charges,Jumlah Pajak dan Biaya
 DocType: Employee,Emergency Contact,Darurat Kontak
 DocType: Item,Quality Parameters,Parameter kualitas
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,Diterima Qty
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Induk Barang
 DocType: Account,Account Type,Jenis Account
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadwal pemeliharaan tidak dihasilkan untuk semua item. Silahkan klik 'Menghasilkan Jadwal'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadwal pemeliharaan tidak dihasilkan untuk semua item. Silahkan klik 'Menghasilkan Jadwal'
 ,To Produce,Untuk Menghasilkan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Untuk baris {0} di {1}. Untuk menyertakan {2} di tingkat Item, baris {3} juga harus disertakan"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasi paket untuk pengiriman (untuk mencetak)
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Perataan
 DocType: Account,Income Account,Akun Penghasilan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Pengecoran
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Pengiriman
 DocType: Stock Reconciliation Item,Current Qty,Jumlah saat ini
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Lihat ""Rate Of Material Berbasis"" dalam Biaya Bagian"
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility area
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Semua Alamat
 DocType: Company,Stock Settings,Pengaturan saham
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan ini hanya mungkin jika sifat berikut yang sama di kedua catatan. Apakah Group, Akar Jenis, Perusahaan"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan ini hanya mungkin jika sifat berikut yang sama di kedua catatan. Apakah Group, Akar Jenis, Perusahaan"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Manage Group Pelanggan Pohon.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Baru Nama Biaya Pusat
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Baru Nama Biaya Pusat
 DocType: Leave Control Panel,Leave Control Panel,Tinggalkan Control Panel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Tidak ada Alamat bawaan Template ditemukan. Harap membuat yang baru dari Pengaturan> Percetakan dan Branding> Template Alamat.
 DocType: Appraisal,HR User,HR Pengguna
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Alat Pembayaran Detil
 ,Sales Browser,Penjualan Browser
 DocType: Journal Entry,Total Credit,Jumlah Kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya saham {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,[Daerah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya saham {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,[Daerah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman Uang Muka dan (Aset)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitur
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Besar
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Tidak ada karyawan ditemukan!
 DocType: C-Form Invoice Detail,Territory,Wilayah
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Harap menyebutkan tidak ada kunjungan yang diperlukan
+DocType: Purchase Order,Customer Address Display,Alamat Pelanggan Tampilan
 DocType: Stock Settings,Default Valuation Method,Metode standar Penilaian
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poles
 DocType: Production Order Operation,Planned Start Time,Rencana Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Dialokasikan
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Tutup Neraca dan Perhitungan Laba Rugi atau buku.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena \ Anda telah membuat beberapa transaksi (s) dengan UOM lain. Untuk mengubah UOM default, \ penggunaan 'UOM Ganti Utility' alat di bawah modul Stock."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Tentukan Nilai Tukar untuk mengkonversi satu mata uang ke yang lain
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Quotation {0} dibatalkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Quotation {0} dibatalkan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Jumlah Total Outstanding
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Karyawan {0} sedang cuti pada {1}. Tidak bisa menandai kehadiran.
 DocType: Sales Partner,Targets,Target
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ini adalah kelompok pelanggan akar dan tidak dapat diedit.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Silakan pengaturan grafik Anda account sebelum Anda mulai Entries Akuntansi
 DocType: Purchase Invoice,Ignore Pricing Rule,Abaikan Aturan Harga
-sites/assets/js/list.min.js +24,Cancelled,Dibatalkan
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Dibatalkan
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Dari Tanggal Struktur Gaji tidak bisa lebih rendah dari karyawan Bergabung Tanggal.
 DocType: Employee Education,Graduate,Lulusan
 DocType: Leave Block List,Block Days,Blokir Hari
 DocType: Journal Entry,Excise Entry,Cukai Masuk
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Peringatan: Sales Order {0} sudah ada terhadap Purchase Order Nasabah {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Peringatan: Sales Order {0} sudah ada terhadap Purchase Order Nasabah {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,Stock Diterima Tapi Tidak Ditagih
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + + Pencairan tunggakan Jumlah Jumlah - Total Pengurangan
 DocType: Monthly Distribution,Distribution Name,Nama Distribusi
 DocType: Features Setup,Sales and Purchase,Penjualan dan Pembelian
-DocType: Purchase Order Item,Material Request No,Permintaan Material yang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Kualitas Inspeksi diperlukan untuk Item {0}
+DocType: Supplier Quotation Item,Material Request No,Permintaan Material yang
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kualitas Inspeksi diperlukan untuk Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tingkat di mana mata uang pelanggan dikonversi ke mata uang dasar perusahaan
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} telah berhasil berhenti berlangganan dari daftar ini.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tingkat Net (Perusahaan Mata Uang)
-apps/frappe/frappe/templates/base.html +132,Added,Ditambahkan
+apps/frappe/frappe/templates/base.html +134,Added,Ditambahkan
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Kelola Wilayah Pohon.
 DocType: Journal Entry Account,Sales Invoice,Faktur Penjualan
 DocType: Journal Entry Account,Party Balance,Saldo Partai
 DocType: Sales Invoice Item,Time Log Batch,Waktu Log Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Silakan pilih Terapkan Diskon Pada
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Silakan pilih Terapkan Diskon Pada
 DocType: Company,Default Receivable Account,Standar Piutang Rekening
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Masuk untuk total gaji yang dibayarkan untuk kriteria di atas yang dipilih
 DocType: Stock Entry,Material Transfer for Manufacture,Alih Material untuk Industri
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Dapatkan Entries Relevan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Masuk akuntansi Saham
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Penjualan team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Item {0} tidak ada
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Item {0} tidak ada
 DocType: Sales Invoice,Customer Address,Alamat pelanggan
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Terapkan tambahan Diskon Pada
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,Inspeksi Kualitas
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Ekstra Kecil
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Semprot membentuk
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Akun {0} dibekukan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Akun {0} dibekukan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Badan Hukum / Anak dengan Bagan terpisah Account milik Organisasi.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman dan Tembakau"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL atau BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tingkat komisi tidak dapat lebih besar dari 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Persediaan Tingkat Minimum
 DocType: Stock Entry,Subcontract,Kontrak tambahan
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Masukkan {0} pertama
 DocType: Production Planning Tool,Get Items From Sales Orders,Dapatkan Item Dari Penjualan Pesanan
 DocType: Production Order Operation,Actual End Time,Realisasi Akhir Waktu
 DocType: Production Planning Tool,Download Materials Required,Unduh Bahan yang dibutuhkan
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,Dijadwalkan
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Silakan pilih item mana "Apakah Stock Item" adalah "Tidak", dan "Apakah Penjualan Item" adalah "Ya" dan tidak ada Bundle Produk lainnya"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Distribusi bulanan untuk merata mendistribusikan target di bulan.
 DocType: Purchase Invoice Item,Valuation Rate,Tingkat Penilaian
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: Penerimaan Pembelian {1} tidak ada dalam tabel di atas 'Pembelian Penerimaan'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Karyawan {0} telah diterapkan untuk {1} antara {2} dan {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Karyawan {0} telah diterapkan untuk {1} antara {2} dan {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Proyek Tanggal Mulai
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Sampai Sampai
 DocType: Rename Tool,Rename Log,Rename Log
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya node daun yang diperbolehkan dalam transaksi
 DocType: Expense Claim,Expense Approver,Beban Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Penerimaan Pembelian Barang Disediakan
-sites/assets/js/erpnext.min.js +48,Pay,Membayar
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Membayar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Untuk Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Log untuk mempertahankan status pengiriman sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Penggilingan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Kecilkan membungkus
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Tertunda Kegiatan
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Tertunda Kegiatan
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Dikonfirmasi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Pemasok> Pemasok Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Silahkan masukkan menghilangkan date.
@@ -2388,7 +2399,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Mas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Koran Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Pilih Tahun Fiskal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Peleburan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Anda adalah Leave Approver untuk record ini. Silakan Update 'Status' dan Simpan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Susun ulang Tingkat
 DocType: Attendance,Attendance Date,Tanggal Kehadiran
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gaji perpisahan berdasarkan Produktif dan Pengurangan.
@@ -2424,6 +2434,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Biaya Center dengan transaksi yang ada tidak dapat dikonversi ke grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Penyusutan
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pemasok (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Periode yang tidak valid
 DocType: Customer,Credit Limit,Batas Kredit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Pilih jenis transaksi
 DocType: GL Entry,Voucher No,Voucher Tidak ada
@@ -2433,8 +2444,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Templ
 DocType: Customer,Address and Contact,Alamat dan Kontak
 DocType: Customer,Last Day of the Next Month,Hari terakhir dari Bulan Depan
 DocType: Employee,Feedback,Umpan balik
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Karena / Referensi Tanggal melebihi diperbolehkan hari kredit pelanggan dengan {0} hari (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Susunan acara
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Karena / Referensi Tanggal melebihi diperbolehkan hari kredit pelanggan dengan {0} hari (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Susunan acara
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Mesin jet abrasif
 DocType: Stock Settings,Freeze Stock Entries,Freeze Entries Stock
 DocType: Website Settings,Website Settings,Pengaturan situs web
@@ -2448,11 +2459,11 @@ DocType: Quality Inspection,Outgoing,Ramah
 DocType: Material Request,Requested For,Diminta Untuk
 DocType: Quotation Item,Against Doctype,Terhadap Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Melacak Pengiriman ini Catatan terhadap Proyek apapun
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Account root tidak bisa dihapus
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Account root tidak bisa dihapus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Tampilkan Entries Bursa
 ,Is Primary Address,Apakah Alamat Primer
 DocType: Production Order,Work-in-Progress Warehouse,Kerja-in Progress-Gudang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referensi # {0} tanggal {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referensi # {0} tanggal {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Mengelola Alamat
 DocType: Pricing Rule,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Buat Pesanan Produksi
@@ -2461,14 +2472,14 @@ DocType: Journal Entry,User Remark,Keterangan Pengguna
 DocType: Lead,Market Segment,Segmen Pasar
 DocType: Communication,Phone,Telepon
 DocType: Employee Internal Work History,Employee Internal Work History,Karyawan Kerja internal Sejarah
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Penutup (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Penutup (Dr)
 DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial ada {0} bukan dalam stok
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template Pajak menjual transaksi.
 DocType: Sales Invoice,Write Off Outstanding Amount,Menulis Off Jumlah Outstanding
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Periksa apakah Anda memerlukan faktur berulang otomatis. Setelah mengirimkan setiap faktur penjualan, bagian Berulang akan terlihat."
 DocType: Account,Accounts Manager,Account Manajer
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Waktu Log {0} harus 'Dikirim'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Waktu Log {0} harus 'Dikirim'
 DocType: Stock Settings,Default Stock UOM,Bawaan Stock UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Biaya Tingkat berdasarkan Jenis Kegiatan (per jam)
 DocType: Production Planning Tool,Create Material Requests,Buat Permintaan Material
@@ -2479,7 +2490,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Rekonsiliasi Bank
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dapatkan Update
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Tambahkan beberapa catatan sampel
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Tinggalkan Manajemen
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Tinggalkan Manajemen
 DocType: Event,Groups,Grup
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Group by Akun
 DocType: Sales Order,Fully Delivered,Sepenuhnya Disampaikan
@@ -2491,11 +2502,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Penjualan Ekstra
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},"{0} anggaran untuk Akun {1} terhadap ""Cost Center"" {2} akan melebihi oleh {3}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Perbedaan Akun harus rekening Jenis Aset / Kewajiban, karena ini Bursa Rekonsiliasi adalah Masuk Pembukaan"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Leaves Diteruskan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tanggal Mulai' harus sebelum 'Tanggal Akhir'
 ,Stock Projected Qty,Stock Proyeksi Jumlah
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik proyek {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik proyek {1}
 DocType: Sales Order,Customer's Purchase Order,Purchase Order pelanggan
 DocType: Warranty Claim,From Company,Dari Perusahaan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Nilai atau Qty
@@ -2508,13 +2518,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Pengecer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit Untuk akun harus rekening Neraca
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Semua Jenis pemasok
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Item Code adalah wajib karena Item tidak secara otomatis nomor
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Item Code adalah wajib karena Item tidak secara otomatis nomor
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Jadwal pemeliharaan Barang
 DocType: Sales Order,%  Delivered,% Terkirim
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Cerukan Bank Akun
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Membuat Slip Gaji
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Unstop
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Telusuri BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pinjaman Aman
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produk Mengagumkan
@@ -2524,7 +2533,7 @@ DocType: Appraisal,Appraisal,Penilaian
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Pengecoran hilang-busa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Gambar
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tanggal diulang
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Tinggalkan approver harus menjadi salah satu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Tinggalkan approver harus menjadi salah satu {0}
 DocType: Hub Settings,Seller Email,Penjual Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Biaya Pembelian (Purchase Invoice via)
 DocType: Workstation Working Hour,Start Time,Waktu Mulai
@@ -2538,8 +2547,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
 DocType: BOM Operation,Hour Rate,Tingkat Jam
 DocType: Stock Settings,Item Naming By,Item Penamaan Dengan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Dari Quotation
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Lain Periode Pendaftaran penutupan {0} telah dibuat setelah {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Dari Quotation
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Lain Periode Pendaftaran penutupan {0} telah dibuat setelah {1}
 DocType: Production Order,Material Transferred for Manufacturing,Bahan Ditransfer untuk Manufaktur
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Akun {0} tidak ada
 DocType: Purchase Receipt Item,Purchase Order Item No,Purchase Order Item No
@@ -2552,11 +2561,11 @@ DocType: Item,Inspection Required,Inspeksi Diperlukan
 DocType: Purchase Invoice Item,PR Detail,PR Detil
 DocType: Sales Order,Fully Billed,Sepenuhnya Ditagih
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Pengiriman gudang diperlukan untuk item saham {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Pengiriman gudang diperlukan untuk item saham {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kotor paket. Berat + kemasan biasanya net berat bahan. (Untuk mencetak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peran ini diperbolehkan untuk mengatur account beku dan membuat / memodifikasi entri akuntansi terhadap rekening beku
 DocType: Serial No,Is Cancelled,Apakah Dibatalkan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Pengiriman saya
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Pengiriman saya
 DocType: Journal Entry,Bill Date,Bill Tanggal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Bahkan jika ada beberapa Aturan Harga dengan prioritas tertinggi, kemudian mengikuti prioritas internal diterapkan:"
 DocType: Supplier,Supplier Details,Pemasok Rincian
@@ -2569,7 +2578,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Silakan pilih Rekening Bank
 DocType: Newsletter,Create and Send Newsletters,Membuat dan Kirim Nawala
-sites/assets/js/report.min.js +107,From Date must be before To Date,Dari Tanggal harus sebelum To Date
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Dari Tanggal harus sebelum To Date
 DocType: Sales Order,Recurring Order,Berulang Order
 DocType: Company,Default Income Account,Akun Pendapatan standar
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kelompok Pelanggan / Pelanggan
@@ -2584,31 +2593,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Purchase Order {0} tidak disampaikan
 ,Projected,Proyeksi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial ada {0} bukan milik Gudang {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Catatan: Sistem tidak akan memeriksa over-pengiriman dan over-booking untuk Item {0} kuantitas atau jumlah 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Catatan: Sistem tidak akan memeriksa over-pengiriman dan over-booking untuk Item {0} kuantitas atau jumlah 0
 DocType: Notification Control,Quotation Message,Quotation Pesan
 DocType: Issue,Opening Date,Tanggal pembukaan
 DocType: Journal Entry,Remark,Komentar
 DocType: Purchase Receipt Item,Rate and Amount,Rate dan Jumlah
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Membosankan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Dari Sales Order
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Dari Sales Order
 DocType: Blog Category,Parent Website Route,Parent Situs Route
 DocType: Sales Order,Not Billed,Tidak Ditagih
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Kedua Gudang harus merupakan gudang dari Perusahaan yang sama
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Tidak ada kontak belum ditambahkan.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Tidak ada kontak belum ditambahkan.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Tidak aktif
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Terhadap Faktur Posting Tanggal
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Biaya mendarat Jumlah Voucher
 DocType: Time Log,Batched for Billing,Batched untuk Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills diajukan oleh Pemasok.
 DocType: POS Profile,Write Off Account,Menulis Off Akun
-sites/assets/js/erpnext.min.js +26,Discount Amount,Jumlah Diskon
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Jumlah Diskon
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Pembelian Faktur
 DocType: Item,Warranty Period (in days),Masa Garansi (dalam hari)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,misalnya PPN
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Masuk Rekening Journal
 DocType: Shopping Cart Settings,Quotation Series,Quotation Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Sebuah item yang ada dengan nama yang sama ({0}), silakan mengubah nama kelompok barang atau mengubah nama item"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Sebuah item yang ada dengan nama yang sama ({0}), silakan mengubah nama kelompok barang atau mengubah nama item"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gas logam panas membentuk
 DocType: Sales Order Item,Sales Order Date,Sales Order Tanggal
 DocType: Sales Invoice Item,Delivered Qty,Disampaikan Qty
@@ -2640,10 +2648,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Pelanggan atau pemasok Detail
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Tetapkan
 DocType: Lead,Lead Owner,Timbal Owner
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Gudang diperlukan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Gudang diperlukan
 DocType: Employee,Marital Status,Status Perkawinan
 DocType: Stock Settings,Auto Material Request,Permintaan Material Otomatis
 DocType: Time Log,Will be updated when billed.,Akan diperbarui saat ditagih.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tersedia Batch Qty di Gudang Dari
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM Lancar dan New BOM tidak bisa sama
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
 DocType: Sales Invoice,Against Income Account,Terhadap Akun Pendapatan
@@ -2660,12 +2669,12 @@ DocType: POS Profile,Update Stock,Perbarui Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeda untuk item akan menyebabkan salah (Total) Nilai Berat Bersih. Pastikan Berat Bersih dari setiap item di UOM sama.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tingkat
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Silakan tarik item dari Pengiriman Note
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Silakan tarik item dari Pengiriman Note
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Entri jurnal {0} un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Catatan dari semua komunikasi email jenis, telepon, chatting, kunjungan, dll"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Sebutkan Putaran Off Biaya Pusat di Perusahaan
 DocType: Purchase Invoice,Terms,Istilah
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Buat New
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Buat New
 DocType: Buying Settings,Purchase Order Required,Pesanan Pembelian Diperlukan
 ,Item-wise Sales History,Item-wise Penjualan Sejarah
 DocType: Expense Claim,Total Sanctioned Amount,Jumlah Total Disahkan
@@ -2682,16 +2691,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Slip Gaji Pengurangan
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Catatan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Pilih simpul kelompok pertama.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tujuan harus menjadi salah satu {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Isi formulir dan menyimpannya
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Isi formulir dan menyimpannya
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download laporan yang berisi semua bahan baku dengan status persediaan terbaru mereka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Menghadapi
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Komunitas
 DocType: Leave Application,Leave Balance Before Application,Tinggalkan Saldo Sebelum Aplikasi
 DocType: SMS Center,Send SMS,Kirim SMS
 DocType: Company,Default Letter Head,Standar Surat Kepala
 DocType: Time Log,Billable,Dapat ditagih
 DocType: Authorization Rule,This will be used for setting rule in HR module,Ini akan digunakan untuk menetapkan aturan dalam modul HR
 DocType: Account,Rate at which this tax is applied,Tingkat di mana pajak ini diterapkan
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Susun ulang Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Susun ulang Qty
 DocType: Company,Stock Adjustment Account,Penyesuaian Stock Akun
 DocType: Journal Entry,Write Off,Mencoret
 DocType: Time Log,Operation ID,ID Operasi
@@ -2702,12 +2712,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Diskon Fields akan tersedia dalam Purchase Order, Penerimaan Pembelian, Purchase Invoice"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akun baru. Catatan: Jangan membuat account untuk Pelanggan dan Pemasok
 DocType: Report,Report Type,Jenis Laporan
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Memuat
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Memuat
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Replace Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Negara bijaksana Alamat bawaan Template
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Pemasok memberikan kepada Nasabah
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Tampilkan pajak break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Impor dan Ekspor
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Jika Anda terlibat dalam aktivitas manufaktur. Memungkinkan Barang 'Apakah Diproduksi'
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktur Posting Tanggal
 DocType: Sales Invoice,Rounded Total,Rounded Jumlah
 DocType: Product Bundle,List items that form the package.,Daftar item yang membentuk paket.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Persentase Alokasi harus sama dengan 100%
@@ -2718,8 +2731,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Silahkan hubungi untuk pengguna yang memiliki penjualan Guru Manajer {0} peran
 DocType: Company,Default Cash Account,Standar Rekening Kas
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Perusahaan (tidak Pelanggan atau Pemasok) Master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Masukkan 'Diharapkan Pengiriman Tanggal'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Masukkan 'Diharapkan Pengiriman Tanggal'
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Jumlah yang dibayarkan + Write Off Jumlah tidak bisa lebih besar dari Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} tidak Nomor Batch berlaku untuk barang {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
@@ -2741,11 +2754,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Baris {0}: Qty tidak avalable di gudang {1} pada {2} {3}.
  Qty Tersedia: {4}, Transfer Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Butir 3
+DocType: Purchase Order,Customer Contact Email,Email Kontak Pelanggan
 DocType: Event,Sunday,Minggu
 DocType: Sales Team,Contribution (%),Kontribusi (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Catatan: Entry Pembayaran tidak akan dibuat karena 'Cash atau Rekening Bank tidak ditentukan
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Tanggung Jawab
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Contoh
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Contoh
 DocType: Sales Person,Sales Person Name,Penjualan Person Nama
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Masukkan minimal 1 faktur dalam tabel
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Tambahkan Pengguna
@@ -2754,7 +2768,7 @@ DocType: Task,Actual Start Date (via Time Logs),Sebenarnya Tanggal Mulai (via Wa
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum rekonsiliasi
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Pajak dan Biaya Ditambahkan (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
 DocType: Sales Order,Partly Billed,Sebagian Ditagih
 DocType: Item,Default BOM,Standar BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2762,12 +2776,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Jumlah Posisi Amt
 DocType: Time Log Batch,Total Hours,Jumlah Jam
 DocType: Journal Entry,Printing Settings,Pengaturan pencetakan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Otomotif
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Daun untuk tipe {0} sudah dialokasikan untuk Karyawan {1} Tahun Anggaran {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item diperlukan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Logam injection molding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Dari Delivery Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Dari Delivery Note
 DocType: Time Log,From Time,Dari Waktu
 DocType: Notification Control,Custom Message,Custom Pesan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Perbankan Investasi
@@ -2783,10 +2796,10 @@ DocType: Newsletter,A Lead with this email id should exist,Sebuah Lead dengan id
 DocType: Stock Entry,From BOM,Dari BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Dasar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksi saham sebelum {0} dibekukan
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',Silahkan klik 'Menghasilkan Jadwal'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Untuk tanggal harus sama dengan Dari Tanggal untuk cuti Half Day
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Silahkan klik 'Menghasilkan Jadwal'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Untuk tanggal harus sama dengan Dari Tanggal untuk cuti Half Day
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","misalnya Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referensi ada adalah wajib jika Anda memasukkan Referensi Tanggal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referensi ada adalah wajib jika Anda memasukkan Referensi Tanggal
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Tanggal Bergabung harus lebih besar dari Tanggal Lahir
 DocType: Salary Structure,Salary Structure,Struktur Gaji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2794,7 +2807,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  konflik dengan menetapkan prioritas. Harga Aturan: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Maskapai Penerbangan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Isu Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Isu Material
 DocType: Material Request Item,For Warehouse,Untuk Gudang
 DocType: Employee,Offer Date,Penawaran Tanggal
 DocType: Hub Settings,Access Token,Akses Token
@@ -2817,6 +2830,7 @@ DocType: Issue,Opening Time,Membuka Waktu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan Untuk tanggal yang Anda inginkan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Efek & Bursa Komoditi
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
+DocType: Delivery Note Item,From Warehouse,Dari Gudang
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Pengeboran
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow molding
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Total
@@ -2838,11 +2852,12 @@ DocType: C-Form,Amended From,Diubah Dari
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Bahan Baku
 DocType: Leave Application,Follow via Email,Ikuti via Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Jumlah pajak Setelah Diskon Jumlah
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Akun anak ada untuk akun ini. Anda tidak dapat menghapus akun ini.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Akun anak ada untuk akun ini. Anda tidak dapat menghapus akun ini.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Entah sasaran qty atau jumlah target adalah wajib
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Tidak ada standar BOM ada untuk Item {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Silakan pilih Posting Tanggal pertama
-DocType: Leave Allocation,Carry Forward,Carry Teruskan
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Tidak ada standar BOM ada untuk Item {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Silakan pilih Posting Tanggal pertama
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tanggal pembukaan harus sebelum Tanggal Penutupan
+DocType: Leave Control Panel,Carry Forward,Carry Teruskan
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Biaya Center dengan transaksi yang ada tidak dapat dikonversi ke buku
 DocType: Department,Days for which Holidays are blocked for this department.,Hari yang Holidays diblokir untuk departemen ini.
 ,Produced,Diproduksi
@@ -2863,17 +2878,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Hiburan & Kenyamanan
 DocType: Purchase Order,The date on which recurring order will be stop,Tanggal perintah berulang akan berhenti
 DocType: Quality Inspection,Item Serial No,Item Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} harus dikurangi oleh {1} atau Anda harus meningkatkan toleransi overflow
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} harus dikurangi oleh {1} atau Anda harus meningkatkan toleransi overflow
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Hadir
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Jam
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serial Barang {0} tidak dapat diperbarui \
  menggunakan Stock Rekonsiliasi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Mentransfer Bahan untuk Pemasok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Mentransfer Bahan untuk Pemasok
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Baru Serial ada tidak dapat memiliki Gudang. Gudang harus diatur oleh Bursa Masuk atau Penerimaan Pembelian
 DocType: Lead,Lead Type,Timbal Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Buat Quotation
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Semua barang-barang tersebut telah ditagih
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Semua barang-barang tersebut telah ditagih
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Dapat disetujui oleh {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Aturan Pengiriman Kondisi
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru setelah penggantian
@@ -2921,7 +2936,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID operasi tidak diatur
 DocType: Production Order,Planned Start Date,Direncanakan Tanggal Mulai
 DocType: Serial No,Creation Document Type,Pembuatan Dokumen Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Kunjungan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Kunjungan
 DocType: Leave Type,Is Encash,Apakah menjual
 DocType: Purchase Invoice,Mobile No,Ponsel Tidak ada
 DocType: Payment Tool,Make Journal Entry,Membuat Jurnal Entri
@@ -2929,7 +2944,7 @@ DocType: Leave Allocation,New Leaves Allocated,Daun baru Dialokasikan
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data proyek-bijaksana tidak tersedia untuk Quotation
 DocType: Project,Expected End Date,Diharapkan Tanggal Akhir
 DocType: Appraisal Template,Appraisal Template Title,Judul Template Penilaian
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Komersial
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Komersial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Induk Barang {0} tidak harus menjadi Stok Item
 DocType: Cost Center,Distribution Id,Id Distribusi
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Layanan mengagumkan
@@ -2945,14 +2960,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Nilai untuk Atribut {0} harus berada dalam kisaran {1} ke {2} dalam penambahan sebesar {3}
 DocType: Tax Rule,Sales,Penjualan
 DocType: Stock Entry Detail,Basic Amount,Dasar Jumlah
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Barang {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Barang {0}
+DocType: Leave Allocation,Unused leaves,Daun terpakai
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standar Piutang Account
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Menggergaji
 DocType: Tax Rule,Billing State,Negara penagihan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
 DocType: Authorization Rule,Applicable To (Employee),Berlaku Untuk (Karyawan)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
@@ -2968,6 +2984,7 @@ DocType: Company,Retail,Eceran
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Pelanggan {0} tidak ada
 DocType: Attendance,Absent,Absen
 DocType: Product Bundle,Product Bundle,Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: referensi tidak valid {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Penghancuran
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Pajak dan Biaya Template
 DocType: Upload Attendance,Download Template,Download Template
@@ -2975,16 +2992,16 @@ DocType: GL Entry,Remarks,Keterangan
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan Baku Item Code
 DocType: Journal Entry,Write Off Based On,Menulis Off Berbasis On
 DocType: Features Setup,POS View,Lihat POS
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Catatan instalasi untuk No Serial
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Catatan instalasi untuk No Serial
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Pengecoran kontinu
-sites/assets/js/erpnext.min.js +10,Please specify a,Silakan tentukan
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Silakan tentukan
 DocType: Offer Letter,Awaiting Response,Menunggu Respon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Di atas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Sizing Dingin
 DocType: Salary Slip,Earning & Deduction,Earning & Pengurangan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Akun {0} tidak dapat menjadi akun Grup
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Daerah
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Opsional. Pengaturan ini akan digunakan untuk menyaring dalam berbagai transaksi.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opsional. Pengaturan ini akan digunakan untuk menyaring dalam berbagai transaksi.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Tingkat Penilaian negatif tidak diperbolehkan
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk misalnya 2012, 2012-13"
@@ -3028,12 +3045,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Menonjol
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Menguapkan-pola pengecoran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Beban Hiburan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktur Penjualan {0} harus dibatalkan sebelum membatalkan Sales Order ini
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Usia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktur Penjualan {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Usia
 DocType: Time Log,Billing Amount,Penagihan Jumlah
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Kuantitas tidak valid untuk item {0}. Jumlah harus lebih besar dari 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Aplikasi untuk cuti.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Beban Legal
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Hari bulan yang urutan otomatis akan dihasilkan misalnya 05, 28 dll"
 DocType: Sales Invoice,Posting Time,Posting Waktu
@@ -3042,9 +3059,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Periksa ini jika Anda ingin untuk memaksa pengguna untuk memilih seri sebelum menyimpan. Tidak akan ada default jika Anda memeriksa ini.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Tidak ada Barang dengan Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Terbuka Pemberitahuan
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Terbuka Pemberitahuan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Beban Langsung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Apakah Anda benar-benar ingin unstop Permintaan Bahan ini?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Pendapatan Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Biaya Perjalanan
 DocType: Maintenance Visit,Breakdown,Rincian
@@ -3055,7 +3071,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Seperti pada Tanggal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Mengasah
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Percobaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Standar Warehouse adalah wajib bagi saham Barang.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standar Warehouse adalah wajib bagi saham Barang.
 DocType: Feed,Full Name,Nama Lengkap
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Meraih
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
@@ -3078,7 +3094,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tambahkan baris
 DocType: Buying Settings,Default Supplier Type,Standar Pemasok Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Penggalian
 DocType: Production Order,Total Operating Cost,Total Biaya Operasional
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Catatan: Barang {0} masuk beberapa kali
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Catatan: Barang {0} masuk beberapa kali
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Semua Kontak.
 DocType: Newsletter,Test Email Id,Uji Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Singkatan Perusahaan
@@ -3102,11 +3118,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Harga u
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peran Diizinkan untuk mengedit saham beku
 ,Territory Target Variance Item Group-Wise,Wilayah Sasaran Variance Barang Group-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Semua Grup Pelanggan
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data rekaman kurs mata uang tidak dibuat untuk {1} ke {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data rekaman kurs mata uang tidak dibuat untuk {1} ke {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template pajak adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Daftar Harga Rate (Perusahaan Mata Uang)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} status 'Dihentikan'
 DocType: Account,Temporary,Sementara
 DocType: Address,Preferred Billing Address,Disukai Alamat Penagihan
 DocType: Monthly Distribution Percentage,Percentage Allocation,Persentase Alokasi
@@ -3124,13 +3139,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Barang Wise Detil Pajak
 DocType: Purchase Order Item,Supplier Quotation,Pemasok Quotation
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Kata-kata akan terlihat sekali Anda menyimpan Quotation tersebut.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Setrika
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} dihentikan
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} dihentikan
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
 DocType: Lead,Add to calendar on this date,Tambahkan ke kalender pada tanggal ini
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Aturan untuk menambahkan biaya pengiriman.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Acara Mendatang
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Acara Mendatang
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Pelanggan diwajibkan
 DocType: Letter Head,Letter Head,Surat Kepala
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entri Cepat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} adalah wajib bagi Kembali
 DocType: Purchase Order,To Receive,Menerima
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Kecilkan pas
@@ -3154,25 +3170,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Setidaknya satu gudang adalah wajib
 DocType: Serial No,Out of Warranty,Out of Garansi
 DocType: BOM Replace Tool,Replace,Mengganti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Masukkan Satuan default Ukur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Masukkan Satuan default Ukur
 DocType: Purchase Invoice Item,Project Name,Nama Proyek
 DocType: Supplier,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
 DocType: Workflow State,Edit,Ubah
 DocType: Journal Entry Account,If Income or Expense,Jika Penghasilan atau Beban
 DocType: Features Setup,Item Batch Nos,Item Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Nilai saham Perbedaan
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Sumber Daya Manusia
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Sumber Daya Manusia
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Rekonsiliasi Pembayaran Pembayaran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Aset pajak
 DocType: BOM Item,BOM No,No. BOM
 DocType: Contact Us Settings,Pincode,Kode PIN
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entri {0} tidak memiliki akun {1} atau sudah dicocokkan voucher lainnya
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entri {0} tidak memiliki akun {1} atau sudah dicocokkan voucher lainnya
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM yang akan diganti
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM harus berbeda dari UOM saham saat ini
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Daun harus dialokasikan dalam kelipatan 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Daun harus dialokasikan dalam kelipatan 0,5"
 DocType: Production Order,Operation Cost,Biaya Operasi
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload kehadiran dari file csv.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Posisi Amt
@@ -3180,7 +3196,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Target
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Untuk menetapkan masalah ini, gunakan ""Assign"" tombol di sidebar."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bekukan Saham Lama Dari [Hari]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jika dua atau lebih Aturan Harga yang ditemukan berdasarkan kondisi di atas, Prioritas diterapkan. Prioritas adalah angka antara 0 sampai 20, sementara nilai default adalah nol (kosong). Jumlah yang lebih tinggi berarti akan diutamakan jika ada beberapa Aturan Harga dengan kondisi yang sama."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Terhadap Faktur
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Tahun Anggaran: {0} tidak ada
 DocType: Currency Exchange,To Currency,Untuk Mata
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Izinkan pengguna ini untuk menyetujui aplikasi izin cuti untuk hari yang terpilih(blocked).
@@ -3209,7 +3224,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate
 DocType: Stock Entry Detail,Additional Cost,Biaya tambahan
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Tahun Keuangan Akhir Tanggal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Membuat Pemasok Quotation
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Membuat Pemasok Quotation
 DocType: Quality Inspection,Incoming,Incoming
 DocType: BOM,Materials Required (Exploded),Bahan yang dibutuhkan (Meledak)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Mengurangi Produktif untuk Tinggalkan Tanpa Bayar (LWP)
@@ -3217,10 +3232,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} tidak sesuai dengan {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Santai Cuti
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Catatan: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Catatan: {0}
 ,Delivery Note Trends,Tren pengiriman Note
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ringkasan minggu ini
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} harus merupakan barang yang dibeli atau barang sub-kontrak di baris {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} harus merupakan barang yang dibeli atau barang sub-kontrak di baris {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Account: {0} hanya dapat diperbarui melalui Transaksi Bursa
 DocType: GL Entry,Party,Pihak
 DocType: Sales Order,Delivery Date,Tanggal Pengiriman
@@ -3233,7 +3248,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,P
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Tingkat Membeli
 DocType: Task,Actual Time (in Hours),Waktu yang sebenarnya (di Jam)
 DocType: Employee,History In Company,Sejarah Dalam Perusahaan
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Newsletter
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletter
 DocType: Address,Shipping,Pengiriman
 DocType: Stock Ledger Entry,Stock Ledger Entry,Bursa Ledger entri
 DocType: Department,Leave Block List,Tinggalkan Block List
@@ -3252,7 +3267,7 @@ DocType: Account,Auditor,Akuntan
 DocType: Purchase Order,End date of current order's period,Tanggal akhir periode orde berjalan
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Membuat Penawaran Surat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Kembali
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Standar Satuan Ukur untuk Varian harus sama dengan Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standar Satuan Ukur untuk Varian harus sama dengan Template
 DocType: DocField,Fold,Melipat
 DocType: Production Order Operation,Production Order Operation,Pesanan Operasi Produksi
 DocType: Pricing Rule,Disable,Nonaktifkan
@@ -3284,7 +3299,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Laporan untuk
 DocType: SMS Settings,Enter url parameter for receiver nos,Masukkan parameter url untuk penerima nos
 DocType: Sales Invoice,Paid Amount,Dibayar Jumlah
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Menutup Akun {0} harus bertipe 'Kewajiban'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Menutup Akun {0} harus bertipe 'Kewajiban'
 ,Available Stock for Packing Items,Tersedia Stock untuk Packing Produk
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Mengatur Template Alamat ini sebagai default karena tidak ada standar lainnya
@@ -3292,7 +3307,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Manajemen Kualitas
 DocType: Production Planning Tool,Filter based on customer,Filter berdasarkan pelanggan
 DocType: Payment Tool Detail,Against Voucher No,Terhadap Voucher Tidak ada
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Mohon masukkan untuk Item {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Mohon masukkan untuk Item {0}
 DocType: Employee External Work History,Employee External Work History,Karyawan Eksternal Riwayat Pekerjaan
 DocType: Tax Rule,Purchase,Pembelian
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Jumlah Saldo
@@ -3329,28 +3344,29 @@ Note: BOM = Bill of Materials","Kelompok agregat Item ** ** ke lain ** Barang **
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serial ada adalah wajib untuk Item {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Silakan tentukan dari / ke berkisar
-sites/assets/js/desk.min.js +7652,Created By,Dibuat Oleh
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Dibuat Oleh
 DocType: Serial No,Under AMC,Di bawah AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Tingkat penilaian Item dihitung ulang mengingat mendarat biaya jumlah voucher
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Pengaturan default untuk menjual transaksi.
 DocType: BOM Replace Tool,Current BOM,BOM saat ini
-sites/assets/js/erpnext.min.js +8,Add Serial No,Tambahkan Nomor Serial
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Tambahkan Nomor Serial
 DocType: Production Order,Warehouses,Gudang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Cetak dan Alat Tulis
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Node kelompok
 DocType: Payment Reconciliation,Minimum Amount,Jumlah Minimum
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Barang pembaruan Selesai
 DocType: Workstation,per hour,per jam
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Seri {0} sudah digunakan dalam {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Seri {0} sudah digunakan dalam {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Akun untuk gudang (Inventaris Perpetual) akan dibuat di bawah Rekening ini.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak dapat dihapus sebagai entri stok buku ada untuk gudang ini.
 DocType: Company,Distribution,Distribusi
-sites/assets/js/erpnext.min.js +50,Amount Paid,Jumlah Dibayar
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Jumlah Dibayar
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Manager Project
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Pengiriman
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Diskon Max diperbolehkan untuk item: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Pajak default dan Biaya
 DocType: Account,Receivable,Piutang
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak diperbolehkan untuk mengubah Pemasok sebagai Purchase Order sudah ada
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peran yang diperbolehkan untuk mengirimkan transaksi yang melebihi batas kredit yang ditetapkan.
 DocType: Sales Invoice,Supplier Reference,Pemasok Referensi
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Jika dicentang, BOM untuk item sub-assembly akan dipertimbangkan untuk mendapatkan bahan baku. Jika tidak, semua item sub-assembly akan diperlakukan sebagai bahan baku."
@@ -3387,8 +3403,8 @@ DocType: Email Digest,Add/Remove Recipients,Tambah / Hapus Penerima
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaksi tidak diperbolehkan berhenti melawan Orde Produksi {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk mengatur Tahun Anggaran ini sebagai Default, klik 'Set as Default'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Pengaturan server masuk untuk email dukungan id. (Misalnya support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Kekurangan Jumlah
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Kekurangan Jumlah
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
 DocType: Salary Slip,Salary Slip,Slip Gaji
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Sampai Tanggal' harus diisi
@@ -3401,6 +3417,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ketika salah satu transaksi yang diperiksa ""Dikirim"", email pop-up secara otomatis dibuka untuk mengirim email ke terkait ""Kontak"" dalam transaksi itu, dengan transaksi sebagai lampiran. Pengguna mungkin atau mungkin tidak mengirim email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Pengaturan global
 DocType: Employee Education,Employee Education,Pendidikan Karyawan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Akun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial ada {0} telah diterima
@@ -3433,7 +3450,7 @@ DocType: BOM,Manufacturing User,Manufaktur Pengguna
 DocType: Purchase Order,Raw Materials Supplied,Disediakan Bahan Baku
 DocType: Purchase Invoice,Recurring Print Format,Berulang Print Format
 DocType: Communication,Series,Seri
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Diharapkan Pengiriman Tanggal tidak bisa sebelum Purchase Order Tanggal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Diharapkan Pengiriman Tanggal tidak bisa sebelum Purchase Order Tanggal
 DocType: Appraisal,Appraisal Template,Template Penilaian
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Klasifikasi Barang
@@ -3489,6 +3506,7 @@ DocType: HR Settings,Payroll Settings,Pengaturan Payroll
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Cocokkan Faktur non-linked dan Pembayaran.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Order
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root tidak dapat memiliki pusat biaya orang tua
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Pilih Merek ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Berlaku
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
 DocType: Supplier,Address and Contacts,Alamat dan Kontak
@@ -3499,7 +3517,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Dapatkan Posisi Voucher
 DocType: Warranty Claim,Resolved By,Terselesaikan Dengan
 DocType: Appraisal,Start Date,Tanggal Mulai
-sites/assets/js/desk.min.js +7629,Value,Nilai
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Nilai
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alokasi cuti untuk periode tertentu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik di sini untuk memverifikasi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Akun {0}: Anda tidak dapat menetapkanya sebagai Akun Induk
@@ -3515,14 +3533,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Access Diizinkan
 DocType: Dropbox Backup,Weekly,Mingguan
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Misalnya. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Menerima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Menerima
 DocType: Maintenance Visit,Fully Completed,Sepenuhnya Selesai
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Lengkap
 DocType: Employee,Educational Qualification,Kualifikasi Pendidikan
 DocType: Workstation,Operating Costs,Biaya Operasional
 DocType: Employee Leave Approver,Employee Leave Approver,Karyawan Tinggalkan Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} telah berhasil ditambahkan ke daftar Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektron beam mesin
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Guru Manajer
@@ -3535,7 +3553,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Tambah / Edit Harga
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Bagan Pusat Biaya
 ,Requested Items To Be Ordered,Produk Diminta Akan Memerintahkan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Pesanan saya
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Pesanan saya
 DocType: Price List,Price List Name,Daftar Harga Nama
 DocType: Time Log,For Manufacturing,Untuk Manufaktur
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Total
@@ -3546,7 +3564,7 @@ DocType: Account,Income,Penghasilan
 DocType: Industry Type,Industry Type,Jenis Industri
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Ada yang salah!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Peringatan: Tinggalkan aplikasi berisi tanggal blok berikut
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah disampaikan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah disampaikan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Tanggal Penyelesaian
 DocType: Purchase Invoice Item,Amount (Company Currency),Jumlah (Perusahaan Mata Uang)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die pengecoran
@@ -3560,10 +3578,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Tahun
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Silahkan Perbarui Pengaturan SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Waktu Log {0} sudah ditagih
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Waktu Log {0} sudah ditagih
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Pinjaman Tanpa Jaminan
 DocType: Cost Center,Cost Center Name,Biaya Nama Pusat
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Item {0} dengan Serial No {1} sudah diinstal
 DocType: Maintenance Schedule Detail,Scheduled Date,Dijadwalkan Tanggal
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Pesan lebih dari 160 karakter akan dipecah menjadi beberapa pesan
@@ -3571,10 +3588,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Diterima dan Diterima
 ,Serial No Service Contract Expiry,Serial No Layanan Kontrak kadaluarsa
 DocType: Item,Unit of Measure Conversion,Unit Konversi Ukur
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Karyawan tidak dapat diubah
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
 DocType: Naming Series,Help HTML,Bantuan HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Jumlah weightage ditugaskan harus 100%. Ini adalah {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Penyisihan over-{0} menyeberang untuk Item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Penyisihan over-{0} menyeberang untuk Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nama orang atau organisasi yang alamat ini milik.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Pemasok Anda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat.
@@ -3585,10 +3602,11 @@ DocType: Lead,Converted,Dikonversi
 DocType: Item,Has Serial No,Memiliki Serial No
 DocType: Employee,Date of Issue,Tanggal Issue
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Set Pemasok untuk item {1}
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Daftar Barang ini dalam beberapa kelompok di website.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} tidak ada dalam sistem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai yg sedang dibekukan
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan Entries Unreconciled
@@ -3599,14 +3617,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Untuk Gudang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Akun {0} telah dimasukkan lebih dari sekali untuk tahun fiskal {1}
 ,Average Commission Rate,Rata-rata Komisi Tingkat
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-persediaan"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-persediaan"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
 DocType: Pricing Rule,Pricing Rule Help,Aturan Harga Bantuan
 DocType: Purchase Taxes and Charges,Account Head,Akun Kepala
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Memperbarui biaya tambahan untuk menghitung biaya mendarat item
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Listrik
 DocType: Stock Entry,Total Value Difference (Out - In),Total Nilai Selisih (Out - Dalam)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Row {0}: Kurs adalah wajib
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Kurs adalah wajib
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID tidak ditetapkan untuk Karyawan {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Dari Garansi Klaim
@@ -3620,15 +3638,17 @@ DocType: Buying Settings,Naming Series,Penamaan Series
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Block List
 DocType: User,Enabled,Diaktifkan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aset saham
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Apakah Anda benar-benar ingin Menyerahkan semua Slip Gaji untuk bulan {0} dan tahun {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Apakah Anda benar-benar ingin Menyerahkan semua Slip Gaji untuk bulan {0} dan tahun {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Pelanggan impor
 DocType: Target Detail,Target Qty,Sasaran Qty
 DocType: Attendance,Present,ada
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Pengiriman Note {0} tidak boleh disampaikan
 DocType: Notification Control,Sales Invoice Message,Penjualan Faktur Pesan
 DocType: Authorization Rule,Based On,Berdasarkan
-,Ordered Qty,Memerintahkan Qty
+DocType: Sales Order Item,Ordered Qty,Memerintahkan Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Item {0} dinonaktifkan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode Dari dan Untuk Periode tanggal wajib bagi berulang {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Kegiatan proyek / tugas.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Menghasilkan Gaji Slips
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} bukan id email yang valid
@@ -3668,7 +3688,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Upload Kehadiran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dan Manufaktur Kuantitas diperlukan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Penuaan Rentang 2
-DocType: Journal Entry Account,Amount,Jumlah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Jumlah
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Menarik
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM diganti
 ,Sales Analytics,Penjualan Analytics
@@ -3695,7 +3715,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Diharapkan Tanggal tidak bisa sebelum Material Request Tanggal
 DocType: Contact Us Settings,City,Kota
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic mesin
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Kesalahan: Tidak id valid?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Kesalahan: Tidak id valid?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} harus Item Penjualan
 DocType: Naming Series,Update Series Number,Pembaruan Series Number
 DocType: Account,Equity,Modal
@@ -3710,7 +3730,7 @@ DocType: Purchase Taxes and Charges,Actual,Aktual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Diskon
 DocType: Purchase Invoice,Against Expense Account,Terhadap Akun Biaya
 DocType: Production Order,Production Order,Pesanan Produksi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Instalasi Catatan {0} telah disampaikan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalasi Catatan {0} telah disampaikan
 DocType: Quotation Item,Against Docname,Terhadap Docname
 DocType: SMS Center,All Employee (Active),Semua Karyawan (Aktif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
@@ -3718,14 +3738,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Biaya Bahan Baku
 DocType: Item,Re-Order Level,Re-order Tingkat
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Masukkan item dan qty direncanakan untuk yang Anda ingin meningkatkan pesanan produksi atau download bahan baku untuk analisis.
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt Bagan
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Bagan
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Daftar hari libur yang berlaku
 DocType: Employee,Cheque,Cek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seri Diperbarui
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Serial Number Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi saham Barang {0} berturut-turut {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi saham Barang {0} berturut-turut {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Grosir
 DocType: Issue,First Responded On,Pertama Menanggapi On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Daftar Lintas Item dalam beberapa kelompok
@@ -3740,7 +3760,7 @@ DocType: Attendance,Attendance,Kehadiran
 DocType: Page,No,Nomor
 DocType: BOM,Materials,bahan materi
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jika tidak diperiksa, daftar harus ditambahkan ke setiap departemen di mana itu harus diterapkan."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Template pajak untuk membeli transaksi.
 ,Item Prices,Harga Barang
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Purchase Order.
@@ -3760,9 +3780,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Beban Administrasi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Konsultasi
 DocType: Customer Group,Parent Customer Group,Induk Pelanggan Grup
-sites/assets/js/erpnext.min.js +50,Change,Perubahan
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Perubahan
 DocType: Purchase Invoice,Contact Email,Email Kontak
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Pesanan Pembelian {0} 'Berhenti'
 DocType: Appraisal Goal,Score Earned,Skor Earned
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","misalnya ""My Company LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Pemberitahuan Masa
@@ -3772,12 +3791,13 @@ DocType: Packing Slip,Gross Weight UOM,Berat Kotor UOM
 DocType: Email Digest,Receivables / Payables,Piutang / Hutang
 DocType: Delivery Note Item,Against Sales Invoice,Terhadap Faktur Penjualan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Pencetakan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Akun kredit
 DocType: Landed Cost Item,Landed Cost Item,Landed Biaya Barang
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Tampilkan nilai nol
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Jumlah barang yang diperoleh setelah manufaktur / repacking dari mengingat jumlah bahan baku
 DocType: Payment Reconciliation,Receivable / Payable Account,Piutang / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Sales Order Barang
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Standar Gudang
 DocType: Task,Actual End Date (via Time Logs),Sebenarnya Tanggal Akhir (via Waktu Log)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Anggaran tidak dapat diberikan terhadap Account Group {0}
@@ -3791,7 +3811,7 @@ DocType: Issue,Support Team,Dukungan Tim
 DocType: Appraisal,Total Score (Out of 5),Skor Total (Out of 5)
 DocType: Contact Us Settings,State,Propinsi
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Keseimbangan
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Keseimbangan
 DocType: Project,Total Expense Claim (via Expense Claims),Jumlah Klaim Beban (via Klaim Beban)
 DocType: User,Gender,Jenis Kelamin
 DocType: Journal Entry,Debit Note,Debit Note
@@ -3807,9 +3827,8 @@ DocType: Lead,Blog Subscriber,Blog Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Buat aturan untuk membatasi transaksi berdasarkan nilai-nilai.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jika dicentang, total ada. dari Hari Kerja akan mencakup libur, dan ini akan mengurangi nilai Gaji Per Hari"
 DocType: Purchase Invoice,Total Advance,Jumlah Uang Muka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Unstop Material Permintaan
 DocType: Workflow State,User,Pengguna
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Pengolahan Payroll
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Pengolahan Payroll
 DocType: Opportunity Item,Basic Rate,Harga Dasar
 DocType: GL Entry,Credit Amount,Jumlah kredit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Set as Hilang
@@ -3817,7 +3836,7 @@ DocType: Customer,Credit Days Based On,Hari Kredit Berdasarkan
 DocType: Tax Rule,Tax Rule,Aturan pajak
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Menjaga Tingkat Sama Sepanjang Siklus Penjualan
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Rencana waktu log luar Jam Kerja Workstation.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} telah diserahkan
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} telah diserahkan
 ,Items To Be Requested,Items Akan Diminta
 DocType: Purchase Order,Get Last Purchase Rate,Dapatkan Terakhir Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Tingkat penagihan berdasarkan Jenis Kegiatan (per jam)
@@ -3826,6 +3845,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Perusahaan Email ID tidak ditemukan, maka surat tidak terkirim"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Penerapan Dana (Aset)
 DocType: Production Planning Tool,Filter based on item,Filter berdasarkan pada item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Akun Debit
 DocType: Fiscal Year,Year Start Date,Tanggal Mulai Tahun
 DocType: Attendance,Employee Name,Nama Karyawan
 DocType: Sales Invoice,Rounded Total (Company Currency),Rounded Jumlah (Perusahaan Mata Uang)
@@ -3837,14 +3857,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Karyawan
 DocType: Sales Invoice,Is POS,Apakah POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Diproduksi Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Kuantitas Diterima
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak ada
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bills diajukan ke Pelanggan.
 DocType: DocField,Default,Dfault
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proyek Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pelanggan telah ditambahkan
 DocType: Maintenance Schedule,Schedule,Jadwal
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Tentukan Anggaran untuk Biaya Pusat ini. Untuk mengatur aksi anggaran, lihat "Daftar Perusahaan""
@@ -3852,7 +3872,7 @@ DocType: Account,Parent Account,Rekening Induk
 DocType: Quality Inspection Reading,Reading 3,Membaca 3
 ,Hub,Pusat
 DocType: GL Entry,Voucher Type,Voucher Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
 DocType: Expense Claim,Approved,Disetujui
 DocType: Pricing Rule,Price,Harga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
@@ -3861,23 +3881,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Pendidikan
 DocType: Selling Settings,Campaign Naming By,Penamaan Promosi dengan
 DocType: Employee,Current Address Is,Alamat saat ini adalah
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opsional. Set mata uang default perusahaan, jika tidak ditentukan."
 DocType: Address,Office,Kantor
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Laporan standar
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Pencatatan Jurnal akuntansi.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Silakan pilih Rekam Karyawan pertama.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partai / Rekening tidak sesuai dengan {1} / {2} di {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Jumlah yang tersedia di Gudang Dari
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Silakan pilih Rekam Karyawan pertama.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partai / Rekening tidak sesuai dengan {1} / {2} di {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Untuk membuat Akun Pajak
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Masukkan Beban Akun
 DocType: Account,Stock,Stock
 DocType: Employee,Current Address,Alamat saat ini
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jika item adalah varian dari item lain maka deskripsi, gambar, harga, pajak dll akan ditetapkan dari template kecuali secara eksplisit ditentukan"
 DocType: Serial No,Purchase / Manufacture Details,Detail Pembelian / Industri
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch Persediaan
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Persediaan
 DocType: Employee,Contract End Date,Tanggal Kontrak End
 DocType: Sales Order,Track this Sales Order against any Project,Melacak Pesanan Penjualan ini terhadap Proyek apapun
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tarik pesanan penjualan (pending untuk memberikan) berdasarkan kriteria di atas
 DocType: DocShare,Document Type,Jenis Dokumen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Dari Pemasok Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Dari Pemasok Quotation
 DocType: Deduction Type,Deduction Type,Pengurangan Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Qty
@@ -3888,20 +3910,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Untuk Quantity (Diproduksi Qty) adalah wajib
 DocType: Stock Entry,Default Target Warehouse,Standar Sasaran Gudang
 DocType: Purchase Invoice,Net Total (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partai Jenis dan Partai ini hanya berlaku terhadap Piutang / Hutang akun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partai Jenis dan Partai ini hanya berlaku terhadap Piutang / Hutang akun
 DocType: Notification Control,Purchase Receipt Message,Penerimaan Pembelian Pesan
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Jumlah daun dialokasikan lebih dari periode
 DocType: Production Order,Actual Start Date,Tanggal Mulai Aktual
 DocType: Sales Order,% of materials delivered against this Sales Order,% Dari materi yang disampaikan terhadap Sales Order ini
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Gerakan barang Rekam.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gerakan barang Rekam.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Daftar Pelanggan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Layanan
 DocType: Hub Settings,Hub Settings,Pengaturan Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Dengan Operasi
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri akuntansi telah dibuat dalam mata uang {0} untuk perusahaan {1}. Silakan pilih akun piutang atau hutang dengan mata uang {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri akuntansi telah dibuat dalam mata uang {0} untuk perusahaan {1}. Silakan pilih akun piutang atau hutang dengan mata uang {0}.
 ,Monthly Salary Register,Gaji Bulanan Daftar
-apps/frappe/frappe/website/template.py +123,Next,Berikutnya
+apps/frappe/frappe/website/template.py +140,Next,Berikutnya
 DocType: Warranty Claim,If different than customer address,Jika berbeda dari alamat pelanggan
 DocType: BOM Operation,BOM Operation,BOM Operation
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3932,6 +3955,7 @@ DocType: Purchase Invoice,Next Date,Berikutnya Tanggal
 DocType: Employee Education,Major/Optional Subjects,Mayor / Opsional Subjek
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Cukup masukkan Pajak dan Biaya
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Machining
+DocType: Sales Invoice Item,Drop Ship,Drop Kapal
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini Anda dapat mempertahankan rincian keluarga seperti nama dan pekerjaan orang tua, pasangan dan anak-anak"
 DocType: Hub Settings,Seller Name,Penjual Nama
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Pajak dan Biaya Dikurangi (Perusahaan Mata Uang)
@@ -3958,29 +3982,29 @@ DocType: Purchase Order,To Receive and Bill,Untuk Menerima dan Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Perancang
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Syarat dan Ketentuan Template
 DocType: Serial No,Delivery Details,Detail Pengiriman
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Secara otomatis membuat Bahan Permintaan jika kuantitas turun di bawah tingkat ini
 ,Item-wise Purchase Register,Barang-bijaksana Pembelian Register
 DocType: Batch,Expiry Date,Tanggal Berakhir
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk mengatur tingkat pemesanan ulang, barang harus Item Pembelian atau Manufacturing Barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk mengatur tingkat pemesanan ulang, barang harus Item Pembelian atau Manufacturing Barang"
 ,Supplier Addresses and Contacts,Pemasok Alamat dan Kontak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Silahkan pilih Kategori pertama
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Menguasai proyek.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Jangan menunjukkan simbol seperti $ etc sebelah mata uang.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Setengah Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Setengah Hari)
 DocType: Supplier,Credit Days,Hari Kredit
 DocType: Leave Type,Is Carry Forward,Apakah Carry Teruskan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Dapatkan item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Dapatkan item dari BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Memimpin Waktu Hari
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Material
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {1}
 DocType: Dropbox Backup,Send Notifications To,Kirim Pemberitahuan Untuk
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Tanggal
 DocType: Employee,Reason for Leaving,Alasan Meninggalkan
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah sanksi
 DocType: GL Entry,Is Opening,Apakah Membuka
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Akun {0} tidak ada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Akun {0} tidak ada
 DocType: Account,Cash,kas
 DocType: Employee,Short biography for website and other publications.,Biografi singkat untuk website dan publikasi lainnya.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Silakan membuat Struktur Gaji untuk karyawan {0}
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 046df3f25c..69b70b5f1e 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Modalità di stipendio
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selezionare distribuzione mensile, se si desidera tenere traccia sulla base di stagionalità."
 DocType: Employee,Divorced,Divorced
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Attenzione: Lo stesso articolo è stato inserito più volte.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Attenzione: Lo stesso articolo è stato inserito più volte.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Elementi già sincronizzati
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetterà che l'articolo da aggiungere più volte in una transazione
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annulla Materiale Visita {0} prima di annullare questa rivendicazione di Garanzia
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compattazione più sinterizzazione
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},È richiesto di valuta per il listino prezzi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sarà calcolato nella transazione
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Da Material Request
+DocType: Purchase Order,Customer Contact,Customer Contact
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Da Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Albero
 DocType: Job Applicant,Job Applicant,Candidato di lavoro
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nessun altro risultato.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Nome Cliente
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Campi Tutte le esportazioni correlati come valuta , il tasso di conversione , totale delle esportazioni , export gran etc totale sono disponibili nella nota di consegna , POS , Preventivo , fattura di vendita , ordini di vendita , ecc"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (o gruppi) contro cui scritture contabili sono fatte e saldi vengono mantenuti.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Eccezionale per {0} non può essere inferiore a zero ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Eccezionale per {0} non può essere inferiore a zero ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Predefinito 10 minuti
 DocType: Leave Type,Leave Type Name,Lascia Tipo Nome
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie Aggiornato con successo
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Molteplici i prezzi articolo.
 DocType: SMS Center,All Supplier Contact,Tutti i Contatti Fornitori
 DocType: Quality Inspection Reading,Parameter,Parametro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Data fine prevista non può essere inferiore a quella prevista data di inizio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Non voglia di stappare ordine di produzione:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Riga #{0}: il Rapporto deve essere lo stesso di {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Nuovo Lascia Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nuovo Lascia Application
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Assegno Bancario
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Per mantenere il codice cliente e renderli ricercabili in base al loro codice usare questa opzione
 DocType: Mode of Payment Account,Mode of Payment Account,Modalità di pagamento Conto
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostra Variant
 DocType: Sales Invoice Item,Quantity,Quantità
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Prestiti (passività )
 DocType: Employee Education,Year of Passing,Anni dal superamento
-sites/assets/js/erpnext.min.js +27,In Stock,In Giacenza
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Posso solo effettuare il pagamento non fatturato contro vendite Order
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In Giacenza
 DocType: Designation,Designation,Designazione
 DocType: Production Plan Item,Production Plan Item,Produzione Piano Voce
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utente {0} è già assegnato a Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crea Nuovo Profilo POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Assistenza Sanitaria
 DocType: Purchase Invoice,Monthly,Mensile
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Fattura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Ritardo nel pagamento (Giorni)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fattura
 DocType: Maintenance Schedule Item,Periodicity,Periodicità
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Indirizzo E-Mail
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Difesa
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Punteggio (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Riga {0}: {1} {2} non corrisponde con {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Riga {0}: {1} {2} non corrisponde con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Veicolo No
-sites/assets/js/erpnext.min.js +55,Please select Price List,Seleziona Listino Prezzi
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Seleziona Listino Prezzi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Lavorazione del legno
 DocType: Production Order Operation,Work In Progress,Work In Progress
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Stampa 3D
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Parent Dettaglio docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura di un lavoro.
 DocType: Item Attribute,Increment,Incremento
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Seleziona Magazzino ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,pubblicità
 DocType: Employee,Married,Sposato
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliare
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,drogheria
 DocType: Quality Inspection Reading,Reading 1,Lettura 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Crea Voce Banca
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Crea Voce Banca
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondi Pensione
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse è obbligatoria se il tipo di conto è Warehouse
 DocType: SMS Center,All Sales Person,Tutti i Venditori
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Scrivi Off Centro di costo
 DocType: Warehouse,Warehouse Detail,Magazzino Dettaglio
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Limite di credito è stato attraversato per il cliente {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Tipo fiscale
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Non sei autorizzato a aggiungere o aggiornare le voci prima di {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Non sei autorizzato a aggiungere o aggiornare le voci prima di {0}
 DocType: Item,Item Image (if not slideshow),Immagine Articolo (se non slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Esiste un cliente con lo stesso nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tasso Orario / 60) * tempo operazione effettivo
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Ospite
 DocType: Quality Inspection,Get Specification Details,Ottieni Specifiche Dettagli
 DocType: Lead,Interested,Interessati
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Da {0} a {1}
 DocType: Item,Copy From Item Group,Copiare da elemento Gruppo
 DocType: Journal Entry,Opening Entry,Apertura Entry
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Prodotto Inchiesta
 DocType: Standard Reply,Owner,Proprietario
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Inserisci prima azienda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Seleziona prima azienda
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Seleziona prima azienda
 DocType: Employee Education,Under Graduate,Sotto Laurea
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,obiettivo On
 DocType: BOM,Total Cost,Costo totale
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefisso
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumabile
 DocType: Upload Attendance,Import Log,Log Importazione
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Invia
+DocType: Sales Invoice Item,Delivered By Supplier,Consegnato da parte del fornitore
 DocType: SMS Center,All Contact,Tutti i contatti
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Stipendio Annuo
 DocType: Period Closing Voucher,Closing Fiscal Year,Chiusura Anno Fiscale
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostra Logs Tempo
 DocType: Journal Entry Account,Credit in Company Currency,Credito in Società Valuta
 DocType: Delivery Note,Installation Status,Stato di installazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accettato + Respinto quantità deve essere uguale al quantitativo ricevuto per la voce {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accettato + Respinto quantità deve essere uguale al quantitativo ricevuto per la voce {0}
 DocType: Item,Supply Raw Materials for Purchase,Fornire Materie Prime per l'Acquisto
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,L'articolo {0} deve essere un'Articolo da Acquistare
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Scarica il modello, compilare i dati appropriati e allegare il file modificato.
  Tutti date e dipendente combinazione nel periodo selezionato arriverà nel modello, con record di presenze esistenti"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,L'articolo {0} non è attivo o la fine della vita è stato raggiunta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,L'articolo {0} non è attivo o la fine della vita è stato raggiunta
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Saranno aggiornate dopo fattura di vendita sia presentata.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Impostazioni per il modulo HR
 DocType: SMS Center,SMS Center,Centro SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Raddrizzare
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Inserisci parametri url pe
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Le modalità di applicazione di prezzi e sconti .
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Questo tempo conflitti Accedi con {0} a {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prezzo di listino deve essere applicabile per l'acquisto o la vendita di
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Data di installazione non può essere prima della data di consegna per la voce {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data di installazione non può essere prima della data di consegna per la voce {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Sconto Listino Tasso (%)
-sites/assets/js/form.min.js +279,Start,Inizio
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Inizio
 DocType: User,First Name,Nome
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,La configurazione è completata. Rinfrescante.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-stampo di fusione
 DocType: Offer Letter,Select Terms and Conditions,Selezionare i Termini e Condizioni
 DocType: Production Planning Tool,Sales Orders,Ordini di vendita
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Contro fattura di vendita dell'oggetto
 ,Production Orders in Progress,Ordini di produzione in corso
 DocType: Lead,Address & Contact,Indirizzo e Contatto
+DocType: Leave Allocation,Add unused leaves from previous allocations,Aggiungere le foglie non utilizzate precedentemente assegnata
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Successivo ricorrente {0} verrà creato su {1}
 DocType: Newsletter List,Total Subscribers,Totale Iscritti
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nome Contatto
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO attesa Qtà
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea busta paga per i criteri sopra menzionati.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Richiesta di acquisto.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Custodia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Solo il selezionato Lascia Approver può presentare questo Leave applicazione
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Solo il selezionato Lascia Approver può presentare questo Leave applicazione
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Data Alleviare deve essere maggiore di Data di giunzione
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lascia per Anno
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Impostare Naming Series per {0} via Impostazione> Impostazioni> Serie Naming
 DocType: Time Log,Will be updated when batched.,Verrà aggiornato quando dosati.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Riga {0}: Abilita 'è Advance' contro Account {1} se questa è una voce di anticipo.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Riga {0}: Abilita 'è Advance' contro Account {1} se questa è una voce di anticipo.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} non appartiene a società {1}
 DocType: Bulk Email,Message,Messaggio
 DocType: Item Website Specification,Item Website Specification,Specifica da Sito Web dell'articolo
 DocType: Dropbox Backup,Dropbox Access Key,Chiave Accesso Dropbox
 DocType: Payment Tool,Reference No,Di riferimento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lascia Bloccato
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,annuale
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voce Riconciliazione Giacenza
 DocType: Stock Entry,Sales Invoice No,Fattura Commerciale No
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Qtà ordine minimo
 DocType: Pricing Rule,Supplier Type,Tipo Fornitore
 DocType: Item,Publish in Hub,Pubblicare in Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,L'articolo {0} è annullato
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Richiesta Materiale 
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Richiesta Materiale 
 DocType: Bank Reconciliation,Update Clearance Date,Aggiornare Liquidazione Data
 DocType: Item,Purchase Details,"Acquisto, i dati"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Articolo {0} non trovato tra le 'Materie Prime Fornite' tabella in Ordine di Acquisto {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Controllo di notifica
 DocType: Lead,Suggestions,Suggerimenti
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Impostare la voce del budget di Gruppo-saggi su questo territorio. È inoltre possibile includere la stagionalità impostando la distribuzione.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Inserisci il gruppo account padre per il magazzino {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Il pagamento contro {0} {1} non può essere maggiore di eccezionale Importo {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Il pagamento contro {0} {1} non può essere maggiore di eccezionale Importo {2}
 DocType: Supplier,Address HTML,Indirizzo HTML
 DocType: Lead,Mobile No.,Num. Cellulare
 DocType: Maintenance Schedule,Generate Schedule,Genera Programma
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nuovo UOM Archivio
 DocType: Period Closing Voucher,Closing Account Head,Chiudere Conto Primario
 DocType: Employee,External Work History,Storia del lavoro esterno
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Error Reference
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Vuoi davvero STOP
 DocType: Communication,Closed,Chiuso
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In Parole (Export) sarà visibile una volta che si salva il DDT.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Sei sicuro di voler STOP
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Profilo di lavoro
 DocType: Newsletter,Newsletter,Newsletter
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Nota Consegna
 DocType: Dropbox Backup,Allow Dropbox Access,Consentire Accesso DropBox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Impostazione Tasse
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Pagamento ingresso è stato modificato dopo l'tirato. Si prega di tirare di nuovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Riepilogo per questa settimana e le attività in corso
 DocType: Workstation,Rent Cost,Affitto Costo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Si prega di selezionare mese e anno
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Velocità con cui valuta Cliente viene convertito in valuta di base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibile in distinta , bolla di consegna , fattura di acquisto , ordine di produzione , ordine di acquisto , ricevuta d'acquisto , fattura di vendita , ordini di vendita , dell'entrata Stock , Timesheet"
 DocType: Item Tax,Tax Rate,Aliquota Fiscale
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Seleziona elemento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleziona elemento
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Voce: {0} gestito non può conciliarsi con \
  della Riconciliazione, utilizzare invece dell'entrata Stock saggio-batch,"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lotto n deve essere uguale a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convert to non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Acquisto ricevuta deve essere presentata
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Giacenza Corrente (UdM)
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lotto di un articolo
 DocType: C-Form Invoice Detail,Invoice Date,Data fattura
 DocType: GL Entry,Debit Amount,Importo Debito
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Ci può essere solo 1 account per ogni impresa in {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Ci può essere solo 1 account per ogni impresa in {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Il tuo indirizzo email
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Si prega di vedere allegato
 DocType: Purchase Order,% Received,% Ricevuto
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Istruzione
 DocType: Quality Inspection,Inspected By,Verifica a cura di
 DocType: Maintenance Visit,Maintenance Type,Tipo di manutenzione
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serial No {0} non appartiene alla Consegna Nota {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serial No {0} non appartiene alla Consegna Nota {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Voce di controllo di qualità dei parametri
 DocType: Leave Application,Leave Approver Name,Lasciare Nome Approver
 ,Schedule Date,Programma Data
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Acquisto Registrati
 DocType: Landed Cost Item,Applicable Charges,Spese applicabili
 DocType: Workstation,Consumable Cost,Costo consumabili
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve avere il ruolo 'Approvatore Ferie'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve avere il ruolo 'Approvatore Ferie'
 DocType: Purchase Receipt,Vehicle Date,Veicolo
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motivo per Perdere
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% Installato
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Inserisci il nome della società prima
 DocType: BOM,Item Desription,Descrizione Articolo
 DocType: Purchase Invoice,Supplier Name,Nome fornitore
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leggere il manuale ERPNext
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Imposta automaticamente seriale Nos sulla base FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controllare fornitore Numero fattura Uniqueness
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Maestro Sales Man
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Impostazioni globali per tutti i processi produttivi.
 DocType: Accounts Settings,Accounts Frozen Upto,Conti congelati Fino
 DocType: SMS Log,Sent On,Inviata il
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
 DocType: Sales Order,Not Applicable,Non Applicabile
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Maestro di vacanza .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Stampaggio Shell
 DocType: Material Request Item,Required Date,Data richiesta
 DocType: Delivery Note,Billing Address,Indirizzo Fatturazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Inserisci il codice dell'articolo.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Inserisci il codice dell'articolo.
 DocType: BOM,Costing,Valutazione Costi
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se selezionato, l'importo della tassa sarà considerata già inclusa nel Stampa Valuta / Stampa Importo"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totale Quantità
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo tra le o
 DocType: Customer,Buyer of Goods and Services.,Durante l'acquisto di beni e servizi.
 DocType: Journal Entry,Accounts Payable,Conti pagabili
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Aggiungi abbonati
-sites/assets/js/erpnext.min.js +5,""" does not exists","""Non esiste"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Non esiste"
 DocType: Pricing Rule,Valid Upto,Valido Fino
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,reddito diretta
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Non è possibile filtrare sulla base di conto , se raggruppati per conto"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,responsabile amministrativo
 DocType: Payment Tool,Received Or Paid,Ricevuto o pagato
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Selezionare prego
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Selezionare prego
 DocType: Stock Entry,Difference Account,account differenza
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Impossibile chiudere compito il compito dipendente {0} non è chiuso.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
 DocType: Production Order,Additional Operating Cost,Ulteriori costi di funzionamento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,cosmetici
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
 DocType: Communication,Subject,Oggetto
 DocType: Shipping Rule,Net Weight,Peso netto
 DocType: Employee,Emergency Phone,Telefono di emergenza
 ,Serial No Warranty Expiry,Serial No Garanzia di scadenza
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Vuoi davvero fermare questo materiale Request ?
 DocType: Sales Order,To Deliver,Consegnare
 DocType: Purchase Invoice Item,Item,Articolo
 DocType: Journal Entry,Difference (Dr - Cr),Differenza ( Dr - Cr )
 DocType: Account,Profit and Loss,Profitti e Perdite
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Gestione Subfornitura
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestione Subfornitura
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nuova unità di misura NON deve essere di tipo numero intero
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobili e Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasso al quale Listino valuta viene convertita in valuta di base dell'azienda
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Aggiungere / Modificare T
 DocType: Purchase Invoice,Supplier Invoice No,Fornitore fattura n
 DocType: Territory,For reference,Per riferimento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Impossibile eliminare N. di serie {0}, come si usa in transazioni di borsa"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Chiusura (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Chiusura (Cr)
 DocType: Serial No,Warranty Period (Days),Periodo di garanzia (Giorni)
 DocType: Installation Note Item,Installation Note Item,Installazione Nota articolo
 ,Pending Qty,In attesa Quantità
@@ -522,8 +522,9 @@ DocType: Sales Order,Billing and Delivery Status,Fatturazione e di condizione di
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ripetere i clienti
 DocType: Leave Control Panel,Allocate,Assegna
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,precedente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Ritorno di vendite
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Ritorno di vendite
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selezionare gli ordini di vendita da cui si desidera creare gli ordini di produzione.
+DocType: Item,Delivered by Supplier (Drop Ship),Consegnato da Supplier (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componenti stipendio.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database Potenziali Clienti.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Database Cliente.
@@ -534,7 +535,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Deposito logica a fronte del quale sono calcolate le scorte.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},N. di riferimento & Reference Data è necessario per {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},N. di riferimento & Reference Data è necessario per {0}
 DocType: Event,Wednesday,Mercoledì
 DocType: Sales Invoice,Customer's Vendor,Fornitore del Cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordine di produzione è obbligatorio
@@ -567,8 +568,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Ricevitore Parametro
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basato Su' e 'Raggruppato Per' non può essere lo stesso
 DocType: Sales Person,Sales Person Targets,Sales Person Obiettivi
-sites/assets/js/form.min.js +271,To,a
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Si prega di inserire l'indirizzo email
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,a
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Si prega di inserire l'indirizzo email
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tubo End formando
 DocType: Production Order Operation,In minutes,In pochi minuti
 DocType: Issue,Resolution Date,Risoluzione Data
@@ -585,7 +586,7 @@ DocType: Activity Cost,Projects User,Progetti utente
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumato
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} non trovato in tabella Dettagli Fattura
 DocType: Company,Round Off Cost Center,Arrotondamento Centro di costo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenzione Visita {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenzione Visita {0} deve essere cancellato prima di annullare questo ordine di vendita
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening ( Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Distacco timestamp deve essere successiva {0}
@@ -593,9 +594,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Impostazioni
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Tasse Landed Cost e oneri
 DocType: Production Order Operation,Actual Start Time,Actual Start Time
 DocType: BOM Operation,Operation Time,Tempo di funzionamento
-sites/assets/js/list.min.js +5,More,Più
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Più
 DocType: Pricing Rule,Sales Manager,Direttore Delle Vendite
-sites/assets/js/desk.min.js +7673,Rename,rinominare
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,rinominare
 DocType: Journal Entry,Write Off Amount,Scrivi Off Importo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Curvatura
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Consentire Utente
@@ -611,13 +612,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Taglio dritto
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Per tenere traccia di voce in documenti di vendita e di acquisto in base alle loro n ° di serie. Questo è può anche usato per rintracciare informazioni sulla garanzia del prodotto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Giacenza Corrente
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Warehouse Respinto è obbligatoria alla voce regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Warehouse Respinto è obbligatoria alla voce regected
 DocType: Account,Expenses Included In Valuation,Spese incluse nella Valutazione
 DocType: Employee,Provide email id registered in company,Fornire id-mail registrato in azienda
 DocType: Hub Settings,Seller City,Città Venditore
 DocType: Email Digest,Next email will be sent on:,La prossimo Email verrà inviato:
 DocType: Offer Letter Term,Offer Letter Term,Offerta Lettera Termine
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Articolo ha varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolo {0} non trovato
 DocType: Bin,Stock Value,Valore Giacenza
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,albero Type
@@ -632,11 +633,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,benvenuto
 DocType: Journal Entry,Credit Card Entry,Entry Carta di Credito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Oggetto Attività
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Merci ricevute dai fornitori.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Merci ricevute dai fornitori.
 DocType: Communication,Open,Aperto
 DocType: Lead,Campaign Name,Nome Campagna
 ,Reserved,riservato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Vuoi davvero unstop
 DocType: Purchase Order,Supply Raw Materials,Fornire Materie Prime
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La data in cui viene generato prossima fattura. Viene generato su Invia.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Attività correnti
@@ -652,7 +652,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Ordine Acquisto Cliente N.
 DocType: Employee,Cell Number,Numero di Telefono
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile immettere buono attuale in 'Against Journal Entry' colonna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile immettere buono attuale in 'Against Journal Entry' colonna
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunità da
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Busta Paga Mensile.
@@ -721,7 +721,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,responsabilità
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importo sanzionato non può essere maggiore di rivendicazione Importo in riga {0}.
 DocType: Company,Default Cost of Goods Sold Account,Costo predefinito di Account merci vendute
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Listino Prezzi non selezionati
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Listino Prezzi non selezionati
 DocType: Employee,Family Background,Sfondo Famiglia
 DocType: Process Payroll,Send Email,Invia Email
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nessuna autorizzazione
@@ -732,7 +732,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,Gli articoli con maggiore weightage nel periodo più alto
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Dettaglio Riconciliazione Banca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Le mie fatture
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Nessun dipendente trovato
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nessun dipendente trovato
 DocType: Purchase Order,Stopped,Arrestato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Selezionare BOM per iniziare
@@ -741,7 +741,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Carica Sa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Invia Ora
 ,Support Analytics,Analytics Support
 DocType: Item,Website Warehouse,Magazzino sito web
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Sei sicuro di voler smettere di ordine di produzione:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Il giorno del mese su cui viene generata fattura automatica es 05, 28 ecc"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punteggio deve essere minore o uguale a 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Record C -Form
@@ -751,12 +750,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Suppo
 DocType: Features Setup,"To enable ""Point of Sale"" features",Per attivare la "Point of Sale" caratteristiche
 DocType: Bin,Moving Average Rate,Tasso Media Mobile
 DocType: Production Planning Tool,Select Items,Selezionare Elementi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} contro Bill {1} ​​in data {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contro Bill {1} ​​in data {2}
 DocType: Comment,Reference Name,Nome di riferimento
 DocType: Maintenance Visit,Completion Status,Stato Completamento
 DocType: Sales Invoice Item,Target Warehouse,Obiettivo Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Consenti superamento ricezione o invio fino a questa percentuale
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Data prevista di consegna non può essere precedente Sales Order Data
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Data prevista di consegna non può essere precedente Sales Order Data
 DocType: Upload Attendance,Import Attendance,Importa presenze
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tutti i gruppi di articoli
 DocType: Process Payroll,Activity Log,Log Attività
@@ -764,7 +763,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Comporre automaticamente il messaggio di presentazione delle transazioni .
 DocType: Production Order,Item To Manufacture,Articolo per la fabbricazione
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Colata in conchiglia
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Ordine d'acquisto a pagamento
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stato è {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordine d'acquisto a pagamento
 DocType: Sales Order Item,Projected Qty,Qtà Proiettata
 DocType: Sales Invoice,Payment Due Date,Pagamento Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
@@ -788,8 +788,8 @@ DocType: SMS Log,Requested Numbers,Numeri richiesti
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Valutazione delle prestazioni.
 DocType: Sales Invoice Item,Stock Details,Dettagli della
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valore di progetto
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Punto vendita
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Non è possibile portare avanti {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto vendita
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Non è possibile portare avanti {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo del conto già in credito, non sei autorizzato a impostare 'saldo deve essere' come 'Debito'"
 DocType: Account,Balance must be,Saldo deve essere
 DocType: Hub Settings,Publish Pricing,Pubblicare Prezzi
@@ -811,7 +811,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,RICEVUTA
 ,Received Items To Be Billed,Oggetti ricevuti da fatturare
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sabbiatura
-sites/assets/js/desk.min.js +3938,Ms,Sig.ra
+DocType: Employee,Ms,Sig.ra
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Maestro del tasso di cambio di valuta .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Impossibile trovare tempo di slot nei prossimi {0} giorni per l'operazione {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiale Piano per sub-assemblaggi
@@ -833,29 +833,31 @@ DocType: Purchase Receipt,Range,Intervallo
 DocType: Supplier,Default Payable Accounts,Debiti default
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
 DocType: Features Setup,Item Barcode,Barcode articolo
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Voce Varianti {0} aggiornato
 DocType: Quality Inspection Reading,Reading 6,Lettura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Acquisto Advance Fattura
 DocType: Address,Shop,Negozio
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Riga {0}: ingresso di credito non può essere collegato con un {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Riga {0}: ingresso di credito non può essere collegato con un {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conto predefinito Banca / Contante  aggiornato automaticamente in Fatture POS quando selezioni questo metodo
 DocType: Employee,Permanent Address Is,Indirizzo permanente è
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operazione completata per quanti prodotti finiti?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Indennità per over-{0} attraversato per la voce {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Indennità per over-{0} attraversato per la voce {1}.
 DocType: Employee,Exit Interview Details,Uscire Dettagli Intervista
 DocType: Item,Is Purchase Item,È Acquisto Voce
 DocType: Journal Entry Account,Purchase Invoice,Acquisto Fattura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
 DocType: Stock Entry,Total Outgoing Value,Totale Valore uscita
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Data e Data di chiusura di apertura dovrebbe essere entro lo stesso anno fiscale
 DocType: Lead,Request for Information,Richiesta di Informazioni
 DocType: Payment Tool,Paid,Pagato
 DocType: Salary Slip,Total in words,Totale in parole
 DocType: Material Request Item,Lead Time Date,Data Tempo di Esecuzione
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,è obbligatorio. Forse record di cambio valuta non viene creato per
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Si prega di specificare Numero d'ordine per la voce {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Per 'prodotto Bundle', Warehouse, numero di serie e Batch No sarà considerata dal 'Packing List' tavolo. Se Magazzino e Batch No sono gli stessi per tutti gli elementi di imballaggio per un elemento qualsiasi 'Product Bundle', questi valori possono essere inseriti nella tabella principale elemento, i valori verranno copiati a 'Packing List' tavolo."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Le spedizioni verso i clienti.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Le spedizioni verso i clienti.
 DocType: Purchase Invoice Item,Purchase Order Item,Ordine di acquisto dell'oggetto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Proventi indiretti
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set di Pagamento = debito residuo
@@ -863,13 +865,14 @@ DocType: Contact Us Settings,Address Line 1,"Indirizzo, riga 1"
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varianza
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nome Azienda
 DocType: SMS Center,Total Message(s),Messaggio Total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Selezionare la voce per il trasferimento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selezionare la voce per il trasferimento
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visualizzare un elenco di tutti i video di aiuto
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selezionare conto capo della banca in cui assegno è stato depositato.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Consenti all'utente di modificare Listino cambio nelle transazioni
 DocType: Pricing Rule,Max Qty,Qtà max
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Riga {0}: Pagamento contro vendite / ordine di acquisto deve essere sempre contrassegnato come anticipo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Riga {0}: Pagamento contro vendite / ordine di acquisto deve essere sempre contrassegnato come anticipo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,chimico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Tutti gli articoli sono già stati trasferiti per questo ordine di produzione.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tutti gli articoli sono già stati trasferiti per questo ordine di produzione.
 DocType: Process Payroll,Select Payroll Year and Month,Selezionare Payroll Anno e mese
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vai al gruppo appropriato (solitamente Applicazione dei fondi> Attività correnti> conti bancari e creare un nuovo account (facendo clic su Add Child) di tipo "Banca"
 DocType: Workstation,Electricity Cost,Costo Elettricità
@@ -884,7 +887,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bian
 DocType: SMS Center,All Lead (Open),Tutti LEAD (Aperto)
 DocType: Purchase Invoice,Get Advances Paid,Ottenere anticipo pagamento
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Allega la tua foto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Fare
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fare
 DocType: Journal Entry,Total Amount in Words,Importo totale in parole
 DocType: Workflow State,Stop,stop
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Si è verificato un errore . Una ragione probabile potrebbe essere che non si è salvato il modulo. Si prega di contattare support@erpnext.com se il problema persiste .
@@ -908,7 +911,7 @@ DocType: Packing Slip Item,Packing Slip Item,Distinta di imballaggio articolo
 DocType: POS Profile,Cash/Bank Account,Conto Cassa/Banca
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elementi rimossi senza variazione di quantità o valore.
 DocType: Delivery Note,Delivery To,Consegna a
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tavolo attributo è obbligatorio
 DocType: Production Planning Tool,Get Sales Orders,Ottieni Ordini di Vendita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} non può essere negativo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Limatura
@@ -919,12 +922,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Verrà aggiorna
 DocType: Project,Internal,Interno
 DocType: Task,Urgent,Urgente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Si prega di specificare un ID Row valido per riga {0} nella tabella {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Vai al desktop e iniziare a utilizzare ERPNext
 DocType: Item,Manufacturer,Produttore
 DocType: Landed Cost Item,Purchase Receipt Item,RICEVUTA articolo
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Riservato a ordini di vendita / Magazzino prodotti finiti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Importo di vendita
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Logs tempo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu sei il Responsabile approvazione di spesa per questo record . Si prega di aggiornare il 'Stato' e Save
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu sei il Responsabile approvazione di spesa per questo record . Si prega di aggiornare il 'Stato' e Save
 DocType: Serial No,Creation Document No,Creazione di documenti No
 DocType: Issue,Issue,Questione
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributi per Voce Varianti. ad esempio Taglia, colore etc."
@@ -939,8 +943,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Previsione
 DocType: Item,Default Selling Cost Center,Centro di costo di vendita di default
 DocType: Sales Partner,Implementation Partner,Partner di implementazione
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} è {1}
 DocType: Opportunity,Contact Info,Info Contatto
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Rendere le entrate nelle scorte
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Rendere le entrate nelle scorte
 DocType: Packing Slip,Net Weight UOM,Peso Netto (UdM)
 DocType: Item,Default Supplier,Fornitore Predefinito
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nel corso di produzione Allowance Percentuale
@@ -949,7 +954,7 @@ DocType: Features Setup,Miscelleneous,Varie
 DocType: Holiday List,Get Weekly Off Dates,Get settimanali Date Off
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data di Fine non può essere inferiore a Data di inizio
 DocType: Sales Person,Select company name first.,Selezionare il nome della società prima.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Preventivi ricevuti dai Fornitori.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Per {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,aggiornato via Logs Tempo
@@ -977,7 +982,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Numeri di registrazione dell'azienda per il vostro riferimento. numero Tassa, ecc"
 DocType: Sales Partner,Distributor,Distributore
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrello Regola Spedizione
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Ordine di produzione {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordine di produzione {0} deve essere cancellato prima di annullare questo ordine di vendita
 ,Ordered Items To Be Billed,Articoli ordinati da fatturare
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Da Campo deve essere inferiore al campo
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selezionare Time Diari e Invia per creare una nuova fattura di vendita.
@@ -1025,7 +1030,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Fiscale
 DocType: Lead,Lead,Contatto
 DocType: Email Digest,Payables,Debiti
 DocType: Account,Warehouse,magazzino
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
 ,Purchase Order Items To Be Billed,Ordine di Acquisto Articoli da fatturare
 DocType: Purchase Invoice Item,Net Rate,Tasso Netto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Acquisto Articolo Fattura
@@ -1040,11 +1045,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Non riconciliate Pa
 DocType: Global Defaults,Current Fiscal Year,Anno Fiscale Corrente
 DocType: Global Defaults,Disable Rounded Total,Disabilita Arrotondamento su Totale
 DocType: Lead,Call,Chiama
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'le voci' non possono essere vuote
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'le voci' non possono essere vuote
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Fila Duplicate {0} con lo stesso {1}
 ,Trial Balance,Bilancio di verifica
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Impostazione dipendenti
-sites/assets/js/erpnext.min.js +5,"Grid ""","grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Impostazione dipendenti
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Si prega di selezionare il prefisso prima
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,ricerca
 DocType: Maintenance Visit Purpose,Work Done,Attività svolta
@@ -1054,14 +1059,15 @@ DocType: Communication,Sent,Inviati
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,vista Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,La prima
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
 DocType: Communication,Delivery Status,Stato Consegna
 DocType: Production Order,Manufacture against Sales Order,Produzione contro Ordine di vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resto del Mondo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto del Mondo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'articolo {0} non può avere Batch
 ,Budget Variance Report,Report Variazione Budget
 DocType: Salary Slip,Gross Pay,Retribuzione lorda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendo liquidato
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Libro mastro
 DocType: Stock Reconciliation,Difference Amount,Differenza Importo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Utili Trattenuti
 DocType: BOM Item,Item Description,Descrizione Articolo
@@ -1075,15 +1081,17 @@ DocType: Opportunity Item,Opportunity Item,Opportunità articolo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura temporanea
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Saldo del Congedo Dipendete
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Saldo per conto {0} deve essere sempre {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo per conto {0} deve essere sempre {1}
 DocType: Address,Address Type,Tipo di indirizzo
 DocType: Purchase Receipt,Rejected Warehouse,Magazzino Rifiutato
 DocType: GL Entry,Against Voucher,Per Tagliando
 DocType: Item,Default Buying Cost Center,Comprare Centro di costo predefinito
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Per ottenere il meglio da ERPNext, si consiglia di richiedere un certo tempo e guardare questi video di aiuto."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,L'Articolo {0} deve essere un'Articolo in Vendita
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,a
 DocType: Item,Lead Time in days,Tempi di Esecuzione in giorni
 ,Accounts Payable Summary,Conti da pagare Sommario
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Non autorizzato a modificare account congelati {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Non autorizzato a modificare account congelati {0}
 DocType: Journal Entry,Get Outstanding Invoices,Ottieni fatture non saldate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} non è valido
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
@@ -1099,7 +1107,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Luogo di emissione
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,contratto
 DocType: Report,Disabled,Disabilitato
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Fattore coversion UOM richiesto per Confezionamento: {0} alla voce: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Fattore coversion UOM richiesto per Confezionamento: {0} alla voce: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,spese indirette
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Riga {0}: Quantità è obbligatorio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,agricoltura
@@ -1108,13 +1116,13 @@ DocType: Mode of Payment,Mode of Payment,Modalità di Pagamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
 DocType: Journal Entry Account,Purchase Order,Ordine di acquisto
 DocType: Warehouse,Warehouse Contact Info,Magazzino contatto
-sites/assets/js/form.min.js +190,Name is required,Il nome è obbligatorio
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Il nome è obbligatorio
 DocType: Purchase Invoice,Recurring Type,Tipo ricorrente
 DocType: Address,City/Town,Città/Paese
 DocType: Email Digest,Annual Income,Reddito annuo
 DocType: Serial No,Serial No Details,Serial No Dettagli
 DocType: Purchase Invoice Item,Item Tax Rate,Articolo Tax Rate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, solo i conti di credito possono essere collegati contro un'altra voce di addebito"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, solo i conti di credito possono essere collegati contro un'altra voce di addebito"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,L'Articolo {0} deve essere di un sub-contratto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Attrezzature Capital
@@ -1125,14 +1133,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Obiettivo
 DocType: Sales Invoice Item,Edit Description,Modifica Descrizione
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data prevista di consegna è minore del previsto Data inizio.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,per Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,per Fornitore
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Impostazione Tipo di account aiuta nella scelta questo account nelle transazioni.
 DocType: Purchase Invoice,Grand Total (Company Currency),Totale generale (valuta Azienda)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Uscita totale
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Ci può essere una sola regola spedizione Circostanza con 0 o il valore vuoto per "" To Value """
 DocType: Authorization Rule,Transaction,Transazioni
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota : Questo centro di costo è un gruppo . Non può fare scritture contabili contro i gruppi .
-apps/erpnext/erpnext/config/projects.py +43,Tools,Strumenti
+apps/frappe/frappe/config/desk.py +7,Tools,Strumenti
 DocType: Item,Website Item Groups,Sito gruppi di articoli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Numero ordine di produzione è obbligatoria per magazzino entry fabbricazione scopo
 DocType: Purchase Invoice,Total (Company Currency),Totale (Società Valuta)
@@ -1142,7 +1150,7 @@ DocType: Workstation,Workstation Name,Nome workstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email di Sintesi:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} non appartiene alla voce {1}
 DocType: Sales Partner,Target Distribution,Distribuzione di destinazione
-sites/assets/js/desk.min.js +7652,Comments,Commenti
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Commenti
 DocType: Salary Slip,Bank Account No.,Conto Bancario N.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Questo è il numero dell'ultimo transazione creata con questo prefisso
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Tasso di valutazione richiesti per l'articolo {0}
@@ -1157,7 +1165,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleziona un
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Lascia Privilege
 DocType: Purchase Invoice,Supplier Invoice Date,Fornitore Data fattura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,È necessario abilitare Carrello
-sites/assets/js/form.min.js +212,No Data,Dati Assenti
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Dati Assenti
 DocType: Appraisal Template Goal,Appraisal Template Goal,Valutazione Modello Obiettivo
 DocType: Salary Slip,Earning,Rendimento
 DocType: Payment Tool,Party Account Currency,Partito Conto Valuta
@@ -1165,7 +1173,7 @@ DocType: Payment Tool,Party Account Currency,Partito Conto Valuta
 DocType: Purchase Taxes and Charges,Add or Deduct,Aggiungere o dedurre
 DocType: Company,If Yearly Budget Exceeded (for expense account),Se Budget annuale superato (per conto spese)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condizioni sovrapposti trovati tra :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Contro diario {0} è già regolata contro un altro buono
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contro diario {0} è già regolata contro un altro buono
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Totale valore di ordine
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,cibo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamma invecchiamento 3
@@ -1173,11 +1181,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Num. di Visite
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter per contatti (leads).
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta del Conto di chiusura deve essere {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somma dei punti per tutti gli obiettivi dovrebbero essere 100. E '{0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Le operazioni non possono essere lasciati vuoti.
 ,Delivered Items To Be Billed,Gli Articoli consegnati da Fatturare
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazzino non può essere modificato per Serial No.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Stato aggiornato per {0}
 DocType: DocField,Description,Descrizione
 DocType: Authorization Rule,Average Discount,Sconto Medio
 DocType: Letter Head,Is Default,È Default
@@ -1205,7 +1213,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Articolo fiscale Ammontare
 DocType: Item,Maintain Stock,Mantenere Scorta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Le voci di archivio già creati per ordine di produzione
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lasciare vuoto se considerato per tutte le designazioni
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Da Datetime
 DocType: Email Digest,For Company,Per Azienda
@@ -1215,7 +1223,7 @@ DocType: Sales Invoice,Shipping Address Name,Indirizzo Shipping Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Grafico dei Conti
 DocType: Material Request,Terms and Conditions Content,Termini e condizioni contenuti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
 DocType: Maintenance Visit,Unscheduled,Non in programma
 DocType: Employee,Owned,Di proprietà
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Dipende in aspettativa senza assegni
@@ -1228,7 +1236,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garanzia / AMC Stato
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Impostazioni dipendente
 ,Batch-Wise Balance History,Cronologia Bilanciamento Lotti-Wise
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,To Do List
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,apprendista
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Quantità negative non è consentito
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1261,13 +1269,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Affitto Ufficio
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Impostazioni del gateway configurazione di SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importazione non riuscita!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Nessun indirizzo ancora aggiunto.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nessun indirizzo ancora aggiunto.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation ore di lavoro
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analista
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a JV importo {2}
 DocType: Item,Inventory,Inventario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Per attivare la "Point of Sale" vista
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Il pagamento non può essere effettuato per carrello vuoto
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Il pagamento non può essere effettuato per carrello vuoto
 DocType: Item,Sales Details,Dettagli di vendita
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Con gli articoli
@@ -1277,7 +1285,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",La data in cui viene generato prossima fattura. Viene generato su Invia.
 DocType: Item Attribute,Item Attribute,Attributo Articolo
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,governo
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Varianti Voce
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Varianti Voce
 DocType: Company,Services,Servizi
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Totale ({0})
 DocType: Cost Center,Parent Cost Center,Parent Centro di costo
@@ -1287,11 +1295,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Esercizio Data di inizio
 DocType: Employee External Work History,Total Experience,Esperienza totale
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Svasatura
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e spese
 DocType: Material Request Item,Sales Order No,Ordine di vendita No
 DocType: Item Group,Item Group Name,Nome Gruppo Articoli
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Preso
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Preso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Trasferimento Materiali per Produzione
 DocType: Pricing Rule,For Price List,Per Listino Prezzi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,executive Search
@@ -1300,8 +1308,7 @@ DocType: Maintenance Schedule,Schedules,Orari
 DocType: Purchase Invoice Item,Net Amount,Importo Netto
 DocType: Purchase Order Item Supplied,BOM Detail No,DIBA Dettagli N.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ulteriori Importo Discount (valuta Company)
-DocType: Period Closing Voucher,CoA Help,Aiuto CoA
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Errore: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Errore: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Si prega di creare un nuovo account dal Piano dei conti .
 DocType: Maintenance Visit,Maintenance Visit,Visita di manutenzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Clienti> Gruppi clienti> Territorio
@@ -1312,6 +1319,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Aiuto
 DocType: Event,Tuesday,Martedì
 DocType: Leave Block List,Block Holidays on important days.,Vacanze di blocco nei giorni importanti.
 ,Accounts Receivable Summary,Contabilità Sommario Crediti
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Parte per il tipo {0} già stanziato per Employee {1} per il periodo {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Impostare campo ID utente in un record Employee impostare Ruolo Employee
 DocType: UOM,UOM Name,UOM Nome
 DocType: Top Bar Item,Target,Obiettivo
@@ -1332,19 +1340,19 @@ DocType: Sales Partner,Sales Partner Target,Vendite Partner di destinazione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Ingresso contabile per {0} può essere fatta solo in valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Regola Prezzi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Tranciatrice
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Richiesta materiale per ordine d'acquisto
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Richiesta materiale per ordine d'acquisto
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: restituito Voce {1} non esiste in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conti bancari
 ,Bank Reconciliation Statement,Prospetto di Riconciliazione Banca
 DocType: Address,Lead Name,Nome Contatto
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Apertura della Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Apertura della Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} deve apparire una sola volta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non è consentito trasferire più {0} di {1} per Ordine d'Acquisto {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Foglie allocata con successo per {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Foglie allocata con successo per {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Non ci sono elementi per il confezionamento
 DocType: Shipping Rule Condition,From Value,Da Valore
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Produzione La quantità è obbligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Produzione La quantità è obbligatoria
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Gli importi non riflette in banca
 DocType: Quality Inspection Reading,Reading 4,Lettura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Reclami per spese dell'azienda.
@@ -1357,19 +1365,20 @@ DocType: Opportunity,Contact Mobile No,Cellulare Contatto
 DocType: Production Planning Tool,Select Sales Orders,Selezionare Ordini di vendita
 ,Material Requests for which Supplier Quotations are not created,Richieste di materiale con le quotazioni dei fornitori non sono creati
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Per tenere traccia di elementi con codice a barre. Si sarà in grado di inserire articoli nel DDT e fattura di vendita attraverso la scansione del codice a barre del prodotto.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Segna come Consegnato
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crea Preventivo
 DocType: Dependent Task,Dependent Task,Task dipendente
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provare le operazioni per X giorni in programma in anticipo.
 DocType: HR Settings,Stop Birthday Reminders,Arresto Compleanno Promemoria
 DocType: SMS Center,Receiver List,Lista Ricevitore
 DocType: Payment Tool Detail,Payment Amount,Pagamento Importo
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantità consumata
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Vista
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vista
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struttura salariale Deduzione
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterizzazione laser selettiva
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importazione Corretta!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo di elementi Emesso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
@@ -1390,7 +1399,7 @@ DocType: Company,Default Payable Account,Conto da pagare Predefinito
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Impostazioni per in linea carrello della spesa, come le regole di trasporto, il listino prezzi ecc"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,installazione completa
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fatturato
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Riservato Quantità
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Riservato Quantità
 DocType: Party Account,Party Account,Account partito
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Risorse Umane
 DocType: Lead,Upper Income,Reddito superiore
@@ -1433,11 +1442,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Abilita Carrello
 DocType: Employee,Permanent Address,Indirizzo permanente
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,L'Articolo {0} deve essere un Servizio
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Anticipo versato contro {0} {1} non può essere maggiore \ di Gran Totale {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Si prega di selezionare il codice articolo
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Ridurre Deduzione per aspettativa senza assegni (LWP)
 DocType: Territory,Territory Manager,Territory Manager
+DocType: Delivery Note Item,To Warehouse (Optional),Per Warehouse (opzionale)
 DocType: Sales Invoice,Paid Amount (Company Currency),Importo versato (Società valuta)
 DocType: Purchase Invoice,Additional Discount,Sconto aggiuntivo
 DocType: Selling Settings,Selling Settings,Vendere Impostazioni
@@ -1460,7 +1470,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minerario
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Colata di resina
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Esiste un Gruppo Clienti con lo stesso nome, per favore cambiare il nome del Cliente o rinominare il Gruppo Clienti"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Si prega di selezionare {0} prima.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Si prega di selezionare {0} prima.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Territorio genitore
 DocType: Quality Inspection Reading,Reading 2,Lettura 2
@@ -1488,11 +1498,11 @@ DocType: Sales Invoice Item,Batch No,Lotto N.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Consentire a più ordini di vendita contro ordine di acquisto di un cliente
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,principale
 DocType: DocPerm,Delete,Elimina
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
-sites/assets/js/desk.min.js +7971,New {0},Nuovo {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nuovo {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Arrestato ordine non può essere cancellato . Stappare per annullare.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Arrestato ordine non può essere cancellato . Stappare per annullare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
 DocType: Employee,Leave Encashed?,Lascia incassati?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Dal campo è obbligatorio
 DocType: Item,Variants,Varianti
@@ -1510,7 +1520,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Nazione
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Indirizzi
 DocType: Communication,Received,Ricevuto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Inserito Numero di Serie duplicato per l'articolo {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condizione per una regola di trasporto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,L'articolo non può avere Ordine di Produzione.
@@ -1531,7 +1541,6 @@ DocType: Employee,Salutation,Appellativo
 DocType: Communication,Rejected,Rifiutato
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,Si applica anche per le varianti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Consegnato
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Articoli Combinati e tempi di vendita.
 DocType: Sales Order Item,Actual Qty,Q.tà Reale
 DocType: Sales Invoice Item,References,Riferimenti
@@ -1569,14 +1578,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,C
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Tosatura
 DocType: Item,Has Variants,Ha Varianti
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Clicca sul pulsante 'Crea Fattura Vendita' per creare una nuova Fattura di Vendita
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Date di Inizio e Fine periodo obbligatorie per %s ricorrenti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Imballaggi ed etichettatura
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome della distribuzione mensile
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Siete pregati di specificare Valuta predefinita in azienda Maestro e predefiniti globali
 DocType: Dropbox Backup,Dropbox Access Secret,Accesso Segreto Dropbox
 DocType: Purchase Invoice,Recurring Invoice,Fattura ricorrente
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Gestione Progetti
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gestione Progetti
 DocType: Supplier,Supplier of Goods or Services.,Fornitore di beni o servizi.
 DocType: Budget Detail,Fiscal Year,Anno Fiscale
 DocType: Cost Center,Budget,Budget
@@ -1605,11 +1613,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Vendite
 DocType: Employee,Salary Information,Informazioni stipendio
 DocType: Sales Person,Name and Employee ID,Nome e ID Dipendente
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Data di scadenza non può essere precedente Data di registrazione
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Data di scadenza non può essere precedente Data di registrazione
 DocType: Website Item Group,Website Item Group,Sito Gruppo Articolo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Dazi e tasse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Inserisci Data di riferimento
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} voci di pagamento non possono essere filtrate per {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Inserisci Data di riferimento
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} voci di pagamento non possono essere filtrate per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tavolo per la voce che verrà mostrato in Sito Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Dotazione Qtà
 DocType: Material Request Item,Material Request Item,Materiale Richiesta articolo
@@ -1617,7 +1625,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Albero di gruppi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Non può consultare numero di riga maggiore o uguale al numero di riga corrente per questo tipo di carica
 ,Item-wise Purchase History,Articolo-saggio Cronologia acquisti
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rosso
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Si prega di cliccare su ' Generate Schedule ' a prendere Serial No aggiunto per la voce {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Si prega di cliccare su ' Generate Schedule ' a prendere Serial No aggiunto per la voce {0}
 DocType: Account,Frozen,Congelato
 ,Open Production Orders,Aprire ordini di produzione
 DocType: Installation Note,Installation Time,Tempo di installazione
@@ -1661,13 +1669,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Tendenze di preventivo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Gruppo Articoli non menzionato nell'Articolo principale per l'Articolo {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Come ordine di produzione può essere fatta per questo articolo , deve essere un elemento di magazzino ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Come ordine di produzione può essere fatta per questo articolo , deve essere un elemento di magazzino ."
 DocType: Shipping Rule Condition,Shipping Amount,Importo spedizione
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Accoppiamento
 DocType: Authorization Rule,Above Value,Sopra Valore
 ,Pending Amount,In attesa di Importo
 DocType: Purchase Invoice Item,Conversion Factor,Fattore di Conversione
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Consegnato
+DocType: Purchase Order,Delivered,Consegnato
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configurazione del server in arrivo per i lavori di id-mail . ( ad esempio jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Numero di veicoli
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data in cui fattura ricorrente sarà ferma
@@ -1684,10 +1692,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuire oneri corri
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Il Conto {0} deve essere di tipo ' Asset fisso ' come voce {1} è un Asset articolo
 DocType: HR Settings,HR Settings,Impostazioni HR
 apps/frappe/frappe/config/setup.py +130,Printing,Stampa
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Claim è in attesa di approvazione . Solo il Responsabile approvazione spesa può aggiornare lo stato .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Claim è in attesa di approvazione . Solo il Responsabile approvazione spesa può aggiornare lo stato .
 DocType: Purchase Invoice,Additional Discount Amount,Ulteriori Importo Sconto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Il giorno ( s ) in cui si stanno applicando per ferie sono vacanze . Non c'è bisogno di domanda per il congedo .
-sites/assets/js/desk.min.js +7805,and,e
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,e
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia Block List Consentire
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Sigla non può essere vuoto o spazio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportivo
@@ -1724,7 +1732,6 @@ DocType: Opportunity,Quotation,Quotazione
 DocType: Salary Slip,Total Deduction,Deduzione totale
 DocType: Quotation,Maintenance User,Manutenzione utente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Costo Aggiornato
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Sei sicuro di voler unstop
 DocType: Employee,Date of Birth,Data Compleanno
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,L'articolo {0} è già stato restituito
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anno Fiscale** rappresenta un anno contabile. Tutte le voci contabili e altre operazioni importanti sono tracciati per **Anno Fiscale**.
@@ -1740,13 +1747,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Tenere traccia delle campagne di vendita. Tenere traccia di Contatti, Preventivi, Ordini ecc da campagne per misurare il ritorno sull'investimento."
 DocType: Expense Claim,Approver,Certificatore
 ,SO Qty,SO Quantità
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Esistono voci Immagini contro warehouse {0}, quindi non è possibile riassegnare o modificare Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Esistono voci Immagini contro warehouse {0}, quindi non è possibile riassegnare o modificare Warehouse"
 DocType: Appraisal,Calculate Total Score,Calcolare il punteggio totale
 DocType: Supplier Quotation,Manufacturing Manager,Manager Produzione
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} è in garanzia fino a {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split di consegna Nota in pacchetti.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Spedizioni
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Stampaggio Dip
+DocType: Purchase Order,To be delivered to customer,Da consegnare al cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Stato deve essere presentata.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N. di serie {0} non appartiene ad alcun magazzino
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Impostazione
@@ -1771,11 +1779,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Da Valuta
 DocType: DocField,Name,Nome
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleziona importo assegnato, Tipo fattura e fattura numero in almeno uno di fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Gli importi non riflette nel sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Tariffa (Valuta Azienda)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altri
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Imposta come Arrestato
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Non riesco a trovare un prodotto trovato. Si prega di selezionare un altro valore per {0}.
 DocType: POS Profile,Taxes and Charges,Tasse e Costi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un prodotto o un servizio che viene acquistato, venduto o conservato in Giacenza."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Non è possibile selezionare il tipo di carica come 'On Fila Indietro Importo ' o 'On Precedente totale riga ' per la prima fila
@@ -1784,19 +1792,20 @@ DocType: Web Form,Select DocType,Selezionare DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brocciatura
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,bancario
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Si prega di cliccare su ' Generate Schedule ' per ottenere pianificazione
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nuovo Centro di costo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nuovo Centro di costo
 DocType: Bin,Ordered Quantity,Ordinato Quantità
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","ad esempio "" Costruire strumenti per i costruttori """
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Sconto Itemwise
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} contro Sales Order {1}
+DocType: Purchase Order Item,Reference Document Type,Riferimento Tipo di documento
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contro Sales Order {1}
 DocType: Account,Fixed Asset,Asset fisso
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serialized Inventario
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Inventario
 DocType: Activity Type,Default Billing Rate,Predefinito fatturazione Tasso
 DocType: Time Log Batch,Total Billing Amount,Importo totale di fatturazione
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Conto Crediti
 ,Stock Balance,Archivio Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Ordine di vendita a pagamento
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Ordine di vendita a pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Dettaglio Rimborso Spese
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tempo Logs creato:
 DocType: Item,Weight UOM,Peso UOM
@@ -1832,10 +1841,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Per account deve essere un account a pagamento
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsione : {0} non può essere genitore o figlio di {2}
 DocType: Production Order Operation,Completed Qty,Q.tà Completata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, solo gli account di debito possono essere collegati contro un'altra voce di credito"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Prezzo di listino {0} è disattivato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, solo gli account di debito possono essere collegati contro un'altra voce di credito"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prezzo di listino {0} è disattivato
 DocType: Manufacturing Settings,Allow Overtime,Consenti Overtime
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Sales Order {0} viene arrestato
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numeri di serie necessari per la voce {1}. Lei ha fornito {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Corrente Tasso di Valutazione
 DocType: Item,Customer Item Codes,Codici Voce clienti
@@ -1844,9 +1852,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Saldatura
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nuovo Archivio UOM è necessaria
 DocType: Quality Inspection,Sample Size,Dimensione del campione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Si prega di specificare una valida 'Dalla sentenza n'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Ulteriori centri di costo possono essere fatte in Gruppi ma le voci possono essere fatte contro i non-Gruppi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Ulteriori centri di costo possono essere fatte in Gruppi ma le voci possono essere fatte contro i non-Gruppi
 DocType: Project,External,Esterno
 DocType: Features Setup,Item Serial Nos,Voce n ° di serie
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utenti e autorizzazioni
@@ -1873,7 +1881,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Indirizzi & Contatti
 DocType: SMS Log,Sender Name,Nome mittente
 DocType: Page,Title,Titolo
-sites/assets/js/list.min.js +104,Customize,Personalizza
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalizza
 DocType: POS Profile,[Select],[Seleziona]
 DocType: SMS Log,Sent To,Inviato A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Crea Fattura di Vendita
@@ -1898,12 +1906,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Fine Vita
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,viaggi
 DocType: Leave Block List,Allow Users,Consentire Utenti
+DocType: Purchase Order,Customer Mobile No,Clienti mobile No
 DocType: Sales Invoice,Recurring,Periodico
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Traccia reddito separata e spesa per verticali di prodotto o divisioni.
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,aggiornamento dei costi
 DocType: Item Reorder,Item Reorder,Articolo riordino
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Material Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Material Transfer
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specificare le operazioni, costi operativi e dare una gestione unica di no a vostre operazioni."
 DocType: Purchase Invoice,Price List Currency,Prezzo di listino Valuta
 DocType: Naming Series,User must always select,L'utente deve sempre selezionare
@@ -1926,7 +1935,7 @@ DocType: Appraisal,Employee,Dipendente
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importa posta elettronica da
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Invita come utente
 DocType: Features Setup,After Sale Installations,Installazioni Post Vendita
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} è completamente fatturato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} è completamente fatturato
 DocType: Workstation Working Hour,End Time,Ora fine
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condizioni contrattuali standard per la vendita o di acquisto.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppo da Voucher
@@ -1935,8 +1944,9 @@ DocType: Sales Invoice,Mass Mailing,Mailing di massa
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,File da rinominare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Numero Purchse ordine richiesto per la voce {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostra Pagamenti
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM specificato {0} non esiste per la voce {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programma di manutenzione {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programma di manutenzione {0} deve essere cancellato prima di annullare questo ordine di vendita
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Taglia
 DocType: Notification Control,Expense Claim Approved,Rimborso Spese Approvato
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutico
@@ -1955,8 +1965,8 @@ DocType: Upload Attendance,Attendance To Date,Data Fine Frequenza
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configurazione del server per la posta elettronica in entrata vendite id . ( ad esempio sales@example.com )
 DocType: Warranty Claim,Raised By,Sollevata dal
 DocType: Payment Tool,Payment Account,Conto di Pagamento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Si prega di specificare Società di procedere
-sites/assets/js/list.min.js +23,Draft,Bozza
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Si prega di specificare Società di procedere
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Bozza
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compensativa Off
 DocType: Quality Inspection Reading,Accepted,Accettato
 DocType: User,Female,Femmina
@@ -1969,14 +1979,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Etichetta Regola di Spedizione
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Siccome ci sono transazioni di magazzino per questo articolo, \ non è possibile modificare i valori di 'Ha Numero Seriale', 'Ha Numero Lotto', 'presente in Scorta' e 'il metodo di valutazione'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Breve diario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Non è possibile modificare tariffa se BOM menzionato agianst tutto l'articolo
 DocType: Employee,Previous Work Experience,Lavoro precedente esperienza
 DocType: Stock Entry,For Quantity,Per Quantità
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Inserisci pianificato quantità per la voce {0} alla riga {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} non è presentato
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Le richieste di articoli.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} non è presentato
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Le richieste di articoli.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ordine di produzione separata verrà creato per ogni buon prodotto finito.
 DocType: Purchase Invoice,Terms and Conditions1,Termini e Condizioni 1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,installazione completa
@@ -1988,7 +1999,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Elenco Indirizzi
 DocType: Delivery Note,Transporter Name,Trasportatore Nome
 DocType: Contact,Enter department to which this Contact belongs,Inserisci reparto a cui appartiene questo contatto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totale Assente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Voce o Magazzino per riga {0} non corrisponde Material Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Voce o Magazzino per riga {0} non corrisponde Material Request
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unità di Misura
 DocType: Fiscal Year,Year End Date,Data di Fine Anno
 DocType: Task Depends On,Task Depends On,Attività dipende
@@ -2014,7 +2025,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distributore di terze parti / rivenditore / commissionario / affiliate / rivenditore che vende i prodotti delle aziende per una commissione.
 DocType: Customer Group,Has Child Node,Ha un Nodo Figlio
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Inserisci parametri statici della url qui (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} non è in alcun anno fiscale attivo. Per maggiori dettagli si veda {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
@@ -2065,11 +2076,9 @@ DocType: Note,Note,Nota
 DocType: Purchase Receipt Item,Recd Quantity,RECD Quantità
 DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Non può produrre più Voce {0} di Sales Order quantità {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Imposta come unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Giacenza {0} non inserita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Giacenza {0} non inserita
 DocType: Payment Reconciliation,Bank / Cash Account,Banca / Account Cash
 DocType: Tax Rule,Billing City,Fatturazione Città
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Questo Leave applicazione è in attesa di approvazione. Solo il Leave Approver può aggiornare lo stato.
 DocType: Global Defaults,Hide Currency Symbol,Nascondi Simbolo Valuta
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","per esempio bancario, contanti, carta di credito"
 DocType: Journal Entry,Credit Note,Nota Credito
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totale (Quantità)
 DocType: Installation Note Item,Installed Qty,Qtà installata
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-sites/assets/js/list.min.js +26,Submitted,Inserito
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Inserito
 DocType: Salary Structure,Total Earning,Guadagnare totale
 DocType: Purchase Receipt,Time at which materials were received,Ora in cui sono stati ricevuti i materiali
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,I miei indirizzi
@@ -2099,7 +2108,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Ramo Organizz
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,oppure
 DocType: Sales Order,Billing Status,Stato Fatturazione
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Spese Utility
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Sopra
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Sopra
 DocType: Buying Settings,Default Buying Price List,Predefinito acquisto Prezzo di listino
 ,Download Backups,Scarica Backup
 DocType: Notification Control,Sales Order Message,Sales Order Messaggio
@@ -2108,7 +2117,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Selezionare Dipendenti
 DocType: Bank Reconciliation,To Date,A Data
 DocType: Opportunity,Potential Sales Deal,Deal potenziale di vendita
-sites/assets/js/form.min.js +308,Details,Dettagli
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Dettagli
 DocType: Purchase Invoice,Total Taxes and Charges,Totale imposte e oneri
 DocType: Employee,Emergency Contact,Contatto di emergenza
 DocType: Item,Quality Parameters,Parametri di Qualità
@@ -2123,7 +2132,7 @@ DocType: Purchase Order Item,Received Qty,Quantità ricevuta
 DocType: Stock Entry Detail,Serial No / Batch,Serial n / Batch
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Tipo Conto
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programma di manutenzione non viene generato per tutte le voci . Si prega di cliccare su ' Generate Schedule '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programma di manutenzione non viene generato per tutte le voci . Si prega di cliccare su ' Generate Schedule '
 ,To Produce,per produrre
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per riga {0} a {1}. Per includere {2} a tasso Item, righe {3} deve essere inclusa anche"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificazione del pacchetto per la consegna (per la stampa)
@@ -2134,7 +2143,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Appiattimento
 DocType: Account,Income Account,Conto Proventi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modanatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Recapito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Recapito
 DocType: Stock Reconciliation Item,Current Qty,Quantità corrente
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Vedere "tasso di materiali a base di" in Costing Sezione
 DocType: Appraisal Goal,Key Responsibility Area,Area Chiave Responsabilità
@@ -2165,9 +2174,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Tutti gli indirizzi.
 DocType: Company,Stock Settings,Impostazioni Giacenza
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusione è possibile solo se seguenti sono gli stessi in entrambi i record. È il gruppo, Radice Tipo, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusione è possibile solo se seguenti sono gli stessi in entrambi i record. È il gruppo, Radice Tipo, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gestire Organizzazione Gruppi Clienti
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nuovo Centro di costo Nome
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nuovo Centro di costo Nome
 DocType: Leave Control Panel,Leave Control Panel,Lascia il Pannello di controllo
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Nessun valore predefinito Indirizzo Template trovato. Si prega di crearne uno nuovo da Setup> Stampa e Branding> Indirizzo Template.
 DocType: Appraisal,HR User,HR utente
@@ -2186,24 +2195,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Dettaglio strumento di pagamento
 ,Sales Browser,Browser vendite
 DocType: Journal Entry,Total Credit,Totale credito
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Locale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Locale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Crediti ( Assets )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nessun dipendente trovato!
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Si prega di citare nessuna delle visite richieste
+DocType: Purchase Order,Customer Address Display,Indirizzo cliente display
 DocType: Stock Settings,Default Valuation Method,Metodo Valutazione Predefinito
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Lucidatura
 DocType: Production Order Operation,Planned Start Time,Planned Ora di inizio
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Assegnati
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Chiudere Stato Patrimoniale e il libro utile o perdita .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unità di misura predefinita per la voce {0} non può essere modificato direttamente, perché \ hai già fatto qualche operazione (s) con un altro UOM. Per cambiare UOM predefinita, \ uso 'UOM Sostituire Utility' strumento sotto modulo Fotografici."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificare Tasso di cambio per convertire una valuta in un'altra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Preventivo {0} è annullato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Preventivo {0} è annullato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Importo totale Eccezionale
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} era in aspettativa per {1} . Impossibile segnare presenze .
 DocType: Sales Partner,Targets,Obiettivi
@@ -2218,12 +2227,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Si tratta di un gruppo di clienti root e non può essere modificato .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Si prega di configurare il piano dei conti prima di iniziare scritture contabili
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignora regola tariffaria
-sites/assets/js/list.min.js +24,Cancelled,Annullato
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Annullato
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La data della struttura salariale non può essere inferiore a quella di assunzione del dipendente.
 DocType: Employee Education,Graduate,Laureato:
 DocType: Leave Block List,Block Days,Giorno Blocco
 DocType: Journal Entry,Excise Entry,Excise Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Attenzione: ordini di vendita {0} esiste già contro Ordine di Acquisto del Cliente {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Attenzione: ordini di vendita {0} esiste già contro Ordine di Acquisto del Cliente {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2280,17 +2289,17 @@ DocType: Account,Stock Received But Not Billed,Giacenza Ricevuta ma non Fatturat
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,retribuzione lorda + Importo posticipata + Importo incasso - Deduzione totale
 DocType: Monthly Distribution,Distribution Name,Nome della Distribuzione
 DocType: Features Setup,Sales and Purchase,Vendita e Acquisto
-DocType: Purchase Order Item,Material Request No,Materiale Richiesta No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
+DocType: Supplier Quotation Item,Material Request No,Materiale Richiesta No
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasso al quale la valuta del cliente viene convertito in valuta di base dell'azienda
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,La sottoscrizione di {0} è stata rimossa da questo elenco.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasso Netto (Valuta Azienda)
-apps/frappe/frappe/templates/base.html +132,Added,Aggiunti
+apps/frappe/frappe/templates/base.html +134,Added,Aggiunti
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gestire Organizzazione Territorio.
 DocType: Journal Entry Account,Sales Invoice,Fattura Commerciale
 DocType: Journal Entry Account,Party Balance,Balance Partito
 DocType: Sales Invoice Item,Time Log Batch,Tempo Log Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Si prega di selezionare Applica sconto su
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Si prega di selezionare Applica sconto su
 DocType: Company,Default Receivable Account,Account Crediti Predefinito
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crea Banca Entry per il salario totale pagato per i criteri sopra selezionati
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer per Produzione
@@ -2301,7 +2310,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Prendi le voci rilevanti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Voce contabilità per scorta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coniatura
 DocType: Sales Invoice,Sales Team1,Vendite Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,L'articolo {0} non esiste
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,L'articolo {0} non esiste
 DocType: Sales Invoice,Customer Address,Indirizzo Cliente
 apps/frappe/frappe/desk/query_report.py +136,Total,Totale
 DocType: Purchase Invoice,Apply Additional Discount On,Applicare Sconto Ulteriori On
@@ -2316,13 +2325,15 @@ DocType: Quality Inspection,Quality Inspection,Controllo Qualità
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formando
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Il Conto {0} è congelato
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Il Conto {0} è congelato
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entità Legale / Controllata con un grafico separato di conti appartenenti all'organizzazione.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Prodotti alimentari , bevande e tabacco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tasso Commissione non può essere superiore a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Livello Minimo di Inventario
 DocType: Stock Entry,Subcontract,Subappaltare
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Si prega di inserire {0} prima
 DocType: Production Planning Tool,Get Items From Sales Orders,Ottieni elementi da ordini di vendita
 DocType: Production Order Operation,Actual End Time,Actual End Time
 DocType: Production Planning Tool,Download Materials Required,Scaricare Materiali Richiesti
@@ -2339,9 +2350,9 @@ DocType: Maintenance Visit,Scheduled,Pianificate
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Si prega di selezionare la voce dove "è articolo di" è "No" e "Is Voce di vendita" è "Sì", e non c'è nessun altro pacchetto di prodotti"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selezionare distribuzione mensile per distribuire in modo non uniforme obiettivi attraverso mesi.
 DocType: Purchase Invoice Item,Valuation Rate,Tasso Valutazione
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Listino Prezzi Valuta non selezionati
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Listino Prezzi Valuta non selezionati
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Voce Riga {0}: Acquisto Ricevuta {1} non esiste nella tabella di cui sopra 'ricevute di acquisto'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ha già presentato domanda di {1} tra {2} e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ha già presentato domanda di {1} tra {2} e {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data di inizio del progetto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Fino a
 DocType: Rename Tool,Rename Log,Rinominare Entra
@@ -2368,13 +2379,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Solo i nodi foglia sono ammessi nelle transazioni
 DocType: Expense Claim,Expense Approver,Expense Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Acquisto Ricevuta Articolo inserito
-sites/assets/js/erpnext.min.js +48,Pay,Pagare
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagare
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Per Data Ora
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,I registri per il mantenimento dello stato di consegna sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Rettifica
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink wrapping
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Attività in sospeso
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Attività in sospeso
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confermato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fornitore> Fornitore Tipo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Inserisci la data alleviare .
@@ -2385,7 +2396,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Ins
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editori Giornali
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selezionare l'anno fiscale
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fusione
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Tu sei il Lascia Responsabile approvazione per questo record . Si prega di aggiornare il 'Stato' e Save
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Riordina Level
 DocType: Attendance,Attendance Date,Data Presenza
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Stipendio rottura basato sul guadagno e di deduzione.
@@ -2421,6 +2431,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro di costo con le transazioni esistenti non può essere convertito in gruppo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ammortamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Periodo non valido
 DocType: Customer,Credit Limit,Limite Credito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleziona il tipo di operazione
 DocType: GL Entry,Voucher No,Voucher No
@@ -2430,8 +2441,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Templ
 DocType: Customer,Address and Contact,Indirizzo e contatto
 DocType: Customer,Last Day of the Next Month,Ultimo giorno del mese prossimo
 DocType: Employee,Feedback,Riscontri
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Tabella di marcia
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tabella di marcia
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Lavorazione a getto abrasivo
 DocType: Stock Settings,Freeze Stock Entries,Congela scorta voci
 DocType: Website Settings,Website Settings,Impostazioni Sito
@@ -2445,11 +2456,11 @@ DocType: Quality Inspection,Outgoing,In partenza
 DocType: Material Request,Requested For,richiesto Per
 DocType: Quotation Item,Against Doctype,Per Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Sottoscrivi questa bolla di consegna contro ogni progetto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Account root non può essere eliminato
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Account root non può essere eliminato
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostra Immagini Entries
 ,Is Primary Address,È primario Indirizzo
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Riferimento # {0} datato {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Riferimento # {0} datato {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gestire Indirizzi
 DocType: Pricing Rule,Item Code,Codice Articolo
 DocType: Production Planning Tool,Create Production Orders,Crea Ordine Prodotto
@@ -2458,14 +2469,14 @@ DocType: Journal Entry,User Remark,Osservazioni utenti
 DocType: Lead,Market Segment,Segmento di Mercato
 DocType: Communication,Phone,Telefono
 DocType: Employee Internal Work History,Employee Internal Work History,Storia lavorativa Interna del Dipendente
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Chiusura (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Chiusura (Dr)
 DocType: Contact,Passive,Passive
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} non in magazzino
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modello fiscale per la vendita di transazioni.
 DocType: Sales Invoice,Write Off Outstanding Amount,Scrivi Off eccezionale Importo
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Seleziona se necessiti di fattura ricorrente periodica. Dopo aver inserito ogni fattura vendita, la sezione Ricorrenza diventa visibile."
 DocType: Account,Accounts Manager,Gestione conti
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Tempo di log {0} deve essere ' inoltrata '
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Tempo di log {0} deve essere ' inoltrata '
 DocType: Stock Settings,Default Stock UOM,UdM predefinita per Giacenza
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Costing tariffa si basa su Tipo Attività (per ora)
 DocType: Production Planning Tool,Create Material Requests,Creare Richieste Materiale
@@ -2476,7 +2487,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Conciliazione Banca
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Ricevi aggiornamenti
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Richiesta materiale {0} viene annullato o interrotto
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Aggiungere un paio di record di esempio
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Lascia Gestione
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lascia Gestione
 DocType: Event,Groups,Gruppi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Raggruppa per conto
 DocType: Sales Order,Fully Delivered,Completamente Consegnato
@@ -2488,11 +2499,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Extra di vendita
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget per conto {1} contro il centro di costo {2} supererà da {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Portare Avanti Autorizzazione
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' Dalla Data' deve essere successivo a 'Alla Data'
 ,Stock Projected Qty,Qtà Prevista Giacenza
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
 DocType: Sales Order,Customer's Purchase Order,Ordine di Acquisto del Cliente
 DocType: Warranty Claim,From Company,Da Azienda
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valore o Quantità
@@ -2505,13 +2515,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Dettagliante
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credito Per account deve essere un account di Stato Patrimoniale
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tutti i tipi di fornitori
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Codice Articolo è obbligatoria in quanto articolo non è numerato automaticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Codice Articolo è obbligatoria in quanto articolo non è numerato automaticamente
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programma di manutenzione Voce
 DocType: Sales Order,%  Delivered,%  Consegnato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Scoperto di conto bancario
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Crea Busta Paga
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,stappare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Sfoglia BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Prestiti garantiti
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Prodotti di punta
@@ -2521,7 +2530,7 @@ DocType: Appraisal,Appraisal,Valutazione
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,-Foam perso colata
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Disegno
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,La Data si Ripete
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Lascia dell'approvazione deve essere uno dei {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Lascia dell'approvazione deve essere uno dei {0}
 DocType: Hub Settings,Seller Email,Venditore Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo totale di acquisto (tramite acquisto fattura)
 DocType: Workstation Working Hour,Start Time,Ora di inizio
@@ -2535,8 +2544,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importo netto (Valuta Azienda)
 DocType: BOM Operation,Hour Rate,Rapporto Orario
 DocType: Stock Settings,Item Naming By,Articolo Naming By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,da Preventivo
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Un'altra voce periodo di chiusura {0} è stato fatto dopo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,da Preventivo
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Un'altra voce periodo di chiusura {0} è stato fatto dopo {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiale trasferito for Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Il Conto {0} non esiste
 DocType: Purchase Receipt Item,Purchase Order Item No,Acquisto fig
@@ -2549,11 +2558,11 @@ DocType: Item,Inspection Required,Ispezione Obbligatorio
 DocType: Purchase Invoice Item,PR Detail,PR Dettaglio
 DocType: Sales Order,Fully Billed,Completamente Fatturato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Magazzino Data di consegna richiesto per articolo di {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Magazzino Data di consegna richiesto per articolo di {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Il peso lordo del pacchetto. Di solito peso netto + peso materiale di imballaggio. (Per la stampa)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gli utenti con questo ruolo sono autorizzati a impostare conti congelati e creare / modificare le voci contabili nei confronti di conti congelati
 DocType: Serial No,Is Cancelled,È Annullato
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Le mie spedizioni
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Le mie spedizioni
 DocType: Journal Entry,Bill Date,Data Fattura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Anche se ci sono più regole sui prezzi con la priorità più alta, si applicano quindi le seguenti priorità interne:"
 DocType: Supplier,Supplier Details,Fornitore Dettagli
@@ -2566,7 +2575,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bonifico bancario
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Seleziona conto bancario
 DocType: Newsletter,Create and Send Newsletters,Creare e inviare newsletter
-sites/assets/js/report.min.js +107,From Date must be before To Date,Da Data deve essere prima di A Data
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Da Data deve essere prima di A Data
 DocType: Sales Order,Recurring Order,Ordine Ricorrente
 DocType: Company,Default Income Account,Conto Predefinito Entrate
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Gruppi clienti / clienti
@@ -2581,31 +2590,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,UdM Giacenza
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Purchase Order {0} non è presentata
 ,Projected,proiettata
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} non appartiene al Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
 DocType: Notification Control,Quotation Message,Messaggio Preventivo
 DocType: Issue,Opening Date,Data di apertura
 DocType: Journal Entry,Remark,Osservazioni
 DocType: Purchase Receipt Item,Rate and Amount,Aliquota e importo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Noioso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Da Ordine di Vendita
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Da Ordine di Vendita
 DocType: Blog Category,Parent Website Route,Parent Sito Percorso
 DocType: Sales Order,Not Billed,Non Fatturata
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Entrambi Warehouse deve appartenere alla stessa Società
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Nessun contatto ancora aggiunto.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nessun contatto ancora aggiunto.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Non attivo
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Contro fattura Data Pubblicazione
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Importo
 DocType: Time Log,Batched for Billing,Raggruppati per la Fatturazione
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Fatture sollevate dai fornitori.
 DocType: POS Profile,Write Off Account,Scrivi Off account
-sites/assets/js/erpnext.min.js +26,Discount Amount,Importo sconto
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Importo sconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Ritorno Contro Acquisto Fattura
 DocType: Item,Warranty Period (in days),Periodo di garanzia (in giorni)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ad esempio IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Articolo 4
 DocType: Journal Entry Account,Journal Entry Account,Addebito Journal
 DocType: Shopping Cart Settings,Quotation Series,Serie Preventivi
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Un elemento esiste con lo stesso nome ( {0} ) , si prega di cambiare il nome del gruppo o di rinominare la voce"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Un elemento esiste con lo stesso nome ( {0} ) , si prega di cambiare il nome del gruppo o di rinominare la voce"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gas metalli a caldo
 DocType: Sales Order Item,Sales Order Date,Ordine di vendita Data
 DocType: Sales Invoice Item,Delivered Qty,Q.tà Consegnata
@@ -2637,10 +2645,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Cliente o fornitore Dettagli
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,set
 DocType: Lead,Lead Owner,Responsabile Contatto
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,È richiesta Magazzino
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,È richiesta Magazzino
 DocType: Employee,Marital Status,Stato civile
 DocType: Stock Settings,Auto Material Request,Richiesta Automatica Materiale 
 DocType: Time Log,Will be updated when billed.,Verrà aggiornato quando fatturati.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponibile Quantità batch a partire Warehouse
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM corrente e New BOM non può essere lo stesso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data del pensionamento deve essere maggiore di Data Assunzione
 DocType: Sales Invoice,Against Income Account,Per Reddito Conto
@@ -2657,12 +2666,12 @@ DocType: POS Profile,Update Stock,Aggiornare Giacenza
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinitura
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Diverso UOM per gli elementi porterà alla non corretta ( Total) Valore di peso netto . Assicurarsi che il peso netto di ogni articolo è nella stessa UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tasso
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Si prega di tirare oggetti da DDT
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Si prega di tirare oggetti da DDT
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journal Entries {0} sono un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registrazione di tutte le comunicazioni di tipo e-mail, telefono, chat, visita, ecc"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Si prega di citare Arrotondamento centro di costo in azienda
 DocType: Purchase Invoice,Terms,Termini
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Crea nuovo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Crea nuovo
 DocType: Buying Settings,Purchase Order Required,Ordine di Acquisto Obbligatorio
 ,Item-wise Sales History,Articolo-saggio Storia Vendite
 DocType: Expense Claim,Total Sanctioned Amount,Totale importo sanzionato
@@ -2679,16 +2688,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Stipendio slittamento Deduz
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Note
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Selezionare un nodo primo gruppo.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Scopo deve essere uno dei {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Compila il modulo e salvarlo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Compila il modulo e salvarlo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Scaricare un report contenete tutte le materie prime con il loro recente stato di inventario
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Di fronte
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 DocType: Leave Application,Leave Balance Before Application,Lascia equilibrio prima applicazione
 DocType: SMS Center,Send SMS,Invia SMS
 DocType: Company,Default Letter Head,Predefinito Lettera Capo
 DocType: Time Log,Billable,Addebitabile
 DocType: Authorization Rule,This will be used for setting rule in HR module,Questo verrà utilizzato per regola impostazione nel modulo HR
 DocType: Account,Rate at which this tax is applied,Tasso a cui viene applicata questa tassa
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Riordina Quantità
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Riordina Quantità
 DocType: Company,Stock Adjustment Account,Conto di regolazione Archivio
 DocType: Journal Entry,Write Off,Cancellare
 DocType: Time Log,Operation ID,Operazione ID
@@ -2699,12 +2709,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Il Campo Sconto sarà abilitato in Ordine di acquisto, ricevuta di acquisto, Fattura Acquisto"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nome del nuovo account. Nota: Si prega di non creare account per Clienti e Fornitori
 DocType: Report,Report Type,Tipo di rapporto
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Caricamento
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Caricamento
 DocType: BOM Replace Tool,BOM Replace Tool,DiBa Sostituire Strumento
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelli Country saggio di default Indirizzo
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Fornitore garantisce al Cliente
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mostra fiscale break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importare e Esportare Dati
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Se si coinvolgono in attività di produzione . Abilita Voce ' è prodotto '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fattura Data Pubblicazione
 DocType: Sales Invoice,Rounded Total,Totale arrotondato
 DocType: Product Bundle,List items that form the package.,Voci di elenco che formano il pacchetto.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentuale di ripartizione dovrebbe essere pari al 100 %
@@ -2715,8 +2728,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Si prega di contattare l'utente che hanno Sales Master Responsabile {0} ruolo
 DocType: Company,Default Cash Account,Conto Monete predefinito
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Azienda ( non cliente o fornitore ) master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Note di consegna {0} devono essere cancellate prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Note di consegna {0} devono essere cancellate prima di annullare questo ordine di vendita
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Importo versato + Scrivi Off importo non può essere superiore a Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} non è un numero di lotto valido per la voce {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
@@ -2738,11 +2751,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Riga {0}: Quantità non avalable in magazzino {1} il {2} {3}.
  Disponibile Quantità: {4}, Qty trasferimento: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Articolo 3
+DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Event,Sunday,Domenica
 DocType: Sales Team,Contribution (%),Contributo (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : non verrà creato il pagamento poiché non è stato specificato 'conto bancario o fido'
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilità
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Modelli
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelli
 DocType: Sales Person,Sales Person Name,Vendite Nome persona
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Inserisci atleast 1 fattura nella tabella
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Aggiungi utenti
@@ -2751,7 +2765,7 @@ DocType: Task,Actual Start Date (via Time Logs),Actual Data di inizio (via Time
 DocType: Stock Reconciliation Item,Before reconciliation,Prima di riconciliazione
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Tasse e spese aggiuntive (Azienda valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
 DocType: Sales Order,Partly Billed,Parzialmente Fatturato
 DocType: Item,Default BOM,BOM Predefinito
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2759,12 +2773,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totale Outstanding Amt
 DocType: Time Log Batch,Total Hours,Totale ore
 DocType: Journal Entry,Printing Settings,Impostazioni di stampa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Debito totale deve essere pari al totale credito .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Debito totale deve essere pari al totale credito .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Parte per il tipo {0} già stanziato per Employee {1} per l'anno fiscale {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,L'Articolo è richiesto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Iniezione di metallo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Da Nota di Consegna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Da Nota di Consegna
 DocType: Time Log,From Time,Da Periodo
 DocType: Notification Control,Custom Message,Messaggio Personalizzato
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
@@ -2780,10 +2793,10 @@ DocType: Newsletter,A Lead with this email id should exist,Un potenziale cliente
 DocType: Stock Entry,From BOM,Da Distinta Base
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,di base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operazioni Giacenza prima {0} sono bloccate
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',Si prega di cliccare su ' Generate Schedule '
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,'A Data' deve essere uguale a 'Da Data' per il congedo di mezza giornata
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Si prega di cliccare su ' Generate Schedule '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,'A Data' deve essere uguale a 'Da Data' per il congedo di mezza giornata
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","ad esempio Kg, unità, nn, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,N. di riferimento è obbligatoria se hai inserito Reference Data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,N. di riferimento è obbligatoria se hai inserito Reference Data
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data di adesione deve essere maggiore di Data di nascita
 DocType: Salary Structure,Salary Structure,Struttura salariale
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2791,7 +2804,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  conflitto assegnando priorità. Regole Prezzo: {0}"
 DocType: Account,Bank,Banca
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,linea aerea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Fornire Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Fornire Materiale
 DocType: Material Request Item,For Warehouse,Per Magazzino
 DocType: Employee,Offer Date,offerta Data
 DocType: Hub Settings,Access Token,Token di accesso
@@ -2814,6 +2827,7 @@ DocType: Issue,Opening Time,Tempo di apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data Inizio e Fine sono obbligatorie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & borse merci
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
+DocType: Delivery Note Item,From Warehouse,Dal magazzino
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforazione
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Soffiaggio
 DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Total
@@ -2835,11 +2849,12 @@ DocType: C-Form,Amended From,Corretto da
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguire via Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Fiscale Ammontare Dopo Sconto Importo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Conto Child esiste per questo account . Non è possibile eliminare questo account .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Conto Child esiste per questo account . Non è possibile eliminare questo account .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Sia qty destinazione o importo obiettivo è obbligatoria
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Non esiste Distinta Base predefinita per l'articolo {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Seleziona Data Pubblicazione primo
-DocType: Leave Allocation,Carry Forward,Portare Avanti
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Non esiste Distinta Base predefinita per l'articolo {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Seleziona Data Pubblicazione primo
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data di apertura dovrebbe essere prima Data di chiusura
+DocType: Leave Control Panel,Carry Forward,Portare Avanti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centro di costo con le transazioni esistenti non può essere convertito in contabilità
 DocType: Department,Days for which Holidays are blocked for this department.,Giorni per i quali le festività sono bloccati per questo reparto.
 ,Produced,prodotto
@@ -2860,17 +2875,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totale (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Intrattenimento e tempo libero
 DocType: Purchase Order,The date on which recurring order will be stop,La data in cui ordine ricorrente sarà ferma
 DocType: Quality Inspection,Item Serial No,Articolo N. d'ordine
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve essere ridotto di {1} o si dovrebbe aumentare la tolleranza di superamento soglia
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve essere ridotto di {1} o si dovrebbe aumentare la tolleranza di superamento soglia
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente totale
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Ora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Voce {0} non può essere aggiornato tramite \
  riconciliazione Archivio"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Trasferire il materiale al Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Trasferire il materiale al Fornitore
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No non può avere Warehouse . Warehouse deve essere impostato da dell'entrata Stock o ricevuta d'acquisto
 DocType: Lead,Lead Type,Tipo Contatto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crea Preventivo
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Tutti questi elementi sono già stati fatturati
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tutti questi elementi sono già stati fatturati
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Può essere approvato da {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Spedizione condizioni regola
 DocType: BOM Replace Tool,The new BOM after replacement,Il nuovo BOM dopo la sostituzione
@@ -2918,7 +2933,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID Operazione non impostato
 DocType: Production Order,Planned Start Date,Data prevista di inizio
 DocType: Serial No,Creation Document Type,Creazione tipo di documento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Visita
 DocType: Leave Type,Is Encash,È incassare
 DocType: Purchase Invoice,Mobile No,Num. Cellulare
 DocType: Payment Tool,Make Journal Entry,Crea Voce Diario
@@ -2926,7 +2941,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nuove foglie allocato
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dati di progetto non sono disponibile per Preventivo
 DocType: Project,Expected End Date,Data prevista di fine
 DocType: Appraisal Template,Appraisal Template Title,Valutazione Titolo Modello
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,commerciale
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,commerciale
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Voce genitore {0} non deve essere un Articolo Articolo
 DocType: Cost Center,Distribution Id,ID di Distribuzione
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servizi di punta
@@ -2942,14 +2957,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Rapporto qualità-attributo {0} deve essere compresa tra {1} a {2} nei incrementi di {3}
 DocType: Tax Rule,Sales,Vendite
 DocType: Stock Entry Detail,Basic Amount,Importo di base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
+DocType: Leave Allocation,Unused leaves,Foglie non utilizzati
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Predefinito Contabilità clienti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Segare
 DocType: Tax Rule,Billing State,Stato di fatturazione
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminazione
 DocType: Item Reorder,Transfer,Trasferimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
 DocType: Authorization Rule,Applicable To (Employee),Applicabile a (Dipendente)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Data di scadenza è obbligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
@@ -2965,6 +2981,7 @@ DocType: Company,Retail,Vendita al dettaglio
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,{0} non esiste clienti
 DocType: Attendance,Absent,Assente
 DocType: Product Bundle,Product Bundle,Bundle prodotto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Riga {0}: Riferimento non valido {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Frantumazione
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Acquistare Tasse e spese Template
 DocType: Upload Attendance,Download Template,Scarica Modello
@@ -2972,16 +2989,16 @@ DocType: GL Entry,Remarks,Osservazioni
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Codice Articolo Materia Prima
 DocType: Journal Entry,Write Off Based On,Scrivi Off Basato Su
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Record di installazione per un numero di serie
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Record di installazione per un numero di serie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Colata continua
-sites/assets/js/erpnext.min.js +10,Please specify a,Si prega di specificare una
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Si prega di specificare una
 DocType: Offer Letter,Awaiting Response,In attesa di risposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Sopra
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamento a freddo
 DocType: Salary Slip,Earning & Deduction,Rendimento & Detrazione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Il Conto {0} non può essere un gruppo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regione
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Facoltativo. Questa impostazione verrà utilizzato per filtrare in diverse operazioni .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Facoltativo. Questa impostazione verrà utilizzato per filtrare in diverse operazioni .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativo Tasso valutazione non è consentito
 DocType: Holiday List,Weekly Off,Settimanale Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per es. 2012, 2012-13"
@@ -3025,12 +3042,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Sporgente
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporazione-modello colata
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Spese di rappresentanza
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fattura di vendita {0} deve essere cancellato prima di annullare questo ordine di vendita
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Età
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fattura di vendita {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Età
 DocType: Time Log,Billing Amount,Fatturazione Importo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantità non valido specificato per l'elemento {0}. La quantità dovrebbe essere maggiore di 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Richieste di Ferie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Conto con transazione esistente non può essere cancellato
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Conto con transazione esistente non può essere cancellato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Spese legali
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Il giorno del mese su cui ordine automatica verrà generato ad esempio 05, 28 ecc"
 DocType: Sales Invoice,Posting Time,Tempo Distacco
@@ -3039,9 +3056,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleziona se vuoi forzare l'utente a selezionare una serie prima di salvare. Altrimenti sarà NO di default.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Nessun Articolo con Numero di Serie {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Aperte Notifiche
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Aperte Notifiche
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,spese dirette
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Vuoi davvero a stappare questa Materiale Richiedi ?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nuovi Ricavi Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Spese di viaggio
 DocType: Maintenance Visit,Breakdown,Esaurimento
@@ -3052,7 +3068,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Come in data
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Levigatura
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Magazino predefinito necessario per articolo in Giacenza.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Magazino predefinito necessario per articolo in Giacenza.
 DocType: Feed,Full Name,Nome Completo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinciatura
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Il pagamento dello stipendio del mese {0} e l'anno {1}
@@ -3075,7 +3091,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Aggiungere righ
 DocType: Buying Settings,Default Supplier Type,Tipo Fornitore Predefinito
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Estrazione
 DocType: Production Order,Total Operating Cost,Totale costi di esercizio
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tutti i contatti.
 DocType: Newsletter,Test Email Id,Prova Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abbreviazione Società
@@ -3099,11 +3115,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Prevent
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ruolo ammessi da modificare stock congelato
 ,Territory Target Variance Item Group-Wise,Territorio di destinazione Varianza articolo Group- Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tutti i gruppi di clienti
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Tax modello è obbligatoria.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Il Conto {0}: conto derivato {1} non esiste
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prezzo di listino (Valuta Azienda)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',Lo stato di {0} {1} è 'Arrestato'
 DocType: Account,Temporary,Temporaneo
 DocType: Address,Preferred Billing Address,Preferito Indirizzo di fatturazione
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentuale di allocazione
@@ -3121,13 +3136,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Voce Wise fiscale Detta
 DocType: Purchase Order Item,Supplier Quotation,Preventivo Fornitore
 DocType: Quotation,In Words will be visible once you save the Quotation.,In parole saranno visibili una volta che si salva il preventivo.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Stiratura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} è fermato
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} è fermato
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
 DocType: Lead,Add to calendar on this date,Aggiungi al calendario in questa data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regole per l'aggiunta di spese di spedizione .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Prossimi eventi
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Prossimi eventi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Il Cliente è tenuto
 DocType: Letter Head,Letter Head,Carta intestata
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Inserimento rapido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} è obbligatorio per Return
 DocType: Purchase Order,To Receive,Ricevere
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink raccordo
@@ -3150,25 +3166,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Almeno un Magazzino è obbligatorio
 DocType: Serial No,Out of Warranty,Fuori Garanzia
 DocType: BOM Replace Tool,Replace,Sostituire
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} contro Fattura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Inserisci unità di misura predefinita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contro Fattura {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Inserisci unità di misura predefinita
 DocType: Purchase Invoice Item,Project Name,Nome del progetto
 DocType: Supplier,Mention if non-standard receivable account,Menzione se conto credito non standard
 DocType: Workflow State,Edit,Modifica
 DocType: Journal Entry Account,If Income or Expense,Se proventi od oneri
 DocType: Features Setup,Item Batch Nos,Numeri Lotto Articolo
 DocType: Stock Ledger Entry,Stock Value Difference,Differenza Valore Giacenza
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Risorsa Umana
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Risorsa Umana
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento Riconciliazione di pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Attività fiscali
 DocType: BOM Item,BOM No,N. DiBa
 DocType: Contact Us Settings,Pincode,PINCODE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Diario {0} non ha conto {1} o già confrontato altro buono
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Diario {0} non ha conto {1} o già confrontato altro buono
 DocType: Item,Moving Average,Media Mobile
 DocType: BOM Replace Tool,The BOM which will be replaced,La distinta base che sarà sostituito
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nuovo Archivio UOM deve essere diverso da stock attuale UOM
 DocType: Account,Debit,Debito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Le foglie devono essere assegnati in multipli di 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Le foglie devono essere assegnati in multipli di 0,5"
 DocType: Production Order,Operation Cost,Operazione Costo
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Carica presenze da un file. Csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Eccezionale Amt
@@ -3176,7 +3192,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fissare
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Per assegnare questo problema, utilizzare il pulsante "Assegna" nella barra laterale."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelare Stocks Older Than [ giorni]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Se due o più regole sui prezzi sono trovate delle condizioni di cui sopra, viene applicata la priorità. La priorità è un numero compreso tra 0 a 20, mentre il valore di default è pari a zero (vuoto). Numero maggiore significa che avrà la precedenza se ci sono più regole sui prezzi con le stesse condizioni."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Contro fattura
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Anno fiscale: {0} non esiste
 DocType: Currency Exchange,To Currency,Per valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Consentire i seguenti utenti per approvare le richieste per i giorni di blocco.
@@ -3205,7 +3220,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tasso
 DocType: Stock Entry Detail,Additional Cost,Costo aggiuntivo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data di Esercizio di fine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Non è possibile filtrare sulla base di Voucher No , se raggruppati per Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Crea Quotazione Fornitore
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Crea Quotazione Fornitore
 DocType: Quality Inspection,Incoming,In arrivo
 DocType: BOM,Materials Required (Exploded),Materiali necessari (esploso)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ridurre Guadagnare in aspettativa senza assegni (LWP)
@@ -3213,10 +3228,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: N. di serie {1} non corrisponde con {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,ID Lotto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota Consegna Tendenza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Sintesi di questa settimana
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve essere un articolo acquistato o in subappalto in riga {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve essere un articolo acquistato o in subappalto in riga {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Conto: {0} può essere aggiornato solo tramite transazioni di magazzino
 DocType: GL Entry,Party,Partito
 DocType: Sales Order,Delivery Date,Data Consegna
@@ -3229,7 +3244,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,l
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Buying Rate
 DocType: Task,Actual Time (in Hours),Tempo reale (in ore)
 DocType: Employee,History In Company,Storia Aziendale
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Newsletters
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletters
 DocType: Address,Shipping,Spedizione
 DocType: Stock Ledger Entry,Stock Ledger Entry,Voce Inventario
 DocType: Department,Leave Block List,Lascia Block List
@@ -3248,7 +3263,7 @@ DocType: Account,Auditor,Uditore
 DocType: Purchase Order,End date of current order's period,Data di fine del periodo di fine corso
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Crea una Lettera d'Offerta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Ritorno
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Unità di misura predefinita per la variante deve essere lo stesso come modello
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unità di misura predefinita per la variante deve essere lo stesso come modello
 DocType: DocField,Fold,Piega
 DocType: Production Order Operation,Production Order Operation,Ordine di produzione Operation
 DocType: Pricing Rule,Disable,Disattiva
@@ -3280,7 +3295,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Relazioni al
 DocType: SMS Settings,Enter url parameter for receiver nos,Inserisci parametri url per NOS ricevuti
 DocType: Sales Invoice,Paid Amount,Importo pagato
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Chiusura del conto {0} deve essere di tipo ' responsabilità '
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Chiusura del conto {0} deve essere di tipo ' responsabilità '
 ,Available Stock for Packing Items,Disponibile Magazzino per imballaggio elementi
 DocType: Item Variant,Item Variant,Elemento Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,L'impostazione di questo modello di indirizzo di default perché non c'è altro difetto
@@ -3288,7 +3303,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestione della qualità
 DocType: Production Planning Tool,Filter based on customer,Filtro basato sul cliente
 DocType: Payment Tool Detail,Against Voucher No,Contro Voucher No
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Inserite la quantità per articolo {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Inserite la quantità per articolo {0}
 DocType: Employee External Work History,Employee External Work History,Storia lavorativa esterna del Dipendente
 DocType: Tax Rule,Purchase,Acquisto
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,equilibrio Quantità
@@ -3325,28 +3340,29 @@ Note: BOM = Bill of Materials","Gruppo aggregato di elementi ** ** in un'alt
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Numero d'ordine è obbligatorio per la voce {0}
 DocType: Item Variant Attribute,Attribute,Attributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Si prega di specificare da / a gamma
-sites/assets/js/desk.min.js +7652,Created By,Creato da
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creato da
 DocType: Serial No,Under AMC,Sotto AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Voce tasso di valutazione viene ricalcolato considerando atterrato importo buono costo
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Impostazioni predefinite per la vendita di transazioni.
 DocType: BOM Replace Tool,Current BOM,DiBa Corrente
-sites/assets/js/erpnext.min.js +8,Add Serial No,Aggiungi Numero di Serie
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Aggiungi Numero di Serie
 DocType: Production Order,Warehouses,Magazzini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Stampa e Fermo
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nodo Group
 DocType: Payment Reconciliation,Minimum Amount,Importo Minimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Merci aggiornamento finiti
 DocType: Workstation,per hour,all'ora
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serie {0} già utilizzata in {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serie {0} già utilizzata in {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Conto per il magazzino ( Perpetual Inventory) verrà creato con questo account .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazzino non può essere eliminato siccome esiste articolo ad inventario per questo Magazzino .
 DocType: Company,Distribution,Distribuzione
-sites/assets/js/erpnext.min.js +50,Amount Paid,Importo pagato
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Importo pagato
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Spedizione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Sconto massimo consentito per la voce: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Tasse predefinite e oneri
 DocType: Account,Receivable,Ricevibile
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: Non ammessi a cambiare fornitore come già esiste ordine d'acquisto
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ruolo che è consentito di presentare le transazioni che superano i limiti di credito stabiliti.
 DocType: Sales Invoice,Supplier Reference,Fornitore di riferimento
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Se selezionato, distinta per gli elementi sub-assemblaggio sarà considerato per ottenere materie prime. In caso contrario, tutti gli elementi sub-assemblaggio saranno trattati come materia prima."
@@ -3383,8 +3399,8 @@ DocType: Email Digest,Add/Remove Recipients,Aggiungere/Rimuovere Destinatario
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Operazione non ammessi contro Production smesso di ordine {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per impostare questo anno fiscale come predefinito , clicca su ' Imposta come predefinito'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configurazione del server in arrivo per il supporto e-mail id . ( ad esempio support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Carenza Quantità
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Carenza Quantità
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
 DocType: Salary Slip,Salary Slip,Stipendio slittamento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunitura
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Alla Data' è obbligatorio
@@ -3397,6 +3413,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando una qualsiasi delle operazioni controllate sono "inviati", una e-mail a comparsa visualizzata automaticamente per inviare una e-mail agli associati "Contatto" in tale operazione, con la transazione come allegato. L'utente può o non può inviare l'e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Impostazioni globali
 DocType: Employee Education,Employee Education,Istruzione Dipendente
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,E 'necessario per recuperare Dettagli elemento.
 DocType: Salary Slip,Net Pay,Retribuzione Netta
 DocType: Account,Account,Conto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} è già stato ricevuto
@@ -3429,7 +3446,7 @@ DocType: BOM,Manufacturing User,Utente Produzione
 DocType: Purchase Order,Raw Materials Supplied,Materie prime fornite
 DocType: Purchase Invoice,Recurring Print Format,Formato di Stampa Ricorrente
 DocType: Communication,Series,serie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Data prevista di consegna non può essere un ordine di acquisto Data
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Data prevista di consegna non può essere un ordine di acquisto Data
 DocType: Appraisal,Appraisal Template,Valutazione Modello
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Classificazione Articolo
@@ -3485,6 +3502,7 @@ DocType: HR Settings,Payroll Settings,Impostazioni Payroll
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Partita Fatture non collegati e pagamenti.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Invia ordine
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root non può avere un centro di costo genitore
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Seleziona Marchio ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
 DocType: Supplier,Address and Contacts,Indirizzo e contatti
@@ -3495,7 +3513,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Get eccezionali Buoni
 DocType: Warranty Claim,Resolved By,Deliberato dall'Assemblea
 DocType: Appraisal,Start Date,Data di inizio
-sites/assets/js/desk.min.js +7629,Value,Valore
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valore
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Allocare le foglie per un periodo .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Clicca qui per verificare
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Il Conto {0}: Non è possibile assegnare stesso come conto principale
@@ -3511,14 +3529,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Consentire accesso Dropbox
 DocType: Dropbox Backup,Weekly,Settimanale
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ad es. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Ricevere
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Ricevere
 DocType: Maintenance Visit,Fully Completed,Debitamente compilato
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completato
 DocType: Employee,Educational Qualification,Titolo di Studio
 DocType: Workstation,Operating Costs,Costi operativi
 DocType: Employee Leave Approver,Employee Leave Approver,Approvatore Congedo Dipendente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} è stato aggiunto alla nostra lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Non è possibile dichiarare come perduto, perché è stato fatto il Preventivo."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Lavorazione a fascio di elettroni
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Acquisto Maestro Direttore
@@ -3531,7 +3549,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Aggiungi / Modifica prezzi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafico Centro di Costo
 ,Requested Items To Be Ordered,Elementi richiesti da ordinare
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,I Miei Ordini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,I Miei Ordini
 DocType: Price List,Price List Name,Prezzo di listino Nome
 DocType: Time Log,For Manufacturing,Per Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totali
@@ -3542,7 +3560,7 @@ DocType: Account,Income,Proventi
 DocType: Industry Type,Industry Type,Tipo Industria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Qualcosa è andato storto!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Attenzione: Lascia applicazione contiene seguenti date di blocco
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,{0} è già stato presentato fattura di vendita
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,{0} è già stato presentato fattura di vendita
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Completamento
 DocType: Purchase Invoice Item,Amount (Company Currency),Importo (Valuta Azienda)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Pressofusione
@@ -3556,10 +3574,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Anno
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profilo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Si prega di aggiornare le impostazioni SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Tempo log {0} già fatturati
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Tempo log {0} già fatturati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,I prestiti non garantiti
 DocType: Cost Center,Cost Center Name,Nome Centro di Costo
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Articolo {0} con N. di Serie {1} è già installato
 DocType: Maintenance Schedule Detail,Scheduled Date,Data prevista
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Totale versato Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Messaggio maggiore di 160 caratteri verrà divisa in mesage multipla
@@ -3567,10 +3584,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Ricevuti e accettati
 ,Serial No Service Contract Expiry,Serial No Contratto di Servizio di scadenza
 DocType: Item,Unit of Measure Conversion,Unità di Conversione di misura
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Il dipendente non può essere modificato
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
 DocType: Naming Series,Help HTML,Aiuto HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage totale assegnato dovrebbe essere al 100 % . E ' {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Indennità per over-{0} incrociate per la voce {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Indennità per over-{0} incrociate per la voce {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome della persona o organizzazione che questo indirizzo appartiene.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,I vostri fornitori
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossibile impostare come persa come è fatto Sales Order .
@@ -3581,10 +3598,11 @@ DocType: Lead,Converted,Convertito
 DocType: Item,Has Serial No,Ha Serial No
 DocType: Employee,Date of Issue,Data Pubblicazione
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Da {0} per {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
 DocType: Issue,Content Type,Tipo Contenuto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,computer
 DocType: Item,List this Item in multiple groups on the website.,Elenco questo articolo a più gruppi sul sito.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Si prega di verificare l'opzione multi valuta per consentire agli account con altra valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Si prega di verificare l'opzione multi valuta per consentire agli account con altra valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Voce: {0} non esiste nel sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Non sei autorizzato a impostare il valore Congelato
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get non riconciliati Entries
@@ -3595,14 +3613,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,A Magazzino
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Il Conto {0} è stato inserito più di una volta per l'anno fiscale {1}
 ,Average Commission Rate,Tasso medio di commissione
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La Presenza non può essere inserita nel futuro
 DocType: Pricing Rule,Pricing Rule Help,Regola Prezzi Aiuto
 DocType: Purchase Taxes and Charges,Account Head,Conto Capo
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aggiornare costi aggiuntivi per calcolare il costo sbarcato di articoli
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elettrico
 DocType: Stock Entry,Total Value Difference (Out - In),Totale Valore Differenza (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Riga {0}: Tasso di cambio è obbligatorio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Riga {0}: Tasso di cambio è obbligatorio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utente non è impostato per Employee {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Pallinatura
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Da Richiesta di Garanzia
@@ -3616,15 +3634,17 @@ DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
 DocType: User,Enabled,Attivato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Attivo Immagini
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Vuoi davvero a presentare tutti foglio paga per il mese {0} e l'anno {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vuoi davvero a presentare tutti foglio paga per il mese {0} e l'anno {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importa Abbonati
 DocType: Target Detail,Target Qty,Obiettivo Qtà
 DocType: Attendance,Present,Presente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Consegna Note {0} non deve essere presentata
 DocType: Notification Control,Sales Invoice Message,Fattura Messaggio
 DocType: Authorization Rule,Based On,Basato su
-,Ordered Qty,Quantità ordinato
+DocType: Sales Order Item,Ordered Qty,Quantità ordinato
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Voce {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periodo Dal periodo e per date obbligatorie per ricorrenti {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Attività / attività del progetto.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generare buste paga
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} non è un id di email valido
@@ -3663,7 +3683,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Carica presenze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e produzione quantità sono necessari
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamma Ageing 2
-DocType: Journal Entry Account,Amount,Importo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Importo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Avvincente
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,DiBa Sostituire
 ,Sales Analytics,Analisi dei dati di vendita
@@ -3690,7 +3710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista non può essere precedente Material Data richiesta
 DocType: Contact Us Settings,City,Città
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Lavorazione ad ultrasuoni
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Errore: Non è un documento di identità valido?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Errore: Non è un documento di identità valido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,L'articolo {0} deve essere un'Articolo in Vendita
 DocType: Naming Series,Update Series Number,Aggiornamento Numero di Serie
 DocType: Account,Equity,equità
@@ -3705,7 +3725,7 @@ DocType: Purchase Taxes and Charges,Actual,Attuale
 DocType: Authorization Rule,Customerwise Discount,Sconto Cliente saggio
 DocType: Purchase Invoice,Against Expense Account,Per Spesa Conto
 DocType: Production Order,Production Order,Ordine di produzione
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Nota Installazione {0} già inserita
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Nota Installazione {0} già inserita
 DocType: Quotation Item,Against Docname,Per Nome Doc
 DocType: SMS Center,All Employee (Active),Tutti Dipendenti (Attivi)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Guarda ora
@@ -3713,14 +3733,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Costo Materie Prime
 DocType: Item,Re-Order Level,Livello Ri-ordino
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Inserisci articoli e q.tà programmate per i quali si desidera raccogliere gli ordini di produzione o scaricare materie prime per l'analisi.
-sites/assets/js/list.min.js +174,Gantt Chart,Diagramma di Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagramma di Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,A tempo parziale
 DocType: Employee,Applicable Holiday List,Lista Vacanze Applicabile
 DocType: Employee,Cheque,Assegno
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,serie Aggiornato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo di rapporto è obbligatoria
 DocType: Item,Serial Number Series,Serial Number Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Magazzino è obbligatorio per l'Articolo in Giacenza {0} alla Riga {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazzino è obbligatorio per l'Articolo in Giacenza {0} alla Riga {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Ha risposto prima su
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croce Listing dell'oggetto in più gruppi
@@ -3735,7 +3755,7 @@ DocType: Attendance,Attendance,Presenze
 DocType: Page,No,No
 DocType: BOM,Materials,Materiali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se non controllati, la lista dovrà essere aggiunto a ciascun Dipartimento dove deve essere applicato."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data di registrazione e il distacco ora è obbligatorio
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Data di registrazione e il distacco ora è obbligatorio
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Modello fiscale per l'acquisto di transazioni.
 ,Item Prices,Voce Prezzi
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,In parole saranno visibili una volta che si salva di Acquisto.
@@ -3755,9 +3775,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Spese Amministrative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Gruppo clienti
-sites/assets/js/erpnext.min.js +50,Change,Cambiamento
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambiamento
 DocType: Purchase Invoice,Contact Email,Email Contatto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Ordine di acquisto {0} ' smesso '
 DocType: Appraisal Goal,Score Earned,Punteggio Earned
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","ad esempio ""My Company LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Periodo Di Preavviso
@@ -3767,12 +3786,13 @@ DocType: Packing Slip,Gross Weight UOM,Peso Lordo UOM
 DocType: Email Digest,Receivables / Payables,Crediti / Debiti
 DocType: Delivery Note Item,Against Sales Invoice,Per Fattura Vendita
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stampigliatura
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Conto di credito
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost articolo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostra valori zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantità di prodotto ottenuto dopo la produzione / reimballaggio da determinati quantitativi di materie prime
 DocType: Payment Reconciliation,Receivable / Payable Account,Conto Crediti / Debiti
 DocType: Delivery Note Item,Against Sales Order Item,Contro Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l'attributo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l'attributo {0}
 DocType: Item,Default Warehouse,Magazzino Predefinito
 DocType: Task,Actual End Date (via Time Logs),Data di fine effettiva (via Time Diari)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Bilancio non può essere assegnato contro account gruppo {0}
@@ -3786,7 +3806,7 @@ DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Punteggio totale (i 5)
 DocType: Contact Us Settings,State,Stato
 DocType: Batch,Batch,Lotto
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Saldo
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Saldo
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via rimborsi spese)
 DocType: User,Gender,Genere
 DocType: Journal Entry,Debit Note,Nota Debito
@@ -3802,9 +3822,8 @@ DocType: Lead,Blog Subscriber,Abbonati Blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Creare regole per limitare le transazioni in base ai valori .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se selezionato, non totale. di giorni lavorativi includerà vacanze, e questo ridurrà il valore di salario per ogni giorno"
 DocType: Purchase Invoice,Total Advance,Totale Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Stappare Materiale Richiesta
 DocType: Workflow State,User,Utente
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Elaborazione paghe
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Elaborazione paghe
 DocType: Opportunity Item,Basic Rate,Tasso Base
 DocType: GL Entry,Credit Amount,Ammontare del credito
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Imposta come persa
@@ -3812,7 +3831,7 @@ DocType: Customer,Credit Days Based On,Giorni di credito in funzione
 DocType: Tax Rule,Tax Rule,Regola fiscale
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantenere la stessa velocità per tutto il ciclo di vendita
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Pianificare i registri di tempo al di fuori dell'orario di lavoro Workstation.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} è già stata presentata
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} è già stata presentata
 ,Items To Be Requested,Articoli da richiedere
 DocType: Purchase Order,Get Last Purchase Rate,Ottieni ultima quotazione acquisto
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Fatturazione tariffa si basa su Tipo Attività (per ora)
@@ -3821,6 +3840,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Azienda Email ID non trovato , quindi posta non inviato"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Applicazione dei fondi ( Assets )
 DocType: Production Planning Tool,Filter based on item,Filtro basato sul articolo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Conto di addebito
 DocType: Fiscal Year,Year Start Date,Anno Data di inizio
 DocType: Attendance,Employee Name,Nome Dipendente
 DocType: Sales Invoice,Rounded Total (Company Currency),Totale arrotondato (Azienda valuta)
@@ -3832,14 +3852,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Soppressione
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefici per i dipendenti
 DocType: Sales Invoice,Is POS,È POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Pranzo quantità deve essere uguale quantità per articolo {0} in riga {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pranzo quantità deve essere uguale quantità per articolo {0} in riga {1}
 DocType: Production Order,Manufactured Qty,Quantità Prodotto
 DocType: Purchase Receipt Item,Accepted Quantity,Quantità accettata
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} non esiste
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Fatture sollevate dai Clienti.
 DocType: DocField,Default,Predefinito
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Progetto Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abbonati aggiunti
 DocType: Maintenance Schedule,Schedule,Pianificare
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definire bilancio per questo centro di costo. Per impostare l'azione di bilancio, vedere "Elenco Società""
@@ -3847,7 +3867,7 @@ DocType: Account,Parent Account,Account principale
 DocType: Quality Inspection Reading,Reading 3,Lettura 3
 ,Hub,Mozzo
 DocType: GL Entry,Voucher Type,Voucher Tipo
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Listino Prezzi non trovato o disattivato
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Listino Prezzi non trovato o disattivato
 DocType: Expense Claim,Approved,Approvato
 DocType: Pricing Rule,Price,prezzo
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
@@ -3856,23 +3876,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Educazione
 DocType: Selling Settings,Campaign Naming By,Campagna di denominazione
 DocType: Employee,Current Address Is,Indirizzo attuale è
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opzionale. Imposta valuta predefinita dell'azienda, se non specificato."
 DocType: Address,Office,Ufficio
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Rapporti standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Diario scritture contabili.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riga {0}: partito / Account non corrisponde con {1} / {2} {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Disponibile Quantità a partire Warehouse
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riga {0}: partito / Account non corrisponde con {1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Per creare un Account Tax
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Inserisci il Conto uscite
 DocType: Account,Stock,Azione
 DocType: Employee,Current Address,Indirizzo Corrente
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se l'articolo è una variante di un altro elemento poi descrizione, immagini, prezzi, tasse ecc verrà impostata dal modello se non espressamente specificato"
 DocType: Serial No,Purchase / Manufacture Details,Acquisto / Produzione Dettagli
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch Inventario
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventario
 DocType: Employee,Contract End Date,Data fine Contratto
 DocType: Sales Order,Track this Sales Order against any Project,Traccia questo ordine di vendita nei confronti di qualsiasi progetto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tirare ordini di vendita (in attesa di consegnare) sulla base dei criteri di cui sopra
 DocType: DocShare,Document Type,Tipo di documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Da Preventivo del Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Da Preventivo del Fornitore
 DocType: Deduction Type,Deduction Type,Tipo Deduzione
 DocType: Attendance,Half Day,Mezza Giornata
 DocType: Pricing Rule,Min Qty,Qtà Min
@@ -3883,20 +3905,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Per quantità (Quantità Prodotto) è obbligatorio
 DocType: Stock Entry,Default Target Warehouse,Magazzino Destinazione Predefinito
 DocType: Purchase Invoice,Net Total (Company Currency),Totale Netto (Valuta Azienda)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riga {0}: Partito Tipo e partito si applica solo nei confronti Crediti / Debiti conto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riga {0}: Partito Tipo e partito si applica solo nei confronti Crediti / Debiti conto
 DocType: Notification Control,Purchase Receipt Message,RICEVUTA Messaggio
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totale foglie assegnati sono più di periodo
 DocType: Production Order,Actual Start Date,Data Inizio Effettivo
 DocType: Sales Order,% of materials delivered against this Sales Order,% dei materiali consegnati su questo Ordine di Vendita
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Registrare il movimento dell'oggetto.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Registrare il movimento dell'oggetto.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Elenco utenti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,servizio
 DocType: Hub Settings,Hub Settings,Impostazioni Hub
 DocType: Project,Gross Margin %,Margine Lordo %
 DocType: BOM,With Operations,Con operazioni
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Scritture contabili sono già stati fatti in valuta {0} per azienda {1}. Si prega di selezionare un account di credito o da pagare con moneta {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Scritture contabili sono già stati fatti in valuta {0} per azienda {1}. Si prega di selezionare un account di credito o da pagare con moneta {0}.
 ,Monthly Salary Register,Registro Stipendio Mensile
-apps/frappe/frappe/website/template.py +123,Next,Successivo
+apps/frappe/frappe/website/template.py +140,Next,Successivo
 DocType: Warranty Claim,If different than customer address,Se diverso da indirizzo del cliente
 DocType: BOM Operation,BOM Operation,DiBa Operazione
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elettrolucidatura
@@ -3927,6 +3950,7 @@ DocType: Purchase Invoice,Next Date,Successiva Data
 DocType: Employee Education,Major/Optional Subjects,Principali / Opzionale Soggetti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Inserisci Tasse e spese
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Lavorazione a macchina
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Qui è possibile mantenere i dettagli della famiglia come il nome e l'occupazione del genitore, coniuge e figli"
 DocType: Hub Settings,Seller Name,Venditore Nome
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Tasse e oneri dedotti (Azienda valuta)
@@ -3953,29 +3977,29 @@ DocType: Purchase Order,To Receive and Bill,Per ricevere e Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termini e condizioni Template
 DocType: Serial No,Delivery Details,Dettagli Consegna
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Creazione automatica di materiale richiesta se la quantità scende al di sotto di questo livello
 ,Item-wise Purchase Register,Articolo-saggio Acquisto Registrati
 DocType: Batch,Expiry Date,Data Scadenza
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per impostare il livello di riordino, elemento deve essere un acquisto dell'oggetto o Produzione Voce"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per impostare il livello di riordino, elemento deve essere un acquisto dell'oggetto o Produzione Voce"
 ,Supplier Addresses and Contacts,Indirizzi e contatti Fornitore
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Si prega di selezionare Categoria prima
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Progetto Master.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Non visualizzare nessun simbolo tipo € dopo le Valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Mezza giornata)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Mezza giornata)
 DocType: Supplier,Credit Days,Giorni Credito
 DocType: Leave Type,Is Carry Forward,È Portare Avanti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Recupera elementi da Distinta Base
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Recupera elementi da Distinta Base
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Giorni Tempo di Esecuzione
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Distinta materiali
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riga {0}: Partito Tipo e Partito è necessario per Crediti / Debiti conto {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riga {0}: Partito Tipo e Partito è necessario per Crediti / Debiti conto {1}
 DocType: Dropbox Backup,Send Notifications To,Inviare notifiche ai
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Data Rif
 DocType: Employee,Reason for Leaving,Motivo per Lasciare
 DocType: Expense Claim Detail,Sanctioned Amount,Importo sanzionato
 DocType: GL Entry,Is Opening,Sta aprendo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Riga {0}: addebito iscrizione non può essere collegato con un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Il Conto {0} non esiste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Riga {0}: addebito iscrizione non può essere collegato con un {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Il Conto {0} non esiste
 DocType: Account,Cash,Contante
 DocType: Employee,Short biography for website and other publications.,Breve biografia per il sito web e altre pubblicazioni.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Si prega di creare struttura salariale per dipendente {0}
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 085ccbab46..2e90bc505a 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,給与モード
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",シーズンを基準に追跡する場合、「月次配分」を選択してください
 DocType: Employee,Divorced,離婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,注意：同じ項目が複数回入力されています
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,注意：同じ項目が複数回入力されています
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,すでに同期されたアイテム
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,取引内でのアイテムの複数回追加を許可
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,この保証請求をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,圧縮焼結
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},価格表{0}には通貨が必要です
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,※取引内で計算されます。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,資材要求元
+DocType: Purchase Order,Customer Contact,顧客の連絡先
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,資材要求元
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}ツリー
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,これ以上、結果はありません。
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,顧客名
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",通貨、変換レート、輸出の合計、輸出総計などのような全ての輸出関連分野は、納品書、POS、見積書、納品書、受注書などで利用可能です
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会計エントリに対する科目（またはグループ）が作成され、残高が維持されます
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),{0}の残高はゼロより小さくすることはできません（{1}）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),{0}の残高はゼロより小さくすることはできません（{1}）
 DocType: Manufacturing Settings,Default 10 mins,デフォルト 10分
 DocType: Leave Type,Leave Type Name,休暇タイプ名
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,シリーズを正常に更新しました
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,複数のアイテム価格
 DocType: SMS Center,All Supplier Contact,全てのサプライヤー連絡先
 DocType: Quality Inspection Reading,Parameter,パラメータ
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,終了予定日は、予想開始日より前にすることはできません
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,次の製造指示を停止解除しますか？：
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：単価は {1}と同じである必要があります：{2}（{3} / {4}）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,新しい休暇申請
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,新しい休暇申請
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,銀行為替手形
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . 顧客ごとのアイテムコードを維持し、コードで検索を可能にするためには、このオプションを使用します。
 DocType: Mode of Payment Account,Mode of Payment Account,支払口座のモード
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,バリエー
 DocType: Sales Invoice Item,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ローン（負債）
 DocType: Employee Education,Year of Passing,経過年
-sites/assets/js/erpnext.min.js +27,In Stock,在庫中
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,未請求の受注に対してのみ支払を行うことができます
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,在庫中
 DocType: Designation,Designation,肩書
 DocType: Production Plan Item,Production Plan Item,生産計画アイテム
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ユーザー{0}はすでに従業員{1}に割り当てられています
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,新しいPOSプロファイルを作成
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,健康管理
 DocType: Purchase Invoice,Monthly,月次
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,請求
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),支払いの遅延（日）
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,請求
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,メールアドレス
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,防御
 DocType: Company,Abbr,略称
 DocType: Appraisal Goal,Score (0-5),スコア（0-5）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2} は {3}と一致しません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2} は {3}と一致しません
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行 {0}：
 DocType: Delivery Note,Vehicle No,車両番号
-sites/assets/js/erpnext.min.js +55,Please select Price List,価格表を選択してください
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,価格表を選択してください
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,木工
 DocType: Production Order Operation,Work In Progress,進行中の作業
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3Dプリント
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,親詳細文書名
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,欠員
 DocType: Item Attribute,Increment,増分
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,倉庫を選択...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,広告
 DocType: Employee,Married,結婚してる
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
 DocType: Payment Reconciliation,Reconcile,照合
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,食料品
 DocType: Quality Inspection Reading,Reading 1,報告要素1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,銀行エントリを作成
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,銀行エントリを作成
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,年金基金
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,アカウントタイプが「倉庫」の場合、倉庫が必須です
 DocType: SMS Center,All Sales Person,全ての営業担当者
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,償却コストセンター
 DocType: Warehouse,Warehouse Detail,倉庫の詳細
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2} 
 DocType: Tax Rule,Tax Type,税タイプ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},{0}以前のエントリーを追加または更新する権限がありません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},{0}以前のエントリーを追加または更新する権限がありません
 DocType: Item,Item Image (if not slideshow),アイテム画像（スライドショーされていない場合）
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名の顧客が存在します
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（時間単価 ÷ 60）× 実際の作業時間
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,ゲスト
 DocType: Quality Inspection,Get Specification Details,仕様詳細を取得
 DocType: Lead,Interested,関心あり
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,部品表
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,期首
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,期首
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0}から{1}へ
 DocType: Item,Copy From Item Group,項目グループからコピーする
 DocType: Journal Entry,Opening Entry,エントリーを開く
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,製品のお問い合わせ
 DocType: Standard Reply,Owner,所有者
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,最初の「会社」を入力してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,会社を選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,会社を選択してください
 DocType: Employee Education,Under Graduate,在学生
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,目標
 DocType: BOM,Total Cost,費用合計
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,接頭辞
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,消耗品
 DocType: Upload Attendance,Import Log,インポートログ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,送信
+DocType: Sales Invoice Item,Delivered By Supplier,サプライヤーで配信
 DocType: SMS Center,All Contact,全ての連絡先
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,年俸
 DocType: Period Closing Voucher,Closing Fiscal Year,閉会年度
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,逆仕訳
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,時間ログを表示
 DocType: Journal Entry Account,Credit in Company Currency,会社通貨の貸方
 DocType: Delivery Note,Installation Status,設置ステータス
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},受入数と拒否数の合計はアイテム{0}の受領数と等しくなければなりません
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},受入数と拒否数の合計はアイテム{0}の受領数と等しくなければなりません
 DocType: Item,Supply Raw Materials for Purchase,購入のための原材料供給
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,アイテム{0}は仕入アイテムでなければなりません
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","テンプレートをダウンロードし、適切なデータを記入した後、変更したファイルを添付してください。
 選択した期間内のすべての日付と従業員の組み合わせは、既存の出勤記録と一緒に、テンプレートに入ります"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,アイテム{0}は、アクティブでないか、販売終了となっています
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,アイテム{0}は、アクティブでないか、販売終了となっています
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,請求書を提出すると更新されます。
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,人事モジュール設定
 DocType: SMS Center,SMS Center,SMSセンター
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,曲り矯正
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,メッセージのURLパ
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,価格設定と割引を適用するためのルール
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},時間ログが {0} と衝突しています {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,価格表は売買に適用可能でなければなりません
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},設置日は、アイテム{0}の納品日より前にすることはできません
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},設置日は、アイテム{0}の納品日より前にすることはできません
 DocType: Pricing Rule,Discount on Price List Rate (%),価格表での割引率（％）
-sites/assets/js/form.min.js +279,Start,開始
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,開始
 DocType: User,First Name,お名前（名）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,セットアップが完了しました。再読み込みしています。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,フルモールド鋳造
 DocType: Offer Letter,Select Terms and Conditions,規約を選択
 DocType: Production Planning Tool,Sales Orders,受注
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,対販売伝票アイテム
 ,Production Orders in Progress,進行中の製造指示
 DocType: Lead,Address & Contact,住所・連絡先
+DocType: Leave Allocation,Add unused leaves from previous allocations,前回の割り当てから未使用の葉を追加
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},次の繰り返し {0} は {1} 上に作成されます
 DocType: Newsletter List,Total Subscribers,総登録者数
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,担当者名
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,受注保留数量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,上記の基準の給与伝票を作成します。
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,仕入要求
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ダブルハウジング
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,年次休暇
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,セットアップ＞設定＞命名シリーズから、{0} に命名シリーズを設定してください
 DocType: Time Log,Will be updated when batched.,バッチ処理されると更新されます。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：前払エントリである場合、アカウント{1}に対する「前払」をご確認ください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：前払エントリである場合、アカウント{1}に対する「前払」をご確認ください
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},倉庫{0}は会社{1}に属していません
 DocType: Bulk Email,Message,メッセージ
 DocType: Item Website Specification,Item Website Specification,アイテムのWebサイトの仕様
 DocType: Dropbox Backup,Dropbox Access Key,Dropboxのアクセスキー
 DocType: Payment Tool,Reference No,参照番号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,休暇
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
 DocType: Stock Entry,Sales Invoice No,請求番号
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,最小注文数量
 DocType: Pricing Rule,Supplier Type,サプライヤータイプ
 DocType: Item,Publish in Hub,ハブに公開
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,アイテム{0}をキャンセルしました
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,資材要求
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
 DocType: Item,Purchase Details,仕入詳細
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},仕入注文 {1} の「原材料供給」テーブルにアイテム {0} が見つかりません
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,通知制御
 DocType: Lead,Suggestions,提案
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,この地域用にアイテムグループごとの予算を設定します。また「配分」を設定することで、期間を含めることができます。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},倉庫{0}の親勘定グループを入力してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} に対する支払は残高 {2} より大きくすることができません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} に対する支払は残高 {2} より大きくすることができません
 DocType: Supplier,Address HTML,住所のHTML
 DocType: Lead,Mobile No.,携帯番号
 DocType: Maintenance Schedule,Generate Schedule,スケジュールを生成
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,新しい在庫単位
 DocType: Period Closing Voucher,Closing Account Head,決算科目
 DocType: Employee,External Work History,職歴（他社）
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環参照エラー
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,本当に停止しますか
 DocType: Communication,Closed,クローズ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,納品書を保存すると「表記（エクスポート）」が表示されます。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,停止してよろしいですか
 DocType: Lead,Industry,業種
 DocType: Employee,Job Profile,職務内容
 DocType: Newsletter,Newsletter,ニュースレター
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,納品書
 DocType: Dropbox Backup,Allow Dropbox Access,Dropboxのアクセスを許可
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,税設定
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,今週と保留中の活動の概要
 DocType: Workstation,Rent Cost,地代・賃料
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,月と年を選択してください
@@ -340,11 +340,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,顧客通貨が顧客の基本通貨に換算されるレート
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",部品表、納品書、請求書、製造指示、発注、仕入領収書、納品書、受注、在庫エントリー、タイムシートで利用可能
 DocType: Item Tax,Tax Rate,税率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,アイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,アイテムを選択
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","アイテム：{0}はバッチごとに管理され、「在庫棚卸」を使用して照合することはできません。
 代わりに「在庫エントリー」を使用してください。"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：バッチ番号は {1} {2}と同じである必要があります
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,非グループに変換
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,仕入時の領収書を提出しなければなりません
@@ -352,7 +352,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,現在の在庫数量単位
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,アイテムのバッチ（ロット）
 DocType: C-Form Invoice Detail,Invoice Date,請求日付
 DocType: GL Entry,Debit Amount,借方金額
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},{0} {1} では会社ごとに1アカウントのみとなります
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},{0} {1} では会社ごとに1アカウントのみとなります
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,あなたのメール アドレス
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,添付ファイルを参照してください
 DocType: Purchase Order,% Received,％受領
@@ -362,7 +362,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,説明書
 DocType: Quality Inspection,Inspected By,検査担当
 DocType: Maintenance Visit,Maintenance Type,メンテナンスタイプ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},シリアル番号 {0} は納品書 {1} に記載がありません
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},シリアル番号 {0} は納品書 {1} に記載がありません
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,アイテム品質検査パラメータ
 DocType: Leave Application,Leave Approver Name,休暇承認者名
 ,Schedule Date,期日
@@ -381,7 +381,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,仕入帳
 DocType: Landed Cost Item,Applicable Charges,適用料金
 DocType: Workstation,Consumable Cost,消耗品費
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
 DocType: Purchase Receipt,Vehicle Date,車両日付
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,検診
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,失敗の原因
@@ -402,6 +402,7 @@ DocType: Delivery Note,% Installed,％インストール
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,最初の「会社」名を入力してください
 DocType: BOM,Item Desription,アイテム説明
 DocType: Purchase Invoice,Supplier Name,サプライヤー名
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNextマニュアルを読みます
 DocType: Account,Is Group,グループ
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,先入先出法（FIFO）によりシリアル番号を自動的に設定
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,サプライヤー請求番号が一意であることを確認してください
@@ -417,13 +418,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,販売マスタ
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,全製造プロセスの共通設定
 DocType: Accounts Settings,Accounts Frozen Upto,凍結口座上限
 DocType: SMS Log,Sent On,送信済
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
 DocType: Sales Order,Not Applicable,特になし
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,休日マスター
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,シェルモールド鋳造
 DocType: Material Request Item,Required Date,要求日
 DocType: Delivery Note,Billing Address,請求先住所
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,アイテムコードを入力してください
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,アイテムコードを入力してください
 DocType: BOM,Costing,原価計算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",チェックすると、税額が既に表示上の単価／額に含まれているものと見なされます
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,合計数量
@@ -446,31 +447,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),操作の間
 DocType: Customer,Buyer of Goods and Services.,物品・サービスのバイヤー
 DocType: Journal Entry,Accounts Payable,買掛金
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,登録者を追加
-sites/assets/js/erpnext.min.js +5,""" does not exists","""が存在しません"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""が存在しません"
 DocType: Pricing Rule,Valid Upto,有効（〜まで）
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,あなたの顧客の一部を一覧表示します。彼らは、組織や個人である可能性があります。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接利益
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",アカウント別にグループ化されている場合、アカウントに基づいてフィルタリングすることはできません
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,管理担当者
 DocType: Payment Tool,Received Or Paid,受領済または支払済
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,会社を選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,会社を選択してください
 DocType: Stock Entry,Difference Account,差損益
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,依存するタスク{0}がクローズされていないため、タスクをクローズできません
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
 DocType: Production Order,Additional Operating Cost,追加の営業費用
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化粧品
 DocType: DocField,Type,タイプ
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
 DocType: Communication,Subject,タイトル
 DocType: Shipping Rule,Net Weight,正味重量
 DocType: Employee,Emergency Phone,緊急電話
 ,Serial No Warranty Expiry,シリアル番号（保証期限）
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,この資材要求を中止しますか？
 DocType: Sales Order,To Deliver,配送する
 DocType: Purchase Invoice Item,Item,アイテム
 DocType: Journal Entry,Difference (Dr - Cr),差額（借方 - 貸方）
 DocType: Account,Profit and Loss,損益
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,業務委託管理
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,業務委託管理
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,新しい単位は、全体数タイプにはできません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,什器・備品
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,価格表の通貨が会社の基本通貨に換算されるレート
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,租税公課の追加/編
 DocType: Purchase Invoice,Supplier Invoice No,サプライヤー請求番号
 DocType: Territory,For reference,参考のため
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",それは株式取引で使用されているように、{0}シリアル番号を削除することはできません
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),（貸方）を閉じる
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),（貸方）を閉じる
 DocType: Serial No,Warranty Period (Days),保証期間（日数）
 DocType: Installation Note Item,Installation Note Item,設置票アイテム
 ,Pending Qty,保留中の数量
@@ -523,8 +523,9 @@ DocType: Sales Order,Billing and Delivery Status,請求と配達の状況
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,リピート顧客
 DocType: Leave Control Panel,Allocate,割当
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,前
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,販売返品
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,販売返品
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,作成した製造指示から受注を選択します。
+DocType: Item,Delivered by Supplier (Drop Ship),サプライヤー（ドロップ船）で配信
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,給与コンポーネント
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在顧客データベース
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,顧客データベース
@@ -535,7 +536,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,タンブリング
 DocType: Purchase Order Item,Billed Amt,支払額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,在庫エントリが作成されるのに対する論理的な倉庫。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},{0}には参照番号・参照日が必要です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},{0}には参照番号・参照日が必要です
 DocType: Event,Wednesday,水曜日
 DocType: Sales Invoice,Customer's Vendor,顧客のベンダー
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,製造指示は必須です
@@ -568,8 +569,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,受領者パラメータ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,「参照元」と「グループ元」は同じにすることはできません
 DocType: Sales Person,Sales Person Targets,営業担当者の目標
-sites/assets/js/form.min.js +271,To,To
-apps/frappe/frappe/templates/base.html +143,Please enter email address,メールアドレスを入力してください
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,To
+apps/frappe/frappe/templates/base.html +145,Please enter email address,メールアドレスを入力してください
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,管端成形
 DocType: Production Order Operation,In minutes,分単位
 DocType: Issue,Resolution Date,課題解決日
@@ -586,7 +587,7 @@ DocType: Activity Cost,Projects User,プロジェクトユーザー
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,消費済
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}：{1}は請求書詳細テーブルに存在しません
 DocType: Company,Round Off Cost Center,丸め誤差コストセンター
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス訪問 {0} をキャンセルしなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス訪問 {0} をキャンセルしなければなりません
 DocType: Material Request,Material Transfer,資材移送
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),開く（借方）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},投稿のタイムスタンプは、{0}の後でなければなりません
@@ -594,9 +595,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,設定
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,陸揚費用租税公課
 DocType: Production Order Operation,Actual Start Time,実際の開始時間
 DocType: BOM Operation,Operation Time,作業時間
-sites/assets/js/list.min.js +5,More,続き
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,続き
 DocType: Pricing Rule,Sales Manager,営業部長
-sites/assets/js/desk.min.js +7673,Rename,名称変更
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,名称変更
 DocType: Journal Entry,Write Off Amount,償却額
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,曲げ加工
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,ユーザを許可
@@ -612,13 +613,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,直状せん断
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,シリアル番号に基づき販売と仕入書類からアイテムを追跡します。製品の保証詳細を追跡するのにも使えます。
 DocType: Purchase Receipt Item Supplied,Current Stock,現在の在庫
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,拒否されたアイテムに対しては拒否された倉庫が必須です
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,拒否されたアイテムに対しては拒否された倉庫が必須です
 DocType: Account,Expenses Included In Valuation,評価中経費
 DocType: Employee,Provide email id registered in company,会社に登録されたメールアドレスを提供
 DocType: Hub Settings,Seller City,販売者の市区町村
 DocType: Email Digest,Next email will be sent on:,次のメール送信先：
 DocType: Offer Letter Term,Offer Letter Term,雇用契約書条件
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,アイテムはバリエーションがあります
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,アイテム{0}が見つかりません
 DocType: Bin,Stock Value,在庫価値
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ツリー型
@@ -633,11 +634,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ようこそ
 DocType: Journal Entry,Credit Card Entry,クレジットカードエントリ
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,タスクの件名
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,サプライヤーから受け取った商品。
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,サプライヤーから受け取った商品。
 DocType: Communication,Open,オープン
 DocType: Lead,Campaign Name,キャンペーン名
 ,Reserved,予約済
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,停止解除しますか？
 DocType: Purchase Order,Supply Raw Materials,原材料供給
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,次の請求が生成される日（提出すると生成されます）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流動資産
@@ -653,7 +653,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,顧客の発注番号
 DocType: Employee,Cell Number,携帯電話の番号
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,失われた
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,「対仕訳入力」列に対してこの伝票を入力することはできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,「対仕訳入力」列に対してこの伝票を入力することはできません
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,エネルギー
 DocType: Opportunity,Opportunity From,機会元
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月次給与計算書。
@@ -729,7 +729,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,負債
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,決済額は、行{0}での請求額を超えることはできません。
 DocType: Company,Default Cost of Goods Sold Account,製品販売アカウントのデフォルト費用
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,価格表が選択されていません
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,価格表が選択されていません
 DocType: Employee,Family Background,家族構成
 DocType: Process Payroll,Send Email,メールを送信
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,権限がありませんん
@@ -740,7 +740,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,番号
 DocType: Item,Items with higher weightage will be shown higher,高い比重を持つアイテムはより高く表示されます
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行勘定調整詳細
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,自分の請求書
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,従業員が見つかりません
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,従業員が見つかりません
 DocType: Purchase Order,Stopped,停止
 DocType: Item,If subcontracted to a vendor,ベンダーに委託した場合
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,開始するには部品表（BOM）を選択
@@ -749,7 +749,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSVから
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,今すぐ送信
 ,Support Analytics,サポート分析
 DocType: Item,Website Warehouse,ウェブサイトの倉庫
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,本当に次の製造指示を停止しますか：
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",自動請求を生成する日付（例：05、28など）
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,スコアは5以下でなければなりません
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Cフォームの記録
@@ -759,12 +758,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,顧
 DocType: Features Setup,"To enable ""Point of Sale"" features",POS機能を有効にする
 DocType: Bin,Moving Average Rate,移動平均レート
 DocType: Production Planning Tool,Select Items,アイテム選択
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
 DocType: Comment,Reference Name,参照名
 DocType: Maintenance Visit,Completion Status,完了状況
 DocType: Sales Invoice Item,Target Warehouse,ターゲット倉庫
 DocType: Item,Allow over delivery or receipt upto this percent,このパーセント以上の配送または受領を許可
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,納品予定日は受注日より前にすることはできません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,納品予定日は受注日より前にすることはできません
 DocType: Upload Attendance,Import Attendance,出勤インポート
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,全てのアイテムグループ
 DocType: Process Payroll,Activity Log,活動ログ
@@ -772,7 +771,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
 DocType: Production Order,Item To Manufacture,製造するアイテム
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,金型鋳造
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,発注からの支払
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}状態は{2}です
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,発注からの支払
 DocType: Sales Order Item,Projected Qty,予想数量
 DocType: Sales Invoice,Payment Due Date,支払期日
 DocType: Newsletter,Newsletter Manager,ニュースレターマネージャー
@@ -796,8 +796,8 @@ DocType: SMS Log,Requested Numbers,要求された番号
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,業績評価
 DocType: Sales Invoice Item,Stock Details,在庫詳細
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,プロジェクトの価値
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,POS
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},繰越はできません{0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,POS
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},繰越はできません{0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",口座残高がすで貸方に存在しており、「残高仕訳先」を「借方」に設定することはできません
 DocType: Account,Balance must be,残高仕訳先
 DocType: Hub Settings,Publish Pricing,価格設定を公開
@@ -819,7 +819,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,領収書
 ,Received Items To Be Billed,支払予定受領アイテム
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,エアーブラスト
-sites/assets/js/desk.min.js +3938,Ms,女史
+DocType: Employee,Ms,女史
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,為替レートマスター
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
 DocType: Production Order,Plan material for sub-assemblies,部分組立品資材計画
@@ -841,29 +841,31 @@ DocType: Purchase Receipt,Range,幅
 DocType: Supplier,Default Payable Accounts,デフォルト買掛金勘定
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
 DocType: Features Setup,Item Barcode,アイテムのバーコード
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
 DocType: Quality Inspection Reading,Reading 6,報告要素6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,仕入請求前払
 DocType: Address,Shop,店
 DocType: Hub Settings,Sync Now,今すぐ同期
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},行{0}：貸方エントリは{1}とリンクすることができません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},行{0}：貸方エントリは{1}とリンクすることができません
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,このモードを選択した場合、デフォルトの銀行口座／現金勘定がPOS請求書内で自動的に更新されます。
 DocType: Employee,Permanent Address Is,本籍地
 DocType: Production Order Operation,Operation completed for how many finished goods?,作業完了時の完成品数
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ブランド
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,{0}以上の引当金は、アイテム {1}と相殺されています。
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0}以上の引当金は、アイテム {1}と相殺されています。
 DocType: Employee,Exit Interview Details,インタビュー詳細を終了
 DocType: Item,Is Purchase Item,仕入アイテム
 DocType: Journal Entry Account,Purchase Invoice,仕入請求
 DocType: Stock Ledger Entry,Voucher Detail No,伝票詳細番号
 DocType: Stock Entry,Total Outgoing Value,支出価値合計
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,日付と終了日付を開くと、同年度内にあるべきです
 DocType: Lead,Request for Information,情報要求
 DocType: Payment Tool,Paid,支払済
 DocType: Salary Slip,Total in words,合計の文字表記
 DocType: Material Request Item,Lead Time Date,リードタイム日
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,必須です。多分両替レコードが作成されません
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},行 {0}：アイテム{1}のシリアル番号を指定してください
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",「製品付属品」アイテム、倉庫、シリアル番号、バッチ番号は、「梱包リスト」テーブルから検討します。倉庫とバッチ番号が任意の「製品付属品」アイテムのすべての梱包アイテムと同じであれば、これらの値はメインのアイテムテーブルに入力することができ、「梱包リスト」テーブルにコピーされます。
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,顧客への出荷
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,顧客への出荷
 DocType: Purchase Invoice Item,Purchase Order Item,発注アイテム
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,間接収入
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,設定支払額＝残高
@@ -871,13 +873,14 @@ DocType: Contact Us Settings,Address Line 1,住所 1行目
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,差違
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,（会社名）
 DocType: SMS Center,Total Message(s),全メッセージ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,すべてのヘルプの動画のリストを見ます
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,小切手が預けられた銀行の勘定科目を選択してください
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ユーザーに取引の価格表単価の編集を許可
 DocType: Pricing Rule,Max Qty,最大数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：受発注書に対する支払いは、常に前払金としてマークする必要があります
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：受発注書に対する支払いは、常に前払金としてマークする必要があります
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,化学
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
 DocType: Process Payroll,Select Payroll Year and Month,賃金台帳 年と月を選択
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",適切なグループ（通常は資金運用＞流動資産＞銀行口座）に移動し、新しい「銀行」アカウント（クリックして子要素を追加します）を作成してください。
 DocType: Workstation,Electricity Cost,電気代
@@ -892,7 +895,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ホ
 DocType: SMS Center,All Lead (Open),全リード（オープン）
 DocType: Purchase Invoice,Get Advances Paid,立替金を取得
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,あなたの写真を添付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,作成
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,作成
 DocType: Journal Entry,Total Amount in Words,合計の文字表記
 DocType: Workflow State,Stop,停止
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"エラーが発生しました。
@@ -918,7 +921,7 @@ DocType: Packing Slip Item,Packing Slip Item,梱包伝票項目
 DocType: POS Profile,Cash/Bank Account,現金/銀行口座
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
 DocType: Delivery Note,Delivery To,納品先
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,属性表は必須です
 DocType: Production Planning Tool,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}はマイナスにできません
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ファイリング
@@ -929,12 +932,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',時間ログは
 DocType: Project,Internal,内部
 DocType: Task,Urgent,緊急
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},テーブル{1}内の行{0}の有効な行IDを指定してください
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,デスクトップに移動し、ERPNextの使用を開始
 DocType: Item,Manufacturer,製造元
 DocType: Landed Cost Item,Purchase Receipt Item,領収書アイテム
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,受注の予約倉庫／完成品倉庫
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,販売額
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,時間ログ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,あなたはこのレコードの経費承認者です。「ステータス」を更新し保存してください。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,あなたはこのレコードの経費承認者です。「ステータス」を更新し保存してください。
 DocType: Serial No,Creation Document No,作成ドキュメントNo
 DocType: Issue,Issue,課題
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",アイテムバリエーションの属性。例）サイズ、色など
@@ -949,8 +953,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
 DocType: Sales Partner,Implementation Partner,導入パートナー
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},受注{0}は{1}です
 DocType: Opportunity,Contact Info,連絡先情報
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,在庫エントリを作成
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,在庫エントリを作成
 DocType: Packing Slip,Net Weight UOM,正味重量単位
 DocType: Item,Default Supplier,デフォルトサプライヤー
 DocType: Manufacturing Settings,Over Production Allowance Percentage,製造割当率超過
@@ -959,7 +964,7 @@ DocType: Features Setup,Miscelleneous,その他
 DocType: Holiday List,Get Weekly Off Dates,週の休日を取得する
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,終了日は開始日より前にすることはできません
 DocType: Sales Person,Select company name first.,はじめに会社名を選択してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,借方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,借方
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,サプライヤーから受け取った見積。
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,時間ログ経由で更新
@@ -987,7 +992,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,参照用の会社登録番号（例：税番号など）
 DocType: Sales Partner,Distributor,販売代理店
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ショッピングカート出荷ルール
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
 ,Ordered Items To Be Billed,支払予定注文済アイテム
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,範囲開始は範囲終了よりも小さくなければなりません
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,タイムログを選択し、新しい請求書を作成し提出してください。
@@ -1035,7 +1040,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,税そ
 DocType: Lead,Lead,リード
 DocType: Email Digest,Payables,買掛金
 DocType: Account,Warehouse,倉庫
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒否数量は「購買返品」に入力することはできません
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒否数量は「購買返品」に入力することはできません
 ,Purchase Order Items To Be Billed,支払予定発注アイテム
 DocType: Purchase Invoice Item,Net Rate,正味単価
 DocType: Purchase Invoice Item,Purchase Invoice Item,仕入請求アイテム
@@ -1050,11 +1055,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,未照合支払い
 DocType: Global Defaults,Current Fiscal Year,現在の会計年度
 DocType: Global Defaults,Disable Rounded Total,合計の四捨五入を無効にする
 DocType: Lead,Call,電話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,「エントリ」は空にできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,「エントリ」は空にできません
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},行{0}は{1}と重複しています
 ,Trial Balance,試算表
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,従業員設定
-sites/assets/js/erpnext.min.js +5,"Grid ""","グリッド """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,従業員設定
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","グリッド """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,接頭辞を選択してください
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,リサーチ
 DocType: Maintenance Visit Purpose,Work Done,作業完了
@@ -1065,14 +1070,15 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,"元帳
 "
 DocType: File,Lft,左
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
 DocType: Communication,Delivery Status,納品ステータス
 DocType: Production Order,Manufacture against Sales Order,受注に対する製造
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,その他の地域
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,その他の地域
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,アイテム{0}はバッチを持てません
 ,Budget Variance Report,予算差異レポート
 DocType: Salary Slip,Gross Pay,給与総額
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,配当金支払額
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,会計元帳
 DocType: Stock Reconciliation,Difference Amount,差額
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,内部留保
 DocType: BOM Item,Item Description,アイテム説明
@@ -1086,15 +1092,17 @@ DocType: Opportunity Item,Opportunity Item,機会アイテム
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,仮勘定期首
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,低温圧延
 ,Employee Leave Balance,従業員の残休暇数
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
 DocType: Address,Address Type,住所タイプ
 DocType: Purchase Receipt,Rejected Warehouse,拒否された倉庫
 DocType: GL Entry,Against Voucher,対伝票
 DocType: Item,Default Buying Cost Center,デフォルト購入コストセンター
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",ERPNextを最大限にするには、我々はあなたがいくつかの時間がかかるし、これらのヘルプビデオを見ることをお勧めします。
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,アイテム{0}は販売アイテムでなければなりません
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,へ
 DocType: Item,Lead Time in days,リードタイム日数
 ,Accounts Payable Summary,買掛金の概要
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},凍結されたアカウント{0}を編集する権限がありません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},凍結されたアカウント{0}を編集する権限がありません
 DocType: Journal Entry,Get Outstanding Invoices,未払いの請求を取得
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,受注{0}は有効ではありません
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",企業はマージできません
@@ -1110,7 +1118,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,発生場所
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,契約書
 DocType: Report,Disabled,無効
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},アイテム{1}の{0}には数量単位変換係数が必要です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},アイテム{1}の{0}には数量単位変換係数が必要です
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,間接経費
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}：数量は必須です
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,農業
@@ -1119,13 +1127,13 @@ DocType: Mode of Payment,Mode of Payment,支払方法
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,これは、ルートアイテムグループであり、編集することはできません。
 DocType: Journal Entry Account,Purchase Order,発注
 DocType: Warehouse,Warehouse Contact Info,倉庫連絡先情報
-sites/assets/js/form.min.js +190,Name is required,名前が必要です
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,名前が必要です
 DocType: Purchase Invoice,Recurring Type,繰り返しタイプ
 DocType: Address,City/Town,市町村
 DocType: Email Digest,Annual Income,年間所得
 DocType: Serial No,Serial No Details,シリアル番号詳細
 DocType: Purchase Invoice Item,Item Tax Rate,アイテムごとの税率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,納品書{0}は提出されていません
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
@@ -1136,14 +1144,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,説明編集
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,配送予定日が計画開始日よりも前に指定されています
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,サプライヤー用
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,サプライヤー用
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,アカウントタイプを設定すると、取引内で選択できるようになります
 DocType: Purchase Invoice,Grand Total (Company Currency),総合計（会社通貨）
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出費総額
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",「値へ」を0か空にする送料ルール条件しかありません
 DocType: Authorization Rule,Transaction,取引
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：このコストセンターはグループです。グループに対する会計エントリーを作成することはできません。
-apps/erpnext/erpnext/config/projects.py +43,Tools,ツール
+apps/frappe/frappe/config/desk.py +7,Tools,ツール
 DocType: Item,Website Item Groups,ウェブサイトのアイテムグループ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,在庫エントリー目的の製造には製造指示番号が必須です
 DocType: Purchase Invoice,Total (Company Currency),計（会社通貨）
@@ -1153,7 +1161,7 @@ DocType: Workstation,Workstation Name,作業所名
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,メールダイジェスト：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
 DocType: Sales Partner,Target Distribution,ターゲット区分
-sites/assets/js/desk.min.js +7652,Comments,コメント
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,コメント
 DocType: Salary Slip,Bank Account No.,銀行口座番号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,この接頭辞が付いた最新の取引番号です
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},アイテム{0}に評価額が必要です
@@ -1168,7 +1176,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,会社を選
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,特別休暇
 DocType: Purchase Invoice,Supplier Invoice Date,サプライヤー請求日
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,「ショッピングカート」を有効にしてください
-sites/assets/js/form.min.js +212,No Data,データがありません
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,データがありません
 DocType: Appraisal Template Goal,Appraisal Template Goal,査定テンプレート目標
 DocType: Salary Slip,Earning,収益
 DocType: Payment Tool,Party Account Currency,当事者アカウント通貨
@@ -1176,7 +1184,7 @@ DocType: Payment Tool,Party Account Currency,当事者アカウント通貨
 DocType: Purchase Taxes and Charges,Add or Deduct,増減
 DocType: Company,If Yearly Budget Exceeded (for expense account),年間予算（経費勘定のため）を超えた場合
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,次の条件が重複しています：
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,対仕訳{0}はすでにいくつか他の伝票に対して適応されています
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,対仕訳{0}はすでにいくつか他の伝票に対して適応されています
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,注文価値合計
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,食べ物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,エイジングレンジ３
@@ -1184,11 +1192,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,訪問なし
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",連絡先・リードへのニュースレター
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},閉じるアカウントの通貨がでなければなりません{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},全目標のポイントの合計は100でなければなりませんが、{0}になっています
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,作業は空白にできません
 ,Delivered Items To Be Billed,未入金の納品済アイテム
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫は製造番号によって変更することはできません。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},ステータスは{0}に更新されました
 DocType: DocField,Description,説明
 DocType: Authorization Rule,Average Discount,平均割引
 DocType: Letter Head,Is Default,デフォルト
@@ -1216,7 +1224,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,アイテムごとの税額
 DocType: Item,Maintain Stock,在庫維持
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,製造指示が作成済の在庫エントリー
 DocType: Leave Control Panel,Leave blank if considered for all designations,全ての肩書を対象にする場合は空白のままにします
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大：{0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,開始日時
 DocType: Email Digest,For Company,会社用
@@ -1226,7 +1234,7 @@ DocType: Sales Invoice,Shipping Address Name,配送先住所
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,勘定科目表
 DocType: Material Request,Terms and Conditions Content,規約の内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,無給休暇に依存
@@ -1239,7 +1247,7 @@ DocType: Warranty Claim,Warranty / AMC Status,保証/ 年間保守契約のス
 DocType: GL Entry,GL Entry,総勘定元帳エントリー
 DocType: HR Settings,Employee Settings,従業員の設定
 ,Batch-Wise Balance History,バッチごとの残高履歴
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,やることリスト
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,やることリスト
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,見習
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,マイナスの数量は許可されていません
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1272,13 +1280,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,事務所賃料
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,SMSゲートウェイの設定
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,インポートが失敗しました！
-sites/assets/js/erpnext.min.js +24,No address added yet.,アドレスがまだ追加されていません
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,アドレスがまだ追加されていません
 DocType: Workstation Working Hour,Workstation Working Hour,作業所の労働時間
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,アナリスト
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：割り当て額{1}は仕訳伝票額{2}以下でなければなりません
 DocType: Item,Inventory,在庫
 DocType: Features Setup,"To enable ""Point of Sale"" view",POS画面を有効にする
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,空のカートに支払はできません
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,空のカートに支払はできません
 DocType: Item,Sales Details,販売明細
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ピンニング
 DocType: Opportunity,With Items,関連アイテム
@@ -1288,7 +1296,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",次の請求書が生成される日付。これは提出時に生成されます。
 DocType: Item Attribute,Item Attribute,アイテム属性
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,政府
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,アイテムバリエーション
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,アイテムバリエーション
 DocType: Company,Services,サービス
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),計（{0}）
 DocType: Cost Center,Parent Cost Center,親コストセンター
@@ -1298,11 +1306,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,会計年度の開始日
 DocType: Employee External Work History,Total Experience,実績合計
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,座繰り
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,梱包伝票（S）をキャンセル
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,梱包伝票（S）をキャンセル
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,運送・転送料金
 DocType: Material Request Item,Sales Order No,受注番号
 DocType: Item Group,Item Group Name,アイテムグループ名
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,売上高
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,売上高
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,製造用資材配送
 DocType: Pricing Rule,For Price List,価格表用
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,ヘッドハンティング
@@ -1312,8 +1320,7 @@ DocType: Maintenance Schedule,Schedules,スケジュール
 DocType: Purchase Invoice Item,Net Amount,正味金額
 DocType: Purchase Order Item Supplied,BOM Detail No,部品表詳細番号
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),追加割引額（会社通貨）
-DocType: Period Closing Voucher,CoA Help,CoAのヘルプ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},エラー：{0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},エラー：{0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,勘定科目表から新しいアカウントを作成してください
 DocType: Maintenance Visit,Maintenance Visit,メンテナンスのための訪問
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,顧客>顧客グループ>地域
@@ -1324,6 +1331,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,陸揚費用ヘルプ
 DocType: Event,Tuesday,火曜日
 DocType: Leave Block List,Block Holidays on important days.,年次休暇（記念日休暇）
 ,Accounts Receivable Summary,売掛金概要
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},すでに期間の従業員{1}のために割り当てられたタイプ{0}のために葉{2}  -  {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,従業員の役割を設定するには、従業員レコードのユーザーIDフィールドを設定してください
 DocType: UOM,UOM Name,数量単位名
 DocType: Top Bar Item,Target,ターゲット
@@ -1345,19 +1353,19 @@ DocType: Sales Partner,Sales Partner Target,販売パートナー目標
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0}の勘定科目は通貨{1}でのみ作成可能です
 DocType: Pricing Rule,Pricing Rule,価格設定ルール
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,ノッチング
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,仕入注文のための資材要求
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,仕入注文のための資材要求
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返品アイテム {1} は {2} {3}に存在しません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行口座
 ,Bank Reconciliation Statement,銀行勘定調整表
 DocType: Address,Lead Name,リード名
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期首在庫残高
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,期首在庫残高
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}が重複しています
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},発注{2}に対して{1}より{0}以上を配送することはできません
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},休暇は{0}に正常に割り当てられました
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},休暇は{0}に正常に割り当てられました
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,梱包するアイテムはありません
 DocType: Shipping Rule Condition,From Value,値から
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,製造数量は必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,製造数量は必須です
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,銀行に反映されていない金額
 DocType: Quality Inspection Reading,Reading 4,報告要素4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,会社経費の請求
@@ -1370,19 +1378,20 @@ DocType: Opportunity,Contact Mobile No,連絡先携帯番号
 DocType: Production Planning Tool,Select Sales Orders,受注を選択
 ,Material Requests for which Supplier Quotations are not created,サプライヤー見積が作成されていない資材要求
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,バーコードを使用してアイテムを追跡します。アイテムのバーコードをスキャンすることによって、納品書や請求書にアイテムを入力することができます。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,配信としてマーク
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,見積を作成
 DocType: Dependent Task,Dependent Task,依存タスク
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,事前にX日の業務を計画してみてください
 DocType: HR Settings,Stop Birthday Reminders,誕生日リマインダを停止
 DocType: SMS Center,Receiver List,受領者リスト
 DocType: Payment Tool Detail,Payment Amount,支払金額
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消費額
-sites/assets/js/erpnext.min.js +51,{0} View,{0}ビュー
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}ビュー
 DocType: Salary Structure Deduction,Salary Structure Deduction,給与体系（控除）
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,選択的レーザー焼結
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,インポート成功！
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,課題アイテムの費用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},数量は{0}以下でなければなりません
@@ -1403,7 +1412,7 @@ DocType: Company,Default Payable Account,デフォルト買掛金勘定
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",オンラインショッピングカート設定（出荷ルール・価格表など）
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,セットアップ完了
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％支払済
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,予約数量
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,予約数量
 DocType: Party Account,Party Account,当事者アカウント
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,人事
 DocType: Lead,Upper Income,高収益
@@ -1447,11 +1456,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,ショッピングカートを有効にする
 DocType: Employee,Permanent Address,本籍地
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,アイテム{0}はサービスアイテムでなければなりません。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0}への前払金として {1} は{2}の総計より大きくすることはできません
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,アイテムコードを選択してください。
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),無給休暇（LWP）の控除減
 DocType: Territory,Territory Manager,地域マネージャ
+DocType: Delivery Note Item,To Warehouse (Optional),倉庫に（オプション）
 DocType: Sales Invoice,Paid Amount (Company Currency),支払額（会社通貨）
 DocType: Purchase Invoice,Additional Discount,追加割引
 DocType: Selling Settings,Selling Settings,販売設定
@@ -1475,7 +1485,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,レジンキャスト
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します
 顧客名か顧客グループのどちらかの名前を変更してください"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,最初の{0}を選択してください
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,最初の{0}を選択してください
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},テキスト{0}
 DocType: Territory,Parent Territory,上位地域
 DocType: Quality Inspection Reading,Reading 2,報告要素2
@@ -1503,11 +1513,11 @@ DocType: Sales Invoice Item,Batch No,バッチ番号
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,顧客の発注に対する複数の受注を許可
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,メイン
 DocType: DocPerm,Delete,削除
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,バリエーション
-sites/assets/js/desk.min.js +7971,New {0},新しい{0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,バリエーション
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新しい{0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,停止された注文はキャンセルできません。キャンセルするには停止解除してください
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,停止された注文はキャンセルできません。キャンセルするには停止解除してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
 DocType: Employee,Leave Encashed?,現金化された休暇？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機会元フィールドは必須です
 DocType: Item,Variants,バリエーション
@@ -1525,7 +1535,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,国
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,住所
 DocType: Communication,Received,受領
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},アイテム{0}に入力されたシリアル番号は重複しています
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,出荷ルールの条件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,アイテムは製造指示を持つことができません
@@ -1546,7 +1556,6 @@ DocType: Employee,Salutation,敬称（例：Mr. Ms.）
 DocType: Communication,Rejected,拒否
 DocType: Pricing Rule,Brand,ブランド
 DocType: Item,Will also apply for variants,バリエーションについても適用されます
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,％納品済
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,販売時に商品をまとめる
 DocType: Sales Order Item,Actual Qty,実際の数量
 DocType: Sales Invoice Item,References,参照
@@ -1584,14 +1593,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,シアリング
 DocType: Item,Has Variants,バリエーションあり
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,新しい売上請求書を作成するために「請求書を作成」ボタンをクリックしてください。
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,繰り返し %s には期間の開始・終了日が必須です
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,包装
 DocType: Monthly Distribution,Name of the Monthly Distribution,月次配分の名前
 DocType: Sales Person,Parent Sales Person,親販売担当者
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,会社マスタ・共通デフォルト設定で「デフォルト通貨」を指定してください
 DocType: Dropbox Backup,Dropbox Access Secret,Dropboxのアクセスの秘密
 DocType: Purchase Invoice,Recurring Invoice,定期的な請求
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,プロジェクト管理
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,プロジェクト管理
 DocType: Supplier,Supplier of Goods or Services.,物品やサービスのサプライヤー
 DocType: Budget Detail,Fiscal Year,会計年度
 DocType: Cost Center,Budget,予算
@@ -1619,11 +1627,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,販売
 DocType: Employee,Salary Information,給与情報
 DocType: Sales Person,Name and Employee ID,名前と従業員ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
 DocType: Website Item Group,Website Item Group,ウェブサイトの項目グループ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,関税と税金
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,基準日を入力してください
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} 件の支払いエントリが {1}によってフィルタリングできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,基準日を入力してください
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} 件の支払いエントリが {1}によってフィルタリングできません
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Webサイトに表示されたアイテムの表
 DocType: Purchase Order Item Supplied,Supplied Qty,サプライ数量
 DocType: Material Request Item,Material Request Item,資材要求アイテム
@@ -1631,7 +1639,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,アイテムグ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,この請求タイプの行数以上の行番号を参照することはできません
 ,Item-wise Purchase History,アイテムごとの仕入履歴
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,レッド
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},アイテム{0}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},アイテム{0}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
 DocType: Account,Frozen,凍結
 ,Open Production Orders,製造指示を開く
 DocType: Installation Note,Installation Time,設置時間
@@ -1676,13 +1684,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,見積傾向
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",このアイテムに製造指示を出すには、在庫アイテムでなければなりません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",このアイテムに製造指示を出すには、在庫アイテムでなければなりません。
 DocType: Shipping Rule Condition,Shipping Amount,出荷量
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,入社
 DocType: Authorization Rule,Above Value,値を上回る
 ,Pending Amount,保留中の金額
 DocType: Purchase Invoice Item,Conversion Factor,換算係数
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,納品済
+DocType: Purchase Order,Delivered,納品済
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),ジョブメールを受信するサーバのメールIDをセットアップします。（例 jobs@example.com）
 DocType: Purchase Receipt,Vehicle Number,車両番号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,繰り返し請求停止予定日
@@ -1699,10 +1707,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,支払按分基準
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,アイテム{1}が資産アイテムである場合、アカウントアイテム{0}は「固定資産」でなければなりません
 DocType: HR Settings,HR Settings,人事設定
 apps/frappe/frappe/config/setup.py +130,Printing,印刷
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,経費請求は承認待ちです。経費承認者のみ、ステータスを更新することができます。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,経費請求は承認待ちです。経費承認者のみ、ステータスを更新することができます。
 DocType: Purchase Invoice,Additional Discount Amount,追加割引額
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,休暇を申請している日は休日です。申請の必要はありません。
-sites/assets/js/desk.min.js +7805,and,＆
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,＆
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,スポーツ
@@ -1739,7 +1747,6 @@ DocType: Opportunity,Quotation,見積
 DocType: Salary Slip,Total Deduction,控除合計
 DocType: Quotation,Maintenance User,メンテナンスユーザー
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,費用更新
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,停止解除してよろしいですか？
 DocType: Employee,Date of Birth,生年月日
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,アイテム{0}はすでに返品されています
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,「会計年度」は、会計年度を表します。すべての会計記帳および他の主要な取引は、「会計年度」に対して記録されます。
@@ -1755,13 +1762,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",セールスキャンペーンを追跡します。投資収益率を測定するために、キャンペーンから受注、見積、リードなどを追跡します。
 DocType: Expense Claim,Approver,承認者
 ,SO Qty,受注数量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",倉庫{0}に対して在庫エントリが存在するため、倉庫の再割り当てや変更ができません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",倉庫{0}に対して在庫エントリが存在するため、倉庫の再割り当てや変更ができません
 DocType: Appraisal,Calculate Total Score,合計スコアを計算
 DocType: Supplier Quotation,Manufacturing Manager,製造マネージャー
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},シリアル番号{0}は {1}まで保証期間内です
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,梱包ごとに納品書を分割
 apps/erpnext/erpnext/hooks.py +84,Shipments,出荷
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,ディップ成形
+DocType: Purchase Order,To be delivered to customer,顧客に配信します
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間ログのステータスが提出されなければなりません
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,シリアル番号は{0}任意の倉庫にも属していません
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,セットアップ
@@ -1786,11 +1794,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,通貨から
 DocType: DocField,Name,名前
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},受注に必要な項目{0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},受注に必要な項目{0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,システムに反映されていない金額
 DocType: Purchase Invoice Item,Rate (Company Currency),レート（報告通貨）
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,その他
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,停止に設定
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,一致する項目が見つかりません。 {0}のために他の値を選択してください。
 DocType: POS Profile,Taxes and Charges,租税公課
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",製品またはサービスは、購入・販売あるいは在庫です。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,最初の行には、「前行の数量」「前行の合計」などの料金タイプを選択することはできません
@@ -1799,19 +1807,20 @@ DocType: Web Form,Select DocType,文書タイプを選択
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,ブローチ加工
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,銀行業務
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,「スケジュールを生成」をクリックしてスケジュールを取得してください
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,新しいコストセンター
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新しいコストセンター
 DocType: Bin,Ordered Quantity,注文数
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",例「ビルダーのためのツール構築」
 DocType: Quality Inspection,In Process,処理中
 DocType: Authorization Rule,Itemwise Discount,アイテムごとの割引
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},受注{1}に対する{0}
+DocType: Purchase Order Item,Reference Document Type,リファレンスドキュメントの種類
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},受注{1}に対する{0}
 DocType: Account,Fixed Asset,固定資産
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,シリアル番号を付与した目録
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,シリアル番号を付与した目録
 DocType: Activity Type,Default Billing Rate,デフォルト請求単価
 DocType: Time Log Batch,Total Billing Amount,総請求額
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,売掛金勘定
 ,Stock Balance,在庫残高
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,受注からの支払
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,受注からの支払
 DocType: Expense Claim Detail,Expense Claim Detail,経費請求の詳細
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,時間ログを作成しました：
 DocType: Item,Weight UOM,重量単位
@@ -1847,10 +1856,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},部品表再帰：{0} {2}の親または子にすることはできません
 DocType: Production Order Operation,Completed Qty,完成した数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",{0}には、別の貸方エントリに対する借方勘定のみリンクすることができます
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,価格表{0}は無効になっています
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0}には、別の貸方エントリに対する借方勘定のみリンクすることができます
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,価格表{0}は無効になっています
 DocType: Manufacturing Settings,Allow Overtime,残業を許可
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,受注{0}は停止されました
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,アイテム {1} には {0} 件のシリアル番号が必要です。{2} 件指定されています
 DocType: Stock Reconciliation Item,Current Valuation Rate,現在の評価額
 DocType: Item,Customer Item Codes,顧客アイテムコード
@@ -1859,9 +1867,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,溶接
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,新しい在庫単位が必要です
 DocType: Quality Inspection,Sample Size,サンプルサイズ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,全てのアイテムはすでに請求済みです
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,全てのアイテムはすでに請求済みです
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',有効な「参照元ケース番号」を指定してください
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,アイテムシリアル番号
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ユーザーと権限
@@ -1888,7 +1896,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,住所・連絡先
 DocType: SMS Log,Sender Name,送信者名
 DocType: Page,Title,タイトル
-sites/assets/js/list.min.js +104,Customize,カスタマイズ
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,カスタマイズ
 DocType: POS Profile,[Select],[選択]
 DocType: SMS Log,Sent To,送信先
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,納品書を作成
@@ -1913,12 +1921,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,提供終了
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,移動
 DocType: Leave Block List,Allow Users,ユーザーを許可
+DocType: Purchase Order,Customer Mobile No,お客様の携帯電話はありません
 DocType: Sales Invoice,Recurring,繰り返し
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,製品の業種や部門ごとに個別の収益と費用を追跡します
 DocType: Rename Tool,Rename Tool,ツール名称変更
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,費用更新
 DocType: Item Reorder,Item Reorder,アイテム再注文
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,資材配送
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,資材配送
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",「運用」には「運用コスト」「固有の運用番号」を指定してください。
 DocType: Purchase Invoice,Price List Currency,価格表の通貨
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
@@ -1942,7 +1951,7 @@ DocType: Appraisal,Employee,従業員
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,メールインポート元
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,ユーザーとして招待
 DocType: Features Setup,After Sale Installations,販売後設置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1}は支払済です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1}は支払済です
 DocType: Workstation Working Hour,End Time,終了時間
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,販売・仕入用の標準的な契約条件
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,伝票によるグループ
@@ -1951,8 +1960,9 @@ DocType: Sales Invoice,Mass Mailing,大量送付
 DocType: Page,Standard,標準
 DocType: Rename Tool,File to Rename,名前を変更するファイル
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},アイテム{0}には発注番号が必要です
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,支払いを表示
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス予定{0}をキャンセルしなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス予定{0}をキャンセルしなければなりません
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,サイズ
 DocType: Notification Control,Expense Claim Approved,経費請求を承認
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,医薬品
@@ -1971,8 +1981,8 @@ DocType: Upload Attendance,Attendance To Date,出勤日
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),営業メールを受信するサーバのメールIDをセットアップします。 （例 sales@example.com）
 DocType: Warranty Claim,Raised By,要求者
 DocType: Payment Tool,Payment Account,支払勘定
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,続行する会社を指定してください
-sites/assets/js/list.min.js +23,Draft,下書き
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,続行する会社を指定してください
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,下書き
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,代償オフ
 DocType: Quality Inspection Reading,Accepted,承認済
 DocType: User,Female,女性
@@ -1985,14 +1995,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,出荷ルールラベル
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料は空白にできません。
 DocType: Newsletter,Test,テスト
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",このアイテムには在庫取引が存在するため、「シリアル番号あり」「バッチ番号あり」「ストックアイテム」「評価方法」の値を変更することはできません。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,クイック仕訳
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
 DocType: Employee,Previous Work Experience,前職歴
 DocType: Stock Entry,For Quantity,数量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},アイテム{0}行{1}に予定数量を入力してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1}は提出されていません
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,アイテム要求
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1}は提出されていません
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,アイテム要求
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,各完成品それぞれに独立した製造指示が作成されます。
 DocType: Purchase Invoice,Terms and Conditions1,規約１
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完全セットアップ
@@ -2004,7 +2015,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,ニュースレ
 DocType: Delivery Note,Transporter Name,輸送者名
 DocType: Contact,Enter department to which this Contact belongs,この連絡先の所属部署を入力してください
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,欠席計
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,行{0}のアイテムまたは倉庫が資材要求と一致していません
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}のアイテムまたは倉庫が資材要求と一致していません
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,数量単位
 DocType: Fiscal Year,Year End Date,年終日
 DocType: Task Depends On,Task Depends On,依存するタスク
@@ -2030,7 +2041,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,契約終了日は、入社日よりも大きくなければなりません
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,コミッションのための企業の製品を販売している第三者の代理店/ディーラー/コミッションエージェント/アフィリエイト/リセラー。
 DocType: Customer Group,Has Child Node,子ノードあり
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},発注{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},発注{1}に対する{0}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","静的なURLパラメータを入力してください（例：sender=ERPNext, username=ERPNext, password=1234 など）"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}は有効な会計年度内にありません。詳細については{2}を確認してください。
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,これはERPNextの自動生成ウェブサイトの例です。
@@ -2088,12 +2099,9 @@ DocType: Note,Note,ノート
 DocType: Purchase Receipt Item,Recd Quantity,受領数量
 DocType: Email Account,Email Ids,メールアドレス
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,停止解除に設定
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金勘定
 DocType: Tax Rule,Billing City,請求先の市
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,"この休暇申請は承認が保留されています。
-休暇承認者だけがステータスを更新することができます。"
 DocType: Global Defaults,Hide Currency Symbol,通貨記号を非表示にする
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card",例「銀行」「現金払い」「クレジットカード払い」
 DocType: Journal Entry,Credit Note,貸方票
@@ -2114,7 +2122,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),合計（量）
 DocType: Installation Note Item,Installed Qty,設置済数量
 DocType: Lead,Fax,FAX
 DocType: Purchase Taxes and Charges,Parenttype,親タイプ
-sites/assets/js/list.min.js +26,Submitted,提出済
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,提出済
 DocType: Salary Structure,Total Earning,収益合計
 DocType: Purchase Receipt,Time at which materials were received,資材受領時刻
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,自分の住所
@@ -2123,7 +2131,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織支部
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,または
 DocType: Sales Order,Billing Status,課金状況
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,水道光熱費
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90以上
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,デフォルト購入価格表
 ,Download Backups,バックアップダウンロード
 DocType: Notification Control,Sales Order Message,受注メッセージ
@@ -2132,7 +2140,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,従業員を選択
 DocType: Bank Reconciliation,To Date,日付
 DocType: Opportunity,Potential Sales Deal,潜在的販売取引
-sites/assets/js/form.min.js +308,Details,詳細
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,詳細
 DocType: Purchase Invoice,Total Taxes and Charges,租税公課計
 DocType: Employee,Emergency Contact,緊急連絡先
 DocType: Item,Quality Parameters,品質パラメータ
@@ -2147,7 +2155,7 @@ DocType: Purchase Order Item,Received Qty,受領数
 DocType: Stock Entry Detail,Serial No / Batch,シリアル番号／バッチ
 DocType: Product Bundle,Parent Item,親アイテム
 DocType: Account,Account Type,アカウントタイプ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
 ,To Produce,製造
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",{1}の行{0}では、アイテム単価に{2}を含める場合、行{3}も含まれている必要があります
 DocType: Packing Slip,Identification of the package for the delivery (for print),納品パッケージの識別票（印刷用）
@@ -2158,7 +2166,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,平面加工
 DocType: Account,Income Account,収益勘定
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,鋳造
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,配送
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,配送
 DocType: Stock Reconciliation Item,Current Qty,現在の数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",原価計算セクションの「資材単価基準」を参照してください。
 DocType: Appraisal Goal,Key Responsibility Area,重要責任分野
@@ -2188,9 +2196,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,全ての住所。
 DocType: Company,Stock Settings,在庫設定
 DocType: User,Bio,自己紹介
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,顧客グループツリーを管理します。
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,新しいコストセンター名
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,新しいコストセンター名
 DocType: Leave Control Panel,Leave Control Panel,[コントロールパネル]を閉じる
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,デフォルトの住所テンプレートが見つかりませんでした。設定> 印刷とブランディング>住所テンプレートから新しく作成してください。
 DocType: Appraisal,HR User,人事ユーザー
@@ -2209,24 +2217,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,支払ツールの詳細
 ,Sales Browser,販売ブラウザ
 DocType: Journal Entry,Total Credit,貸方合計
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}が在庫エントリ{2}に対して存在します
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,現地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}が在庫エントリ{2}に対して存在します
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,現地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ローンと貸付金（資産）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務者
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,L
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,従業員が見つかりません！
 DocType: C-Form Invoice Detail,Territory,地域
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,必要な訪問の数を記述してください
+DocType: Purchase Order,Customer Address Display,顧客の住所の表示
 DocType: Stock Settings,Default Valuation Method,デフォルト評価方法
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,研磨
 DocType: Production Order Operation,Planned Start Time,計画開始時間
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,割り当て済み
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,貸借対照表を閉じて損益を記帳
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",アイテム {0} のデフォルト数量単位（UOM）は、別の数量単位が取引内で使用されているため、直接変更することはできません。デフォルト数量単位を変更するには、在庫モジュール内の「数量単位置換ユーティリティ」ツールを使用してください。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,別通貨に変換するための為替レートを指定
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,見積{0}はキャンセルされました
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,見積{0}はキャンセルされました
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,残高合計
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,従業員は{0} {1}に休暇中でした。出勤とすることはできません。
 DocType: Sales Partner,Targets,ターゲット
@@ -2241,12 +2249,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ルート（大元の）顧客グループなので編集できません
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,会計エントリーを開始する前に、勘定科目を設定してください
 DocType: Purchase Invoice,Ignore Pricing Rule,価格設定ルールを無視
-sites/assets/js/list.min.js +24,Cancelled,キャンセル
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,キャンセル
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,給与体系内の開始日は従業員の入社日よりも前にはできません
 DocType: Employee Education,Graduate,大卒
 DocType: Leave Block List,Block Days,ブロック日数
 DocType: Journal Entry,Excise Entry,消費税​​エントリ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：受注 {0} は受注 {1} に既に存在します
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：受注 {0} は受注 {1} に既に存在します
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2302,17 +2310,17 @@ DocType: Account,Stock Received But Not Billed,記帳前在庫
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,給与総額+滞納額+現金化金額 - 合計控除
 DocType: Monthly Distribution,Distribution Name,配布名
 DocType: Features Setup,Sales and Purchase,販売と仕入
-DocType: Purchase Order Item,Material Request No,資材要求番号
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
+DocType: Supplier Quotation Item,Material Request No,資材要求番号
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,顧客の通貨が会社の基本通貨に換算されるレート
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,このリストから{0}を正常に解除しました。
 DocType: Purchase Invoice Item,Net Rate (Company Currency),正味単価（会社通貨）
-apps/frappe/frappe/templates/base.html +132,Added,追加済
+apps/frappe/frappe/templates/base.html +134,Added,追加済
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,地域ツリーを管理
 DocType: Journal Entry Account,Sales Invoice,請求書
 DocType: Journal Entry Account,Party Balance,当事者残高
 DocType: Sales Invoice Item,Time Log Batch,時間ログバッチ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,「割引を適用」を選択してください
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,「割引を適用」を選択してください
 DocType: Company,Default Receivable Account,デフォルト売掛金勘定
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,上記選択条件に支払われる総給与のための銀行エントリを作成
 DocType: Stock Entry,Material Transfer for Manufacture,製造用資材移送
@@ -2323,7 +2331,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,関連するエントリを取
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,在庫の会計エントリー
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,コイニング
 DocType: Sales Invoice,Sales Team1,販売チーム1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,アイテム{0}は存在しません
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,アイテム{0}は存在しません
 DocType: Sales Invoice,Customer Address,顧客の住所
 apps/frappe/frappe/desk/query_report.py +136,Total,計
 DocType: Purchase Invoice,Apply Additional Discount On,追加割引に適用
@@ -2338,13 +2346,15 @@ DocType: Quality Inspection,Quality Inspection,品質検査
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,XS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,溶射成形
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,アカウント{0}は凍結されています
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,アカウント{0}は凍結されています
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,組織内で別々の勘定科目を持つ法人／子会社
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆タバコ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL・BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,手数料率は、100を超えることはできません。
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最小在庫レベル
 DocType: Stock Entry,Subcontract,下請
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,最初の{0}を入力してください
 DocType: Production Planning Tool,Get Items From Sales Orders,受注からアイテムを取得
 DocType: Production Order Operation,Actual End Time,実際の終了時間
 DocType: Production Planning Tool,Download Materials Required,所要資材をダウンロード
@@ -2361,9 +2371,9 @@ DocType: Maintenance Visit,Scheduled,スケジュール設定済
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",「在庫アイテム」が「いいえ」であり「販売アイテム」が「はい」であり他の製品付属品が無いアイテムを選択してください。
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,月をまたがってターゲットを不均等に配分するには、「月次配分」を選択してください
 DocType: Purchase Invoice Item,Valuation Rate,評価額
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,価格表の通貨が選択されていません
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,価格表の通貨が選択されていません
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,アイテムの行{0}：領収書{1}は上記の「領収書」テーブルに存在しません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},従業員{0}は{2} と{3}の間の{1}を既に申請しています
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},従業員{0}は{2} と{3}の間の{1}を既に申請しています
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,プロジェクト開始日
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,まで
 DocType: Rename Tool,Rename Log,ログ名称変更
@@ -2390,13 +2400,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,取引にはリーフノードのみ許可されています
 DocType: Expense Claim,Expense Approver,経費承認者
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,領収書アイテム供給済
-sites/assets/js/erpnext.min.js +48,Pay,支払
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,支払
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,終了日時
 DocType: SMS Settings,SMS Gateway URL,SMSゲートウェイURL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMSの配信状態を維持管理するためのログ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,研削
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,シュリンクラップ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,保留中の活動
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,保留中の活動
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,確認済
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,サプライヤー>サプライヤータイプ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,退職日を入力してください。
@@ -2407,7 +2417,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,問
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,新聞社
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,会計年度を選択
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,精錬
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,あなたはこのレコードの休暇承認者です。「ステータス」を更新し保存してください。
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,再注文レベル
 DocType: Attendance,Attendance Date,出勤日
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,給与の支給と控除
@@ -2443,6 +2452,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,既存の取引があるコストセンターは、グループに変換することはできません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,減価償却
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),サプライヤー
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,無効期間
 DocType: Customer,Credit Limit,与信限度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,取引タイプを選択
 DocType: GL Entry,Voucher No,伝票番号
@@ -2452,8 +2462,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,規
 DocType: Customer,Address and Contact,住所・連絡先
 DocType: Customer,Last Day of the Next Month,次月末日
 DocType: Employee,Feedback,フィードバック
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,メンテナンススケジュール
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,メンテナンススケジュール
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,アブレイシブジェット加工
 DocType: Stock Settings,Freeze Stock Entries,凍結在庫エントリー
 DocType: Website Settings,Website Settings,Webサイト設定
@@ -2467,11 +2477,11 @@ DocType: Quality Inspection,Outgoing,支出
 DocType: Material Request,Requested For,要求対象
 DocType: Quotation Item,Against Doctype,対文書タイプ
 DocType: Delivery Note,Track this Delivery Note against any Project,任意のプロジェクトに対してこの納品書を追跡します
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,rootアカウントを削除することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,rootアカウントを削除することはできません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,在庫エントリー表示
 ,Is Primary Address,プライマリアドレス
 DocType: Production Order,Work-in-Progress Warehouse,作業中の倉庫
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},参照＃{0} 日付{1}　
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},参照＃{0} 日付{1}　
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,住所管理
 DocType: Pricing Rule,Item Code,アイテムコード
 DocType: Production Planning Tool,Create Production Orders,製造指示を作成
@@ -2480,14 +2490,14 @@ DocType: Journal Entry,User Remark,ユーザー備考
 DocType: Lead,Market Segment,市場区分
 DocType: Communication,Phone,電話
 DocType: Employee Internal Work History,Employee Internal Work History,従業員の入社後の職歴
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),（借方）を閉じる
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),（借方）を閉じる
 DocType: Contact,Passive,消極的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,シリアル番号{0}は在庫切れです
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,販売取引用の税のテンプレート
 DocType: Sales Invoice,Write Off Outstanding Amount,未償却残額
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",自動で繰り返し請求にする場合チェックをオンにします。請求書の提出後、「繰り返し」セクションが表示されます。
 DocType: Account,Accounts Manager,会計管理者
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',時間ログ{0}は「提出済」でなければなりません
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',時間ログ{0}は「提出済」でなければなりません
 DocType: Stock Settings,Default Stock UOM,デフォルト在庫数量単位
 DocType: Time Log,Costing Rate based on Activity Type (per hour),行動タイプ（毎時）に基づく原価
 DocType: Production Planning Tool,Create Material Requests,資材要求を作成
@@ -2498,7 +2508,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,銀行勘定調整
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,アップデートを入手
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,いくつかのサンプルレコードを追加
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,休暇管理
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,休暇管理
 DocType: Event,Groups,グループ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,勘定によるグループ
 DocType: Sales Order,Fully Delivered,全て納品済
@@ -2510,11 +2520,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,試供
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},コストセンター{2}に対するアカウント{1}の予算{0}が {3}により超えてしまいます
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産／負債タイプのアカウントである必要があります
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
-DocType: Leave Allocation,Carry Forwarded Leaves,繰り越し休暇
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',「終了日」は「開始日」の後にしてください。
 ,Stock Projected Qty,予測在庫数
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
 DocType: Sales Order,Customer's Purchase Order,顧客の購入注文
 DocType: Warranty Claim,From Company,会社から
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,値または数量
@@ -2527,13 +2536,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,小売業者
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,全てのサプライヤータイプ
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,アイテムは自動的に採番されていないため、アイテムコードが必須です
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,アイテムは自動的に採番されていないため、アイテムコードが必須です
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,メンテナンス予定アイテム
 DocType: Sales Order,%  Delivered,％納品済
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,銀行当座貸越口座
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,給与伝票を作成
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,停止解除
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,部品表（BOM）を表示
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,担保ローン
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,素晴らしい製品
@@ -2543,7 +2551,7 @@ DocType: Appraisal,Appraisal,査定
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ロストフォーム鋳造
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,図
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日付が繰り返されます
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
 DocType: Hub Settings,Seller Email,販売者のメール
 DocType: Project,Total Purchase Cost (via Purchase Invoice),総仕入費用（仕入請求書経由）
 DocType: Workstation Working Hour,Start Time,開始時間
@@ -2557,8 +2565,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),正味金額（会社通貨）
 DocType: BOM Operation,Hour Rate,時給
 DocType: Stock Settings,Item Naming By,アイテム命名
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,見積から
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},別の期間の決算仕訳 {0} が {1} の後に作成されています
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,見積から
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},別の期間の決算仕訳 {0} が {1} の後に作成されています
 DocType: Production Order,Material Transferred for Manufacturing,製造用移設資材
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,アカウント{0}が存在しません
 DocType: Purchase Receipt Item,Purchase Order Item No,発注アイテム番号
@@ -2571,11 +2579,11 @@ DocType: Item,Inspection Required,要検査
 DocType: Purchase Invoice Item,PR Detail,PR詳細
 DocType: Sales Order,Fully Billed,全て記帳済
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,手持ちの現金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},在庫アイテム{0}には配送倉庫が必要です
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},在庫アイテム{0}には配送倉庫が必要です
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),梱包の総重量は通常、正味重量＋梱包材重量です （印刷用）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,この役割を持つユーザーは、口座の凍結と、凍結口座に対しての会計エントリーの作成/修正が許可されています
 DocType: Serial No,Is Cancelled,キャンセル済
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,自分の出荷
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,自分の出荷
 DocType: Journal Entry,Bill Date,ビル日
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",最高優先度を持つ複数の価格設定ルールがあった場合でも、次の内部優先順位が適用されます
 DocType: Supplier,Supplier Details,サプライヤー詳細
@@ -2588,7 +2596,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,電信振込
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,銀行口座を選択してください
 DocType: Newsletter,Create and Send Newsletters,ニュースレターの作成・送信
-sites/assets/js/report.min.js +107,From Date must be before To Date,開始日は終了日より前でなければなりません
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,開始日は終了日より前でなければなりません
 DocType: Sales Order,Recurring Order,定期的な注文
 DocType: Company,Default Income Account,デフォルト損益勘定
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,顧客グループ／顧客
@@ -2603,31 +2611,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,在庫単位
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,発注{0}は提出されていません
 ,Projected,予想
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},倉庫 {1} に存在しないシリアル番号 {0}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：アイテム{0}の数量が0であるため、システムは超過納品や超過注文をチェックしません。
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：アイテム{0}の数量が0であるため、システムは超過納品や超過注文をチェックしません。
 DocType: Notification Control,Quotation Message,見積メッセージ
 DocType: Issue,Opening Date,日付を開く
 DocType: Journal Entry,Remark,備考
 DocType: Purchase Receipt Item,Rate and Amount,割合と量
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ボーリング加工
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,受注から
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,受注から
 DocType: Blog Category,Parent Website Route,親サイトルート
 DocType: Sales Order,Not Billed,未記帳
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,両方の倉庫は同じ会社に属している必要があります
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,連絡先がまだ追加されていません
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,連絡先がまだ追加されていません
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,アクティブではありません
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,対請求書転記日付
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,陸揚費用伝票額
 DocType: Time Log,Batched for Billing,請求の一括処理
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,サプライヤーからの請求
 DocType: POS Profile,Write Off Account,償却勘定
-sites/assets/js/erpnext.min.js +26,Discount Amount,割引額
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,割引額
 DocType: Purchase Invoice,Return Against Purchase Invoice,仕入請求書に対する返品
 DocType: Item,Warranty Period (in days),保証期間（日数）
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,例「付加価値税（VAT）」
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,アイテム4
 DocType: Journal Entry Account,Journal Entry Account,仕訳勘定
 DocType: Shopping Cart Settings,Quotation Series,見積シリーズ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",同名のアイテム（{0}）が存在しますので、アイテムグループ名を変えるか、アイテム名を変更してください
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",同名のアイテム（{0}）が存在しますので、アイテムグループ名を変えるか、アイテム名を変更してください
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,熱間ガスフォーミング
 DocType: Sales Order Item,Sales Order Date,受注日
 DocType: Sales Invoice Item,Delivered Qty,納品済数量
@@ -2659,10 +2666,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,顧客またはサプライヤー詳細
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,設定
 DocType: Lead,Lead Owner,リード所有者
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,倉庫が必要です
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,倉庫が必要です
 DocType: Employee,Marital Status,配偶者の有無
 DocType: Stock Settings,Auto Material Request,自動資材要求
 DocType: Time Log,Will be updated when billed.,記帳時に更新されます。
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,倉庫からの利用可能なバッチ数量
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,「現在の部品表」と「新しい部品表」は同じにすることはできません
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
 DocType: Sales Invoice,Against Income Account,対損益勘定
@@ -2679,12 +2687,12 @@ DocType: POS Profile,Update Stock,在庫更新
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,超仕上げ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,アイテムごとに数量単位が異なると、（合計）正味重量値が正しくなりません。各アイテムの正味重量が同じ単位になっていることを確認してください。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,部品表通貨レート
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,納品書からアイテムを抽出してください
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,納品書からアイテムを抽出してください
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,仕訳{0}はリンク解除されています
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",電子メール、電話、チャット、訪問等すべてのやりとりの記録
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,会社の丸め誤差コストセンターを指定してください
 DocType: Purchase Invoice,Terms,規約
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,新規作成
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,新規作成
 DocType: Buying Settings,Purchase Order Required,発注が必要です
 ,Item-wise Sales History,アイテムごとの販売履歴
 DocType: Expense Claim,Total Sanctioned Amount,認可額合計
@@ -2701,16 +2709,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,給与控除明細
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,ノート
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,はじめにグループノードを選択してください
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的は、{0}のいずれかである必要があります
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,フォームに入力して保存します
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,フォームに入力して保存します
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,最新の在庫状況とのすべての原材料を含むレポートをダウンロード
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,フェーシング加工
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,コミュニティフォーラム
 DocType: Leave Application,Leave Balance Before Application,申請前休暇残数
 DocType: SMS Center,Send SMS,SMSを送信
 DocType: Company,Default Letter Head,デフォルトレターヘッド
 DocType: Time Log,Billable,請求可能
 DocType: Authorization Rule,This will be used for setting rule in HR module,人事モジュールで規則を設定するために使用されます
 DocType: Account,Rate at which this tax is applied,この税金が適用されるレート
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,再注文数量
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再注文数量
 DocType: Company,Stock Adjustment Account,在庫調整勘定
 DocType: Journal Entry,Write Off,償却
 DocType: Time Log,Operation ID,操作ID
@@ -2721,12 +2730,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",割引フィールドが発注書、領収書、請求書に利用できるようになります
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新しいアカウント名。注：顧客やサプライヤーのためにアカウントを作成しないでください
 DocType: Report,Report Type,レポートタイプ
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,読み込み中
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,読み込み中
 DocType: BOM Replace Tool,BOM Replace Tool,部品表交換ツール
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国ごとのデフォルトのアドレステンプレート
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
+DocType: Sales Order Item,Supplier delivers to Customer,サプライヤーは、お客様に提供します
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,表示減税アップ
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,データインポート・エクスポート
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',製造活動に関与する場合、アイテムを「製造済」にすることができます
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,請求書の転記日付
 DocType: Sales Invoice,Rounded Total,合計（四捨五入）
 DocType: Product Bundle,List items that form the package.,梱包を形成するリストアイテム
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,割合の割り当ては100パーセントに等しくなければなりません
@@ -2737,8 +2749,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
 DocType: Company,Default Cash Account,デフォルトの現金勘定
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,会社（顧客・サプライヤーではない）のマスター
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',「納品予定日」を入力してください
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',「納品予定日」を入力してください
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,支払額＋償却額は総計を超えることはできません
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}はアイテム{1}に対して有効なバッチ番号ではありません
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注：休暇タイプ{0}のための休暇残高が足りません
@@ -2759,11 +2771,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}",行{0}：{2} {3} の倉庫 {1} で可能な数量ではありません（可能な数量 {4}／移転数量 {5}）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,アイテム3
+DocType: Purchase Order,Customer Contact Email,お客様の連絡先メールアドレス
 DocType: Event,Sunday,日曜日
 DocType: Sales Team,Contribution (%),寄与度（％）
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：「現金または銀行口座」が指定されていないため、支払エントリが作成されません
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,責任
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,テンプレート
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,テンプレート
 DocType: Sales Person,Sales Person Name,営業担当者名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,表に少なくとも1件の請求書を入力してください
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,ユーザー追加
@@ -2772,7 +2785,7 @@ DocType: Task,Actual Start Date (via Time Logs),実際の開始日（時間ロ
 DocType: Stock Reconciliation Item,Before reconciliation,照合前
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),租税公課が追加されました。（報告通貨）
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
 DocType: Sales Order,Partly Billed,一部支払済
 DocType: Item,Default BOM,デフォルト部品表
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2780,12 +2793,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,残高合計
 DocType: Time Log Batch,Total Hours,時間合計
 DocType: Journal Entry,Printing Settings,印刷設定
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,自動車
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},休暇タイプ{0}はすでに会計年度{0}の従業員{1}に割り当てられています
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,アイテムが必要です
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,金属射出成形
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,納品書から
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,納品書から
 DocType: Time Log,From Time,開始時間
 DocType: Notification Control,Custom Message,カスタムメッセージ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,投資銀行
@@ -2801,10 +2813,10 @@ DocType: Newsletter,A Lead with this email id should exist,このメールアド
 DocType: Stock Entry,From BOM,参照元部品表
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}が凍結される以前の在庫取引
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',「スケジュール生成」をクリックしてください
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,半日休暇の開始日と終了日は同日でなければなりません
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',「スケジュール生成」をクリックしてください
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,半日休暇の開始日と終了日は同日でなければなりません
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",例「kg」「単位」「個数」「m」
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,参照日を入力した場合は参照番号が必須です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,参照日を入力した場合は参照番号が必須です
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,入社日は誕生日よりも後でなければなりません
 DocType: Salary Structure,Salary Structure,給与体系
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2812,7 +2824,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
 価格ルール：{0}"
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,航空会社
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,資材課題
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,資材課題
 DocType: Material Request Item,For Warehouse,倉庫用
 DocType: Employee,Offer Date,雇用契約日
 DocType: Hub Settings,Access Token,アクセストークン
@@ -2835,6 +2847,7 @@ DocType: Issue,Opening Time,「時間」を開く
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,期間日付が必要です
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,証券・商品取引所
 DocType: Shipping Rule,Calculate Based On,計算基準
+DocType: Delivery Note Item,From Warehouse,倉庫から
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,穴あけ加工
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ブロー成形
 DocType: Purchase Taxes and Charges,Valuation and Total,評価と総合
@@ -2856,11 +2869,12 @@ DocType: C-Form,Amended From,修正元
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原材料
 DocType: Leave Application,Follow via Email,メール経由でフォロー
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,割引後の税額
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,このアカウントには子アカウントが存在しています。このアカウントを削除することはできません。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,このアカウントには子アカウントが存在しています。このアカウントを削除することはできません。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ターゲット数量や目標量のどちらかが必須です
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,最初の転記日付を選択してください
-DocType: Leave Allocation,Carry Forward,繰り越す
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,最初の転記日付を選択してください
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,日付を開くと、日付を閉じる前にすべきです
+DocType: Leave Control Panel,Carry Forward,繰り越す
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,既存の取引があるコストセンターは、元帳に変換することはできません
 DocType: Department,Days for which Holidays are blocked for this department.,この部門のために休暇期間指定されている日
 ,Produced,生産
@@ -2881,16 +2895,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),合計（数）
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,エンターテインメント＆レジャー
 DocType: Purchase Order,The date on which recurring order will be stop,繰り返し注文停止予定日
 DocType: Quality Inspection,Item Serial No,アイテムシリアル番号
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0}は {1}より減少させなければならないか、オーバーフロー許容値を増やす必要があります
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0}は {1}より減少させなければならないか、オーバーフロー許容値を増やす必要があります
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,総現在価値
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,時
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",シリアル番号が付与されたアイテム{0}は「在庫棚卸」を使用して更新することはできません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,サプライヤーに資材を配送
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,サプライヤーに資材を配送
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新しいシリアル番号には倉庫を指定することができません。倉庫は在庫エントリーか領収書によって設定する必要があります
 DocType: Lead,Lead Type,リードタイプ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,見積を登録
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,これら全アイテムはすでに請求済みです
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,これら全アイテムはすでに請求済みです
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0}によって承認することができます
 DocType: Shipping Rule,Shipping Rule Conditions,出荷ルール条件
 DocType: BOM Replace Tool,The new BOM after replacement,交換後の新しい部品表
@@ -2938,7 +2952,7 @@ DocType: C-Form,C-Form,C-フォーム
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,操作IDが設定されていません
 DocType: Production Order,Planned Start Date,計画開始日
 DocType: Serial No,Creation Document Type,作成ドキュメントの種類
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,メンテナンス訪問
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,メンテナンス訪問
 DocType: Leave Type,Is Encash,現金化済
 DocType: Purchase Invoice,Mobile No,携帯番号
 DocType: Payment Tool,Make Journal Entry,仕訳を作成
@@ -2946,7 +2960,7 @@ DocType: Leave Allocation,New Leaves Allocated,新しい有給休暇
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,プロジェクトごとのデータは、引用符は使用できません
 DocType: Project,Expected End Date,終了予定日
 DocType: Appraisal Template,Appraisal Template Title,査定テンプレートタイトル
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,営利企業
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,営利企業
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,親項目 {0} は在庫アイテムにはできません
 DocType: Cost Center,Distribution Id,配布ID
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,素晴らしいサービス
@@ -2962,14 +2976,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},属性 {0} の値は、{3}の単位で {1} から {2}の範囲内でなければなりません
 DocType: Tax Rule,Sales,販売
 DocType: Stock Entry Detail,Basic Amount,基本額
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,貸方
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
+DocType: Leave Allocation,Unused leaves,未使用の葉
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,貸方
 DocType: Customer,Default Receivable Accounts,デフォルト売掛金勘定
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,ソーイング
 DocType: Tax Rule,Billing State,請求状況
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ラミネート
 DocType: Item Reorder,Transfer,移転
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
 DocType: Authorization Rule,Applicable To (Employee),（従業員）に適用
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,期日は必須です
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
@@ -2985,6 +3000,7 @@ DocType: Company,Retail,小売
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,顧客{0}は存在しません
 DocType: Attendance,Absent,欠勤
 DocType: Product Bundle,Product Bundle,製品付属品
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}：無効参照{1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,つぶし加工
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購入租税公課テンプレート
 DocType: Upload Attendance,Download Template,テンプレートのダウンロード
@@ -2992,16 +3008,16 @@ DocType: GL Entry,Remarks,備考
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原材料アイテムコード
 DocType: Journal Entry,Write Off Based On,償却基準
 DocType: Features Setup,POS View,POS表示
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,シリアル番号の設置レコード
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,シリアル番号の設置レコード
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,連続鋳造
-sites/assets/js/erpnext.min.js +10,Please specify a,指定してください
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,指定してください
 DocType: Offer Letter,Awaiting Response,応答を待っています
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,上記
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,冷間サイジング
 DocType: Salary Slip,Earning & Deduction,収益と控除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,アカウント{0}はグループにすることはできません
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,地域
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,（オプション）この設定は、様々な取引をフィルタリングするために使用されます。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,（オプション）この設定は、様々な取引をフィルタリングするために使用されます。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
 DocType: Holiday List,Weekly Off,週休
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","例：2012, 2012-13"
@@ -3045,12 +3061,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,バルジ加工
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,消失模型鋳造法
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,交際費
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、請求書{0}がキャンセルされていなければなりません
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,年齢
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、請求書{0}がキャンセルされていなければなりません
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,年齢
 DocType: Time Log,Billing Amount,請求額
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,アイテム{0}に無効な量が指定されています。数量は0以上でなければなりません。
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,休暇申請
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,既存の取引を持つアカウントを削除することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,既存の取引を持つアカウントを削除することはできません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,訴訟費用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",自動注文を生成する日付（例：05、28など）
 DocType: Sales Invoice,Posting Time,投稿時間
@@ -3059,9 +3075,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,ロゴ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,あなたが保存する前に、一連の選択をユーザに強制したい場合は、これを確認してください。これをチェックするとデフォルトはありません。
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},シリアル番号{0}のアイテムはありません
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,オープン通知
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,オープン通知
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,直接経費
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,この資材要求の停止を解除しますか？
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新規顧客の収益
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,旅費交通費
 DocType: Maintenance Visit,Breakdown,故障
@@ -3072,7 +3087,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,基準日
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,ホーニング加工
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,試用
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,在庫アイテムにはデフォルト倉庫が必須です。
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,在庫アイテムにはデフォルト倉庫が必須です。
 DocType: Feed,Full Name,氏名
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,クリンチ加工
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},{1}年{0}月の給与支払
@@ -3095,7 +3110,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,アカウント
 DocType: Buying Settings,Default Supplier Type,デフォルトサプライヤータイプ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,採石
 DocType: Production Order,Total Operating Cost,営業費合計
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,注：アイテム{0}が複数回入力されています
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,注：アイテム{0}が複数回入力されています
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,全ての連絡先。
 DocType: Newsletter,Test Email Id,テスト用メールアドレス
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,会社略称
@@ -3119,11 +3134,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,リー
 DocType: Stock Settings,Role Allowed to edit frozen stock,凍結在庫の編集が許可された役割
 ,Territory Target Variance Item Group-Wise,地域ターゲット差違（アイテムグループごと）
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,全ての顧客グループ
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,税テンプレートは必須です
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,アカウント{0}：親アカウント{1}が存在しません
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),価格表単価（会社通貨）
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1}ステータスは「停止」です
 DocType: Account,Temporary,仮勘定
 DocType: Address,Preferred Billing Address,優先請求先住所
 DocType: Monthly Distribution Percentage,Percentage Allocation,パーセンテージの割当
@@ -3141,13 +3155,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,アイテムごとの
 DocType: Purchase Order Item,Supplier Quotation,サプライヤー見積
 DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,しごき加工
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1}は停止しています
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}は停止しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
 DocType: Lead,Add to calendar on this date,この日付でカレンダーに追加
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,送料を追加するためのルール
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,今後のイベント
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,今後のイベント
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,顧客が必要です
 DocType: Letter Head,Letter Head,レターヘッド
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,クイック入力
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,返品には {0} が必須です
 DocType: Purchase Order,To Receive,受領する
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,焼き嵌め
@@ -3170,25 +3185,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
 DocType: Serial No,Out of Warranty,保証外
 DocType: BOM Replace Tool,Replace,置き換え
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},納品書{1}に対する{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,デフォルトの単位を入力してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},納品書{1}に対する{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,デフォルトの単位を入力してください
 DocType: Purchase Invoice Item,Project Name,プロジェクト名
 DocType: Supplier,Mention if non-standard receivable account,非標準の売掛金の場合に記載
 DocType: Workflow State,Edit,編集
 DocType: Journal Entry Account,If Income or Expense,収益または費用の場合
 DocType: Features Setup,Item Batch Nos,アイテムバッチ番号
 DocType: Stock Ledger Entry,Stock Value Difference,在庫価値の差違
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,人材
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,人材
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,支払照合 支払
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,税金資産
 DocType: BOM Item,BOM No,部品表番号
 DocType: Contact Us Settings,Pincode,郵便番号
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,仕訳{0}は、勘定{1}が無いか、既に他の伝票に照合されています
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,仕訳{0}は、勘定{1}が無いか、既に他の伝票に照合されています
 DocType: Item,Moving Average,移動平均
 DocType: BOM Replace Tool,The BOM which will be replaced,交換される部品表
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,新しい在庫単位は現在の在庫単位とは異なる必要があります
 DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,休暇は0.5の倍数で割り当てられなければなりません
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,休暇は0.5の倍数で割り当てられなければなりません
 DocType: Production Order,Operation Cost,作業費用
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,CSVファイルで出勤アップロード
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,未払額
@@ -3197,7 +3212,6 @@ DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[日]より古い在庫を凍結
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","上記の条件内に二つ以上の価格設定ルールがある場合、優先順位が適用されます。
 優先度は0〜20の間の数で、デフォルト値はゼロ（空白）です。同じ条件で複数の価格設定ルールがある場合、大きい数字が優先されることになります。"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,対請求書
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,会計年度：{0}は存在しません
 DocType: Currency Exchange,To Currency,通貨
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,次のユーザーが休暇期間申請を承認することを許可
@@ -3226,7 +3240,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),割
 DocType: Stock Entry Detail,Additional Cost,追加費用
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,会計年度終了日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",伝票でグループ化されている場合、伝票番号でフィルタリングすることはできません。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,サプライヤ見積を作成
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,サプライヤ見積を作成
 DocType: Quality Inspection,Incoming,収入
 DocType: BOM,Materials Required (Exploded),資材が必要です（展開）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),無給休暇（LWP）の所得減
@@ -3234,10 +3248,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：シリアル番号 {1} が {2} {3}と一致しません
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,臨時休暇
 DocType: Batch,Batch ID,バッチID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},注：{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},注：{0}
 ,Delivery Note Trends,納品書の動向
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,今週のまとめ
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}の{0}は仕入または下請アイテムでなければなりません
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}の{0}は仕入または下請アイテムでなければなりません
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,アカウント：{0}のみ株式取引を介して更新することができます
 DocType: GL Entry,Party,当事者
 DocType: Sales Order,Delivery Date,納期
@@ -3250,7 +3264,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均購入レート
 DocType: Task,Actual Time (in Hours),実際の時間（時）
 DocType: Employee,History In Company,会社での履歴
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,ニュースレター
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,ニュースレター
 DocType: Address,Shipping,出荷
 DocType: Stock Ledger Entry,Stock Ledger Entry,在庫元帳エントリー
 DocType: Department,Leave Block List,休暇リスト
@@ -3269,7 +3283,7 @@ DocType: Account,Auditor,監査人
 DocType: Purchase Order,End date of current order's period,現在の注文の期間の終了日
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,雇用契約書を作成
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,返品
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,バリエーションのデフォルトの数量単位はテンプレートと同じでなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,バリエーションのデフォルトの数量単位はテンプレートと同じでなければなりません
 DocType: DocField,Fold,フォールド
 DocType: Production Order Operation,Production Order Operation,製造指示作業
 DocType: Pricing Rule,Disable,無効にする
@@ -3301,7 +3315,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,レポート先
 DocType: SMS Settings,Enter url parameter for receiver nos,受信者番号にURLパラメータを入力してください
 DocType: Sales Invoice,Paid Amount,支払金額
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',決算{0}はタイプ「負債」でなければなりません
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',決算{0}はタイプ「負債」でなければなりません
 ,Available Stock for Packing Items,梱包可能な在庫
 DocType: Item Variant,Item Variant,アイテムバリエーション
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,他にデフォルトがないので、このアドレステンプレートをデフォルトとして設定します
@@ -3309,7 +3323,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,顧客に基づくフィルター
 DocType: Payment Tool Detail,Against Voucher No,対伝票番号
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},アイテム{0}の数量を入力してください
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},アイテム{0}の数量を入力してください
 DocType: Employee External Work History,Employee External Work History,従業員の職歴
 DocType: Tax Rule,Purchase,仕入
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,残高数量
@@ -3346,28 +3360,29 @@ Note: BOM = Bill of Materials",「アイテム」をグループ化して別の
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},アイテム{0}にはシリアル番号が必須です
 DocType: Item Variant Attribute,Attribute,属性
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,範囲の開始／終了を指定してください
-sites/assets/js/desk.min.js +7652,Created By,によって作成された
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,によって作成された
 DocType: Serial No,Under AMC,AMC（年間保守契約）下
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,アイテムの評価額は陸揚費用の伝票額を考慮して再計算されています
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,販売取引のデフォルト設定
 DocType: BOM Replace Tool,Current BOM,現在の部品表
-sites/assets/js/erpnext.min.js +8,Add Serial No,シリアル番号を追加
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,シリアル番号を追加
 DocType: Production Order,Warehouses,倉庫
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,印刷と固定化
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,グループノード
 DocType: Payment Reconciliation,Minimum Amount,最低額
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,完成品更新
 DocType: Workstation,per hour,毎時
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},シリーズは、{0}はすでに{1}で使用されています
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},シリーズは、{0}はすでに{1}で使用されています
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,倉庫（継続記録）のアカウントは、このアカウントの下に作成されます。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,在庫元帳にエントリーが存在する倉庫を削除することはできません。
 DocType: Company,Distribution,配布
-sites/assets/js/erpnext.min.js +50,Amount Paid,支払額
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,支払額
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,プロジェクトマネージャー
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,発送
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,アイテムの許可最大割引：{0}が{1}％
 DocType: Customer,Default Taxes and Charges,デフォルト租税公課
 DocType: Account,Receivable,売掛金
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：注文がすでに存在しているとして、サプライヤーを変更することはできません
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,設定された与信限度額を超えた取引を提出することが許可されている役割
 DocType: Sales Invoice,Supplier Reference,サプライヤーリファレンス
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",チェックすると、部分組立品アイテムの「部品表」に原材料が組み込まれます。そうでなければ、全ての部分組立品アイテムが原材料として扱われます。
@@ -3404,8 +3419,8 @@ DocType: Email Digest,Add/Remove Recipients,受信者の追加／削除
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},停止された製造指示{0}に対しては取引が許可されていません
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",この会計年度をデフォルト値に設定するには、「デフォルトに設定」をクリックしてください
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),サポートメールを受信するサーバのメールIDをセットアップします。 （例 support@example.com）
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,不足数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
 DocType: Salary Slip,Salary Slip,給料明細
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,バニシング加工
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,「終了日」が必要です
@@ -3418,6 +3433,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",チェックされた取引を「送信済」にすると、取引に関連付けられた「連絡先」あてのメールが、添付ファイル付きで、画面にポップアップします。ユーザーはメールを送信するか、キャンセルするかを選ぶことが出来ます。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,共通設定
 DocType: Employee Education,Employee Education,従業員教育
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
 DocType: Salary Slip,Net Pay,給与総計
 DocType: Account,Account,アカウント
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,シリアル番号{0}はすでに受領されています
@@ -3450,7 +3466,7 @@ DocType: BOM,Manufacturing User,製造ユーザー
 DocType: Purchase Order,Raw Materials Supplied,原材料供給
 DocType: Purchase Invoice,Recurring Print Format,繰り返し用印刷フォーマット
 DocType: Communication,Series,シリーズ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,納品予定日は発注日より前にすることはできません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,納品予定日は発注日より前にすることはできません
 DocType: Appraisal,Appraisal Template,査定テンプレート
 DocType: Communication,Email,メール
 DocType: Item Group,Item Classification,アイテム分類
@@ -3506,6 +3522,7 @@ DocType: HR Settings,Payroll Settings,給与計算の設定
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,リンクされていない請求書と支払を照合
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,注文する
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ルートには親コストセンターを指定できません
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ブランドを選択してください...
 DocType: Sales Invoice,C-Form Applicable,C-フォーム適用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
 DocType: Supplier,Address and Contacts,住所・連絡先
@@ -3516,7 +3533,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,未払伝票を取得
 DocType: Warranty Claim,Resolved By,課題解決者
 DocType: Appraisal,Start Date,開始日
-sites/assets/js/desk.min.js +7629,Value,値
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,値
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,期間に休暇を割り当てる。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,クリックして認証
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,アカウント{0}：自身を親アカウントに割当することはできません
@@ -3532,14 +3549,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropboxのアクセス許可
 DocType: Dropbox Backup,Weekly,毎週
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例「smsgateway.com/api/send_sms.cgi」
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,受信
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,受信
 DocType: Maintenance Visit,Fully Completed,全て完了
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完了
 DocType: Employee,Educational Qualification,学歴
 DocType: Workstation,Operating Costs,営業費用
 DocType: Employee Leave Approver,Employee Leave Approver,従業員休暇承認者
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} はニュースレターのリストに正常に追加されました
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,電子ビーム加工
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,仕入マスターマネージャー
@@ -3552,7 +3569,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc文書型
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,価格の追加/編集
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,コストセンターの表
 ,Requested Items To Be Ordered,発注予定の要求アイテム
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,自分の注文
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,自分の注文
 DocType: Price List,Price List Name,価格表名称
 DocType: Time Log,For Manufacturing,製造用
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,合計
@@ -3563,7 +3580,7 @@ DocType: Account,Income,収入
 DocType: Industry Type,Industry Type,業種タイプ
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,問題発生！
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：休暇申請に次の期間が含まれています。
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完了日
 DocType: Purchase Invoice Item,Amount (Company Currency),額（会社通貨）
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ダイカスト
@@ -3577,10 +3594,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,年
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,POSプロフィール
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMSの設定を更新してください
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,時間ログ{0}は請求済です
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,時間ログ{0}は請求済です
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,無担保ローン
 DocType: Cost Center,Cost Center Name,コストセンター名
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,シリアル番号{1}のアイテム{0}はすでに設置されています
 DocType: Maintenance Schedule Detail,Scheduled Date,スケジュール日付
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,支出額合計
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160文字を超えるメッセージは複数のメッセージに分割されます
@@ -3588,10 +3604,10 @@ DocType: Purchase Receipt Item,Received and Accepted,受領・承認済
 ,Serial No Service Contract Expiry,シリアル番号（サービス契約の有効期限）
 DocType: Item,Unit of Measure Conversion,数量単位変換
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,従業員を変更することはできません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
 DocType: Naming Series,Help HTML,HTMLヘルプ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},割り当てられた重みづけの合計は100％でなければなりません。{0}になっています。
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},{0}以上の引当金は、アイテム {1}と相殺されています
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0}以上の引当金は、アイテム {1}と相殺されています
 DocType: Address,Name of person or organization that this address belongs to.,このアドレスが所属する個人または組織の名前。
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,サプライヤー
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
@@ -3602,10 +3618,11 @@ DocType: Lead,Converted,変換済
 DocType: Item,Has Serial No,シリアル番号あり
 DocType: Employee,Date of Issue,発行日
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}： {1}のための{0}から
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},行＃{0}：項目の設定サプライヤー{1}
 DocType: Issue,Content Type,コンテンツタイプ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,コンピュータ
 DocType: Item,List this Item in multiple groups on the website.,ウェブサイト上の複数のグループでこのアイテムを一覧表示します。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,アイテム：{0}はシステムに存在しません
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
 DocType: Payment Reconciliation,Get Unreconciled Entries,未照合のエントリーを取得
@@ -3616,14 +3633,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,倉庫
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},アカウント{0}は会計年度の{1}を複数回入力されました
 ,Average Commission Rate,平均手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,出勤は将来の日付にマークを付けることができません
 DocType: Pricing Rule,Pricing Rule Help,価格設定ルールヘルプ
 DocType: Purchase Taxes and Charges,Account Head,勘定科目
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,アイテムの陸揚費用を計算するために、追加の費用を更新してください
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,電気
 DocType: Stock Entry,Total Value Difference (Out - In),価値差違合計（出 - 入）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,行{0}：為替レートは必須です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,行{0}：為替レートは必須です
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},従業員{0}のユーザーIDが未設定です。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,ピーニング
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,保証請求元
@@ -3637,15 +3654,17 @@ DocType: Buying Settings,Naming Series,シリーズ名を付ける
 DocType: Leave Block List,Leave Block List Name,休暇リスト名
 DocType: User,Enabled,有効
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,在庫資産
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},{0}年{1}の月のすべての給与伝票を登録しますか？
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},{0}年{1}の月のすべての給与伝票を登録しますか？
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,登録者インポート
 DocType: Target Detail,Target Qty,ターゲット数量
 DocType: Attendance,Present,出勤
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,納品書{0}は提出済にすることはできません
 DocType: Notification Control,Sales Invoice Message,請求書メッセージ
 DocType: Authorization Rule,Based On,参照元
-,Ordered Qty,注文数
+DocType: Sales Order Item,Ordered Qty,注文数
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,項目{0}が無効になっています
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},からと期間、繰り返しのために必須の日付までの期間{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,プロジェクト活動／タスク
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,給与明細を生成
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0}は有効なメールアドレスではありません
@@ -3686,7 +3705,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,出勤アップロード
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,部品表と生産数量が必要です
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,エイジングレンジ２
-DocType: Journal Entry Account,Amount,額
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,額
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,リベット
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,部品表交換
 ,Sales Analytics,販売分析
@@ -3713,7 +3732,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,予定日は資材要求日の前にすることはできません
 DocType: Contact Us Settings,City,都市
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,超音波加工
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,エラー：有効なIDではない？
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,エラー：有効なIDではない？
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,アイテム{0}は販売アイテムでなければなりません
 DocType: Naming Series,Update Series Number,シリーズ番号更新
 DocType: Account,Equity,株式
@@ -3728,7 +3747,7 @@ DocType: Purchase Taxes and Charges,Actual,実際
 DocType: Authorization Rule,Customerwise Discount,顧客ごと割引
 DocType: Purchase Invoice,Against Expense Account,対経費
 DocType: Production Order,Production Order,製造指示
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
 DocType: Quotation Item,Against Docname,文書名に対して
 DocType: SMS Center,All Employee (Active),全ての従業員（アクティブ）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,"表示
@@ -3737,14 +3756,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,原材料費
 DocType: Item,Re-Order Level,再注文レベル
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,製造指示を出すまたは分析用に原材料をダウンロードするための、アイテムと計画数を入力してください。
-sites/assets/js/list.min.js +174,Gantt Chart,ガントチャート
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,ガントチャート
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,パートタイム
 DocType: Employee,Applicable Holiday List,適切な休日リスト
 DocType: Employee,Cheque,小切手
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,シリーズ更新
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,レポートタイプは必須です
 DocType: Item,Serial Number Series,シリアル番号シリーズ
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},列{1}の在庫アイテム{0}には倉庫が必須です。
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},列{1}の在庫アイテム{0}には倉庫が必須です。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,小売・卸売
 DocType: Issue,First Responded On,初回返答
 DocType: Website Item Group,Cross Listing of Item in multiple groups,複数のグループのアイテムのクロスリスト
@@ -3759,7 +3778,7 @@ DocType: Attendance,Attendance,出勤
 DocType: Page,No,いいえ
 DocType: BOM,Materials,資材
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",チェックされていない場合、リストを適用先の各カテゴリーに追加しなくてはなりません
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,転記日時は必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,転記日時は必須です
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,購入取引用の税のテンプレート
 ,Item Prices,アイテム価格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,発注を保存すると表示される表記内。
@@ -3779,9 +3798,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,一般管理費
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,コンサルティング
 DocType: Customer Group,Parent Customer Group,親顧客グループ
-sites/assets/js/erpnext.min.js +50,Change,変更
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,変更
 DocType: Purchase Invoice,Contact Email,連絡先 メール
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',発注{0}は「停止」になっています
 DocType: Appraisal Goal,Score Earned,スコア獲得
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",例「マイカンパニーLLC」
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,通知期間
@@ -3791,12 +3809,13 @@ DocType: Packing Slip,Gross Weight UOM,総重量数量単位
 DocType: Email Digest,Receivables / Payables,売掛／買掛
 DocType: Delivery Note Item,Against Sales Invoice,対納品書
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,スタンピング成形
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,信用取引
 DocType: Landed Cost Item,Landed Cost Item,輸入費用項目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,ゼロ値を表示
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,与えられた原材料の数量から製造／再梱包した後に得られたアイテムの数量
 DocType: Payment Reconciliation,Receivable / Payable Account,売掛金／買掛金
 DocType: Delivery Note Item,Against Sales Order Item,対受注アイテム
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
 DocType: Item,Default Warehouse,デフォルト倉庫
 DocType: Task,Actual End Date (via Time Logs),実際の終了日（時間ログ経由）
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},グループアカウント{0}に対して予算を割り当てることができません
@@ -3810,7 +3829,7 @@ DocType: Issue,Support Team,サポートチーム
 DocType: Appraisal,Total Score (Out of 5),総得点（5点満点）
 DocType: Contact Us Settings,State,状態
 DocType: Batch,Batch,バッチ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,残高
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,残高
 DocType: Project,Total Expense Claim (via Expense Claims),総経費請求（経費請求経由）
 DocType: User,Gender,性別
 DocType: Journal Entry,Debit Note,借方票
@@ -3826,9 +3845,8 @@ DocType: Lead,Blog Subscriber,ブログ購読者
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,値に基づいて取引を制限するルールを作成
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",チェックした場合、営業日数は全て祝日を含みますが、これにより1日あたりの給与の値は小さくなります
 DocType: Purchase Invoice,Total Advance,前払金計
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,資材要求停止解除
 DocType: Workflow State,User,ユーザー
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,給与計算
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,給与計算
 DocType: Opportunity Item,Basic Rate,基本料金
 DocType: GL Entry,Credit Amount,貸方金額
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,失注として設定
@@ -3836,7 +3854,7 @@ DocType: Customer,Credit Days Based On,与信日数基準
 DocType: Tax Rule,Tax Rule,税ルール
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,販売サイクル全体で同じレートを維持
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ワークステーションの労働時間外のタイムログを計画します。
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1}は提出済です
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}は提出済です
 ,Items To Be Requested,要求されるアイテム
 DocType: Purchase Order,Get Last Purchase Rate,最新の購入料金を取得
 DocType: Time Log,Billing Rate based on Activity Type (per hour),行動タイプ（毎時）に基づく請求単価
@@ -3845,6 +3863,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",会社メールアドレスが見つかなかったため、送信されませんでした。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),資金運用（資産）
 DocType: Production Planning Tool,Filter based on item,項目に基づくフィルター
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,デビットアカウント
 DocType: Fiscal Year,Year Start Date,年始日
 DocType: Attendance,Employee Name,従業員名
 DocType: Sales Invoice,Rounded Total (Company Currency),合計（四捨五入）（会社通貨）
@@ -3856,14 +3875,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,剪断
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,従業員給付
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
 DocType: Production Order,Manufactured Qty,製造数量
 DocType: Purchase Receipt Item,Accepted Quantity,受入数
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}は存在しません
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,顧客あて請求
 DocType: DocField,Default,初期値
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,プロジェクトID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}：経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}：経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}登録者追加済
 DocType: Maintenance Schedule,Schedule,スケジュール
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",このコストセンターの予算を定義します。予算のアクションを設定するには、「会社リスト」を参照してください
@@ -3871,7 +3890,7 @@ DocType: Account,Parent Account,親勘定
 DocType: Quality Inspection Reading,Reading 3,報告要素3
 ,Hub,ハブ
 DocType: GL Entry,Voucher Type,伝票タイプ
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,価格表が見つからないか無効になっています
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,価格表が見つからないか無効になっています
 DocType: Expense Claim,Approved,承認済
 DocType: Pricing Rule,Price,価格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
@@ -3880,23 +3899,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,キャンペーンの命名により、
 DocType: Employee,Current Address Is,現住所は：
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",オプション。指定されていない場合は、会社のデフォルト通貨を設定します。
 DocType: Address,Office,事務所
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,標準レポート
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会計仕訳
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,先に従業員レコードを選択してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：当事者／アカウントが {3} {4} の {1} / {2}と一致しません
+DocType: Delivery Note Item,Available Qty at From Warehouse,倉庫からの利用可能な数量
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,先に従業員レコードを選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：当事者／アカウントが {3} {4} の {1} / {2}と一致しません
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,税勘定を作成
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,経費勘定を入力してください
 DocType: Account,Stock,在庫
 DocType: Employee,Current Address,現住所
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",アイテムが別のアイテムのバリエーションである場合には、明示的に指定しない限り、その後の説明、画像、価格、税金などはテンプレートから設定されます
 DocType: Serial No,Purchase / Manufacture Details,仕入／製造の詳細
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,バッチ目録
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,バッチ目録
 DocType: Employee,Contract End Date,契約終了日
 DocType: Sales Order,Track this Sales Order against any Project,任意のプロジェクトに対して、この受注を追跡します
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,上記の基準に基づいて（配送するために保留中の）受注を取り込む
 DocType: DocShare,Document Type,文書タイプ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,サプライヤー見積から
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,サプライヤー見積から
 DocType: Deduction Type,Deduction Type,控除の種類
 DocType: Attendance,Half Day,半日
 DocType: Pricing Rule,Min Qty,最小数量
@@ -3907,20 +3928,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,数量（製造数量）が必須です
 DocType: Stock Entry,Default Target Warehouse,デフォルト入庫先倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),差引計（会社通貨）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：当事者タイプと当事者は売掛金／買掛金勘定に対してのみ適用されます
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：当事者タイプと当事者は売掛金／買掛金勘定に対してのみ適用されます
 DocType: Notification Control,Purchase Receipt Message,領収書のメッセージ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,総割り当てられた葉は期間以上あります
 DocType: Production Order,Actual Start Date,実際の開始日
 DocType: Sales Order,% of materials delivered against this Sales Order,％の資材が納品済（この受注を対象）
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,レコードアイテムの移動
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,レコードアイテムの移動
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,ニュースレターリスト購読者
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,ホゾ穴加工
 DocType: Email Account,Service,サービス
 DocType: Hub Settings,Hub Settings,ハブの設定
 DocType: Project,Gross Margin %,粗利益率％
 DocType: BOM,With Operations,操作で
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会計エントリは、すでに同社{1}の通貨{0}で行われています。通貨{0}と債権又は債務のアカウントを選択してください。
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会計エントリは、すでに同社{1}の通貨{0}で行われています。通貨{0}と債権又は債務のアカウントを選択してください。
 ,Monthly Salary Register,月給登録
-apps/frappe/frappe/website/template.py +123,Next,次
+apps/frappe/frappe/website/template.py +140,Next,次
 DocType: Warranty Claim,If different than customer address,顧客の住所と異なる場合
 DocType: BOM Operation,BOM Operation,部品表の操作
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,電解研磨
@@ -3951,6 +3973,7 @@ DocType: Purchase Invoice,Next Date,次の日
 DocType: Employee Education,Major/Optional Subjects,大手/オプション科目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,租税公課を入力してください
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,機械加工
+DocType: Sales Invoice Item,Drop Ship,ドロップシップ
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",ここでは、親、配偶者や子供の名前と職業などの家族の詳細を保持することができます
 DocType: Hub Settings,Seller Name,販売者名
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),租税公課控除（会社通貨）
@@ -3977,29 +4000,29 @@ DocType: Purchase Order,To Receive and Bill,受領・請求する
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,デザイナー
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,規約のテンプレート
 DocType: Serial No,Delivery Details,納品詳細
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
 DocType: Item,Automatically create Material Request if quantity falls below this level,量がこのレベルを下回った場合、自動的に資材要求を作成します
 ,Item-wise Purchase Register,アイテムごとの仕入登録
 DocType: Batch,Expiry Date,有効期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",再注文のレベルを設定するには、アイテムは、購買アイテムや製造項目でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",再注文のレベルを設定するには、アイテムは、購買アイテムや製造項目でなければなりません
 ,Supplier Addresses and Contacts,サプライヤー住所・連絡先
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,カテゴリを選択してください
 apps/erpnext/erpnext/config/projects.py +18,Project master.,プロジェクトマスター
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,次の通貨に$などのような任意のシンボルを表示しません。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),（半日）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),（半日）
 DocType: Supplier,Credit Days,信用日数
 DocType: Leave Type,Is Carry Forward,繰越済
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,部品表からアイテムを取得
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,部品表からアイテムを取得
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,リードタイム日数
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,部品表
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：当事者タイプと当事者が売掛金／買掛金勘定 {1} に必要です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：当事者タイプと当事者が売掛金／買掛金勘定 {1} に必要です
 DocType: Dropbox Backup,Send Notifications To,通知送信先
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,参照日付
 DocType: Employee,Reason for Leaving,退職理由
 DocType: Expense Claim Detail,Sanctioned Amount,承認予算額
 DocType: GL Entry,Is Opening,オープン
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},行{0}：借方エントリは{1}とリンクすることができません
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,アカウント{0}は存在しません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}：借方エントリは{1}とリンクすることができません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,アカウント{0}は存在しません
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,ウェブサイトや他の出版物のための略歴
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},従業員{0}の給与構造を作成してください
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index 6701d7280e..fefe8ce22e 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,របៀប​ប្រាក់​បៀវត្ស
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","ជ្រើស​ចែកចាយ​ប្រចាំខែ​, ប្រសិន​បើ​អ្នក​ចង់​តាមដាន​ដោយ​ផ្អែក​លើ​រដូវ​កាល​។"
 DocType: Employee,Divorced,លែងលះ​គ្នា
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,ព្រមាន & ‧​;​: ធាតុ​ដូចគ្នា​ត្រូវ​បាន​បញ្ចូល​ច្រើន​ដង​។
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,ព្រមាន & ‧​;​: ធាតុ​ដូចគ្នា​ត្រូវ​បាន​បញ្ចូល​ច្រើន​ដង​។
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ធាតុ​ដែល​បាន​ធ្វើ​សម​កាល​កម្ម​រួច​ទៅ​ហើយ
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,អនុញ្ញាត​ឱ្យ​ធាតុ​នឹង​ត្រូវ​បាន​បន្ថែម​ជា​ច្រើន​ដង​នៅ​ក្នុង​ប្រតិ​ប​ត្តិ​ការ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,ផលិតផល​ទំនិញ​ប្រើ​ប្រាស់
@@ -20,7 +20,8 @@ DocType: POS Profile,Applicable for User,អាច​ប្រើប្រាស
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់​ការ​បញ្ជា​ទិញ​ផលិត​ផល​ដែល​មិន​អាច​ត្រូវ​បាន​លុបចោល​ឮ​វា​ជា​លើក​ដំបូង​ដើម្បី​បោះបង់
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,បង្រួម​បូក sintering
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* នឹង​ត្រូវ​បាន​គណនា​ក្នុង​ប្រតិបត្តិការ​នេះ​។
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,ពី​សម្ភារៈ​ស្នើ​សុំ
+DocType: Purchase Order,Customer Contact,ទំនាក់ទំនង​អតិថិជន
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ពី​សម្ភារៈ​ស្នើ​សុំ
 DocType: Job Applicant,Job Applicant,ការងារ​ដែល​អ្នក​ដាក់ពាក្យសុំ
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,មិន​មាន​លទ្ធផល​ជា​ច្រើន​ទៀត​។
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,ផ្នែក​ច្បាប់
@@ -42,8 +43,7 @@ DocType: Item Price,Multiple Item prices.,តម្លៃ​ធាតុ​ជ
 DocType: SMS Center,All Supplier Contact,ទាំងអស់​ផ្គត់ផ្គង់​ទំនាក់ទំនង
 DocType: Quality Inspection Reading,Parameter,ប៉ារ៉ាម៉ែត្រ
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,គេ​រំពឹង​ថា​នឹង​កាលបរិច្ឆេទ​បញ្ចប់​មិន​អាច​តិច​ជាង​ការ​រំពឹង​ទុក​ការ​ចាប់​ផ្តើ​ម​កាល​បរិច្ឆេទ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,តើ​ពិត​ជា​ចង់​ឮ​ការ​បញ្ជាទិញ​ផលិត​:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,ចាកចេញ​កម្មវិធី​ថ្មី
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,ចាកចេញ​កម្មវិធី​ថ្មី
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,សេចក្តី​ព្រាង​ធនាគារ
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. ដើម្បី​រក្សា​អតិថិជន​លេខ​កូដ​ធាតុ​ដែល​មាន​ប្រាជ្ញា​និង​ដើម្បី​ធ្វើ​ឱ្យ​ពួកគេ​អាច​ស្វែងរក​ដោយ​ផ្អែក​លើ​ការ​ប្រើ​ប្រាស់​កូដ​របស់​ពួក​គេ​ជម្រើស​នេះ
 DocType: Mode of Payment Account,Mode of Payment Account,របៀប​នៃ​ការ​ទូទាត់​គណនី
@@ -51,21 +51,21 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,បង្ហ
 DocType: Sales Invoice Item,Quantity,បរិមាណ​ដែល​ត្រូវ​ទទួលទាន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ការ​ផ្តល់​ប្រាក់​កម្ចី (បំណុល​)
 DocType: Employee Education,Year of Passing,ឆ្នាំ Pass
-sites/assets/js/erpnext.min.js +27,In Stock,នៅ​ក្នុង​ផ្សារ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,ត្រឹម​តែ​អាច​ធ្វើ​ឱ្យ​ការ​ទូទាត់​នឹង​ដីកា​សម្រេច​លក់ unbilled
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,នៅ​ក្នុង​ផ្សារ
 DocType: Designation,Designation,ការ​រចនា
 DocType: Production Plan Item,Production Plan Item,ផលិតកម្ម​ធាតុ​ផែនការ
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,ទម្រង់​ម៉ាស៊ីន​ឆូត​កាត​ថ្មី​បាន​ធ្វើ​ឱ្យ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,ការថែទាំ​សុខភាព
 DocType: Purchase Invoice,Monthly,ប្រចាំខែ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,វិ​ក័​យ​ប័ត្រ
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ព​ន្យា​ពេល​ក្នុង​ការ​ទូទាត់ (ថ្ងៃ​)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,វិ​ក័​យ​ប័ត្រ
 DocType: Maintenance Schedule Item,Periodicity,រយៈ​ពេល
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,អាសយដ្ឋាន​អ៊ី​ម៉ែ​ល
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ការពារ​ជាតិ
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ពិន្ទុ (0-5​)
 DocType: Delivery Note,Vehicle No,គ្មាន​យានយន្ត
-sites/assets/js/erpnext.min.js +55,Please select Price List,សូម​ជ្រើស​តារាងតម្លៃ
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,សូម​ជ្រើស​តារាងតម្លៃ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,woodworking
 DocType: Production Order Operation,Work In Progress,ការងារ​ក្នុង​វឌ្ឍនភាព
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,ការ​បោះពុម្ព 3D
@@ -86,12 +86,13 @@ DocType: Packed Item,Parent Detail docname,ព​ត៌​មាន​លំអ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,គីឡូក្រាម
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,បើក​សម្រាប់​ការងារ​។
 DocType: Item Attribute,Increment,ចំនួន​បន្ថែម
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ជ្រើស​ឃ្លាំង ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,ការ​ផ្សព្វផ្សាយ​ពាណិជ្ជកម្ម
 DocType: Employee,Married,រៀបការ​ជាមួយ
 DocType: Payment Reconciliation,Reconcile,សម្រប​សម្រួល
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,គ្រឿងទេស
 DocType: Quality Inspection Reading,Reading 1,ការ​អាន​ទី 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,ធ្វើ​ឱ្យ​ធាតុ​របស់​ធនាគារ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ធ្វើ​ឱ្យ​ធាតុ​របស់​ធនាគារ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,មូលនិធិ​សោធន​និវត្តន៍
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,ឃ្លាំង​គឺ​ជា​ចាំបាច់​បើ​សិន​ជា​ប្រភេទ​គណនី​គឺ​ឃ្លាំង
 DocType: SMS Center,All Sales Person,ការ​លក់​របស់​បុគ្គល​ទាំង​អស់
@@ -112,7 +113,7 @@ DocType: Blog Post,Guest,អ្នកទស្សនា
 DocType: Quality Inspection,Get Specification Details,ទទួល​បាន​ព័ត៌មាន​លម្អិត​ជាក់លាក់
 DocType: Lead,Interested,មាន​ការ​ចាប់​អារម្មណ៍
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,វិ​ក័​យ​ប័ត្រ​នៃ​សម្ភារៈ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,ពិធី​បើក
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,ពិធី​បើក
 DocType: Item,Copy From Item Group,ការ​ចម្លង​ពី​ធាតុ​គ្រុប
 DocType: Journal Entry,Opening Entry,ការ​បើក​ចូល
 DocType: Stock Entry,Additional Costs,ការ​ចំណាយ​បន្ថែម​ទៀត
@@ -120,7 +121,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,ផលិតផល​សំណួរ
 DocType: Standard Reply,Owner,ម្ចាស់
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,សូម​បញ្ចូល​ក្រុមហ៊ុន​ដំបូង
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,សូម​ជ្រើសរើស​ក្រុមហ៊ុន​ដំបូង
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,សូម​ជ្រើសរើស​ក្រុមហ៊ុន​ដំបូង
 DocType: Employee Education,Under Graduate,នៅ​ក្រោម​បញ្ចប់​ការ​សិក្សា
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,គោល​ដៅ​នៅ​លើ
 DocType: BOM,Total Cost,ការ​ចំណាយ​សរុប
@@ -137,6 +138,7 @@ DocType: Naming Series,Prefix,បុព្វបទ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,អ្នក​ប្រើ​ប្រាស់
 DocType: Upload Attendance,Import Log,នាំចូល​ចូល
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ផ្ញើ
+DocType: Sales Invoice Item,Delivered By Supplier,បាន​បញ្ជូន​ដោយ​អ្នក​ផ្គត់​ផ្គង់
 DocType: SMS Center,All Contact,ទំនាក់ទំនង​ទាំងអស់
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,ប្រាក់បៀវត្ស​ប្រចាំឆ្នាំ​ប្រាក់
 DocType: Period Closing Voucher,Closing Fiscal Year,បិទ​ឆ្នាំ​សារពើពន្ធ
@@ -172,9 +174,8 @@ DocType: SMS Settings,Enter url parameter for message,បញ្ចូល​ប
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,ក្បួន​សម្រាប់​ការ​ដាក់​ពាក្យ​សុំ​ការ​កំណត់​តម្លៃ​និង​ការ​បញ្ចុះ​តម្លៃ​។
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,បញ្ជី​តម្លៃ​ត្រូវ​តែ​មាន​ការ​អនុវត្ត​សម្រាប់​ទិញ​ឬ​លក់
 DocType: Pricing Rule,Discount on Price List Rate (%),ការ​បញ្ចុះ​តំលៃ​លើ​តំលៃ​អត្រា​បញ្ជី (%​)
-sites/assets/js/form.min.js +279,Start,ការ​ចាប់​ផ្តើ​ម
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,ការ​ចាប់​ផ្តើ​ម
 DocType: User,First Name,ឈ្មោះ​ជា​លើក​ដំបូង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,ការ​រៀបចំ​របស់​អ្នក​ត្រូវ​បាន​បញ្ចប់​។ ស្រស់​។
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ការ​សម្ដែង​ពេញ​ផ្សិត
 DocType: Offer Letter,Select Terms and Conditions,ជ្រើស​លក្ខខណ្ឌ
 DocType: Production Planning Tool,Sales Orders,ការ​បញ្ជា​ទិញ​ការ​លក់
@@ -199,13 +200,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,ការ​ប្រឆាំង​នឹង​ការ​ធាតុ​លក់​វិ​ក័​យ​ប័ត្រ
 ,Production Orders in Progress,ការ​បញ្ជា​ទិញ​ផលិត​កម្ម​ក្នុង​វឌ្ឍនភាព
 DocType: Lead,Address & Contact,អាសយដ្ឋាន​ទំនាក់ទំនង
+DocType: Leave Allocation,Add unused leaves from previous allocations,បន្ថែម​ស្លឹក​ដែល​មិន​បាន​ប្រើ​ពី​ការ​បែង​ចែក​ពី​មុន
 DocType: Newsletter List,Total Subscribers,អតិថិជន​សរុប
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ឈ្មោះ​ទំនាក់ទំនង
 DocType: Production Plan Item,SO Pending Qty,សូ​ដែល​មិនទាន់​បាន Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,បង្កើត​ប័ណ្ណ​ប្រាក់​បៀវត្ស​ចំពោះ​លក្ខណៈ​វិនិច្ឆ័យ​ដែល​បាន​រៀបរាប់​ខាងលើ​។
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ស្នើ​សុំ​សម្រាប់​ការ​ទិញ​។
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,លំនៅ​ដ្ឋាន​បាន​កើន​ទ្វេ​រ​ដង
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,មាន​តែ​ការ​យល់​ព្រម​ចាកចេញ​ជ្រើស​អាច​ដាក់ពាក្យសុំ​ចាកចេញ​នេះ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,មាន​តែ​ការ​យល់​ព្រម​ចាកចេញ​ជ្រើស​អាច​ដាក់ពាក្យសុំ​ចាកចេញ​នេះ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,បន្ថយ​កាលបរិច្ឆេទ​ត្រូវ​តែ​ធំ​ជាង​កាលបរិច្ឆេទ​នៃ​ការ​ចូលរួម
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,ស្លឹក​មួយ​ឆ្នាំ
 DocType: Time Log,Will be updated when batched.,នឹង​ត្រូវ​បាន​បន្ថែម​ពេល batched ។
@@ -213,7 +215,7 @@ DocType: Bulk Email,Message,សារ​ស្វាគមន៍
 DocType: Item Website Specification,Item Website Specification,បញ្ជាក់​ធាតុ​គេហទំព័រ
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox គន្លឹះ​ចូល​ដំណើរ​ការ
 DocType: Payment Tool,Reference No,សេចក្តី​យោង​គ្មាន
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,ទុក​ឱ្យ​ទប់ស្កាត់
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ទុក​ឱ្យ​ទប់ស្កាត់
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,ប្រចាំ​ឆ្នាំ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុ​ភាគ​ហ៊ុន​ការផ្សះផ្សា
 DocType: Stock Entry,Sales Invoice No,ការ​លក់​វិ​ក័​យ​ប័ត្រ​គ្មាន
@@ -225,7 +227,7 @@ DocType: Item,Minimum Order Qty,អប្ប​រ​មា​លំដាប់
 DocType: Pricing Rule,Supplier Type,ប្រភេទ​ក្រុមហ៊ុន​ផ្គត់ផ្គង់
 DocType: Item,Publish in Hub,បោះ​ពុម្ព​ផ្សាយ​នៅ​ក្នុង​មជ្ឈមណ្ឌល
 ,Terretory,Terretory
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,សម្ភារៈ​ស្នើ​សុំ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,សម្ភារៈ​ស្នើ​សុំ
 DocType: Bank Reconciliation,Update Clearance Date,ធ្វើ​ឱ្យ​ទាន់​សម័យ​បោសសំអាត​កាលបរិច្ឆេទ
 DocType: Item,Purchase Details,ព​ត៌​មាន​លំអិត​ទិញ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ដុសធ្មេញ​ខ្សែ
@@ -263,10 +265,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,ញូ​ហ៊ុន UOM
 DocType: Period Closing Voucher,Closing Account Head,បិទ​នាយក​គណនី
 DocType: Employee,External Work History,ការងារ​ខាងក្រៅ​ប្រវត្តិ
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,កំហុស​ក្នុង​ការ​យោង​សារាចរ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,តើ​អ្នក​ពិត​ជា​ចង់​បញ្ឈប់
 DocType: Communication,Closed,បាន​បិទ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,នៅ​ក្នុង​ពាក្យ (នាំ​ចេញ​) នឹង​មើល​ឃើញ​នៅ​ពេល​ដែល​អ្នក​រក្សា​ទុក​ចំណាំ​ដឹកជញ្ជូន​ផង​ដែរ​។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,តើ​អ្នក​ពិត​ជា​ចង់​បញ្ឈប់
 DocType: Lead,Industry,វិស័យ​ឧស្សាហកម្ម
 DocType: Employee,Job Profile,ទម្រង់​ការងារ
 DocType: Newsletter,Newsletter,ព្រឹត្តិ​ប័ត្រ​ព័ត៌មាន
@@ -297,7 +297,7 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,អត្រា​ដែល​រូបិយវត្ថុ​របស់​អតិថិជន​ត្រូវ​បាន​បម្លែង​ទៅ​ជា​រូបិយប័ណ្ណ​មូលដ្ឋាន​របស់​អតិថិជន
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","ដែល​មាន​នៅ​ក្នុង Bom​, ដឹកជញ្ជូន​ចំណាំ​, ការ​ទិញ​វិ​ក័​យ​ប័ត្រ​, ការ​បញ្ជាទិញ​ផលិតផល​, ការ​ទិញ​លំដាប់​, ទទួល​ទិញ​, លក់​វិ​ក័​យ​ប័ត្រ​, ការ​លក់​លំដាប់​, ហ៊ុន​ធាតុ​, Timesheet"
 DocType: Item Tax,Tax Rate,អត្រា​អាករ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,ជ្រើស​ធាតុ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,ជ្រើស​ធាតុ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,បម្លែង​ទៅ​នឹង​ការ​មិន​គ្រុប
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ទទួល​ទិញ​ត្រូវតែ​ត្រូវ​បាន​ដាក់​ជូន
 DocType: Stock UOM Replace Utility,Current Stock UOM,នា​ពេល​បច្ចុប្បន្ន​ហ៊ុន UOM
@@ -348,6 +348,7 @@ DocType: Delivery Note,% Installed,% ដែល​បាន​ដំឡើង
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,សូម​បញ្ចូល​ឈ្មោះ​របស់​ក្រុមហ៊ុន​ដំបូង
 DocType: BOM,Item Desription,Desription ធាតុ
 DocType: Purchase Invoice,Supplier Name,ឈ្មោះ​ក្រុមហ៊ុន​ផ្គត់ផ្គង់
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,សូម​អាន​សៀវភៅ​ដៃ ERPNext
 DocType: Account,Is Group,គឺ​ជា​ក្រុម
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,កំណត់​សម្គាល់ Nos ដោយ​ស្វ័យប្រវត្តិ​ដោយ​ផ្អែកលើ FIFO & ‧​;
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ពិនិត្យ​ហាងទំនិញ​វិ​ក័​យ​ប័ត្រ​លេខ​ពិសេស
@@ -368,7 +369,7 @@ apps/erpnext/erpnext/config/hr.py +140,Holiday master.,ចៅហ្វាយ​
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ការអប់រំ​របស់​ក្រុមហ៊ុន Shell
 DocType: Material Request Item,Required Date,កាលបរិច្ឆេទ​ដែល​បាន​ទាមទារ
 DocType: Delivery Note,Billing Address,វិ​ក័​យ​ប័ត្រ​អាសយដ្ឋាន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,សូម​បញ្ចូល​លេខ​កូដ​ធាតុ​។
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,សូម​បញ្ចូល​លេខ​កូដ​ធាតុ​។
 DocType: BOM,Costing,ចំណាយ​ថវិកា​អស់
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",ប្រសិន​បើ​បាន​ធីក​ចំនួន​ប្រាក់​ពន្ធ​ដែល​នឹង​ត្រូវ​បាន​ចាត់​ទុក​ជា​បាន​រួម​បញ្ចូល​រួច​ហើយ​នៅ​ក្នុង​អត្រា​ការ​បោះពុម្ព / បោះពុម្ព​ចំនួន​ទឹកប្រាក់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,សរុប Qty
@@ -391,30 +392,29 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),ពេល​
 DocType: Customer,Buyer of Goods and Services.,អ្នក​ទិញ​ទំនិញ​និង​សេវាកម្ម​។
 DocType: Journal Entry,Accounts Payable,គណនី​ទូទាត់
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,បន្ថែម​អតិថិជន
-sites/assets/js/erpnext.min.js +5,""" does not exists",«​មិន​ដែល​មាន
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",«​មិន​ដែល​មាន
 DocType: Pricing Rule,Valid Upto,រីក​រាយ​ជាមួយ​នឹង​មាន​សុពលភាព
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,រាយ​មួយ​ចំនួន​នៃ​អតិថិជន​របស់​អ្នក​។ ពួក​គេ​អាច​ត្រូវ​បាន​អង្គការ​ឬ​បុគ្គល​។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,ប្រាក់​ចំណូល​ដោយ​ផ្ទាល់
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","មិន​អាច​ត្រង​ដោយ​ផ្អែក​លើ​គណនី​, ប្រសិន​បើ​ការ​ដាក់​ជា​ក្រុម​តាម​គណនី"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,ម​ន្រ្តី​រដ្ឋបាល
 DocType: Payment Tool,Received Or Paid,ទទួល​បាន​ការ​ឬ​បង់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,សូម​ជ្រើសរើស​ក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,សូម​ជ្រើសរើស​ក្រុមហ៊ុន
 DocType: Stock Entry,Difference Account,គណនី​មាន​ភាព​ខុស​គ្នា
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,សូម​បញ្ចូល​ឃ្លាំង​ដែល​សម្ភារៈ​ស្នើ​សុំ​នឹង​ត្រូវ​បាន​លើកឡើង
 DocType: Production Order,Additional Operating Cost,ចំណាយ​ប្រតិបត្តិការ​បន្ថែម
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
 DocType: DocField,Type,ប្រភេទ
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",រួម​បញ្ចូល​គ្នា​នោះ​មាន​លក្ខណៈ​សម្បត្តិ​ដូច​ខាង​ក្រោម​នេះ​ត្រូវ​ដូចគ្នា​សម្រាប់​ធាតុ​ទាំង​ពីរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",រួម​បញ្ចូល​គ្នា​នោះ​មាន​លក្ខណៈ​សម្បត្តិ​ដូច​ខាង​ក្រោម​នេះ​ត្រូវ​ដូចគ្នា​សម្រាប់​ធាតុ​ទាំង​ពីរ
 DocType: Communication,Subject,ប្រធានបទ
 DocType: Shipping Rule,Net Weight,ទំ​ង​ន់​សុទ្ធ
 DocType: Employee,Emergency Phone,ទូរស័ព្ទ​ស​ង្រ្គោះ​បន្ទាន់
 ,Serial No Warranty Expiry,គ្មាន​ផុតកំណត់​ការធានា​សៀរៀល
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,តើ​អ្នក​ពិត​ជា​ចង់​បញ្ឈប់​សម្ភារៈ​ស្នើ​សុំ​នេះ​ទេ​?
 DocType: Sales Order,To Deliver,ដើម្បី​រំដោះ
 DocType: Purchase Invoice Item,Item,ធាតុ
 DocType: Journal Entry,Difference (Dr - Cr),ភាព​ខុស​គ្នា (លោក​វេជ្ជបណ្ឌិត - Cr​)
 DocType: Account,Profit and Loss,ប្រាក់​ចំណេញ​និង​ការ​បាត់​បង់
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,ការ​គ្រប់គ្រង​អ្នកម៉ៅការ​បន្ត
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,ការ​គ្រប់គ្រង​អ្នកម៉ៅការ​បន្ត
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,ញូ UOM ត្រូវ​តែ​មិន​មាន​ប្រភេទ​លេខ​ទាំងមូល
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,គ្រឿង​សង្ហា​រឹម​និង​សម្ភារៈ
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,អត្រា​ដែល​តារាង​តំលៃ​រូបិយប័ណ្ណ​ត្រូវ​បម្លែង​ទៅ​ជា​រូបិយប័ណ្ណ​មូលដ្ឋាន​របស់​ក្រុមហ៊ុន
@@ -429,7 +429,7 @@ apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,បន្ថែម / កែសម្រួល​ពន្ធ​និង​ការ​ចោទ​ប្រកាន់
 DocType: Purchase Invoice,Supplier Invoice No,វិ​ក័​យ​ប័ត្រ​គ្មាន​ការ​ផ្គត់​ផ្គង់
 DocType: Territory,For reference,សម្រាប់​ជា​ឯកសារ​យោង
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),បិទ (Cr​)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),បិទ (Cr​)
 DocType: Serial No,Warranty Period (Days),រយៈពេល​ធានា (ថ្ងៃ​)
 DocType: Installation Note Item,Installation Note Item,ធាតុ​ចំណាំ​ការ​ដំឡើង
 ,Pending Qty,ដំ​ណើ Qty
@@ -459,8 +459,9 @@ DocType: Sales Order,Billing and Delivery Status,វិ​ក័​យ​ប័
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,អតិថិជន​ម្តង​ទៀត
 DocType: Leave Control Panel,Allocate,ការ​បម្រុង​ទុក
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,មុន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,ត្រឡប់​មក​វិញ​ការ​លក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,ត្រឡប់​មក​វិញ​ការ​លក់
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,ជ្រើស​ការ​បញ្ជា​ទិញ​លក់​ដែល​អ្នក​ចង់​បង្កើត​ការ​បញ្ជាទិញ​ផលិតកម្ម​។
+DocType: Item,Delivered by Supplier (Drop Ship),ថ្លែង​ដោយ​ហាងទំនិញ (ទម្លាក់​នាវា​)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,សមាសភាគ​ប្រាក់​បៀវត្ស​។
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,មូលដ្ឋាន​ទិន្នន័យ​របស់​អតិថិជន​សក្តា​នុ​ពល​។
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,មូលដ្ឋាន​ទិន្នន័យ​របស់​អតិថិជន​។
@@ -500,8 +501,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,អ្នក​ទទួល​ប៉ារ៉ាម៉ែត្រ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'ដោយ​ផ្អែក​លើ "និង​" ក្រុម​តាម​' មិន​អាច​ជា​ដូច​គ្នា
 DocType: Sales Person,Sales Person Targets,ការ​លក់​មនុស្ស​គោលដៅ
-sites/assets/js/form.min.js +271,To,ដើម្បី
-apps/frappe/frappe/templates/base.html +143,Please enter email address,សូម​បញ្ចូល​អាសយដ្ឋាន​អ៊ី​ម៉ែ​ល
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ដើម្បី
+apps/frappe/frappe/templates/base.html +145,Please enter email address,សូម​បញ្ចូល​អាសយដ្ឋាន​អ៊ី​ម៉ែ​ល
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,បំពង់​បញ្ចប់​ការ​បង្កើត
 DocType: Production Order Operation,In minutes,នៅ​ក្នុង​នាទី
 DocType: Issue,Resolution Date,ការ​ដោះស្រាយ​កាលបរិច្ឆេទ
@@ -522,9 +523,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,ការ​កំណត់
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ពន្ធ​ទូក​ចោទ​ប្រកាន់​ចំ​នាយ
 DocType: Production Order Operation,Actual Start Time,ជាក់​ស្តែ​ង​ពេលវេលា​ចាប់ផ្ដើម
 DocType: BOM Operation,Operation Time,ប្រតិ​ប​ត្ដិ​ការ​ពេល​វេលា
-sites/assets/js/list.min.js +5,More,ច្រើន​ទៀត
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,ច្រើន​ទៀត
 DocType: Pricing Rule,Sales Manager,ប្រធាន​ផ្នែក​លក់
-sites/assets/js/desk.min.js +7673,Rename,ប្តូ​រ​ឈ្មោះ
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,ប្តូ​រ​ឈ្មោះ
 DocType: Journal Entry,Write Off Amount,បិទ​ការ​សរសេរ​ចំនួន​ទឹកប្រាក់
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,ពត់​កោង
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,អនុញ្ញាត​ឱ្យ​អ្នក​ប្រើ
@@ -540,13 +541,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ត្រង់​កាត់
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,ដើម្បី​តាមដាន​ធាតុ​នៅ​ក្នុង​ការ​លក់​និង​ទិញ​ដោយ​ផ្អែក​លើ​ឯក​សារ​សម្គាល់​របស់​ពួក​គេ NOS ។ នេះ​ក៏​អាច​ត្រូវ​បាន​គេ​ប្រើ​ដើម្បី​តាមដាន​ព័ត៌មាន​លម្អិត​ធានា​នៃ​ផលិតផល​។
 DocType: Purchase Receipt Item Supplied,Current Stock,ហ៊ុន​នា​ពេល​បច្ចុប្បន្ន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,ឃ្លាំង​បាន​ច្រាន​ចោល​ការ​ប្រឆាំង​នឹង​ធាតុ​គឺ​ចាំបាច់ regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,ឃ្លាំង​បាន​ច្រាន​ចោល​ការ​ប្រឆាំង​នឹង​ធាតុ​គឺ​ចាំបាច់ regected
 DocType: Account,Expenses Included In Valuation,ការ​ចំណាយ​ដែល​បាន​រួម​បញ្ចូល​នៅ​ក្នុង​ការ​វាយតម្លៃ
 DocType: Employee,Provide email id registered in company,ផ្តល់​ជូន​នូវ​លេខ​សម្គាល់​នៅ​ក្នុង​ក្រុមហ៊ុន​អ៊ី​ម៉ែ​ល​ដែល​បាន​ចុះ​ឈ្មោះ
 DocType: Hub Settings,Seller City,ទីក្រុង​អ្នក​លក់
 DocType: Email Digest,Next email will be sent on:,អ៊ី​ម៉ែ​ល​បន្ទាប់​នឹង​ត្រូវ​បាន​ផ្ញើ​នៅ​លើ​:
 DocType: Offer Letter Term,Offer Letter Term,ផ្តល់​ជូន​នូវ​លិខិត​អាណត្តិ
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,ធាតុ​មាន​វ៉ា​រ្យ៉​ង់​។
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,ធាតុ​មាន​វ៉ា​រ្យ៉​ង់​។
 DocType: Bin,Stock Value,ភាគ​ហ៊ុន​តម្លៃ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ប្រភេទ​ដើម​ឈើ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,qty ប្រើ​ប្រាស់​ក្នុង​មួយ​ឯកតា
@@ -560,11 +561,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,សូម​ស្វា​គម​ន៏
 DocType: Journal Entry,Credit Card Entry,ចូល​កាត​ឥណទាន
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,ភារកិច្ច​ប្រធានបទ
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,ទំនិញ​ទទួល​បាន​ពី​ការ​ផ្គត់​ផ្គង់​។
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,ទំនិញ​ទទួល​បាន​ពី​ការ​ផ្គត់​ផ្គង់​។
 DocType: Communication,Open,បើក​ទូលាយ
 DocType: Lead,Campaign Name,ឈ្មោះ​យុទ្ធនាការ​ឃោសនា
 ,Reserved,បម្រុង​ទុក
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,តើ​អ្នក​ពិត​ជា​ចង់​ឮ
 DocType: Purchase Order,Supply Raw Materials,ផ្គត់ផ្គង់​សំភារៈ​ឆៅ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,កាលបរិច្ឆេទ​ដែល​វិ​ក័​យ​ប័ត្រ​ក្រោយ​នឹង​ត្រូវ​បាន​បង្កើត​។ វា​ត្រូវ​បាន​គេ​បង្កើត​នៅ​លើ​ការ​ដាក់​ស្នើ​។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ទ្រព្យ​នា​ពេល​បច្ចុប្បន្ន
@@ -579,7 +579,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,ការ​ទិញ​របស់​អតិថិជន​លំដាប់​គ្មាន
 DocType: Employee,Cell Number,លេខ​ទូរស័ព្ទ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ការ​បាត់​បង់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,អ្នក​មិន​អាច​បញ្ចូល​ទឹក​ប្រាក់​ក្នុង​ពេល​បច្ចុប្បន្ន​នៅ​ក្នុង​ការ​ប្រឆាំង​នឹង​ការ​ធាតុ​ទិនានុប្បវត្តិ "ជួរ​ឈរ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,អ្នក​មិន​អាច​បញ្ចូល​ទឹក​ប្រាក់​ក្នុង​ពេល​បច្ចុប្បន្ន​នៅ​ក្នុង​ការ​ប្រឆាំង​នឹង​ការ​ធាតុ​ទិនានុប្បវត្តិ "ជួរ​ឈរ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ថាមពល
 DocType: Opportunity,Opportunity From,ឱកាស​ការងារ​ពី
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,សេចក្តី​ថ្លែង​ការ​ប្រាក់​បៀវត្សរ៍​ប្រចាំ​ខែ​។
@@ -624,7 +624,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,សូម​បញ្ចូល​ធាតុ​ដំបូង
 DocType: Account,Liability,ការទទួលខុសត្រូវ
 DocType: Company,Default Cost of Goods Sold Account,តម្លៃ​លំនាំ​ដើម​នៃ​គណនី​ទំនិញ​លក់
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,បញ្ជី​តម្លៃ​ដែល​មិន​បាន​ជ្រើស
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,បញ្ជី​តម្លៃ​ដែល​មិន​បាន​ជ្រើស
 DocType: Employee,Family Background,ប្រវត្តិ​ក្រុម​គ្រួសារ
 DocType: Process Payroll,Send Email,ផ្ញើ​អ៊ីមែល
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,គ្មាន​សិទ្ធិ
@@ -634,7 +634,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,ធាតុ​ជា​មួយ​នឹង weightage ខ្ពស់​ជាង​នេះ​នឹង​ត្រូវ​បាន​បង្ហាញ​ដែល​ខ្ពស់​ជាង
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ព​ត៌​មាន​លំអិត​ធនាគារ​ការផ្សះផ្សា
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,វិ​កិ​យ​ប័ត្រ​របស់​ខ្ញុំ
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,រក​មិន​ឃើញ​បុគ្គលិក
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,រក​មិន​ឃើញ​បុគ្គលិក
 DocType: Purchase Order,Stopped,បញ្ឈប់
 DocType: Item,If subcontracted to a vendor,ប្រសិន​បើ​មាន​អ្នក​លក់​មួយ​ម៉ៅការ​បន្ត
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,ការ​ចាប់​ផ្តើ​ម​ជ្រើស Bom
@@ -643,7 +643,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,ផ្ទ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ផ្ញើ​ឥឡូវ
 ,Support Analytics,ការ​គាំទ្រ​វិភាគ
 DocType: Item,Website Warehouse,វេ​ប​សាយ​ឃ្លាំង
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,តើ​អ្នក​ពិត​ជា​ចង់​បញ្ឈប់​ការ​បញ្ជាទិញ​ផលិត​:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ថ្ងៃ​នៃ​ខែ​ដែល​វិ​ក័​យ​ប័ត្រ​ដោយ​ស្វ័យ​ប្រវត្តិ​នឹង​ត្រូវ​បាន​បង្កើត​ឧ 05​, 28 ល"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ពិន្ទុ​ត្រូវ​តែ​តិច​ជាង​ឬ​ស្មើ​នឹង 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,កំណត់ត្រា C​-សំណុំ​បែបបទ
@@ -657,7 +656,7 @@ DocType: Comment,Reference Name,ឈ្មោះ​ឯកសារ​យោង
 DocType: Maintenance Visit,Completion Status,ស្ថានភាព​បញ្ចប់
 DocType: Sales Invoice Item,Target Warehouse,គោល​ដៅ​ឃ្លាំង
 DocType: Item,Allow over delivery or receipt upto this percent,អនុញ្ញាត​ឱ្យ​មាន​ការ​ចែក​ចាយ​ឬ​ទទួល​បាន​ជាង​រីក​រាយ​ជាមួយ​នឹង​ភាគរយ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,គេ​រំពឹង​ថា​ការ​ដឹកជញ្ជូន​មិន​អាច​កាលបរិច្ឆេទ​ត្រូវ​តែ​មុន​ពេល​ការ​លក់​លំដាប់​កាលបរិច្ឆេទ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,គេ​រំពឹង​ថា​ការ​ដឹកជញ្ជូន​មិន​អាច​កាលបរិច្ឆេទ​ត្រូវ​តែ​មុន​ពេល​ការ​លក់​លំដាប់​កាលបរិច្ឆេទ
 DocType: Upload Attendance,Import Attendance,នាំចូល​វត្តមាន
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,ក្រុម​ធាតុ​ទាំងអស់
 DocType: Process Payroll,Activity Log,សកម្មភាព​កំណត់​ហេតុ
@@ -665,7 +664,7 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,តែង​សារ​ស្វ័យ​ប្រវត្តិ​នៅ​លើ​ការ​ដាក់​ប្រតិបត្តិការ​។
 DocType: Production Order,Item To Manufacture,ធាតុ​ដើម្បី​ផលិត
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ការ​សម្ដែង​ផ្សិត​អ​ចិ​ន្រ្តៃ​យ៍
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,ដីកា​បង្គាប់​ឱ្យ​ទូទាត់​ការ​ទិញ
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ដីកា​បង្គាប់​ឱ្យ​ទូទាត់​ការ​ទិញ
 DocType: Sales Order Item,Projected Qty,ការ​ព្យាករ Qty
 DocType: Sales Invoice,Payment Due Date,ការ​ទូទាត់​កាលបរិច្ឆេទ
 DocType: Newsletter,Newsletter Manager,កម្មវិធី​គ្រប់គ្រង​ព្រឹត្តិ​ប័ត្រ​ព័ត៌មាន
@@ -687,7 +686,7 @@ DocType: SMS Log,Requested Numbers,លេខ​ដែល​បាន​ស្ន
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,វាយតម្លៃ​ការ​អនុវត្ត​។
 DocType: Sales Invoice Item,Stock Details,ភាគ​ហ៊ុន​លំអិត
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,តម្លៃ​គម្រោង
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,ចំណុច​នៃ​ការ​លក់
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,ចំណុច​នៃ​ការ​លក់
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","សមតុល្យ​គណនី​រួច​ហើយ​នៅ​ក្នុង​ឥណទាន​, អ្នក​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​កំណត់​ទឹកប្រាក់​ត្រូវតែ "ជា​" ឥណពន្ធ"
 DocType: Account,Balance must be,មាន​តុល្យភាព​ត្រូវ​តែ​មាន
 DocType: Hub Settings,Publish Pricing,តម្លៃ​បោះ​ពុម្ព​ផ្សាយ
@@ -709,7 +708,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,បង្កាន់ដៃ​ទិញ
 ,Received Items To Be Billed,ទទួល​បាន​ធាតុ​ដែល​នឹង​ត្រូវ​បាន​ផ្សព្វ​ផ្សាយ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ការ​បំផ្ទុះ​សំណឹក
-sites/assets/js/desk.min.js +3938,Ms,លោកស្រី
+DocType: Employee,Ms,លោកស្រី
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,អត្រា​ប្តូ​រ​ប្រាក់​រូបិយប័ណ្ណ​មេ​។
 DocType: Production Order,Plan material for sub-assemblies,សម្ភារៈ​ផែនការ​សម្រាប់​ការ​អនុ​សភា
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,សូម​ជ្រើស​ប្រភេទ​ឯកសារ​នេះ​ជា​លើក​ដំបូង
@@ -739,12 +738,14 @@ DocType: Item,Is Purchase Item,តើ​មាន​ធាតុ​ទិញ
 DocType: Journal Entry Account,Purchase Invoice,ការ​ទិញ​វិ​ក័​យ​ប័ត្រ
 DocType: Stock Ledger Entry,Voucher Detail No,ព​ត៌​មាន​លំអិត​កាត​មាន​ទឹក​ប្រាក់​គ្មាន
 DocType: Stock Entry,Total Outgoing Value,តម្លៃ​ចេញ​សរុប
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,បើក​កាលបរិច្ឆេទ​និង​ថ្ងៃ​ផុតកំណត់​គួរតែ​ត្រូវ​បាន​នៅ​ក្នុង​ឆ្នាំ​សារពើពន្ធ​ដូចគ្នា
 DocType: Lead,Request for Information,សំណើសុំ​ព័ត៌មាន
 DocType: Payment Tool,Paid,Paid
 DocType: Salary Slip,Total in words,សរុប​នៅ​ក្នុង​ពាក្យ
 DocType: Material Request Item,Lead Time Date,កាលបរិច្ឆេទ​ពេលវេលា​នាំ​មុខ
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,គឺ​ជា​ចាំបាច់​។ ប្រហែល​ជា​កំណត់​ត្រា​ប្តូ​រ​រូបិយប័ណ្ណ​ដែល​មិន​ត្រូវ​បាន​បង្កើត​ឡើង​សម្រាប់
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","សម្រាប់​ធាតុ "ផលិតផល​កញ្ចប់​, ឃ្លាំង​, សៀរៀល​, គ្មាន​ទេ​និង​បាច់ & ‧​នឹង​ត្រូវ​បាន​ចាត់ទុកថា​ពី​" ការ​វេច​ខ្ចប់​បញ្ជី "តារាង​។ បើ​សិន​ជា​គ្មាន​ឃ្លាំង​និង​ជំនាន់​ដូចគ្នា​សម្រាប់​ធាតុ​ដែល​មាន​ទាំងអស់​សម្រាប់​វេច​ខ្ចប់​ធាតុ​ណាមួយ "ផលិតផល​ជា​កញ្ចប់​" តម្លៃ​ទាំង​នោះ​អាច​ត្រូវ​បាន​បញ្ចូល​នៅ​ក្នុង​តារាង​ធាតុ​ដ៏​សំខាន់​, តម្លៃ​នឹង​ត្រូវ​បាន​ចម្លង​ទៅ 'វេច​ខ្ចប់​បញ្ជី "តារាង​។"
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,ការ​នាំ​ចេញ​ទៅ​កាន់​អតិថិជន​។
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ការ​នាំ​ចេញ​ទៅ​កាន់​អតិថិជន​។
 DocType: Purchase Invoice Item,Purchase Order Item,ទិញ​ធាតុ​លំដាប់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,ចំណូល​ប្រយោល
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,កំណត់​ចំនួន​ការ​ទូទាត់ = ចំនួន​ទឹកប្រាក់​ឆ្នើម
@@ -752,12 +753,13 @@ DocType: Contact Us Settings,Address Line 1,អាសយដ្ឋាន​បន
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,អថេរ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ឈ្មោះ​ក្រុមហ៊ុន
 DocType: SMS Center,Total Message(s),សារ​សរុប (s បាន​)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,ជ្រើស​ធាតុ​សម្រាប់​ការ​ផ្ទេរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,ជ្រើស​ធាតុ​សម្រាប់​ការ​ផ្ទេរ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,មើល​បញ្ជី​នៃ​ការ​ជួយ​វីដេអូ​ទាំងអស់
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ជ្រើស​ប្រធាន​គណនី​របស់​ធនាគារ​នេះ​ដែល​ជា​កន្លែង​ដែល​ការ​ត្រួត​ពិនិត្យ​ត្រូវ​បាន​តម្កល់ទុក​។
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,អនុញ្ញាត​ឱ្យ​អ្នក​ប្រើ​ដើម្បី​កែ​សម្រួល​អត្រា​តំលៃ​បញ្ជី​នៅ​ក្នុង​ប្រតិបត្តិការ
 DocType: Pricing Rule,Max Qty,អតិបរមា Qty
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,គីមី
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,ធាតុ​ទាំងអស់​ត្រូវ​បាន​បញ្ជូន​រួច​ហើយ​សម្រាប់​ការ​បញ្ជាទិញ​ផលិតផល​នេះ​។
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,ធាតុ​ទាំងអស់​ត្រូវ​បាន​បញ្ជូន​រួច​ហើយ​សម្រាប់​ការ​បញ្ជាទិញ​ផលិតផល​នេះ​។
 DocType: Process Payroll,Select Payroll Year and Month,ជ្រើស​បើក​ប្រាក់​បៀវត្ស​ឆ្នាំ​និង​ខែ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",សូម​ចូល​ទៅ​កាន់​ក្រុម​ដែល​សមស្រប (ជា​ធម្មតា​ពាក្យ​ស្នើសុំ​របស់​មូលនិធិ​> ទ្រព្យ​បច្ចុប្បន្ន​> គណនី​ធនាគារ​និង​បង្កើត​គណនី​ថ្មី​មួយ (ដោយ​ចុច​លើ Add កុមារ​) នៃ​ប្រភេទ "ធនាគារ​"
 DocType: Workstation,Electricity Cost,តម្លៃ​អគ្គិសនី
@@ -772,7 +774,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ស
 DocType: SMS Center,All Lead (Open),អ្នក​ដឹក​នាំ​ការ​ទាំងអស់ (ការ​បើក​ចំហ​)
 DocType: Purchase Invoice,Get Advances Paid,ទទួល​បាន​ការ​វិវត្ត​បង់ប្រាក់
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ភ្ជាប់​រូបភាព​របស់​អ្នក
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,ធ្វើ​ឱ្យ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ធ្វើ​ឱ្យ
 DocType: Journal Entry,Total Amount in Words,ចំនួន​សរុប​នៅ​ក្នុង​ពាក្យ
 DocType: Workflow State,Stop,បញ្ឈប់
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,មាន​កំហុស​។ ហេតុ​ផល​មួយ​ដែល​អាច​នឹង​ត្រូវ​បាន​ប្រហែលជា​ដែល​អ្នក​មិន​បាន​រក្សា​ទុក​សំណុំ​បែប​បទ​។ សូម​ទាក់ទង support@erpnext.com ប្រសិន​បើ​បញ្ហា​នៅតែ​បន្ត​កើតមាន​។
@@ -794,7 +796,7 @@ DocType: Packing Slip Item,Packing Slip Item,វេច​ខ្ចប់​ធ
 DocType: POS Profile,Cash/Bank Account,សាច់ប្រាក់ / គណនី​ធនាគារ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,ធាតុ​បាន​យក​ចេញ​ដោយ​ការ​ផ្លាស់​ប្តូ​រ​ក្នុង​បរិមាណ​ឬ​តម្លៃ​ទេ​។
 DocType: Delivery Note,Delivery To,ដឹកជញ្ជូន​ដើម្បី
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,តារាង​គុណលក្ខណៈ​គឺ​ជា​ការ​ចាំបាច់
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,តារាង​គុណលក្ខណៈ​គឺ​ជា​ការ​ចាំបាច់
 DocType: Production Planning Tool,Get Sales Orders,ទទួល​បាន​ការ​បញ្ជា​ទិញ​លក់
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ការ​ដាក់​លិខិត
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,បញ្ចុះ​តំលៃ
@@ -803,12 +805,13 @@ DocType: Workstation,Wages,ប្រាក់​ឈ្នួល
 DocType: Time Log,Will be updated only if Time Log is 'Billable',នឹង​ត្រូវ​បាន​ធ្វើ​ឱ្យ​ទាន់​សម័យ​តែ​ប៉ុណ្ណោះ​ប្រសិន​បើ​កំណត់​ហេតុ​ពេលវេលា​គឺ "Billable​"
 DocType: Project,Internal,ផ្ទៃក្នុង
 DocType: Task,Urgent,បន្ទាន់
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ចូរ​ទៅ​ផ្ទៃតុ​ហើយ​ចាប់​ផ្តើ​ម​ដោយ​ការ​ប្រើ ERPNext
 DocType: Item,Manufacturer,ក្រុមហ៊ុន​ផលិត
 DocType: Landed Cost Item,Purchase Receipt Item,ធាតុ​បង្កាន់ដៃ​ទិញ
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ឃ្លាំង​ត្រូវ​បាន​បម្រុង​ទុក​នៅ​ក្នុង​ការ​លក់​លំដាប់ / ឃ្លាំង​ទំនិញ​បាន​បញ្ចប់
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,ចំនួន​លក់
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,ម៉ោង​កំណត់ហេតុ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,អ្នក​គឺ​ជា​អ្នក​ដែល​មាន​ការ​យល់​ព្រម​ចំណាយ​សម្រាប់​កំណត់​ត្រា​នេះ​។ សូម​ធ្វើ​ឱ្យ​ទាន់​សម័យ​នេះ 'ស្ថានភាព​' និង​រក្សាទុក
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,អ្នក​គឺ​ជា​អ្នក​ដែល​មាន​ការ​យល់​ព្រម​ចំណាយ​សម្រាប់​កំណត់​ត្រា​នេះ​។ សូម​ធ្វើ​ឱ្យ​ទាន់​សម័យ​នេះ 'ស្ថានភាព​' និង​រក្សាទុក
 DocType: Serial No,Creation Document No,ការ​បង្កើត​ឯកសារ​គ្មាន
 DocType: Issue,Issue,បញ្ហា
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",គុណ​លក្ខណៈ​សម្រាប់​ធាតុ​វ៉ា​រ្យ៉​ង់​។ ឧទាហរណ៍​ដូចជា​ទំហំ​ពណ៌​ល
@@ -823,7 +826,7 @@ DocType: GL Entry,Against,ប្រឆាំង​នឹង​ការ
 DocType: Item,Default Selling Cost Center,ចំណាយ​លើ​ការ​លក់​លំនាំ​ដើម​របស់​មជ្ឈមណ្ឌល
 DocType: Sales Partner,Implementation Partner,ដៃគូ​អនុវត្ដ​ន៍
 DocType: Opportunity,Contact Info,ព​ត៌​មាន​ទំនាក់ទំនង
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,ការ​ធ្វើ​ឱ្យ​ធាតុ​ហ៊ុន
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,ការ​ធ្វើ​ឱ្យ​ធាតុ​ហ៊ុន
 DocType: Packing Slip,Net Weight UOM,សុទ្ធ​ទម្ងន់ UOM
 DocType: Item,Default Supplier,ហាងទំនិញ​លំនាំ​ដើម
 DocType: Manufacturing Settings,Over Production Allowance Percentage,លើស​ពី​ភាគរយ​សំវិធានធន​ផលិតកម្ម
@@ -832,7 +835,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,ដើម្បី​ទទួល​បាន​កាលបរិច្ឆេទ​ការ​បិទ​ប្រចាំ​ស​ប្តា​ហ៍
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,កាលបរិច្ឆេទ​បញ្ចប់​មិន​អាច​តិច​ជាង​ការ​ចាប់​ផ្តើ​ម​កាល​បរិច្ឆេទ
 DocType: Sales Person,Select company name first.,ជ្រើស​ឈ្មោះ​ក្រុម​ហ៊ុន​ជា​លើក​ដំបូង​។
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,លោក​បណ្ឌិត
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,លោក​បណ្ឌិត
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,សម្រង់​ពាក្យ​ដែល​ទទួល​បាន​ពី​ការ​ផ្គត់​ផ្គង់​។
 DocType: Time Log Batch,updated via Time Logs,ធ្វើ​ឱ្យ​ទាន់​សម័យ​តាម​រយៈ​ពេល​កំណត់ហេតុ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,អាយុ​ជា​មធ្យម
@@ -914,10 +917,10 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,ព​ត៌​ម
 DocType: Global Defaults,Current Fiscal Year,ឆ្នាំ​សារពើពន្ធ​នា​ពេល​បច្ចុប្បន្ន
 DocType: Global Defaults,Disable Rounded Total,បិទ​ការ​សរុប​មូល
 DocType: Lead,Call,ការ​ហៅ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"ធាតុ​" មិន​អាច​ទទេ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"ធាតុ​" មិន​អាច​ទទេ
 ,Trial Balance,អង្គ​ជំនុំ​តុល្យភាព
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,ការ​រៀបចំ​បុគ្គលិក
-sites/assets/js/erpnext.min.js +5,"Grid """,ក្រឡា​ចត្រង្គ "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ការ​រៀបចំ​បុគ្គលិក
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,ក្រឡា​ចត្រង្គ "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,សូម​ជ្រើស​បុព្វបទ​ជា​លើក​ដំបូង
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,ស្រាវជ្រាវ
 DocType: Maintenance Visit Purpose,Work Done,ការងារ​ធ្វើ
@@ -927,13 +930,14 @@ DocType: Communication,Sent,ដែល​បាន​ផ្ញើ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,មើល​សៀវភៅ
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូង​បំផុត
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុ​មួយ​ពូល​មាន​ឈ្មោះ​ដូច​គ្នា​សូម​ប្ដូរ​ឈ្មោះ​ធាតុ​ឬ​ប្ដូរ​ឈ្មោះ​ធាតុ​ដែល​ជា​ក្រុម
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុ​មួយ​ពូល​មាន​ឈ្មោះ​ដូច​គ្នា​សូម​ប្ដូរ​ឈ្មោះ​ធាតុ​ឬ​ប្ដូរ​ឈ្មោះ​ធាតុ​ដែល​ជា​ក្រុម
 DocType: Communication,Delivery Status,ស្ថានភាព​ដឹកជញ្ជូន
 DocType: Production Order,Manufacture against Sales Order,ផលិត​ប្រឆាំង​នឹង​ការ​លក់​ស​ណ្តា​ប់​ធ្នាប់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,នៅ​សល់​នៃ​ពិភពលោក
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,នៅ​សល់​នៃ​ពិភពលោក
 ,Budget Variance Report,របាយការណ៍​អថេរ​ថវិកា​រ
 DocType: Salary Slip,Gross Pay,បង់​សរុប​បាន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,ភាគលាភ​បង់​ប្រាក់
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,គណនេយ្យ​សៀវភៅ​ធំ
 DocType: Stock Reconciliation,Difference Amount,ចំនួន​ទឹកប្រាក់​ដែល​មាន​ភាព​ខុស​គ្នា
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,ប្រាក់ចំណូល​រក្សា​ទុក
 DocType: BOM Item,Item Description,ធាតុ​ការ​ពិពណ៌នា​សង្ខេប
@@ -951,6 +955,8 @@ DocType: Address,Address Type,ប្រភេទ​អាសយដ្ឋាន
 DocType: Purchase Receipt,Rejected Warehouse,ឃ្លាំង​ច្រាន​ចោល
 DocType: GL Entry,Against Voucher,ប្រឆាំង​នឹង​ប័ណ្ណ
 DocType: Item,Default Buying Cost Center,មជ្ឈ​មណ្ឌល​ការ​ចំណាយ​ទិញ​លំនាំ​ដើម
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",ដើម្បី​ទទួល​បាន​ប្រយោជន៍​ច្រើន​បំផុត​ក្នុង ERPNext យើង​ផ្ដល់​អនុសាសន៍​ថា​អ្នក​បាន​យក​ពេល​វេលា​មួយ​ចំនួន​និង​មើល​វីដេអូ​បាន​ជំនួយ​ទាំងនេះ​។
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,ដើម្បី
 DocType: Item,Lead Time in days,អ្នក​ដឹក​នាំ​ការ​ពេល​វេលា​នៅ​ក្នុង​ថ្ងៃ
 ,Accounts Payable Summary,គណនី​ចងការប្រាក់​សង្ខេប
 DocType: Journal Entry,Get Outstanding Invoices,ទទួល​បាន​វិ​កិ​យ​ប័ត្រ​ឆ្នើម
@@ -972,7 +978,7 @@ DocType: Mode of Payment,Mode of Payment,របៀប​នៃ​ការ​ទ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,នេះ​គឺជា​ក្រុម​មួយ​ដែល​ធាតុ root និង​មិន​អាច​ត្រូវ​បាន​កែសម្រួល​។
 DocType: Journal Entry Account,Purchase Order,ការ​បញ្ជា​ទិញ
 DocType: Warehouse,Warehouse Contact Info,ឃ្លាំង​ព​ត៌​មាន​ទំនាក់ទំនង
-sites/assets/js/form.min.js +190,Name is required,ឈ្មោះ​ត្រូវ​បាន​ទាមទារ
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,ឈ្មោះ​ត្រូវ​បាន​ទាមទារ
 DocType: Purchase Invoice,Recurring Type,ប្រភេទ​កើតឡើង
 DocType: Address,City/Town,ទីក្រុង / ក្រុង
 DocType: Email Digest,Annual Income,ប្រាក់​ចំណូល​ប្រចាំ​ឆ្នាំ
@@ -985,14 +991,14 @@ apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated perc
 DocType: Appraisal Goal,Goal,គ្រាប់​បាល់​បញ្ចូល​ទី
 DocType: Sales Invoice Item,Edit Description,កែសម្រួល​ការ​បរិយាយ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,គេ​រំពឹង​ថា​កាលបរិច្ឆេទ​ដឹកជញ្ជូន​គឺ​តិច​ជាង​ចាប់​ផ្ដើម​គំរោង​កាលបរិច្ឆេទ​។
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,សម្រាប់​ផ្គត់​ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,សម្រាប់​ផ្គត់​ផ្គង់
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ការ​កំណត់​ប្រភេទ​គណនី​ជួយ​ក្នុង​ការ​ជ្រើស​គណនី​នេះ​ក្នុង​ប្រតិ​បតិ​្ត​ការ​។
 DocType: Purchase Invoice,Grand Total (Company Currency),សម្ពោធ​សរុប (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ចេញ​សរុប
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",មាន​តែ​អាច​ជា​លក្ខខណ្ឌ​មួយ​ដែល​មាន​ការ​ដឹក​ជញ្ជូន​វិធាន 0 ឬ​តម្លៃ​វា​នៅ​ទទេ​សម្រាប់ "ឱ្យ​តម្លៃ​"
 DocType: Authorization Rule,Transaction,ប្រតិ​ប​ត្តិ​ការ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ចំណាំ​: មជ្ឈមណ្ឌល​នេះ​ជា​ការ​ចំណាយ​ក្រុម​។ មិន​អាច​ធ្វើ​ឱ្យ​ការ​បញ្ចូល​គណនី​ប្រឆាំង​នឹង​ក្រុម​។
-apps/erpnext/erpnext/config/projects.py +43,Tools,ឧបករណ៍
+apps/frappe/frappe/config/desk.py +7,Tools,ឧបករណ៍
 DocType: Item,Website Item Groups,ក្រុម​ធាតុ​វេ​ប​សាយ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,លេខ​លំដាប់​របស់​ផលិតកម្ម​ជា​ការ​ចាំបាច់​សម្រាប់​ធាតុ​ភាគ​ហ៊ុន​ផលិត​គោល​បំណង
 DocType: Purchase Invoice,Total (Company Currency),សរុប (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
@@ -1000,7 +1006,7 @@ DocType: Journal Entry,Journal Entry,ធាតុ​ទិនានុប្ប
 DocType: Workstation,Workstation Name,ឈ្មោះ​ស្ថានីយ​ការងារ Stencils
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,សង្ខេប​អ៊ី​ម៉ែ​ល​:
 DocType: Sales Partner,Target Distribution,ចែកចាយ​គោល​ដៅ
-sites/assets/js/desk.min.js +7652,Comments,យោបល់
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,យោបល់
 DocType: Salary Slip,Bank Account No.,លេខ​គណនី​ធនាគារ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,នេះ​ជា​ចំនួន​នៃ​ការ​ប្រតិ​ប​ត្តិ​ការ​បង្កើត​ចុងក្រោយ​ជាមួយ​បុព្វបទ​នេះ
 DocType: Quality Inspection Reading,Reading 8,ការ​អាន 8
@@ -1013,7 +1019,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,សូម​
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,ឯកសិទ្ធិ​ចាកចេញ
 DocType: Purchase Invoice,Supplier Invoice Date,កាលបរិច្ឆេទ​ផ្គត់​ផ្គង់​វិ​ក័​យ​ប័ត្រ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,អ្នក​ត្រូវ​អនុញ្ញាត​ក​ន្រ្ត​ក​ទំនិញ
-sites/assets/js/form.min.js +212,No Data,គ្មាន​ទិន្នន័យ
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,គ្មាន​ទិន្នន័យ
 DocType: Appraisal Template Goal,Appraisal Template Goal,គោលដៅ​វាយតម្លៃ​ទំព័រ​គំរូ
 DocType: Salary Slip,Earning,រក​ប្រាក់​ចំណូល
 DocType: Payment Tool,Party Account Currency,គណបក្ស​គណនី​រូបិយប័ណ្ណ
@@ -1077,7 +1083,7 @@ DocType: Warranty Claim,Warranty / AMC Status,ការធានា / ស្ថ
 DocType: GL Entry,GL Entry,ចូល GL ដើម
 DocType: HR Settings,Employee Settings,ការ​កំណត់​បុគ្គលិក
 ,Batch-Wise Balance History,ប្រាជ្ញា​តុល្យភាព​បាច់​ប្រវត្តិ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,ដើម្បី​ធ្វើ​បញ្ជី
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ដើម្បី​ធ្វើ​បញ្ជី
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,សិស្ស
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,បរិមាណ​ដែល​ត្រូវ​ទទួលទាន​អវិជ្ជមាន​មិន​ត្រូវ​បាន​អនុញ្ញាត
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1106,12 +1112,12 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ការិយាល័យ​សំរាប់​ជួល
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,ការ​កំណត់​ច្រក​ចេញ​ចូល​ការ​រៀបចំ​សារ​ជា​អក្សរ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,នាំចូល​បាន​បរាជ័យ​!
-sites/assets/js/erpnext.min.js +24,No address added yet.,គ្មាន​អាសយដ្ឋាន​បន្ថែម​នៅ​ឡើយ​ទេ​។
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,គ្មាន​អាសយដ្ឋាន​បន្ថែម​នៅ​ឡើយ​ទេ​។
 DocType: Workstation Working Hour,Workstation Working Hour,ស្ថានីយ​ការងារ​ការងារ​ហួរ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,អ្នក​វិភាគ
 DocType: Item,Inventory,សារពើ​ភ័​ណ្ឌ
 DocType: Features Setup,"To enable ""Point of Sale"" view",ដើម្បី​បើក​ការ​«​ចំណុច​នៃ​ការ​លក់​«​ទស្សនៈ
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,ការ​ទូទាត់​មិន​អាច​ត្រូវ​បាន​ធ្វើ​ឡើង​សម្រាប់​រទេះ​ទទេ
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ការ​ទូទាត់​មិន​អាច​ត្រូវ​បាន​ធ្វើ​ឡើង​សម្រាប់​រទេះ​ទទេ
 DocType: Item,Sales Details,ព​ត៌​មាន​លំអិត​ការ​លក់
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,pinning
 DocType: Opportunity,With Items,ជា​មួយ​នឹង​ការ​ធាតុ
@@ -1121,7 +1127,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",កាលបរិច្ឆេទ​ដែល​វិ​ក័​យ​ប័ត្រ​ក្រោយ​នឹង​ត្រូវ​បាន​បង្កើត​។ វា​ត្រូវ​បាន​គេ​បង្កើត​នៅ​លើ​ការ​ដាក់​ស្នើ​។
 DocType: Item Attribute,Item Attribute,គុណ​លក្ខណៈ​ធាតុ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,រដ្ឋា​ភិ​បាល
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,វ៉ា​រ្យ៉​ង់​ធាតុ
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,វ៉ា​រ្យ៉​ង់​ធាតុ
 DocType: Company,Services,ការ​ផ្តល់​សេវា
 DocType: Cost Center,Parent Cost Center,មជ្ឈមណ្ឌល​តម្លៃ​ដែល​មាតា​ឬ​បិតា
 DocType: Sales Invoice,Source,ប្រភព
@@ -1130,11 +1136,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,កាលបរិច្ឆេទ​ចាប់​ផ្តើ​ម​ក្នុង​ឆ្នាំ​ហិរញ្ញវត្ថុ
 DocType: Employee External Work History,Total Experience,បទពិសោធន៍​សរុប
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,គ្រូពេទ្យ​ប្រហែលជា​វេច​ខ្ចប់ (s​) បាន​ត្រូវ​បាន​លុប​ចោល
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,គ្រូពេទ្យ​ប្រហែលជា​វេច​ខ្ចប់ (s​) បាន​ត្រូវ​បាន​លុប​ចោល
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ការ​ចោទ​ប្រកាន់​ការ​ដឹក​ជញ្ជូន​និង​ការ​បញ្ជូន​បន្ត
 DocType: Material Request Item,Sales Order No,គ្មាន​ការ​លក់​ស​ណ្តា​ប់​ធ្នាប់
 DocType: Item Group,Item Group Name,ធាតុ​ឈ្មោះ​ក្រុម
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,គេ​យក
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,គេ​យក
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,ផ្ទេរ​សម្រាប់​ការផលិត​សម្ភារៈ
 DocType: Pricing Rule,For Price List,សម្រាប់​តារាងតម្លៃ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,ស្វែងរក​ប្រតិបត្តិ
@@ -1142,7 +1148,6 @@ DocType: Maintenance Schedule,Schedules,កាលវិភាគ
 DocType: Purchase Invoice Item,Net Amount,ចំនួន​ទឹកប្រាក់​សុទ្ធ
 DocType: Purchase Order Item Supplied,BOM Detail No,ព​ត៌​មាន​លំអិត Bom គ្មាន
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ចំនួន​ទឹកប្រាក់​ដែល​បញ្ចុះតម្លៃ​បន្ថែម (រូបិយប័ណ្ណ​របស់​ក្រុមហ៊ុន​)
-DocType: Period Closing Voucher,CoA Help,CoA ជំនួយ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,សូម​បង្កើត​គណនី​ថ្មី​មួយ​ពី​តារាង​នៃ​គណនី​។
 DocType: Maintenance Visit,Maintenance Visit,ថែទាំ​ទស្សនកិច្ច
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,អតិថិជន​> គ្រុប​អតិថិជន​> ដែនដី
@@ -1172,15 +1177,15 @@ DocType: Production Plan Sales Order,Production Plan Sales Order,ផលិតក
 DocType: Sales Partner,Sales Partner Target,ដៃគូ​គោលដៅ​ការ​លក់
 DocType: Pricing Rule,Pricing Rule,វិធាន​ការកំណត់​តម្លៃ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,ស្នាម​ចោះ
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,សម្ភារៈ​សំណើ​ទិញ​ស​ណ្តា​ប់​ធ្នាប់
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,សម្ភារៈ​សំណើ​ទិញ​ស​ណ្តា​ប់​ធ្នាប់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,គណនី​ធនាគារ
 ,Bank Reconciliation Statement,សេចក្តី​ថ្លែង​ការ​របស់​ធនាគារ​ការផ្សះផ្សា
 DocType: Address,Lead Name,ការ​នាំ​មុខ​ឈ្មោះ
 ,POS,ម៉ាស៊ីន​ឆូត​កាត
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ការ​បើក​ផ្សារ​ហ៊ុន​តុល្យភាព
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,ការ​បើក​ផ្សារ​ហ៊ុន​តុល្យភាព
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,គ្មាន​ធាតុ​ខ្ចប់
 DocType: Shipping Rule Condition,From Value,ពី​តម្លៃ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,បរិមាណ​ដែល​ត្រូវ​ទទួលទាន​គឺ​ចាំបាច់​កម្មន្តសាល
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,បរិមាណ​ដែល​ត្រូវ​ទទួលទាន​គឺ​ចាំបាច់​កម្មន្តសាល
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,មាន​ចំនួន​មិន​បាន​ឆ្លុះ​បញ្ចាំង​នៅ​ក្នុង​ធនាគារ
 DocType: Quality Inspection Reading,Reading 4,ការ​អាន​ទី 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ពាក្យ​ប​ណ្តឹ​ង​សម្រាប់​ការ​ចំណាយ​របស់​ក្រុម​ហ៊ុន​។
@@ -1193,6 +1198,7 @@ DocType: Opportunity,Contact Mobile No,ទំនាក់ទំនង​ទូ
 DocType: Production Planning Tool,Select Sales Orders,ជ្រើស​ការ​បញ្ជាទិញ​លក់
 ,Material Requests for which Supplier Quotations are not created,សំណើ​សម្ភារៈ​ដែល​សម្រង់​ស​ម្តី​ផ្គត់ផ្គង់​មិន​ត្រូវ​បាន​បង្កើត
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,ដើម្បី​តាមដាន​ធាតុ​ដែល​បាន​ប្រើ​ប្រាស់​លេខ​កូដ​។ អ្នក​នឹង​អាច​ចូល​ទៅ​ក្នុង​ធាតុ​នៅ​ក្នុង​ការ​ចំណាំ​ដឹកជញ្ជូន​និង​ការ​លក់​វិ​ក័​យ​ប័ត្រ​ដោយ​ការ​ស្កេន​លេខ​កូដ​នៃ​ធាតុ​។
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,សម្គាល់​ថា​បាន​ដឹកនាំ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ចូរ​ធ្វើ​សម្រង់
 DocType: Dependent Task,Dependent Task,ការងារ​ពឹង​ផ្អែក
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ការ​ធ្វើ​ផែនការ​ប្រតិ​ប​ត្ដិ​ការ​សម្រាប់​ការ​ព្យាយាម​របស់ X នៅ​មុន​ថ្ងៃ​។
@@ -1217,7 +1223,7 @@ DocType: Delivery Note,Vehicle Dispatch Date,កាលបរិច្ឆេទ
 DocType: Company,Default Payable Account,គណនី​ទូទាត់​លំនាំ​ដើម
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",ការ​កំណត់​សម្រាប់​រទេះ​ដើរ​ទិញ​ឥវ៉ាន់​អន​ឡា​ញ​ដូច​ជា​វិធាន​ការ​ដឹក​ជញ្ជូន​បញ្ជី​តម្លៃ​ល
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,រៀបចំ​ការ​បំពេញ
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,រក្សា Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,រក្សា Qty
 DocType: Party Account,Party Account,គណនី​គណបក្ស
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,ធនធានមនុស្ស
 DocType: Lead,Upper Income,ផ្នែក​ខាង​លើ​ប្រាក់​ចំណូល
@@ -1260,6 +1266,7 @@ DocType: Employee,Permanent Address,អាសយដ្ឋាន​អ​ចិ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,សូម​ជ្រើសរើស​លេខ​កូដ​ធាតុ
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),កាត់​បន្ថយ​ការ​កាត់​ស្នើសុំ​ការអនុញ្ញាត​ដោយ​គ្មាន​ប្រាក់​ខែ (LWP​)
 DocType: Territory,Territory Manager,កម្មវិធី​គ្រប់គ្រង​ទឹក​ដី
+DocType: Delivery Note Item,To Warehouse (Optional),ទៅ​ឃ្លាំង (ជា​ជម្រើស​)
 DocType: Sales Invoice,Paid Amount (Company Currency),ចំនួន​ទឹកប្រាក់​ដែល​បាន​បង់ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 DocType: Purchase Invoice,Additional Discount,បញ្ចុះ​តំលៃ​បន្ថែម
 DocType: Selling Settings,Selling Settings,ការ​លក់​ការ​កំណត់
@@ -1302,9 +1309,9 @@ DocType: Sales Invoice Item,Batch No,បាច់​គ្មាន
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,អនុញ្ញាត​ឱ្យ​មាន​ការ​បញ្ជា​ទិញ​ការ​លក់​ការ​ទិញ​ស​ណ្តា​ប់​ធ្នាប់​ជា​ច្រើន​ប្រឆាំង​នឹង​អតិថិជន​របស់​មួយ
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,ដើម​ចម្បង
 DocType: DocPerm,Delete,លុប
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,វ៉ា​រ្យ៉​ង់
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,វ៉ា​រ្យ៉​ង់
 DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់​បុព្វបទ​សម្រាប់​លេខ​ស៊េរី​លើ​ប្រតិ​បតិ​្ត​ការ​របស់​អ្នក
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,គោល​បំណង​បញ្ឈប់​ការ​ដែល​មិន​អាច​ត្រូវ​បាន​លុបចោល​។ ឮ​ដើម្បី​លុបចោល​។
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,គោល​បំណង​បញ្ឈប់​ការ​ដែល​មិន​អាច​ត្រូវ​បាន​លុបចោល​។ ឮ​ដើម្បី​លុបចោល​។
 DocType: Employee,Leave Encashed?,ទុក​ឱ្យ Encashed​?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ឱកាស​ក្នុង​វាល​ពី​គឺ​ចាំបាច់
 DocType: Item,Variants,វ៉ា​រ្យ៉​ង់
@@ -1338,7 +1345,6 @@ DocType: Employee,Salutation,ពាក្យ​សួរសុខទុក្ខ
 DocType: Communication,Rejected,ច្រាន​ចោល
 DocType: Pricing Rule,Brand,ម៉ាក
 DocType: Item,Will also apply for variants,ក៏​នឹង​អនុវត្ត​សម្រាប់​វ៉ា​រ្យ៉​ង់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% ដឹកនាំ
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,ធាតុ​បាច់​នៅ​ក្នុង​ពេល​នៃ​ការ​លក់​។
 DocType: Sales Order Item,Actual Qty,ជាក់​ស្តែ Qty
 DocType: Sales Invoice Item,References,ឯកសារយោង
@@ -1371,14 +1377,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,កាត់
 DocType: Item,Has Variants,មាន​វ៉ា​រ្យ៉​ង់
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,ចុច​លើ​ប៊ូតុង "ធ្វើ​ឱ្យ​ការ​លក់​វិ​ក័​យ​ប័ត្រ​ក្នុង​ការ​បង្កើត​វិ​ក័​យ​ប័ត្រ​លក់​ថ្មី​។
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,រយៈ​ពេល​ពី​និង​រយៈពេល​ដើម្បី​កាលបរិច្ឆេទ​ជា​ចាំ​បាច់​សំរាប់​ការ​កើតឡើង​ក្នុង​% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,វេច​ខ្ចប់​ស្លាក​និង
 DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះ​របស់​ចែកចាយ​ប្រចាំខែ
 DocType: Sales Person,Parent Sales Person,ឪពុក​ម្តាយ​របស់​បុគ្គល​លក់
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,សូម​បញ្ជាក់​រូបិយប័ណ្ណ​លំនាំដើម​ក្នុង​ក្រុមហ៊ុន Master និង​លំនាំដើម​ជា​សកល
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox ចូល​ដំណើរ​ការ​សម្ងាត់
 DocType: Purchase Invoice,Recurring Invoice,វិ​ក័​យ​ប័ត្រ​កើតឡើង
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,ការ​គ្រប់គ្រង​គម្រោង
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,ការ​គ្រប់គ្រង​គម្រោង
 DocType: Supplier,Supplier of Goods or Services.,ក្រុមហ៊ុន​ផ្គត់ផ្គង់​ទំនិញ​ឬ​សេវា​។
 DocType: Budget Detail,Fiscal Year,ឆ្នាំ​សារពើពន្ធ
 DocType: Cost Center,Budget,ថវិកា​រ
@@ -1400,10 +1405,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table ca
 DocType: Pricing Rule,Selling,លក់
 DocType: Employee,Salary Information,ព​ត៌​មាន​ប្រាក់​បៀវត្ស
 DocType: Sales Person,Name and Employee ID,ឈ្មោះ​និង​លេខ​សម្គាល់​របស់​និយោជិត
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,កាលបរិច្ឆេទ​ដោយ​សារ​តែ​មិន​អាច​មាន​មុន​ពេល​ការ​ប្រកាស​កាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,កាលបរិច្ឆេទ​ដោយ​សារ​តែ​មិន​អាច​មាន​មុន​ពេល​ការ​ប្រកាស​កាលបរិច្ឆេទ
 DocType: Website Item Group,Website Item Group,វេ​ប​សាយ​ធាតុ​គ្រុប
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,ភារកិច្ច​និង​ពន្ធ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,សូម​បញ្ចូល​កាលបរិច្ឆេទ​យោង
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,សូម​បញ្ចូល​កាលបរិច្ឆេទ​យោង
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,តារាង​សម្រាប់​ធាតុ​ដែល​នឹង​ត្រូវ​បាន​បង្ហាញ​នៅ​ក្នុង​វ៉ិ​ប​សាយ
 DocType: Purchase Order Item Supplied,Supplied Qty,ការ​ផ្គត់ផ្គង់ Qty
 DocType: Material Request Item,Material Request Item,ការ​ស្នើ​សុំ​សម្ភារៈ​ធាតុ
@@ -1450,13 +1455,13 @@ DocType: Employee,Personal Details,ព​ត៌​មាន​លំអិត​
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,ក្រឡោត
 ,Quotation Trends,សម្រង់​និន្នាការ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,ឥណពន្ធ​វី​សា​ទៅ​គណនី​ត្រូវ​តែ​ជា​គណនី​ដែល​ទទួល
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",ខណៈ​ពេល​ដែល​ការ​បញ្ជាទិញ​ផលិតផល​អាច​ត្រូវ​បាន​ធ្វើ​សម្រាប់​ធាតុ​នេះ​វា​ត្រូវតែ​ជា​ធាតុ​ភាគ​ហ៊ុន​។
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",ខណៈ​ពេល​ដែល​ការ​បញ្ជាទិញ​ផលិតផល​អាច​ត្រូវ​បាន​ធ្វើ​សម្រាប់​ធាតុ​នេះ​វា​ត្រូវតែ​ជា​ធាតុ​ភាគ​ហ៊ុន​។
 DocType: Shipping Rule Condition,Shipping Amount,ចំនួន​ទឹកប្រាក់​ការ​ដឹក​ជញ្ជូន
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,ការ​ចូល​រួម
 DocType: Authorization Rule,Above Value,តម្លៃ​ខាង​លើ
 ,Pending Amount,ចំនួន​ទឹកប្រាក់​ដែល​មិន​ទាន់​សម្រេច
 DocType: Purchase Invoice Item,Conversion Factor,ការ​ប្រែចិត្ត​ជឿ​កត្តា
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,បាន​បញ្ជូន
+DocType: Purchase Order,Delivered,បាន​បញ្ជូន
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),រៀបចំ​ម៉ាស៊ីន​បម្រើ​ចូល​មក​សម្រាប់​លេខ​សម្គាល់​ការ​ងារ​អ៊ីមែល​។ (ឧ jobs@example.com​)
 DocType: Purchase Receipt,Vehicle Number,ចំនួន​រថយន្ត
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ថ្ងៃ​ដែល​នឹង​ត្រូវ​កើតឡើង​វិក្កយបត្រ​បញ្ឈប់​ការ
@@ -1472,10 +1477,10 @@ DocType: Leave Control Panel,Leave blank if considered for all employee types,
 DocType: Landed Cost Voucher,Distribute Charges Based On,ដោយ​ផ្អែក​លើ​ការ​ចែក​ចាយ​ការ​ចោទ​ប្រកាន់
 DocType: HR Settings,HR Settings,ការ​កំណត់​ធនធានមនុស្ស
 apps/frappe/frappe/config/setup.py +130,Printing,ការ​បោះពុម្ព
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ​គឺ​ត្រូវ​រង់ចាំ​ការ​អនុម័ត​។ មាន​តែ​ការ​អនុម័ត​លើ​ការ​ចំណាយ​នេះ​អាច​ធ្វើ​ឱ្យ​ស្ថានភាព​ទាន់សម័យ​។
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ​គឺ​ត្រូវ​រង់ចាំ​ការ​អនុម័ត​។ មាន​តែ​ការ​អនុម័ត​លើ​ការ​ចំណាយ​នេះ​អាច​ធ្វើ​ឱ្យ​ស្ថានភាព​ទាន់សម័យ​។
 DocType: Purchase Invoice,Additional Discount Amount,ចំនួន​ទឹកប្រាក់​ដែល​បញ្ចុះតម្លៃ​បន្ថែម
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,ថ្ងៃ​នេះ (s​) បាន​នៅ​លើ​ដែល​អ្នក​កំពុង​ដាក​​់​ពាក្យ​សុំ​ឈប់​សម្រាក​គឺ​ជា​ថ្ងៃ​ឈប់​សម្រាក​។ អ្នក​ត្រូវ​ការ​មិន​អនុវត្ត​ការ​ឈប់​សម្រាក​។
-sites/assets/js/desk.min.js +7805,and,និង
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,និង
 DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជី​ប្លុក​អនុញ្ញាត​ឱ្យ​ចាក​ចេញ​ពី
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr មិន​អាច​មាន​នៅ​ទទេ​ឬ​ទំហំ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,កីឡា
@@ -1507,7 +1512,6 @@ DocType: Opportunity,Quotation,សម្រង់
 DocType: Salary Slip,Total Deduction,ការ​កាត់​សរុប
 DocType: Quotation,Maintenance User,អ្នកប្រើប្រាស់​ថែទាំ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,ការ​ចំណាយ​បន្ទាន់​សម័យ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,តើ​អ្នក​ប្រាកដ​ជា​ចង់​ឮ
 DocType: Employee,Date of Birth,ថ្ងៃខែ​ឆ្នាំ​កំណើត
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ឆ្នាំ​សារពើពន្ធ​ឆ្នាំ ** តំណាង​ឱ្យ​ហិរញ្ញវត្ថុ​។ ការ​បញ្ចូល​គណនី​ទាំងអស់​និង​ប្រតិបត្តិការ​ដ៏​ធំ​មួយ​ផ្សេង​ទៀត​ត្រូវ​បាន​តាម​ដាន​ការ​ប្រឆាំង​នឹង​ឆ្នាំ​សារពើពន្ធ ** ** ។
 DocType: Opportunity,Customer / Lead Address,អតិថិជន / អ្នក​ដឹក​នាំ​ការ​អាសយដ្ឋាន
@@ -1527,6 +1531,7 @@ DocType: Supplier Quotation,Manufacturing Manager,កម្មវិធី​គ
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ចំណាំ​ដឹកជញ្ជូន​ពុះ​ចូល​ទៅ​ក្នុង​កញ្ចប់​។
 apps/erpnext/erpnext/hooks.py +84,Shipments,ការ​នាំ​ចេញ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,ផ្សិត​ដង
+DocType: Purchase Order,To be delivered to customer,ត្រូវ​បាន​បញ្ជូន​ទៅ​កាន់​អតិថិជន
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ស្ថានភាព​កំណត់ហេតុ​ម៉ោង​ត្រូវ​ជូន​។
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ការ​ដំឡើង
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ជួរ​ដេក #
@@ -1549,7 +1554,6 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,មាន​ចំនួន​មិន​បាន​ឆ្លុះ​បញ្ចាំង​នៅ​ក្នុង​ប្រព័ន្ធ
 DocType: Purchase Invoice Item,Rate (Company Currency),អត្រា​ការ​ប្រាក់ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,អ្នក​ផ្សេង​ទៀត
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,ដែល​បាន​កំណត់​ជា​បាន​បញ្ឈប់
 DocType: POS Profile,Taxes and Charges,ពន្ធ​និង​ការ​ចោទ​ប្រកាន់
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",ផលិតផល​ឬ​សេវាកម្ម​ដែល​ត្រូវ​បាន​ទិញ​លក់​ឬ​ទុក​នៅ​ក្នុង​ភាគ​ហ៊ុន​។
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,មិន​អាច​ជ្រើស​ប្រភេទ​ការ​ចោទ​ប្រកាន់​ថា​ជា "នៅ​លើ​ចំនួន​ជួរ​ដេក​មុន 'ឬ​' នៅ​លើ​ជួរដេក​សរុប​មុន​" សម្រាប់​ជួរ​ដេក​ដំបូង
@@ -1558,18 +1562,19 @@ DocType: Web Form,Select DocType,ជ្រើស​ចង្អុល​បង
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,វិស័យ​ធនាគារ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,សូម​ចុច​លើ 'បង្កើត​កាលវិភាគ​' ដើម្បី​ទទួល​បាន​នូវ​កាលវិភាគ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,មជ្ឈមណ្ឌល​ការ​ចំណាយ​ថ្មី​មួយ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,មជ្ឈមណ្ឌល​ការ​ចំណាយ​ថ្មី​មួយ
 DocType: Bin,Ordered Quantity,បរិមាណ​ដែល​ត្រូវ​បាន​បញ្ជា​ឱ្យ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",ឧ​ទា​ហរ​ណ៏ "ឧបករណ៍​សម្រាប់​អ្នក​សាងសង់​ស្ថាបនា​"
 DocType: Quality Inspection,In Process,ក្នុង​ដំណើរការ
 DocType: Authorization Rule,Itemwise Discount,Itemwise បញ្ចុះ​តំលៃ
+DocType: Purchase Order Item,Reference Document Type,សេចក្តី​យោង​ប្រភេទ​ឯកសារ
 DocType: Account,Fixed Asset,ទ្រព្យសកម្ម​ថេរ
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,សារពើ​ភ័​ណ្ឌ​ស៊េរី
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,សារពើ​ភ័​ណ្ឌ​ស៊េរី
 DocType: Activity Type,Default Billing Rate,អត្រា​ការ​ប្រាក់​វិ​ក័​យ​ប័ត្រ​លំនាំ​ដើម
 DocType: Time Log Batch,Total Billing Amount,ចំនួន​ទឹកប្រាក់​សរុប​វិ​ក័​យ​ប័ត្រ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,គណនី​ត្រូវ​ទទួល
 ,Stock Balance,តុល្យភាព​ភាគ​ហ៊ុន
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,ស​ណ្តា​ប់​ធ្នាប់​ការ​លក់​ទៅ​ការ​ទូទាត់
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ស​ណ្តា​ប់​ធ្នាប់​ការ​លក់​ទៅ​ការ​ទូទាត់
 DocType: Expense Claim Detail,Expense Claim Detail,ព​ត៌​មាន​លំអិត​ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,កំណត់ហេតុ​បង្កើត​ឡើង​វេលា​ម៉ោង​:
 DocType: Item,Weight UOM,ទំ​ង​ន់ UOM
@@ -1612,9 +1617,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ផ្សារដែក
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,ញូ​ហ៊ុន UOM ត្រូវ​បាន​ទាមទារ
 DocType: Quality Inspection,Sample Size,ទំហំ​គំរូ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,ធាតុ​ទាំងអស់​ត្រូវ​បាន invoiced រួច​ទៅ​ហើយ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,ធាតុ​ទាំងអស់​ត្រូវ​បាន invoiced រួច​ទៅ​ហើយ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',សូម​បញ្ជាក់​ត្រឹមត្រូវ​មួយ "ពី​សំណុំ​រឿង​លេខ​"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,មជ្ឈ​មណ្ឌល​ការ​ចំណាយ​បន្ថែម​ទៀត​អាច​ត្រូវ​បាន​ធ្វើ​ឡើង​នៅ​ក្រោម​ការ​ក្រុម​នោះ​ទេ​ប៉ុន្តែ​ធាតុ​ដែល​អាច​ត្រូវ​បាន​ធ្វើ​ប្រឆាំង​នឹង​ការ​ដែល​មិន​មែន​ជា​ក្រុម
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,មជ្ឈ​មណ្ឌល​ការ​ចំណាយ​បន្ថែម​ទៀត​អាច​ត្រូវ​បាន​ធ្វើ​ឡើង​នៅ​ក្រោម​ការ​ក្រុម​នោះ​ទេ​ប៉ុន្តែ​ធាតុ​ដែល​អាច​ត្រូវ​បាន​ធ្វើ​ប្រឆាំង​នឹង​ការ​ដែល​មិន​មែន​ជា​ក្រុម
 DocType: Project,External,ខាងក្រៅ
 DocType: Features Setup,Item Serial Nos,ធាតុ​សៀរៀល Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,អ្នក​ប្រើ​និង​សិទ្ធិ
@@ -1639,7 +1644,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,អាសយដ្ឋាន & ទំនាក់ទំនង
 DocType: SMS Log,Sender Name,ឈ្មោះ​របស់​អ្នក​ផ្ញើ
 DocType: Page,Title,ចំណងជើង
-sites/assets/js/list.min.js +104,Customize,ប្ដូរ​តាម​បំណង
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,ប្ដូរ​តាម​បំណង
 DocType: POS Profile,[Select],[ជ្រើស​]
 DocType: SMS Log,Sent To,ដែល​បាន​ផ្ញើ​ទៅ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,ធ្វើ​ឱ្យ​ការ​លក់​វិ​ក័​យ​ប័ត្រ
@@ -1662,12 +1667,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,ចុង​បញ្ចប់​នៃ​ជីវិត
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ការ​ធ្វើ​ដំណើរ
 DocType: Leave Block List,Allow Users,អនុញ្ញាត​ឱ្យ​អ្នក​ប្រើ
+DocType: Purchase Order,Customer Mobile No,គ្មាន​គយ​ចល័ត
 DocType: Sales Invoice,Recurring,កើតឡើង
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,តាមដាន​ចំណូល​ដាច់​ដោយ​ឡែក​និង​ចំ​សម្រាប់​បញ្ឈរ​ផលិតផល​ឬ​ការ​បែក​បាក់​។
 DocType: Rename Tool,Rename Tool,ឧបករណ៍​ប្តូ​រ​ឈ្មោះ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,តម្លៃ​ដែល​ធ្វើ​ឱ្យ​ទាន់​សម័យ
 DocType: Item Reorder,Item Reorder,ធាតុ​រៀបចំ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,សម្ភារៈ​សេវា​ផ្ទេរ​ប្រាក់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,សម្ភារៈ​សេវា​ផ្ទេរ​ប្រាក់
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់​ប្រតិ​ប​ត្តិ​ការ​, ការ​ចំណាយ​ប្រតិ​ប​ត្ដិ​ការ​និង​ផ្ដល់​ឱ្យ​នូវ​ប្រតិ​ប​ត្ដិ​ការ​តែ​មួយ​គត់​នោះ​ទេ​ដើម្បី​ឱ្យ​ប្រតិ​ប​ត្តិ​ការ​របស់​អ្នក​។"
 DocType: Purchase Invoice,Price List Currency,បញ្ជី​តម្លៃ​រូបិយប័ណ្ណ
 DocType: Naming Series,User must always select,អ្នក​ប្រើ​ដែល​ត្រូវ​តែ​ជ្រើស​តែងតែ
@@ -1696,6 +1702,7 @@ apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required
 DocType: Sales Invoice,Mass Mailing,អភិបូជា​សំបុត្រ​រួម
 DocType: Page,Standard,ស្ដ​ង់​ដា​រ
 DocType: Rename Tool,File to Rename,ឯកសារ​ដែល​ត្រូវ​ប្តូ​រ​ឈ្មោះ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,បង្ហាញ​ការ​ទូទាត់
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,ទំហំ
 DocType: Notification Control,Expense Claim Approved,ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ​បាន​អនុម័ត
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ឱសថ
@@ -1714,8 +1721,8 @@ DocType: Upload Attendance,Attendance To Date,ចូលរួម​កាលប
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),រៀបចំ​ម៉ាស៊ីន​បម្រើ​ចូល​មក​សម្រាប់​លេខ​សម្គាល់​ការ​លក់​អ៊ីមែល​។ (ឧ sales@example.com​)
 DocType: Warranty Claim,Raised By,បាន​លើកឡើង​ដោយ
 DocType: Payment Tool,Payment Account,គណនី​ទូទាត់​ប្រាក់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,សូម​បញ្ជាក់​ក្រុមហ៊ុន​ដើម្បី​បន្ត
-sites/assets/js/list.min.js +23,Draft,សេចក្តី​ព្រាង​ច្បាប់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,សូម​បញ្ជាក់​ក្រុមហ៊ុន​ដើម្បី​បន្ត
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,សេចក្តី​ព្រាង​ច្បាប់
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ទូទាត់​បិទ
 DocType: Quality Inspection Reading,Accepted,បាន​ទទួល​យក
 DocType: User,Female,ស្រី
@@ -1727,12 +1734,13 @@ DocType: Payment Tool,Total Payment Amount,ចំនួន​ទឹកប្រ
 DocType: Shipping Rule,Shipping Rule Label,វិធាន​ការ​ដឹក​ជញ្ជូន​ស្លាក
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,វត្ថុ​ធាតុ​ដើម​ដែល​មិន​អាច​ត្រូវ​បាន​ទទេ​។
 DocType: Newsletter,Test,ការ​ធ្វើ​តេ​ស្ត
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ដូច​​​ដែល​មាន​ប្រតិ​បតិ​្ត​ការ​ភាគ​ហ៊ុន​ដែល​មាន​ស្រាប់​សម្រាប់​ធាតុ​នេះ \ អ្នក​មិន​អាច​ផ្លាស់​ប្តូ​រ​តម្លៃ​នៃ "គ្មាន​សៀរៀល ',​' មាន​ជំនាន់​ទី​គ្មាន ',​' គឺ​ជា​ធាតុ​ហ៊ុន​" និង "វិធី​សា​ស្រ្ត​វាយតម្លៃ​""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,ធាតុ​ទិនានុប្បវត្តិ​រហ័ស
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,អ្នក​មិន​អាច​ផ្លាស់​ប្តូ​រ​អត្រា​ការ​បាន​ប្រសិន​បើ Bom បាន​រៀបរាប់ agianst ធាតុ​ណាមួយ
 DocType: Employee,Previous Work Experience,បទពិសោធន៍​ការងារ​មុន
 DocType: Stock Entry,For Quantity,ចប់
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,សំណើ​សម្រាប់​ធាតុ​។
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,សំណើ​សម្រាប់​ធាតុ​។
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,គោល​បំណង​ផលិត​ដោយ​ឡែក​ពី​គ្នា​នឹង​ត្រូវ​បាន​បង្កើត​សម្រាប់​ធាតុ​ដ៏​ល្អ​គ្នា​បាន​បញ្ចប់​។
 DocType: Purchase Invoice,Terms and Conditions1,លក្ខខណ្ឌ​និង Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,ការ​រៀបចំ​ពេញលេញ
@@ -1796,10 +1804,8 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
 DocType: Note,Note,ចំណាំ
 DocType: Purchase Receipt Item,Recd Quantity,បរិមាណ​ដែល​ត្រូវ​ទទួលទាន Recd
 DocType: Email Account,Email Ids,អ៊ី​ម៉ែ​ល​លេខ​សម្គាល់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,ដែល​បាន​កំណត់​ជា​ឮ
 DocType: Payment Reconciliation,Bank / Cash Account,គណនី​ធនាគារ / សាច់ប្រាក់
 DocType: Tax Rule,Billing City,ទីក្រុង​វ​​ិ​ក័​យ​ប័ត្រ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,ពាក្យ​ស្នើសុំ​ចាកចេញ​នេះ​ត្រូវ​រង់ចាំ​ការ​អនុម័ត​។ តែ​ស្លឹក​បាន​ការ​អនុម័ត​អាច​ធ្វើ​ឱ្យ​ស្ថានភាព​ទាន់សម័យ​។
 DocType: Global Defaults,Hide Currency Symbol,រូបិយប័ណ្ណ​និមិត្ត​សញ្ញា​លាក់
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","ឧ​ធនាគារ​សាច់ប្រាក់​, កាត​ឥណទាន"
 DocType: Journal Entry,Credit Note,ឥណទាន​ចំណាំ
@@ -1818,7 +1824,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),សរុប (Qty​)
 DocType: Installation Note Item,Installed Qty,ដែល​បាន​ដំឡើង Qty
 DocType: Lead,Fax,ទូរសារ
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,ផ្តល់​ជូន
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,ផ្តល់​ជូន
 DocType: Salary Structure,Total Earning,ប្រាក់​ចំណូល​សរុប
 DocType: Purchase Receipt,Time at which materials were received,ពេលវេលា​ដែល​បាន​ស​មា​្ភា​រៈ​ត្រូវ​បាន​ទទួល
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,អាសយដ្ឋាន​របស់ខ្ញុំ
@@ -1827,7 +1833,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,ចៅហ្
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ឬ
 DocType: Sales Order,Billing Status,ស្ថានភាព​វិ​ក័​យ​ប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ចំណាយ​ឧបករណ៍​ប្រើប្រាស់
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 ខាង​លើ
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 ខាង​លើ
 DocType: Buying Settings,Default Buying Price List,តារាងតម្លៃ​ទិញ​លំនាំដើម & ‧​;
 ,Download Backups,ទាញ​យក​ឯកសារ​បម្រុង​ទុក
 DocType: Notification Control,Sales Order Message,ការ​លក់​លំដាប់​សារ
@@ -1836,7 +1842,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,ជ្រើស​បុគ្គលិក
 DocType: Bank Reconciliation,To Date,ដើម្បី​កាលបរិច្ឆេទ
 DocType: Opportunity,Potential Sales Deal,ឥឡូវនេះ​ការ​លក់​មាន​សក្តា​នុ​ពល
-sites/assets/js/form.min.js +308,Details,ព​ត៌​មាន​លំអិត
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,ព​ត៌​មាន​លំអិត
 DocType: Purchase Invoice,Total Taxes and Charges,ពន្ធ​សរុប​និង​ការ​ចោទ​ប្រកាន់
 DocType: Employee,Emergency Contact,ទំនាក់ទំនង​ស​ង្រ្គោះ​បន្ទាន់
 DocType: Item,Quality Parameters,ប៉ារ៉ាម៉ែត្រ​ដែល​មាន​គុណភាព
@@ -1849,7 +1855,7 @@ DocType: Purchase Order Item,Received Qty,ទទួល​បាន​ការ Q
 DocType: Stock Entry Detail,Serial No / Batch,សៀរៀល​គ្មាន / បាច់
 DocType: Product Bundle,Parent Item,ធាតុ​មេ
 DocType: Account,Account Type,ប្រភេទ​គណនី
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំ​គឺ​មិន​ត្រូវ​បាន​បង្កើត​កាលវិភាគ​សម្រាប់​ធាតុ​ទាំង​អស់​នោះ​។ សូម​ចុច​លើ 'បង្កើត​កាលវិភាគ "
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំ​គឺ​មិន​ត្រូវ​បាន​បង្កើត​កាលវិភាគ​សម្រាប់​ធាតុ​ទាំង​អស់​នោះ​។ សូម​ចុច​លើ 'បង្កើត​កាលវិភាគ "
 ,To Produce,ផលិត
 DocType: Packing Slip,Identification of the package for the delivery (for print),ការ​កំណត់​អត្តសញ្ញាណ​នៃ​កញ្ចប់​សម្រាប់​ការ​ចែក​ចាយ (សម្រាប់​បោះពុម្ព​)
 DocType: Bin,Reserved Quantity,បរិមាណ​បំរុង​ទុក
@@ -1859,7 +1865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,វាយកម្ទេច
 DocType: Account,Income Account,គណនី​ប្រាក់​ចំណូល
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ការអប់រំ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,ការ​ដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,ការ​ដឹកជញ្ជូន
 DocType: Stock Reconciliation Item,Current Qty,Qty នា​ពេល​បច្ចុប្បន្ន
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",សូម​មើល "អត្រា​នៃ​មូលដ្ឋាន​នៅ​លើ​សម្ភារៈ​" នៅ​ក្នុង​ផ្នែក​ទី​ផ្សារ
 DocType: Appraisal Goal,Key Responsibility Area,តំបន់​ភារកិច្ច​សំខាន់
@@ -1885,9 +1891,9 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,អាសយដ្ឋាន​ទាំងអស់​។
 DocType: Company,Stock Settings,ការ​កំណត់​តម្លៃ​ភាគ​ហ៊ុន
 DocType: User,Bio,ជី​វ​ប្រវត្តិ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួម​បញ្ចូល​គ្នា​រវាង​គឺ​អាច​ធ្វើ​បាន​តែ​ប៉ុណ្ណោះ​ប្រសិន​បើ​មាន​លក្ខណៈ​សម្បត្តិ​ដូច​ខាង​ក្រោម​គឺ​ដូច​គ្នា​នៅ​ក្នុង​កំណត់​ត្រា​ទាំង​ពីរ​។ គឺ​ជា​ក្រុម​, ប្រភេទ​ជា Root ក្រុមហ៊ុន"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួម​បញ្ចូល​គ្នា​រវាង​គឺ​អាច​ធ្វើ​បាន​តែ​ប៉ុណ្ណោះ​ប្រសិន​បើ​មាន​លក្ខណៈ​សម្បត្តិ​ដូច​ខាង​ក្រោម​គឺ​ដូច​គ្នា​នៅ​ក្នុង​កំណត់​ត្រា​ទាំង​ពីរ​។ គឺ​ជា​ក្រុម​, ប្រភេទ​ជា Root ក្រុមហ៊ុន"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,គ្រប់គ្រង​ក្រុម​ផ្ទាល់ខ្លួន​ដើមឈើ​។
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,មជ្ឈមណ្ឌល​ការ​ចំណាយ​ថ្មី​របស់​ឈ្មោះ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,មជ្ឈមណ្ឌល​ការ​ចំណាយ​ថ្មី​របស់​ឈ្មោះ
 DocType: Leave Control Panel,Leave Control Panel,ទុក​ឱ្យ​ផ្ទាំង​បញ្ជា
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,រក​មិន​ឃើញ​ទំព័រ​គំរូ​លំនាំ​ដើម​អាសយដ្ឋាន​។ សូម​បង្កើត​ថ្មី​មួយ​ពី​ការ​ដំឡើង​> បោះពុម្ព​និង​យីហោ​> អាស័យ​ពុម្ព​។
 DocType: Appraisal,HR User,ធនធានមនុស្ស​របស់​អ្នកប្រើប្រាស់
@@ -1905,17 +1911,17 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,ព​ត៌​មាន​នៃ​ឧបករណ៍​ទូទាត់​ប្រាក់
 ,Sales Browser,កម្មវិធី​រុករក​ការ​លក់
 DocType: Journal Entry,Total Credit,ឥណទាន​សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,ក្នុង​តំបន់
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ក្នុង​តំបន់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ឥណទាន​និង​បុរេប្រទាន (ទ្រព្យសម្បត្តិ​)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ជំពាក់​បំណុល
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,ដែល​មាន​ទំហំ​ធំ
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,គ្មាន​និយោជិត​រក​ឃើញ​!
 DocType: C-Form Invoice Detail,Territory,ស​ណ្ធា​ន​ដី
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,សូម​និយាយ​ពី​មិន​មាន​នៃ​ការ​មើល​ដែល​បាន​ទាមទារ
+DocType: Purchase Order,Customer Address Display,អាសយដ្ឋាន​អតិថិជន​បង្ហាញ
 DocType: Stock Settings,Default Valuation Method,វិធី​សា​ស្រ្ត​វាយតម្លៃ​លំនាំ​ដើម
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,ខាត់
 DocType: Production Order Operation,Planned Start Time,ពេលវេលា​ចាប់ផ្ដើម​គ្រោងទុក
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,ត្រៀម​បម្រុង​ទុក
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,តារាង​តុល្យការ​ជិតស្និទ្ធ​និង​សៀវភៅ​ចំណ​ញ​ឬ​ខាត​។
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,បញ្ជាក់​អត្រា​ប្តូ​រ​ប្រាក់​ដើម្បី​បម្លែង​រូបិយ​ប័ណ្ណ​មួយ​ទៅ​មួយ​ផ្សេង​ទៀត
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ចំនួន​សរុប
@@ -1930,7 +1936,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,នេះ​គឺជា​ក្រុម​អតិថិជន​ជា root និង​មិន​អាច​ត្រូវ​បាន​កែសម្រួល​។
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,សូម​រៀបចំ​ការ​គំនូស​តាង​របស់​អ្នក​គណនី​របស់​អ្នក​មុន​ពេល​អ្នក​ចាប់​ផ្តើ​ម​ធាតុ​គណនេយ្យ
 DocType: Purchase Invoice,Ignore Pricing Rule,មិន​អើពើ​វិធាន​តម្លៃ
-sites/assets/js/list.min.js +24,Cancelled,លុបចោល
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,លុបចោល
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,ពី​កាល​បរិច្ឆេទ​ក្នុង​រចនាសម្ព័ន្ធ​ប្រាក់ខែ​មិន​អាច​មាន​តិច​ជាង​បុគ្គលិក​កាលបរិច្ឆេទ​ការ​ចូលរួម​។
 DocType: Employee Education,Graduate,បាន​បញ្ចប់​ការ​សិក្សា
 DocType: Leave Block List,Block Days,ប្លុក​ថ្ងៃ
@@ -1974,15 +1980,15 @@ DocType: Account,Stock Received But Not Billed,ភាគ​ហ៊ុន​បា
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ចំនួន​សរុប​បាន​ចំនួន​ទឹកប្រាក់​ប្រាក់ខែ + + + + Encashment បំណុល - ការ​កាត់​សរុប
 DocType: Monthly Distribution,Distribution Name,ឈ្មោះ​ចែកចាយ
 DocType: Features Setup,Sales and Purchase,ការ​លក់​និង​ទិញ
-DocType: Purchase Order Item,Material Request No,សម្ភារៈ​គ្មាន​សំណើ​រ
+DocType: Supplier Quotation Item,Material Request No,សម្ភារៈ​គ្មាន​សំណើ​រ
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,អត្រា​រូបិយប័ណ្ណ​អតិថិជន​ដែល​ត្រូវ​បាន​បម្លែង​ទៅ​ជា​រូបិយប័ណ្ណ​មូលដ្ឋាន​របស់​ក្រុមហ៊ុន
 DocType: Purchase Invoice Item,Net Rate (Company Currency),អត្រា​ការ​ប្រាក់​សុទ្ធ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
-apps/frappe/frappe/templates/base.html +132,Added,បាន​បន្ថែម
+apps/frappe/frappe/templates/base.html +134,Added,បាន​បន្ថែម
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,គ្រប់គ្រង​ដើមឈើ​មួយ​ដើម​ដែនដី​។
 DocType: Journal Entry Account,Sales Invoice,វិ​ក័​យ​ប័ត្រ​ការ​លក់
 DocType: Journal Entry Account,Party Balance,តុល្យភាព​គណបក្ស
 DocType: Sales Invoice Item,Time Log Batch,កំណត់​ហេតុ​ម៉ោង​បាច់
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,សូម​ជ្រើសរើស​អនុវត្ត​បញ្ចុះតម្លៃ​នៅ​លើ
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,សូម​ជ្រើសរើស​អនុវត្ត​បញ្ចុះតម្លៃ​នៅ​លើ
 DocType: Company,Default Receivable Account,គណនី​អ្នក​ទទួល​លំនាំ​ដើម
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,បង្កើត​ធាតុ​របស់​ធនាគារ​ចំពោះ​ប្រាក់​បៀវត្ស​សរុប​ដែល​បាន​បង់​សម្រាប់​លក្ខណៈ​វិនិច្ឆ័យ​ដែល​បាន​ជ្រើស​ខាងលើ
 DocType: Stock Entry,Material Transfer for Manufacture,ផ្ទេរ​សម្រាប់​ការផលិត​សម្ភារៈ
@@ -2026,7 +2032,7 @@ DocType: Maintenance Visit,Scheduled,កំណត់​ពេល​វេលា
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",សូម​ជ្រើស​ធាតុ​ដែល "គឺ​ជា​ធាតុ​ហ៊ុន​" គឺ "ទេ​" ហើយ "តើ​ធាតុ​លក់​" គឺ​ជា "បាទ​" ហើយ​មិន​មាន​កញ្ចប់​ផលិត​ផល​ផ្សេង​ទៀត
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ជ្រើស​ដើម្បី​មិន​ស្មើគ្នា​ចែកចាយ​ប្រចាំខែ​គោលដៅ​នៅ​ទូទាំង​ខែ​ចែកចាយ​។
 DocType: Purchase Invoice Item,Valuation Rate,អត្រា​ការ​វាយ​តម្លៃ
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,រូបិយប័ណ្ណ​បញ្ជី​តម្លៃ​មិន​បាន​ជ្រើស​រើស
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,រូបិយប័ណ្ណ​បញ្ជី​តម្លៃ​មិន​បាន​ជ្រើស​រើស
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ការ​ចាប់​ផ្តើ​ម​គម្រោង​កាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,រហូត​មក​ដល់
 DocType: Rename Tool,Rename Log,ប្តូ​រ​ឈ្មោះ​ចូល
@@ -2051,13 +2057,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,មាន​តែ​ថ្នាំង​ស្លឹក​ត្រូវ​បាន​អនុញ្ញាត​ក្នុង​ប្រតិ​ប​ត្តិ​ការ
 DocType: Expense Claim,Expense Approver,ការ​អនុម័ត​ការ​ចំណាយ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ធាតុ​បង្កាន់ដៃ​ទិញ​សហ​ការី
-sites/assets/js/erpnext.min.js +48,Pay,បង់​ប្រាក់
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,បង់​ប្រាក់
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,ដើម្បី Datetime
 DocType: SMS Settings,SMS Gateway URL,URL ដែល​បាន​សារ SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,កំណត់​ហេតុ​សម្រាប់​ការ​រក្សា​ស្ថានភាព​ចែក​ចាយ​ផ្ញើ​សារ​ជា​អក្សរ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,កិន
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,បង្រួញ​រុំ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,សកម្មភាព​ដែល​មិន​ទាន់​សម្រេច
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,សកម្មភាព​ដែល​មិន​ទាន់​សម្រេច
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,បាន​បញ្ជាក់​ថា
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ក្រុមហ៊ុន​ផ្គត់ផ្គង់​> ប្រភេទ​ផ្គត់ផ្គង់
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,សូម​បញ្ចូល​កាលបរិច្ឆេទ​បន្ថយ​។
@@ -2068,7 +2074,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ប
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,កាសែត​បោះពុម្ពផ្សាយ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ជ្រើស​ឆ្នាំ​សារពើពន្ធ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,រំលាយ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,អ្នក​គឺ​ជា​អ្នក​ដែល​មាន​ការ​យល់​ព្រម​ចាកចេញ​សម្រាប់​កំណត់​ត្រា​នេះ​។ សូម​ធ្វើ​ឱ្យ​ទាន់​សម័យ​នេះ 'ស្ថានភាព​' និង​រក្សាទុក
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,រៀបចំ​វគ្គ
 DocType: Attendance,Attendance Date,ការ​ចូលរួម​កាលបរិច្ឆេទ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ការ​បែកបាក់​គ្នា​ដោយ​ផ្អែក​លើ​ការ​រក​ប្រាក់​ចំណូល​បាន​ប្រាក់​ខែ​និង​ការ​កាត់​។
@@ -2103,6 +2108,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ជាមួយ​នឹង​ការ​ប្រតិ​ប​ត្តិ​ការ​នៃ​មជ្ឈមណ្ឌល​ការ​ចំណាយ​ដែល​មាន​ស្រាប់​ដែល​មិន​អាច​ត្រូវ​បាន​បម្លែង​ទៅ​ជា​ក្រុម
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,រំលស់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ក្រុមហ៊ុន​ផ្គត់ផ្គង់ (s បាន​)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,រយៈ​ពេល​មិន​ត្រឹមត្រូវ
 DocType: Customer,Credit Limit,ដែន​កំណត់​ឥណទាន
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,ជ្រើស​ប្រភេទ​នៃ​ការ​ប្រតិ​ប​ត្តិ​ការ
 DocType: GL Entry,Voucher No,កាត​មាន​ទឹក​ប្រាក់​គ្មាន
@@ -2111,7 +2117,7 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,ទ
 DocType: Customer,Address and Contact,អាស័យ​ដ្ឋាន​និង​ទំនាក់ទំនង
 DocType: Customer,Last Day of the Next Month,ចុង​ក្រោយ​កាល​ពី​ថ្ងៃ​នៃ​ខែ​បន្ទាប់
 DocType: Employee,Feedback,មតិ​អ្នក
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint ។ កាលវិភាគ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint ។ កាលវិភាគ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ម៉ាស៊ីន​យន្តហោះ​សំណឹក
 DocType: Stock Settings,Freeze Stock Entries,ធាតុ​បង្ក​ហ៊ុន
 DocType: Website Settings,Website Settings,ការ​កំណត់​វេ​ប​សាយ
@@ -2125,7 +2131,7 @@ DocType: Quality Inspection,Outgoing,ចេញ
 DocType: Material Request,Requested For,ស្នើ​សម្រាប់
 DocType: Quotation Item,Against Doctype,ប្រឆាំង​នឹង​ការ DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,តាមដាន​ការ​ដឹកជញ្ជូន​ចំណាំ​នេះ​ប្រឆាំង​នឹង​គម្រោង​ណាមួយ​ឡើយ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,គណនី root មិន​អាច​ត្រូវ​បាន​លុប
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,គណនី root មិន​អាច​ត្រូវ​បាន​លុប
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,បង្ហាញ​ធាតុ​ហ៊ុន
 ,Is Primary Address,គឺ​ជា​អាសយដ្ឋាន​បឋមសិក្សា
 DocType: Production Order,Work-in-Progress Warehouse,ការងារ​ក្នុង​វឌ្ឍនភាព​ឃ្លាំង
@@ -2137,7 +2143,7 @@ DocType: Journal Entry,User Remark,សំគាល់​របស់​អ្ន
 DocType: Lead,Market Segment,ចំណែក​ទីផ្សារ
 DocType: Communication,Phone,ទូរស័ព្ទ
 DocType: Employee Internal Work History,Employee Internal Work History,ប្រវត្តិ​ការងារ​របស់​បុគ្គលិក​ផ្ទ​​ៃក្នុង
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),បិទ (លោក​បណ្ឌិត​)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),បិទ (លោក​បណ្ឌិត​)
 DocType: Contact,Passive,អ​កម្ម
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,ពុម្ព​ពន្ធ​លើ​ការ​លក់​ការ​ធ្វើ​ប្រតិបត្តិការ​។
 DocType: Sales Invoice,Write Off Outstanding Amount,បិទ​ការ​សរសេរ​ចំនួន​ទឹកប្រាក់​ដ៏​ឆ្នើម
@@ -2152,7 +2158,7 @@ DocType: Sales Invoice Item,Available Qty at Warehouse,ដែល​អាច​
 DocType: Bank Reconciliation,Bank Reconciliation,ធនាគារ​ការផ្សះផ្សា
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ទទួល​បាន​ការ​ធ្វើ​ឱ្យ​ទាន់សម័យ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,បន្ថែម​កំណត់ត្រា​គំរូ​មួយ​ចំនួន​ដែល
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,ទុក​ឱ្យ​ការ​គ្រប់​គ្រង
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,ទុក​ឱ្យ​ការ​គ្រប់​គ្រង
 DocType: Event,Groups,ក្រុម​អ្នក
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ក្រុម​តាម​គណនី
 DocType: Sales Order,Fully Delivered,ផ្តល់​ឱ្យ​បាន​ពេញ​លេញ
@@ -2162,7 +2168,6 @@ DocType: Payment Tool,Against Vouchers,ប្រឆាំង​នឹង​ប
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,ជំនួយ​រហ័ស
 DocType: Features Setup,Sales Extras,ការ​លក់​បន្ថែម
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",គណនី​មាន​ភាព​ខុស​គ្នា​ត្រូវ​តែ​ជា​គណនី​ប្រភេទ​ទ្រព្យសកម្ម / ការទទួលខុសត្រូវ​ចាប់​តាំង​ពី​ការ​ផ្សះផ្សា​នេះ​គឺ​ផ្សារ​ភាគ​ហ៊ុន​ការ​បើក​ជា​មួយ​ធាតុ
-DocType: Leave Allocation,Carry Forwarded Leaves,អនុវត្ត​ស្លឹក​បញ្ជូន​បន្ត
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"ពី​កាល​បរិច្ឆេទ​" ត្រូវ​តែ​មាន​បន្ទាប់ 'ដើម្បី​កាលបរិច្ឆេទ "
 ,Stock Projected Qty,គម្រោង Qty ផ្សារ​ភាគ​ហ៊ុន
 DocType: Sales Order,Customer's Purchase Order,ទិញ​លំដាប់​របស់​អតិថិជន
@@ -2177,12 +2182,11 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,ការ​លក់​រាយ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,ឥណទាន​ទៅ​គណនី​ត្រូវ​តែ​មាន​តារាង​តុល្យការ​គណនី
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ក្រុមហ៊ុន​ផ្គត់ផ្គង់​គ្រប់​ប្រភេទ
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,ក្រម​ធាតុ​គឺ​ជា​ចាំបាច់​ដោយ​សារ​តែ​ធាតុ​បង់​លេខ​ដោយ​ស្វ័យ​ប្រវត្តិ​គឺ​មិន
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,ក្រម​ធាតុ​គឺ​ជា​ចាំបាច់​ដោយ​សារ​តែ​ធាតុ​បង់​លេខ​ដោយ​ស្វ័យ​ប្រវត្តិ​គឺ​មិន
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,កាលវិភាគ​ធាតុ​ថែទាំ
 DocType: Sales Order,%  Delivered,% ដឹកនាំ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ធនាគារ​រូបា​រូប
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,ធ្វើ​ឱ្យ​ប្រាក់ខែ​គ្រូពេទ្យ​ប្រហែលជា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,ឮ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,រក​មើល Bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,ការ​ផ្តល់​កម្ចី​ដែល​មាន​សុវត្ថិភាព
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ផលិតផល​ដែល​ប្រសើរ
@@ -2205,7 +2209,7 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ចំនួន​ទឹកប្រាក់​សុទ្ធ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 DocType: BOM Operation,Hour Rate,ហួរ​អត្រា
 DocType: Stock Settings,Item Naming By,ធាតុ​ដាក់ឈ្មោះ​តាម
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,ចាប់​ពី​សម្រង់
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,ចាប់​ពី​សម្រង់
 DocType: Production Order,Material Transferred for Manufacturing,សម្ភារៈ​ផ្ទេរ​សម្រាប់​កម្មន្តសាល
 DocType: Purchase Receipt Item,Purchase Order Item No,ទិញ​ធាតុ​លំដាប់​គ្មាន
 DocType: System Settings,System Settings,កំណត់​ប្រព័ន្ធ
@@ -2219,7 +2223,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ទំ​ង​ន់​សរុប​នៃ​កញ្ចប់​។ ជា​ធម្មតា​មាន​ទម្ងន់​សុទ្ធ + + ការ​វេច​ខ្ចប់​មាន​ទម្ងន់​សម្ភារៈ​។ (សម្រាប់​ការ​បោះពុម្ព​)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,អ្នក​ប្រើ​ដែល​មាន​តួនាទី​នេះ​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​កំណត់​គណនី​របស់​ទឹកកក​និង​បង្កើត / កែប្រែ​ធាតុ​គណនេយ្យ​ប្រឆាំង​នឹង​គណនី​ជា​ទឹកកក
 DocType: Serial No,Is Cancelled,ត្រូវ​បាន​លុបចោល
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,ការ​នាំ​ចេញ​របស់​យើង
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,ការ​នាំ​ចេញ​របស់​យើង
 DocType: Journal Entry,Bill Date,លោក Bill កាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",បើ​ទោះ​បី​ជា​មាន​ច្បាប់​តម្លៃ​ច្រើន​ដែល​មាន​អាទិភាព​ខ្ពស់​បំផុត​បន្ទាប់​មក​បន្ទាប់​ពី​មាន​អាទិភាព​ផ្ទៃក្នុង​ត្រូវ​បាន​អនុវត្ត​:
 DocType: Supplier,Supplier Details,ព​ត៌​មាន​លំអិត​ក្រុមហ៊ុន​ផ្គត់ផ្គង់
@@ -2231,7 +2235,7 @@ DocType: Hub Settings,Publish Items to Hub,បោះពុម្ព​ផ្ស
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ការ​ផ្ទេរ​ខ្សែ
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,សូម​ជ្រើស​រើស​គណនី​ធនាគារ
 DocType: Newsletter,Create and Send Newsletters,បង្កើត​និង​ផ្ញើ​ការ​ពិពណ៌នា
-sites/assets/js/report.min.js +107,From Date must be before To Date,ចាប់​ពី​កាលបរិច្ឆេទ​ត្រូវ​តែ​ជា​កាលបរិច្ឆេទ​មុន
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,ចាប់​ពី​កាលបរិច្ឆេទ​ត្រូវ​តែ​ជា​កាលបរិច្ឆេទ​មុន
 DocType: Sales Order,Recurring Order,លំដាប់​កើតឡើង
 DocType: Company,Default Income Account,គណនី​ចំណូល​លំនាំ​ដើម
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ក្រុម​ផ្ទាល់ខ្លួន / អតិថិជន
@@ -2249,18 +2253,17 @@ DocType: Issue,Opening Date,ពិធី​បើក​កាលបរិច្
 DocType: Journal Entry,Remark,សំគាល់
 DocType: Purchase Receipt Item,Rate and Amount,អត្រា​ការ​ប្រាក់​និង​ចំនួន
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,គួរ​ឱ្យ​ធុញ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,ពី​ការ​លក់​ស​ណ្តា​ប់​ធ្នាប់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,ពី​ការ​លក់​ស​ណ្តា​ប់​ធ្នាប់
 DocType: Blog Category,Parent Website Route,ផ្លូវ​របស់​ឪពុក​ម្តាយ​គេហទំព័រ
 DocType: Sales Order,Not Billed,មិន​បាន​ផ្សព្វ​ផ្សាយ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,ឃ្លាំង​ទាំង​ពីរ​ត្រូវ​តែ​ជា​កម្មសិទ្ធិ​របស់​ក្រុមហ៊ុន​ដូច​គ្នា
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,គ្មាន​ទំនាក់ទំនង​បាន​បន្ថែម​នៅ​ឡើយ​ទេ​។
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,គ្មាន​ទំនាក់ទំនង​បាន​បន្ថែម​នៅ​ឡើយ​ទេ​។
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,មិន​សកម្ម
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,ការ​ប្រឆាំង​នឹង​ការ​វិ​ក័​យ​ប័ត្រ Post Date
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ចំនួន​ប័ណ្ណ​ការ​ចំណាយ​បាន​ចុះ​ចត
 DocType: Time Log,Batched for Billing,Batched សម្រាប់​វិ​ក័​យ​ប័ត្រ
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,វិ​ក័​យ​ប័ត្រ​ដែល​បាន​លើកឡើង​ដោយ​អ្នក​ផ្គត់​ផ្គង់​។
 DocType: POS Profile,Write Off Account,បិទ​ការ​សរសេរ​គណនី
-sites/assets/js/erpnext.min.js +26,Discount Amount,ចំនួន​ការ​បញ្ចុះ​តំលៃ
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,ចំនួន​ការ​បញ្ចុះ​តំលៃ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ការ​វិល​ត្រឡប់​ពី​ការ​ប្រឆាំង​នឹង​ការ​ទិញ​វិ​ក័​យ​ប័ត្រ
 DocType: Item,Warranty Period (in days),ការ​ធានា​រយៈ​ពេល (នៅ​ក្នុង​ថ្ងៃ​)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ឧ​អាករ​លើ​តម្លៃ​បន្ថែម
@@ -2296,10 +2299,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,សេចក្ដី​លម្អិត​អតិថិជន​ឬ​ផ្គត់​ផ្គង់
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,កំណត់
 DocType: Lead,Lead Owner,ការ​នាំ​មុខ​ម្ចាស់
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,ឃ្លាំង​ត្រូវ​បាន​ទាមទារ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,ឃ្លាំង​ត្រូវ​បាន​ទាមទារ
 DocType: Employee,Marital Status,ស្ថានភាព​គ្រួសារ
 DocType: Stock Settings,Auto Material Request,សម្ភារៈ​ស្នើ​សុំ​ដោយ​ស្វ័យ​ប្រវត្តិ
 DocType: Time Log,Will be updated when billed.,នឹង​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​នៅ​ពេល​ដែល​បាន​ផ្សព្វ​ផ្សាយ​។
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qty បាច់​អាច​រក​បាន​នៅ​ពី​ឃ្លាំង
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Bom បច្ចុប្បន្ន​និង​ថ្មី Bom មិន​អាច​ជា​ដូច​គ្នា
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,កាល​បរិច្ឆេទ​នៃ​ការ​ចូល​និវត្តន៍​ត្រូវ​តែ​ធំ​ជាង​កាលបរិច្ឆេទ​នៃ​ការ​ចូលរួម
 DocType: Sales Invoice,Against Income Account,ប្រឆាំង​នឹង​គណនី​ចំណូល
@@ -2314,11 +2318,11 @@ DocType: POS Profile,Update Stock,ធ្វើ​ឱ្យ​ទាន់​ស
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ផ្សេង​គ្នា​សម្រាប់​ធាតុ​នឹង​នាំ​ឱ្យ​មាន​មិន​ត្រឹមត្រូវ (សរុប​) តម្លៃ​ទម្ងន់​សុទ្ធ​។ សូម​ប្រាកដ​ថា​ទម្ងន់​សុទ្ធ​នៃ​ធាតុ​គ្នា​គឺ​នៅ UOM ដូច​គ្នា​។
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,អត្រា Bom
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,សូម​ទាញ​ធាតុ​ពី​ការ​ដឹកជញ្ជូន​ចំណាំ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,សូម​ទាញ​ធាតុ​ពី​ការ​ដឹកជញ្ជូន​ចំណាំ
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","កំណត់ហេតុ​នៃ​ការ​ទំនាក់ទំនង​ទាំង​អស់​នៃ​ប្រភេទ​អ៊ីមែល​ទូរស័ព្ទ​ជជែក​កំសាន្ត​, ដំណើរ​ទស្សនកិច្ច​, ល"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,សូម​និយាយ​ពី​មជ្ឈ​មណ្ឌល​ការ​ចំណាយ​មូល​បិទ​ក្នុង​ក្រុមហ៊ុន
 DocType: Purchase Invoice,Terms,លក្ខខណ្ឌ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,បង្កើត​ថ្មី
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,បង្កើត​ថ្មី
 DocType: Buying Settings,Purchase Order Required,ទិញ​លំដាប់​ដែល​បាន​ទាមទារ
 ,Item-wise Sales History,ប្រវត្តិ​លក់​ធាតុ​ប្រាជ្ញា
 DocType: Expense Claim,Total Sanctioned Amount,ចំនួន​ទឹកប្រាក់​ដែល​បាន​អនុញ្ញាត​សរុប
@@ -2332,16 +2336,17 @@ apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a ro
 DocType: Salary Slip Deduction,Salary Slip Deduction,ការ​កាត់​គ្រូពេទ្យ​ប្រហែលជា​ប្រាក់​បៀវត្ស
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,កំណត់​ត្រា
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,ជ្រើស​ថ្នាំង​ជា​ក្រុម​មួយ​ជា​លើក​ដំបូង​។
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,បំពេញ​សំណុំ​បែបបទ​និង​រក្សា​ទុក​វា
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,បំពេញ​សំណុំ​បែបបទ​និង​រក្សា​ទុក​វា
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ទាញ​យក​របាយការណ៍​ដែល​មាន​វត្ថុ​ធាតុ​ដើម​ទាំង​អស់​ដែល​មាន​ស្ថានភាព​សារពើ​ភ័​ណ្ឌ​ចុងក្រោយ​បំផុត​របស់​ពួក​គេ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,ប្រឈម​មុខ​នឹង​ការ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,វេទិកា​សហគមន៍
 DocType: Leave Application,Leave Balance Before Application,ទុក​ឱ្យ​តុល្យភាព​មុន​ពេល​ដាក់ពាក្យ​ស្នើសុំ
 DocType: SMS Center,Send SMS,ផ្ញើ​សារ​ជា​អក្សរ
 DocType: Company,Default Letter Head,លំនាំ​ដើម​លិខិត​នាយក
 DocType: Time Log,Billable,Billable
 DocType: Authorization Rule,This will be used for setting rule in HR module,ការ​នេះ​នឹង​ត្រូវ​បាន​ប្រើ​សម្រាប់​ការ​កំណត់​ក្បួន​នៅ​ក្នុង​ម៉ូឌុល​ធនធានមនុស្ស
 DocType: Account,Rate at which this tax is applied,អត្រា​ដែល​ពន្ធ​នេះ​ត្រូវ​បាន​អនុវត្ត
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,រៀបចំ Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,រៀបចំ Qty
 DocType: Company,Stock Adjustment Account,គណនី​កែតម្រូវ​ភាគ​ហ៊ុន
 DocType: Journal Entry,Write Off,បិទ​ការ​សរសេរ
 DocType: Time Log,Operation ID,លេខ​សម្គាល់​ការ​ប្រតិ​ប​ត្ដិ​ការ
@@ -2351,11 +2356,14 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","វាល​បញ្ចុះ​តម្លៃ​នឹង​មាន​នៅ​ក្នុង​ការ​ទិញ​លំដាប់​, ទទួល​ទិញ​, ទិញ​វិ​ក័​យ​ប័ត្រ"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ឈ្មោះ​នៃ​គណនី​ថ្មី​។ ចំណាំ​: សូម​កុំ​បង្កើត​គណនី​សម្រាប់​អតិថិជន​និង​អ្នក​ផ្គត់​ផ្គង់
 DocType: Report,Report Type,ប្រភេទ​របាយការណ៍
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,កំពុង​ផ្ទុក
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,កំពុង​ផ្ទុក
 DocType: BOM Replace Tool,BOM Replace Tool,Bom ជំនួស​ឧបករណ៍
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ប្រទេស​អាស័យ​ដ្ឋាន​ពុម្ព​លំនាំ​ដើម​របស់​អ្នក​មាន​ប្រាជ្ញា
+DocType: Sales Order Item,Supplier delivers to Customer,ក្រុមហ៊ុន​ផ្គត់​ផ្គង់​បាន​ផ្ដល់​នូវ​ការ​ទៅ​ឱ្យ​អតិថិជន
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,សម្រាក​ឡើង​ពន្ធ​លើ​ការ​បង្ហាញ
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,នាំចូល​ទិន្នន័យ​និង​ការ​នាំ​ចេញ
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',ប្រសិន​បើ​លោក​អ្នក​មាន​ការ​ចូលរួម​ក្នុង​សកម្មភាព​ផលិតកម្ម​។ អនុញ្ញាត​ឱ្យ​មាន​ធាតុ "ត្រូវ​បាន​ផលិត​"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,កាលបរិច្ឆេទ​វិ​ក្ក័​យ​ប័ត្រ
 DocType: Sales Invoice,Rounded Total,សរុប​មាន​រាង​មូល
 DocType: Product Bundle,List items that form the package.,ធាតុ​បញ្ជី​ដែល​បង្កើត​ជា​កញ្ចប់​។
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ការបែងចែក​គួរ​តែ​ស្មើ​ជា​ភាគរយ​ទៅ 100​%
@@ -2365,7 +2373,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard tur
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,ធ្វើ​ឱ្យ​ការ​ថែទាំ​ទស្សនកិច្ច
 DocType: Company,Default Cash Account,គណនី​សាច់ប្រាក់​លំនាំ​ដើម
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ក្រុមហ៊ុន (មិន​មាន​អតិថិជន​ឬ​ផ្គត់​) មេ​។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',សូម​បញ្ចូល 'កាលបរិច្ឆេទ​ដឹកជញ្ជូន​រំពឹង​ទុក "
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',សូម​បញ្ចូល 'កាលបរិច្ឆេទ​ដឹកជញ្ជូន​រំពឹង​ទុក "
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួន​ទឹកប្រាក់​ដែល​បង់ + + បិទ​សរសេរ​ចំនួន​ទឹកប្រាក់​ដែល​មិន​អាច​ត្រូវ​បាន​ធំជាង​សម្ពោធ​សរុប
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",ចំណាំ​: ប្រសិន​បើ​ការ​ទូទាត់​មិន​ត្រូវ​បាន​ធ្វើ​ប្រឆាំង​នឹង​ឯកសារ​យោង​ណា​មួយ​ដែល​ធ្វើ​ឱ្យ​ធាតុ​ទិនានុប្បវត្តិ​ដោយ​ដៃ​។
 DocType: Item,Supplier Items,ក្រុមហ៊ុន​ផ្គត់ផ្គង់​ធាតុ
@@ -2380,11 +2388,12 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot b
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ដែល​បាន​កំណត់​ជា​បើក​ទូលាយ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ផ្ញើ​អ៊ី​ម៉ែ​ល​ដោយ​ស្វ័យ​ប្រវត្តិ​ទៅ​ទំនាក់ទំនង​នៅ​លើ​ដាក់​ស្នើ​ប្រតិបត្តិការ​។
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ធាតុ 3
+DocType: Purchase Order,Customer Contact Email,ទំនាក់ទំនង​អតិថិជន​អ៊ី​ម៉ែ​ល
 DocType: Event,Sunday,កាល​ពី​ថ្ងៃ​អាទិត្យ
 DocType: Sales Team,Contribution (%),ចំ​ែ​ណ​ក (%​)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ​: ការ​ទូទាត់​នឹង​មិន​ចូល​ត្រូវ​បាន​បង្កើត​តាំង​ពី​សាច់ប្រាក់​ឬ​គណនី​ធនាគារ 'មិន​ត្រូវ​បាន​បញ្ជាក់
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,ការ​ទទួល​ខុស​ត្រូវ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,ទំព័រ​គំរូ
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ទំព័រ​គំរូ
 DocType: Sales Person,Sales Person Name,ការ​លក់​ឈ្មោះ​បុគ្គល
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,សូម​បញ្ចូល​យ៉ាងហោចណាស់ 1 វិ​ក័​យ​ប័ត្រ​ក្នុង​តារាង
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,បន្ថែម​អ្នក​ប្រើ
@@ -2402,7 +2411,7 @@ DocType: Journal Entry,Printing Settings,ការ​កំណត់​បោះ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,រថ​យ​ន្ដ
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,ធាតុ​ត្រូវ​បាន​ទាមទារ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,ចាក់​ថ្នាំ​ធ្វើ​ពី​ដែក​ផ្សិត
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,ពី​ការ​ដឹកជញ្ជូន​ចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ពី​ការ​ដឹកជញ្ជូន​ចំណាំ
 DocType: Time Log,From Time,ចាប់​ពី​ពេល​វេលា
 DocType: Notification Control,Custom Message,សារ​ផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,ធនាគារ​វិនិយោគ
@@ -2417,15 +2426,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,ហ
 DocType: Newsletter,A Lead with this email id should exist,អ្នក​ដឹក​នាំ​ដែល​មាន​លេខ​សម្គាល់​អ៊ីមែល​នេះ​គួរ​តែ​មាន
 DocType: Stock Entry,From BOM,ចាប់​ពី Bom
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,ជា​មូលដ្ឋាន
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',សូម​ចុច​លើ 'បង្កើត​កាលវិភាគ "
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,គួរ​មាន​កាលបរិច្ឆេទ​ដូច​គ្នា​ជា​ពី​កាល​បរិច្ឆេទ​ការ​ឈប់​ពាក់​ក​ណ្តា​ល​ថ្ងៃ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',សូម​ចុច​លើ 'បង្កើត​កាលវិភាគ "
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,គួរ​មាន​កាលបរិច្ឆេទ​ដូច​គ្នា​ជា​ពី​កាល​បរិច្ឆេទ​ការ​ឈប់​ពាក់​ក​ណ្តា​ល​ថ្ងៃ
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","ឧ​គីឡូក្រាម​, អង្គភាព​, NOS លោក​ម៉ែត្រ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,សេចក្តី​យោង​មិន​មាន​ជា​ការ​ចាំបាច់​បំផុត​ប្រសិន​បើ​អ្នក​បាន​បញ្ចូល​សេចក្តី​យោង​កាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,សេចក្តី​យោង​មិន​មាន​ជា​ការ​ចាំបាច់​បំផុត​ប្រសិន​បើ​អ្នក​បាន​បញ្ចូល​សេចក្តី​យោង​កាលបរិច្ឆេទ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,កាលបរិច្ឆេទ​នៃ​ការ​ចូលរួម​ត្រូវ​តែ​ធំ​ជាង​ថ្ងៃខែ​ឆ្នាំ​កំណើត
 DocType: Salary Structure,Salary Structure,រចនាសម្ព័ន្ធ​ប្រាក់​បៀវត្ស
 DocType: Account,Bank,ធនាគារ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,ក្រុមហ៊ុន​អាកាស​ចរ​ណ៍
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,សម្ភារៈ​បញ្ហា
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,សម្ភារៈ​បញ្ហា
 DocType: Material Request Item,For Warehouse,សម្រាប់​ឃ្លាំង
 DocType: Employee,Offer Date,ការ​ផ្តល់​ជូន​កាលបរិច្ឆេទ
 DocType: Hub Settings,Access Token,ការ​ចូល​ដំណើរ​ការ Token
@@ -2448,6 +2457,7 @@ DocType: Issue,Opening Time,ម៉ោង​បើក
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ពី​និង​ដើម្បី​កាលបរិច្ឆេទ​ដែល​បាន​ទាមទារ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,ផ្លាស់​ប្តូ​រ​ទំនិញ​និង​មូលបត្រ
 DocType: Shipping Rule,Calculate Based On,គណនា​មូលដ្ឋាន​នៅ​លើ
+DocType: Delivery Note Item,From Warehouse,ចាប់​ពី​ឃ្លាំង
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ការ​ខួង
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ផ្សិត​ខក​ចិត្ត
 DocType: Purchase Taxes and Charges,Valuation and Total,ការ​វាយ​តម្លៃ​និង​សរុប
@@ -2468,10 +2478,11 @@ DocType: C-Form,Amended From,ធ្វើ​វិសោធនកម្ម​ព
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,វត្ថុ​ធាតុ​ដើម
 DocType: Leave Application,Follow via Email,សូម​អនុវត្ត​តាម​រយៈ​អ៊ី​ម៉ែ​ល
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ចំនួន​ប្រាក់​ពន្ធ​បន្ទាប់​ពី​ចំនួន​ទឹកប្រាក់​ដែល​បញ្ចុះតម្លៃ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,គណនី​កុមារ​ដែល​មាន​សម្រាប់​គណនី​នេះ​។ អ្នក​មិន​អាច​លុប​គណនី​នេះ​។
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,គណនី​កុមារ​ដែល​មាន​សម្រាប់​គណនី​នេះ​។ អ្នក​មិន​អាច​លុប​គណនី​នេះ​។
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ទាំង qty គោលដៅ​ឬ​ចំនួន​គោល​ដៅ​គឺ​ជា​ចាំបាច់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,សូម​ជ្រើសរើស​កាលបរិច្ឆេទ​ដំបូង​គេ​បង្អស់
-DocType: Leave Allocation,Carry Forward,អនុវត្ត​ការ​ទៅ​មុខ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,សូម​ជ្រើសរើស​កាលបរិច្ឆេទ​ដំបូង​គេ​បង្អស់
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,បើក​កាលបរិច្ឆេទ​គួរ​តែ​មាន​មុន​កាល​បរិចេ្ឆទ​ផុតកំណត់
+DocType: Leave Control Panel,Carry Forward,អនុវត្ត​ការ​ទៅ​មុខ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,មជ្ឈមណ្ឌល​ប្រាក់​ដែល​មាន​ស្រាប់​ការ​ចំណាយ​ដែល​មិន​អាច​ត្រូវ​បាន​បម្លែង​ទៅ​ជា​សៀវភៅ
 DocType: Department,Days for which Holidays are blocked for this department.,ថ្ងៃ​ដែល​ថ្ងៃ​ឈប់​សម្រាក​ត្រូវ​បាន​បិទ​សម្រាប់​នាយកដ្ឋាន​នេះ​។
 ,Produced,រថយន្ត​នេះ​ផលិត
@@ -2493,11 +2504,11 @@ DocType: Purchase Order,The date on which recurring order will be stop,ថ្ង
 DocType: Quality Inspection,Item Serial No,គ្មាន​សៀរៀល​ធាតុ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,បច្ចុប្បន្ន​សរុប
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ហួរ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,ផ្ទេរ​សម្ភារៈ​ដើម្បី​ផ្គត់​ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,ផ្ទេរ​សម្ភារៈ​ដើម្បី​ផ្គត់​ផ្គង់
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,គ្មាន​ស៊េរី​ថ្មី​នេះ​មិន​អាច​មាន​ឃ្លាំង​។ ឃ្លាំង​ត្រូវ​តែ​ត្រូវ​បាន​កំណត់​ដោយ​បង្កាន់ដៃ​ហ៊ុន​ទិញ​ចូល​ឬ
 DocType: Lead,Lead Type,ការ​នាំ​មុខ​ប្រភេទ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,បង្កើត​សម្រង់
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,ធាតុ​ទាំងអស់​នេះ​ត្រូវ​បាន​គេ invoiced រួច​ទៅ​ហើយ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,ធាតុ​ទាំងអស់​នេះ​ត្រូវ​បាន​គេ invoiced រួច​ទៅ​ហើយ
 DocType: Shipping Rule,Shipping Rule Conditions,ការ​ដឹក​ជញ្ជូន​វិធាន​លក្ខខណ្ឌ
 DocType: BOM Replace Tool,The new BOM after replacement,នេះ​បន្ទាប់ពី​ការ​ជំនួស Bom
 DocType: Features Setup,Point of Sale,ចំណុច​នៃ​ការ​លក់
@@ -2539,7 +2550,7 @@ DocType: C-Form,C-Form,C​-សំណុំ​បែបបទ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,លេខ​សម្គាល់​ការ​ប្រតិ​ប​ត្ដិ​ការ​មិន​បាន​កំណត់
 DocType: Production Order,Planned Start Date,ដែល​បាន​គ្រោង​ទុក​កាល​បរិច្ឆេទ​ចាប់​ផ្តើ​ម
 DocType: Serial No,Creation Document Type,ការ​បង្កើត​ប្រភេទ​ឯកសារ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint ។ ដំណើរ​ទស្សនកិច្ច
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint ។ ដំណើរ​ទស្សនកិច្ច
 DocType: Leave Type,Is Encash,តើ​ការ Encash
 DocType: Purchase Invoice,Mobile No,គ្មាន​ទូរស័ព្ទ​ដៃ
 DocType: Payment Tool,Make Journal Entry,ធ្វើ​ឱ្យ​ធាតុ​ទិនានុប្បវត្តិ
@@ -2547,7 +2558,7 @@ DocType: Leave Allocation,New Leaves Allocated,ស្លឹក​ថ្មី​
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ទិន្នន័យ​គម្រោង​ប្រាជ្ញា​គឺ​មិន​អាច​ប្រើ​បាន​សម្រាប់​សម្រង់
 DocType: Project,Expected End Date,គេ​រំពឹង​ថា​នឹង​កាលបរិច្ឆេទ​បញ្ចប់
 DocType: Appraisal Template,Appraisal Template Title,ការវាយតម្លៃ​ទំព័រ​គំរូ​ចំណងជើង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,ពាណិជ្ជ
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ពាណិជ្ជ
 DocType: Cost Center,Distribution Id,លេខ​សម្គាល់​ការ​ចែកចាយ
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,សេវា​សេវា​ល្អ​មែន​ទែន
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,ផលិតផល​ឬ​សេវាកម្ម​ទាំងអស់​។
@@ -2561,13 +2572,14 @@ apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandator
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,សេវា​ហិរញ្ញវត្ថុ
 DocType: Tax Rule,Sales,ការ​លក់
 DocType: Stock Entry Detail,Basic Amount,ចំនួន​ទឹកប្រាក់​ជា​មូលដ្ឋាន
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,CR
+DocType: Leave Allocation,Unused leaves,ស្លឹក​មិន​ប្រើ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,លំនាំ​ដើម​គណនី​អ្នក​ទទួល
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,sawing
 DocType: Tax Rule,Billing State,រដ្ឋ​វិ​ក័​យ​ប័ត្រ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,laminate
 DocType: Item Reorder,Transfer,សេវា​ផ្ទេរ​ប្រាក់
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួម​បញ្ចូល​ទាំង​សភា​អនុ​)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួម​បញ្ចូល​ទាំង​សភា​អនុ​)
 DocType: Authorization Rule,Applicable To (Employee),ដែល​អាច​អនុវត្ត​ទៅ (បុគ្គលិក​)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,កាលបរិច្ឆេទ​ដល់​កំណត់​គឺ​ជា​ចាំបាច់
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
@@ -2588,15 +2600,15 @@ DocType: GL Entry,Remarks,សុន្ទរកថា
 DocType: Purchase Order Item Supplied,Raw Material Item Code,លេខ​កូដ​ធាតុ​វត្ថុ​ធាតុ​ដើម
 DocType: Journal Entry,Write Off Based On,បិទ​ការ​សរសេរ​មូលដ្ឋាន​នៅ​លើ
 DocType: Features Setup,POS View,ម៉ាស៊ីន​ឆូត​កាត​មើល
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,កំណត់​ត្រា​អំពី​ការ​ដំឡើង​សម្រាប់​លេខ​ស៊េរី
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,កំណត់​ត្រា​អំពី​ការ​ដំឡើង​សម្រាប់​លេខ​ស៊េរី
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,ការ​សម្ដែង​ជា​បន្ត
-sites/assets/js/erpnext.min.js +10,Please specify a,សូម​បញ្ជាក់
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,សូម​បញ្ជាក់
 DocType: Offer Letter,Awaiting Response,រង់ចាំ​ការ​ឆ្លើយតប
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ខាង​លើ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,ទំហំ​ម​ត្រជាក់
 DocType: Salary Slip,Earning & Deduction,ការ​រក​ប្រាក់​ចំណូល​និង​ការ​កាត់​បន​ថយ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,តំបន់
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,ស្រេច​ចិត្ត​។ ការ​កំណត់​នេះ​នឹង​ត្រូវ​បាន​ប្រើ​ដើម្បី​ត្រង​នៅ​ក្នុង​ប្រតិបត្តិការ​នានា​។
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ស្រេច​ចិត្ត​។ ការ​កំណត់​នេះ​នឹង​ត្រូវ​បាន​ប្រើ​ដើម្បី​ត្រង​នៅ​ក្នុង​ប្រតិបត្តិការ​នានា​។
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,អត្រា​វាយតម្លៃ​អវិជ្ជមាន​មិន​ត្រូវ​បាន​អនុញ្ញាត
 DocType: Holiday List,Weekly Off,បិទ​ប្រចាំ​ស​ប្តា​ហ៍
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ឧទាហរណ៍​ៈ​ឆ្នាំ 201​​2​, 2012-13"
@@ -2635,10 +2647,10 @@ DocType: Production Order,Expected Delivery Date,គេ​រំពឹង​ថ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,bulging
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ហួត​លំនាំ​សម្ដែង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ចំណាយ​កំសាន្ត
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,ដែល​មាន​អាយុ
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,ដែល​មាន​អាយុ
 DocType: Time Log,Billing Amount,ចំនួន​វិ​ក័​យ​ប័ត្រ
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,កម្មវិធី​សម្រាប់​ការ​ឈប់​សម្រាក​។
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,គណនី​ប្រតិបត្តិការ​ដែល​មាន​ស្រាប់​ដែល​មិន​អាច​ត្រូវ​បាន​លុប
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,គណនី​ប្រតិបត្តិការ​ដែល​មាន​ស្រាប់​ដែល​មិន​អាច​ត្រូវ​បាន​លុប
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ការ​ចំណាយ​ផ្នែក​ច្បាប់
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ថ្ងៃ​នៃ​ខែ​ដែល​ការ​បញ្ជាទិញ​នឹង​ត្រូវ​បាន​បង្កើត​ដោយ​ស្វ័យ​ប្រវត្តិ​របស់​ឧ 05​, 28 ល"
 DocType: Sales Invoice,Posting Time,ម៉ោង​ប្រកាស
@@ -2646,9 +2658,8 @@ DocType: Sales Order,% Amount Billed,% ចំនួន billed
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,ការ​ចំណាយ​តាម​ទូរស័ព្ទ
 DocType: Sales Partner,Logo,រូបសញ្ញា
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ធីក​ប្រអប់​នេះ​ប្រសិន​បើ​អ្នក​ចង់​បង្ខំ​ឱ្យ​អ្នក​ប្រើ​ជ្រើស​ស៊េរី​មុន​ពេល​រក្សា​ទុក​។ វា​នឹង​ជា​លំនាំ​ដើម​ប្រសិន​បើ​អ្នក​ធីក​នេះ​។
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,ការ​ជូន​ដំណឹង​បើក​ទូលាយ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ការ​ជូន​ដំណឹង​បើក​ទូលាយ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,ការ​ចំណាយ​ដោយ​ផ្ទាល់
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,តើ​អ្នក​ពិត​ជា​ចង់​ឮ​សម្ភារៈ​ស្នើ​សុំ​នេះ​ទេ​?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ប្រាក់​ចំណូល​អតិថិជន​ថ្មី
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ការ​ចំណាយ​ការ​ធ្វើ​ដំណើរ
 DocType: Maintenance Visit,Breakdown,ការវិភាគ
@@ -2657,7 +2668,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ដូច​​​ជា​នៅ​លើ​កាលបរិច្ឆេទ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing ដោយ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,ការសាកល្បង
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,ឃ្លាំង​លំនាំ​ដើម​គឺ​ចាំបាច់​សម្រាប់​ធាតុ​ភាគហ៊ុន​។
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,ឃ្លាំង​លំនាំ​ដើម​គឺ​ចាំបាច់​សម្រាប់​ធាតុ​ភាគហ៊ុន​។
 DocType: Feed,Full Name,ឈ្មោះ​ពេញ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,ឈ្នះ
 DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ​ប្រសិន​បើ​អ្នក​មាន​អត្រា​តារាងតម្លៃ​បាត់​ខ្លួន
@@ -2721,9 +2732,10 @@ DocType: Quotation,In Words will be visible once you save the Quotation.,នៅ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,ជាតិ​ដែក
 DocType: Lead,Add to calendar on this date,បញ្ចូល​ទៅ​ក្នុង​ប្រតិទិន​ស្តី​ពី​កាលបរិច្ឆេទ​នេះ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,ក្បួន​សម្រាប់​ការ​បន្ថែម​ការ​ចំណាយ​លើ​ការ​ដឹក​ជញ្ជូន​។
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,ព្រឹត្តិការណ៍​ជិត​មក​ដល់
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ព្រឹត្តិការណ៍​ជិត​មក​ដល់
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,អតិថិជន​គឺ​ត្រូវ​បាន​ទាមទារ
 DocType: Letter Head,Letter Head,លិខិត​នាយក
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ធាតុ​រហ័ស
 DocType: Purchase Order,To Receive,ដើម្បី​ទទួល​បាន
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,បង្រួញ​ការ​សម
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
@@ -2745,14 +2757,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,យ៉ាងហោចណាស់​មាន​ម្នាក់​ឃ្លាំង​គឺ​ជា​ចាំបាច់
 DocType: Serial No,Out of Warranty,ចេញ​ពី​ការធានា
 DocType: BOM Replace Tool,Replace,ជំនួស
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,សូម​បញ្ចូល​លំនាំដើម​វិធានការ​អង្គភាព
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,សូម​បញ្ចូល​លំនាំដើម​វិធានការ​អង្គភាព
 DocType: Purchase Invoice Item,Project Name,ឈ្មោះ​គម្រោង
 DocType: Supplier,Mention if non-standard receivable account,និយាយ​ពី​ការ​ប្រសិន​បើ​គណនី​ដែល​មិន​មែន​ជា​ស្តង់​ដា​ទទួល
 DocType: Workflow State,Edit,កែសម្រួល
 DocType: Journal Entry Account,If Income or Expense,ប្រសិន​បើ​មាន​ប្រាក់​ចំណូល​ឬ​ការ​ចំណាយ
 DocType: Features Setup,Item Batch Nos,បាច់​ធាតុ Nos
 DocType: Stock Ledger Entry,Stock Value Difference,ភាព​ខុស​គ្នា​តម្លៃ​ភាគ​ហ៊ុន
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,ធនធានមនុស្ស
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,ធនធានមនុស្ស
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ការ​ទូទាត់​ការ​ផ្សះផ្សា​ការ​ទូទាត់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ការ​ប្រមូល​ពន្ធ​លើ​ទ្រព្យសម្បត្តិ
 DocType: BOM Item,BOM No,Bom គ្មាន
@@ -2761,7 +2773,7 @@ DocType: Item,Moving Average,ជា​មធ្យម​ការ​ផ្លា
 DocType: BOM Replace Tool,The BOM which will be replaced,Bom ដែល​នឹង​ត្រូវ​បាន​ជំនួស
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,ញូ​ហ៊ុន UOM ត្រូវ​តែ​មាន​ភាព​ខុស​គ្នា​ពី UOM សន្និធិ​បច្ចុប្បន្ន
 DocType: Account,Debit,ឥណពន្ធ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"ស្លឹក​ត្រូវ​តែ​ត្រូវ​បាន​បម្រុង​ទុក​នៅ​ក្នុង 0,5 ច្រើន"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"ស្លឹក​ត្រូវ​តែ​ត្រូវ​បាន​បម្រុង​ទុក​នៅ​ក្នុង 0,5 ច្រើន"
 DocType: Production Order,Operation Cost,ប្រតិ​ប​ត្ដិ​ការ​ចំណាយ
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,ការ​ចូល​រួម​ពី​ឯកសារ​ដែល​បាន​ផ្ទុក​ឡើង .csv មួយ
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ឆ្នើម AMT
@@ -2769,7 +2781,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ធា
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",ដើម្បី​កំណត់​ពី​បញ្ហា​នេះ​ប្រើ​ប៊ូតុង "កំណត់​" នៅ​ក្នុង​របារ​ចំហៀង​។
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ភាគហ៊ុន​បង្ក​ក​ចាស់​ជាង [ថ្ងៃ​]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",បើ​សិន​ជា​វិធាន​តម្លៃ​ពីរ​ឬ​ច្រើន​ត្រូវ​បាន​រក​ឃើញ​ដោយ​ផ្អែក​លើ​លក្ខខណ្ឌ​ខាង​លើ​អាទិភាព​ត្រូវ​បាន​អនុវត្ត​។ អាទិភាព​គឺ​ជា​លេខ​រវាង 0 ទៅ 20 ខណៈ​ពេល​តម្លៃ​លំនាំដើម​គឺ​សូន្យ (ទទេ​) ។ ចំនួន​ខ្ពស់​មាន​ន័យ​ថា​វា​នឹង​យក​អាទិភាព​ប្រសិន​បើ​មិន​មាន​វិធាន​តម្លៃ​ច្រើន​ដែល​មាន​ស្ថានភាព​ដូចគ្នា​។
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,ប្រឆាំង​នឹង​ការ​វិ​ក័​យ​ប័ត្រ
 DocType: Currency Exchange,To Currency,ដើម្បី​រូបិយប័ណ្ណ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,អនុញ្ញាត​ឱ្យ​អ្នក​ប្រើ​ដូច​ខាង​ក្រោម​ដើម្បី​អនុម័ត​កម្មវិធី​សុំច្បាប់​សម្រាក​សម្រាប់​ថ្ងៃ​ប្លុក​។
 apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,ប្រភេទ​នៃ​ការ​ទាមទារ​សំណង​ថ្លៃ​។
@@ -2796,7 +2807,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),អ
 DocType: Stock Entry Detail,Additional Cost,ការ​ចំណាយ​បន្ថែម​ទៀត
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,កាលបរិច្ឆេទ​ឆ្នាំ​ហិរញ្ញវត្ថុ​បញ្ចប់
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",មិន​អាច​ត្រង​ដោយ​ផ្អែក​លើ​ប័ណ្ណ​គ្មាន​ប្រសិនបើ​ដាក់​ជា​ក្រុម​តាម​ប័ណ្ណ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,ធ្វើ​ឱ្យ​សម្រង់​ផ្គត់ផ្គង់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ធ្វើ​ឱ្យ​សម្រង់​ផ្គត់ផ្គង់
 DocType: Quality Inspection,Incoming,មក​ដល់
 DocType: BOM,Materials Required (Exploded),សំភារៈ​ទាមទារ (ផ្ទុះ​)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),កាត់​បន្ថយ​រក​ស្នើសុំ​ការអនុញ្ញាត​ដោយ​គ្មាន​ការ​បង់ (LWP​)
@@ -2816,7 +2827,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ជាមធ្យម​។ អត្រា​ទិញ
 DocType: Task,Actual Time (in Hours),ពេល​វេលា​ពិត​ប្រាកដ (នៅ​ក្នុង​ម៉ោង​ធ្វើការ​)
 DocType: Employee,History In Company,ប្រវត្តិ​សា​ស្រ្ត​នៅ​ក្នុង​ក្រុមហ៊ុន
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,ព្រឹត្តិបត្រ
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,ព្រឹត្តិបត្រ
 DocType: Address,Shipping,ការ​ដឹក​ជញ្ជូន
 DocType: Stock Ledger Entry,Stock Ledger Entry,ភាគ​ហ៊ុន​ធាតុ​សៀវភៅ
 DocType: Department,Leave Block List,ទុក​ឱ្យ​បញ្ជី​ប្លុក
@@ -2834,7 +2845,7 @@ DocType: Account,Auditor,សវនករ
 DocType: Purchase Order,End date of current order's period,កាលបរិច្ឆេទ​បញ្ចប់​នៃ​រយៈ​ពេល​ការ​បញ្ជា​ទិញ​នា​ពេល​បច្ចុប្បន្ន​របស់
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ធ្វើ​ឱ្យ​ការ​ផ្តល់​ជូន​លិខិត
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ត្រឡប់​មក​វិញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,ឯកតា​លំនាំដើម​នៃ​វិធានការ​សម្រាប់​វ៉ារ្យង់​ត្រូវតែ​មាន​ដូចគ្នា​ជា​ពុម្ព
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,ឯកតា​លំនាំដើម​នៃ​វិធានការ​សម្រាប់​វ៉ារ្យង់​ត្រូវតែ​មាន​ដូចគ្នា​ជា​ពុម្ព
 DocType: DocField,Fold,បោះបង់ចោល
 DocType: Production Order Operation,Production Order Operation,ផលិតកម្ម​លំដាប់​ប្រតិបត្តិការ
 DocType: Pricing Rule,Disable,មិន​អនុញ្ញាត
@@ -2899,12 +2910,12 @@ For Example: If you are selling Laptops and Backpacks separately and have a spec
 Note: BOM = Bill of Materials","ក្រុម​ការ​សរុប​នៃ​ធាតុ ** ** ចូល​ទៅ​ក្នុង​ធាតុ ** ផ្សេង​ទៀត ** ។ នេះ​មាន​ប្រយោជន៍​ប្រសិន​បើ​អ្នក​កំពុង bundling ធាតុ ** ជាក់លាក់ ** ទៅ​ក្នុង​កញ្ចប់​មួយ​ហើយ​អ្នក​រក្សា​ភាគ​ហ៊ុន​របស់ packed ** ធាតុ ** និង​មិន​សរុប ** ធាតុ ** ។ កញ្ចប់ ** ធាតុ ** នឹង​មាន​«​តើ​ធាតុ​ហ៊ុន "ជា​" ទេ "ហើយ​" តើ​ធាតុ​លក់ "ជា​" បាទ "។ ឧទាហរណ៍​: ប្រសិន​បើ​អ្នក​ត្រូវ​ការ​លក់​កុំព្យូទ័រ​យួរដៃ​និង​កាតាប​ស្ពាយ​ដោយ​ឡែក​ពី​គ្នា​និង​មាន​តម្លៃ​ពិសេស​ប្រសិន​បើ​អតិថិជន​ទិញ​ទាំង​ពីរ​, បន្ទាប់​មក​ភ្ញៀវ​ទេសចរ​សម្ពាយ​កុំព្យូទ័រ​យួរដៃ​បូក​នឹង​មាន​ធាតុ​កញ្ចប់​ផលិតផល​ថ្មី​មួយ​។ ចំណាំ​: Bom = លោក Bill នៃ​សម្ភារៈ"
 DocType: Item Variant Attribute,Attribute,គុណលក្ខណៈ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,សូម​បញ្ជាក់​ពី / ទៅ​រាប់
-sites/assets/js/desk.min.js +7652,Created By,បាន​បង្កើត​ដោយ
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,បាន​បង្កើត​ដោយ
 DocType: Serial No,Under AMC,នៅ​ក្រោម AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,អត្រា​ការ​ប្រាក់​ត្រូវ​បាន​គណនា​ឡើង​វិញ​បើ​ធាតុ​តម្លៃ​បាន​ពិចារណា​ពី​ចំនួន​ទឹកប្រាក់​ដែល​ទឹក​ប្រាក់​ចំណាយ​បាន​ចុះ​ចត
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,ការ​កំណត់​លំនាំ​ដើម​សម្រាប់​លក់​ប្រតិបត្តិការ​។
 DocType: BOM Replace Tool,Current BOM,Bom នា​ពេល​បច្ចុប្បន្ន
-sites/assets/js/erpnext.min.js +8,Add Serial No,បន្ថែម​គ្មាន​សៀរៀល
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,បន្ថែម​គ្មាន​សៀរៀល
 DocType: Production Order,Warehouses,ឃ្លាំង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,បោះពុម្ព​និង​ស្ថា​នី
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ថ្នាំង​គ្រុប
@@ -2914,7 +2925,7 @@ DocType: Workstation,per hour,ក្នុង​មួយ​ម៉ោង
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,គណនី​សម្រាប់​ឃ្លាំង (សារពើ​ភ័​ណ្ឌ​ងូត​) នឹង​ត្រូវ​បាន​បង្កើត​ឡើង​ក្រោម​គណនី​នេះ​។
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ឃ្លាំង​មិន​អាច​លុប​ធាតុ​ដែល​បាន​ចុះ​ក្នុង​សៀវភៅ​ភាគ​ហ៊ុន​មាន​សម្រាប់​ឃ្លាំង​នេះ​។
 DocType: Company,Distribution,ចែកចាយ
-sites/assets/js/erpnext.min.js +50,Amount Paid,ចំនួន​ទឹកប្រាក់​ដែល​បង់
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,ចំនួន​ទឹកប្រាក់​ដែល​បង់
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ប្រធាន​គ្រប់គ្រង​គម្រោង
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,បញ្ជូន
 DocType: Customer,Default Taxes and Charges,ពន្ធ​លំនាំដើម​និង​ការ​ចោទ​ប្រកាន់
@@ -2950,7 +2961,7 @@ DocType: Sales Invoice,Get Advances Received,ទទួល​បុរេប្
 DocType: Email Digest,Add/Remove Recipients,បន្ថែម / យក​អ្នក​ទទួល
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",ដើម្បី​កំណត់​ឆ្នាំ​សារពើពន្ធ​នេះ​ជា​លំនាំ​ដើម​សូម​ចុច​លើ "កំណត់​ជា​លំនាំដើម '
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),រៀបចំ​ម៉ាស៊ីន​បម្រើ​ចូល​មក​សម្រាប់​លេខ​សម្គាល់​អ្នក​គាំទ្រ​អ៊ី​ម៉ែ​ល​។ (ឧ support@example.com​)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,កង្វះ​ខាត Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,កង្វះ​ខាត Qty
 DocType: Salary Slip,Salary Slip,ប្រាក់​បៀវត្ស​គ្រូពេទ្យ​ប្រហែលជា
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'ដើម្បី​កាលបរិច្ឆេទ​' ត្រូវ​បាន​ទាមទារ
@@ -2963,6 +2974,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",នៅ​ពេល​ណា​ដែល​ប្រតិ​ប​ត្តិ​ការ​ដែល​បាន​ធីក​ត្រូវ​បាន "ផ្តល់​ជូន​" ដែល​ជា​ការ​លេច​ឡើង​អ៊ី​ម៉ែ​ល​ដែល​បាន​បើក​ដោយ​ស្វ័យ​ប្រវត្តិ​ដើម្បី​ផ្ញើ​អ៊ីមែល​ទៅ​ជាប់​ទាក់ទង "ទំនាក់ទំនង​" នៅ​ក្នុង​ប្រតិបត្តិការ​នោះ​ដោយ​មាន​ប្រតិ​ប​ត្តិ​ការ​ជា​មួយ​ការ​ភ្ជាប់​នេះ​។ អ្នក​ប្រើ​ដែល​អាច​ឬ​មិន​អាច​ផ្ញើ​អ៊ីមែល​។
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ការ​កំណត់​សកល
 DocType: Employee Education,Employee Education,បុគ្គលិក​អប់រំ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,វា​ត្រូវ​បាន​គេ​ត្រូវការ​ដើម្បី​ទៅ​យក​លំអិត​ធាតុ​។
 DocType: Salary Slip,Net Pay,ប្រាក់​ចំណេញ​សុទ្ធ
 DocType: Account,Account,គណនី
 ,Requested Items To Be Transferred,ធាតុ​ដែល​បាន​ស្នើ​សុំ​ឱ្យ​គេ​បញ្ជូន
@@ -2994,7 +3006,7 @@ DocType: BOM,Manufacturing User,អ្នកប្រើប្រាស់​ក
 DocType: Purchase Order,Raw Materials Supplied,វត្ថុ​ធាតុ​ដើម​ដែល​សហ​ការី
 DocType: Purchase Invoice,Recurring Print Format,កើតឡើង​ទ្រង់ទ្រាយ​បោះពុម្ព
 DocType: Communication,Series,កម្រង​ឯកសារ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,គេ​រំពឹង​ថា​ការ​ដឹកជញ្ជូន​មិន​អាច​កាលបរិច្ឆេទ​ត្រូវ​តែ​មុន​ពេល​ការ​ទិញ​លំដាប់​កាលបរិច្ឆេទ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,គេ​រំពឹង​ថា​ការ​ដឹកជញ្ជូន​មិន​អាច​កាលបរិច្ឆេទ​ត្រូវ​តែ​មុន​ពេល​ការ​ទិញ​លំដាប់​កាលបរិច្ឆេទ
 DocType: Appraisal,Appraisal Template,ការវាយតម្លៃ​ទំព័រ​គំរូ
 DocType: Communication,Email,អ៊ី​ម៉ែ​ល
 DocType: Item Group,Item Classification,ចំណាត់ថ្នាក់​ធាតុ
@@ -3035,6 +3047,7 @@ DocType: HR Settings,Payroll Settings,ការ​កំណត់​បើក​
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,ផ្គូផ្គង​នឹង​វិ​កិ​យ​ប័ត្រ​ដែល​មិន​មាន​ភ្ជាប់​និង​ការ​ទូទាត់​។
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,លំដាប់​ទីកន្លែង
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ជា root មិន​អាច​មាន​ការ​ក​ណ្តា​ល​ចំណាយ​ឪពុក​ម្តាយ
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ជ្រើស​ម៉ាក ...
 DocType: Sales Invoice,C-Form Applicable,C​-ទម្រង់​ពាក្យ​ស្នើសុំ
 DocType: Supplier,Address and Contacts,អាសយដ្ឋាន​និង​ទំនាក់ទំនង
 DocType: UOM Conversion Detail,UOM Conversion Detail,ព​ត៌​មាន​នៃ​ការ​ប្រែចិត្ត​ជឿ UOM
@@ -3044,7 +3057,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,ទទួល​បាន​ប័ណ្ណ​ឆ្នើម
 DocType: Warranty Claim,Resolved By,បាន​ដោះស្រាយ​ដោយ
 DocType: Appraisal,Start Date,ថ្ងៃ​ចាប់ផ្តើម
-sites/assets/js/desk.min.js +7629,Value,គុណ​តម្លៃ
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,គុណ​តម្លៃ
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,បម្រុង​ទុក​ស្លឹក​សម្រាប់​រយៈពេល​។
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,សូម​ចុច​ទីនេះ​ដើម្បី​ផ្ទៀងផ្ទាត់
 DocType: Purchase Invoice Item,Price List Rate,តម្លៃ​ការ​វាយ​តម្លៃ​បញ្ជី
@@ -3059,7 +3072,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox បាន​អនុញ្ញាត​ការ​ចូល​ដំណើរ​ការ
 DocType: Dropbox Backup,Weekly,ប្រចាំ​ស​ប្តា​ហ៍
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ឧ​ទា​ហរ​ណ៏​។ smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,ទទួល​បាន
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,ទទួល​បាន
 DocType: Maintenance Visit,Fully Completed,បាន​បញ្ចប់​យ៉ាង​ពេញលេញ
 DocType: Employee,Educational Qualification,គុណវុឌ្ឍិ​អប់រំ
 DocType: Workstation,Operating Costs,ចំណាយ​ប្រតិបត្តិការ
@@ -3074,7 +3087,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,ចង្អុល​បង្ហ
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,បន្ថែម / កែសម្រួល​តម្លៃ​ទំនិញ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,គំនូសតាង​នៃ​មជ្ឈមណ្ឌល​ការ​ចំណាយ
 ,Requested Items To Be Ordered,ធាតុ​ដែល​បាន​ស្នើ​ដើម្បី​ឱ្យ​បាន​លំដាប់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,ការ​បញ្ជា​ទិញ​របស់​ខ្ញុំ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,ការ​បញ្ជា​ទិញ​របស់​ខ្ញុំ
 DocType: Price List,Price List Name,ឈ្មោះ​តារាងតម្លៃ
 DocType: Time Log,For Manufacturing,សម្រាប់​អ្នក​ផលិត
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,សរុប
@@ -3106,7 +3119,7 @@ DocType: Purchase Receipt Item,Received and Accepted,បាន​ទទួល​
 ,Serial No Service Contract Expiry,គ្មាន​សេវា​កិច្ចសន្យា​សៀរៀល​ផុតកំណត់
 DocType: Item,Unit of Measure Conversion,ឯកតា​នៃ​ការ​ប្រែចិត្ត​ជឿ​វិធានការ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,និយោជិត​មិន​អាច​ត្រូវ​បាន​ផ្លាស់​ប្តូ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,អ្នក​មិន​អាច​ឥណទាន​និង​ឥណពន្ធ​គណនី​ដូច​គ្នា​នៅ​ពេល​តែមួយ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,អ្នក​មិន​អាច​ឥណទាន​និង​ឥណពន្ធ​គណនី​ដូច​គ្នា​នៅ​ពេល​តែមួយ
 DocType: Naming Series,Help HTML,ជំនួយ HTML
 DocType: Address,Name of person or organization that this address belongs to.,ឈ្មោះ​របស់​មនុស្ស​ម្នាក់​ឬ​អង្គការ​មួយ​ដែល​មាន​អាស័យ​ដ្ឋាន​ជា​របស់​វា​។
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,អ្នកផ្គត់ផ្គង់​របស់​អ្នក
@@ -3119,7 +3132,7 @@ DocType: Employee,Date of Issue,កាលបរិច្ឆេទ​នៃ​ប
 DocType: Issue,Content Type,ប្រភេទ​មាតិកា​រ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,កុំ​ព្យូ​ទ័​រ
 DocType: Item,List this Item in multiple groups on the website.,រាយ​ធាតុ​នេះ​នៅ​ក្នុង​ក្រុម​ជា​ច្រើន​នៅ​លើ​គេហទំព័រ​។
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,សូម​ពិនិត្យ​មើល​ជម្រើស​រូបិយវត្ថុ​ពហុ​ដើម្បី​អនុញ្ញាត​ឱ្យ​គណនី​ជា​រូបិយប័ណ្ណ​ផ្សេង​ទៀត
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,សូម​ពិនិត្យ​មើល​ជម្រើស​រូបិយវត្ថុ​ពហុ​ដើម្បី​អនុញ្ញាត​ឱ្យ​គណនី​ជា​រូបិយប័ណ្ណ​ផ្សេង​ទៀត
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,អ្នក​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឱ្យ​កំណត់​តម្លៃ​ទឹកកក
 DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួល​បាន​ធាតុ Unreconciled
 DocType: Cost Center,Budgets,ថវិកា
@@ -3128,7 +3141,7 @@ DocType: Employee,Emergency Contact Details,ព​ត៌​មាន​ទំន
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,តើ​ធ្វើ​ដូច​ម្ដេច​?
 DocType: Delivery Note,To Warehouse,ដើម្បី​ឃ្លាំង
 ,Average Commission Rate,គណៈ​កម្ម​ការ​ជា​មធ្យម​អត្រា​ការ
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'មិន​មាន​មិន​សៀរៀល​' មិន​អាច​ក្លាយ​​​ជា 'បាទ​' សម្រាប់​ធាតុ​ដែល​មិន​មែន​ជា​ភាគ​ហ៊ុន​-
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'មិន​មាន​មិន​សៀរៀល​' មិន​អាច​ក្លាយ​​​ជា 'បាទ​' សម្រាប់​ធាតុ​ដែល​មិន​មែន​ជា​ភាគ​ហ៊ុន​-
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ការ​ចូល​រួម​មិន​អាច​ត្រូវ​បាន​សម្គាល់​សម្រាប់​កាល​បរិច្ឆេទ​នា​ពេល​អនាគត
 DocType: Pricing Rule,Pricing Rule Help,វិធាន​កំណត់​តម្លៃ​ជំនួយ
 DocType: Purchase Taxes and Charges,Account Head,នាយក​គណនី
@@ -3151,7 +3164,7 @@ DocType: Target Detail,Target Qty,គោល​ដៅ Qty
 DocType: Attendance,Present,នា​ពេល​បច្ចុប្បន្ន
 DocType: Notification Control,Sales Invoice Message,វិ​ក័​យ​ប័ត្រ​ការ​លក់​សារ
 DocType: Authorization Rule,Based On,ដោយ​ផ្អែក​លើ​ការ
-,Ordered Qty,បាន​បញ្ជា​ឱ្យ Qty
+DocType: Sales Order Item,Ordered Qty,បាន​បញ្ជា​ឱ្យ Qty
 DocType: Stock Settings,Stock Frozen Upto,រីក​រាយ​ជាមួយ​នឹង​ផ្សារ​ភាគ​ហ៊ុន​ទឹកកក
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,សកម្មភាព​របស់​គម្រោង / ភារកិច្ច​។
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,បង្កើត​ប្រាក់ខែ​គ្រូពេទ្យ​ប្រហែលជា
@@ -3186,7 +3199,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,វត្តមាន​ផ្ទុក​ឡើង
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,កម្មន្តសាល​ចំ​នូន Bom និង​ត្រូវ​បាន​តម្រូវ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ជួរ Ageing 2
-DocType: Journal Entry Account,Amount,ចំនួន​ទឹកប្រាក់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,ចំនួន​ទឹកប្រាក់
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom បាន​ជំនួស
 ,Sales Analytics,វិភាគ​ការ​លក់
@@ -3210,7 +3223,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,កាលបរិច្ឆេទ​គេ​រំពឹង​ថា​នឹង​មិន​អាច​មាន​មុន​ពេល​ដែល​កាលបរិច្ឆេទ​នៃ​សំណើ​សុំ​សម្ភារៈ
 DocType: Contact Us Settings,City,ទីក្រុង
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ម៉ាស៊ីន Ultrasonic
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,កំហុស​: មិន​មាន​អត្តសញ្ញាណប័ណ្ណ​ដែល​មាន​សុពលភាព​?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,កំហុស​: មិន​មាន​អត្តសញ្ញាណប័ណ្ណ​ដែល​មាន​សុពលភាព​?
 DocType: Naming Series,Update Series Number,កម្រង​ឯកសារ​លេខ​ធ្វើ​ឱ្យ​ទាន់​សម័យ
 DocType: Account,Equity,សមធម៌
 DocType: Sales Order,Printing Details,សេចក្ដី​លម្អិត​ការ​បោះពុម្ព
@@ -3230,7 +3243,7 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,វត្ថុ​ធាតុ​ដើម​ដែល​ការ​ចំណាយ
 DocType: Item,Re-Order Level,ដីកាសម្រេច​កម្រិត​ឡើងវិញ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,បញ្ចូល​ធាតុ​និង​ការ​ដែល​បាន​គ្រោង​ទុក qty ដែល​អ្នក​ចង់​បាន​ដើម្បី​បង្កើន​ការ​បញ្ជា​ទិញ​ផលិត​ផល​ឬ​ទាញ​យក​វត្ថុ​ធាតុ​ដើម​សម្រាប់​ការ​វិភាគ​។
-sites/assets/js/list.min.js +174,Gantt Chart,គំនូសតាង Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,គំនូសតាង Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,ពេញ​ម៉ោង
 DocType: Employee,Applicable Holiday List,បញ្ជី​ថ្ងៃ​ឈប់​សម្រាក​ដែល​អាច​អនុវត្ត​បាន
 DocType: Employee,Cheque,មូលប្បទានប័ត្រ
@@ -3250,7 +3263,7 @@ DocType: Attendance,Attendance,ការ​ចូលរួម
 DocType: Page,No,គ្មាន
 DocType: BOM,Materials,ស​មា​្ភា​រៈ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ប្រសិន​បើ​មិន​បាន​ធីក​បញ្ជី​នេះ​នឹង​ត្រូវ​បាន​បន្ថែម​ទៅ​កាន់​ក្រសួង​គ្នា​ដែល​ជា​កន្លែង​ដែល​វា​ត្រូវ​បាន​អនុវត្ត​។
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,ប្រកាស​កាល​បរិច្ឆេទ​និង​ពេល​វេលា​ជា​ការ​ចាំបាច់​បង្ហោះ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,ប្រកាស​កាល​បរិច្ឆេទ​និង​ពេល​វេលា​ជា​ការ​ចាំបាច់​បង្ហោះ
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,ពុម្ព​ពន្ធ​លើ​ការ​ទិញ​ប្រតិបត្តិការ​។
 ,Item Prices,តម្លៃ​ធាតុ
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,នៅ​ក្នុង​ពាក្យ​នោះ​នឹង​ត្រូវ​បាន​មើល​ឃើញ​នៅ​ពេល​ដែល​អ្នក​រក្សា​ទុក​ការ​បញ្ជា​ទិញ​នេះ​។
@@ -3269,7 +3282,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ចំណាយ​រដ្ឋបាល
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ការ​ប្រឹក្សា​យោបល់
 DocType: Customer Group,Parent Customer Group,ឪពុក​ម្តាយ​ដែល​ជា​ក្រុម​អតិថិជន
-sites/assets/js/erpnext.min.js +50,Change,ការ​ផ្លាស់​ប្តូ​រ
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ការ​ផ្លាស់​ប្តូ​រ
 DocType: Purchase Invoice,Contact Email,ទំនាក់ទំនង​តាម​អ៊ីមែល
 DocType: Appraisal Goal,Score Earned,គ្រាប់​បាល់​បញ្ចូល​ទី​ទទួល​បាន
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",ឧទាហរណ៍​ដូចជា​រឿង "My ក្រុមហ៊ុន LLC បាន​"
@@ -3280,6 +3293,7 @@ DocType: Packing Slip,Gross Weight UOM,សរុប​បាន​ទំ UOM
 DocType: Email Digest,Receivables / Payables,ទទួល / បង់
 DocType: Delivery Note Item,Against Sales Invoice,ប្រឆាំង​នឹង​ការ​វិ​ក័​យ​ប័ត្រ​លក់
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,ការ​បង្ក្រាប
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,គណនី​ឥណទាន
 DocType: Landed Cost Item,Landed Cost Item,ធាតុ​តម្លៃ​ដែល​បាន​ចុះ​ចត
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,បង្ហាញ​តម្លៃ​សូន្យ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,បរិមាណ​នៃ​ការ​ផលិត​ធាតុ​ដែល​ទទួល​បាន​បន្ទាប់ / វែ​ច​ខ្ចប់​ឡើងវិញ​ពី​បរិមាណ​ដែល​បាន​ផ្តល់​វត្ថុ​ធាតុ​ដើម
@@ -3297,7 +3311,7 @@ DocType: Issue,Support Team,ក្រុម​គាំទ្រ
 DocType: Appraisal,Total Score (Out of 5),ពិន្ទុ​សរុប (ក្នុង​ចំណោម 5​)
 DocType: Contact Us Settings,State,រដ្ឋ
 DocType: Batch,Batch,ជំនាន់​ទី
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,មាន​តុល្យភាព
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,មាន​តុល្យភាព
 DocType: Project,Total Expense Claim (via Expense Claims),ពាក្យ​ប​ណ្តឹ​ង​លើ​ការ​ចំណាយ​សរុប (តាម​រយៈ​ការ​ប្តឹ​ង​ទាមទារ​សំណង​លើ​ការ​ចំណាយ​)
 DocType: User,Gender,យែ​ន​ឌ័​រ
 DocType: Journal Entry,Debit Note,ចំណាំ​ឥណពន្ធ
@@ -3313,9 +3327,8 @@ DocType: Lead,Blog Subscriber,អតិថិជន​កំណត់​ហេ
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,បង្កើត​ច្បាប់​ដើម្បី​រឹត​បន្តឹង​ការ​ធ្វើ​ប្រតិបត្តិការ​ដោយ​ផ្អែក​លើ​តម្លៃ​។
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ប្រសិន​បើ​បាន​ធីក​នោះ​ទេ​សរុប​។ នៃ​ថ្ងៃ​ធ្វើការ​នឹង​រួម​បញ្ចូល​ទាំង​ថ្ងៃ​ឈប់​សម្រាក​, ហើយ​នេះ​នឹង​កាត់​បន្ថយ​តម្លៃ​នៃ​ប្រាក់ខែ​ក្នុង​មួយ​ថ្ងៃ​នោះ"
 DocType: Purchase Invoice,Total Advance,ជាមុន​សរុប
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,សម្ភារៈ​ឮ​សំណើ​រ​សុំ
 DocType: Workflow State,User,របស់​អ្នក​ប្រើ
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,ដំណើរ​ការ​សេវា​បើក​ប្រាក់​បៀវត្ស
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,ដំណើរ​ការ​សេវា​បើក​ប្រាក់​បៀវត្ស
 DocType: Opportunity Item,Basic Rate,អត្រា​ជា​មូលដ្ឋាន
 DocType: GL Entry,Credit Amount,ចំនួន​ឥណទាន
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,ដែល​បាន​កំណត់​ជា​បាត់បង់
@@ -3331,6 +3344,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",រក​មិន​ឃើញ​អ៊ី​ម៉ែ​ល​ដែល​ជា​ក្រុម​ហ៊ុន​លេខ​សម្គាល់​ដូចនេះ mail មិនបាន​ចាត់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),កម្មវិធី​របស់​មូលនិធិ (ទ្រព្យសកម្ម​)
 DocType: Production Planning Tool,Filter based on item,តម្រង​មាន​មូលដ្ឋាន​លើ​ធាតុ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,គណនី​ឥណពន្ធ​វី​សា
 DocType: Fiscal Year,Year Start Date,នៅ​ឆ្នាំ​កាលបរិច្ឆេទ​ចាប់​ផ្តើ​ម
 DocType: Attendance,Employee Name,ឈ្មោះ​បុគ្គលិក
 DocType: Sales Invoice,Rounded Total (Company Currency),សរុប​មូល (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
@@ -3352,29 +3366,31 @@ DocType: Account,Parent Account,គណនី​មាតា​ឬ​បិតា
 DocType: Quality Inspection Reading,Reading 3,ការ​អាន​ទី 3
 ,Hub,ហាប់
 DocType: GL Entry,Voucher Type,ប្រភេទ​កាត​មាន​ទឹក​ប្រាក់
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,រក​មិន​ឃើញ​បញ្ជី​ថ្លៃ​ឬ​ជន​ពិការ
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,រក​មិន​ឃើញ​បញ្ជី​ថ្លៃ​ឬ​ជន​ពិការ
 DocType: Expense Claim,Approved,បាន​អនុម័ត
 DocType: Pricing Rule,Price,តំលៃ​លក់
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",ជ្រើស "បាទ​" នឹង​ផ្តល់​ឱ្យ​អត្ត​សញ្ញាណ​តែ​មួយ​គត់​ដើម្បី​ឱ្យ​អង្គភាព​គ្នា​នៃ​ធាតុ​ដែល​អាច​ត្រូវ​បាន​មើល​នៅ​ក្នុង​ស៊េរី​ចៅហ្វាយ​គ្មាន​នេះ​។
 DocType: Employee,Education,ការ​អប់រំ
 DocType: Selling Settings,Campaign Naming By,ដាក់​​​ឈ្មោះ​ការ​ឃោសនា​ដោយ
 DocType: Employee,Current Address Is,អាសយដ្ឋាន​បច្ចុប្បន្ន​គឺ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",ស្រេច​ចិត្ត​។ កំណត់​រូបិយប័ណ្ណ​លំនាំដើម​របស់​ក្រុម​ហ៊ុន​ប្រសិន​បើ​មិន​បាន​បញ្ជាក់​។
 DocType: Address,Office,ការិយាល័យ
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,របាយ​ការ​ណ៏​ស្ដ​ង់​ដា​រ
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,ធាតុ​ទិនានុប្បវត្តិ​គណនេយ្យ​។
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,សូម​ជ្រើសរើស​បុគ្គលិក​កំណត់ត្រា​ដំបូង​។
+DocType: Delivery Note Item,Available Qty at From Warehouse,ដែល​អាច​ប្រើ​បាន​នៅ​ពី​ឃ្លាំង Qty
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,សូម​ជ្រើសរើស​បុគ្គលិក​កំណត់ត្រា​ដំបូង​។
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,ដើម្បី​បង្កើត​គណនី​អាករ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,សូម​បញ្ចូល​ចំណាយ​តាម​គណនី
 DocType: Account,Stock,ភាគ​ហ៊ុន
 DocType: Employee,Current Address,អាសយដ្ឋាន​បច្ចុប្បន្ន
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ប្រសិន​បើ​មាន​ធាតុ​គឺ​វ៉ា​រ្យ៉​ង់​នៃ​ធាតុ​ផ្សេង​ទៀត​បន្ទាប់​មក​ពិពណ៌នា​, រូបភាព​, ការ​កំណត់​តម្លៃ​ពន្ធ​ល​នឹង​ត្រូវ​បាន​កំណត់​ពី​ពុម្ព​មួយ​នេះ​ទេ​លុះ​ត្រា​តែ​បាន​បញ្ជាក់​យ៉ាង​ជាក់លាក់"
 DocType: Serial No,Purchase / Manufacture Details,ទិញ / ព​ត៌​មាន​លំអិត​ការផលិត
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,សារពើ​ភ័​ណ្ឌ​បាច់
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,សារពើ​ភ័​ណ្ឌ​បាច់
 DocType: Employee,Contract End Date,កាលបរិច្ឆេទ​ការ​ចុះ​កិច្ច​សន្យា​បញ្ចប់
 DocType: Sales Order,Track this Sales Order against any Project,តាមដាន​ការ​បញ្ជា​ទិញ​លក់​នេះ​ប្រឆាំង​នឹង​គម្រោង​ណាមួយ​ឡើយ
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ការ​បញ្ជា​ទិញ​ការ​លក់​ទាញ (ដែល​មិន​ទាន់​សម្រេច​បាន​នូវ​ការ​ផ្តល់​) ដោយ​ផ្អែក​លើ​លក្ខណៈ​វិនិច្ឆ័យ​ដូច​ខាងលើ​នេះ
 DocType: DocShare,Document Type,ប្រភេទ​ឯកសារ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,ចាប់​ពី​សម្រង់​ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ចាប់​ពី​សម្រង់​ផ្គត់ផ្គង់
 DocType: Deduction Type,Deduction Type,ប្រភេទ​កាត់កង
 DocType: Attendance,Half Day,ពាក់​ក​ណ្តា​ល​ថ្ងៃ
 DocType: Pricing Rule,Min Qty,លោក Min Qty
@@ -3386,9 +3402,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity
 DocType: Stock Entry,Default Target Warehouse,ឃ្លាំង​គោលដៅ​លំនាំ​ដើម
 DocType: Purchase Invoice,Net Total (Company Currency),សរុប (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
 DocType: Notification Control,Purchase Receipt Message,សារ​បង្កាន់ដៃ​ទិញ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,ស្លឹក​ដែល​បាន​បម្រុង​ទុក​សរុប​គឺ​មាន​ច្រើន​ជាង​សម័យ
 DocType: Production Order,Actual Start Date,កាលបរិច្ឆេទ​ពិត​ប្រាកដ​ចាប់​ផ្តើ​ម
 DocType: Sales Order,% of materials delivered against this Sales Order,ស​មា​្ភា​រៈ​បាន​បញ្ជូន​% នៃ​ការ​លក់​នេះ​បាន​ប្រឆាំង​ទៅ​នឹង​ស​ណ្តា​ប់​ធ្នាប់
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,ចលនា​ធាតុ​កំណត់ត្រា​។
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,ចលនា​ធាតុ​កំណត់ត្រា​។
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,បញ្ជី​ព្រឹត្តិ​ប័ត្រ​ព័ត៌មាន​អតិថិជន
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,សេវាកម្ម
@@ -3396,7 +3413,7 @@ DocType: Hub Settings,Hub Settings,ការ​កំណត់​ហាប់
 DocType: Project,Gross Margin %,រឹម​% សរុប​បាន
 DocType: BOM,With Operations,ជា​មួយ​នឹង​ការ​ប្រតិ​ប​ត្ដិ​ការ
 ,Monthly Salary Register,ប្រចាំខែ​ប្រាក់ខែ​ចុះឈ្មោះ
-apps/frappe/frappe/website/template.py +123,Next,បន្ទាប់
+apps/frappe/frappe/website/template.py +140,Next,បន្ទាប់
 DocType: Warranty Claim,If different than customer address,បើ​សិន​ជា​ខុស​គ្នា​ជាង​អាសយដ្ឋាន​អតិថិជន
 DocType: BOM Operation,BOM Operation,Bom ប្រតិបត្តិការ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3425,6 +3442,7 @@ DocType: Purchase Invoice,Next Date,កាលបរិច្ឆេទ​បន
 DocType: Employee Education,Major/Optional Subjects,ដ៏​ធំ​ប្រធានបទ / ស្រេច​ចិត្ត
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,សូម​បញ្ចូល​ពន្ធ​និង​ការ​ចោទ​ប្រកាន់
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,ការ​ឆ្នៃ​ប្រឌិត
+DocType: Sales Invoice Item,Drop Ship,ទម្លាក់​នាវា
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",នៅ​ទីនេះ​អ្នក​អាច​រក្សា​បាន​នូវ​ព័ត៌មាន​លម្អិត​សម្រាប់​ក្រុម​គ្រួសារ​ដូច​ជា​ឈ្មោះ​និង​មុខរបរ​របស់​ឪពុក​ម្តាយ​ប្តី​ប្រពន្ធ​និង​កូន
 DocType: Hub Settings,Seller Name,ឈ្មោះ​អ្នក​លក់
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ពន្ធ​និង​ការ​ចោទ​ប្រកាន់​កាត់ (ក្រុមហ៊ុន​រូបិយវត្ថុ​)
@@ -3454,15 +3472,15 @@ DocType: Serial No,Delivery Details,ព​ត៌​មាន​លំអិត
 DocType: Item,Automatically create Material Request if quantity falls below this level,បង្កើត​សម្ភារៈ​ស្នើ​សុំ​ដោយ​ស្វ័យ​ប្រវត្តិ​បើ​បរិមាណ​ធ្លាក់​នៅ​ក្រោម​កម្រិត​នេះ
 ,Item-wise Purchase Register,ចុះឈ្មោះ​ទិញ​ធាតុ​ប្រាជ្ញា
 DocType: Batch,Expiry Date,កាលបរិច្ឆេទ​ផុតកំណត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ដើម្បី​កំណត់​កម្រិត​ការ​រៀបចំ​ធាតុ​ត្រូវ​តែ​ជា​ធាតុ​ទិញ​ឬ​ធាតុ​កម្មន្តសាល
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ដើម្បី​កំណត់​កម្រិត​ការ​រៀបចំ​ធាតុ​ត្រូវ​តែ​ជា​ធាតុ​ទិញ​ឬ​ធាតុ​កម្មន្តសាល
 ,Supplier Addresses and Contacts,អាសយដ្ឋាន​ក្រុមហ៊ុន​ផ្គត់ផ្គង់​និង​ទំនាក់ទំនង
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,សូម​ជ្រើស​ប្រភេទ​ជា​លើក​ដំបូង
 apps/erpnext/erpnext/config/projects.py +18,Project master.,ចៅហ្វាយ​គម្រោង​។
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,កុំ​បង្ហាញ​និមិត្ត​រូប​ដូចជា $ ល​ណាមួយ​ដែល​ជាប់​នឹង​រូបិយ​ប័ណ្ណ​។
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(ពាក់​ក​ណ្តា​ល​ថ្ងៃ​)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(ពាក់​ក​ណ្តា​ល​ថ្ងៃ​)
 DocType: Supplier,Credit Days,ថ្ងៃ​ឥណទាន
 DocType: Leave Type,Is Carry Forward,គឺ​ត្រូវ​បាន​អនុវត្ត​ទៅ​មុខ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,ទទួល​បាន​ធាតុ​ពី Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,ទទួល​បាន​ធាតុ​ពី Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ពេល​ថ្ងៃ
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,វិ​ក័​យ​ប័ត្រ​នៃ​សម្ភារៈ
 DocType: Dropbox Backup,Send Notifications To,ផ្ញើ​ការ​ជូន​ដំណឹង​ដើម្បី
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index ffeeaeed9a..ed9a950ce5 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,ಸಂಬಳ ಫ್ಯಾಷನ್
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","ನೀವು ಋತುಗಳು ಆಧರಿಸಿ ಟ್ರ್ಯಾಕ್ ಬಯಸಿದರೆ, ಮಾಸಿಕ ವಿತರಣೆ ಆಯ್ಕೆ."
 DocType: Employee,Divorced,ವಿವಾಹವಿಚ್ಛೇದಿತ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,ಎಚ್ಚರಿಕೆ: ಒಂದೇ ಐಟಂ ಅನ್ನು ಹಲವಾರು ಬಾರಿ ನಮೂದಿಸಲಾದ.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,ಎಚ್ಚರಿಕೆ: ಒಂದೇ ಐಟಂ ಅನ್ನು ಹಲವಾರು ಬಾರಿ ನಮೂದಿಸಲಾದ.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸಿಂಕ್
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ಐಟಂ ಒಂದು ವ್ಯವಹಾರದಲ್ಲಿ ಅನೇಕ ಬಾರಿ ಸೇರಿಸಬೇಕಾಗಿದೆ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ಮೆಟೀರಿಯಲ್ ಭೇಟಿ {0} ಈ ಖಾತರಿ ಹಕ್ಕು ರದ್ದು ಮೊದಲು ರದ್ದು
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,ಒತ್ತಡದಿಂದ ಜೊತೆಗೆ ಹೆಪ್ಪುಗಟ್ಟಿಸಿ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},ಕರೆನ್ಸಿ ಬೆಲೆ ಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ಲೆಕ್ಕಾಚಾರ ಮಾಡಲಾಗುತ್ತದೆ ವ್ಯವಹಾರದಲ್ಲಿ ಆಗಿದೆ .
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+DocType: Purchase Order,Customer Contact,ಗ್ರಾಹಕ ಸಂಪರ್ಕ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ಟ್ರೀ
 DocType: Job Applicant,Job Applicant,ಜಾಬ್ ಸಂ
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ಹೆಚ್ಚು ಫಲಿತಾಂಶಗಳು.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,ಗ್ರಾಹಕ ಹೆಸರು
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","ಕರೆನ್ಸಿ , ಪರಿವರ್ತನೆ ದರ , ಒಟ್ಟು ರಫ್ತು , ರಫ್ತು grandtotal ಇತ್ಯಾದಿ ಎಲ್ಲಾ ರಫ್ತು ಆಧಾರಿತ ಜಾಗ ಇತ್ಯಾದಿ ಡೆಲಿವರಿ ನೋಟ್, ಪಿಓಎಸ್ , ಉದ್ಧರಣ , ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ , ಮಾರಾಟದ ಆರ್ಡರ್ ಲಭ್ಯವಿದೆ"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ತಲೆ (ಅಥವಾ ಗುಂಪುಗಳು) ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಸಮತೋಲನಗಳ ನಿರ್ವಹಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),ಮಹೋನ್ನತ {0} ಕಡಿಮೆ ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),ಮಹೋನ್ನತ {0} ಕಡಿಮೆ ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,10 ನಿಮಿಷಗಳು ಡೀಫಾಲ್ಟ್
 DocType: Leave Type,Leave Type Name,TypeName ಬಿಡಿ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,ಸರಣಿ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,ಬಹು ಐಟಂ ಬೆಲೆಗಳ
 DocType: SMS Center,All Supplier Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ ಸರಬರಾಜುದಾರ
 DocType: Quality Inspection Reading,Parameter,ನಿಯತಾಂಕ
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,ನಿಜವಾಗಿಯೂ ಉತ್ಪಾದನೆ ಸಲುವಾಗಿ ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು ಬಯಸುವಿರಾ:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ರೋ # {0}: ದರ ಅದೇ ಇರಬೇಕು {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 ಬುದ್ಧಿವಂತ ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ ನಿರ್ವಹಿಸಲು ಮತ್ತು ತಮ್ಮ ಕೋಡ್ ಬಳಕೆ ಈ ಆಯ್ಕೆಯನ್ನು ಆಧರಿಸಿ ಅವುಗಳನ್ನು ಹುಡುಕಲು ಸುಲಭವಾಗುವಂತೆ
 DocType: Mode of Payment Account,Mode of Payment Account,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,ತೋ
 DocType: Sales Invoice Item,Quantity,ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು )
 DocType: Employee Education,Year of Passing,ಸಾಗುವುದು ವರ್ಷ
-sites/assets/js/erpnext.min.js +27,In Stock,ಸಂಗ್ರಹಣೆಯಲ್ಲಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,ಮಾತ್ರ unbilled ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ಸಂಗ್ರಹಣೆಯಲ್ಲಿ
 DocType: Designation,Designation,ಹುದ್ದೆ
 DocType: Production Plan Item,Production Plan Item,ನಿರ್ಮಾಣ ವೇಳಾಪಟ್ಟಿಯು ಐಟಂ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ಬಳಕೆದಾರ {0} ಈಗಾಗಲೇ ನೌಕರರ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,ಹೊಸ ಪಿಓಎಸ್ ವಿವರ ಮಾಡಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,ಆರೋಗ್ಯ
 DocType: Purchase Invoice,Monthly,ಮಾಸಿಕ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ಪಾವತಿ ವಿಳಂಬ (ದಿನಗಳು)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Maintenance Schedule Item,Periodicity,ನಿಯತಕಾಲಿಕತೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ಇಮೇಲ್ ವಿಳಾಸ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ರಕ್ಷಣೆ
 DocType: Company,Abbr,ರದ್ದು
 DocType: Appraisal Goal,Score (0-5),ಸ್ಕೋರ್ ( 0-5 )
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},ಸಾಲು {0}: {1} {2} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ಸಾಲು {0}: {1} {2} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,ರೋ # {0}:
 DocType: Delivery Note,Vehicle No,ವಾಹನ ನಂ
-sites/assets/js/erpnext.min.js +55,Please select Price List,ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,ಮರಗೆಲಸ
 DocType: Production Order Operation,Work In Progress,ಪ್ರಗತಿಯಲ್ಲಿದೆ ಕೆಲಸ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ಮುದ್ರಣ
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Docname ಪೋಷಕ ವಿವ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,ಕೆಜಿ
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,ಕೆಲಸ ತೆರೆಯುತ್ತಿದೆ .
 DocType: Item Attribute,Increment,ಹೆಚ್ಚಳವನ್ನು
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,ಜಾಹೀರಾತು
 DocType: Employee,Married,ವಿವಾಹಿತರು
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 DocType: Payment Reconciliation,Reconcile,ರಾಜಿ ಮಾಡಿಸು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,ದಿನಸಿ
 DocType: Quality Inspection Reading,Reading 1,1 ಓದುವಿಕೆ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ಮಾಡಿ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,ಪಿಂಚಣಿ ನಿಧಿಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,ಖಾತೆಯನ್ನು ರೀತಿಯ ವೇರ್ಹೌಸ್ ವೇಳೆ ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯ
 DocType: SMS Center,All Sales Person,ಎಲ್ಲಾ ಮಾರಾಟಗಾರನ
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್ 
 DocType: Warehouse,Warehouse Detail,ವೇರ್ಹೌಸ್ ವಿವರ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ದಾಟಿದೆ ಮಾಡಲಾಗಿದೆ {0} {1} / {2}
 DocType: Tax Rule,Tax Type,ಜನಪ್ರಿಯ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},ನೀವು ಮೊದಲು ನಮೂದುಗಳನ್ನು ಸೇರಿಸಲು ಅಥವ ಅಪ್ಡೇಟ್ ಅಧಿಕಾರ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},ನೀವು ಮೊದಲು ನಮೂದುಗಳನ್ನು ಸೇರಿಸಲು ಅಥವ ಅಪ್ಡೇಟ್ ಅಧಿಕಾರ {0}
 DocType: Item,Item Image (if not slideshow),ಐಟಂ ಚಿತ್ರ (ಇಲ್ಲದಿದ್ದರೆ ಸ್ಲೈಡ್ಶೋ )
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ಗ್ರಾಹಕ ಅದೇ ಹೆಸರಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ಅವರ್ ದರ / 60) * ವಾಸ್ತವಿಕ ಆಪರೇಷನ್ ಟೈಮ್
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,ಅತಿಥಿ
 DocType: Quality Inspection,Get Specification Details,ವಿಶಿಷ್ಟ ವಿವರಗಳನ್ನು ಪಡೆಯಲು
 DocType: Lead,Interested,ಆಸಕ್ತಿ
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ಮೆಟೀರಿಯಲ್ ಬಿಲ್
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,ಆರಂಭಿಕ
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,ಆರಂಭಿಕ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},ಗೆ {0} ಗೆ {1}
 DocType: Item,Copy From Item Group,ಐಟಂ ಗುಂಪಿನಿಂದ ನಕಲಿಸಿ
 DocType: Journal Entry,Opening Entry,ಎಂಟ್ರಿ ತೆರೆಯುವ
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,ಉತ್ಪನ್ನ ವಿಚಾರಣೆ
 DocType: Standard Reply,Owner,ಒಡೆಯ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,ಮೊದಲ ಕಂಪನಿ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,ಮೊದಲ ಕಂಪನಿ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,ಮೊದಲ ಕಂಪನಿ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Employee Education,Under Graduate,ಸ್ನಾತಕಪೂರ್ವ ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,ಟಾರ್ಗೆಟ್ ರಂದು
 DocType: BOM,Total Cost,ಒಟ್ಟು ವೆಚ್ಚ
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,ಮೊದಲೇ ಜೋಡಿಸು
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,ಉಪಭೋಗ್ಯ
 DocType: Upload Attendance,Import Log,ಆಮದು ಲಾಗ್
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ಕಳುಹಿಸು
+DocType: Sales Invoice Item,Delivered By Supplier,ಸರಬರಾಜುದಾರ ವಿತರಣೆ
 DocType: SMS Center,All Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
 DocType: Period Closing Voucher,Closing Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಕ್ಲೋಸಿಂಗ್
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,ಕಾಂಟ್ರಾ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,ಟೈಮ್ ತೋರಿಸಿ ದಾಖಲೆಗಳು
 DocType: Journal Entry Account,Credit in Company Currency,ಕಂಪನಿ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್
 DocType: Delivery Note,Installation Status,ಅನುಸ್ಥಾಪನ ಸ್ಥಿತಿಯನ್ನು
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ಅಕ್ಸೆಪ್ಟೆಡ್ + ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ ಐಟಂ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣಕ್ಕೆ ಸಮ ಇರಬೇಕು {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ಅಕ್ಸೆಪ್ಟೆಡ್ + ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ ಐಟಂ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣಕ್ಕೆ ಸಮ ಇರಬೇಕು {0}
 DocType: Item,Supply Raw Materials for Purchase,ಪೂರೈಕೆ ಕಚ್ಚಾ ವಸ್ತುಗಳ ಖರೀದಿ
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,ಐಟಂ {0} ಖರೀದಿಸಿ ಐಟಂ ಇರಬೇಕು
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", ಟೆಂಪ್ಲೇಟು ಸೂಕ್ತ ಮಾಹಿತಿ ತುಂಬಲು ಮತ್ತು ಬದಲಾಯಿಸಲಾಗಿತ್ತು ಕಡತ ಲಗತ್ತಿಸಬಹುದು.
  ಆಯ್ಕೆ ಅವಧಿಯಲ್ಲಿ ಎಲ್ಲ ದಿನಾಂಕಗಳು ಮತ್ತು ನೌಕರ ಸಂಯೋಜನೆಯನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಹಾಜರಾತಿ ದಾಖಲೆಗಳು, ಟೆಂಪ್ಲೇಟ್ ಬರುತ್ತದೆ"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,ಐಟಂ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಜೀವನದ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿತು ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,ಐಟಂ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಜೀವನದ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿತು ಮಾಡಲಾಗಿದೆ
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಸಲ್ಲಿಸಿದ ನಂತರ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: SMS Center,SMS Center,ಸಂಚಿಕೆ ಸೆಂಟರ್
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ನೇರವಾಗಿ
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,ಸಂದೇಶವು U
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,ಬೆಲೆ ಮತ್ತು ರಿಯಾಯಿತಿ ಅಳವಡಿಸುವ ನಿಯಮಗಳು .
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},ಈ ಟೈಮ್ ಲಾಗ್ ಘರ್ಷಣೆಗಳು {0} ಫಾರ್ {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ ಅಥವಾ ಮಾರಾಟದ ಜ ಇರಬೇಕು
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},ಅನುಸ್ಥಾಪನ ದಿನಾಂಕ ಐಟಂ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},ಅನುಸ್ಥಾಪನ ದಿನಾಂಕ ಐಟಂ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ದರ ಪಟ್ಟಿ ದರ ರಿಯಾಯಿತಿ (%)
-sites/assets/js/form.min.js +279,Start,ಪ್ರಾರಂಭ
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,ಪ್ರಾರಂಭ
 DocType: User,First Name,ಮೊದಲ ಹೆಸರು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,ನಿಮ್ಮ ಸೆಟಪ್ ಪೂರ್ಣಗೊಂಡಿದೆ. ರಿಫ್ರೆಶ್.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ಪೂರ್ಣ ಅಚ್ಚು ಎರಕದ
 DocType: Offer Letter,Select Terms and Conditions,ಆಯ್ಕೆ ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
 DocType: Production Planning Tool,Sales Orders,ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ ವಿರುದ್ಧ
 ,Production Orders in Progress,ಪ್ರೋಗ್ರೆಸ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 DocType: Lead,Address & Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
+DocType: Leave Allocation,Add unused leaves from previous allocations,ಹಿಂದಿನ ಹಂಚಿಕೆಗಳು ರಿಂದ ಬಳಕೆಯಾಗದ ಎಲೆಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},ಮುಂದಿನ ಮರುಕಳಿಸುವ {0} ಮೇಲೆ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ {1}
 DocType: Newsletter List,Total Subscribers,ಒಟ್ಟು ಚಂದಾದಾರರು
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ಸಂಪರ್ಕಿಸಿ ಹೆಸರು
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,ಆದ್ದರಿಂದ ಬಾಕ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ಮೇಲೆ ತಿಳಿಸಿದ ಮಾನದಂಡಗಳನ್ನು ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸುತ್ತದೆ .
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ಖರೀದಿ ವಿನಂತಿ .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ಡಬಲ್ ವಸತಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,ದಿನಾಂಕ ನಿವಾರಿಸುವ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} ಸೆಟಪ್> ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ> ಹೆಸರಿಸುವ ಸರಣಿಯ ಸರಣಿ ಹೆಸರಿಸುವ ಹೊಂದಿಸಿ
 DocType: Time Log,Will be updated when batched.,Batched ಮಾಡಿದಾಗ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ಸಾಲು {0}: ಪರಿಶೀಲಿಸಿ ಖಾತೆ ವಿರುದ್ಧ 'ಅಡ್ವಾನ್ಸ್ ಈಸ್' {1} ಈ ಮುಂಗಡ ಪ್ರವೇಶ ವೇಳೆ.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ಸಾಲು {0}: ಪರಿಶೀಲಿಸಿ ಖಾತೆ ವಿರುದ್ಧ 'ಅಡ್ವಾನ್ಸ್ ಈಸ್' {1} ಈ ಮುಂಗಡ ಪ್ರವೇಶ ವೇಳೆ.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},ವೇರ್ಹೌಸ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
 DocType: Bulk Email,Message,ಸಂದೇಶ
 DocType: Item Website Specification,Item Website Specification,ವಸ್ತು ವಿಶೇಷತೆಗಳು ವೆಬ್ಸೈಟ್
 DocType: Dropbox Backup,Dropbox Access Key,ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಪ್ರವೇಶ ಕೀ
 DocType: Payment Tool,Reference No,ಉಲ್ಲೇಖ ಯಾವುದೇ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
 DocType: Stock Entry,Sales Invoice No,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ನಂ
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೆ
 DocType: Pricing Rule,Supplier Type,ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Item,Purchase Details,ಖರೀದಿ ವಿವರಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ಖರೀದಿ ಆದೇಶದ 'ಕಚ್ಚಾ ವಸ್ತುಗಳ ಸರಬರಾಜು ಕೋಷ್ಟಕದಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ ಐಟಂ {0} {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,ಅಧಿಸೂಚನೆ ಕ
 DocType: Lead,Suggestions,ಸಲಹೆಗಳು
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,ಈ ಪ್ರದೇಶ ಮೇಲೆ ಐಟಂ ಗುಂಪು ಬಲ್ಲ ಬಜೆಟ್ ಹೊಂದಿಸಲು . ನೀವು ಆದ್ದರಿಂದ ವಿತರಣೆ ಹೊಂದಿಸುವ ಮೂಲಕ ಋತುಗಳು ಒಳಗೊಳ್ಳಬಹುದು.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},ಗೋದಾಮಿನ ಪೋಷಕ ಖಾತೆಯನ್ನು ಗುಂಪು ನಮೂದಿಸಿ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ವಿರುದ್ಧ ಪಾವತಿ {0} {1} ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ವಿರುದ್ಧ ಪಾವತಿ {0} {1} ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {2}
 DocType: Supplier,Address HTML,ವಿಳಾಸ ಎಚ್ಟಿಎಮ್ಎಲ್
 DocType: Lead,Mobile No.,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Maintenance Schedule,Generate Schedule,ವೇಳಾಪಟ್ಟಿ ರಚಿಸಿ
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,ಹೊಸ ಸ್ಟಾಕ್
 DocType: Period Closing Voucher,Closing Account Head,ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಹೆಡ್
 DocType: Employee,External Work History,ಬಾಹ್ಯ ಕೆಲಸ ಇತಿಹಾಸ
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,ನೀವು ನಿಜವಾಗಿಯೂ ನಿಲ್ಲಿಸಲು ಬಯಸುತ್ತೀರಾ
 DocType: Communication,Closed,ಮುಚ್ಚಲಾಗಿದೆ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ನೀವು ವಿತರಣಾ ಸೂಚನೆ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ( ರಫ್ತು ) ಗೋಚರಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,ನೀವು ನಿಲ್ಲಿಸಲು ಖಚಿತವೇ
 DocType: Lead,Industry,ಇಂಡಸ್ಟ್ರಿ
 DocType: Employee,Job Profile,ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು
 DocType: Newsletter,Newsletter,ಸುದ್ದಿಪತ್ರ
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸ
 DocType: Dropbox Backup,Allow Dropbox Access,ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಅನುಮತಿಸಬಹುದು
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ಈ ವಾರ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Workstation,Rent Cost,ಬಾಡಿಗೆ ವೆಚ್ಚ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,ತಿಂಗಳು ವರ್ಷದ ಆಯ್ಕೆಮಾಡಿ
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ಗ್ರಾಹಕ ಕರೆನ್ಸಿ ದರ ಗ್ರಾಹಕ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM , ಡೆಲಿವರಿ ನೋಟ್, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ , ಉತ್ಪಾದನೆ ಆರ್ಡರ್ , ಆರ್ಡರ್ ಖರೀದಿಸಿ , ಖರೀದಿ ರಸೀತಿ , ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ , ಮಾರಾಟದ ಆರ್ಡರ್ , ಸ್ಟಾಕ್ ಎಂಟ್ರಿ , timesheet ಲಭ್ಯವಿದೆ"
 DocType: Item Tax,Tax Rate,ತೆರಿಗೆ ದರ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,ಆಯ್ಕೆ ಐಟಂ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","ಐಟಂ: {0} ಬ್ಯಾಚ್ ಬಲ್ಲ, ಬದಲಿಗೆ ಬಳಸಲು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ \
  ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು ರಾಜಿ ಸಾಧ್ಯವಿಲ್ಲ ನಿರ್ವಹಿಸುತ್ತಿದ್ದ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ರೋ # {0}: ಬ್ಯಾಚ್ ಯಾವುದೇ ಅದೇ ಇರಬೇಕು {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,ಅ ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ಸಲ್ಲಿಸಬೇಕು
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,ಪ್ರಸ್ತುತ 
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,ಐಟಂ ಬ್ಯಾಚ್ ( ಬಹಳಷ್ಟು ) .
 DocType: C-Form Invoice Detail,Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 DocType: GL Entry,Debit Amount,ಡೆಬಿಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,ನಿಮ್ಮ ಈಮೇಲ್ ವಿಳಾಸ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
 DocType: Purchase Order,% Received,% ಸ್ವೀಕರಿಸಲಾಗಿದೆ
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,ಸೂಚನೆಗಳು
 DocType: Quality Inspection,Inspected By,ಪರಿಶೀಲನೆ
 DocType: Maintenance Visit,Maintenance Type,ನಿರ್ವಹಣೆ ಪ್ರಕಾರ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ಐಟಂ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ ನಿಯತಾಂಕಗಳನ್ನು
 DocType: Leave Application,Leave Approver Name,ಅನುಮೋದಕ ಹೆಸರು ಬಿಡಿ
 ,Schedule Date,ವೇಳಾಪಟ್ಟಿ ದಿನಾಂಕ
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,ಖರೀದಿ ನೋಂದಣಿ
 DocType: Landed Cost Item,Applicable Charges,ಅನ್ವಯಿಸುವ ಆರೋಪಗಳನ್ನು
 DocType: Workstation,Consumable Cost,ಉಪಭೋಗ್ಯ ವೆಚ್ಚ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
 DocType: Purchase Receipt,Vehicle Date,ವಾಹನ ದಿನಾಂಕ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ವೈದ್ಯಕೀಯ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ಸೋತ ಕಾರಣ
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% ಅನುಸ್ಥಾಪಿಸಲಾದ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ನಮೂದಿಸಿ
 DocType: BOM,Item Desription,ಐಟಂ desription
 DocType: Purchase Invoice,Supplier Name,ಸರಬರಾಜುದಾರ ಹೆಸರು
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext ಮ್ಯಾನುಯಲ್ ಓದಿ
 DocType: Account,Is Group,ಗ್ರೂಪ್
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,ಸ್ವಯಂಚಾಲಿತವಾಗಿ FIFO ಆಧರಿಸಿ ನಾವು ಸೀರಿಯಲ್ ಹೊಂದಿಸಿ
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ಚೆಕ್ ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ವೈಶಿಷ್ಟ್ಯ
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,ಮಾರಾಟ 
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,ಎಲ್ಲಾ ಉತ್ಪಾದನಾ ಪ್ರಕ್ರಿಯೆಗಳು ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು.
 DocType: Accounts Settings,Accounts Frozen Upto,ಘನೀಕೃತ ವರೆಗೆ ಖಾತೆಗಳು
 DocType: SMS Log,Sent On,ಕಳುಹಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
 DocType: Sales Order,Not Applicable,ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ಶೆಲ್ ಸೂರು
 DocType: Material Request Item,Required Date,ಅಗತ್ಯವಿರುವ ದಿನಾಂಕ
 DocType: Delivery Note,Billing Address,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
 DocType: BOM,Costing,ಕಾಸ್ಟಿಂಗ್
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","ಪರಿಶೀಲಿಸಿದರೆ ಈಗಾಗಲೇ ಮುದ್ರಣ ದರ / ಪ್ರಿಂಟ್ ಪ್ರಮಾಣ ಸೇರಿಸಲಾಗಿದೆ ಎಂದು , ತೆರಿಗೆ ಪ್ರಮಾಣವನ್ನು ಪರಿಗಣಿಸಲಾಗುವುದು"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,ಒಟ್ಟು ಪ್ರಮಾಣ
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),(ನಿಮಿ
 DocType: Customer,Buyer of Goods and Services.,ಸರಕು ಮತ್ತು ಸೇವೆಗಳ ಖರೀದಿದಾರನ.
 DocType: Journal Entry,Accounts Payable,ಖಾತೆಗಳನ್ನು ಕೊಡಬೇಕಾದ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,ಚಂದಾದಾರರು ಸೇರಿಸಿ
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
 DocType: Pricing Rule,Valid Upto,ಮಾನ್ಯ ವರೆಗೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,ನಿಮ್ಮ ಗ್ರಾಹಕರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,ನೇರ ಆದಾಯ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","ಖಾತೆ ವರ್ಗೀಕರಿಸಲಾದ ವೇಳೆ , ಖಾತೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
 DocType: Payment Tool,Received Or Paid,ಪಡೆದಾಗ ಅಥವಾ ಪಾವತಿಸಿದಾಗ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 DocType: Stock Entry,Difference Account,ವ್ಯತ್ಯಾಸ ಖಾತೆ
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,ಇದನ್ನು ಅವಲಂಬಿಸಿರುವ ಕೆಲಸವನ್ನು {0} ಮುಚ್ಚಿಲ್ಲ ಹತ್ತಿರಕ್ಕೆ ಕೆಲಸವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
 DocType: Production Order,Additional Operating Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚವನ್ನು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
 DocType: DocField,Type,ದರ್ಜೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
 DocType: Communication,Subject,ವಿಷಯ
 DocType: Shipping Rule,Net Weight,ನೆಟ್ ತೂಕ
 DocType: Employee,Emergency Phone,ತುರ್ತು ದೂರವಾಣಿ
 ,Serial No Warranty Expiry,ಸೀರಿಯಲ್ ಭರವಸೆಯಿಲ್ಲ ಅಂತ್ಯ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ವಸ್ತು ವಿನಂತಿಯನ್ನು ನಿಲ್ಲಿಸಲು ಬಯಸುತ್ತೀರಾ ?
 DocType: Sales Order,To Deliver,ತಲುಪಿಸಲು
 DocType: Purchase Invoice Item,Item,ವಸ್ತು
 DocType: Journal Entry,Difference (Dr - Cr),ವ್ಯತ್ಯಾಸ ( ಡಾ - ಸಿಆರ್)
 DocType: Account,Profit and Loss,ಲಾಭ ಮತ್ತು ನಷ್ಟ
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,ಹೊಸ UOM ಇಡೀ ಸಂಖ್ಯೆ ಇರಬಾರದು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,ಪೀಠೋಪಕರಣಗಳು ಮತ್ತು ಫಿಕ್ಸ್ಚರ್
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ದರ ಕಂಪನಿಯ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,ಸೇರಿಸಿ / 
 DocType: Purchase Invoice,Supplier Invoice No,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Territory,For reference,ಪರಾಮರ್ಶೆಗಾಗಿ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","ಅಳಿಸಿಹಾಕಲಾಗದು ಸೀರಿಯಲ್ ಯಾವುದೇ {0}, ಇದು ಸ್ಟಾಕ್ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುತ್ತದೆ"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),ಮುಚ್ಚುವ (ಸಿಆರ್)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),ಮುಚ್ಚುವ (ಸಿಆರ್)
 DocType: Serial No,Warranty Period (Days),ಖಾತರಿ ಕಾಲ (ದಿನಗಳು)
 DocType: Installation Note Item,Installation Note Item,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ ಐಟಂ
 ,Pending Qty,ಬಾಕಿ ಪ್ರಮಾಣ
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,ಬಿಲ್ಲಿಂಗ್ ಮ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ಮತ್ತೆ ಗ್ರಾಹಕರ
 DocType: Leave Control Panel,Allocate,ಗೊತ್ತುಪಡಿಸು
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,ಹಿಂದಿನ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,ನೀವು ಉತ್ಪಾದನೆ ಆದೇಶಗಳನ್ನು ರಚಿಸಲು ಬಯಸುವ ಆಯ್ಕೆ ಮಾರಾಟ ಆದೇಶಗಳನ್ನು .
+DocType: Item,Delivered by Supplier (Drop Ship),ಸರಬರಾಜುದಾರ ವಿತರಣೆ (ಡ್ರಾಪ್ ಹಡಗು)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,ಸಂಬಳ ಘಟಕಗಳನ್ನು .
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ಸಂಭಾವ್ಯ ಗ್ರಾಹಕರು ಡೇಟಾಬೇಸ್ .
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,ಗ್ರಾಹಕ ಡೇಟಾಬೇಸ್ .
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,ಉರುಳುವ
 DocType: Purchase Order Item,Billed Amt,ಖ್ಯಾತವಾದ ಕಚೇರಿ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಇದು ವಿರುದ್ಧ ತಾರ್ಕಿಕ ವೇರ್ಹೌಸ್.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},ರೆಫರೆನ್ಸ್ ನಂ & ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},ರೆಫರೆನ್ಸ್ ನಂ & ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ {0}
 DocType: Event,Wednesday,ಬುಧವಾರ
 DocType: Sales Invoice,Customer's Vendor,ಗ್ರಾಹಕರ ಮಾರಾಟಗಾರರ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಕಡ್ಡಾಯ
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,ಸ್ವೀಕರಿಸುವವರ ನಿಯತಾಂಕಗಳನ್ನು
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'ಆಧರಿಸಿ ' ಮತ್ತು ' ಗುಂಪಿನ ' ಇರಲಾಗುವುದಿಲ್ಲ
 DocType: Sales Person,Sales Person Targets,ಮಾರಾಟಗಾರನ ಗುರಿ
-sites/assets/js/form.min.js +271,To,ಗೆ
-apps/frappe/frappe/templates/base.html +143,Please enter email address,ದಯವಿಟ್ಟು ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ಗೆ
+apps/frappe/frappe/templates/base.html +145,Please enter email address,ದಯವಿಟ್ಟು ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,ರೂಪಿಸುವ ಎಂಡ್ ಟ್ಯೂಬ್
 DocType: Production Order Operation,In minutes,ನಿಮಿಷಗಳಲ್ಲಿ
 DocType: Issue,Resolution Date,ರೆಸಲ್ಯೂಶನ್ ದಿನಾಂಕ
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,ಯೋಜನೆಗಳು ಬಳಕೆ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,ಸೇವಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ಸರಕುಪಟ್ಟಿ ವಿವರಗಳು ಟೇಬಲ್ ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Company,Round Off Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್ ಆಫ್ ಸುತ್ತ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ಭೇಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ಭೇಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 DocType: Material Request,Material Transfer,ವಸ್ತು ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),ತೆರೆಯುತ್ತಿದೆ ( ಡಾ )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},ಪೋಸ್ಟ್ ಸಮಯಮುದ್ರೆಗೆ ನಂತರ ಇರಬೇಕು {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,ಸೆಟ್ಟಿಂಗ್ಗ
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ಇಳಿಯಿತು ವೆಚ್ಚ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Production Order Operation,Actual Start Time,ನಿಜವಾದ ಟೈಮ್
 DocType: BOM Operation,Operation Time,ಆಪರೇಷನ್ ಟೈಮ್
-sites/assets/js/list.min.js +5,More,ಇನ್ನಷ್ಟು
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,ಇನ್ನಷ್ಟು
 DocType: Pricing Rule,Sales Manager,ಸೇಲ್ಸ್ ಮ್ಯಾನೇಜರ್
-sites/assets/js/desk.min.js +7673,Rename,ಹೊಸ ಹೆಸರಿಡು
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,ಹೊಸ ಹೆಸರಿಡು
 DocType: Journal Entry,Write Off Amount,ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,ಬಾಗುವುದು
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,ಬಳಕೆದಾರ ಅನುಮತಿಸಿ
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ನೇರ ಕತ್ತರಿಸುವ
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,ಅವರ ಸರಣಿ ಸೂಲ ಆಧರಿಸಿ ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ ದಾಖಲೆಗಳನ್ನು ಐಟಂ ಅನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಲು . ಆದ್ದರಿಂದ ಉತ್ಪನ್ನದ ಖಾತರಿ ವಿವರಗಳು ಪತ್ತೆಹಚ್ಚಲು ಬಳಸಲಾಗುತ್ತದೆ ಮಾಡಬಹುದು ಇದೆ .
 DocType: Purchase Receipt Item Supplied,Current Stock,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ವೇರ್ಹೌಸ್ regected ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ವೇರ್ಹೌಸ್ regected ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ
 DocType: Account,Expenses Included In Valuation,ವೆಚ್ಚಗಳು ಮೌಲ್ಯಾಂಕನ ಸೇರಿಸಲಾಗಿದೆ
 DocType: Employee,Provide email id registered in company,ಕಂಪನಿಗಳು ನೋಂದಣಿ ಇಮೇಲ್ ಐಡಿ ಒದಗಿಸಿ
 DocType: Hub Settings,Seller City,ಮಾರಾಟಗಾರ ಸಿಟಿ
 DocType: Email Digest,Next email will be sent on:,ಮುಂದೆ ಇಮೇಲ್ ಮೇಲೆ ಕಳುಹಿಸಲಾಗುವುದು :
 DocType: Offer Letter Term,Offer Letter Term,ಪತ್ರ ಟರ್ಮ್ ಆಫರ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ಐಟಂ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Bin,Stock Value,ಸ್ಟಾಕ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ಟ್ರೀ ಕೌಟುಂಬಿಕತೆ
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ಸ್ವಾಗತ
 DocType: Journal Entry,Credit Card Entry,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,ಕೆಲಸವನ್ನು ವಿಷಯ
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,ಗೂಡ್ಸ್ ವಿತರಕರಿಂದ ಪಡೆದ .
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,ಗೂಡ್ಸ್ ವಿತರಕರಿಂದ ಪಡೆದ .
 DocType: Communication,Open,ತೆರೆದ
 DocType: Lead,Campaign Name,ಕ್ಯಾಂಪೇನ್ ಹೆಸರು
 ,Reserved,ಮೀಸಲಿಟ್ಟ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,ನೀವು ನಿಜವಾಗಿಯೂ ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು ಬಯಸುವಿರಾ
 DocType: Purchase Order,Supply Raw Materials,ಪೂರೈಕೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ಮುಂದಿನ ಸರಕುಪಟ್ಟಿ ಉತ್ಪಾದಿಸಬಹುದಾಗಿದೆ ಯಾವ ದಿನಾಂಕ. ಒಪ್ಪಿಸಬಹುದು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ಪ್ರಸಕ್ತ ಆಸ್ತಿಪಾಸ್ತಿಗಳು
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,ಗ್ರಾಹಕರ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ನಂ
 DocType: Employee,Cell Number,ಸೆಲ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ಲಾಸ್ಟ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ 'ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿರುದ್ಧ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ 'ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿರುದ್ಧ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ಶಕ್ತಿ
 DocType: Opportunity,Opportunity From,ಅವಕಾಶದಿಂದ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,ಮಾಸಿಕ ವೇತನವನ್ನು ಹೇಳಿಕೆ .
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,ಹೊಣೆಗಾರಿಕೆ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ಮಂಜೂರು ಪ್ರಮಾಣ ರೋನಲ್ಲಿ ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0}.
 DocType: Company,Default Cost of Goods Sold Account,ಸರಕುಗಳು ಮಾರಾಟ ಖಾತೆ ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚ
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
 DocType: Employee,Family Background,ಕೌಟುಂಬಿಕ ಹಿನ್ನೆಲೆ
 DocType: Process Payroll,Send Email,ಇಮೇಲ್ ಕಳುಹಿಸಿ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,ಯಾವುದೇ ಅನುಮತಿ
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,ಸೂಲ
 DocType: Item,Items with higher weightage will be shown higher,ಹೆಚ್ಚಿನ ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು ಹೊಂದಿರುವ ಐಟಂಗಳು ಹೆಚ್ಚಿನ ತೋರಿಸಲಾಗುತ್ತದೆ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ವಿವರ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,ನನ್ನ ಇನ್ವಾಯ್ಸ್ಗಳು
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,ಯಾವುದೇ ನೌಕರ
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ಯಾವುದೇ ನೌಕರ
 DocType: Purchase Order,Stopped,ನಿಲ್ಲಿಸಿತು
 DocType: Item,If subcontracted to a vendor,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,ಆರಂಭಿಸಲು BOM ಆಯ್ಕೆ
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSV ಮ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ಈಗ ಕಳುಹಿಸಿ
 ,Support Analytics,ಬೆಂಬಲ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Item,Website Warehouse,ವೆಬ್ಸೈಟ್ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,ನೀವು ನಿಜವಾಗಿಯೂ ಉತ್ಪಾದನೆ ಸಲುವಾಗಿ ನಿಲ್ಲಿಸಲು ಬಯಸುವಿರಾ:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ಸ್ವಯಂ ಸರಕುಪಟ್ಟಿ 05, 28 ಇತ್ಯಾದಿ ಉದಾ ರಚಿಸಲಾಗಿದೆ ಮೇಲೆ ತಿಂಗಳ ದಿನ"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ಸ್ಕೋರ್ ಕಡಿಮೆ ಅಥವಾ 5 ಸಮಾನವಾಗಿರಬೇಕು
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,ಸಿ ಆಕಾರ ರೆಕಾರ್ಡ್ಸ್
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,ಗ
 DocType: Features Setup,"To enable ""Point of Sale"" features","ಮಾರಾಟದ" ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಲು
 DocType: Bin,Moving Average Rate,ಮೂವಿಂಗ್ ಸರಾಸರಿ ದರ
 DocType: Production Planning Tool,Select Items,ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
 DocType: Comment,Reference Name,ರೆಫರೆನ್ಸ್ ಹೆಸರು
 DocType: Maintenance Visit,Completion Status,ಪೂರ್ಣಗೊಂಡ ಸ್ಥಿತಿ
 DocType: Sales Invoice Item,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
 DocType: Item,Allow over delivery or receipt upto this percent,ಈ ಶೇಕಡಾ ವರೆಗೆ ವಿತರಣೆ ಅಥವಾ ರಶೀದಿ ಮೇಲೆ ಅವಕಾಶ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,ನಿರೀಕ್ಷಿತ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,ನಿರೀಕ್ಷಿತ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Upload Attendance,Import Attendance,ಆಮದು ಅಟೆಂಡೆನ್ಸ್
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
 DocType: Process Payroll,Activity Log,ಚಟುವಟಿಕೆ ಲಾಗ್
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವ್ಯವಹಾರಗಳ ಸಲ್ಲಿಕೆಯಲ್ಲಿ ಸಂದೇಶವನ್ನು ರಚಿಸಿದರು .
 DocType: Production Order,Item To Manufacture,ತಯಾರಿಸಲು ಐಟಂ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ಶಾಶ್ವತ ಅಚ್ಚು ಎರಕದ
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,ಪಾವತಿ ಆರ್ಡರ್ ಖರೀದಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} ಸ್ಥಿತಿ {2} ಆಗಿದೆ
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ಪಾವತಿ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 DocType: Sales Order Item,Projected Qty,ಪ್ರಮಾಣ ಯೋಜಿತ
 DocType: Sales Invoice,Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ
 DocType: Newsletter,Newsletter Manager,ಸುದ್ದಿಪತ್ರ ಮ್ಯಾನೇಜರ್
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,ಕೋರಿಕೆ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,ಸಾಧನೆಯ ಮೌಲ್ಯ ನಿರ್ಣಯ .
 DocType: Sales Invoice Item,Stock Details,ಸ್ಟಾಕ್ ವಿವರಗಳು
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ಪ್ರಾಜೆಕ್ಟ್ ಮೌಲ್ಯ
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},ಸಾಧ್ಯವಿಲ್ಲ carryforward {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},ಸಾಧ್ಯವಿಲ್ಲ carryforward {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ಖಾತೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ರೆಡಿಟ್, ನೀವು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ 'ಡೆಬಿಟ್' ಎಂದು 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಲೇಬೇಕು'"
 DocType: Account,Balance must be,ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು
 DocType: Hub Settings,Publish Pricing,ಬೆಲೆ ಪ್ರಕಟಿಸಿ
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
 ,Received Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಸ್ವೀಕರಿಸಿದ ಐಟಂಗಳು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ಅಪಘರ್ಷಕ ಸ್ಪೋಟವನ್ನು
-sites/assets/js/desk.min.js +3938,Ms,MS
+DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
 DocType: Production Order,Plan material for sub-assemblies,ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಯೋಜನೆ ವಸ್ತು
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,ಶ್ರೇಣಿ
 DocType: Supplier,Default Payable Accounts,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Features Setup,Item Barcode,ಐಟಂ ಬಾರ್ಕೋಡ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ಸರಕುಪಟ್ಟಿ ಮುಂಗಡ ಖರೀದಿ
 DocType: Address,Shop,ಅಂಗಡಿ
 DocType: Hub Settings,Sync Now,ಸಿಂಕ್ ಈಗ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},ಸಾಲು {0}: ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},ಸಾಲು {0}: ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ಈ ಕ್ರಮವನ್ನು ಆಯ್ಕೆ ಮಾಡಿದಾಗ ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ರಲ್ಲಿ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
 DocType: Employee,Permanent Address Is,ಖಾಯಂ ವಿಳಾಸ ಈಸ್
 DocType: Production Order Operation,Operation completed for how many finished goods?,ಆಪರೇಷನ್ ಎಷ್ಟು ಸಿದ್ಧಪಡಿಸಿದ ವಸ್ತುಗಳನ್ನು ಪೂರ್ಣಗೊಂಡಿತು?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ಬ್ರ್ಯಾಂಡ್
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}.
 DocType: Employee,Exit Interview Details,ಎಕ್ಸಿಟ್ ಸಂದರ್ಶನ ವಿವರಗಳು
 DocType: Item,Is Purchase Item,ಖರೀದಿ ಐಟಂ
 DocType: Journal Entry Account,Purchase Invoice,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ
 DocType: Stock Ledger Entry,Voucher Detail No,ಚೀಟಿ ವಿವರ ನಂ
 DocType: Stock Entry,Total Outgoing Value,ಒಟ್ಟು ಹೊರಹೋಗುವ ಮೌಲ್ಯ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,ದಿನಾಂಕ ಮತ್ತು ಮುಕ್ತಾಯದ ದಿನಾಂಕ ತೆರೆಯುವ ಒಂದೇ ಆಗಿರುವ ಹಣಕಾಸಿನ ವರ್ಷವನ್ನು ಒಳಗೆ ಇರಬೇಕು
 DocType: Lead,Request for Information,ಮಾಹಿತಿಗಾಗಿ ಕೋರಿಕೆ
 DocType: Payment Tool,Paid,ಹಣ
 DocType: Salary Slip,Total in words,ಪದಗಳನ್ನು ಒಟ್ಟು
 DocType: Material Request Item,Lead Time Date,ಲೀಡ್ ಟೈಮ್ ದಿನಾಂಕ
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ ರಚಿಸಲಾಗಲಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},ರೋ # {0}: ಐಟಂ ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'ಉತ್ಪನ್ನ ಕಟ್ಟು' ಐಟಂಗಳನ್ನು, ವೇರ್ಹೌಸ್, ಸೀರಿಯಲ್ ಯಾವುದೇ ಮತ್ತು ಬ್ಯಾಚ್ ಯಾವುದೇ 'ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ ಮೇಜಿನಿಂದ ಪರಿಗಣಿಸಲಾಗುವುದು. ವೇರ್ಹೌಸ್ ಮತ್ತು ಬ್ಯಾಚ್ ಯಾವುದೇ ಯಾವುದೇ 'ಉತ್ಪನ್ನ ಕಟ್ಟು' ಐಟಂ ಎಲ್ಲಾ ಪ್ಯಾಕಿಂಗ್ ವಸ್ತುಗಳನ್ನು ಅದೇ ಇದ್ದರೆ, ಆ ಮೌಲ್ಯಗಳು ಮುಖ್ಯ ಐಟಂ ಕೋಷ್ಟಕದಲ್ಲಿ ಪ್ರವೇಶಿಸಬಹುದಾದ, ಮೌಲ್ಯಗಳನ್ನು ಟೇಬಲ್ 'ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ' ನಕಲು ನಡೆಯಲಿದೆ."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,ಗ್ರಾಹಕರಿಗೆ ರವಾನಿಸಲಾಯಿತು .
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ಗ್ರಾಹಕರಿಗೆ ರವಾನಿಸಲಾಯಿತು .
 DocType: Purchase Invoice Item,Purchase Order Item,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,ಪರೋಕ್ಷ ಆದಾಯ
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,ಹೊಂದಿಸಿ ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು = ಬಾಕಿ ಮೊತ್ತದ
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,ಲೈನ್ 1 ವಿಳಾಸ
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,ಭಿನ್ನಾಭಿಪ್ರಾಯ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ಕಂಪನಿ ಹೆಸರು
 DocType: SMS Center,Total Message(s),ಒಟ್ಟು ಸಂದೇಶ (ಗಳು)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ಎಲ್ಲಾ ಸಹಾಯ ವೀಡಿಯೊಗಳನ್ನು ಪಟ್ಟಿಯನ್ನು ವೀಕ್ಷಿಸಿ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ಅಲ್ಲಿ ಚೆಕ್ ಠೇವಣಿ ಏನು ಬ್ಯಾಂಕ್ ಖಾತೆ ಮುಖ್ಯಸ್ಥ ಆಯ್ಕೆ .
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ಬಳಕೆದಾರ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬೆಲೆ ಪಟ್ಟಿ ದರ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಿ
 DocType: Pricing Rule,Max Qty,ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ಸಾಲು {0}: ಮಾರಾಟದ / ​​ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಯಾವಾಗಲೂ ಮುಂಚಿತವಾಗಿ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ಸಾಲು {0}: ಮಾರಾಟದ / ​​ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಯಾವಾಗಲೂ ಮುಂಚಿತವಾಗಿ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,ರಾಸಾಯನಿಕ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
 DocType: Process Payroll,Select Payroll Year and Month,ವೇತನದಾರರ ವರ್ಷ ಮತ್ತು ತಿಂಗಳು ಆಯ್ಕೆ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",ಸೂಕ್ತ ಗುಂಪು (ಸಾಮಾನ್ಯವಾಗಿ ಫಂಡ್ಸ್ ಅಪ್ಲಿಕೇಶನ್> ಪ್ರಸಕ್ತ ಆಸ್ತಿಪಾಸ್ತಿಗಳು> ಬ್ಯಾಂಕ್ ಖಾತೆಗಳ ಹೋಗಿ ರೀತಿಯ) ಮಕ್ಕಳ ಸೇರಿಸಿ ಕ್ಲಿಕ್ಕಿಸಿ (ಒಂದು ಹೊಸ ಖಾತೆ ರಚಿಸಿ "ಬ್ಯಾಂಕ್"
 DocType: Workstation,Electricity Cost,ವಿದ್ಯುತ್ ಬೆಲೆ
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ಬ
 DocType: SMS Center,All Lead (Open),ಎಲ್ಲಾ ಪ್ರಮುಖ ( ಓಪನ್ )
 DocType: Purchase Invoice,Get Advances Paid,ಪಾವತಿಸಿದ ಅಡ್ವಾನ್ಸಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ನಿಮ್ಮ ಚಿತ್ರ ಲಗತ್ತಿಸಿ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,ಮಾಡಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ಮಾಡಿ
 DocType: Journal Entry,Total Amount in Words,ವರ್ಡ್ಸ್ ಒಟ್ಟು ಪ್ರಮಾಣ
 DocType: Workflow State,Stop,ನಿಲ್ಲಿಸಲು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ಒಂದು ದೋಷ ಉಂಟಾಗಿದೆ . ನೀವು ಉಳಿಸಿಲ್ಲ ಮಾಡಲಿಲ್ಲ ಒಂದು ಸಂಭಾವ್ಯ ಕಾರಣ ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ support@erpnext.com ಸಂಪರ್ಕಿಸಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಾಧ್ಯವಾಗಿಲ್ಲ .
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,ಪ್ಯಾಕಿಂಗ್ ಸ್
 DocType: POS Profile,Cash/Bank Account,ನಗದು / ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
 DocType: Delivery Note,Delivery To,ವಿತರಣಾ
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Planning Tool,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ಫೈಲಿಂಗ್
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',ಟೈಮ್
 DocType: Project,Internal,ಆಂತರಿಕ
 DocType: Task,Urgent,ತುರ್ತಿನ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},ಕೋಷ್ಟಕದಲ್ಲಿ ಸಾಲು {0} ಮಾನ್ಯವಾದ ಸಾಲು ಐಡಿ ಸೂಚಿಸಿ {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ಡೆಸ್ಕ್ಟಾಪ್ ಹೋಗಿ ERPNext ಬಳಸಿಕೊಂಡು ಆರಂಭಿಸಲು
 DocType: Item,Manufacturer,ತಯಾರಕ
 DocType: Landed Cost Item,Purchase Receipt Item,ಖರೀದಿ ರಸೀತಿ ಐಟಂ
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ಮಾರಾಟದ ಆರ್ಡರ್ / ಗೂಡ್ಸ್ ಮುಕ್ತಾಯಗೊಂಡ ವೇರ್ಹೌಸ್ ರಿಸರ್ವ್ಡ್ ಗೋದಾಮಿನ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,ಮಾರಾಟ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,ಸಮಯ ದಾಖಲೆಗಳು
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,ನೀವು ಈ ದಾಖಲೆ ಖರ್ಚು ಅನುಮೋದಕ ಇವೆ . ' ಸ್ಥಿತಿಯನ್ನು ' ಅಪ್ಡೇಟ್ ಮತ್ತು ಉಳಿಸಿ ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,ನೀವು ಈ ದಾಖಲೆ ಖರ್ಚು ಅನುಮೋದಕ ಇವೆ . ' ಸ್ಥಿತಿಯನ್ನು ' ಅಪ್ಡೇಟ್ ಮತ್ತು ಉಳಿಸಿ ದಯವಿಟ್ಟು
 DocType: Serial No,Creation Document No,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಂಖ್ಯೆ
 DocType: Issue,Issue,ಸಂಚಿಕೆ
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","ಐಟಂ ಮಾರ್ಪಾಟುಗಳು ಗುಣಲಕ್ಷಣಗಳು. ಉದಾಹರಣೆಗೆ ಗಾತ್ರ, ಬಣ್ಣ ಇತ್ಯಾದಿ"
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
 DocType: Opportunity,Contact Info,ಸಂಪರ್ಕ ಮಾಹಿತಿ
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
 DocType: Packing Slip,Net Weight UOM,ನೆಟ್ ತೂಕ UOM
 DocType: Item,Default Supplier,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ಪ್ರೊಡಕ್ಷನ್ ಸೇವನೆ ಶೇಕಡಾವಾರು ಓವರ್
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,ದಿನಾಂಕ ವೀಕ್ಲಿ ಆಫ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,ಅಂತಿಮ ದಿನಾಂಕ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Sales Person,Select company name first.,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,ಡಾ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,ಡಾ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ಉಲ್ಲೇಖಗಳು ವಿತರಕರಿಂದ ಪಡೆದ .
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},ಗೆ {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,ನಿಮ್ಮ ಉಲ್ಲೇಖ ಕಂಪನಿ ನೋಂದಣಿ ಸಂಖ್ಯೆಗಳು . ತೆರಿಗೆ ಸಂಖ್ಯೆಗಳನ್ನು ಇತ್ಯಾದಿ
 DocType: Sales Partner,Distributor,ವಿತರಕ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 ,Ordered Items To Be Billed,ಖ್ಯಾತವಾದ ಐಟಂಗಳನ್ನು ಆದೇಶ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,ರೇಂಜ್ ಕಡಿಮೆ ಎಂದು ಹೊಂದಿದೆ ಹೆಚ್ಚಾಗಿ ಶ್ರೇಣಿಗೆ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,ಟೈಮ್ ದಾಖಲೆಗಳು ಆಯ್ಕೆ ಮತ್ತು ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು ಸಲ್ಲಿಸಿ .
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ತೆ
 DocType: Lead,Lead,ಲೀಡ್
 DocType: Email Digest,Payables,ಸಂದಾಯಗಳು
 DocType: Account,Warehouse,ಮಳಿಗೆ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,ರೋ # {0}: ಪ್ರಮಾಣ ಖರೀದಿ ರಿಟರ್ನ್ ಪ್ರವೇಶಿಸಿತು ಸಾಧ್ಯವಿಲ್ಲ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,ರೋ # {0}: ಪ್ರಮಾಣ ಖರೀದಿ ರಿಟರ್ನ್ ಪ್ರವೇಶಿಸಿತು ಸಾಧ್ಯವಿಲ್ಲ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
 ,Purchase Order Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಖರೀದಿ ಆದೇಶವನ್ನು ಐಟಂಗಳು
 DocType: Purchase Invoice Item,Net Rate,ನೆಟ್ ದರ
 DocType: Purchase Invoice Item,Purchase Invoice Item,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಐಟಂ
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,ರಾಜಿಯಾ
 DocType: Global Defaults,Current Fiscal Year,ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ
 DocType: Global Defaults,Disable Rounded Total,ದುಂಡಾದ ಒಟ್ಟು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Lead,Call,ಕರೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},ನಕಲು ಸಾಲು {0} {1} ಒಂದೇ ಜೊತೆ
 ,Trial Balance,ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
-sites/assets/js/erpnext.min.js +5,"Grid ""","ಗ್ರಿಡ್ """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","ಗ್ರಿಡ್ """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,ರಿಸರ್ಚ್
 DocType: Maintenance Visit Purpose,Work Done,ಕೆಲಸ ನಡೆದಿದೆ
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,ಕಳುಹಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ಮುಂಚಿನ
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
 DocType: Communication,Delivery Status,ಡೆಲಿವರಿ ಸ್ಥಿತಿ
 DocType: Production Order,Manufacture against Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ತಯಾರಿಸಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 ,Budget Variance Report,ಬಜೆಟ್ ವೈಷಮ್ಯವನ್ನು ವರದಿ
 DocType: Salary Slip,Gross Pay,ಗ್ರಾಸ್ ಪೇ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,ಫಲಕಾರಿಯಾಯಿತು
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,ಲೆಕ್ಕಪತ್ರ ಲೆಡ್ಜರ್
 DocType: Stock Reconciliation,Difference Amount,ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,ಇಟ್ಟುಕೊಂಡ ಗಳಿಕೆಗಳು
 DocType: BOM Item,Item Description,ಐಟಂ ವಿವರಣೆ
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,ಅವಕಾಶ ಐಟಂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,ತಾತ್ಕಾಲಿಕ ಉದ್ಘಾಟನಾ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,ನೌಕರರ ಲೀವ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},{0} ಯಾವಾಗಲೂ ಇರಬೇಕು ಖಾತೆ ಬಾಕಿ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} ಯಾವಾಗಲೂ ಇರಬೇಕು ಖಾತೆ ಬಾಕಿ {1}
 DocType: Address,Address Type,ವಿಳಾಸ ಪ್ರಕಾರ
 DocType: Purchase Receipt,Rejected Warehouse,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ವೇರ್ಹೌಸ್
 DocType: GL Entry,Against Voucher,ಚೀಟಿ ವಿರುದ್ಧ
 DocType: Item,Default Buying Cost Center,ಡೀಫಾಲ್ಟ್ ಖರೀದಿ ವೆಚ್ಚ ಸೆಂಟರ್
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext ಅತ್ಯುತ್ತಮ ಔಟ್ ಪಡೆಯಲು, ನೀವು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ ಮತ್ತು ಈ ಸಹಾಯ ವೀಡಿಯೊಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಶಿಫಾರಸು."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,ಐಟಂ {0} ಮಾರಾಟದ ಐಟಂ ಇರಬೇಕು
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,ಗೆ
 DocType: Item,Lead Time in days,ದಿನಗಳಲ್ಲಿ ಪ್ರಮುಖ ಸಮಯ
 ,Accounts Payable Summary,ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು ಸಾರಾಂಶ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆ ಸಂಪಾದಿಸಲು ಅಧಿಕಾರ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆ ಸಂಪಾದಿಸಲು ಅಧಿಕಾರ {0}
 DocType: Journal Entry,Get Outstanding Invoices,ಮಹೋನ್ನತ ಇನ್ವಾಯ್ಸಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,ಸಂಚಿಕೆ ಪ್ಲೇಸ್
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ಒಪ್ಪಂದ
 DocType: Report,Disabled,ಅಂಗವಿಕಲ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM ಅಗತ್ಯವಿದೆ UOM coversion ಫ್ಯಾಕ್ಟರ್: {0} ಐಟಂ ರಲ್ಲಿ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM ಅಗತ್ಯವಿದೆ UOM coversion ಫ್ಯಾಕ್ಟರ್: {0} ಐಟಂ ರಲ್ಲಿ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ಪರೋಕ್ಷ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ರೋ {0}: ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,ವ್ಯವಸಾಯ
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಐಟಂ ಗುಂಪು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: Journal Entry Account,Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: Warehouse,Warehouse Contact Info,ವೇರ್ಹೌಸ್ ಸಂಪರ್ಕ ಮಾಹಿತಿ
-sites/assets/js/form.min.js +190,Name is required,ಹೆಸರು ಅಗತ್ಯವಿದೆ
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,ಹೆಸರು ಅಗತ್ಯವಿದೆ
 DocType: Purchase Invoice,Recurring Type,ಮರುಕಳಿಸುವ ಪ್ರಕಾರ
 DocType: Address,City/Town,ನಗರ / ಪಟ್ಟಣ
 DocType: Email Digest,Annual Income,ವಾರ್ಷಿಕ ಆದಾಯ
 DocType: Serial No,Serial No Details,ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿವರಗಳು
 DocType: Purchase Invoice Item,Item Tax Rate,ಐಟಂ ತೆರಿಗೆ ದರ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ಸಲಕರಣಾ
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,ಗುರಿ
 DocType: Sales Invoice Item,Edit Description,ಸಂಪಾದಿಸಿ ವಿವರಣೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪ್ಲಾನ್ಡ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಗಿಂತ ಕಡಿಮೆಯಾಗಿದೆ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,ಸರಬರಾಜುದಾರನ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,ಸರಬರಾಜುದಾರನ
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ AccountType ವ್ಯವಹಾರಗಳಲ್ಲಿ ಈ ಖಾತೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡುತ್ತದೆ .
 DocType: Purchase Invoice,Grand Total (Company Currency),ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ಒಟ್ಟು ಹೊರಹೋಗುವ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","ಕೇವಲ "" ಮೌಲ್ಯವನ್ನು "" 0 ಅಥವಾ ಖಾಲಿ ಮೌಲ್ಯದೊಂದಿಗೆ ಒಂದು ಹಡಗು ರೂಲ್ ಕಂಡಿಶನ್ ಇಡಬಹುದು"
 DocType: Authorization Rule,Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ಗಮನಿಸಿ: ಈ ವೆಚ್ಚ ಸೆಂಟರ್ ಒಂದು ಗುಂಪು. ಗುಂಪುಗಳ ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ.
-apps/erpnext/erpnext/config/projects.py +43,Tools,ಪರಿಕರಗಳು
+apps/frappe/frappe/config/desk.py +7,Tools,ಪರಿಕರಗಳು
 DocType: Item,Website Item Groups,ವೆಬ್ಸೈಟ್ ಐಟಂ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶ ಸಂಖ್ಯೆ ಸ್ಟಾಕ್ ಪ್ರವೇಶ ಉದ್ದೇಶಕ್ಕಾಗಿ ತಯಾರಿಕೆಯಲ್ಲಿ ಕಡ್ಡಾಯ
 DocType: Purchase Invoice,Total (Company Currency),ಒಟ್ಟು (ಕಂಪನಿ ಕರೆನ್ಸಿ)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,ಕಾರ್ಯಕ್ಷೇತ್ರ 
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Sales Partner,Target Distribution,ಟಾರ್ಗೆಟ್ ಡಿಸ್ಟ್ರಿಬ್ಯೂಶನ್
-sites/assets/js/desk.min.js +7652,Comments,ಪ್ರತಿಕ್ರಿಯೆಗಳು
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,ಪ್ರತಿಕ್ರಿಯೆಗಳು
 DocType: Salary Slip,Bank Account No.,ಬ್ಯಾಂಕ್ ಖಾತೆ ಸಂಖ್ಯೆ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ಈ ಪೂರ್ವನಾಮವನ್ನು ಹೊಂದಿರುವ ಲೋಡ್ ದಾಖಲಿಸಿದವರು ವ್ಯವಹಾರದ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಮೌಲ್ಯಾಂಕನ ದರ {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ಒಂದು
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
 DocType: Purchase Invoice,Supplier Invoice Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,ನೀವು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ
-sites/assets/js/form.min.js +212,No Data,ಡೇಟಾ ಇಲ್ಲ
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,ಡೇಟಾ ಇಲ್ಲ
 DocType: Appraisal Template Goal,Appraisal Template Goal,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಗೋಲ್
 DocType: Salary Slip,Earning,ಗಳಿಕೆ
 DocType: Payment Tool,Party Account Currency,ಪಕ್ಷದ ಖಾತೆ ಕರೆನ್ಸಿ
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,ಪಕ್ಷದ ಖಾತೆ ಕರ
 DocType: Purchase Taxes and Charges,Add or Deduct,ಸೇರಿಸಿ ಅಥವಾ ಕಡಿತಗೊಳಿಸುವ
 DocType: Company,If Yearly Budget Exceeded (for expense account),ವಾರ್ಷಿಕ ಬಜೆಟ್ (ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಗೆ) ಮೀರಿದ್ದಲ್ಲಿ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,ನಡುವೆ ಕಂಡುಬರುವ ಅತಿಕ್ರಮಿಸುವ ಪರಿಸ್ಥಿತಿಗಳು :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಈಗಾಗಲೇ ಕೆಲವು ಚೀಟಿ ವಿರುದ್ಧ ಸರಿಹೊಂದಿಸಲಾಗುತ್ತದೆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಈಗಾಗಲೇ ಕೆಲವು ಚೀಟಿ ವಿರುದ್ಧ ಸರಿಹೊಂದಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,ಒಟ್ಟು ಆರ್ಡರ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,ಆಹಾರ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ಏಜಿಂಗ್ ರೇಂಜ್ 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,ಭೇಟಿ ಸಂಖ್ಯೆ
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","ಸಂಪರ್ಕಗಳಿಗೆ ಸುದ್ದಿಪತ್ರಗಳು , ಕಾರಣವಾಗುತ್ತದೆ ."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ಎಲ್ಲಾ ಗುರಿಗಳನ್ನು ಅಂಕಗಳನ್ನು ಒಟ್ಟು ಮೊತ್ತ ಇದು 100 ಇರಬೇಕು {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,ಕಾರ್ಯಾಚರಣೆ ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ.
 ,Delivered Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ವಿತರಿಸಲಾಯಿತು ಐಟಂಗಳು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ವೇರ್ಹೌಸ್ ನೆಯ ಬದಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ .
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},ಸ್ಥಿತಿ ಅಪ್ಡೇಟ್ {0}
 DocType: DocField,Description,ವಿವರಣೆ
 DocType: Authorization Rule,Average Discount,ಸರಾಸರಿ ರಿಯಾಯಿತಿ
 DocType: Letter Head,Is Default,ಡೀಫಾಲ್ಟ್
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,ಐಟಂ ತೆರಿಗೆ ಪ
 DocType: Item,Maintain Stock,ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ಈಗಾಗಲೇ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ದಾಖಲಿಸಿದವರು ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Leave Control Panel,Leave blank if considered for all designations,ಎಲ್ಲಾ ಅಂಕಿತಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime ಗೆ
 DocType: Email Digest,For Company,ಕಂಪನಿ
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,ಶಿಪ್ಪಿಂಗ್ ವಿ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್
 DocType: Material Request,Terms and Conditions Content,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿಷಯ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,ಖಾತರಿ / ಎಎಮ್ಸ
 DocType: GL Entry,GL Entry,ಜಿಎಲ್ ಎಂಟ್ರಿ
 DocType: HR Settings,Employee Settings,ನೌಕರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
 ,Batch-Wise Balance History,ಬ್ಯಾಚ್ ವೈಸ್ ಬ್ಯಾಲೆನ್ಸ್ ಇತಿಹಾಸ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,ಪಟ್ಟಿ ಮಾಡಿ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ಪಟ್ಟಿ ಮಾಡಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,ಹೊಸಗಸುಬಿ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ಕಚೇರಿ ಬಾಡಿಗೆ
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,ಸೆಟಪ್ SMS ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ಆಮದು ವಿಫಲವಾಗಿದೆ!
-sites/assets/js/erpnext.min.js +24,No address added yet.,ಯಾವುದೇ ವಿಳಾಸ ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ಯಾವುದೇ ವಿಳಾಸ ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
 DocType: Workstation Working Hour,Workstation Working Hour,ಕಾರ್ಯಸ್ಥಳ ವರ್ಕಿಂಗ್ ಅವರ್
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ವಿಶ್ಲೇಷಕ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಜಂಟಿ ಉದ್ಯಮ ಪ್ರಮಾಣದ ಸಮ ಮಾಡಬೇಕು {2}
 DocType: Item,Inventory,ತಪಶೀಲು ಪಟ್ಟಿ
 DocType: Features Setup,"To enable ""Point of Sale"" view",ವೀಕ್ಷಿಸಿ "ಮಾರಾಟದ" ಶಕ್ತಗೊಳಿಸಲು
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,ಪಾವತಿ ಖಾಲಿ ಕಾರ್ಟ್ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ಪಾವತಿ ಖಾಲಿ ಕಾರ್ಟ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ಪಿನ್ನಿಂಗ್
 DocType: Opportunity,With Items,ವಸ್ತುಗಳು
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",ಮುಂದಿನ ಸರಕುಪಟ್ಟಿ ಉತ್ಪಾದಿಸಬಹುದಾಗಿದೆ ಯಾವ ದಿನಾಂಕ. ಒಪ್ಪಿಸಬಹುದು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
 DocType: Item Attribute,Item Attribute,ಐಟಂ ಲಕ್ಷಣ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,ಸರ್ಕಾರ
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು
 DocType: Company,Services,ಸೇವೆಗಳು
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),ಒಟ್ಟು ({0})
 DocType: Cost Center,Parent Cost Center,ಪೋಷಕ ವೆಚ್ಚ ಸೆಂಟರ್
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,ಹಣಕಾಸು ವರ್ಷದ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Employee External Work History,Total Experience,ಒಟ್ಟು ಅನುಭವ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ಸರಕು ಮತ್ತು ಸಾಗಣೆಯನ್ನು ಚಾರ್ಜಸ್
 DocType: Material Request Item,Sales Order No,ಮಾರಾಟದ ಆದೇಶ ಸಂಖ್ಯೆ
 DocType: Item Group,Item Group Name,ಐಟಂ ಗುಂಪು ಹೆಸರು
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,ಟೇಕನ್
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ಟೇಕನ್
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,ತಯಾರಿಕೆಗೆ ವರ್ಗಾವಣೆ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Pricing Rule,For Price List,ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,ವೇಳಾಪಟ್ಟಿಗಳು
 DocType: Purchase Invoice Item,Net Amount,ನೆಟ್ ಪ್ರಮಾಣ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ವಿವರ ಯಾವುದೇ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-DocType: Period Closing Voucher,CoA Help,ಸಿಓಎ ಸಹಾಯ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},ದೋಷ : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},ದೋಷ : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,ಖಾತೆಗಳ ಚಾರ್ಟ್ ಹೊಸ ಖಾತೆಯನ್ನು ರಚಿಸಿ.
 DocType: Maintenance Visit,Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ಗ್ರಾಹಕ> ಗ್ರಾಹಕ ಗುಂಪಿನ> ಪ್ರದೇಶ
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,ಇಳಿಯಿತು ವೆಚ್
 DocType: Event,Tuesday,ಮಂಗಳವಾರ
 DocType: Leave Block List,Block Holidays on important days.,ಪ್ರಮುಖ ದಿನಗಳಲ್ಲಿ ಬ್ಲಾಕ್ ರಜಾದಿನಗಳು.
 ,Accounts Receivable Summary,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಸಾರಾಂಶ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ಈಗಾಗಲೇ ಅವಧಿಗೆ ನೌಕರರ {1} ಇರುವ ರೀತಿಯ {0} ಎಲೆಗಳು {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,ನೌಕರರ ಪಾತ್ರ ಸೆಟ್ ಒಂದು ನೌಕರರ ದಾಖಲೆಯಲ್ಲಿ ಬಳಕೆದಾರ ID ಕ್ಷೇತ್ರದಲ್ಲಿ ಸೆಟ್ ಮಾಡಿ
 DocType: UOM,UOM Name,UOM ಹೆಸರು
 DocType: Top Bar Item,Target,ಟಾರ್ಗೆಟ್
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,ಮಾರಾಟದ ಸಂಗಾತ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {1}
 DocType: Pricing Rule,Pricing Rule,ಬೆಲೆ ರೂಲ್
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ರೋ # {0}: ರಿಟರ್ನ್ಡ ಐಟಂ {1} ಅಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಇಲ್ಲ {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ಬ್ಯಾಂಕ್ ಖಾತೆಗಳು
 ,Bank Reconciliation Statement,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ಹೇಳಿಕೆ
 DocType: Address,Lead Name,ಲೀಡ್ ಹೆಸರು
 ,POS,ಪಿಓಎಸ್
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ಒಮ್ಮೆ ಮಾತ್ರ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತವೆ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ಹೆಚ್ಚು ವರ್ಗಾಯಿಸುವುದೇ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ {0} ಹೆಚ್ಚು {1} ಆರ್ಡರ್ ಖರೀದಿಸಿ ವಿರುದ್ಧ {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},ಎಲೆಗಳು ಯಶಸ್ವಿಯಾಗಿ ನಿಗದಿ {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},ಎಲೆಗಳು ಯಶಸ್ವಿಯಾಗಿ ನಿಗದಿ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ಪ್ಯಾಕ್ ಯಾವುದೇ ಐಟಂಗಳು
 DocType: Shipping Rule Condition,From Value,FromValue
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,ಬ್ಯಾಂಕ್ ಕಾಣಿಸಿಕೊಂಡಿಲ್ಲ ಪ್ರಮಾಣದ
 DocType: Quality Inspection Reading,Reading 4,4 ಓದುವಿಕೆ
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ಕಂಪನಿ ಖರ್ಚು ಹಕ್ಕು .
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,ಸಂಪರ್ಕಿಸಿ ಮೊಬ
 DocType: Production Planning Tool,Select Sales Orders,ಆಯ್ಕೆ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್
 ,Material Requests for which Supplier Quotations are not created,ಯಾವ ಸರಬರಾಜುದಾರ ಉಲ್ಲೇಖಗಳು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ದಾಖಲಿಸಿದವರು ಇಲ್ಲ
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,ಬಾರ್ಕೋಡ್ ಐಟಂಗಳನ್ನು ಟ್ರ್ಯಾಕ್ . ನೀವು ಐಟಂ ಬಾರ್ಸಂಕೇತವನ್ನು ಸ್ಕ್ಯಾನ್ ಮೂಲಕ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಮತ್ತು ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂಗಳನ್ನು ನಮೂದಿಸಿ ಸಾಧ್ಯವಾಗುತ್ತದೆ .
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,ಮಾರ್ಕ್ ತಲುಪಿಸಿದರು
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ಮುಂಚಿತವಾಗಿ ಎಕ್ಸ್ ದಿನಗಳ ಕಾರ್ಯಾಚರಣೆ ಯೋಜನೆ ಪ್ರಯತ್ನಿಸಿ.
 DocType: HR Settings,Stop Birthday Reminders,ನಿಲ್ಲಿಸಿ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
 DocType: SMS Center,Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ
 DocType: Payment Tool Detail,Payment Amount,ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ಸೇವಿಸುವ ಪ್ರಮಾಣವನ್ನು
-sites/assets/js/erpnext.min.js +51,{0} View,{0} ವೀಕ್ಷಿಸಿ
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ವೀಕ್ಷಿಸಿ
 DocType: Salary Structure Deduction,Salary Structure Deduction,ಸಂಬಳ ರಚನೆ ಕಳೆಯುವುದು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,ಆಯ್ದ ಲೇಸರ್ ಹೆಪ್ಪುಗಟ್ಟಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,ಯಶಸ್ವಿಯಾಗಿ ಆಮದು !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ನೀಡಲಾಗಿದೆ ಐಟಂಗಳು ವೆಚ್ಚ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,ಡೀಫಾಲ್ಟ್ ಪಾವ
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ಉದಾಹರಣೆಗೆ ಹಡಗು ನಿಯಮಗಳು, ಬೆಲೆ ಪಟ್ಟಿ ಇತ್ಯಾದಿ ಆನ್ಲೈನ್ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,ಸೆಟಪ್ ಕಂಪ್ಲೀಟ್
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% ಖ್ಯಾತವಾದ
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Party Account,Party Account,ಪಕ್ಷದ ಖಾತೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
 DocType: Lead,Upper Income,ಮೇಲ್ ವರಮಾನ
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Employee,Permanent Address,ಖಾಯಂ ವಿಳಾಸ
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,ಐಟಂ {0} ಒಂದು ಸೇವೆ ಐಟಂ ಇರಬೇಕು .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಹೆಚ್ಚು \ {0} {1} ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ ವಿರುದ್ಧ ಹಣ ಅಡ್ವಾನ್ಸ್ {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,ಐಟಂ ಕೋಡ್ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),ಪೇ ಇಲ್ಲದೆ ಬಿಡಿ ಕಡಿತಗೊಳಿಸು ಕಡಿಮೆ ( LWP )
 DocType: Territory,Territory Manager,ಪ್ರದೇಶ ಮ್ಯಾನೇಜರ್
+DocType: Delivery Note Item,To Warehouse (Optional),ಮಳಿಗೆಗೆ (ಐಚ್ಛಿಕ)
 DocType: Sales Invoice,Paid Amount (Company Currency),ಪಾವತಿಸಿದ ಮೊತ್ತಕ್ಕೆ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Purchase Invoice,Additional Discount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ
 DocType: Selling Settings,Selling Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಮಾರಾಟ
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,ಮೈನಿಂಗ್
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ರಾಳದ ಎರಕದ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},ಪಠ್ಯ {0}
 DocType: Territory,Parent Territory,ಪೋಷಕ ಪ್ರದೇಶ
 DocType: Quality Inspection Reading,Reading 2,2 ಓದುವಿಕೆ
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,ಬ್ಯಾಚ್ ನಂ
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ಗ್ರಾಹಕರ ಖರೀದಿ ಆದೇಶದ ವಿರುದ್ಧ ಅನೇಕ ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಅವಕಾಶ
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,ಮುಖ್ಯ
 DocType: DocPerm,Delete,ಅಳಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,ಭಿನ್ನ
-sites/assets/js/desk.min.js +7971,New {0},ಹೊಸ {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,ಭಿನ್ನ
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},ಹೊಸ {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,ನಿಲ್ಲಿಸಿತು ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ . ರದ್ದು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು .
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,ನಿಲ್ಲಿಸಿತು ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ . ರದ್ದು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು .
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
 DocType: Employee,Leave Encashed?,Encashed ಬಿಡಿ ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ಕ್ಷೇತ್ರದ ಅವಕಾಶ ಕಡ್ಡಾಯ
 DocType: Item,Variants,ರೂಪಾಂತರಗಳು
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,ದೇಶ
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,ವಿಳಾಸಗಳು
 DocType: Communication,Received,ಸ್ವೀಕರಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ಐಟಂ ಪ್ರವೇಶಿಸಿತು ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ನಕಲು {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ಒಂದು ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಒಂದು ಸ್ಥಿತಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,ಐಟಂ ಪ್ರೊಡಕ್ಷನ್ ಕ್ರಮಕ್ಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,ವಂದನೆ
 DocType: Communication,Rejected,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
 DocType: Pricing Rule,Brand,ಬೆಂಕಿ
 DocType: Item,Will also apply for variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯವಾಗುವುದು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,ತಲುಪಿಸಲಾಗಿದೆ %
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,ಮಾರಾಟದ ಸಮಯದಲ್ಲಿ ಐಟಂಗಳನ್ನು ಬಂಡಲ್.
 DocType: Sales Order Item,Actual Qty,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Sales Invoice Item,References,ಉಲ್ಲೇಖಗಳು
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,ಕತ್ತರಿಸುವುದು
 DocType: Item,Has Variants,ವೇರಿಯಂಟ್
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು ' ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ ' ಗುಂಡಿಯನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ .
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,ಗೆ ಅವಧಿಯ% ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,ಪ್ಯಾಕೇಜ್ ಮತ್ತು ಲೇಬಲಿಂಗ್
 DocType: Monthly Distribution,Name of the Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ ಹೆಸರು
 DocType: Sales Person,Parent Sales Person,ಪೋಷಕ ಮಾರಾಟಗಾರ್ತಿ
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,ಕಂಪನಿ ಮಾಸ್ಟರ್ ಮತ್ತು ಜಾಗತಿಕ ಪೂರ್ವನಿಯೋಜಿತಗಳು ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Dropbox Backup,Dropbox Access Secret,ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಪ್ರವೇಶ ಸೀಕ್ರೆಟ್
 DocType: Purchase Invoice,Recurring Invoice,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,ಯೋಜನೆಗಳ ವ್ಯವಸ್ಥಾಪಕ
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,ಯೋಜನೆಗಳ ವ್ಯವಸ್ಥಾಪಕ
 DocType: Supplier,Supplier of Goods or Services.,ಸರಕುಗಳು ಅಥವಾ ಸೇವೆಗಳ ಪೂರೈಕೆದಾರ.
 DocType: Budget Detail,Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ
 DocType: Cost Center,Budget,ಮುಂಗಡಪತ್ರ
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,ವಿಕ್ರಯ
 DocType: Employee,Salary Information,ವೇತನ ಮಾಹಿತಿ
 DocType: Sales Person,Name and Employee ID,ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗಿಗಳ ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Website Item Group,Website Item Group,ಐಟಂ ಗ್ರೂಪ್ ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} ಪಾವತಿ ನಮೂದುಗಳನ್ನು ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ಪಾವತಿ ನಮೂದುಗಳನ್ನು ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ವೆಬ್ ಸೈಟ್ ತೋರಿಸಲಾಗುತ್ತದೆ ಎಂದು ಐಟಂ ಟೇಬಲ್
 DocType: Purchase Order Item Supplied,Supplied Qty,ಸರಬರಾಜು ಪ್ರಮಾಣ
 DocType: Material Request Item,Material Request Item,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಐಟಂ
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,ಐಟಂ ಗು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,ಈ ಬ್ಯಾಚ್ ಮಾದರಿ ಸಾಲು ಸಂಖ್ಯೆ ಹೆಚ್ಚಿನ ಅಥವಾ ಪ್ರಸ್ತುತ ಸಾಲಿನ ಸಂಖ್ಯೆ ಸಮಾನವಾಗಿರುತ್ತದೆ ಸೂಚಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 ,Item-wise Purchase History,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ಇತಿಹಾಸ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,ಕೆಂಪು
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ ತರಲು ' ರಚಿಸಿ ' ವೇಳಾಪಟ್ಟಿ ' ಕ್ಲಿಕ್ ಮಾಡಿ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ ತರಲು ' ರಚಿಸಿ ' ವೇಳಾಪಟ್ಟಿ ' ಕ್ಲಿಕ್ ಮಾಡಿ {0}
 DocType: Account,Frozen,ಘನೀಕೃತ
 ,Open Production Orders,ಓಪನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 DocType: Installation Note,Installation Time,ಅನುಸ್ಥಾಪನ ಟೈಮ್
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಈ ಐಟಂ ಮಾಡಬಹುದು ಎಂದು, ಇದು ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಈ ಐಟಂ ಮಾಡಬಹುದು ಎಂದು, ಇದು ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು ."
 DocType: Shipping Rule Condition,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,ಸೇರುವ
 DocType: Authorization Rule,Above Value,ಮೌಲ್ಯದ ಮೇಲೆ
 ,Pending Amount,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Conversion Factor,ಪರಿವರ್ತಿಸುವುದರ
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,ತಲುಪಿಸಲಾಗಿದೆ
+DocType: Purchase Order,Delivered,ತಲುಪಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),ಉದ್ಯೋಗಗಳು ಇಮೇಲ್ ಐಡಿ ಸೆಟಪ್ ಒಳಬರುವ ಸರ್ವರ್ . ( ಇ ಜಿ jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,ವಾಹನ ಸಂಖ್ಯೆ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ ಸ್ಟಾಪ್ ಯಾವ ದಿನಾಂಕ
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,ವಿತರಿಸಲ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,ಐಟಂ {1} ಆಸ್ತಿ ಐಟಂ ಖಾತೆ {0} ಬಗೆಯ ' ಸ್ಥಿರ ಆಸ್ತಿ ' ಇರಬೇಕು
 DocType: HR Settings,HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/frappe/frappe/config/setup.py +130,Printing,ಮುದ್ರಣ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಬಾಕಿ ಇದೆ . ಮಾತ್ರ ಖರ್ಚು ಅನುಮೋದಕ ಡೇಟ್ ಮಾಡಬಹುದು .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಬಾಕಿ ಇದೆ . ಮಾತ್ರ ಖರ್ಚು ಅನುಮೋದಕ ಡೇಟ್ ಮಾಡಬಹುದು .
 DocType: Purchase Invoice,Additional Discount Amount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾ ಇವೆ . ನೀವು ಬಿಟ್ಟು ಅರ್ಜಿ ಅಗತ್ಯವಿದೆ .
-sites/assets/js/desk.min.js +7805,and,ಮತ್ತು
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ಮತ್ತು
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,ಕ್ರೀಡೆ
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,ಉದ್ಧರಣ
 DocType: Salary Slip,Total Deduction,ಒಟ್ಟು ಕಳೆಯುವುದು
 DocType: Quotation,Maintenance User,ನಿರ್ವಹಣೆ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,ನೀವು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು ಬಯಸಿದ್ದೀರಾ
 DocType: Employee,Date of Birth,ಜನ್ಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,ಐಟಂ {0} ಈಗಾಗಲೇ ಮರಳಿದರು
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ಹಣಕಾಸಿನ ವರ್ಷ ** ಒಂದು ಹಣಕಾಸು ವರ್ಷದ ಪ್ರತಿನಿಧಿಸುತ್ತದೆ. ಎಲ್ಲಾ ಲೆಕ್ಕ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಇತರ ಪ್ರಮುಖ ವ್ಯವಹಾರಗಳ ** ** ಹಣಕಾಸಿನ ವರ್ಷ ವಿರುದ್ಧ ಕಂಡುಕೊಳ್ಳಲಾಯಿತು.
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ಮಾರಾಟದ ಶಿಬಿರಗಳು ಟ್ರ್ಯಾಕ್. ಲೀಡ್ಸ್ ಉಲ್ಲೇಖಗಳು ಜಾಡನ್ನು ಮಾರಾಟದ ಆರ್ಡರ್ ಇತ್ಯಾದಿ ಶಿಬಿರಗಳು ರಿಂದ ಹೂಡಿಕೆ ಮೇಲೆ ರಿಟರ್ನ್ ಅಳೆಯುವ. 
 DocType: Expense Claim,Approver,ಅನಪುಮೋದಕ
 ,SO Qty,ಆದ್ದರಿಂದ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಗೋದಾಮಿನ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ {0}, ಆದ್ದರಿಂದ ನೀವು ಮರು ನಿಯೋಜಿಸಲು ಅಥವಾ ವೇರ್ಹೌಸ್ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಗೋದಾಮಿನ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ {0}, ಆದ್ದರಿಂದ ನೀವು ಮರು ನಿಯೋಜಿಸಲು ಅಥವಾ ವೇರ್ಹೌಸ್ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Appraisal,Calculate Total Score,ಒಟ್ಟು ಸ್ಕೋರ್ ಲೆಕ್ಕ
 DocType: Supplier Quotation,Manufacturing Manager,ಉತ್ಪಾದನಾ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ವಾರಂಟಿ {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ಪ್ರವಾಸ ಒಳಗೆ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸ್ಪ್ಲಿಟ್ .
 apps/erpnext/erpnext/hooks.py +84,Shipments,ಸಾಗಣೆಗಳು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,ಅದ್ದು ಸೂರು
+DocType: Purchase Order,To be delivered to customer,ಗ್ರಾಹಕನಿಗೆ ನೀಡಬೇಕಾಗಿದೆ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ಟೈಮ್ ಲಾಗ್ ಸ್ಥಿತಿ ಸಲ್ಲಿಸಬೇಕು.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ಸೀರಿಯಲ್ ಯಾವುದೇ {0} ಯಾವುದೇ ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,ಚಲಾವಣೆಯ
 DocType: DocField,Name,ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,ವ್ಯವಸ್ಥೆಯ ಕಾಣಿಸಿಕೊಂಡಿಲ್ಲ ಪ್ರಮಾಣದ
 DocType: Purchase Invoice Item,Rate (Company Currency),ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,ಇತರೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,ನಿಲ್ಲಿಸಲಾಗಿದೆ ಎಂದು ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,ಮ್ಯಾಚಿಂಗ್ ಐಟಂ ಸಿಗುವುದಿಲ್ಲ. ಫಾರ್ {0} ಕೆಲವು ಇತರ ಮೌಲ್ಯ ಆಯ್ಕೆಮಾಡಿ.
 DocType: POS Profile,Taxes and Charges,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","ಒಂದು ಉತ್ಪನ್ನ ಅಥವಾ, ಖರೀದಿಸಿತು ಮಾರಾಟ ಅಥವಾ ಸ್ಟಾಕ್ ಇಟ್ಟುಕೊಂಡು ಒಂದು ಸೇವೆ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ಮೊದಲ ಸಾಲಿನ ' ಹಿಂದಿನ ರೋ ಒಟ್ಟು ರಂದು ' ' ಹಿಂದಿನ ಸಾಲಿನಲ್ಲಿ ಪ್ರಮಾಣ ' ಅಥವಾ ಒಂದು ಬ್ಯಾಚ್ ರೀತಿಯ ಆಯ್ಕೆ ಮಾಡಬಹುದು
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,ಆಯ್ಕೆ doctype
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,ಲೇವಾದೇವಿ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,ವೇಳಾಪಟ್ಟಿ ಪಡೆಯಲು ' ರಚಿಸಿ ವೇಳಾಪಟ್ಟಿ ' ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Bin,Ordered Quantity,ಆದೇಶ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","ಇ ಜಿ "" ಬಿಲ್ಡರ್ ಗಳು ಉಪಕರಣಗಳು ನಿರ್ಮಿಸಿ """
 DocType: Quality Inspection,In Process,ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ
 DocType: Authorization Rule,Itemwise Discount,Itemwise ಡಿಸ್ಕೌಂಟ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
+DocType: Purchase Order Item,Reference Document Type,ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
 DocType: Account,Fixed Asset,ಸ್ಥಿರಾಸ್ತಿ
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,ಧಾರಾವಾಹಿಯಾಗಿ ಇನ್ವೆಂಟರಿ
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,ಧಾರಾವಾಹಿಯಾಗಿ ಇನ್ವೆಂಟರಿ
 DocType: Activity Type,Default Billing Rate,ಡೀಫಾಲ್ಟ್ ಬಿಲ್ಲಿಂಗ್ ದರ
 DocType: Time Log Batch,Total Billing Amount,ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
 ,Stock Balance,ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,ಪಾವತಿ ಮಾರಾಟ ಆರ್ಡರ್
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ಪಾವತಿ ಮಾರಾಟ ಆರ್ಡರ್
 DocType: Expense Claim Detail,Expense Claim Detail,ಖರ್ಚು ಹಕ್ಕು ವಿವರ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,ಟೈಮ್ ದಾಖಲೆಗಳು ದಾಖಲಿಸಿದವರು:
 DocType: Item,Weight UOM,ತೂಕ UOM
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಒಂದು ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಇರಬೇಕು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
 DocType: Production Order Operation,Completed Qty,ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","{0}, ಮಾತ್ರ ಡೆಬಿಟ್ ಖಾತೆಗಳನ್ನು ಇನ್ನೊಂದು ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,ಬೆಲೆ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, ಮಾತ್ರ ಡೆಬಿಟ್ ಖಾತೆಗಳನ್ನು ಇನ್ನೊಂದು ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,ಬೆಲೆ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Manufacturing Settings,Allow Overtime,ಓವರ್ಟೈಮ್ ಅವಕಾಶ
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ನಿಲ್ಲಿಸಿದಾಗ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ಐಟಂ ಬೇಕಾದ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು {1}. ನೀವು ಒದಗಿಸಿದ {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ಪ್ರಸ್ತುತ ಮೌಲ್ಯಮಾಪನ ದರ
 DocType: Item,Customer Item Codes,ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ಸ್
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ವೆಲ್ಡಿಂಗ್
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,ಹೊಸ ಸ್ಟಾಕ್ UOM ಅಗತ್ಯವಿದೆ
 DocType: Quality Inspection,Sample Size,ಸ್ಯಾಂಪಲ್ ಸೈಜ್
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',ಮಾನ್ಯ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು ' ಕೇಸ್ ನಂ ಗೆ . '
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,ಮತ್ತಷ್ಟು ವೆಚ್ಚ ಕೇಂದ್ರಗಳು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,ಮತ್ತಷ್ಟು ವೆಚ್ಚ ಕೇಂದ್ರಗಳು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Project,External,ಬಾಹ್ಯ
 DocType: Features Setup,Item Serial Nos,ಐಟಂ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ಬಳಕೆದಾರರು ಮತ್ತು ಅನುಮತಿಗಳು
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: SMS Log,Sender Name,ಹೆಸರು
 DocType: Page,Title,ಶೀರ್ಷಿಕೆ
-sites/assets/js/list.min.js +104,Customize,ಕಸ್ಟಮೈಸ್
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,ಕಸ್ಟಮೈಸ್
 DocType: POS Profile,[Select],[ ಆರಿಸಿರಿ ]
 DocType: SMS Log,Sent To,ಕಳುಹಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,ಲೈಫ್ ಅಂತ್ಯ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ಓಡಾಡು
 DocType: Leave Block List,Allow Users,ಬಳಕೆದಾರರನ್ನು ಅನುಮತಿಸಿ
+DocType: Purchase Order,Customer Mobile No,ಗ್ರಾಹಕ ಮೊಬೈಲ್ ಯಾವುದೇ
 DocType: Sales Invoice,Recurring,ಮರುಕಳಿಸುವ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ಪ್ರತ್ಯೇಕ ಆದಾಯ ಟ್ರ್ಯಾಕ್ ಮತ್ತು ಉತ್ಪನ್ನ ಸಂಸ್ಥಾ ಅಥವಾ ವಿಭಾಗಗಳು ಖರ್ಚು.
 DocType: Rename Tool,Rename Tool,ಟೂಲ್ ಮರುಹೆಸರಿಸು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,ನವೀಕರಣ ವೆಚ್ಚ
 DocType: Item Reorder,Item Reorder,ಐಟಂ ಮರುಕ್ರಮಗೊಳಿಸಿ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ಕಾರ್ಯಾಚರಣೆಗಳು , ನಿರ್ವಹಣಾ ವೆಚ್ಚ ನಿರ್ದಿಷ್ಟಪಡಿಸಲು ಮತ್ತು ಕಾರ್ಯಾಚರಣೆಗಳು ಒಂದು ಅನನ್ಯ ಕಾರ್ಯಾಚರಣೆ ಯಾವುದೇ ನೀಡಿ ."
 DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,ನೌಕರರ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,ಆಮದು ಇಮೇಲ್
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,ಬಳಕೆದಾರ ಎಂದು ಆಹ್ವಾನಿಸಿ
 DocType: Features Setup,After Sale Installations,ಮಾರಾಟಕ್ಕೆ ಅನುಸ್ಥಾಪನೆಗಳು ನಂತರ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} ಸಂಪೂರ್ಣವಾಗಿ ವಿಧಿಸಲಾಗುತ್ತದೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} ಸಂಪೂರ್ಣವಾಗಿ ವಿಧಿಸಲಾಗುತ್ತದೆ
 DocType: Workstation Working Hour,End Time,ಎಂಡ್ ಟೈಮ್
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,ಮಾರಾಟದ ಅಥವಾ ಖರೀದಿಗಾಗಿ ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಒಪ್ಪಂದದ ವಿಚಾರದಲ್ಲಿ .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ಚೀಟಿ ಮೂಲಕ ಗುಂಪು
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,ಸಾಮೂಹಿಕ ಮೇಲಿಂಗ
 DocType: Page,Standard,ಸ್ಟ್ಯಾಂಡರ್ಡ್
 DocType: Rename Tool,File to Rename,ಮರುಹೆಸರಿಸಲು ಫೈಲ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse ಆದೇಶ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,ಶೋ ಪಾವತಿಗಳು
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,ಗಾತ್ರ
 DocType: Notification Control,Expense Claim Approved,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ಔಷಧೀಯ
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,ದಿನಾಂಕ ಹಾಜರಿ
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),ಮಾರಾಟ ಇಮೇಲ್ ಐಡಿ ಸೆಟಪ್ ಒಳಬರುವ ಸರ್ವರ್ . ( ಇ ಜಿ sales@example.com )
 DocType: Warranty Claim,Raised By,ಬೆಳೆಸಿದರು
 DocType: Payment Tool,Payment Account,ಪಾವತಿ ಖಾತೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
-sites/assets/js/list.min.js +23,Draft,ಡ್ರಾಫ್ಟ್
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,ಡ್ರಾಫ್ಟ್
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ಪರಿಹಾರ ಆಫ್
 DocType: Quality Inspection Reading,Accepted,Accepted
 DocType: User,Female,ಹೆಣ್ಣು
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,ಶಿಪ್ಪಿಂಗ್ ಲೇಬಲ್ ರೂಲ್
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
 DocType: Newsletter,Test,ಟೆಸ್ಟ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ನಿಮಗೆ ಮೌಲ್ಯಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ \ ಈ ಐಟಂ, ಇವೆ ಎಂದು 'ಸೀರಿಯಲ್ ಯಾವುದೇ ಹೊಂದಿದೆ', 'ಬ್ಯಾಚ್ ಹೊಂದಿದೆ ಇಲ್ಲ', 'ಸ್ಟಾಕ್ ಐಟಂ' ಮತ್ತು 'ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Employee,Previous Work Experience,ಹಿಂದಿನ ಅನುಭವ
 DocType: Stock Entry,For Quantity,ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},ಐಟಂ ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0} ಸಾಲು {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} ಸಲ್ಲಿಸದಿದ್ದರೆ
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,ಐಟಂಗಳನ್ನು ವಿನಂತಿಗಳು .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,ಐಟಂಗಳನ್ನು ವಿನಂತಿಗಳು .
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ಪ್ರತ್ಯೇಕ ಉತ್ಪಾದನಾ ಸಲುವಾಗಿ ಪ್ರತಿ ಸಿದ್ಧಪಡಿಸಿದ ಉತ್ತಮ ಐಟಂ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ .
 DocType: Purchase Invoice,Terms and Conditions1,ನಿಯಮಗಳು ಮತ್ತು Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,ಕಂಪ್ಲೀಟ್ ಸೆಟಪ್
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,ಸುದ್ದ
 DocType: Delivery Note,Transporter Name,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ ಹೆಸರು
 DocType: Contact,Enter department to which this Contact belongs,ಯಾವ ಇಲಾಖೆ ಯನ್ನು ಈ ಸಂಪರ್ಕಿಸಿ ಸೇರುತ್ತದೆ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,ಒಟ್ಟು ಆಬ್ಸೆಂಟ್
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,ಸಾಲು ಐಟಂ ಅಥವಾ ಗೋದಾಮಿನ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,ಸಾಲು ಐಟಂ ಅಥವಾ ಗೋದಾಮಿನ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,ಅಳತೆಯ ಘಟಕ
 DocType: Fiscal Year,Year End Date,ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 DocType: Task Depends On,Task Depends On,ಟಾಸ್ಕ್ ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ನಿಯೋಜನೆಗಾಗಿ ಕಂಪನಿಗಳು ಉತ್ಪನ್ನಗಳನ್ನು ಮಾರುತ್ತದೆ ಒಬ್ಬ ಮೂರನೇ ವ್ಯಕ್ತಿಯ ವಿತರಕ / ಡೀಲರ್ / ಆಯೋಗದ ಏಜೆಂಟ್ / ಅಂಗ / ಮರುಮಾರಾಟಗಾರರ.
 DocType: Customer Group,Has Child Node,ಮಗುವಿನ ನೋಡ್ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ಇಲ್ಲಿ ಸ್ಥಿರ URL ನಿಯತಾಂಕಗಳನ್ನು ನಮೂದಿಸಲು ( ಉದಾ. ಕಳುಹಿಸುವವರ = ERPNext , ಬಳಕೆದಾರಹೆಸರು = ERPNext , ಪಾಸ್ವರ್ಡ್ = 1234 , ಇತ್ಯಾದಿ )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ಯಾವುದೇ ಸಕ್ರಿಯ ವರ್ಷದಲ್ಲಿ. ಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ ಚೆಕ್ {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ಈ ERPNext ನಿಂದ ಸ್ವಯಂ ರಚಿತವಾದ ಒಂದು ಉದಾಹರಣೆ ವೆಬ್ಸೈಟ್
@@ -2067,11 +2078,9 @@ DocType: Note,Note,ನೋಡು
 DocType: Purchase Receipt Item,Recd Quantity,Recd ಪ್ರಮಾಣ
 DocType: Email Account,Email Ids,ಇಮೇಲ್ ಐಡಿಗಳನ್ನು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,ತಡೆಯುವಿಕೆಯೂ ಹೊಂದಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Payment Reconciliation,Bank / Cash Account,ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆ
 DocType: Tax Rule,Billing City,ಬಿಲ್ಲಿಂಗ್ ನಗರ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಅನುಮೋದನೆ ಬಾಕಿ ಇದೆ. ಕೇವಲ ಬಿಡಿ ಅನುಮೋದಕ ಸ್ಥಿತಿ ನವೀಕರಿಸಬಹುದು.
 DocType: Global Defaults,Hide Currency Symbol,ಕರೆನ್ಸಿ ಸಂಕೇತ ಮರೆಮಾಡಿ
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","ಇ ಜಿ ಬ್ಯಾಂಕ್ , ನಗದು, ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್"
 DocType: Journal Entry,Credit Note,ಕ್ರೆಡಿಟ್ ಸ್ಕೋರ್
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ಒಟ್ಟು (ಪ
 DocType: Installation Note Item,Installed Qty,ಅನುಸ್ಥಾಪಿಸಲಾದ ಪ್ರಮಾಣ
 DocType: Lead,Fax,ಫ್ಯಾಕ್ಸ್
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-sites/assets/js/list.min.js +26,Submitted,ಒಪ್ಪಿಸಿದ
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,ಒಪ್ಪಿಸಿದ
 DocType: Salary Structure,Total Earning,ಒಟ್ಟು ದುಡಿಯುತ್ತಿದ್ದ
 DocType: Purchase Receipt,Time at which materials were received,ವಸ್ತುಗಳನ್ನು ಸ್ವೀಕರಿಸಿದ ಯಾವ ಸಮಯದಲ್ಲಿ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,ನನ್ನ ವಿಳಾಸಗಳು
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,ಸಂಸ್
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ಅಥವಾ
 DocType: Sales Order,Billing Status,ಬಿಲ್ಲಿಂಗ್ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ಯುಟಿಲಿಟಿ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 ಮೇಲೆ
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 ಮೇಲೆ
 DocType: Buying Settings,Default Buying Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ
 ,Download Backups,ಡೌನ್ಲೋಡ್ ಬ್ಯಾಕ್ಅಪ್ಗಳು
 DocType: Notification Control,Sales Order Message,ಮಾರಾಟದ ಆರ್ಡರ್ ಸಂದೇಶ
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,ಆಯ್ಕೆ ನೌಕರರು
 DocType: Bank Reconciliation,To Date,ದಿನಾಂಕ
 DocType: Opportunity,Potential Sales Deal,ಸಂಭಾವ್ಯ ಮಾರಾಟ ಡೀಲ್
-sites/assets/js/form.min.js +308,Details,ವಿವರಗಳು
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,ವಿವರಗಳು
 DocType: Purchase Invoice,Total Taxes and Charges,ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Employee,Emergency Contact,ತುರ್ತು ಸಂಪರ್ಕ
 DocType: Item,Quality Parameters,ಗುಣಮಟ್ಟದ ಮಾನದಂಡಗಳು
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,ಪ್ರಮಾಣ ಸ್ವೀಕ
 DocType: Stock Entry Detail,Serial No / Batch,ಯಾವುದೇ ಸೀರಿಯಲ್ / ಬ್ಯಾಚ್
 DocType: Product Bundle,Parent Item,ಪೋಷಕ ಐಟಂ
 DocType: Account,Account Type,ಖಾತೆ ಪ್ರಕಾರ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 ,To Produce,ಉತ್ಪಾದಿಸಲು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ಸಾಲು {0} ನಲ್ಲಿ {1}. ಐಟಂ ದರ {2} ಸೇರಿವೆ, ಸಾಲುಗಳನ್ನು {3} ಸಹ ಸೇರಿಸಲೇಬೇಕು"
 DocType: Packing Slip,Identification of the package for the delivery (for print),( ಮುದ್ರಣ ) ವಿತರಣಾ ಪ್ಯಾಕೇಜ್ ಗುರುತಿನ
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,ದುರ್ಬಲಗೊಳ್ಳುವ
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ರೂಪಣೆಯ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,ಡೆಲಿವರಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,ಡೆಲಿವರಿ
 DocType: Stock Reconciliation Item,Current Qty,ಪ್ರಸ್ತುತ ಪ್ರಮಾಣ
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ವಿಭಾಗ ಕಾಸ್ಟಿಂಗ್ ರಲ್ಲಿ ""ಆಧರಿಸಿ ವಸ್ತುಗಳ ದರ "" ನೋಡಿ"
 DocType: Appraisal Goal,Key Responsibility Area,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,ಎಲ್ಲಾ ವಿಳಾಸಗಳನ್ನು .
 DocType: Company,Stock Settings,ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: User,Bio,ಬಯೋ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ಗ್ರಾಹಕ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಗ್ರೂಪ್ ಟ್ರೀ .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೆಸರು
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೆಸರು
 DocType: Leave Control Panel,Leave Control Panel,ಕಂಟ್ರೋಲ್ ಪ್ಯಾನಲ್ ಬಿಡಿ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಕಂಡುಬಂದಿಲ್ಲ. ಸೆಟಪ್> ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್ ಒಂದು ಹೊಸ> ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ರಚಿಸಿ.
 DocType: Appraisal,HR User,ಮಾನವ ಸಂಪನ್ಮೂಲ ಬಳಕೆದಾರ
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,ಪಾವತಿ ಉಪಕರಣ ವಿವರ
 ,Sales Browser,ಮಾರಾಟದ ಬ್ರೌಸರ್
 DocType: Journal Entry,Total Credit,ಒಟ್ಟು ಕ್ರೆಡಿಟ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,ಸ್ಥಳೀಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ಸ್ಥಳೀಯ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ಸಾಲ ಮತ್ತು ಅಡ್ವಾನ್ಸಸ್ ( ಆಸ್ತಿಗಳು )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ಸಾಲಗಾರರು
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,ದೊಡ್ಡದು
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,ಯಾವುದೇ ನೌಕರ ಕಂಡು !
 DocType: C-Form Invoice Detail,Territory,ಕ್ಷೇತ್ರ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
+DocType: Purchase Order,Customer Address Display,ಗ್ರಾಹಕ ವಿಳಾಸ ಪ್ರದರ್ಶನ
 DocType: Stock Settings,Default Valuation Method,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,ಹೊಳಪು
 DocType: Production Order Operation,Planned Start Time,ಯೋಜಿತ ಆರಂಭಿಸಲು ಸಮಯ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,ಹಂಚಿಕೆ
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,ಮುಚ್ಚಿ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಮತ್ತು ಪುಸ್ತಕ ಲಾಭ ಅಥವಾ ನಷ್ಟ .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿದ \ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬದಲಾಯಿಸಲು, \ ಬಳಕೆ ಸ್ಟಾಕ್ ಘಟಕ ಅಡಿಯಲ್ಲಿ ಸಾಧನ 'ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಯುಟಿಲಿಟಿ ಬದಲಾಯಿಸಿ'."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ವಿನಿಮಯ ದರ ಇನ್ನೊಂದು ಒಂದು ಕರೆನ್ಸಿ ಪರಿವರ್ತಿಸಲು ಸೂಚಿಸಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,ನುಡಿಮುತ್ತುಗಳು {0} ರದ್ದು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,ನುಡಿಮುತ್ತುಗಳು {0} ರದ್ದು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ಒಟ್ಟು ಬಾಕಿ ಮೊತ್ತದ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,ನೌಕರರ {0} ಮೇಲೆ ರಜೆ ಮೇಲೆ {1} . ಹಾಜರಾತಿ ಗುರುತಿಸಲಾಗುವುದಿಲ್ಲ.
 DocType: Sales Partner,Targets,ಗುರಿ
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ಈ ಗ್ರಾಹಕ ಗುಂಪಿನ ಮೂಲ ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,ನೀವು ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳು ಆರಂಭಿಸುವ ಮುನ್ನ ಸೆಟಪ್ ಖಾತೆಗಳ ನಿಮ್ಮ ಚಾರ್ಟ್ ಪ್ಲೀಸ್
 DocType: Purchase Invoice,Ignore Pricing Rule,ಬೆಲೆ ರೂಲ್ ನಿರ್ಲಕ್ಷಿಸು
-sites/assets/js/list.min.js +24,Cancelled,ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,ಸಂಬಳ ರಚನೆ ದಿನಾಂಕದಿಂದ ನೌಕರರ ಸೇರುವ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Employee Education,Graduate,ಪದವೀಧರ
 DocType: Leave Block List,Block Days,ಬ್ಲಾಕ್ ಡೇಸ್
 DocType: Journal Entry,Excise Entry,ಅಬಕಾರಿ ಎಂಟ್ರಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},ಎಚ್ಚರಿಕೆ: ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಈಗಾಗಲೇ ಗ್ರಾಹಕರ ಆರ್ಡರ್ ಖರೀದಿಸಿ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},ಎಚ್ಚರಿಕೆ: ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಈಗಾಗಲೇ ಗ್ರಾಹಕರ ಆರ್ಡರ್ ಖರೀದಿಸಿ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,ಸ್ಟಾಕ್ ಪಡೆದ
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ಗ್ರಾಸ್ ಪೇ + ನಗದೀಕರಣ ಬಾಕಿ ಪ್ರಮಾಣ ಪ್ರಮಾಣ - ಒಟ್ಟು ಕಳೆಯುವುದು
 DocType: Monthly Distribution,Distribution Name,ವಿತರಣೆ ಹೆಸರು
 DocType: Features Setup,Sales and Purchase,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ
-DocType: Purchase Order Item,Material Request No,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ನಂ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
+DocType: Supplier Quotation Item,Material Request No,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ನಂ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ಗ್ರಾಹಕ ಕರೆನ್ಸಿ ದರ ಕಂಪನಿಯ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ಈ ಪಟ್ಟಿಯಿಂದ ಯಶಸ್ವಿಯಾಗಿ ಅನ್ಸಬ್ಸ್ಕ್ರೈಬ್ ಮಾಡಲಾಗಿದೆ.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),ನೆಟ್ ದರ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/frappe/frappe/templates/base.html +132,Added,ಸೇರಿಸಲಾಗಿದೆ
+apps/frappe/frappe/templates/base.html +134,Added,ಸೇರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,ಪ್ರದೇಶ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಟ್ರೀ .
 DocType: Journal Entry Account,Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 DocType: Journal Entry Account,Party Balance,ಪಕ್ಷದ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Sales Invoice Item,Time Log Batch,ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು ಆಯ್ಕೆಮಾಡಿ
 DocType: Company,Default Receivable Account,ಡೀಫಾಲ್ಟ್ ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ಮೇಲೆ ಆಯ್ಕೆ ಮಾನದಂಡದ ಒಟ್ಟು ವೇತನ ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ರಚಿಸಿ
 DocType: Stock Entry,Material Transfer for Manufacture,ತಯಾರಿಕೆಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,ಸಂಬಂಧಿತ ನಮ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,ರೂಪಿಸಲ್ಪಟ್ಟ
 DocType: Sales Invoice,Sales Team1,ಮಾರಾಟದ team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Sales Invoice,Customer Address,ಗ್ರಾಹಕ ವಿಳಾಸ
 apps/frappe/frappe/desk/query_report.py +136,Total,ಒಟ್ಟು
 DocType: Purchase Invoice,Apply Additional Discount On,ಹೆಚ್ಚುವರಿ ರಿಯಾಯತಿ ಅನ್ವಯಿಸು
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,ಗುಣಮಟ್ಟದ ತಪ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ರೂಪಿಸುವ ಸ್ಪ್ರೇ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ಸಂಸ್ಥೆ ಸೇರಿದ ಖಾತೆಗಳ ಪ್ರತ್ಯೇಕ ಚಾರ್ಟ್ ಜೊತೆಗೆ ಕಾನೂನು ಘಟಕದ / ಅಂಗಸಂಸ್ಥೆ.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","ಆಹಾರ , ಪಾನೀಯ ಮತ್ತು ತಂಬಾಕು"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,ಪಿಎಲ್ ಅಥವಾ ಬಿಎಸ್
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,ಕಮಿಷನ್ ದರ 100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,ಕನಿಷ್ಠ ಇನ್ವೆಂಟರಿ ಮಟ್ಟ
 DocType: Stock Entry,Subcontract,subcontract
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,ಮೊದಲ {0} ನಮೂದಿಸಿ
 DocType: Production Planning Tool,Get Items From Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
 DocType: Production Order Operation,Actual End Time,ನಿಜವಾದ ಎಂಡ್ ಟೈಮ್
 DocType: Production Planning Tool,Download Materials Required,ಮೆಟೀರಿಯಲ್ಸ್ ಅಗತ್ಯ ಡೌನ್ಲೋಡ್
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,ಪರಿಶಿಷ್ಟ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","ಇಲ್ಲ" ಮತ್ತು "ಮಾರಾಟ ಐಟಂ" "ಸ್ಟಾಕ್ ಐಟಂ" ಅಲ್ಲಿ "ಹೌದು" ಐಟಂ ಆಯ್ಕೆ ಮತ್ತು ಯಾವುದೇ ಉತ್ಪನ್ನ ಕಟ್ಟು ಇಲ್ಲ ದಯವಿಟ್ಟು
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ಅಸಮಾನವಾಗಿ ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ಗುರಿಗಳನ್ನು ವಿತರಿಸಲು ಮಾಸಿಕ ವಿತರಣೆ ಆಯ್ಕೆ.
 DocType: Purchase Invoice Item,Valuation Rate,ಮೌಲ್ಯಾಂಕನ ದರ
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,ಐಟಂ ಸಾಲು {0}: {1} ಮೇಲೆ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು' ಟೇಬಲ್ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},ನೌಕರರ {0} ಈಗಾಗಲೇ {1} {2} ಮತ್ತು ನಡುವೆ ಅನ್ವಯಿಸಿದ್ದಾರೆ {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},ನೌಕರರ {0} ಈಗಾಗಲೇ {1} {2} ಮತ್ತು ನಡುವೆ ಅನ್ವಯಿಸಿದ್ದಾರೆ {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,ರವರೆಗೆ
 DocType: Rename Tool,Rename Log,ಲಾಗ್ ಮರುಹೆಸರಿಸು
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ಮಾತ್ರ ಲೀಫ್ ನೋಡ್ಗಳು ವ್ಯವಹಾರದಲ್ಲಿ ಅವಕಾಶ
 DocType: Expense Claim,Expense Approver,ವೆಚ್ಚದಲ್ಲಿ ಅನುಮೋದಕ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ಖರೀದಿ ರಸೀತಿ ಐಟಂ ವಿತರಿಸುತ್ತಾರೆ
-sites/assets/js/erpnext.min.js +48,Pay,ಪೇ
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,ಪೇ
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime ಗೆ
 DocType: SMS Settings,SMS Gateway URL,SMS ಗೇಟ್ವೇ URL ಅನ್ನು
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS ಡೆಲಿವರಿ ಸ್ಥಾನಮಾನ ಕಾಯ್ದುಕೊಳ್ಳುವುದು ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ಗ್ರೈಂಡಿಂಗ್
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,ಸುತ್ತಿ ಸಂಕೋಚನ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,ಬಾಕಿ ಚಟುವಟಿಕೆಗಳು
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ಬಾಕಿ ಚಟುವಟಿಕೆಗಳು
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,ದೃಢಪಡಿಸಿದರು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ಸರಬರಾಜುದಾರ> ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ವ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,ಸುದ್ದಿ ಪತ್ರಿಕೆಗಳ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ಕರಗಿಸುವ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,ಈ ದಾಖಲೆ ಬಿಡಿ ಅನುಮೋದಕ ಇವೆ . ' ಸ್ಥಿತಿಯನ್ನು ' ಅಪ್ಡೇಟ್ ಮತ್ತು ಉಳಿಸಿ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ
 DocType: Attendance,Attendance Date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ಸಂಬಳ ವಿಘಟನೆಯ ಸಂಪಾದಿಸಿದ ಮತ್ತು ಕಳೆಯುವುದು ಆಧರಿಸಿ .
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ಸವಕಳಿ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ಪೂರೈಕೆದಾರ (ರು)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,ಅಮಾನ್ಯವಾದ ಅವಧಿಯಲ್ಲಿ
 DocType: Customer,Credit Limit,ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,ವ್ಯವಹಾರದ ಪ್ರಕಾರವನ್ನುಆರಿಸಿ
 DocType: GL Entry,Voucher No,ಚೀಟಿ ಸಂಖ್ಯೆ
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,ನ
 DocType: Customer,Address and Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
 DocType: Customer,Last Day of the Next Month,ಮುಂದಿನ ತಿಂಗಳ ಕೊನೆಯ ದಿನ
 DocType: Employee,Feedback,ಪ್ರತ್ಯಾದಾನ
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,ಮಾಹಿತಿ ಗಾತ್ರ. ವೇಳಾಪಟ್ಟಿ
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,ಮಾಹಿತಿ ಗಾತ್ರ. ವೇಳಾಪಟ್ಟಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ಅಪಘರ್ಷಕ ಜೆಟ್ ಯಂತ್ರ
 DocType: Stock Settings,Freeze Stock Entries,ಫ್ರೀಜ್ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Website Settings,Website Settings,ಸೈಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,ನಿರ್ಗಮಿಸುವ
 DocType: Material Request,Requested For,ಮನವಿ
 DocType: Quotation Item,Against Doctype,DOCTYPE ವಿರುದ್ಧ
 DocType: Delivery Note,Track this Delivery Note against any Project,ಯಾವುದೇ ಪ್ರಾಜೆಕ್ಟ್ ವಿರುದ್ಧ ಈ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಟ್ರ್ಯಾಕ್
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,ಮೂಲ ಖಾತೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,ಮೂಲ ಖಾತೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,ಪ್ರದರ್ಶನ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 ,Is Primary Address,ಪ್ರಾಥಮಿಕ ವಿಳಾಸ
 DocType: Production Order,Work-in-Progress Warehouse,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ವಿಳಾಸಗಳನ್ನು ನಿರ್ವಹಿಸಿ
 DocType: Pricing Rule,Item Code,ಐಟಂ ಕೋಡ್
 DocType: Production Planning Tool,Create Production Orders,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶಗಳನ್ನು ರಚಿಸಲು
@@ -2460,14 +2471,14 @@ DocType: Journal Entry,User Remark,ಬಳಕೆದಾರ ಟೀಕಿಸು
 DocType: Lead,Market Segment,ಮಾರುಕಟ್ಟೆ ವಿಭಾಗ
 DocType: Communication,Phone,ದೂರವಾಣಿ
 DocType: Employee Internal Work History,Employee Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
 DocType: Contact,Passive,ನಿಷ್ಕ್ರಿಯ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಲ್ಲ ಸ್ಟಾಕ್
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,ವ್ಯವಹಾರ ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ .
 DocType: Sales Invoice,Write Off Outstanding Amount,ಪ್ರಮಾಣ ಅತ್ಯುತ್ತಮ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","ನೀವು ಸ್ವಯಂಚಾಲಿತ ಮರುಕಳಿಸುವ ಇನ್ವಾಯ್ಸ್ ಅಗತ್ಯವಿದ್ದರೆ ಪರಿಶೀಲಿಸಿ . ಯಾವುದೇ ಮಾರಾಟ ಸರಕುಪಟ್ಟಿ ಸಲ್ಲಿಸಿದ ನಂತರ, ಮರುಕಳಿಸುವ ಭಾಗವನ್ನುತೆರೆದು ಗೋಚರಿಸುತ್ತದೆ."
 DocType: Account,Accounts Manager,ಖಾತೆಗಳು ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',ಟೈಮ್ ಲಾಗ್ {0} ' ಸಲ್ಲಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',ಟೈಮ್ ಲಾಗ್ {0} ' ಸಲ್ಲಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
 DocType: Stock Settings,Default Stock UOM,ಡೀಫಾಲ್ಟ್ ಸ್ಟಾಕ್ UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),ಚಟುವಟಿಕೆ ರೀತಿಯ ಮೇಲೆ ದರ ಕಾಸ್ಟಿಂಗ್ (ಗಂಟೆಗೆ)
 DocType: Production Planning Tool,Create Material Requests,CreateMaterial ವಿನಂತಿಗಳು
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,ಬ್ಯಾಂಕ್ ಸಾಮ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ಅಪ್ಡೇಟ್ಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,ಕೆಲವು ಸ್ಯಾಂಪಲ್ ದಾಖಲೆಗಳನ್ನು ಸೇರಿಸಿ
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಬಿಡಿ
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಬಿಡಿ
 DocType: Event,Groups,ಗುಂಪುಗಳು
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ಖಾತೆ ಗುಂಪು
 DocType: Sales Order,Fully Delivered,ಸಂಪೂರ್ಣವಾಗಿ ತಲುಪಿಸಲಾಗಿದೆ
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,ಮಾರಾಟದ ಪರಿಕರಗಳು
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},ವೆಚ್ಚ ಸೆಂಟರ್ ವಿರುದ್ಧ ಬಜೆಟ್ {0} {1} ಖಾತೆಗೆ {2} {3} ಮೂಲಕ ಮೀರುತ್ತದೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,ಫಾರ್ವರ್ಡ್ ಎಲೆಗಳು ಕ್ಯಾರಿ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' ದಿನಾಂಕದಿಂದ ' ' ದಿನಾಂಕ ' ನಂತರ ಇರಬೇಕು
 ,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
 DocType: Sales Order,Customer's Purchase Order,ಗ್ರಾಹಕರ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 DocType: Warranty Claim,From Company,ಕಂಪನಿ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,ಚಿಲ್ಲರೆ ವ್ಯಾಪಾರಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ಎಲ್ಲಾ ವಿಧಗಳು ಸರಬರಾಜುದಾರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯ ಕಾರಣ ಐಟಂ ಕೋಡ್ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯ ಕಾರಣ ಐಟಂ ಕೋಡ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಐಟಂ
 DocType: Sales Order,%  Delivered,ತಲುಪಿಸಲಾಗಿದೆ %
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ಬ್ಯಾಂಕಿನ ಓವರ್ಡ್ರಾಫ್ಟ್ ಖಾತೆ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ಮಾಡಿ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ಬ್ರೌಸ್ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,ಸುರಕ್ಷಿತ ಸಾಲ
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ಆಕರ್ಷಕ ಉತ್ಪನ್ನಗಳು
@@ -2523,7 +2532,7 @@ DocType: Appraisal,Appraisal,ಬೆಲೆಕಟ್ಟುವಿಕೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ಲಾಸ್ಟ್-ಫೋಮ್ ಎರಕದ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ಡ್ರಾಯಿಂಗ್
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,ದಿನಾಂಕ ಪುನರಾವರ್ತಿಸುತ್ತದೆ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},ಬಿಡಿ ಅನುಮೋದಕ ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},ಬಿಡಿ ಅನುಮೋದಕ ಒಂದು ಇರಬೇಕು {0}
 DocType: Hub Settings,Seller Email,ಮಾರಾಟಗಾರ ಇಮೇಲ್
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ಒಟ್ಟು ಖರೀದಿ ವೆಚ್ಚ (ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಮೂಲಕ)
 DocType: Workstation Working Hour,Start Time,ಟೈಮ್
@@ -2537,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ನೆಟ್ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: BOM Operation,Hour Rate,ಅವರ್ ದರ
 DocType: Stock Settings,Item Naming By,ಐಟಂ ಹೆಸರಿಸುವ ಮೂಲಕ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,ನುಡಿಮುತ್ತುಗಳು ಗೆ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},ಮತ್ತೊಂದು ಅವಧಿ ಮುಕ್ತಾಯ ಎಂಟ್ರಿ {0} ನಂತರ ಮಾಡಲಾಗಿದೆ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,ನುಡಿಮುತ್ತುಗಳು ಗೆ
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ಮತ್ತೊಂದು ಅವಧಿ ಮುಕ್ತಾಯ ಎಂಟ್ರಿ {0} ನಂತರ ಮಾಡಲಾಗಿದೆ {1}
 DocType: Production Order,Material Transferred for Manufacturing,ವಸ್ತು ಉತ್ಪಾದನೆ ವರ್ಗಾಯಿಸಲ್ಪಟ್ಟ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,ಖಾತೆ {0} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Purchase Receipt Item,Purchase Order Item No,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ ಸಂಖ್ಯೆ
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಅಗತ
 DocType: Purchase Invoice Item,PR Detail,ತರಬೇತಿ ವಿವರ
 DocType: Sales Order,Fully Billed,ಸಂಪೂರ್ಣವಾಗಿ ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,ಕೈಯಲ್ಲಿ ನಗದು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},ಡೆಲಿವರಿ ಗೋದಾಮಿನ ಸ್ಟಾಕ್ ಐಟಂ ಬೇಕಾದ {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},ಡೆಲಿವರಿ ಗೋದಾಮಿನ ಸ್ಟಾಕ್ ಐಟಂ ಬೇಕಾದ {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ಪ್ಯಾಕೇಜ್ ಒಟ್ಟಾರೆ ತೂಕದ . ಸಾಮಾನ್ಯವಾಗಿ ನಿವ್ವಳ ತೂಕ + ಪ್ಯಾಕೇಜಿಂಗ್ ವಸ್ತುಗಳ ತೂಕ . ( ಮುದ್ರಣ )
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ಈ ಪಾತ್ರವನ್ನು ಬಳಕೆದಾರರು ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳ ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು / ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳನ್ನು ಸೆಟ್ ಮತ್ತು ರಚಿಸಲು ಅವಕಾಶ
 DocType: Serial No,Is Cancelled,ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,ನನ್ನ ಸಾಗಾಣಿಕೆಯಲ್ಲಿ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,ನನ್ನ ಸಾಗಾಣಿಕೆಯಲ್ಲಿ
 DocType: Journal Entry,Bill Date,ಬಿಲ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","ಹೆಚ್ಚಿನ ಆದ್ಯತೆ ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಇವೆ ಸಹ, ನಂತರ ಕೆಳಗಿನ ಆಂತರಿಕ ಆದ್ಯತೆಗಳು ಅನ್ವಯಿಸಲಾಗಿದೆ:"
 DocType: Supplier,Supplier Details,ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
@@ -2568,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,ಬ್ಯಾಂಕ್ ಖಾತೆ ಆಯ್ಕೆಮಾಡಿ
 DocType: Newsletter,Create and Send Newsletters,ರಚಿಸಿ ಮತ್ತು ಕಳುಹಿಸಿ ಸುದ್ದಿಪತ್ರಗಳು
-sites/assets/js/report.min.js +107,From Date must be before To Date,ದಿನಾಂಕ ಇಲ್ಲಿಯವರೆಗೆ ಮೊದಲು ಇರಬೇಕು
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,ದಿನಾಂಕ ಇಲ್ಲಿಯವರೆಗೆ ಮೊದಲು ಇರಬೇಕು
 DocType: Sales Order,Recurring Order,ಮರುಕಳಿಸುವ ಆರ್ಡರ್
 DocType: Company,Default Income Account,ಡೀಫಾಲ್ಟ್ ಆದಾಯ ಖಾತೆ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ಗ್ರಾಹಕ ಗುಂಪಿನ / ಗ್ರಾಹಕ
@@ -2583,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,ಸ್ಟಾಕ್ UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 ,Projected,ಯೋಜಿತ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ಗಮನಿಸಿ : ಸಿಸ್ಟಮ್ ಐಟಂ ಡೆಲಿವರಿ ಮೇಲೆ ಮತ್ತು ಅತಿ ಬುಕಿಂಗ್ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ {0} ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣದ 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ಗಮನಿಸಿ : ಸಿಸ್ಟಮ್ ಐಟಂ ಡೆಲಿವರಿ ಮೇಲೆ ಮತ್ತು ಅತಿ ಬುಕಿಂಗ್ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ {0} ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣದ 0
 DocType: Notification Control,Quotation Message,ನುಡಿಮುತ್ತುಗಳು ಸಂದೇಶ
 DocType: Issue,Opening Date,ದಿನಾಂಕ ತೆರೆಯುವ
 DocType: Journal Entry,Remark,ಟೀಕಿಸು
 DocType: Purchase Receipt Item,Rate and Amount,ದರ ಮತ್ತು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ಬೋರಿಂಗ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್ ಗೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್ ಗೆ
 DocType: Blog Category,Parent Website Route,ಪೋಷಕ ಸೈಟ್ ಮಾರ್ಗ
 DocType: Sales Order,Not Billed,ಖ್ಯಾತವಾದ ಮಾಡಿರುವುದಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,ಎರಡೂ ಗೋದಾಮಿನ ಅದೇ ಕಂಪನಿ ಸೇರಿರಬೇಕು
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,ಯಾವುದೇ ಸಂಪರ್ಕಗಳನ್ನು ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,ಯಾವುದೇ ಸಂಪರ್ಕಗಳನ್ನು ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,ಸಕ್ರಿಯವಾಗಿಲ್ಲ
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,ಸರಕುಪಟ್ಟಿ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ವಿರುದ್ಧ
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ ಪ್ರಮಾಣ
 DocType: Time Log,Batched for Billing,ಬಿಲ್ಲಿಂಗ್ Batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,ಪೂರೈಕೆದಾರರು ಬೆಳೆಸಿದರು ಬಿಲ್ಲುಗಳನ್ನು .
 DocType: POS Profile,Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ
-sites/assets/js/erpnext.min.js +26,Discount Amount,ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ವಿರುದ್ಧ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಹಿಂತಿರುಗಿ
 DocType: Item,Warranty Period (in days),( ದಿನಗಳಲ್ಲಿ ) ಖಾತರಿ ಅವಧಿಯ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ಇ ಜಿ ವ್ಯಾಟ್
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ಐಟಂ 4
 DocType: Journal Entry Account,Journal Entry Account,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಖಾತೆ
 DocType: Shopping Cart Settings,Quotation Series,ಉದ್ಧರಣ ಸರಣಿ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","ಐಟಂ ( {0} ) , ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","ಐಟಂ ( {0} ) , ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,ರೂಪಿಸುವ ಬಿಸಿ ಲೋಹದ ಅನಿಲ
 DocType: Sales Order Item,Sales Order Date,ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ
 DocType: Sales Invoice Item,Delivered Qty,ತಲುಪಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
@@ -2639,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,ಗ್ರಾಹಕ ಅಥವಾ ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,ಸೆಟ್
 DocType: Lead,Lead Owner,ಲೀಡ್ ಮಾಲೀಕ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,ವೇರ್ಹೌಸ್ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,ವೇರ್ಹೌಸ್ ಅಗತ್ಯವಿದೆ
 DocType: Employee,Marital Status,ವೈವಾಹಿಕ ಸ್ಥಿತಿ
 DocType: Stock Settings,Auto Material Request,ಆಟೋ ಉತ್ಪನ್ನ ವಿನಂತಿ
 DocType: Time Log,Will be updated when billed.,ಕೊಕ್ಕಿನ ಮಾಡಿದಾಗ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಬ್ಯಾಚ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,ಪ್ರಸ್ತುತ BOM ಮತ್ತು ಹೊಸ BOM ಇರಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,ನಿವೃತ್ತಿ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Sales Invoice,Against Income Account,ಆದಾಯ ಖಾತೆ ವಿರುದ್ಧ
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,ಸ್ಟಾಕ್ ನವೀಕರಿಸಲ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ಐಟಂಗಳನ್ನು ವಿವಿಧ UOM ತಪ್ಪು ( ಒಟ್ಟು ) ನೆಟ್ ತೂಕ ಮೌಲ್ಯವನ್ನು ಕಾರಣವಾಗುತ್ತದೆ . ಪ್ರತಿ ಐಟಂ ಮಾಡಿ surethat ನೆಟ್ ತೂಕ ಅದೇ UOM ಹೊಂದಿದೆ .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ಬಿಒಎಮ್ ದರ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂಗಳನ್ನು ಪುಲ್ ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂಗಳನ್ನು ಪುಲ್ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,ಜರ್ನಲ್ ನಮೂದುಗಳು {0} ಅನ್ ಬಂಧಿಸಿಲ್ಲ
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","ಮಾದರಿ ಇಮೇಲ್, ಫೋನ್, ಚಾಟ್, ಭೇಟಿ, ಇತ್ಯಾದಿ ಎಲ್ಲಾ ಸಂವಹನ ರೆಕಾರ್ಡ್"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,ಕಂಪನಿಯಲ್ಲಿ ರೌಂಡ್ ಆಫ್ ವೆಚ್ಚ ಸೆಂಟರ್ ಬಗ್ಗೆ ದಯವಿಟ್ಟು
 DocType: Purchase Invoice,Terms,ನಿಯಮಗಳು
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,ಹೊಸ ರಚಿಸಿ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,ಹೊಸ ರಚಿಸಿ
 DocType: Buying Settings,Purchase Order Required,ಆದೇಶ ಅಗತ್ಯವಿರುವ ಖರೀದಿಸಿ
 ,Item-wise Sales History,ಐಟಂ ಬಲ್ಲ ಮಾರಾಟದ ಇತಿಹಾಸ
 DocType: Expense Claim,Total Sanctioned Amount,ಒಟ್ಟು ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
@@ -2681,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,ಸಂಬಳದ ಸ್ಲ
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,ಟಿಪ್ಪಣಿಗಳು
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,ಮೊದಲ ಗುಂಪು ನೋಡ್ ಆಯ್ಕೆ.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},ಉದ್ದೇಶ ಒಂದು ಇರಬೇಕು {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,ರೂಪ ಭರ್ತಿ ಮಾಡಿ ಮತ್ತು ಅದನ್ನು ಉಳಿಸಲು
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ರೂಪ ಭರ್ತಿ ಮಾಡಿ ಮತ್ತು ಅದನ್ನು ಉಳಿಸಲು
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ಅವರ ಇತ್ತೀಚಿನ ದಾಸ್ತಾನು ಸ್ಥಿತಿಯನ್ನು ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಹೊಂದಿದ ಒಂದು ವರದಿಯನ್ನು ಡೌನ್ಲೋಡ್
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,ಎದುರಿಸುತ್ತಿರುವ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ಸಮುದಾಯ ವೇದಿಕೆ
 DocType: Leave Application,Leave Balance Before Application,ಅಪ್ಲಿಕೇಶನ್ ಮೊದಲು ಬ್ಯಾಲೆನ್ಸ್ ಬಿಡಿ
 DocType: SMS Center,Send SMS,ಎಸ್ಎಂಎಸ್ ಕಳುಹಿಸಿ
 DocType: Company,Default Letter Head,ಪತ್ರ ಹೆಡ್ ಡೀಫಾಲ್ಟ್
 DocType: Time Log,Billable,ಬಿಲ್ ಮಾಡಬಹುದಾದ
 DocType: Authorization Rule,This will be used for setting rule in HR module,ಈ ಮಾನವ ಸಂಪನ್ಮೂಲ ಭಾಗದಲ್ಲಿ ನಿಯಮ ಸ್ಥಾಪನೆಗೆ ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Account,Rate at which this tax is applied,ದರ ಈ ತೆರಿಗೆ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ ನಲ್ಲಿ
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ
 DocType: Company,Stock Adjustment Account,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ ಖಾತೆ
 DocType: Journal Entry,Write Off,ಆಫ್ ಬರೆಯಿರಿ
 DocType: Time Log,Operation ID,ಆಪರೇಷನ್ ಐಡಿ
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","ರಿಯಾಯಿತಿ ಫೀಲ್ಡ್ಸ್ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ , ಖರೀದಿ ರಸೀತಿ , ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಲಭ್ಯವಾಗುತ್ತದೆ"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ಹೊಸ ಖಾತೆ ಶಾಲೆಯ ಹೆಸರು. ಗಮನಿಸಿ: ಗ್ರಾಹಕರ ಹಾಗೂ ವಿತರಕರ ಖಾತೆಗಳನ್ನು ರಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Report,Report Type,ವರದಿ ಪ್ರಕಾರ
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,ಲೋಡ್
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,ಲೋಡ್
 DocType: BOM Replace Tool,BOM Replace Tool,BOM ಬದಲಿಗೆ ಸಾಧನ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ದೇಶದ ಬುದ್ಧಿವಂತ ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ಗಳು
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
+DocType: Sales Order Item,Supplier delivers to Customer,ಸರಬರಾಜುದಾರ ಗ್ರಾಹಕ ನೀಡುತ್ತದೆ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ಡೇಟಾ ಆಮದು ಮತ್ತು ರಫ್ತು
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',ನೀವು ಉತ್ಪಾದನಾ ಚಟುವಟಿಕೆ ಒಳಗೊಂಡಿರುತ್ತವೆ ವೇಳೆ . ಐಟಂ ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ ' ತಯಾರಿಸುತ್ತದೆ '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,ಸರಕುಪಟ್ಟಿ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ
 DocType: Sales Invoice,Rounded Total,ದುಂಡಾದ ಒಟ್ಟು
 DocType: Product Bundle,List items that form the package.,ಪಟ್ಟಿ ಐಟಂಗಳನ್ನು ಪ್ಯಾಕೇಜ್ ರೂಪಿಸಲು ಮಾಡಿದರು .
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ಶೇಕಡಾವಾರು ಅಲೋಕೇಶನ್ 100% ಸಮನಾಗಿರುತ್ತದೆ
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
 DocType: Company,Default Cash Account,ಡೀಫಾಲ್ಟ್ ನಗದು ಖಾತೆ
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ಕಂಪನಿ ( ಗ್ರಾಹಕ ಅಥವಾ ಸರಬರಾಜುದಾರ ) ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',' ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ' ನಮೂದಿಸಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',' ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ' ನಮೂದಿಸಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,ಪಾವತಿಸಿದ ಪ್ರಮಾಣದ + ಆಫ್ ಬರೆಯಿರಿ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ಐಟಂ ಮಾನ್ಯ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಅಲ್ಲ {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},ಗಮನಿಸಿ : ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
@@ -2740,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","ಸಾಲು {0}: ಪ್ರಮಾಣ ಉಗ್ರಾಣದಲ್ಲಿ avalable ಅಲ್ಲ {1} ನಲ್ಲಿ {2} {3}.
  ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ: {4}, ಪ್ರಮಾಣ ವರ್ಗಾಯಿಸಿ: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ಐಟಂ 3
+DocType: Purchase Order,Customer Contact Email,ಗ್ರಾಹಕ ಸಂಪರ್ಕ ಇಮೇಲ್
 DocType: Event,Sunday,ಭಾನುವಾರ
 DocType: Sales Team,Contribution (%),ಕೊಡುಗೆ ( % )
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,ಟೆಂಪ್ಲೇಟು
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ಟೆಂಪ್ಲೇಟು
 DocType: Sales Person,Sales Person Name,ಮಾರಾಟಗಾರನ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಸರಕುಪಟ್ಟಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,ಬಳಕೆದಾರರು ಸೇರಿಸಿ
@@ -2753,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),ನಿಜವಾದ ಪ್ರಾ
 DocType: Stock Reconciliation Item,Before reconciliation,ಸಮನ್ವಯ ಮೊದಲು
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ಗೆ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
 DocType: Sales Order,Partly Billed,ಹೆಚ್ಚಾಗಿ ಖ್ಯಾತವಾದ
 DocType: Item,Default BOM,ಡೀಫಾಲ್ಟ್ BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2761,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
 DocType: Time Log Batch,Total Hours,ಒಟ್ಟು ಅವರ್ಸ್
 DocType: Journal Entry,Printing Settings,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,ಆಟೋಮೋಟಿವ್
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},ಎಲೆಗಳು ಮಾದರಿ {0} ನೌಕರ ಈಗಾಗಲೇ ನಿಗದಿಪಡಿಸಲಾಗಿತ್ತು {1} ಹಣಕಾಸಿನ ವರ್ಷ {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,ಐಟಂ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,ಮೆಟಲ್ ಅಚ್ಚೊತ್ತುವಿಕೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 DocType: Time Log,From Time,ಸಮಯದಿಂದ
 DocType: Notification Control,Custom Message,ಕಸ್ಟಮ್ ಸಂದೇಶ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ ಬ್ಯಾಂಕಿಂಗ್
@@ -2782,10 +2795,10 @@ DocType: Newsletter,A Lead with this email id should exist,ಈ ಇಮೇಲ
 DocType: Stock Entry,From BOM,BOM ಗೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,ಮೂಲಭೂತ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} ಮೊದಲು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಘನೀಭವಿಸಿದ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,ದಿನಾಂಕ ಅರ್ಧ ದಿನ ರಜೆ Fromdate ಅದೇ ಇರಬೇಕು
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,ದಿನಾಂಕ ಅರ್ಧ ದಿನ ರಜೆ Fromdate ಅದೇ ಇರಬೇಕು
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","ಇ ಜಿ ಕೆಜಿ, ಘಟಕ , ಸೂಲ , ಮೀ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,ನೀವು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿದರೆ ರೆಫರೆನ್ಸ್ ನಂ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,ನೀವು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿದರೆ ರೆಫರೆನ್ಸ್ ನಂ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,ಸೇರುವ ದಿನಾಂಕ ಜನ್ಮ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Salary Structure,Salary Structure,ಸಂಬಳ ರಚನೆ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,7 +2806,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ದಯವಿಟ್ಟು. ಬೆಲೆ ನಿಯಮಗಳು: {0}"
 DocType: Account,Bank,ಬ್ಯಾಂಕ್
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,ಏರ್ಲೈನ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
 DocType: Material Request Item,For Warehouse,ಗೋದಾಮಿನ
 DocType: Employee,Offer Date,ಆಫರ್ ದಿನಾಂಕ
 DocType: Hub Settings,Access Token,ಪ್ರವೇಶ ಟೋಕನ್
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,ಆರಂಭಿಕ ಸಮಯ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ಅಗತ್ಯವಿದೆ ದಿನಾಂಕ ಮತ್ತು ಮಾಡಲು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ಸರಕು ವಿನಿಮಯ
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
+DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ಕೊರೆಯುವ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ಊದು ಅಚ್ಚೊತ್ತುವಿಕೆ
 DocType: Purchase Taxes and Charges,Valuation and Total,ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು
@@ -2837,11 +2851,12 @@ DocType: C-Form,Amended From,ಗೆ ತಿದ್ದುಪಡಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,ಮೂಲಸಾಮಗ್ರಿ
 DocType: Leave Application,Follow via Email,ಇಮೇಲ್ ಮೂಲಕ ಅನುಸರಿಸಿ
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,ಮಗುವಿನ ಖಾತೆಗೆ ಈ ಖಾತೆಗಾಗಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ . ನೀವು ಈ ಖಾತೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,ಮಗುವಿನ ಖಾತೆಗೆ ಈ ಖಾತೆಗಾಗಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ . ನೀವು ಈ ಖಾತೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ಗುರಿ ಪ್ರಮಾಣ ಅಥವಾ ಗುರಿ ಪ್ರಮಾಣವನ್ನು ಒಂದೋ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
-DocType: Leave Allocation,Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,ದಿನಾಂಕ ತೆರೆಯುವ ದಿನಾಂಕ ಮುಚ್ಚುವ ಮೊದಲು ಇರಬೇಕು
+DocType: Leave Control Panel,Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Department,Days for which Holidays are blocked for this department.,ಯಾವ ರಜಾದಿನಗಳಲ್ಲಿ ಡೇಸ್ ಈ ಇಲಾಖೆಗೆ ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ.
 ,Produced,ನಿರ್ಮಾಣ
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ಒಟ್ಟು (ಆ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,ಮನರಂಜನೆ ಮತ್ತು ವಿರಾಮ
 DocType: Purchase Order,The date on which recurring order will be stop,ಮರುಕಳಿಸುವ ಸಲುವಾಗಿ ನಿಲ್ಲಿಸಲು ಯಾವ ದಿನಾಂಕ
 DocType: Quality Inspection,Item Serial No,ಐಟಂ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} ಕಡಿಮೆ ಮಾಡಬೇಕು ಅಥವಾ ನೀವು ಉಕ್ಕಿ ಸಹನೆ ಹೆಚ್ಚಾಗಬೇಕು
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} ಕಡಿಮೆ ಮಾಡಬೇಕು ಅಥವಾ ನೀವು ಉಕ್ಕಿ ಸಹನೆ ಹೆಚ್ಚಾಗಬೇಕು
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,ಒಟ್ಟು ಪ್ರೆಸೆಂಟ್
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ಗಂಟೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು \
  ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,ಸರಬರಾಜುದಾರರಿಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,ಸರಬರಾಜುದಾರರಿಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ಹೊಸ ಸೀರಿಯಲ್ ನಂ ಗೋದಾಮಿನ ಸಾಧ್ಯವಿಲ್ಲ . ವೇರ್ಹೌಸ್ ಷೇರು ಖರೀದಿ ರಸೀತಿ ಎಂಟ್ರಿ ಅಥವಾ ಸೆಟ್ ಮಾಡಬೇಕು
 DocType: Lead,Lead Type,ಲೀಡ್ ಪ್ರಕಾರ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,ಉದ್ಧರಣ ರಚಿಸಿ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,ಈ ಎಲ್ಲಾ ವಸ್ತುಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,ಈ ಎಲ್ಲಾ ವಸ್ತುಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ಅನುಮೋದನೆ ಮಾಡಬಹುದು
 DocType: Shipping Rule,Shipping Rule Conditions,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ನಿಯಮಗಳು
 DocType: BOM Replace Tool,The new BOM after replacement,ಬದಲಿ ನಂತರ ಹೊಸ BOM
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,ಸಿ ಆಕಾರ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ಆಪರೇಷನ್ ಐಡಿ ಹೊಂದಿಸಿಲ್ಲ
 DocType: Production Order,Planned Start Date,ಯೋಜನೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Serial No,Creation Document Type,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,ಮಾಹಿತಿ ಗಾತ್ರ. ಭೇಟಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,ಮಾಹಿತಿ ಗಾತ್ರ. ಭೇಟಿ
 DocType: Leave Type,Is Encash,ಮುರಿಸು ಇದೆ
 DocType: Purchase Invoice,Mobile No,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Payment Tool,Make Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮಾಡಿ
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,ನಿಗದಿ ಹೊಸ ಎ
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ಪ್ರಾಜೆಕ್ಟ್ ಬಲ್ಲ ದಶಮಾಂಶ ಉದ್ಧರಣ ಲಭ್ಯವಿಲ್ಲ
 DocType: Project,Expected End Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Appraisal Template,Appraisal Template Title,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಶೀರ್ಷಿಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,ವ್ಯಾಪಾರದ
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ವ್ಯಾಪಾರದ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,ಪೋಷಕ ಐಟಂ {0} ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬಾರದು
 DocType: Cost Center,Distribution Id,ವಿತರಣೆ ಸಂ
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,ಆಕರ್ಷಕ ಸೇವೆಗಳು
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} ಲಕ್ಷಣ ಮೌಲ್ಯವನ್ನು ವ್ಯಾಪ್ತಿಯಲ್ಲಿ ಇರಬೇಕು {1} ಗೆ {2} ಏರಿಕೆಗಳಲ್ಲಿ {3}
 DocType: Tax Rule,Sales,ಮಾರಾಟದ
 DocType: Stock Entry Detail,Basic Amount,ಬೇಸಿಕ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,ಕೋಟಿ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,ಕೋಟಿ
 DocType: Customer,Default Receivable Accounts,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಡೀಫಾಲ್ಟ್
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,ಬಿಲ್ಲಿಂಗ್ ರಾಜ್ಯ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ಲ್ಯಾಮಿನೇಟ್
 DocType: Item Reorder,Transfer,ವರ್ಗಾವಣೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
 DocType: Authorization Rule,Applicable To (Employee),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಉದ್ಯೋಗಗಳು)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,ಚಿಲ್ಲರೆ ವ್ಯಪಾರ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ಗ್ರಾಹಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Attendance,Absent,ಆಬ್ಸೆಂಟ್
 DocType: Product Bundle,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ಸಾಲು {0}: ಅಮಾನ್ಯ ಉಲ್ಲೇಖಿತ {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ಹಿಂಡುವಿಕೆ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 DocType: Upload Attendance,Download Template,ಡೌನ್ಲೋಡ್ ಟೆಂಪ್ಲೇಟು
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,ರಿಮಾರ್ಕ್ಸ್
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ರಾ ಮೆಟೀರಿಯಲ್ ಐಟಂ ಕೋಡ್
 DocType: Journal Entry,Write Off Based On,ಆಧರಿಸಿದ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Features Setup,POS View,ಪಿಓಎಸ್ ವೀಕ್ಷಿಸಿ
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,ಒಂದು ನೆಯ ಅನುಸ್ಥಾಪನೆ ದಾಖಲೆ .
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,ಒಂದು ನೆಯ ಅನುಸ್ಥಾಪನೆ ದಾಖಲೆ .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,ನಿರಂತರ ಎರಕದ
-sites/assets/js/erpnext.min.js +10,Please specify a,ಒಂದು ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,ಒಂದು ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Offer Letter,Awaiting Response,ಪ್ರತಿಕ್ರಿಯೆ ಕಾಯುತ್ತಿದ್ದ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ಮೇಲೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,ಶೀತಲ ಗಾತ್ರ
 DocType: Salary Slip,Earning & Deduction,ದುಡಿಯುತ್ತಿದ್ದ & ಡಿಡಕ್ಷನ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,ಖಾತೆ {0} ಒಂದು ಗುಂಪು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,ಪ್ರದೇಶ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,ಐಚ್ಛಿಕ . ಈ ಸೆಟ್ಟಿಂಗ್ ವಿವಿಧ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಫಿಲ್ಟರ್ ಬಳಸಲಾಗುತ್ತದೆ.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ಐಚ್ಛಿಕ . ಈ ಸೆಟ್ಟಿಂಗ್ ವಿವಿಧ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಫಿಲ್ಟರ್ ಬಳಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Holiday List,Weekly Off,ಸಾಪ್ತಾಹಿಕ ಆಫ್
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ಇ ಜಿ ಫಾರ್ 2012 , 2012-13"
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,ಉಬ್ಬುವ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ಆವಿಗೊಳಿಸುವ ಚಿತ್ತಾರ ಎರಕದ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ಮನೋರಂಜನೆ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,ವಯಸ್ಸು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,ವಯಸ್ಸು
 DocType: Time Log,Billing Amount,ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,ಐಟಂ ನಿಗದಿತ ಅಮಾನ್ಯ ಪ್ರಮಾಣ {0} . ಪ್ರಮಾಣ 0 ಹೆಚ್ಚಿರಬೇಕು
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,ರಜೆ ಅಪ್ಲಿಕೇಷನ್ಗಳಿಗೆ .
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಅಳಿಸಲಾಗಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಅಳಿಸಲಾಗಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ಕಾನೂನು ವೆಚ್ಚ
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ಸ್ವಯಂ ಸಲುವಾಗಿ 05, 28 ಇತ್ಯಾದಿ ಉದಾ ರಚಿಸಲಾಗಿದೆ ಮೇಲೆ ತಿಂಗಳ ದಿನ"
 DocType: Sales Invoice,Posting Time,ಟೈಮ್ ಪೋಸ್ಟ್
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,ಲೋಗೋ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ನೀವು ಉಳಿಸುವ ಮೊದಲು ಸರಣಿ ಆರಿಸಲು ಬಳಕೆದಾರರಿಗೆ ಒತ್ತಾಯಿಸಲು ಬಯಸಿದಲ್ಲಿ ಈ ಪರಿಶೀಲಿಸಿ . ನೀವು ಈ ಪರಿಶೀಲಿಸಿ ವೇಳೆ ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇರುತ್ತದೆ .
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಅನ್ನು {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,ಓಪನ್ ಸೂಚನೆಗಳು
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ಓಪನ್ ಸೂಚನೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,ನೇರ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು ಬಯಸುವಿರಾ?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ಹೊಸ ಗ್ರಾಹಕ ಕಂದಾಯ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ಪ್ರಯಾಣ ವೆಚ್ಚ
 DocType: Maintenance Visit,Breakdown,ಅನಾರೋಗ್ಯದಿಂದ ಕುಸಿತ
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ದಿನಾಂಕದಂದು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,ಸಾಣೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,ಪರೀಕ್ಷಣೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ.
 DocType: Feed,Full Name,ಪೂರ್ಣ ಹೆಸರು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,ತೆಕ್ಕೆಗೆ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಪಾವತಿ {0} {1}
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,ಖಾತೆಗ
 DocType: Buying Settings,Default Supplier Type,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,ಕಲ್ಲುಗಣಿಗಾರಿಕೆ
 DocType: Production Order,Total Operating Cost,ಒಟ್ಟು ವೆಚ್ಚವನ್ನು
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,ರೇಟಿಂಗ್ : ಐಟಂ {0} ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,ರೇಟಿಂಗ್ : ಐಟಂ {0} ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು .
 DocType: Newsletter,Test Email Id,ಟೆಸ್ಟ್ ಮಿಂಚಂಚೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,ಕಂಪನಿ ಸಂಕ್ಷೇಪಣ
@@ -3101,11 +3117,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ಪಾ
 DocType: Stock Settings,Role Allowed to edit frozen stock,ಪಾತ್ರ ಹೆಪ್ಪುಗಟ್ಟಿದ ಸ್ಟಾಕ್ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಲಾಗಿದೆ
 ,Territory Target Variance Item Group-Wise,ಪ್ರದೇಶ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಕಡ್ಡಾಯವಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ಬೆಲೆ ಪಟ್ಟಿ ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} ಸ್ಥಿತಿಯನ್ನು ' ಸ್ಟಾಪ್ಡ್ ' ಇದೆ
 DocType: Account,Temporary,ತಾತ್ಕಾಲಿಕ
 DocType: Address,Preferred Billing Address,ಮೆಚ್ಚಿನ ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ಶೇಕಡಾವಾರು ಹಂಚಿಕ
@@ -3123,13 +3138,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ಐಟಂ ವೈಸ
 DocType: Purchase Order Item,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
 DocType: Quotation,In Words will be visible once you save the Quotation.,ನೀವು ಉದ್ಧರಣ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,ಇಸ್ತ್ರಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} ನಿಲ್ಲಿಸಿದಾಗ
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ನಿಲ್ಲಿಸಿದಾಗ
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
 DocType: Lead,Add to calendar on this date,ಈ ದಿನಾಂಕದಂದು ಕ್ಯಾಲೆಂಡರ್ಗೆ ಸೇರಿಸು
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,ಹಡಗು ವೆಚ್ಚ ಸೇರಿಸುವ ನಿಯಮಗಳು .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,ಮುಂಬರುವ ಕಾರ್ಯಕ್ರಮಗಳು
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ಮುಂಬರುವ ಕಾರ್ಯಕ್ರಮಗಳು
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ಗ್ರಾಹಕ ಅಗತ್ಯವಿದೆ
 DocType: Letter Head,Letter Head,ತಲೆಬರಹ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ತ್ವರಿತ ಪ್ರವೇಶ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ರಿಟರ್ನ್ ಕಡ್ಡಾಯ
 DocType: Purchase Order,To Receive,ಪಡೆಯಲು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,ಬಿಗಿಯಾದ ಸಂಕೋಚನ
@@ -3153,25 +3169,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,ಕನಿಷ್ಠ ಒಂದು ಗೋದಾಮಿನ ಕಡ್ಡಾಯ
 DocType: Serial No,Out of Warranty,ಖಾತರಿ ಹೊರಗೆ
 DocType: BOM Replace Tool,Replace,ಬದಲಾಯಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ನಮೂದಿಸಿ
 DocType: Purchase Invoice Item,Project Name,ಪ್ರಾಜೆಕ್ಟ್ ಹೆಸರು
 DocType: Supplier,Mention if non-standard receivable account,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ವೇಳೆ
 DocType: Workflow State,Edit,ಸಂಪಾದಿಸು
 DocType: Journal Entry Account,If Income or Expense,ವೇಳೆ ಆದಾಯ ಅಥವಾ ಖರ್ಚು
 DocType: Features Setup,Item Batch Nos,ಐಟಂ ಬ್ಯಾಚ್ ಸೂಲ
 DocType: Stock Ledger Entry,Stock Value Difference,ಸ್ಟಾಕ್ ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,ಮಾನವ ಸಂಪನ್ಮೂಲ
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,ಮಾನವ ಸಂಪನ್ಮೂಲ
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ಪಾವತಿ ರಾಜಿ ಪಾವತಿಗೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ತೆರಿಗೆ ಸ್ವತ್ತುಗಳು
 DocType: BOM Item,BOM No,ಯಾವುದೇ BOM
 DocType: Contact Us Settings,Pincode,ಪಿನ್ ಕೋಡ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} {1} ಅಥವಾ ಈಗಾಗಲೇ ಇತರ ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} {1} ಅಥವಾ ಈಗಾಗಲೇ ಇತರ ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ
 DocType: Item,Moving Average,ಸರಾಸರಿ ಮೂವಿಂಗ್
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ಯಾವ ಸ್ಥಾನಾಂತರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,ಹೊಸ ಸ್ಟಾಕ್ UOM ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್ UOM ಭಿನ್ನವಾಗಿದೆ ಇರಬೇಕು
 DocType: Account,Debit,ಡೆಬಿಟ್
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,ಎಲೆಗಳು ಹಂಚಿಕೆ 0.5 ಗುಣಾತ್ಮಕವಾಗಿ ಇರಬೇಕು
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,ಎಲೆಗಳು ಹಂಚಿಕೆ 0.5 ಗುಣಾತ್ಮಕವಾಗಿ ಇರಬೇಕು
 DocType: Production Order,Operation Cost,ಆಪರೇಷನ್ ವೆಚ್ಚ
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,ಒಂದು . CSV ಕಡತ ಹಾಜರಾತಿ ಅಪ್ಲೋಡ್
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
@@ -3179,7 +3195,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ಸೆ
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","ಈ ಸಮಸ್ಯೆಯನ್ನು ನಿಯೋಜಿಸಲು ಸೈಡ್ಬಾರ್ನಲ್ಲಿ "" ನಿಯೋಜನೆ "" ಗುಂಡಿಯನ್ನು ಬಳಸಿ."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ಫ್ರೀಜ್ ಸ್ಟಾಕ್ಗಳು ​​ಹಳೆಯದಾಗಿರುವ [ ಡೇಸ್ ]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ಎರಡು ಅಥವಾ ಹೆಚ್ಚು ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲೆ ಆಧರಿಸಿ ಕಂಡುಬರದಿದ್ದಲ್ಲಿ, ಆದ್ಯತಾ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ. ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ (ಖಾಲಿ) ಹಾಗೆಯೇ ಆದ್ಯತಾ 20 0 ನಡುವೆ ಸಂಖ್ಯೆ. ಹೆಚ್ಚಿನ ಸಂಖ್ಯೆ ಅದೇ ಪರಿಸ್ಥಿತಿಗಳು ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಇವೆ ಅದು ಪ್ರಾಧಾನ್ಯತೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ ಅರ್ಥ."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ಹಣಕಾಸಿನ ವರ್ಷ: {0} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Currency Exchange,To Currency,ಕರೆನ್ಸಿ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,ಕೆಳಗಿನ ಬಳಕೆದಾರರಿಗೆ ಬ್ಲಾಕ್ ದಿನಗಳ ಬಿಟ್ಟು ಅನ್ವಯಗಳು ಅನುಮೋದಿಸಲು ಅನುಮತಿಸಿ .
@@ -3208,7 +3223,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),ದ
 DocType: Stock Entry Detail,Additional Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,ಹಣಕಾಸು ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ಚೀಟಿ ಮೂಲಕ ವರ್ಗೀಕರಿಸಲಾಗಿದೆ ವೇಳೆ , ಚೀಟಿ ಸಂಖ್ಯೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Quality Inspection,Incoming,ಒಳಬರುವ
 DocType: BOM,Materials Required (Exploded),ಬೇಕಾದ ಸಾಮಗ್ರಿಗಳು (ಸ್ಫೋಟಿಸಿತು )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ವೇತನ ಇಲ್ಲದೆ ರಜೆ ದುಡಿಯುತ್ತಿದ್ದ ಕಡಿಮೆ ( LWP )
@@ -3216,10 +3231,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ {1} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,ರಜೆ
 DocType: Batch,Batch ID,ಬ್ಯಾಚ್ ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},ರೇಟಿಂಗ್ : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},ರೇಟಿಂಗ್ : {0}
 ,Delivery Note Trends,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಪ್ರವೃತ್ತಿಗಳು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ಈ ವಾರದ ಸಾರಾಂಶ
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ಸತತವಾಗಿ ಖರೀದಿಸಲಾದ ಅಥವಾ ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ಸತತವಾಗಿ ಖರೀದಿಸಲಾದ ಅಥವಾ ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,ಖಾತೆ: {0} ಮಾತ್ರ ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಮೂಲಕ ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು
 DocType: GL Entry,Party,ಪಕ್ಷ
 DocType: Sales Order,Delivery Date,ಡೆಲಿವರಿ ದಿನಾಂಕ
@@ -3232,7 +3247,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,P
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ಆವರೇಜ್. ಬೈಯಿಂಗ್ ದರ
 DocType: Task,Actual Time (in Hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್
 DocType: Employee,History In Company,ಕಂಪನಿ ಇತಿಹಾಸ
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,ಸುದ್ದಿಪತ್ರಗಳು
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,ಸುದ್ದಿಪತ್ರಗಳು
 DocType: Address,Shipping,ಹಡಗು ರವಾನೆ
 DocType: Stock Ledger Entry,Stock Ledger Entry,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಎಂಟ್ರಿ
 DocType: Department,Leave Block List,ಖಂಡ ಬಿಡಿ
@@ -3251,7 +3266,7 @@ DocType: Account,Auditor,ಆಡಿಟರ್
 DocType: Purchase Order,End date of current order's period,ಪ್ರಸ್ತುತ ಸಲುವಾಗಿ ನ ಅವಧಿಯ ಕೊನೆಯಲ್ಲಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ಆಫರ್ ಲೆಟರ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ರಿಟರ್ನ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು
 DocType: DocField,Fold,ಪಟ್ಟು
 DocType: Production Order Operation,Production Order Operation,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಆಪರೇಷನ್
 DocType: Pricing Rule,Disable,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
@@ -3283,7 +3298,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,ಗೆ ವರದಿಗಳು
 DocType: SMS Settings,Enter url parameter for receiver nos,ರಿಸೀವರ್ ಸೂಲ URL ಅನ್ನು ನಿಯತಾಂಕ ಯನ್ನು
 DocType: Sales Invoice,Paid Amount,ಮೊತ್ತವನ್ನು
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',ಖಾತೆ {0} ಕ್ಲೋಸಿಂಗ್ ಮಾದರಿ ' ಹೊಣೆಗಾರಿಕೆ ' ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',ಖಾತೆ {0} ಕ್ಲೋಸಿಂಗ್ ಮಾದರಿ ' ಹೊಣೆಗಾರಿಕೆ ' ಇರಬೇಕು
 ,Available Stock for Packing Items,ಐಟಂಗಳು ಪ್ಯಾಕಿಂಗ್ ಸ್ಟಾಕ್ ಲಭ್ಯವಿದೆ
 DocType: Item Variant,Item Variant,ಐಟಂ ಭಿನ್ನ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇಲ್ಲ ಎಂದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಈ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ ಹೊಂದಿಸುವ
@@ -3291,7 +3306,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
 DocType: Production Planning Tool,Filter based on customer,ಫಿಲ್ಟರ್ ಗ್ರಾಹಕ ಆಧಾರಿತ
 DocType: Payment Tool Detail,Against Voucher No,ಚೀಟಿ ಯಾವುದೇ ವಿರುದ್ಧ
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},ಐಟಂ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},ಐಟಂ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0}
 DocType: Employee External Work History,Employee External Work History,ಬಾಹ್ಯ ಕೆಲಸದ ಇತಿಹಾಸ
 DocType: Tax Rule,Purchase,ಖರೀದಿ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,ಬ್ಯಾಲೆನ್ಸ್ ಪ್ರಮಾಣ
@@ -3328,28 +3343,29 @@ Note: BOM = Bill of Materials","ಮತ್ತೊಂದು ** ಐಟಂ ಆಗ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: Item Variant Attribute,Attribute,ಲಕ್ಷಣ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,ವ್ಯಾಪ್ತಿ / ರಿಂದ ಸೂಚಿಸಿ
-sites/assets/js/desk.min.js +7652,Created By,ದಾಖಲಿಸಿದವರು
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,ದಾಖಲಿಸಿದವರು
 DocType: Serial No,Under AMC,ಎಎಂಸಿ ಅಂಡರ್
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,ಐಟಂ ಮೌಲ್ಯಮಾಪನ ದರ ಬಂದಿಳಿದ ವೆಚ್ಚ ಚೀಟಿ ಪ್ರಮಾಣವನ್ನು ಪರಿಗಣಿಸಿ recalculated ಇದೆ
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,ವ್ಯವಹಾರ ಮಾರಾಟ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
 DocType: BOM Replace Tool,Current BOM,ಪ್ರಸ್ತುತ BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,ಸೀರಿಯಲ್ ನಂ ಸೇರಿಸಿ
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,ಸೀರಿಯಲ್ ನಂ ಸೇರಿಸಿ
 DocType: Production Order,Warehouses,ಗೋದಾಮುಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,ಮುದ್ರಣ ಮತ್ತು ಸ್ಟೇಷನರಿ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ಗುಂಪು ನೋಡ್
 DocType: Payment Reconciliation,Minimum Amount,ಕನಿಷ್ಠ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,ಅಪ್ಡೇಟ್ ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
 DocType: Workstation,per hour,ಗಂಟೆಗೆ
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},ಸರಣಿ {0} ಈಗಾಗಲೇ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},ಸರಣಿ {0} ಈಗಾಗಲೇ ಬಳಸಲಾಗುತ್ತದೆ {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,ಗೋದಾಮಿನ ( ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ) ಖಾತೆ ಈ ಖಾತೆಯ ಅಡಿಯಲ್ಲಿ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಪ್ರವೇಶ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ .
 DocType: Company,Distribution,ಹಂಚುವುದು
-sites/assets/js/erpnext.min.js +50,Amount Paid,ಮೊತ್ತವನ್ನು
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,ಮೊತ್ತವನ್ನು
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,ರವಾನಿಸು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ಮ್ಯಾಕ್ಸ್ ರಿಯಾಯಿತಿ ಐಟಂ ಅವಕಾಶ: {0} {1}% ಆಗಿದೆ
 DocType: Customer,Default Taxes and Charges,ಡೀಫಾಲ್ಟ್ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Account,Receivable,ಲಭ್ಯ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ರೋ # {0}: ಆರ್ಡರ್ ಖರೀದಿಸಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪೂರೈಕೆದಾರ ಬದಲಾಯಿಸಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ಪಾತ್ರ ವ್ಯವಹಾರ ಸೆಟ್ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಮಾಡಲಿಲ್ಲ ಸಲ್ಲಿಸಲು ಅವಕಾಶ ನೀಡಲಿಲ್ಲ .
 DocType: Sales Invoice,Supplier Reference,ಸರಬರಾಜುದಾರ ರೆಫರೆನ್ಸ್
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","ಪರಿಶೀಲಿಸಿದರೆ, ಉಪ ಅಸೆಂಬ್ಲಿ ಐಟಂಗಳನ್ನು BOM ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಪಡೆಯುವ ಪರಿಗಣಿಸಲಾಗುವುದು . ಇಲ್ಲದಿದ್ದರೆ, ಎಲ್ಲಾ ಉಪ ಅಸೆಂಬ್ಲಿ ಐಟಂಗಳನ್ನು ಕಚ್ಚಾವಸ್ತುಗಳನ್ನು ಪರಿಗಣಿಸಲಾಗುವುದು ."
@@ -3386,8 +3402,8 @@ DocType: Email Digest,Add/Remove Recipients,ಸೇರಿಸಿ / ತೆಗೆ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ವಿರುದ್ಧ ನಿಲ್ಲಿಸಿತು {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","ಡೀಫಾಲ್ಟ್ ಎಂದು ಈ ಆರ್ಥಿಕ ವರ್ಷ ಹೊಂದಿಸಲು, ' ಪೂರ್ವನಿಯೋಜಿತವಾಗಿನಿಗದಿಪಡಿಸು ' ಕ್ಲಿಕ್"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),ಬೆಂಬಲ ಇಮೇಲ್ ಐಡಿ ಸೆಟಪ್ ಒಳಬರುವ ಸರ್ವರ್ . ( ಇ ಜಿ support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Salary Slip,Salary Slip,ಸಂಬಳದ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,ಮೆರುಗು ಕೊಡುವುದರ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' ದಿನಾಂಕ ' ಅಗತ್ಯವಿದೆ
@@ -3400,6 +3416,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","ಪರೀಕ್ಷಿಸಿದ್ದು ವ್ಯವಹಾರಗಳ ಯಾವುದೇ ""ಸಲ್ಲಿಸಿದ"" ಮಾಡಲಾಗುತ್ತದೆ , ಇಮೇಲ್ ಪಾಪ್ ಅಪ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಒಂದು ಅಟ್ಯಾಚ್ಮೆಂಟ್ ಆಗಿ ವ್ಯವಹಾರ ಜೊತೆ , ಮಾಡಿದರು ವ್ಯವಹಾರ ಸಂಬಂಧಿಸಿದ "" ಸಂಪರ್ಕಿಸಿ "" ಒಂದು ಇಮೇಲ್ ಕಳುಹಿಸಲು ತೆರೆಯಿತು . ಬಳಕೆದಾರ ಅಥವಾ ಜೂನ್ ಜೂನ್ ಇಮೇಲ್ ಕಳುಹಿಸಲು ."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Employee Education,Employee Education,ನೌಕರರ ಶಿಕ್ಷಣ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
 DocType: Salary Slip,Net Pay,ನಿವ್ವಳ ವೇತನ
 DocType: Account,Account,ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಈಗಾಗಲೇ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
@@ -3432,7 +3449,7 @@ DocType: BOM,Manufacturing User,ಉತ್ಪಾದನಾ ಬಳಕೆದಾರ
 DocType: Purchase Order,Raw Materials Supplied,ವಿತರಿಸುತ್ತಾರೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Purchase Invoice,Recurring Print Format,ಮರುಕಳಿಸುವ ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್
 DocType: Communication,Series,ಸರಣಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Appraisal,Appraisal Template,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು
 DocType: Communication,Email,ಗಾಜುಲೇಪ
 DocType: Item Group,Item Classification,ಐಟಂ ವರ್ಗೀಕರಣ
@@ -3488,6 +3505,7 @@ DocType: HR Settings,Payroll Settings,ವೇತನದಾರರ ಸೆಟ್
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,ಅಲ್ಲದ ಲಿಂಕ್ ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಪಾವತಿಗಳು ಫಲಿತಾಂಶ .
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,ಪ್ಲೇಸ್ ಆರ್ಡರ್
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ರೂಟ್ ಪೋಷಕರು ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ಆಯ್ಕೆ ಬ್ರ್ಯಾಂಡ್ ...
 DocType: Sales Invoice,C-Form Applicable,ಅನ್ವಯಿಸುವ ಸಿ ಆಕಾರ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
 DocType: Supplier,Address and Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
@@ -3498,7 +3516,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,ಅತ್ಯುತ್ತಮ ರಶೀದಿ ಪಡೆಯಲು
 DocType: Warranty Claim,Resolved By,ಪರಿಹರಿಸಲಾಗುವುದು
 DocType: Appraisal,Start Date,ಪ್ರಾರಂಭ ದಿನಾಂಕ
-sites/assets/js/desk.min.js +7629,Value,ಮೌಲ್ಯ
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,ಮೌಲ್ಯ
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,ಕಾಲ ಎಲೆಗಳು ನಿಯೋಜಿಸಿ.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,ಪರಿಶೀಲಿಸಲು ಇಲ್ಲಿ ಕ್ಲಿಕ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,ಖಾತೆ {0}: ನೀವು ಪೋಷಕರ ಖಾತೆಯ ಎಂದು ಸ್ವತಃ ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -3514,14 +3532,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,ಅನುಮತಿಸಲಾಗಿದೆ ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಪ್ರವೇಶ
 DocType: Dropbox Backup,Weekly,ವಾರದ
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ಉದಾ . smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,ಸ್ವೀಕರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,ಸ್ವೀಕರಿಸಿ
 DocType: Maintenance Visit,Fully Completed,ಸಂಪೂರ್ಣವಾಗಿ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ಕಂಪ್ಲೀಟ್
 DocType: Employee,Educational Qualification,ಶೈಕ್ಷಣಿಕ ಅರ್ಹತೆ
 DocType: Workstation,Operating Costs,ವೆಚ್ಚದ
 DocType: Employee Leave Approver,Employee Leave Approver,ನೌಕರರ ಲೀವ್ ಅನುಮೋದಕ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ಯಶಸ್ವಿಯಾಗಿ ನಮ್ಮ ಸುದ್ದಿಪತ್ರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲಾಗಿದೆ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ಎಲೆಕ್ಟ್ರಾನ್ ಕಿರಣವು ಯಂತ್ರ
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ಖರೀದಿ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್
@@ -3534,7 +3552,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc doctype
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಚಾರ್ಟ್
 ,Requested Items To Be Ordered,ಆದೇಶ ಕೋರಲಾಗಿದೆ ಐಟಂಗಳು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,ನನ್ನ ಆರ್ಡರ್ಸ್
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,ನನ್ನ ಆರ್ಡರ್ಸ್
 DocType: Price List,Price List Name,ಬೆಲೆ ಪಟ್ಟಿ ಹೆಸರು
 DocType: Time Log,For Manufacturing,ಉತ್ಪಾದನೆ
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,ಮೊತ್ತವನ್ನು
@@ -3545,7 +3563,7 @@ DocType: Account,Income,ಆದಾಯ
 DocType: Industry Type,Industry Type,ಉದ್ಯಮ ಪ್ರಕಾರ
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,ಏನೋ ತಪ್ಪಾಗಿದೆ!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,ಪೂರ್ಣಗೊಳ್ಳುವ ದಿನಾಂಕ
 DocType: Purchase Invoice Item,Amount (Company Currency),ಪ್ರಮಾಣ ( ಕರೆನ್ಸಿ ಕಂಪನಿ )
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ಡೈ ಆವರಣ
@@ -3559,10 +3577,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,ವರ್ಷ
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ ವಿವರ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS ಸೆಟ್ಟಿಂಗ್ಗಳು ಅಪ್ಡೇಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,ಈಗಾಗಲೇ ಕೊಕ್ಕಿನ ಟೈಮ್ ಲಾಗ್ {0}
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,ಈಗಾಗಲೇ ಕೊಕ್ಕಿನ ಟೈಮ್ ಲಾಗ್ {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,ಅಸುರಕ್ಷಿತ ಸಾಲ
 DocType: Cost Center,Cost Center Name,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಹೆಸರು
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,ಐಟಂ {0} ಸೀರಿಯಲ್ ನಂ {1} ಈಗಾಗಲೇ ಸ್ಥಾಪಿಸಲಾಗಿರುವ
 DocType: Maintenance Schedule Detail,Scheduled Date,ಪರಿಶಿಷ್ಟ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,ಒಟ್ಟು ಪಾವತಿಸಿದ ಆಮ್ಟ್
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 ಪಾತ್ರಗಳು ಹೆಚ್ಚು ಸಂದೇಶಗಳು ಅನೇಕ ಸಂದೇಶಗಳನ್ನು ವಿಭಜಿಸಲಾಗುವುದು
@@ -3570,10 +3587,10 @@ DocType: Purchase Receipt Item,Received and Accepted,ಸ್ವೀಕರಿಸ
 ,Serial No Service Contract Expiry,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೇವೆ ಕಾಂಟ್ರಾಕ್ಟ್ ಅಂತ್ಯ
 DocType: Item,Unit of Measure Conversion,ಅಳತೆ ಮತಾಂತರದ ಘಟಕ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,ನೌಕರರ ಬದಲಾವಣೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Naming Series,Help HTML,HTML ಸಹಾಯ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},ನಿಯೋಜಿಸಲಾಗಿದೆ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು. ಇದು {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}
 DocType: Address,Name of person or organization that this address belongs to.,ವ್ಯಕ್ತಿ ಅಥವಾ ಸಂಸ್ಥೆಯ ಹೆಸರು ಈ ವಿಳಾಸಕ್ಕೆ ಸೇರುತ್ತದೆ .
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
@@ -3584,10 +3601,11 @@ DocType: Lead,Converted,ಪರಿವರ್ತಿತ
 DocType: Item,Has Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಹೊಂದಿದೆ
 DocType: Employee,Date of Issue,ಸಂಚಿಕೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: ಗೆ {0} ಫಾರ್ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
 DocType: Issue,Content Type,ವಿಷಯ ಪ್ರಕಾರ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
 DocType: Item,List this Item in multiple groups on the website.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,ಐಟಂ: {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
 DocType: Payment Reconciliation,Get Unreconciled Entries,ರಾಜಿಯಾಗದ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
@@ -3598,14 +3616,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,ಗೋದಾಮಿನ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},ಖಾತೆ {0} ಹೆಚ್ಚು ಹಣಕಾಸಿನ ವರ್ಷ ಒಂದಕ್ಕಿಂತ ನಮೂದಿಸಲಾದ {1}
 ,Average Commission Rate,ಸರಾಸರಿ ಆಯೋಗದ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ಅಟೆಂಡೆನ್ಸ್ ಭವಿಷ್ಯದ ದಿನಾಂಕ ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Pricing Rule,Pricing Rule Help,ಬೆಲೆ ನಿಯಮ ಸಹಾಯ
 DocType: Purchase Taxes and Charges,Account Head,ಖಾತೆ ಹೆಡ್
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ಐಟಂಗಳ ಬಂದಿಳಿದ ವೆಚ್ಚ ಲೆಕ್ಕ ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,ವಿದ್ಯುತ್ತಿನ
 DocType: Stock Entry,Total Value Difference (Out - In),ಒಟ್ಟು ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ (ಔಟ್ - ರಲ್ಲಿ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ಬಳಕೆದಾರ ID ನೌಕರ ಸೆಟ್ {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
@@ -3619,15 +3637,17 @@ DocType: Buying Settings,Naming Series,ಸರಣಿ ಹೆಸರಿಸುವ
 DocType: Leave Block List,Leave Block List Name,ಖಂಡ ಬಿಡಿ ಹೆಸರು
 DocType: User,Enabled,ಶಕ್ತಗೊಂಡಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ಸ್ಟಾಕ್ ಸ್ವತ್ತುಗಳು
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},ನೀವು ನಿಜವಾಗಿಯೂ {0} {1} ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಸ್ಲಿಪ್ ಎಲ್ಲಾ ಸಲ್ಲಿಸಲು ಬಯಸುತ್ತೀರಾ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},ನೀವು ನಿಜವಾಗಿಯೂ {0} {1} ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಸ್ಲಿಪ್ ಎಲ್ಲಾ ಸಲ್ಲಿಸಲು ಬಯಸುತ್ತೀರಾ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,ಆಮದು ಚಂದಾದಾರರು
 DocType: Target Detail,Target Qty,ಟಾರ್ಗೆಟ್ ಪ್ರಮಾಣ
 DocType: Attendance,Present,ಪ್ರೆಸೆಂಟ್
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸಿದ ಮಾಡಬಾರದು
 DocType: Notification Control,Sales Invoice Message,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಸಂದೇಶ
 DocType: Authorization Rule,Based On,ಆಧರಿಸಿದೆ
-,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
+DocType: Sales Order Item,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},ಗೆ ಅವಧಿಯ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,ಸಂಬಳ ಚೂರುಗಳನ್ನು ರಚಿಸಿ
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ಒಂದು ಮಾನ್ಯ ಇಮೇಲ್ ಐಡಿ ಅಲ್ಲ
@@ -3667,7 +3687,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,ಅಟೆಂಡೆನ್ಸ್ ಅಪ್ಲೋಡ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ಮತ್ತು ಉತ್ಪಾದನೆ ಪ್ರಮಾಣ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ಏಜಿಂಗ್ ರೇಂಜ್ 2
-DocType: Journal Entry Account,Amount,ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,ರಿವರ್ಟಿಂಗ್ನಿಂದ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ
 ,Sales Analytics,ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
@@ -3694,7 +3714,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ನಿರೀಕ್ಷಿತ ದಿನಾಂಕ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Contact Us Settings,City,ನಗರ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ಅಲ್ಟ್ರಾಸಾನಿಕ್ ಯಂತ್ರ
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,ದೋಷ: ಮಾನ್ಯ ಐಡಿ?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,ದೋಷ: ಮಾನ್ಯ ಐಡಿ?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,ಐಟಂ {0} ಸೇಲ್ಸ್ ಐಟಂ ಇರಬೇಕು
 DocType: Naming Series,Update Series Number,ಅಪ್ಡೇಟ್ ಸರಣಿ ಸಂಖ್ಯೆ
 DocType: Account,Equity,ಇಕ್ವಿಟಿ
@@ -3709,7 +3729,7 @@ DocType: Purchase Taxes and Charges,Actual,ವಾಸ್ತವಿಕ
 DocType: Authorization Rule,Customerwise Discount,Customerwise ಡಿಸ್ಕೌಂಟ್
 DocType: Purchase Invoice,Against Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ವಿರುದ್ಧ
 DocType: Production Order,Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Quotation Item,Against Docname,docName ವಿರುದ್ಧ
 DocType: SMS Center,All Employee (Active),ಎಲ್ಲಾ ನೌಕರರ ( ಸಕ್ರಿಯ )
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ಈಗ ವೀಕ್ಷಿಸಿ
@@ -3717,14 +3737,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,ರಾ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ
 DocType: Item,Re-Order Level,ಮರು ಕ್ರಮಾಂಕದ ಮಟ್ಟ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ನೀವು ಉತ್ಪಾದನೆ ಆದೇಶಗಳನ್ನು ಹೆಚ್ಚಿಸಲು ಅಥವಾ ವಿಶ್ಲೇಷಣೆ ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಬಯಸುವ ಐಟಂಗಳನ್ನು ಮತ್ತು ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ.
-sites/assets/js/list.min.js +174,Gantt Chart,ಗಂಟ್ ಚಾರ್ಟ್
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,ಗಂಟ್ ಚಾರ್ಟ್
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,ಅರೆಕಾಲಿಕ
 DocType: Employee,Applicable Holiday List,ಅನ್ವಯಿಸುವ ಹಾಲಿಡೇ ಪಟ್ಟಿ
 DocType: Employee,Cheque,ಚೆಕ್
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ಸರಣಿ Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,ವರದಿ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
 DocType: Item,Serial Number Series,ಕ್ರಮ ಸಂಖ್ಯೆ ಸರಣಿ
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ {0} ಸತತವಾಗಿ {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ {0} ಸತತವಾಗಿ {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,ಚಿಲ್ಲರೆ & ಸಗಟು
 DocType: Issue,First Responded On,ಮೊದಲ ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಐಟಂ ಅಡ್ಡ ಪಟ್ಟಿ
@@ -3739,7 +3759,7 @@ DocType: Attendance,Attendance,ಅಟೆಂಡೆನ್ಸ್
 DocType: Page,No,ಇಲ್ಲ
 DocType: BOM,Materials,ಮೆಟೀರಿಯಲ್
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ಪರೀಕ್ಷಿಸಿದ್ದು ಅಲ್ಲ, ಪಟ್ಟಿ ಇದು ಅನ್ವಯಿಸಬಹುದು ಅಲ್ಲಿ ಪ್ರತಿ ಇಲಾಖೆಗಳು ಸೇರಿಸಲಾಗುತ್ತದೆ ಹೊಂದಿರುತ್ತದೆ ."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮತ್ತು ಪೋಸ್ಟ್ ಸಮಯದಲ್ಲಿ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮತ್ತು ಪೋಸ್ಟ್ ಸಮಯದಲ್ಲಿ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,ವ್ಯವಹಾರ ಖರೀದಿ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ .
 ,Item Prices,ಐಟಂ ಬೆಲೆಗಳು
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,ನೀವು ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
@@ -3759,9 +3779,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ಆಡಳಿತಾತ್ಮಕ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ಕನ್ಸಲ್ಟಿಂಗ್
 DocType: Customer Group,Parent Customer Group,ಪೋಷಕ ಗ್ರಾಹಕ ಗುಂಪಿನ
-sites/assets/js/erpnext.min.js +50,Change,ಬದಲಾವಣೆ
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ಬದಲಾವಣೆ
 DocType: Purchase Invoice,Contact Email,ಇಮೇಲ್ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',{0} ' ಸ್ಟಾಪ್ಡ್ ' ಇದೆ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 DocType: Appraisal Goal,Score Earned,ಸ್ಕೋರ್ ಗಳಿಸಿದರು
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","ಇ ಜಿ "" ನನ್ನ ಕಂಪನಿ ಎಲ್ಎಲ್ """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
@@ -3771,12 +3790,13 @@ DocType: Packing Slip,Gross Weight UOM,ಒಟ್ಟಾರೆ ತೂಕದ UOM
 DocType: Email Digest,Receivables / Payables,ಕರಾರು / ಸಂದಾಯಗಳು
 DocType: Delivery Note Item,Against Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stamping
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
 DocType: Landed Cost Item,Landed Cost Item,ಇಳಿಯಿತು ವೆಚ್ಚ ಐಟಂ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,ಶೂನ್ಯ ಮೌಲ್ಯಗಳು ತೋರಿಸಿ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ಕಚ್ಚಾ ವಸ್ತುಗಳ givenName ಪ್ರಮಾಣದಲ್ಲಿ repacking / ತಯಾರಿಕಾ ನಂತರ ಪಡೆದುಕೊಂಡು ಐಟಂ ಪ್ರಮಾಣ
 DocType: Payment Reconciliation,Receivable / Payable Account,ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 DocType: Delivery Note Item,Against Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ವಿರುದ್ಧ
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
 DocType: Item,Default Warehouse,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್
 DocType: Task,Actual End Date (via Time Logs),ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},ಬಜೆಟ್ ಗ್ರೂಪ್ ಖಾತೆ ವಿರುದ್ಧ ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ {0}
@@ -3790,7 +3810,7 @@ DocType: Issue,Support Team,ಬೆಂಬಲ ತಂಡ
 DocType: Appraisal,Total Score (Out of 5),ಒಟ್ಟು ಸ್ಕೋರ್ ( 5)
 DocType: Contact Us Settings,State,ರಾಜ್ಯ
 DocType: Batch,Batch,ಗುಂಪು
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,ಬ್ಯಾಲೆನ್ಸ್
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,ಬ್ಯಾಲೆನ್ಸ್
 DocType: Project,Total Expense Claim (via Expense Claims),ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು (ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ)
 DocType: User,Gender,ಲಿಂಗ
 DocType: Journal Entry,Debit Note,ಡೆಬಿಟ್ ಚೀಟಿಯನ್ನು
@@ -3806,9 +3826,8 @@ DocType: Lead,Blog Subscriber,ಬ್ಲಾಗ್ ಚಂದಾದಾರರ
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,ಮೌಲ್ಯಗಳ ಆಧಾರದ ವ್ಯವಹಾರ ನಿರ್ಬಂಧಿಸಲು ನಿಯಮಗಳನ್ನು ರಚಿಸಿ .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ಪರಿಶೀಲಿಸಿದರೆ, ಕೆಲಸ ದಿನಗಳ ಒಟ್ಟು ಯಾವುದೇ ರಜಾದಿನಗಳು ಸೇರಿವೆ , ಮತ್ತು ಈ ಸಂಬಳ ದಿನಕ್ಕೆ ಮೌಲ್ಯವನ್ನು ಕಡಿಮೆಗೊಳಿಸುತ್ತದೆ"
 DocType: Purchase Invoice,Total Advance,ಒಟ್ಟು ಅಡ್ವಾನ್ಸ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Workflow State,User,ಬಳಕೆದಾರ
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,ಸಂಸ್ಕರಣ ವೇತನದಾರರ
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,ಸಂಸ್ಕರಣ ವೇತನದಾರರ
 DocType: Opportunity Item,Basic Rate,ಮೂಲ ದರದ
 DocType: GL Entry,Credit Amount,ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,ಲಾಸ್ಟ್ ಹೊಂದಿಸಿ
@@ -3816,7 +3835,7 @@ DocType: Customer,Credit Days Based On,ಕ್ರೆಡಿಟ್ ಡೇಸ್
 DocType: Tax Rule,Tax Rule,ತೆರಿಗೆ ನಿಯಮ
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,ಮಾರಾಟ ಸೈಕಲ್ ಉದ್ದಕ್ಕೂ ಅದೇ ದರ ಕಾಯ್ದುಕೊಳ್ಳಲು
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ವರ್ಕ್ಸ್ಟೇಷನ್ ಕೆಲಸ ಅವಧಿಗಳನ್ನು ಹೊರತುಪಡಿಸಿ ಸಮಯ ದಾಖಲೆಗಳು ಯೋಜನೆ.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 ,Items To Be Requested,ಮನವಿ ಐಟಂಗಳನ್ನು
 DocType: Purchase Order,Get Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ ಸಿಗುತ್ತದೆ
 DocType: Time Log,Billing Rate based on Activity Type (per hour),ಚಟುವಟಿಕೆ ಆಧರಿತವಾಗಿ ಬಿಲ್ಲಿಂಗ್ ದರ (ಪ್ರತಿ ಗಂಟೆಗೆ)
@@ -3825,6 +3844,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ಕಂಪನಿ ಇಮೇಲ್ ಐಡಿ ಪತ್ತೆಯಾಗಿಲ್ಲ , ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಮೇಲ್"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ನಿಧಿಗಳು ಅಪ್ಲಿಕೇಶನ್ ( ಆಸ್ತಿಗಳು )
 DocType: Production Planning Tool,Filter based on item,ಐಟಂ ಆಧರಿಸಿ ಫಿಲ್ಟರ್
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
 DocType: Fiscal Year,Year Start Date,ವರ್ಷದ ಆರಂಭ ದಿನಾಂಕ
 DocType: Attendance,Employee Name,ನೌಕರರ ಹೆಸರು
 DocType: Sales Invoice,Rounded Total (Company Currency),ದುಂಡಾದ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
@@ -3836,14 +3856,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,ಖಾಲಿಮಾಡುವ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 DocType: Sales Invoice,Is POS,ಪಿಓಎಸ್ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
 DocType: Production Order,Manufactured Qty,ತಯಾರಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ಗ್ರಾಹಕರು ಬೆಳೆದ ಬಿಲ್ಲುಗಳನ್ನು .
 DocType: DocField,Default,ಡೀಫಾಲ್ಟ್
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ಪ್ರಾಜೆಕ್ಟ್ ಐಡಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} ಗ್ರಾಹಕರನ್ನು ಸೇರ್ಪಡೆ
 DocType: Maintenance Schedule,Schedule,ಕಾರ್ಯಕ್ರಮ
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","ಈ ವೆಚ್ಚ ಕೇಂದ್ರ ಬಜೆಟ್ ವಿವರಿಸಿ. ವೆಚ್ಚದ ಸೆಟ್, ನೋಡಿ "ಕಂಪನಿ ಪಟ್ಟಿ""
@@ -3851,7 +3871,7 @@ DocType: Account,Parent Account,ಪೋಷಕರ ಖಾತೆಯ
 DocType: Quality Inspection Reading,Reading 3,3 ಓದುವಿಕೆ
 ,Hub,ಹಬ್
 DocType: GL Entry,Voucher Type,ಚೀಟಿ ಪ್ರಕಾರ
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Expense Claim,Approved,Approved
 DocType: Pricing Rule,Price,ಬೆಲೆ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
@@ -3860,23 +3880,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,ಶಿಕ್ಷಣ
 DocType: Selling Settings,Campaign Naming By,ಅಭಿಯಾನ ಹೆಸರಿಸುವ
 DocType: Employee,Current Address Is,ಪ್ರಸ್ತುತ ವಿಳಾಸ ಈಸ್
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","ಐಚ್ಛಿಕ. ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಅಲ್ಲ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಹೊಂದಿಸುತ್ತದೆ."
 DocType: Address,Office,ಕಚೇರಿ
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವರದಿಗಳು
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,ಲೆಕ್ಕಪರಿಶೋಧಕ ಜರ್ನಲ್ ನಮೂದುಗಳು .
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ಸಾಲು {0}: ಪಕ್ಷದ / ಖಾತೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {1} / {2} ನಲ್ಲಿ {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ಸಾಲು {0}: ಪಕ್ಷದ / ಖಾತೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {1} / {2} ನಲ್ಲಿ {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,ಒಂದು ತೆರಿಗೆ ಖಾತೆಯನ್ನು ರಚಿಸಲು
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Account,Stock,ಸ್ಟಾಕ್
 DocType: Employee,Current Address,ಪ್ರಸ್ತುತ ವಿಳಾಸ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ನಿಗದಿಸಬಹುದು ಹೊರತು ಐಟಂ ನಂತರ ವಿವರಣೆ, ಇಮೇಜ್, ಬೆಲೆ, ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟ್ ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಇತ್ಯಾದಿ ಮತ್ತೊಂದು ಐಟಂ ಒಂದು ಭೇದ ವೇಳೆ"
 DocType: Serial No,Purchase / Manufacture Details,ಖರೀದಿ / ತಯಾರಿಕೆ ವಿವರಗಳು
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,ಬ್ಯಾಚ್ ಇನ್ವೆಂಟರಿ
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,ಬ್ಯಾಚ್ ಇನ್ವೆಂಟರಿ
 DocType: Employee,Contract End Date,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ
 DocType: Sales Order,Track this Sales Order against any Project,ಯಾವುದೇ ಪ್ರಾಜೆಕ್ಟ್ ವಿರುದ್ಧ ಈ ಮಾರಾಟದ ಆರ್ಡರ್ ಟ್ರ್ಯಾಕ್
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ಮೇಲೆ ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ ( ತಲುಪಿಸಲು ಬಾಕಿ ) ಮಾರಾಟ ಆದೇಶಗಳನ್ನು ಪುಲ್
 DocType: DocShare,Document Type,ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಗೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಗೆ
 DocType: Deduction Type,Deduction Type,ಕಡಿತವು ಕೌಟುಂಬಿಕತೆ
 DocType: Attendance,Half Day,ಅರ್ಧ ದಿನ
 DocType: Pricing Rule,Min Qty,ಮಿನ್ ಪ್ರಮಾಣ
@@ -3887,20 +3909,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,ಪ್ರಮಾಣ (ಪ್ರಮಾಣ ತಯಾರಿಸಲ್ಪಟ್ಟ) ಕಡ್ಡಾಯ
 DocType: Stock Entry,Default Target Warehouse,ಡೀಫಾಲ್ಟ್ ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
 DocType: Purchase Invoice,Net Total (Company Currency),ನೆಟ್ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಮಾತ್ರ ಅನ್ವಯವಾಗುತ್ತದೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಮಾತ್ರ ಅನ್ವಯವಾಗುತ್ತದೆ
 DocType: Notification Control,Purchase Receipt Message,ಖರೀದಿ ರಸೀತಿ ಸಂದೇಶ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,ಒಟ್ಟು ಹಂಚಿಕೆ ಎಲೆಗಳು ಅವಧಿಯಲ್ಲಿ ಹೆಚ್ಚು
 DocType: Production Order,Actual Start Date,ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ
 DocType: Sales Order,% of materials delivered against this Sales Order,ಈ ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ವಿತರಿಸಲಾಯಿತು ವಸ್ತುಗಳ %
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,ರೆಕಾರ್ಡ್ ಐಟಂ ಚಳುವಳಿ .
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,ರೆಕಾರ್ಡ್ ಐಟಂ ಚಳುವಳಿ .
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,ಸುದ್ದಿಪತ್ರ ಪಟ್ಟಿ ಚಂದಾದಾರ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,ಸೇವೆ
 DocType: Hub Settings,Hub Settings,ಹಬ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Project,Gross Margin %,ಒಟ್ಟು ಅಂಚು %
 DocType: BOM,With Operations,ಕಾರ್ಯಾಚರಣೆ
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಈಗಾಗಲೇ ಕರೆನ್ಸಿ ಮಾಡಲಾಗಿದೆ {0} ಕಂಪನಿಗೆ {1}. ಕರೆನ್ಸಿಯ ಜತೆ ಸ್ವೀಕೃತಿ ಅಥವಾ ಕೊಡಬೇಕಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಈಗಾಗಲೇ ಕರೆನ್ಸಿ ಮಾಡಲಾಗಿದೆ {0} ಕಂಪನಿಗೆ {1}. ಕರೆನ್ಸಿಯ ಜತೆ ಸ್ವೀಕೃತಿ ಅಥವಾ ಕೊಡಬೇಕಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}.
 ,Monthly Salary Register,ಮಾಸಿಕ ವೇತನ ನೋಂದಣಿ
-apps/frappe/frappe/website/template.py +123,Next,ಮುಂದೆ
+apps/frappe/frappe/website/template.py +140,Next,ಮುಂದೆ
 DocType: Warranty Claim,If different than customer address,ಗ್ರಾಹಕ ವಿಳಾಸಕ್ಕೆ ವಿಭಿನ್ನವಾದ
 DocType: BOM Operation,BOM Operation,BOM ಕಾರ್ಯಾಚರಣೆ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,ವಿದ್ಯುದ್ಮೆರಗು
@@ -3931,6 +3954,7 @@ DocType: Purchase Invoice,Next Date,NextDate
 DocType: Employee Education,Major/Optional Subjects,ಮೇಜರ್ / ಐಚ್ಛಿಕ ವಿಷಯಗಳ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,ಯಂತ್ರಗಳ
+DocType: Sales Invoice Item,Drop Ship,ಡ್ರಾಪ್ ಹಡಗು
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ಇಲ್ಲಿ ನೀವು ಮೂಲ , ಹೆಂಡತಿ ಮತ್ತು ಮಕ್ಕಳ ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗ ಕುಟುಂಬ ವಿವರಗಳು ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
 DocType: Hub Settings,Seller Name,ಮಾರಾಟಗಾರ ಹೆಸರು
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
@@ -3957,29 +3981,29 @@ DocType: Purchase Order,To Receive and Bill,ಸ್ವೀಕರಿಸಿ ಮ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,ಡಿಸೈನರ್
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ಟೆಂಪ್ಲೇಟು
 DocType: Serial No,Delivery Details,ಡೆಲಿವರಿ ವಿವರಗಳು
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,ಪ್ರಮಾಣ ಈ ಮಟ್ಟಕ್ಕಿಂತಲೂ ಕಳಗೆ ಬಿದ್ದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಚಿಸಲು
 ,Item-wise Purchase Register,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ನೋಂದಣಿ
 DocType: Batch,Expiry Date,ಅಂತ್ಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ ಹೊಂದಿಸಲು, ಐಟಂ ಖರೀದಿ ಐಟಂ ಅಥವಾ ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಐಟಂ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ ಹೊಂದಿಸಲು, ಐಟಂ ಖರೀದಿ ಐಟಂ ಅಥವಾ ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಐಟಂ ಇರಬೇಕು"
 ,Supplier Addresses and Contacts,ಸರಬರಾಜುದಾರ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,ಮೊದಲ ವರ್ಗ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/projects.py +18,Project master.,ಪ್ರಾಜೆಕ್ಟ್ ಮಾಸ್ಟರ್ .
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ಮುಂದಿನ ಕರೆನ್ಸಿಗಳ $ ಇತ್ಯಾದಿ ಯಾವುದೇ ಸಂಕೇತ ತೋರಿಸುವುದಿಲ್ಲ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(ಅರ್ಧ ದಿನ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ಟೈಮ್ ಡೇಸ್ ಲೀಡ್
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,ಸಾಮಗ್ರಿಗಳ ಬಿಲ್ಲು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {1}
 DocType: Dropbox Backup,Send Notifications To,ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಿ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,ಉಲ್ಲೇಖ ದಿನಾಂಕ
 DocType: Employee,Reason for Leaving,ಲೀವಿಂಗ್ ಕಾರಣ
 DocType: Expense Claim Detail,Sanctioned Amount,ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
 DocType: GL Entry,Is Opening,ಆರಂಭ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},ಸಾಲು {0}: ಡೆಬಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},ಸಾಲು {0}: ಡೆಬಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Account,Cash,ನಗದು
 DocType: Employee,Short biography for website and other publications.,ವೆಬ್ಸೈಟ್ ಮತ್ತು ಇತರ ಪ್ರಕಟಣೆಗಳು ಕಿರು ಜೀವನಚರಿತ್ರೆ.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},ನೌಕರ ಸಂಬಳ ರಚನೆ ರಚಿಸಲು ದಯವಿಟ್ಟು {0}
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index fe067266fb..9d33caa46e 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,급여 모드
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","당신은 계절에 따라 추적 할 경우, 월별 분포를 선택합니다."
 DocType: Employee,Divorced,이혼
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,경고 : 동일한 항목을 복수 회 입력되었습니다.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,경고 : 동일한 항목을 복수 회 입력되었습니다.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,항목은 이미 동기화
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,항목은 트랜잭션에 여러 번 추가 할 수
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,재 방문 {0}이 보증 청구를 취소하기 전에 취소
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,다짐 플러스 소결
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},환율은 가격 목록에 필요한 {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* 트랜잭션에서 계산됩니다.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,자료 요청에서
+DocType: Purchase Order,Customer Contact,고객 연락처
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,자료 요청에서
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 트리
 DocType: Job Applicant,Job Applicant,구직자
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,더 이상 결과가 없습니다.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,고객 이름
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","통화, 전환율, 수출 총 수출 총계 등과 같은 모든 수출 관련 분야가 배달 참고, POS, 견적, 판매 송장, 판매 주문 등을 사용할 수 있습니다"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,머리 (또는 그룹)에있는 회계 항목은 만들어와 균형이 유지된다.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),뛰어난 {0}보다 작을 수 없습니다에 대한 ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),뛰어난 {0}보다 작을 수 없습니다에 대한 ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 분을 기본
 DocType: Leave Type,Leave Type Name,유형 이름을 남겨주세요
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,시리즈가 업데이트
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,여러 품목의 가격.
 DocType: SMS Center,All Supplier Contact,모든 공급 업체에게 연락 해주기
 DocType: Quality Inspection Reading,Parameter,매개변수
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,예상 종료 날짜는 예상 시작 날짜보다 작을 수 없습니다
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,정말 생산하기 위해 멈추지 않고 하시겠습니까?
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,행 번호 {0} : 속도가 동일해야합니다 {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,새로운 허가 신청
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,새로운 허가 신청
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,은행 어음
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1고객 현명한 항목 코드를 유지하고 자신의 코드 사용이 옵션에 따라이를 검색 할 수 있도록
 DocType: Mode of Payment Account,Mode of Payment Account,지불 계정의 모드
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,쇼 변형
 DocType: Sales Invoice Item,Quantity,수량
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),대출 (부채)
 DocType: Employee Education,Year of Passing,전달의 해
-sites/assets/js/erpnext.min.js +27,In Stock,재고 있음
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,만 미 청구 판매 주문에 대한 결제를 할 수
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,재고 있음
 DocType: Designation,Designation,Designation
 DocType: Production Plan Item,Production Plan Item,생산 계획 항목
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},사용자 {0}이 (가) 이미 직원에 할당 된 {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,새로운 POS의 프로필을
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,건강 관리
 DocType: Purchase Invoice,Monthly,월
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,송장
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),지급 지연 (일)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,송장
 DocType: Maintenance Schedule Item,Periodicity,주기성
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,이메일 주소
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,방어
 DocType: Company,Abbr,약어
 DocType: Appraisal Goal,Score (0-5),점수 (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},행 {0} : {1} {2}과 일치하지 않는 {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},행 {0} : {1} {2}과 일치하지 않는 {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,행 번호 {0} :
 DocType: Delivery Note,Vehicle No,차량 없음
-sites/assets/js/erpnext.min.js +55,Please select Price List,가격리스트를 선택하세요
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,가격리스트를 선택하세요
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,목공
 DocType: Production Order Operation,Work In Progress,진행중인 작업
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D 프린팅
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,부모 상세 docName 같은
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,KG
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,작업에 대한 열기.
 DocType: Item Attribute,Increment,증가
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,창고를 선택합니다 ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,광고
 DocType: Employee,Married,결혼 한
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
 DocType: Payment Reconciliation,Reconcile,조정
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,식료품 점
 DocType: Quality Inspection Reading,Reading 1,읽기 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,은행 입장 확인
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,은행 입장 확인
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,연금 펀드
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,계정 유형이 창고인 경우 창고는 필수입니다
 DocType: SMS Center,All Sales Person,모든 판매 사람
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,비용 센터를 오프 쓰기
 DocType: Warehouse,Warehouse Detail,창고 세부 정보
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},신용 한도는 고객에 대한 교차 된 {0} {1} / {2}
 DocType: Tax Rule,Tax Type,세금의 종류
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},당신은 전에 항목을 추가하거나 업데이트 할 수있는 권한이 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},당신은 전에 항목을 추가하거나 업데이트 할 수있는 권한이 없습니다 {0}
 DocType: Item,Item Image (if not slideshow),상품의 이미지 (그렇지 않으면 슬라이드 쇼)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,고객은 같은 이름을 가진
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(시간 속도 / 60) * 실제 작업 시간
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,손님
 DocType: Quality Inspection,Get Specification Details,사양 세부 사항을 얻을
 DocType: Lead,Interested,관심
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,자재 명세서 (BOM)
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,열기
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,열기
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},에서 {0}에 {1}
 DocType: Item,Copy From Item Group,상품 그룹에서 복사
 DocType: Journal Entry,Opening Entry,항목 열기
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,제품 문의
 DocType: Standard Reply,Owner,소유권자
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,첫 번째 회사를 입력하십시오
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,처음 회사를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,처음 회사를 선택하세요
 DocType: Employee Education,Under Graduate,대학원에서
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,대상에
 DocType: BOM,Total Cost,총 비용
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,접두사
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,소모품
 DocType: Upload Attendance,Import Log,가져 오기 로그
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,보내기
+DocType: Sales Invoice Item,Delivered By Supplier,공급 업체에 의해 전달
 DocType: SMS Center,All Contact,모든 연락처
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,연봉
 DocType: Period Closing Voucher,Closing Fiscal Year,회계 연도 결산
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,콘트라 항목
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,시간 표시 로그
 DocType: Journal Entry Account,Credit in Company Currency,회사 통화 신용
 DocType: Delivery Note,Installation Status,설치 상태
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},수락 + 거부 수량이 항목에 대한 수신 수량이 동일해야합니다 {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},수락 + 거부 수량이 항목에 대한 수신 수량이 동일해야합니다 {0}
 DocType: Item,Supply Raw Materials for Purchase,공급 원료 구매
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,{0} 항목을 구매 상품이어야합니다
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", 템플릿을 다운로드 적절한 데이터를 입력하고 수정 된 파일을 첨부합니다.
  선택한 기간의 모든 날짜와 직원 조합은 기존의 출석 기록과 함께, 템플릿에 올 것이다"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,{0} 항목을 활성화하지 않거나 수명이 도달했습니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,{0} 항목을 활성화하지 않거나 수명이 도달했습니다
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,견적서를 제출 한 후 업데이트됩니다.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,HR 모듈에 대한 설정
 DocType: SMS Center,SMS Center,SMS 센터
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,스트레이트
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,메시지의 URL 매개 
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,가격 및 할인을 적용하기위한 규칙.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},이번에는 로그인 충돌 {0}에 대한 {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,가격리스트는 구매 또는 판매에 적용해야합니다
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},설치 날짜는 항목에 대한 배달 날짜 이전 할 수 없습니다 {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},설치 날짜는 항목에 대한 배달 날짜 이전 할 수 없습니다 {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),가격 목록 요금에 할인 (%)
-sites/assets/js/form.min.js +279,Start,시작
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,시작
 DocType: User,First Name,이름
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,귀하의 설정이 완료되었습니다.새로 고침.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,풀 몰드 주조
 DocType: Offer Letter,Select Terms and Conditions,이용 약관 선택
 DocType: Production Planning Tool,Sales Orders,판매 주문
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,견적서 항목에 대하여
 ,Production Orders in Progress,진행 중 생산 주문
 DocType: Lead,Address & Contact,주소 및 연락처
+DocType: Leave Allocation,Add unused leaves from previous allocations,이전 할당에서 사용하지 않는 잎 추가
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},다음 반복 {0} 생성됩니다 {1}
 DocType: Newsletter List,Total Subscribers,총 구독자
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,담당자 이름
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO 보류 수량
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,위에서 언급 한 기준에 대한 급여 명세서를 작성합니다.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,구입 요청합니다.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,두 주택
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,날짜를 완화하는 것은 가입 날짜보다 커야합니다
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,연간 잎
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} 설정> 설정을 통해> 명명 시리즈에 대한 시리즈를 명명 설정을하세요
 DocType: Time Log,Will be updated when batched.,일괄 처리 할 때 업데이트됩니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,행 {0} : 확인하시기 바랍니다이 계정에 대한 '사전인가'{1}이 사전 항목 인 경우.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,행 {0} : 확인하시기 바랍니다이 계정에 대한 '사전인가'{1}이 사전 항목 인 경우.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},웨어 하우스는 {0}에 속하지 않는 회사 {1}
 DocType: Bulk Email,Message,메시지
 DocType: Item Website Specification,Item Website Specification,항목 웹 사이트 사양
 DocType: Dropbox Backup,Dropbox Access Key,보관 용 액세스 키
 DocType: Payment Tool,Reference No,참조 번호
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,남겨 차단
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
 DocType: Stock Entry,Sales Invoice No,판매 송장 번호
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,최소 주문 수량
 DocType: Pricing Rule,Supplier Type,공급 업체 유형
 DocType: Item,Publish in Hub,허브에 게시
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,{0} 항목 취소
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,자료 요청
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
 DocType: Item,Purchase Details,구매 상세 정보
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},구매 주문에 '원료 공급'테이블에없는 항목 {0} {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,알림 제어
 DocType: Lead,Suggestions,제안
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,이 지역에 상품 그룹 현명한 예산을 설정합니다.또한 배포를 설정하여 계절성을 포함 할 수 있습니다.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},웨어 하우스의 부모 계정 그룹을 입력하세요 {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},에 대한 지불은 {0} {1} 뛰어난 금액보다 클 수 없습니다 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},에 대한 지불은 {0} {1} 뛰어난 금액보다 클 수 없습니다 {2}
 DocType: Supplier,Address HTML,주소 HTML
 DocType: Lead,Mobile No.,모바일 번호
 DocType: Maintenance Schedule,Generate Schedule,일정을 생성
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,새로운 재고 UOM
 DocType: Period Closing Voucher,Closing Account Head,마감 계정 헤드
 DocType: Employee,External Work History,외부 작업의 역사
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,순환 참조 오류
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,당신이 정말로 중지하고 싶지 않음
 DocType: Communication,Closed,닫힘
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,당신은 배달 주를 저장 한 단어에서 (수출) 표시됩니다.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,당신은 당신이 중지 하시겠습니까
 DocType: Lead,Industry,산업
 DocType: Employee,Job Profile,작업 프로필
 DocType: Newsletter,Newsletter,뉴스레터
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,상품 수령증
 DocType: Dropbox Backup,Allow Dropbox Access,보관 용 접근이 허용
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,세금 설정
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,이번 주 보류중인 활동에 대한 요약
 DocType: Workstation,Rent Cost,임대 비용
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,월 및 연도를 선택하세요
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,고객 통화는 고객의 기본 통화로 변환하는 속도에
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, 배달 참고, 구매 송장, 생산 주문, 구매 주문, 구입 영수증, 견적서, 판매 주문, 재고 항목, 작업 표에서 사용 가능"
 DocType: Item Tax,Tax Rate,세율
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,항목 선택
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","항목 : {0} 배치 식, 대신 사용 재고 항목 \
  재고 조정을 사용하여 조정되지 않는 경우가 있습니다 관리"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},행 번호 {0} : 일괄 없음은 동일해야합니다 {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,비 그룹으로 변환
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,구매 영수증을 제출해야합니다
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,현재 재고 UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,항목의 일괄처리 (lot).
 DocType: C-Form Invoice Detail,Invoice Date,송장의 날짜
 DocType: GL Entry,Debit Amount,직불 금액
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,귀하의 이메일 주소
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,첨부 파일을 참조하시기 바랍니다
 DocType: Purchase Order,% Received,% 수신
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,지침
 DocType: Quality Inspection,Inspected By,검사
 DocType: Maintenance Visit,Maintenance Type,유지 보수 유형
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},일련 번호 {0} 배달 주에 속하지 않는 {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},일련 번호 {0} 배달 주에 속하지 않는 {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,상품 품질 검사 매개 변수
 DocType: Leave Application,Leave Approver Name,승인자 이름을 남겨주세요
 ,Schedule Date,일정 날짜
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,회원에게 구매
 DocType: Landed Cost Item,Applicable Charges,적용 요금
 DocType: Workstation,Consumable Cost,소모품 비용
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
 DocType: Purchase Receipt,Vehicle Date,차량 날짜
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,의료
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,잃는 이유
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% 설치
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,첫 번째 회사 이름을 입력하십시오
 DocType: BOM,Item Desription,항목 DESRIPTION
 DocType: Purchase Invoice,Supplier Name,공급 업체 이름
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext 설명서를 읽어
 DocType: Account,Is Group,IS 그룹
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,자동으로 FIFO를 기반으로 제 직렬 설정
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,체크 공급 업체 송장 번호 특이 사항
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,판매 마스터
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,모든 제조 공정에 대한 글로벌 설정.
 DocType: Accounts Settings,Accounts Frozen Upto,까지에게 동결계정
 DocType: SMS Log,Sent On,에 전송
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
 DocType: Sales Order,Not Applicable,적용 할 수 없음
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,휴일 마스터.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,쉘 성형
 DocType: Material Request Item,Required Date,필요한 날짜
 DocType: Delivery Note,Billing Address,청구 주소
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
 DocType: BOM,Costing,원가 계산
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",선택하면 이미 인쇄 속도 / 인쇄 금액에 포함되어있는 세액은 간주됩니다
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,총 수량
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),(분에) 작
 DocType: Customer,Buyer of Goods and Services.,제품 및 서비스의 구매자.
 DocType: Journal Entry,Accounts Payable,미지급금
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,가입자 추가
-sites/assets/js/erpnext.min.js +5,""" does not exists","""존재하지 않습니다"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""존재하지 않습니다"
 DocType: Pricing Rule,Valid Upto,유효한 개까지
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,고객의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,직접 수입
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","계정별로 분류하면, 계정을 기준으로 필터링 할 수 없습니다"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,관리 책임자
 DocType: Payment Tool,Received Or Paid,수신 또는 유료
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,회사를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,회사를 선택하세요
 DocType: Stock Entry,Difference Account,차이 계정
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,종속 작업 {0}이 닫혀 있지 가까운 작업을 할 수 없습니다.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
 DocType: Production Order,Additional Operating Cost,추가 운영 비용
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,화장품
 DocType: DocField,Type,종류
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
 DocType: Communication,Subject,주제
 DocType: Shipping Rule,Net Weight,순중량
 DocType: Employee,Emergency Phone,긴급 전화
 ,Serial No Warranty Expiry,일련 번호 보증 만료
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,당신은 정말이 자료 요청을 중지 하시겠습니까?
 DocType: Sales Order,To Deliver,전달하기
 DocType: Purchase Invoice Item,Item,항목
 DocType: Journal Entry,Difference (Dr - Cr),차이 (박사 - 크롬)
 DocType: Account,Profit and Loss,이익과 손실
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,관리 하도급
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,관리 하도급
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,새 UOM 형 정수 가져야 할 필요는 없다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,가구 및 비품
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,가격 목록 통화는 회사의 기본 통화로 변환하는 속도에
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,세금과 요금 추가/
 DocType: Purchase Invoice,Supplier Invoice No,공급 업체 송장 번호
 DocType: Territory,For reference,참고로
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","삭제할 수 없습니다 시리얼 번호 {0}, 그것은 증권 거래에 사용되는로"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),결산 (CR)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),결산 (CR)
 DocType: Serial No,Warranty Period (Days),보증 기간 (일)
 DocType: Installation Note Item,Installation Note Item,설치 노트 항목
 ,Pending Qty,보류 수량
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,결제 및 배송 상태
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,반복 고객
 DocType: Leave Control Panel,Allocate,할당
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,이전
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,판매로 돌아 가기
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,판매로 돌아 가기
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,당신이 생산 오더를 생성하려는 선택 판매 주문.
+DocType: Item,Delivered by Supplier (Drop Ship),공급 업체에 의해 전달 (드롭 선박)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,급여항목
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,잠재 고객의 데이터베이스.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,고객 데이터베이스입니다.
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,텀블링
 DocType: Purchase Order Item,Billed Amt,청구 AMT 사의
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,재고 항목이 만들어지는에 대해 논리적 창고.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},참조 번호 및 참고 날짜가 필요합니다 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},참조 번호 및 참고 날짜가 필요합니다 {0}
 DocType: Event,Wednesday,수요일
 DocType: Sales Invoice,Customer's Vendor,고객의 공급 업체
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,생산 오더는 필수입니다
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,수신기 매개 변수
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'을 바탕으로'와 '그룹으로는'동일 할 수 없습니다
 DocType: Sales Person,Sales Person Targets,영업 사원 대상
-sites/assets/js/form.min.js +271,To,에
-apps/frappe/frappe/templates/base.html +143,Please enter email address,이메일 주소를 입력하세요
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,에
+apps/frappe/frappe/templates/base.html +145,Please enter email address,이메일 주소를 입력하세요
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,형성 엔드 튜브
 DocType: Production Order Operation,In minutes,분에서
 DocType: Issue,Resolution Date,결의일
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,프로젝트 사용자
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,소비
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0} {1} 송장 정보 테이블에서 찾을 수 없습니다
 DocType: Company,Round Off Cost Center,비용 센터를 반올림
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,유지 보수 방문은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,유지 보수 방문은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 DocType: Material Request,Material Transfer,재료 이송
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),오프닝 (박사)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},게시 타임 스탬프 이후 여야 {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,설정
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,착륙 비용 세금 및 요금
 DocType: Production Order Operation,Actual Start Time,실제 시작 시간
 DocType: BOM Operation,Operation Time,운영 시간
-sites/assets/js/list.min.js +5,More,더
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,더
 DocType: Pricing Rule,Sales Manager,영업 관리자
-sites/assets/js/desk.min.js +7673,Rename,이름
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,이름
 DocType: Journal Entry,Write Off Amount,금액을 상각
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,굽​​힘
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,사용자에게 허용
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,스트레이트 전단
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,자신의 시리얼 NOS에 따라 판매 및 구매 문서의 항목을 추적 할 수 있습니다.또한이 제품의 보증 내용을 추적하는 데 사용 할 수 있습니다.
 DocType: Purchase Receipt Item Supplied,Current Stock,현재 재고
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,거부 창고 regected 항목에 대해 필수입니다
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,거부 창고 regected 항목에 대해 필수입니다
 DocType: Account,Expenses Included In Valuation,비용은 평가에 포함
 DocType: Employee,Provide email id registered in company,이메일 ID는 회사에 등록 제공
 DocType: Hub Settings,Seller City,판매자 도시
 DocType: Email Digest,Next email will be sent on:,다음 이메일에 전송됩니다 :
 DocType: Offer Letter Term,Offer Letter Term,편지 기간을 제공
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,항목 변종이있다.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} 항목을 찾을 수 없습니다
 DocType: Bin,Stock Value,재고 가치
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,나무의 종류
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,반갑습니다
 DocType: Journal Entry,Credit Card Entry,신용 카드 입력
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,태스크 주제
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,제품은 공급 업체에서 받았다.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,제품은 공급 업체에서 받았다.
 DocType: Communication,Open,열기
 DocType: Lead,Campaign Name,캠페인 이름
 ,Reserved,예약
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,당신이 정말로 멈추지 않고하고 싶지 않음
 DocType: Purchase Order,Supply Raw Materials,공급 원료
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,다음 송장이 생성됩니다되는 날짜입니다. 그것은 제출에 생성됩니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,유동 자산
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,고객의 구매 주문 번호
 DocType: Employee,Cell Number,핸드폰 번호
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,상실
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '저널 항목에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '저널 항목에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,에너지
 DocType: Opportunity,Opportunity From,기회에서
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,월급의 문.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,부채
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,제재 금액 행에 청구 금액보다 클 수 없습니다 {0}.
 DocType: Company,Default Cost of Goods Sold Account,제품 판매 계정의 기본 비용
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,가격 목록을 선택하지
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,가격 목록을 선택하지
 DocType: Employee,Family Background,가족 배경
 DocType: Process Payroll,Send Email,이메일 보내기
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,아무 권한이 없습니다
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,높은 weightage와 항목에서 높은 표시됩니다
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,은행 계정조정 세부 정보
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,내 송장
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,검색된 직원이 없습니다
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,검색된 직원이 없습니다
 DocType: Purchase Order,Stopped,중지
 DocType: Item,If subcontracted to a vendor,공급 업체에 하청하는 경우
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,시작 BOM을 선택
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSV를 
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,지금 보내기
 ,Support Analytics,지원 분석
 DocType: Item,Website Warehouse,웹 사이트 창고
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,당신이 정말로 생산 순서를 중지 하시겠습니까?
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","자동 청구서는 05, 28 등의 예를 들어 생성되는 달의 날"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,점수보다 작거나 5 같아야
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C 형태의 기록
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,고
 DocType: Features Setup,"To enable ""Point of Sale"" features","판매 시점"기능을 사용하려면
 DocType: Bin,Moving Average Rate,이동 평균 속도
 DocType: Production Planning Tool,Select Items,항목 선택
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
 DocType: Comment,Reference Name,참조명(Reference Name)
 DocType: Maintenance Visit,Completion Status,완료 상태
 DocType: Sales Invoice Item,Target Warehouse,목표웨어 하우스
 DocType: Item,Allow over delivery or receipt upto this percent,이 퍼센트 개까지 배달 또는 영수증을 통해 허용
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,예상 배달 날짜 이전에 판매 주문 날짜가 될 수 없습니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,예상 배달 날짜 이전에 판매 주문 날짜가 될 수 없습니다
 DocType: Upload Attendance,Import Attendance,수입 출석
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,모든 상품 그룹
 DocType: Process Payroll,Activity Log,활동 로그
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,자동 거래의 제출에 메시지를 작성합니다.
 DocType: Production Order,Item To Manufacture,제조 품목에
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,영구 금형 주조
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,지불하기 위해 구매
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} 상태가 {2}이다
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,지불하기 위해 구매
 DocType: Sales Order Item,Projected Qty,수량을 예상
 DocType: Sales Invoice,Payment Due Date,지불 기한
 DocType: Newsletter,Newsletter Manager,뉴스 관리자
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,신청 번호
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,성능 평가.
 DocType: Sales Invoice Item,Stock Details,주식의 자세한 사항
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,프로젝트 값
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,판매 시점
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},앞으로 수행 할 수 없습니다 {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,판매 시점
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},앞으로 수행 할 수 없습니다 {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","계정 잔액이 이미 신용, 당신이 설정할 수 없습니다 '직불 카드'로 '밸런스 것은이어야'"
 DocType: Account,Balance must be,잔고는
 DocType: Hub Settings,Publish Pricing,가격을 게시
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,구입 영수증
 ,Received Items To Be Billed,청구에 주어진 항목
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,블라스트
-sites/assets/js/desk.min.js +3938,Ms,MS
+DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,통화 환율 마스터.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
 DocType: Production Order,Plan material for sub-assemblies,서브 어셈블리 계획 물질
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,범위
 DocType: Supplier,Default Payable Accounts,기본 미지급금
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
 DocType: Features Setup,Item Barcode,상품의 바코드
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,항목 변형 {0} 업데이트
 DocType: Quality Inspection Reading,Reading 6,6 읽기
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,송장 전진에게 구입
 DocType: Address,Shop,상점
 DocType: Hub Settings,Sync Now,지금 동기화
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},행은 {0} : 신용 항목에 링크 할 수 없습니다 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},행은 {0} : 신용 항목에 링크 할 수 없습니다 {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,이 모드를 선택하면 기본 은행 / 현금 계정은 자동으로 POS 송장에 업데이트됩니다.
 DocType: Employee,Permanent Address Is,영구 주소는
 DocType: Production Order Operation,Operation completed for how many finished goods?,작업이 얼마나 많은 완제품 완료?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,브랜드
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,수당에 {0} 항목에 대한 교차에 대한 {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,수당에 {0} 항목에 대한 교차에 대한 {1}.
 DocType: Employee,Exit Interview Details,출구 인터뷰의 자세한 사항
 DocType: Item,Is Purchase Item,구매 상품입니다
 DocType: Journal Entry Account,Purchase Invoice,구매 송장
 DocType: Stock Ledger Entry,Voucher Detail No,바우처 세부 사항 없음
 DocType: Stock Entry,Total Outgoing Value,총 보내는 값
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,날짜 및 마감일을 열면 동일 회계 연도 내에 있어야합니다
 DocType: Lead,Request for Information,정보 요청
 DocType: Payment Tool,Paid,지불
 DocType: Salary Slip,Total in words,즉 전체
 DocType: Material Request Item,Lead Time Date,리드 타임 날짜
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,필수입니다. 아마 환전 레코드가 만들어지지 않습니다
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},행 번호는 {0} 항목에 대한 일련 번호를 지정하십시오 {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'제품 번들'항목, 창고, 일련 번호 및 배치에 대해 아니오 '포장 목록'테이블에서 고려 될 것이다. 창고 및 배치 없음 어떤 '제품 번들'항목에 대한 모든 포장 항목에 대해 동일한 경우, 그 값이 주요 항목 테이블에 입력 할 수는 값이 테이블 '목록 포장'을 복사됩니다."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,고객에게 선적.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,고객에게 선적.
 DocType: Purchase Invoice Item,Purchase Order Item,구매 주문 상품
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,간접 소득
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,설정 지불 금액 = 뛰어난 금액
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,1 호선 주소
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,변화
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,회사 명
 DocType: SMS Center,Total Message(s),전체 메시지 (들)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,모든 도움말 동영상 목록보기
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,검사가 입금 된 은행 계좌 머리를 선택합니다.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,사용자가 거래 가격리스트 평가를 편집 할 수
 DocType: Pricing Rule,Max Qty,최대 수량
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,행 {0} : 판매 / 구매 주문에 대한 결제가 항상 사전으로 표시해야
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,행 {0} : 판매 / 구매 주문에 대한 결제가 항상 사전으로 표시해야
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,화학
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
 DocType: Process Payroll,Select Payroll Year and Month,급여 연도와 월을 선택
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",해당 그룹 (일반적으로 펀드의 응용 프로그램> 현재 자산> 은행 계좌로 이동 유형) 자녀 추가 클릭하여 (새 계정 만들기 "은행"
 DocType: Workstation,Electricity Cost,전기 비용
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,화
 DocType: SMS Center,All Lead (Open),모든 납 (열기)
 DocType: Purchase Invoice,Get Advances Paid,선불지급
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,사진 첨부
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,확인
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,확인
 DocType: Journal Entry,Total Amount in Words,단어의 합계 금액
 DocType: Workflow State,Stop,중지
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,오류가 발생했습니다.한 가지 가능한 이유는 양식을 저장하지 않은 경우입니다.문제가 계속되면 support@erpnext.com에 문의하시기 바랍니다.
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,패킹 슬립 상품
 DocType: POS Profile,Cash/Bank Account,현금 / 은행 계좌
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
 DocType: Delivery Note,Delivery To,에 배달
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Planning Tool,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} 음수가 될 수 없습니다
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,제출
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',시간 로그 &
 DocType: Project,Internal,내부
 DocType: Task,Urgent,긴급한
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},테이블의 행 {0}에 대한 올바른 행 ID를 지정하십시오 {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,바탕 화면으로 이동 ERPNext를 사용하여 시작
 DocType: Item,Manufacturer,제조사:
 DocType: Landed Cost Item,Purchase Receipt Item,구매 영수증 항목
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,판매 주문 / 완제품 창고에서 예약 창고
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,판매 금액
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,시간 로그
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,이 기록에 대한 비용 승인자입니다.'상태'를 업데이트하고 저장하십시오
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,이 기록에 대한 비용 승인자입니다.'상태'를 업데이트하고 저장하십시오
 DocType: Serial No,Creation Document No,작성 문서 없음
 DocType: Issue,Issue,이슈
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","항목 변형의 속성. 예를 들어, 크기, 색상 등"
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
 DocType: Sales Partner,Implementation Partner,구현 파트너
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},판매 주문 {0}를 {1}
 DocType: Opportunity,Contact Info,연락처 정보
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,재고 항목 만들기
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,재고 항목 만들기
 DocType: Packing Slip,Net Weight UOM,순 중량 UOM
 DocType: Item,Default Supplier,기본 공급 업체
 DocType: Manufacturing Settings,Over Production Allowance Percentage,생산 수당 비율 이상
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,날짜 매주 하차
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,종료 날짜는 시작 날짜보다 작을 수 없습니다
 DocType: Sales Person,Select company name first.,첫 번째 회사 이름을 선택합니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,박사
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,박사
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,인용문은 공급 업체에서 받았다.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},에 {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,시간 로그를 통해 업데이트
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,당신의 참고를위한 회사의 등록 번호.세금 번호 등
 DocType: Sales Partner,Distributor,분배 자
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,쇼핑 카트 배송 규칙
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 ,Ordered Items To Be Billed,청구 항목을 주문한
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,범위이어야한다보다는에게 범위
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,시간 로그를 선택하고 새로운 판매 송장을 만들 제출.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,세금 
 DocType: Lead,Lead,리드 고객
 DocType: Email Digest,Payables,채무
 DocType: Account,Warehouse,창고
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,행 번호 {0} : 수량은 구매 대가로 입력 할 수 없습니다 거부
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,행 번호 {0} : 수량은 구매 대가로 입력 할 수 없습니다 거부
 ,Purchase Order Items To Be Billed,청구 할 수 구매 주문 아이템
 DocType: Purchase Invoice Item,Net Rate,인터넷 속도
 DocType: Purchase Invoice Item,Purchase Invoice Item,구매 송장 항목
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,비 조정 지불 
 DocType: Global Defaults,Current Fiscal Year,당해 사업 연도
 DocType: Global Defaults,Disable Rounded Total,둥근 전체에게 사용 안 함
 DocType: Lead,Call,전화
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'항목은'비워 둘 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'항목은'비워 둘 수 없습니다
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},중복 행 {0}과 같은 {1}
 ,Trial Balance,시산표
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,직원 설정
-sites/assets/js/erpnext.min.js +5,"Grid ""","그리드 """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,직원 설정
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","그리드 """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,첫 번째 접두사를 선택하세요
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,연구
 DocType: Maintenance Visit Purpose,Work Done,작업 완료
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,발신
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,보기 원장
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,처음
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
 DocType: Communication,Delivery Status,배달 상태
 DocType: Production Order,Manufacture against Sales Order,판매 주문에 대해 제조
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,세계의 나머지
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,세계의 나머지
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,항목 {0} 배치를 가질 수 없습니다
 ,Budget Variance Report,예산 차이 보고서
 DocType: Salary Slip,Gross Pay,총 지불
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,배당금 지급
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,회계 원장
 DocType: Stock Reconciliation,Difference Amount,차이 금액
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,이익 잉여금
 DocType: BOM Item,Item Description,항목 설명
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,기회 상품
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,임시 열기
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,직원 허가 밸런스
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},{0} 계정 잔고는 항상 {1}  이어야합니다
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} 계정 잔고는 항상 {1}  이어야합니다
 DocType: Address,Address Type,주소 유형
 DocType: Purchase Receipt,Rejected Warehouse,거부 창고
 DocType: GL Entry,Against Voucher,바우처에 대한
 DocType: Item,Default Buying Cost Center,기본 구매 비용 센터
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext 중 최고를 얻으려면, 우리는 당신이 약간의 시간이 걸릴 이러한 도움 비디오를 시청할 것을 권장합니다."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,{0} 항목 판매 상품이어야합니다
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,에
 DocType: Item,Lead Time in days,일 리드 타임
 ,Accounts Payable Summary,미지급금 합계
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},동결 계정을 편집 할 수있는 권한이 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},동결 계정을 편집 할 수있는 권한이 없습니다 {0}
 DocType: Journal Entry,Get Outstanding Invoices,미결제 송장를 얻을
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,문제의 장소
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,계약직
 DocType: Report,Disabled,사용 안함
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM에 필요한 UOM coversion 인자 : {0} 항목 {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM에 필요한 UOM coversion 인자 : {0} 항목 {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,간접 비용
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,행 {0} : 수량은 필수입니다
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,농업
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,결제 방식
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,이 루트 항목 그룹 및 편집 할 수 없습니다.
 DocType: Journal Entry Account,Purchase Order,구매 주문
 DocType: Warehouse,Warehouse Contact Info,창고 연락처 정보
-sites/assets/js/form.min.js +190,Name is required,이름이 필요합니다
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,이름이 필요합니다
 DocType: Purchase Invoice,Recurring Type,경상 유형
 DocType: Address,City/Town,도시
 DocType: Email Digest,Annual Income,연간 소득
 DocType: Serial No,Serial No Details,일련 번호 세부 사항
 DocType: Purchase Invoice Item,Item Tax Rate,항목 세율
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,자본 장비
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,골
 DocType: Sales Invoice Item,Edit Description,편집 설명
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,예상 배달 날짜는 계획 시작 날짜보다 적은이다.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,공급 업체
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,공급 업체
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,계정 유형을 설정하면 트랜잭션이 계정을 선택하는 데 도움이됩니다.
 DocType: Purchase Invoice,Grand Total (Company Currency),총계 (회사 통화)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,총 발신
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","전용 ""값을""0 또는 빈 값을 발송하는 규칙 조건이있을 수 있습니다"
 DocType: Authorization Rule,Transaction,거래
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,참고 :이 비용 센터가 그룹입니다.그룹에 대한 회계 항목을 만들 수 없습니다.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Tools (도구)
+apps/frappe/frappe/config/desk.py +7,Tools,Tools (도구)
 DocType: Item,Website Item Groups,웹 사이트 상품 그룹
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,생산 주문 번호 재고 항목 목적의 제조를위한 필수입니다
 DocType: Purchase Invoice,Total (Company Currency),총 (회사 통화)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,워크 스테이션 이름
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,다이제스트 이메일 :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
 DocType: Sales Partner,Target Distribution,대상 배포
-sites/assets/js/desk.min.js +7652,Comments,비고
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,비고
 DocType: Salary Slip,Bank Account No.,은행 계좌 번호
 DocType: Naming Series,This is the number of the last created transaction with this prefix,이것은이 접두사를 마지막으로 생성 된 트랜잭션의 수입니다
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},상품에 필요한 평가 비율 {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,회사를 
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,권한 허가
 DocType: Purchase Invoice,Supplier Invoice Date,공급 업체 송장 날짜
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,당신은 쇼핑 카트를 활성화해야
-sites/assets/js/form.min.js +212,No Data,데이터가 없습니다
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,데이터가 없습니다
 DocType: Appraisal Template Goal,Appraisal Template Goal,평가 템플릿 목표
 DocType: Salary Slip,Earning,당기순이익
 DocType: Payment Tool,Party Account Currency,파티 계정 환율
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,파티 계정 환율
 DocType: Purchase Taxes and Charges,Add or Deduct,추가 공제
 DocType: Company,If Yearly Budget Exceeded (for expense account),연간 예산 (비용 계정) 초과하는 경우
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,사이에있는 중복 조건 :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,저널에 대하여 항목은 {0}이 (가) 이미 다른 쿠폰에 대해 조정
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,저널에 대하여 항목은 {0}이 (가) 이미 다른 쿠폰에 대해 조정
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,총 주문액
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,음식
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,고령화 범위 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,방문 없음
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","상대에게 뉴스 레터, 리드."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},닫기 계정의 통화가 있어야합니다 {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},모든 목표에 대한 포인트의 합은 그것이 100해야한다 {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,작업은 비워 둘 수 없습니다.
 ,Delivered Items To Be Billed,청구에 전달 항목
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,웨어 하우스는 일련 번호 변경할 수 없습니다
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},상태로 업데이트 {0}
 DocType: DocField,Description,내용
 DocType: Authorization Rule,Average Discount,평균 할인
 DocType: Letter Head,Is Default,기본값
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,항목 세액
 DocType: Item,Maintain Stock,재고 유지
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,이미 생산 오더에 대 한 만든 항목
 DocType: Leave Control Panel,Leave blank if considered for all designations,모든 지정을 고려하는 경우 비워 둡니다
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},최대 : {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,날짜 시간에서
 DocType: Email Digest,For Company,회사
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,배송 주소 이름
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,계정 차트
 DocType: Material Request,Terms and Conditions Content,약관 내용
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,무급 휴가에 따라 다름
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,보증 / AMC 상태
 DocType: GL Entry,GL Entry,GL 등록
 DocType: HR Settings,Employee Settings,직원 설정
 ,Batch-Wise Balance History,배치 식 밸런스 역사
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,할일 목록
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,할일 목록
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,도제
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,음의 수량은 허용되지 않습니다
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,사무실 임대
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,설치 SMS 게이트웨이 설정
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,가져 오기 실패!
-sites/assets/js/erpnext.min.js +24,No address added yet.,어떤 주소는 아직 추가되지 않습니다.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,어떤 주소는 아직 추가되지 않습니다.
 DocType: Workstation Working Hour,Workstation Working Hour,워크 스테이션 작업 시간
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,분석자
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},행 {0} : 할당 된 양 {1} 미만 또는 JV의 양에 해당한다 {2}
 DocType: Item,Inventory,재고
 DocType: Features Setup,"To enable ""Point of Sale"" view",보기 "판매 시점"을 사용하려면
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,결제는 빈 카트에 할 수 없다
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,결제는 빈 카트에 할 수 없다
 DocType: Item,Sales Details,판매 세부 사항
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,피닝
 DocType: Opportunity,With Items,항목
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",다음 송장이 생성됩니다되는 날짜입니다. 그것은 제출에 생성됩니다.
 DocType: Item Attribute,Item Attribute,항목 속성
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,통치 체제
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,항목 변형
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,항목 변형
 DocType: Company,Services,Services (서비스)
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),전체 ({0})
 DocType: Cost Center,Parent Cost Center,부모의 비용 센터
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,회계 연도의 시작 날짜
 DocType: Employee External Work History,Total Experience,총 체험
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,카운터 싱크
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,포장 명세서 (들) 취소
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,포장 명세서 (들) 취소
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,화물 운송 및 포워딩 요금
 DocType: Material Request Item,Sales Order No,판매 주문 번호
 DocType: Item Group,Item Group Name,항목 그룹 이름
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,촬영
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,촬영
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,제조에 대한 전송 재료
 DocType: Pricing Rule,For Price List,가격 목록을 보려면
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,대표 조사
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,일정
 DocType: Purchase Invoice Item,Net Amount,순액
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM 세부 사항 없음
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),추가 할인 금액 (회사 통화)
-DocType: Period Closing Voucher,CoA Help,CoA를 도움말
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},오류 : {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},오류 : {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,계정 차트에서 새로운 계정을 생성 해주세요.
 DocType: Maintenance Visit,Maintenance Visit,유지 보수 방문
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,고객 지원> 고객 그룹> 지역
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,착륙 비용 도움말
 DocType: Event,Tuesday,화요일
 DocType: Leave Block List,Block Holidays on important days.,중요한 일에 블록 휴일.
 ,Accounts Receivable Summary,미수금 요약
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},이미 기간 동안 직원 {1}에 할당 된 유형 {0}에 대한 잎 {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,직원 역할을 설정하는 직원 레코드에 사용자 ID 필드를 설정하십시오
 DocType: UOM,UOM Name,UOM 이름
 DocType: Top Bar Item,Target,목표물
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,영업 파트너 대상
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0}에 대한 회계 항목 만 통화 할 수있다 : {1}
 DocType: Pricing Rule,Pricing Rule,가격 규칙
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,노칭
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},행 번호 {0} : 반환 항목 {1}에 존재하지 않는 {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,은행 계정
 ,Bank Reconciliation Statement,은행 계정 조정 계산서
 DocType: Address,Lead Name,리드 명
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,열기 주식 대차
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,열기 주식 대차
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} 한 번만 표시합니다
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},더 tranfer 할 수 없습니다 {0}보다 {1} 구매 주문에 대한 {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},잎에 성공적으로 할당 된 {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},잎에 성공적으로 할당 된 {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,포장하는 항목이 없습니다
 DocType: Shipping Rule Condition,From Value,값에서
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,제조 수량이 필수입니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,제조 수량이 필수입니다
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,은행에 반영되지 금액
 DocType: Quality Inspection Reading,Reading 4,4 읽기
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,회사 경비 주장한다.
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,연락처 모바일 없음
 DocType: Production Planning Tool,Select Sales Orders,선택 판매 주문
 ,Material Requests for which Supplier Quotations are not created,공급 업체의 견적이 생성되지 않는 자재 요청
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,바코드를 사용하여 항목을 추적 할 수 있습니다.당신은 상품의 바코드를 스캔하여 납품서 및 판매 송장에서 항목을 입력 할 수 있습니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,마크 배달로
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,견적 확인
 DocType: Dependent Task,Dependent Task,종속 작업
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,사전에 X 일에 대한 작업을 계획 해보십시오.
 DocType: HR Settings,Stop Birthday Reminders,정지 생일 알림
 DocType: SMS Center,Receiver List,수신기 목록
 DocType: Payment Tool Detail,Payment Amount,결제 금액
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,소비 금액
-sites/assets/js/erpnext.min.js +51,{0} View,{0}보기
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}보기
 DocType: Salary Structure Deduction,Salary Structure Deduction,급여 구조 공제
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,선택적 레이저 소결
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,성공적인 가져 오기!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,발행 항목의 비용
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},수량 이하이어야한다 {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,기본 지불 계정
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","이러한 운송 규칙, 가격 목록 등 온라인 쇼핑 카트에 대한 설정"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,설치 완료
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0} % 청구
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,예약 수량
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,예약 수량
 DocType: Party Account,Party Account,당 계정
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,인적 자원
 DocType: Lead,Upper Income,위 소득
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,장바구니 사용
 DocType: Employee,Permanent Address,영구 주소
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,항목 {0} 서비스 상품이어야합니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",총계보다 \ {0} {1} 초과 할 수 없습니다에 대해 지불 사전 {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,품목 코드를 선택하세요
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),무급 휴직 공제를 줄 (LWP)
 DocType: Territory,Territory Manager,지역 관리자
+DocType: Delivery Note Item,To Warehouse (Optional),웨어 하우스 (선택 사항)
 DocType: Sales Invoice,Paid Amount (Company Currency),지불 금액 (회사 통화)
 DocType: Purchase Invoice,Additional Discount,추가 할인
 DocType: Selling Settings,Selling Settings,판매 설정
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,채광
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,수지 주조
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,먼저 {0}을 선택하십시오.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,먼저 {0}을 선택하십시오.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},텍스트 {0}
 DocType: Territory,Parent Territory,상위 지역
 DocType: Quality Inspection Reading,Reading 2,2 읽기
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,배치 없음
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,고객의 구매 주문에 대해 여러 판매 주문 허용
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,주요 기능
 DocType: DocPerm,Delete,삭제
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,변체
-sites/assets/js/desk.min.js +7971,New {0},새로운 {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,변체
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},새로운 {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,정지 순서는 취소 할 수 없습니다.취소 멈추지.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,정지 순서는 취소 할 수 없습니다.취소 멈추지.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
 DocType: Employee,Leave Encashed?,Encashed 남겨?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,필드에서 기회는 필수입니다
 DocType: Item,Variants,변종
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,국가
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,주소
 DocType: Communication,Received,획득
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},중복 된 일련 번호는 항목에 대해 입력 {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,배송 규칙의 조건
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,항목은 생산 주문을 할 수 없습니다.
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,인사말
 DocType: Communication,Rejected,거부
 DocType: Pricing Rule,Brand,상표
 DocType: Item,Will also apply for variants,또한 변형 적용됩니다
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% 배송
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,판매 상품을 동시에 번들.
 DocType: Sales Order Item,Actual Qty,실제 수량
 DocType: Sales Invoice Item,References,참조
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,양털 깎기
 DocType: Item,Has Variants,변형을 가지고
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,새로운 판매 송장을 작성하는 '판매 송장 확인'버튼을 클릭합니다.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,에서와 기간 % s을 (를) 반복 필수 날짜까지 기간
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,포장 및 라벨링
 DocType: Monthly Distribution,Name of the Monthly Distribution,월별 분포의 이름
 DocType: Sales Person,Parent Sales Person,부모 판매 사람
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,회사 마스터 및 글로벌 기본값에 기본 통화를 지정하십시오
 DocType: Dropbox Backup,Dropbox Access Secret,보관 용 액세스 비밀
 DocType: Purchase Invoice,Recurring Invoice,경상 송장
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,프로젝트 관리
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,프로젝트 관리
 DocType: Supplier,Supplier of Goods or Services.,제품 또는 서비스의 공급.
 DocType: Budget Detail,Fiscal Year,회계 연도
 DocType: Cost Center,Budget,예산
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,판매
 DocType: Employee,Salary Information,급여정보
 DocType: Sales Person,Name and Employee ID,이름 및 직원 ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
 DocType: Website Item Group,Website Item Group,웹 사이트 상품 그룹
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,관세 및 세금
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,참고 날짜를 입력 해주세요
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} 지급 항목으로 필터링 할 수 없습니다 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,참고 날짜를 입력 해주세요
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} 지급 항목으로 필터링 할 수 없습니다 {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,웹 사이트에 표시됩니다 항목 표
 DocType: Purchase Order Item Supplied,Supplied Qty,납품 수량
 DocType: Material Request Item,Material Request Item,자료 요청 항목
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,항목 그룹의
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,이 충전 유형에 대한보다 크거나 현재의 행의 수와 동일한 행 번호를 참조 할 수 없습니다
 ,Item-wise Purchase History,상품 현명한 구입 내역
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,빨간
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},시리얼 번호는 항목에 대한 추가 가져 오기 위해 '생성 일정'을 클릭하십시오 {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},시리얼 번호는 항목에 대한 추가 가져 오기 위해 '생성 일정'을 클릭하십시오 {0}
 DocType: Account,Frozen,동결
 ,Open Production Orders,오픈 생산 주문
 DocType: Installation Note,Installation Time,설치 시간
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,견적 동향
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","생산 주문이 항목에 대한 만들 수 있습니다, 그것은 재고 품목 수 있어야합니다."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","생산 주문이 항목에 대한 만들 수 있습니다, 그것은 재고 품목 수 있어야합니다."
 DocType: Shipping Rule Condition,Shipping Amount,배송 금액
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,합류
 DocType: Authorization Rule,Above Value,상위값
 ,Pending Amount,대기중인 금액
 DocType: Purchase Invoice Item,Conversion Factor,변환 계수
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,배달
+DocType: Purchase Order,Delivered,배달
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),작업 메일 ID의 설정받는 서버. (예를 들어 jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,차량 번호
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,반복 송장이 중단 될 일자
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,배포 요금을 기준
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,품목은 {1} 자산 상품이기 때문에 계정 {0} 형식의 '고정 자산'이어야합니다
 DocType: HR Settings,HR Settings,HR 설정
 apps/frappe/frappe/config/setup.py +130,Printing,인쇄
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,비용 청구가 승인 대기 중입니다.만 비용 승인자 상태를 업데이트 할 수 있습니다.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,비용 청구가 승인 대기 중입니다.만 비용 승인자 상태를 업데이트 할 수 있습니다.
 DocType: Purchase Invoice,Additional Discount Amount,추가 할인 금액
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,당신이 허가를 신청하는 날 (들)은 휴일입니다.당신은 휴가를 신청할 필요가 없습니다.
-sites/assets/js/desk.min.js +7805,and,손목
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,손목
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,약어는 비워둘수 없습니다
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,스포츠
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,인용
 DocType: Salary Slip,Total Deduction,총 공제
 DocType: Quotation,Maintenance User,유지 보수 사용자
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,비용 업데이트
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,당신은 당신이 멈추지 않고 하시겠습니까
 DocType: Employee,Date of Birth,생일
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,항목 {0}이 (가) 이미 반환 된
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** 회계 연도는 ** 금융 년도 나타냅니다.모든 회계 항목 및 기타 주요 거래는 ** ** 회계 연도에 대해 추적됩니다.
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","판매 캠페인을 추적.리드, 인용문을 추적, 판매 주문 등 캠페인에서 투자 수익을 측정합니다."
 DocType: Expense Claim,Approver,승인자
 ,SO Qty,SO 수량
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","재고 항목이 창고에 존재 {0}, 따라서 당신은 다시 할당하거나 창고를 수정할 수 없습니다"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","재고 항목이 창고에 존재 {0}, 따라서 당신은 다시 할당하거나 창고를 수정할 수 없습니다"
 DocType: Appraisal,Calculate Total Score,총 점수를 계산
 DocType: Supplier Quotation,Manufacturing Manager,제조 관리자
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},일련 번호는 {0}까지 보증 {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,패키지로 배달 주를 분할합니다.
 apps/erpnext/erpnext/hooks.py +84,Shipments,선적
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,딥 성형
+DocType: Purchase Order,To be delivered to customer,고객에게 전달 될
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,소요시간 로그 상태는 제출해야합니다.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,일련 번호 {0} 어떤 창고에 속하지 않는
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,설정
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,통화와
 DocType: DocField,Name,이름
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},상품에 필요한 판매 주문 {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},상품에 필요한 판매 주문 {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,시스템에 반영되지 금액
 DocType: Purchase Invoice Item,Rate (Company Currency),속도 (회사 통화)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,기타사항
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,중지로 설정
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,일치하는 항목을 찾을 수 없습니다. 에 대한 {0} 다른 값을 선택하십시오.
 DocType: POS Profile,Taxes and Charges,세금과 요금
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","제품 또는, 구입 판매 또는 재고 유지 서비스."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,첫 번째 행에 대한 '이전 행 전체에'이전 행에 금액 '또는로 충전 타입을 선택할 수 없습니다
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,문서 종류 선택
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,꿰매
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,은행
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,일정을 얻기 위해 '생성 일정'을 클릭 해주세요
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,새로운 비용 센터
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,새로운 비용 센터
 DocType: Bin,Ordered Quantity,주문 수량
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","예) ""빌더를 위한  빌드 도구"""
 DocType: Quality Inspection,In Process,처리 중
 DocType: Authorization Rule,Itemwise Discount,Itemwise 할인
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} 판매 주문에 대한 {1}
+DocType: Purchase Order Item,Reference Document Type,참조 문서 유형
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} 판매 주문에 대한 {1}
 DocType: Account,Fixed Asset,고정 자산
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,직렬화 된 재고
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,직렬화 된 재고
 DocType: Activity Type,Default Billing Rate,기본 결제 요금
 DocType: Time Log Batch,Total Billing Amount,총 결제 금액
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,채권 계정
 ,Stock Balance,재고 대차
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,지불에 판매 주문
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,지불에 판매 주문
 DocType: Expense Claim Detail,Expense Claim Detail,비용 청구 상세 정보
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,시간 로그 생성 :
 DocType: Item,Weight UOM,무게 UOM
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,대변계정은 채무 계정이어야합니다
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
 DocType: Production Order Operation,Completed Qty,완료 수량
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",{0} 만 직불 계정은 다른 신용 항목에 링크 할 수 있습니다 들어
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,가격 목록 {0} 비활성화
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0} 만 직불 계정은 다른 신용 항목에 링크 할 수 있습니다 들어
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,가격 목록 {0} 비활성화
 DocType: Manufacturing Settings,Allow Overtime,초과 근무 허용
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,판매 주문은 {0} 정지
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} 항목에 필요한 일련 번호 {1}. 당신이 제공 한 {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,현재 평가 비율
 DocType: Item,Customer Item Codes,고객 상품 코드
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,용접
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,새로운 재고 UOM가 필요합니다
 DocType: Quality Inspection,Sample Size,표본 크기
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,모든 상품은 이미 청구 된
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,모든 상품은 이미 청구 된
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.','사건 번호에서'유효 기간을 지정하십시오
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,또한 비용 센터 그룹에서 할 수 있지만 항목이 아닌 그룹에 대해 할 수있다
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,또한 비용 센터 그룹에서 할 수 있지만 항목이 아닌 그룹에 대해 할 수있다
 DocType: Project,External,외부
 DocType: Features Setup,Item Serial Nos,상품 직렬 NOS
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,사용자 및 권한
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,주소 및 연락처
 DocType: SMS Log,Sender Name,보낸 사람 이름
 DocType: Page,Title,제목
-sites/assets/js/list.min.js +104,Customize,사용자 지정
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,사용자 지정
 DocType: POS Profile,[Select],[선택]
 DocType: SMS Log,Sent To,전송
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,견적서에게 확인
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,수명 종료
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,여행
 DocType: Leave Block List,Allow Users,사용자에게 허용
+DocType: Purchase Order,Customer Mobile No,고객 모바일 없음
 DocType: Sales Invoice,Recurring,반복
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,별도의 소득을 추적하고 제품 수직 또는 부서에 대한 비용.
 DocType: Rename Tool,Rename Tool,이름바꾸기 툴
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,업데이트 비용
 DocType: Item Reorder,Item Reorder,항목 순서 바꾸기
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,전송 자료
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,전송 자료
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","운영, 운영 비용을 지정하고 작업에 고유 한 작업에게 더를 제공합니다."
 DocType: Purchase Invoice,Price List Currency,가격리스트 통화
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,종업원
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,가져 오기 이메일
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,사용자로 초대하기
 DocType: Features Setup,After Sale Installations,판매 설치 후
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} 전액 청구됩니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} 전액 청구됩니다
 DocType: Workstation Working Hour,End Time,종료 시간
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,판매 또는 구매를위한 표준 계약 조건.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,바우처 그룹
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,대량 메일 링
 DocType: Page,Standard,표준
 DocType: Rename Tool,File to Rename,이름 바꾸기 파일
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},purchse를 주문 번호는 상품에 필요한 {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,쇼 지불
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},상품에 대한 존재하지 않습니다 BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,유지 보수 일정은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,유지 보수 일정은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,크기
 DocType: Notification Control,Expense Claim Approved,비용 청구 승인
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,제약
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,날짜 출석
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),판매 이메일 ID에 대한 설정받는 서버. (예를 들어 sales@example.com)
 DocType: Warranty Claim,Raised By,에 의해 제기
 DocType: Payment Tool,Payment Account,결제 계정
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,진행하는 회사를 지정하십시오
-sites/assets/js/list.min.js +23,Draft,초안
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,진행하는 회사를 지정하십시오
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,초안
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,보상 오프
 DocType: Quality Inspection Reading,Accepted,허용
 DocType: User,Female,여성
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,배송 규칙 라벨
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
 DocType: Newsletter,Test,미리 보기
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","기존의 주식 거래는의 값을 변경할 수 없습니다 \이 항목에 대한 있기 때문에 '일련 번호를 가지고', '배치를 가지고 없음', '주식 항목으로'와 '평가 방법'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,빠른 분개
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
 DocType: Employee,Previous Work Experience,이전 작업 경험
 DocType: Stock Entry,For Quantity,수량
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},항목에 대한 계획 수량을 입력하십시오 {0} 행에서 {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} 제출되지
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,상품에 대한 요청.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} 제출되지
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,상품에 대한 요청.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,별도의 생산 순서는 각 완제품 항목에 대해 작성됩니다.
 DocType: Purchase Invoice,Terms and Conditions1,약관 및 상태 인 경우 1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,설정 완료
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,뉴스 레터 메
 DocType: Delivery Note,Transporter Name,트랜스 포터의 이름
 DocType: Contact,Enter department to which this Contact belongs,이 연락처가 속한 부서를 입력
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,총 결석
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,행에 대한 항목이나 창고 {0} 물자의 요청과 일치하지 않습니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,행에 대한 항목이나 창고 {0} 물자의 요청과 일치하지 않습니다
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,측정 단위
 DocType: Fiscal Year,Year End Date,연도 종료 날짜
 DocType: Task Depends On,Task Depends On,작업에 따라 다릅니다
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,수수료에 대한 회사의 제품을 판매하는 타사 대리점 / 딜러 /위원회 에이전트 / 제휴 / 대리점.
 DocType: Customer Group,Has Child Node,아이 노드에게 있습니다
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} 구매 주문에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} 구매 주문에 대한 {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","여기에 정적 URL 매개 변수를 입력합니다 (예 : 보낸 사람 = ERPNext, 사용자 이름 = ERPNext, 암호 = 1234 등)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}되지 않은 활성 회계 연도에. 자세한 내용 확인은 {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,이 ERPNext에서 자동으로 생성 예를 들어 웹 사이트입니다
@@ -2067,11 +2078,9 @@ DocType: Note,Note,정보
 DocType: Purchase Receipt Item,Recd Quantity,Recd 수량
 DocType: Email Account,Email Ids,이메일 IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,마개를로 설정
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
 DocType: Payment Reconciliation,Bank / Cash Account,은행 / 현금 계정
 DocType: Tax Rule,Billing City,결제시
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,이 휴가 신청은 승인 대기 중입니다.만 휴가 승인 상태를 업데이트 할 수 있습니다.
 DocType: Global Defaults,Hide Currency Symbol,통화 기호에게 숨기기
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","예) 은행, 현금, 신용 카드"
 DocType: Journal Entry,Credit Note,신용 주
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),합계 (수량)
 DocType: Installation Note Item,Installed Qty,설치 수량
 DocType: Lead,Fax,팩스
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,제출
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,제출
 DocType: Salary Structure,Total Earning,총 적립
 DocType: Purchase Receipt,Time at which materials were received,재료가 수신 된 시간입니다
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,내 주소
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,조직 분기
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,또는
 DocType: Sales Order,Billing Status,결제 상태
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,광열비
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 위
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 위
 DocType: Buying Settings,Default Buying Price List,기본 구매 가격 목록
 ,Download Backups,다운로드 백업
 DocType: Notification Control,Sales Order Message,판매 주문 메시지
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,직원 선택
 DocType: Bank Reconciliation,To Date,현재까지
 DocType: Opportunity,Potential Sales Deal,잠재적 인 판매 거래
-sites/assets/js/form.min.js +308,Details,세부 정보
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,세부 정보
 DocType: Purchase Invoice,Total Taxes and Charges,총 세금 및 요금
 DocType: Employee,Emergency Contact,비상 연락처
 DocType: Item,Quality Parameters,품질 매개 변수
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,수량에게받은
 DocType: Stock Entry Detail,Serial No / Batch,일련 번호 / 배치
 DocType: Product Bundle,Parent Item,상위 항목
 DocType: Account,Account Type,계정 유형
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
 ,To Produce,생산
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",행에 대해 {0}에서 {1}. 상품 요금에 {2} 포함하려면 행은 {3}도 포함해야
 DocType: Packing Slip,Identification of the package for the delivery (for print),(프린트) 전달을위한 패키지의 식별
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,편평
 DocType: Account,Income Account,수익 계정
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,조형
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,배달
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,배달
 DocType: Stock Reconciliation Item,Current Qty,현재 수량
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","절 원가 계산의 ""에 근거를 자료의 평가""를 참조하십시오"
 DocType: Appraisal Goal,Key Responsibility Area,주요 책임 지역
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,모든 주소.
 DocType: Company,Stock Settings,스톡 설정
 DocType: User,Bio,바이오
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,고객 그룹 트리를 관리 할 수 있습니다.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,새로운 비용 센터의 이름
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,새로운 비용 센터의 이름
 DocType: Leave Control Panel,Leave Control Panel,제어판에게 남겨
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,기본 주소 템플릿을 찾을 수 없습니다.설정> 인쇄 및 브랜딩에서 새> 주소 템플릿을 생성 해주세요.
 DocType: Appraisal,HR User,HR 사용자
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,지불 도구 세부 정보
 ,Sales Browser,판매 브라우저
 DocType: Journal Entry,Total Credit,총 크레딧
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,지역정보 검색
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,지역정보 검색
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),대출 및 선수금 (자산)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,외상매출금
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,큰
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,어떤 직원을 찾을 수 없습니다!
 DocType: C-Form Invoice Detail,Territory,국가
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,언급 해주십시오 필요한 방문 없음
+DocType: Purchase Order,Customer Address Display,고객의 주소 표시
 DocType: Stock Settings,Default Valuation Method,기본 평가 방법
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,연마
 DocType: Production Order Operation,Planned Start Time,계획 시작 시간
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,할당
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,닫기 대차 대조표 및 책 이익 또는 손실.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","이미 다른 UOM 일부 거래 (들)을 만들었습니다 \ 있기 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 기본 UOM을 변경하려면, \ 사용 stock 모듈에서 도구 'UOM 유틸리티 바꾸기."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,환율이 통화를 다른 통화로 지정
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,견적 {0} 취소
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,견적 {0} 취소
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,총 발행 금액
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,직원은 {0} {1}에 휴가를했다.출석을 표시 할 수 없습니다.
 DocType: Sales Partner,Targets,대상
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,이 루트 고객 그룹 및 편집 할 수 없습니다.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,회계 항목을 입력하기 전에  계정 차트를설정해주세요
 DocType: Purchase Invoice,Ignore Pricing Rule,가격 규칙을 무시
-sites/assets/js/list.min.js +24,Cancelled,취소
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,취소
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,급여 구조에 날짜 직원 가입 날짜보다 적은 수 없습니다.
 DocType: Employee Education,Graduate,졸업생
 DocType: Leave Block List,Block Days,블록 일
 DocType: Journal Entry,Excise Entry,소비세 항목
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},경고 : 판매 주문 {0} 이미 고객의 구매 주문에 대해 존재 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},경고 : 판매 주문 {0} 이미 고객의 구매 주문에 대해 존재 {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,재고품 받았지만 청구하
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,총 급여 + 연체 금액 + 현금화 금액 - 총 공제
 DocType: Monthly Distribution,Distribution Name,배포 이름
 DocType: Features Setup,Sales and Purchase,판매 및 구매
-DocType: Purchase Order Item,Material Request No,자료 요청 없음
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
+DocType: Supplier Quotation Item,Material Request No,자료 요청 없음
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,고객의 통화는 회사의 기본 통화로 변환하는 속도에
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}이 목록에서 성공적으로 탈퇴했다.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),인터넷 속도 (회사 통화)
-apps/frappe/frappe/templates/base.html +132,Added,추가
+apps/frappe/frappe/templates/base.html +134,Added,추가
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,지역의 나무를 관리합니다.
 DocType: Journal Entry Account,Sales Invoice,판매 송장
 DocType: Journal Entry Account,Party Balance,파티 밸런스
 DocType: Sales Invoice Item,Time Log Batch,시간 로그 배치
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,할인에 적용을 선택하세요
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,할인에 적용을 선택하세요
 DocType: Company,Default Receivable Account,기본 채권 계정
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,위의 선택 기준에 대해 지불 한 총 연봉 은행 항목 만들기
 DocType: Stock Entry,Material Transfer for Manufacture,제조에 대한 자료 전송
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,관련 항목을보세요
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,재고에 대한 회계 항목
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,코 이닝
 DocType: Sales Invoice,Sales Team1,판매 Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,{0} 항목이 존재하지 않습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,{0} 항목이 존재하지 않습니다
 DocType: Sales Invoice,Customer Address,고객 주소
 apps/frappe/frappe/desk/query_report.py +136,Total,합계
 DocType: Purchase Invoice,Apply Additional Discount On,추가 할인에 적용
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,품질 검사
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,매우 작은
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,형성 스프레이
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,계정 {0} 동결
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,계정 {0} 동결
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,조직에 속한 계정의 별도의 차트와 법인 / 자회사.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","음식, 음료 및 담배"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL 또는 BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,수수료율은 100보다 큰 수 없습니다
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,최소 재고 수준
 DocType: Stock Entry,Subcontract,하청
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,첫 번째 {0}을 입력하세요
 DocType: Production Planning Tool,Get Items From Sales Orders,판매 주문에서 항목 가져 오기
 DocType: Production Order Operation,Actual End Time,실제 종료 시간
 DocType: Production Planning Tool,Download Materials Required,필요한 재료 다운로드하십시오
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,예약된
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","아니오"와 "판매 상품은" "주식의 항목으로"여기서 "예"인 항목을 선택하고 다른 제품 번들이없는하세요
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,고르지 개월에 걸쳐 목표를 배포하는 월별 분포를 선택합니다.
 DocType: Purchase Invoice Item,Valuation Rate,평가 평가
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,가격리스트 통화 선택하지
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,가격리스트 통화 선택하지
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,항목 행 {0} : {1} 위 '구매 영수증'테이블에 존재하지 않는 구매 영수증
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},직원 {0}이 (가) 이미 사이에 {1}를 신청했다 {2}와 {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},직원 {0}이 (가) 이미 사이에 {1}를 신청했다 {2}와 {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,프로젝트 시작 날짜
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,까지
 DocType: Rename Tool,Rename Log,로그인에게 이름 바꾸기
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,만 잎 노드는 트랜잭션에 허용
 DocType: Expense Claim,Expense Approver,지출 승인
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,구매 영수증 품목 공급
-sites/assets/js/erpnext.min.js +48,Pay,지불
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,지불
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,날짜 시간에
 DocType: SMS Settings,SMS Gateway URL,SMS 게이트웨이 URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS 전달 상태를 유지하기위한 로그
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,연마
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,포장 축소
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,보류 활동
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,보류 활동
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,확인 된
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,공급 업체> 공급 업체 유형
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,메
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,신문 발행인
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,회계 연도 선택
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,제련
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,이 기록에 대한 허가 승인자입니다.'상태'를 업데이트하고 저장하십시오
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,재정렬 수준
 DocType: Attendance,Attendance Date,출석 날짜
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,급여 이별은 적립 및 차감에 따라.
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,기존의 트랜잭션 비용 센터는 그룹으로 변환 할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,감가 상각
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),공급 업체 (들)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,잘못된 기간
 DocType: Customer,Credit Limit,신용 한도
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,거래 종류 선택
 DocType: GL Entry,Voucher No,바우처 없음
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,조
 DocType: Customer,Address and Contact,주소와 연락처
 DocType: Customer,Last Day of the Next Month,다음 달의 마지막 날
 DocType: Employee,Feedback,피드백
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,MAINT. 예정
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,MAINT. 예정
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,연마 제트 가공
 DocType: Stock Settings,Freeze Stock Entries,동결 재고 항목
 DocType: Website Settings,Website Settings,웹 사이트 설정
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,발신
 DocType: Material Request,Requested For,에 대해 요청
 DocType: Quotation Item,Against Doctype,문서 종류에 대하여
 DocType: Delivery Note,Track this Delivery Note against any Project,모든 프로젝트에 대해이 배달 주를 추적
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,루트 계정은 삭제할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,루트 계정은 삭제할 수 없습니다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,보기 재고 항목
 ,Is Primary Address,기본 주소는
 DocType: Production Order,Work-in-Progress Warehouse,작업중인 창고
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},참고 # {0} 년 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},참고 # {0} 년 {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,주소를 관리
 DocType: Pricing Rule,Item Code,상품 코드
 DocType: Production Planning Tool,Create Production Orders,생산 오더를 생성
@@ -2460,14 +2471,14 @@ DocType: Journal Entry,User Remark,사용자 비고
 DocType: Lead,Market Segment,시장 세분
 DocType: Communication,Phone,휴대폰
 DocType: Employee Internal Work History,Employee Internal Work History,직원 내부 작업 기록
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),결산 (박사)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),결산 (박사)
 DocType: Contact,Passive,수동
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,일련 번호 {0} 재고가없는
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,거래를 판매에 대한 세금 템플릿.
 DocType: Sales Invoice,Write Off Outstanding Amount,잔액을 떨어져 쓰기
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","당신이 자동 반복 송장을 필요로하는 경우에 선택합니다.모든 판매 청구서를 제출 한 후, 반복되는 부분은 볼 수 있습니다."
 DocType: Account,Accounts Manager,계정 관리자
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',시간 로그는 {0} '제출'해야
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',시간 로그는 {0} '제출'해야
 DocType: Stock Settings,Default Stock UOM,기본 재고 UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),활동 유형에 따라 요금 원가 계산 (시간당)
 DocType: Production Planning Tool,Create Material Requests,자료 요청을 만듭니다
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,은행 계정 조정
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,업데이트 받기
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,자료 요청 {0} 취소 또는 정지
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,몇 가지 샘플 레코드 추가
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,관리를 남겨주세요
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,관리를 남겨주세요
 DocType: Event,Groups,그룹
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,계정별 그룹
 DocType: Sales Order,Fully Delivered,완전 배달
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,판매 부가항목
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 계정에 대한 예산은 {1} 코스트 센터에 대해 {2} {3}에 의해 초과
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,전달 잎을 운반
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','시작일자'는  '마감일자'이후이 여야합니다
 ,Stock Projected Qty,재고 수량을 예상
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
 DocType: Sales Order,Customer's Purchase Order,고객의 구매 주문
 DocType: Warranty Claim,From Company,회사에서
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,값 또는 수량
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,소매상 인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,모든 공급 유형
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,항목이 자동으로 번호가되어 있지 않기 때문에 상품 코드는 필수입니다
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},견적 {0}은 유형 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,항목이 자동으로 번호가되어 있지 않기 때문에 상품 코드는 필수입니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},견적 {0}은 유형 {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,유지 보수 일정 상품
 DocType: Sales Order,%  Delivered,% 배달
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,당좌 차월 계정
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,급여 슬립을
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,...의 마개를 뽑다
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,찾아 BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,보안 대출
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,최고 제품
@@ -2523,7 +2532,7 @@ DocType: Appraisal,Appraisal,펑가
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,분실 거품 주조
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,그림
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,날짜는 반복된다
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},남겨 승인 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},남겨 승인 중 하나 여야합니다 {0}
 DocType: Hub Settings,Seller Email,판매자 이메일
 DocType: Project,Total Purchase Cost (via Purchase Invoice),총 구매 비용 (구매 송장을 통해)
 DocType: Workstation Working Hour,Start Time,시작 시간
@@ -2537,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),순 금액 (회사 통화)
 DocType: BOM Operation,Hour Rate,시간 비율
 DocType: Stock Settings,Item Naming By,상품 이름 지정으로
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,견적에서
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},또 다른 기간 결산 항목은 {0} 이후 한 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,견적에서
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},또 다른 기간 결산 항목은 {0} 이후 한 {1}
 DocType: Production Order,Material Transferred for Manufacturing,재료 제조에 대한 양도
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,계정 {0}이 존재하지 않습니다
 DocType: Purchase Receipt Item,Purchase Order Item No,구매 주문 품목 아니오
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,검사 필수
 DocType: Purchase Invoice Item,PR Detail,PR의 세부 사항
 DocType: Sales Order,Fully Billed,완전 청구
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,손에 현금
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},배송 창고 재고 항목에 필요한 {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},배송 창고 재고 항목에 필요한 {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),패키지의 총 무게.보통 그물 무게 + 포장 재료의 무게. (프린트)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,이 역할이있는 사용자는 고정 된 계정에 대한 계정 항목을 수정 / 동결 계정을 설정하고 만들 수 있습니다
 DocType: Serial No,Is Cancelled,취소된다
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,내 선적
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,내 선적
 DocType: Journal Entry,Bill Date,청구 일자
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","우선 순위가 가장 높은 가격에 여러 규칙이있는 경우에도, 그 다음 다음 내부의 우선 순위가 적용됩니다"
 DocType: Supplier,Supplier Details,공급 업체의 상세 정보
@@ -2568,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,송금
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,은행 계좌를 선택하세요
 DocType: Newsletter,Create and Send Newsletters,작성 및 보내기 뉴스 레터
-sites/assets/js/report.min.js +107,From Date must be before To Date,날짜 누계 이전이어야합니다
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,날짜 누계 이전이어야합니다
 DocType: Sales Order,Recurring Order,반복 주문
 DocType: Company,Default Income Account,기본 수입 계정
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,고객 그룹 / 고객
@@ -2583,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,재고 UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
 ,Projected,예상
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},일련 번호 {0} 창고에 속하지 않는 {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,주 : 시스템이 항목에 대한 납품에 이상 - 예약 확인하지 않습니다 {0} 수량 또는 금액으로 0이됩니다
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,주 : 시스템이 항목에 대한 납품에 이상 - 예약 확인하지 않습니다 {0} 수량 또는 금액으로 0이됩니다
 DocType: Notification Control,Quotation Message,견적 메시지
 DocType: Issue,Opening Date,Opening 날짜
 DocType: Journal Entry,Remark,비고
 DocType: Purchase Receipt Item,Rate and Amount,속도 및 양
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,지루한
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,판매 주문에서
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,판매 주문에서
 DocType: Blog Category,Parent Website Route,상위 웹 사이트 루트
 DocType: Sales Order,Not Billed,청구되지 않음
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,두 창고는 같은 회사에 속해 있어야합니다
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,주소록은 아직 추가되지 않습니다.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,주소록은 아직 추가되지 않습니다.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,활성 없음
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,송장 전기 일에 대하여
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,착륙 비용 바우처 금액
 DocType: Time Log,Batched for Billing,결제를위한 일괄 처리
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,공급 업체에 의해 제기 된 지폐입니다.
 DocType: POS Profile,Write Off Account,감액계정
-sites/assets/js/erpnext.min.js +26,Discount Amount,할인 금액
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,할인 금액
 DocType: Purchase Invoice,Return Against Purchase Invoice,에 대하여 구매 송장을 돌려줍니다
 DocType: Item,Warranty Period (in days),(일) 보증 기간
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,예) VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,항목 4
 DocType: Journal Entry Account,Journal Entry Account,분개 계정
 DocType: Shopping Cart Settings,Quotation Series,견적 시리즈
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",항목 ({0}) 항목의 그룹 이름을 변경하거나 항목의 이름을 변경하시기 바랍니다 같은 이름을 가진
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",항목 ({0}) 항목의 그룹 이름을 변경하거나 항목의 이름을 변경하시기 바랍니다 같은 이름을 가진
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,열간 금속 가스
 DocType: Sales Order Item,Sales Order Date,판매 주문 날짜
 DocType: Sales Invoice Item,Delivered Qty,납품 수량
@@ -2639,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,"고객, 공급 업체의 자세한 사항"
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,설정
 DocType: Lead,Lead Owner,리드 소유자
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,창고가 필요합니다
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,창고가 필요합니다
 DocType: Employee,Marital Status,결혼 여부
 DocType: Stock Settings,Auto Material Request,자동 자료 요청
 DocType: Time Log,Will be updated when billed.,청구 할 때 업데이트됩니다.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,창고에서 이용 가능한 일괄 수량
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,현재 BOM 및 새로운 BOM은 동일 할 수 없습니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,은퇴 날짜 가입 날짜보다 커야합니다
 DocType: Sales Invoice,Against Income Account,손익 계정에 대한
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,재고 업데이트
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,항목에 대해 서로 다른 UOM가 잘못 (총) 순 중량 값으로 이어질 것입니다.각 항목의 순 중량이 동일한 UOM에 있는지 확인하십시오.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM 평가
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,배달 주에서 항목을 뽑아주세요
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,배달 주에서 항목을 뽑아주세요
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,저널 항목은 {0}-않은 링크 된
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","형 이메일, 전화, 채팅, 방문 등의 모든 통신 기록"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,회사에 라운드 오프 비용 센터를 언급 해주십시오
 DocType: Purchase Invoice,Terms,약관
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,새로 만들기
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,새로 만들기
 DocType: Buying Settings,Purchase Order Required,주문 필수에게 구입
 ,Item-wise Sales History,상품이 많다는 판매 기록
 DocType: Expense Claim,Total Sanctioned Amount,전체 금액의인가를
@@ -2681,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,급여 공제 전표
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,노트
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,첫 번째 그룹 노드를 선택합니다.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},목적 중 하나 여야합니다 {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,양식을 작성하고 저장
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,양식을 작성하고 저장
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,그들의 최신의 재고 상황에 따라 모든 원료가 포함 된 보고서를 다운로드
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,직면
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,커뮤니티 포럼
 DocType: Leave Application,Leave Balance Before Application,응용 프로그램의 앞에 균형을 남겨주세요
 DocType: SMS Center,Send SMS,SMS 보내기
 DocType: Company,Default Letter Head,편지 헤드 기본
 DocType: Time Log,Billable,청구
 DocType: Authorization Rule,This will be used for setting rule in HR module,이것은 HR 모듈 규칙을 설정하는 데 사용할
 DocType: Account,Rate at which this tax is applied,요금이 세금이 적용되는
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,재주문 수량
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,재주문 수량
 DocType: Company,Stock Adjustment Account,재고 조정 계정
 DocType: Journal Entry,Write Off,탕치다
 DocType: Time Log,Operation ID,작업 ID
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","할인 필드는 구매 주문, 구입 영수증, 구매 송장에 사용할 수"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,새로운 계정의 이름입니다. 참고 : 고객 및 공급 업체에 대한 계정을 생성하지 마십시오
 DocType: Report,Report Type,보고서 유형
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,로딩중
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,로딩중
 DocType: BOM Replace Tool,BOM Replace Tool,BOM 교체도구
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,국가 현명한 기본 주소 템플릿
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
+DocType: Sales Order Item,Supplier delivers to Customer,공급자는 고객에게 제공
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,쇼 세금 해체
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,데이터 가져 오기 및 내보내기
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',당신이 생산 활동에 참여합니다.항목을 활성화는 '제조'
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,송장 전기 일
 DocType: Sales Invoice,Rounded Total,둥근 총
 DocType: Product Bundle,List items that form the package.,패키지를 형성하는 목록 항목.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,백분율 할당은 100 % 같아야
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
 DocType: Company,Default Cash Account,기본 현금 계정
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,회사 (안 고객 또는 공급 업체) 마스터.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date','예상 배달 날짜'를 입력하십시오
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','예상 배달 날짜'를 입력하십시오
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,지불 금액 + 금액 오프 쓰기 총합보다 클 수 없습니다
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} 항목에 대한 유효한 배치 번호없는 {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},참고 : 허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
@@ -2740,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","행 {0} : 수량이 창고에 avalable하지 {1}에 {2} {3}.
  가능 수량은 {4}, 수량을 전송 : {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,항목 3
+DocType: Purchase Order,Customer Contact Email,고객 연락처 이메일
 DocType: Event,Sunday,일요일
 DocType: Sales Team,Contribution (%),기여도 (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,책임
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,템플릿
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,템플릿
 DocType: Sales Person,Sales Person Name,영업 사원명
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,표에이어야 1 송장을 입력하십시오
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,사용자 추가
@@ -2753,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),실제 시작 날짜 (시간 로
 DocType: Stock Reconciliation Item,Before reconciliation,계정조정전
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},에 {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),추가 세금 및 수수료 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
 DocType: Sales Order,Partly Billed,일부 청구
 DocType: Item,Default BOM,기본 BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2761,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,총 발행 AMT 사의
 DocType: Time Log Batch,Total Hours,총 시간
 DocType: Journal Entry,Printing Settings,인쇄 설정
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,자동차
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},잎 유형에 대한 {0}이 (가) 이미 직원에 할당 된 {1} 회계 연도에 대한 {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,항목이 필요합니다
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,금속 사출 성형
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,배달 주에서
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,배달 주에서
 DocType: Time Log,From Time,시간에서
 DocType: Notification Control,Custom Message,사용자 지정 메시지
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,투자 은행
@@ -2782,10 +2795,10 @@ DocType: Newsletter,A Lead with this email id should exist,이 이메일 ID와 
 DocType: Stock Entry,From BOM,BOM에서
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,기본
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} 전에 재고 거래는 동결
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule','생성 일정'을 클릭 해주세요
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,다른 날짜로 반나절 휴직 일로부터 동일해야합니다
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','생성 일정'을 클릭 해주세요
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,다른 날짜로 반나절 휴직 일로부터 동일해야합니다
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","예) kg, 단위, NOS, M"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,당신이 참조 날짜를 입력 한 경우 참조 번호는 필수입니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,당신이 참조 날짜를 입력 한 경우 참조 번호는 필수입니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,가입 날짜는 출생의 날짜보다 커야합니다
 DocType: Salary Structure,Salary Structure,급여 체계
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,7 +2806,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  충돌을 해결하십시오.가격 규칙 : {0}"
 DocType: Account,Bank,은행
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,항공 회사
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,문제의 소재
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,문제의 소재
 DocType: Material Request Item,For Warehouse,웨어 하우스
 DocType: Employee,Offer Date,제공 날짜
 DocType: Hub Settings,Access Token,액세스 토큰
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,영업 시간
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,일자 및 끝
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,증권 및 상품 교환
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
+DocType: Delivery Note Item,From Warehouse,창고에서
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,드릴링
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,블로우 성형
 DocType: Purchase Taxes and Charges,Valuation and Total,평가 및 총
@@ -2837,11 +2851,12 @@ DocType: C-Form,Amended From,개정
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,원료
 DocType: Leave Application,Follow via Email,이메일을 통해 수행
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,할인 금액 후 세액
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,이 계정에 하위계정이 존재합니다.이 계정을 삭제할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,이 계정에 하위계정이 존재합니다.이 계정을 삭제할 수 없습니다.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,목표 수량 또는 목표량 하나는 필수입니다
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
-DocType: Leave Allocation,Carry Forward,이월하다
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,날짜를 열기 날짜를 닫기 전에해야
+DocType: Leave Control Panel,Carry Forward,이월하다
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,기존의 트랜잭션 비용 센터 원장으로 변환 할 수 없습니다
 DocType: Department,Days for which Holidays are blocked for this department.,휴일이 부서 차단하는 일.
 ,Produced,생산
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),총 AMT ()
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,엔터테인먼트 & 레저
 DocType: Purchase Order,The date on which recurring order will be stop,반복되는 순서가 중지됩니다 된 날짜
 DocType: Quality Inspection,Item Serial No,상품 시리얼 번호
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} 감소해야하거나 오버 플로우 내성을 증가한다
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} 감소해야하거나 오버 플로우 내성을 증가한다
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,전체 현재
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,시간
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","직렬화 된 항목 {0} 재고 조정을 사용 \
  업데이트 할 수 없습니다"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,공급 업체에 자료를 전송
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,공급 업체에 자료를 전송
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,새로운 시리얼 번호는 창고를 가질 수 없습니다.창고 재고 항목 또는 구입 영수증으로 설정해야합니다
 DocType: Lead,Lead Type,리드 타입
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,견적을 만들기
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,이러한 모든 항목이 이미 청구 된
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,이러한 모든 항목이 이미 청구 된
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0}에 의해 승인 될 수있다
 DocType: Shipping Rule,Shipping Rule Conditions,배송 규칙 조건
 DocType: BOM Replace Tool,The new BOM after replacement,교체 후 새로운 BOM
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,C-양식
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,작업 ID가 설정되어 있지
 DocType: Production Order,Planned Start Date,계획 시작 날짜
 DocType: Serial No,Creation Document Type,작성 문서 형식
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,MAINT. 방문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,MAINT. 방문
 DocType: Leave Type,Is Encash,현금화는
 DocType: Purchase Invoice,Mobile No,모바일 없음
 DocType: Payment Tool,Make Journal Entry,저널 항목을 만듭니다
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,할당 된 새로운 잎
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,프로젝트 와이즈 데이터는 견적을 사용할 수 없습니다
 DocType: Project,Expected End Date,예상 종료 날짜
 DocType: Appraisal Template,Appraisal Template Title,평가 템플릿 제목
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,광고 방송
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,광고 방송
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,상위 항목 {0} 주식 항목이 아니어야합니다
 DocType: Cost Center,Distribution Id,배신 ID
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,멋진 서비스
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} 속성에 대한 값의 범위 내에 있어야합니다 {1}에 {2}의 단위로 {3}
 DocType: Tax Rule,Sales,판매
 DocType: Stock Entry Detail,Basic Amount,기본 금액
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,CR
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
+DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,미수금 기본
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,톱질
 DocType: Tax Rule,Billing State,결제 주
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,라미네이팅
 DocType: Item Reorder,Transfer,이체
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
 DocType: Authorization Rule,Applicable To (Employee),에 적용 (직원)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,마감일은 필수입니다
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,소매의
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,고객 {0}이 (가) 없습니다
 DocType: Attendance,Absent,없는
 DocType: Product Bundle,Product Bundle,번들 제품
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},행 {0} : 잘못된 참조 {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,분쇄
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,구매세금 및 요금 템플릿
 DocType: Upload Attendance,Download Template,다운로드 템플릿
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,Remarks
 DocType: Purchase Order Item Supplied,Raw Material Item Code,원료 상품 코드
 DocType: Journal Entry,Write Off Based On,에 의거 오프 쓰기
 DocType: Features Setup,POS View,POS보기
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,일련 번호의 설치 기록
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,일련 번호의 설치 기록
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,연속 주조
-sites/assets/js/erpnext.min.js +10,Please specify a,를 지정하십시오
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,를 지정하십시오
 DocType: Offer Letter,Awaiting Response,응답을 기다리는 중
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,위
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,콜드 크기 조정
 DocType: Salary Slip,Earning & Deduction,당기순이익/손실
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,계정 {0} 그룹이 될 수 없습니다
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,지방
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,선택.이 설정은 다양한 거래를 필터링하는 데 사용됩니다.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,선택.이 설정은 다양한 거래를 필터링하는 데 사용됩니다.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
 DocType: Holiday List,Weekly Off,주간 끄기
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","예를 들어, 2012 년, 2012-13"
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,부푼
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,증발 패턴 주조
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,접대비
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,판매 송장은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,나이
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,판매 송장은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,나이
 DocType: Time Log,Billing Amount,결제 금액
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,항목에 대해 지정된 잘못된 수량 {0}.수량이 0보다 커야합니다.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,휴가 신청.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,기존 거래 계정은 삭제할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,기존 거래 계정은 삭제할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,법률 비용
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","자동 주문은 05, 28 등의 예를 들어 생성되는 달의 날"
 DocType: Sales Invoice,Posting Time,등록시간
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,로고
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,당신은 저장하기 전에 시리즈를 선택하도록 강제하려는 경우이 옵션을 선택합니다.당신이 선택하면 기본이되지 않습니다.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},시리얼 번호와 어떤 항목이 없습니다 {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,열기 알림
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,열기 알림
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,직접 비용
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,당신은 정말이 자료 요청을 멈추지 하시겠습니까?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,새로운 고객 수익
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,여행 비용
 DocType: Maintenance Visit,Breakdown,고장
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,날짜에로
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,래핑
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,근신
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,기본 창고 재고 상품에 대한 필수입니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,기본 창고 재고 상품에 대한 필수입니다.
 DocType: Feed,Full Name,전체 이름
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,결말
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},달의 급여의 지급 {0}과 연도 {1}
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,계정에 연
 DocType: Buying Settings,Default Supplier Type,기본 공급자 유형
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,채석
 DocType: Production Order,Total Operating Cost,총 영업 비용
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,참고 : {0} 항목을 여러 번 입력
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,참고 : {0} 항목을 여러 번 입력
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,모든 연락처.
 DocType: Newsletter,Test Email Id,테스트 이메일 아이디
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,회사의 약어
@@ -3101,11 +3117,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,리드
 DocType: Stock Settings,Role Allowed to edit frozen stock,동결 재고을 편집 할 수 있는 역할
 ,Territory Target Variance Item Group-Wise,지역 대상 분산 상품 그룹 와이즈
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,모든 고객 그룹
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,세금 템플릿은 필수입니다.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,계정 {0} : 부모 계정 {1}이 (가) 없습니다
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),가격 목록 비율 (회사 통화)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} 상태가 '중지'된다
 DocType: Account,Temporary,일시적인
 DocType: Address,Preferred Billing Address,선호하는 결제 주소
 DocType: Monthly Distribution Percentage,Percentage Allocation,비율 할당
@@ -3123,13 +3138,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,항목 와이즈 세금
 DocType: Purchase Order Item,Supplier Quotation,공급 업체 견적
 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,다림질
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1}이 정지 될
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}이 정지 될
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
 DocType: Lead,Add to calendar on this date,이 날짜에 캘린더에 추가
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,비용을 추가하는 규칙.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,다가오는 이벤트
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,다가오는 이벤트
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,고객이 필요합니다
 DocType: Letter Head,Letter Head,레터 헤드
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,빠른 입력
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} 반환을위한 필수입니다
 DocType: Purchase Order,To Receive,받다
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,피팅 축소
@@ -3152,25 +3168,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,이어야 한 창고는 필수입니다
 DocType: Serial No,Out of Warranty,보증 기간 만료
 DocType: BOM Replace Tool,Replace,교체
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,측정의 기본 단위를 입력하십시오
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,측정의 기본 단위를 입력하십시오
 DocType: Purchase Invoice Item,Project Name,프로젝트 이름
 DocType: Supplier,Mention if non-standard receivable account,언급 표준이 아닌 채권 계정의 경우
 DocType: Workflow State,Edit,편집
 DocType: Journal Entry Account,If Income or Expense,만약 소득 또는 비용
 DocType: Features Setup,Item Batch Nos,상품 배치 NOS
 DocType: Stock Ledger Entry,Stock Value Difference,재고 가치의 차이
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,인적 자원
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,인적 자원
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,지불 화해 지불
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,법인세 자산
 DocType: BOM Item,BOM No,BOM 없음
 DocType: Contact Us Settings,Pincode,PIN 코드
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,분개 {0} {1} 또는 이미 다른 쿠폰에 대해 일치하는 계정이 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,분개 {0} {1} 또는 이미 다른 쿠폰에 대해 일치하는 계정이 없습니다
 DocType: Item,Moving Average,움직임 평균
 DocType: BOM Replace Tool,The BOM which will be replaced,대체됩니다 BOM
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,새로운 재고 UOM은 현재 재고 UOM 달라야합니다
 DocType: Account,Debit,직불
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,잎은 0.5의 배수로 할당해야합니다
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,잎은 0.5의 배수로 할당해야합니다
 DocType: Production Order,Operation Cost,운영 비용
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,. csv 파일에서 출석을 업로드
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,뛰어난 AMT 사의
@@ -3178,7 +3194,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,목표
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","이 문제를 할당 막대에서 ""할당""버튼을 사용하십시오."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],고정 재고 이전보다 [일]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","둘 이상의 가격 결정 규칙은 상기 조건에 따라 발견되면, 우선 적용된다.기본 값이 0 (공백) 동안 우선 순위는 0-20 사이의 숫자입니다.숫자가 높을수록 동일한 조건으로 여러 가격 규칙이있는 경우는 우선 순위를 의미합니다."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,송장에 대하여
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,회계 연도 : {0} 수행하지 존재
 DocType: Currency Exchange,To Currency,통화로
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,다음 사용자가 블록 일에 대한 허가 신청을 승인 할 수 있습니다.
@@ -3207,7 +3222,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),비
 DocType: Stock Entry Detail,Additional Cost,추가 비용
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,회계 연도 종료일
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","바우처를 기반으로 필터링 할 수 없음, 바우처로 그룹화하는 경우"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,공급 업체의 견적을
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,공급 업체의 견적을
 DocType: Quality Inspection,Incoming,수신
 DocType: BOM,Materials Required (Exploded),필요한 재료 (분해)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),무급 휴직 적립 감소 (LWP)
@@ -3215,10 +3230,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},행 번호 {0} : 일련 번호 {1}과 일치하지 않는 {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,캐주얼 허가
 DocType: Batch,Batch ID,일괄 처리 ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},참고 : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},참고 : {0}
 ,Delivery Note Trends,배송 참고 동향
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,이번 주 요약
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} 행의 구입 또는 하위 계약 품목이어야 {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} 행의 구입 또는 하위 계약 품목이어야 {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,계정 : {0} 만 재고 거래를 통해 업데이트 할 수 있습니다
 DocType: GL Entry,Party,파티
 DocType: Sales Order,Delivery Date,* 인수일
@@ -3231,7 +3246,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,평균. 구매 비율
 DocType: Task,Actual Time (in Hours),(시간) 실제 시간
 DocType: Employee,History In Company,회사의 역사
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,뉴스 레터
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,뉴스 레터
 DocType: Address,Shipping,배송
 DocType: Stock Ledger Entry,Stock Ledger Entry,재고 원장 입력
 DocType: Department,Leave Block List,차단 목록을 남겨주세요
@@ -3250,7 +3265,7 @@ DocType: Account,Auditor,감사
 DocType: Purchase Order,End date of current order's period,현재 주문의 기간의 종료일
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,제공 문자를 확인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,반환
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,변형에 대한 측정의 기본 단위는 템플릿으로 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,변형에 대한 측정의 기본 단위는 템플릿으로 동일해야합니다
 DocType: DocField,Fold,겹
 DocType: Production Order Operation,Production Order Operation,생산 오더 운영
 DocType: Pricing Rule,Disable,사용 안함
@@ -3282,7 +3297,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,에 대한 보고서
 DocType: SMS Settings,Enter url parameter for receiver nos,수신기 NOS에 대한 URL 매개 변수를 입력
 DocType: Sales Invoice,Paid Amount,지불 금액
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',마감 계정 {0}는  '부채계정'이어야합니다
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',마감 계정 {0}는  '부채계정'이어야합니다
 ,Available Stock for Packing Items,항목 포장 재고품
 DocType: Item Variant,Item Variant,항목 변형
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,다른 기본이 없기 때문에 기본적으로이 주소 템플릿 설정
@@ -3290,7 +3305,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,품질 관리
 DocType: Production Planning Tool,Filter based on customer,필터 고객에 따라
 DocType: Payment Tool Detail,Against Voucher No,바우처 없음에 대하여
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},제품의 수량을 입력 해주십시오 {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},제품의 수량을 입력 해주십시오 {0}
 DocType: Employee External Work History,Employee External Work History,직원 외부 일 역사
 DocType: Tax Rule,Purchase,구입
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,잔고 수량
@@ -3327,28 +3342,29 @@ Note: BOM = Bill of Materials","다른 ** 항목에 ** ** 항목의 집계 그
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},일련 번호는 항목에 대해 필수입니다 {0}
 DocType: Item Variant Attribute,Attribute,속성
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,범위 /에서 지정하십시오
-sites/assets/js/desk.min.js +7652,Created By,제작
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,제작
 DocType: Serial No,Under AMC,AMC에서
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,항목 평가 비율은 착륙 비용 바우처 금액을 고려하여 계산됩니다
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,트랜잭션을 판매의 기본 설정.
 DocType: BOM Replace Tool,Current BOM,현재 BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,일련 번호 추가
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,일련 번호 추가
 DocType: Production Order,Warehouses,창고
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,인쇄 및 정지
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,그룹 노드
 DocType: Payment Reconciliation,Minimum Amount,최소 금액
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,업데이트 완성품
 DocType: Workstation,per hour,시간당
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},계열 {0} 이미 사용될 {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},계열 {0} 이미 사용될 {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,웨어 하우스 (영구 재고)에 대한 계정은이 계정이 생성됩니다.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,재고 원장 항목이 창고에 존재하는웨어 하우스는 삭제할 수 없습니다.
 DocType: Company,Distribution,유통
-sites/assets/js/erpnext.min.js +50,Amount Paid,지불 금액
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,지불 금액
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,프로젝트 매니저
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,파견
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,최대 할인 품목을 허용 : {0} {1} %이
 DocType: Customer,Default Taxes and Charges,기본 세금 및 요금
 DocType: Account,Receivable,받을 수있는
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,행 번호 {0} : 구매 주문이 이미 존재로 공급 업체를 변경할 수 없습니다
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,설정 신용 한도를 초과하는 거래를 제출하도록 허용 역할.
 DocType: Sales Invoice,Supplier Reference,공급 업체 참조
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","선택하면, 서브 어셈블리 항목에 대한 BOM은 원료를 얻기 위해 고려 될 것입니다.그렇지 않으면, 모든 서브 어셈블리 항목은 원료로 처리됩니다."
@@ -3385,8 +3401,8 @@ DocType: Email Digest,Add/Remove Recipients,추가 /받는 사람을 제거
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},거래 정지 생산 오더에 대해 허용되지 {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",기본값으로이 회계 연도 설정하려면 '기본값으로 설정'을 클릭
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),지원 전자 우편 ID의 설정받는 서버. (예를 들어 support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,부족 수량
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
 DocType: Salary Slip,Salary Slip,급여 전표
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,버니 싱
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'마감일자'필요
@@ -3399,6 +3415,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","체크 거래의 하나가 ""제출""하면, 이메일 팝업이 자동으로 첨부 파일로 트랜잭션, 트랜잭션에 관련된 ""연락처""로 이메일을 보내 열었다.사용자는 나 이메일을 보낼 수도 있고 그렇지 않을 수도 있습니다."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,전역 설정
 DocType: Employee Education,Employee Education,직원 교육
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
 DocType: Salary Slip,Net Pay,실질 임금
 DocType: Account,Account,계정
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,일련 번호 {0}이 (가) 이미 수신 된
@@ -3431,7 +3448,7 @@ DocType: BOM,Manufacturing User,제조 사용자
 DocType: Purchase Order,Raw Materials Supplied,공급 원료
 DocType: Purchase Invoice,Recurring Print Format,반복 인쇄 형식
 DocType: Communication,Series,시리즈
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,예상 배송 날짜는 구매 주문 날짜 전에 할 수 없습니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,예상 배송 날짜는 구매 주문 날짜 전에 할 수 없습니다
 DocType: Appraisal,Appraisal Template,평가 템플릿
 DocType: Communication,Email,이메일
 DocType: Item Group,Item Classification,품목 분류
@@ -3487,6 +3504,7 @@ DocType: HR Settings,Payroll Settings,급여 설정
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,연결되지 않은 청구서 지불을 일치시킵니다.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,장소 주문
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,루트는 부모의 비용 센터를 가질 수 없습니다
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,선택 브랜드 ...
 DocType: Sales Invoice,C-Form Applicable,해당 C-양식
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
 DocType: Supplier,Address and Contacts,주소 및 연락처
@@ -3497,7 +3515,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,뛰어난 쿠폰 받기
 DocType: Warranty Claim,Resolved By,에 의해 해결
 DocType: Appraisal,Start Date,시작 날짜
-sites/assets/js/desk.min.js +7629,Value,가치
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,가치
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,기간 동안 잎을 할당합니다.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,확인하려면 여기를 클릭하십시오
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,계정 {0} : 당신은 부모 계정 자체를 할당 할 수 없습니다
@@ -3513,14 +3531,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,허용 보관 용 액세스
 DocType: Dropbox Backup,Weekly,주l
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,예. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,수신
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,수신
 DocType: Maintenance Visit,Fully Completed,완전히 완료
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0} % 완료
 DocType: Employee,Educational Qualification,교육 자격
 DocType: Workstation,Operating Costs,운영 비용
 DocType: Employee Leave Approver,Employee Leave Approver,직원 허가 승인자
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} 성공적으로 우리의 뉴스 레터 목록에 추가되었습니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,전자빔 가공
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,구매 마스터 관리자
@@ -3533,7 +3551,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc의 문서 종류
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,가격 추가/편집
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,코스트 센터의 차트
 ,Requested Items To Be Ordered,주문 요청 항목
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,내 주문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,내 주문
 DocType: Price List,Price List Name,가격리스트 이름
 DocType: Time Log,For Manufacturing,제조
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,합계
@@ -3544,7 +3562,7 @@ DocType: Account,Income,수익
 DocType: Industry Type,Industry Type,산업 유형
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,문제가 발생했습니다!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,판매 송장 {0}이 (가) 이미 제출되었습니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,판매 송장 {0}이 (가) 이미 제출되었습니다
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,완료일
 DocType: Purchase Invoice Item,Amount (Company Currency),금액 (회사 통화)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,다이 캐스팅
@@ -3558,10 +3576,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,년
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,판매 시점 프로필
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS 설정을 업데이트하십시오
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,이미 청구 시간 로그 {0}
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,이미 청구 시간 로그 {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,무담보 대출
 DocType: Cost Center,Cost Center Name,코스트 센터의 이름
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,{0} 항목을 일련 번호로 {1}이 (가) 이미 설치되어 있습니다
 DocType: Maintenance Schedule Detail,Scheduled Date,예약 된 날짜
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,총 유료 AMT 사의
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 자보다 큰 메시지는 여러 개의 메시지로 분할됩니다
@@ -3569,10 +3586,10 @@ DocType: Purchase Receipt Item,Received and Accepted,접수 및 승인
 ,Serial No Service Contract Expiry,일련 번호 서비스 계약 유효
 DocType: Item,Unit of Measure Conversion,측정 단위 변환
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,직원은 변경할 수 없다
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
 DocType: Naming Series,Help HTML,도움말 HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},할당 된 총 weightage 100 %이어야한다.그것은 {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},수당에 {0} 항목에 대한 교차에 대한 {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},수당에 {0} 항목에 대한 교차에 대한 {1}
 DocType: Address,Name of person or organization that this address belongs to.,이 주소가 속해있는 개인이나 조직의 이름입니다.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,공급 업체
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
@@ -3583,10 +3600,11 @@ DocType: Lead,Converted,변환
 DocType: Item,Has Serial No,시리얼 No에게 있습니다
 DocType: Employee,Date of Issue,발행일
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}에서 {0}에 대한 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
 DocType: Issue,Content Type,컨텐츠 유형
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,컴퓨터
 DocType: Item,List this Item in multiple groups on the website.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,상품 : {0} 시스템에 존재하지 않을
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
 DocType: Payment Reconciliation,Get Unreconciled Entries,비 조정 항목을보세요
@@ -3597,14 +3615,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,창고
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},계정 {0} 더 많은 회계 연도 번 이상 입력 한 {1}
 ,Average Commission Rate,평균위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고'재고 항목에 대해 '예'일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고'재고 항목에 대해 '예'일 수 없습니다
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,출석은 미래의 날짜에 표시 할 수 없습니다
 DocType: Pricing Rule,Pricing Rule Help,가격 규칙 도움말
 DocType: Purchase Taxes and Charges,Account Head,계정 헤드
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,상품의 도착 비용을 계산하기 위해 추가적인 비용을 업데이트
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,전기의
 DocType: Stock Entry,Total Value Difference (Out - In),총 가치 차이 (아웃 -에서)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},사용자 ID 직원에 대한 설정하지 {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,피닝
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,보증 청구에서
@@ -3618,15 +3636,17 @@ DocType: Buying Settings,Naming Series,시리즈 이름 지정
 DocType: Leave Block List,Leave Block List Name,차단 목록의 이름을 남겨주세요
 DocType: User,Enabled,사용
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,재고 자산
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},당신은 정말 {0}과 {1} 년 달에 대한 모든 급여 슬립 제출 하시겠습니까
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},당신은 정말 {0}과 {1} 년 달에 대한 모든 급여 슬립 제출 하시겠습니까
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,가져 오기 구독자
 DocType: Target Detail,Target Qty,목표 수량
 DocType: Attendance,Present,선물
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,배송 참고 {0} 제출하지 않아야합니다
 DocType: Notification Control,Sales Invoice Message,판매 송장 메시지
 DocType: Authorization Rule,Based On,에 근거
-,Ordered Qty,수량 주문
+DocType: Sales Order Item,Ordered Qty,수량 주문
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},에서와 기간 반복 필수 날짜로 기간 {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,프로젝트 활동 / 작업.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,급여 전표 생성
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} 유효한 이메일 ID가 아닌
@@ -3666,7 +3686,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,출석 업로드
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM 및 제조 수량이 필요합니다
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,고령화 범위 2
-DocType: Journal Entry Account,Amount,양
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,양
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,리벳
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM 교체
 ,Sales Analytics,판매 분석
@@ -3693,7 +3713,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,예상 날짜 자료 요청 날짜 이전 할 수 없습니다
 DocType: Contact Us Settings,City,시
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,초음파 가공
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,오류 : 유효한 ID?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,오류 : 유효한 ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,항목 {0} 판매 품목이어야합니다
 DocType: Naming Series,Update Series Number,업데이트 시리즈 번호
 DocType: Account,Equity,공평
@@ -3708,7 +3728,7 @@ DocType: Purchase Taxes and Charges,Actual,실제
 DocType: Authorization Rule,Customerwise Discount,Customerwise 할인
 DocType: Purchase Invoice,Against Expense Account,비용 계정에 대한
 DocType: Production Order,Production Order,생산 주문
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다
 DocType: Quotation Item,Against Docname,docName 같은 반대
 DocType: SMS Center,All Employee (Active),모든 직원 (활성)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,지금보기
@@ -3716,14 +3736,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,원료 비용
 DocType: Item,Re-Order Level,다시 주문 수준
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,당신이 생산 주문을 올리거나 분석을위한 원시 자료를 다운로드하고자하는 항목 및 계획 수량을 입력합니다.
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt 차트
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt 차트
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,파트 타임으로
 DocType: Employee,Applicable Holiday List,해당 휴일 목록
 DocType: Employee,Cheque,수표
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,시리즈 업데이트
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,보고서 유형이 필수입니다
 DocType: Item,Serial Number Series,일련 번호 시리즈
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},창고 재고 상품의 경우 필수 {0} 행에서 {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},창고 재고 상품의 경우 필수 {0} 행에서 {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,소매 및 도매
 DocType: Issue,First Responded On,첫 번째에 반응했다
 DocType: Website Item Group,Cross Listing of Item in multiple groups,여러 그룹에서 항목의 크로스 리스팅
@@ -3738,7 +3758,7 @@ DocType: Attendance,Attendance,출석
 DocType: Page,No,NO
 DocType: BOM,Materials,도구
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","선택되지 않으면, 목록은인가되는 각 부서가 여기에 첨가되어야 할 것이다."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,게시 날짜 및 게시 시간이 필수입니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,게시 날짜 및 게시 시간이 필수입니다
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,트랜잭션을 구입을위한 세금 템플릿.
 ,Item Prices,상품 가격
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,당신이 구매 주문을 저장 한 단어에서 볼 수 있습니다.
@@ -3758,9 +3778,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,관리비
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,컨설팅
 DocType: Customer Group,Parent Customer Group,상위 고객 그룹
-sites/assets/js/erpnext.min.js +50,Change,변경
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,변경
 DocType: Purchase Invoice,Contact Email,담당자 이메일
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',{0} '중지'를 주문 구매
 DocType: Appraisal Goal,Score Earned,점수 획득
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","예) ""내 회사 LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,통지 기간
@@ -3770,12 +3789,13 @@ DocType: Packing Slip,Gross Weight UOM,총중량 UOM
 DocType: Email Digest,Receivables / Payables,채권 / 채무
 DocType: Delivery Note Item,Against Sales Invoice,견적서에 대하여
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,스탬핑
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,신용 계정
 DocType: Landed Cost Item,Landed Cost Item,착륙 비용 항목
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,0 값을보기
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,원료의 부여 수량에서 재 포장 / 제조 후의 아이템의 수량
 DocType: Payment Reconciliation,Receivable / Payable Account,채권 / 채무 계정
 DocType: Delivery Note Item,Against Sales Order Item,판매 주문 항목에 대하여
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
 DocType: Item,Default Warehouse,기본 창고
 DocType: Task,Actual End Date (via Time Logs),실제 종료 날짜 (시간 로그를 통해)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},예산은 그룹 계정에 할당 할 수 없습니다 {0}
@@ -3789,7 +3809,7 @@ DocType: Issue,Support Team,지원 팀
 DocType: Appraisal,Total Score (Out of 5),전체 점수 (5 점 만점)
 DocType: Contact Us Settings,State,도
 DocType: Batch,Batch,일괄처리
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,잔고
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,잔고
 DocType: Project,Total Expense Claim (via Expense Claims),총 경비 요청 (비용 청구를 통해)
 DocType: User,Gender,성별
 DocType: Journal Entry,Debit Note,직불 주
@@ -3805,9 +3825,8 @@ DocType: Lead,Blog Subscriber,블로그 구독자
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,값을 기준으로 거래를 제한하는 규칙을 만듭니다.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","이 옵션을 선택하면 총 없음. 작업 일의 휴일을 포함하며,이 급여 당 일의 가치를 감소시킬 것이다"
 DocType: Purchase Invoice,Total Advance,전체 사전
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,멈추지 자료 요청
 DocType: Workflow State,User,사용자
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,가공 급여
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,가공 급여
 DocType: Opportunity Item,Basic Rate,기본 요금
 DocType: GL Entry,Credit Amount,신용 금액
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,분실로 설정
@@ -3815,7 +3834,7 @@ DocType: Customer,Credit Days Based On,신용 일을 기준으로
 DocType: Tax Rule,Tax Rule,세금 규칙
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,판매주기 전반에 걸쳐 동일한 비율을 유지
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,워크 스테이션 근무 시간 외에 시간 로그를 계획합니다.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1}이 (가) 이미 제출되었습니다
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}이 (가) 이미 제출되었습니다
 ,Items To Be Requested,요청 할 항목
 DocType: Purchase Order,Get Last Purchase Rate,마지막 구매께서는보세요
 DocType: Time Log,Billing Rate based on Activity Type (per hour),활동 유형에 따라 결제 요금 (시간당)
@@ -3824,6 +3843,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","회사 이메일 ID를 찾을 수 없습니다, 따라서 전송되지 메일"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),펀드의 응용 프로그램 (자산)
 DocType: Production Planning Tool,Filter based on item,항목을 기준으로 필터링
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,자동 이체 계좌
 DocType: Fiscal Year,Year Start Date,년 시작 날짜
 DocType: Attendance,Employee Name,직원 이름
 DocType: Sales Invoice,Rounded Total (Company Currency),둥근 합계 (회사 통화)
@@ -3835,14 +3855,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,블랭킹
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,종업원 급여
 DocType: Sales Invoice,Is POS,POS입니다
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
 DocType: Production Order,Manufactured Qty,제조 수량
 DocType: Purchase Receipt Item,Accepted Quantity,허용 수량
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} : {1} 수행하지 존재
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,고객에게 제기 지폐입니다.
 DocType: DocField,Default,기본값
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,프로젝트 ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} 가입자는 추가
 DocType: Maintenance Schedule,Schedule,일정
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",이 코스트 센터에 대한 예산을 정의합니다. 예산 작업을 설정하려면 다음을 참조 "회사 목록"
@@ -3850,7 +3870,7 @@ DocType: Account,Parent Account,부모 계정
 DocType: Quality Inspection Reading,Reading 3,3 읽기
 ,Hub,허브
 DocType: GL Entry,Voucher Type,바우처 유형
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
 DocType: Expense Claim,Approved,인가 된
 DocType: Pricing Rule,Price,가격
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
@@ -3859,23 +3879,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,교육
 DocType: Selling Settings,Campaign Naming By,캠페인 이름 지정으로
 DocType: Employee,Current Address Is,현재 주소는
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","선택 사항. 지정하지 않을 경우, 회사의 기본 통화를 설정합니다."
 DocType: Address,Office,사무실
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,표준 보고서
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,회계 분개.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},행 {0} : 파티 / 계정과 일치하지 않는 {1} / {2}에서 {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,창고에서 이용 가능한 수량
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},행 {0} : 파티 / 계정과 일치하지 않는 {1} / {2}에서 {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,세금 계정을 만들려면
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,비용 계정을 입력하십시오
 DocType: Account,Stock,재고
 DocType: Employee,Current Address,현재 주소
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","명시 적으로 지정하지 않는 항목은 다음 설명, 이미지, 가격은 세금이 템플릿에서 설정됩니다 등 다른 항목의 변형 인 경우"
 DocType: Serial No,Purchase / Manufacture Details,구매 / 제조 세부 사항
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,배치 재고
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,배치 재고
 DocType: Employee,Contract End Date,계약 종료 날짜
 DocType: Sales Order,Track this Sales Order against any Project,모든 프로젝트에 대해이 판매 주문을 추적
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,위의 기준에 따라 (전달하기 위해 출원 중) 판매 주문을 당겨
 DocType: DocShare,Document Type,문서 형식
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,공급 업체의 견적에서
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,공급 업체의 견적에서
 DocType: Deduction Type,Deduction Type,공제 유형
 DocType: Attendance,Half Day,반나절
 DocType: Pricing Rule,Min Qty,최소 수량
@@ -3886,20 +3908,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,수량 (수량 제조) 필수
 DocType: Stock Entry,Default Target Warehouse,기본 대상 창고
 DocType: Purchase Invoice,Net Total (Company Currency),합계액 (회사 통화)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,행 {0} : 파티 형 파티는 채권 / 채무 계정에 대하여 만 적용
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,행 {0} : 파티 형 파티는 채권 / 채무 계정에 대하여 만 적용
 DocType: Notification Control,Purchase Receipt Message,구매 영수증 메시지
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,총 할당 된 잎은 기간보다 더 있습니다
 DocType: Production Order,Actual Start Date,실제 시작 날짜
 DocType: Sales Order,% of materials delivered against this Sales Order,이 판매 주문에 대해 배송자재 %
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,기록 항목의 움직임.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,기록 항목의 움직임.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,뉴스 목록 가입자
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,서비스
 DocType: Hub Settings,Hub Settings,허브 설정
 DocType: Project,Gross Margin %,매출 총 이익률의 %
 DocType: BOM,With Operations,운영과
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,회계 항목이 이미 통화로 된 {0} 회사의 {1}. 통화와 채권 또는 채무 계정을 선택하세요 {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,회계 항목이 이미 통화로 된 {0} 회사의 {1}. 통화와 채권 또는 채무 계정을 선택하세요 {0}.
 ,Monthly Salary Register,월급 등록
-apps/frappe/frappe/website/template.py +123,Next,다음
+apps/frappe/frappe/website/template.py +140,Next,다음
 DocType: Warranty Claim,If different than customer address,만약 고객 주소와 다른
 DocType: BOM Operation,BOM Operation,BOM 운영
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,전해
@@ -3930,6 +3953,7 @@ DocType: Purchase Invoice,Next Date,다음 날짜
 DocType: Employee Education,Major/Optional Subjects,주요 / 선택 주제
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,세금 및 요금을 입력하세요
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,가공
+DocType: Sales Invoice Item,Drop Ship,드롭 선박
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","여기에서 당신은 부모, 배우자와 자녀의 이름과 직업 등 가족 세부 사항을 유지 관리 할 수 있습니다"
 DocType: Hub Settings,Seller Name,판매자 이름
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),차감 세금 및 수수료 (회사 통화)
@@ -3956,29 +3980,29 @@ DocType: Purchase Order,To Receive and Bill,수신 및 법안
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,디자이너
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,이용 약관 템플릿
 DocType: Serial No,Delivery Details,납품 세부 사항
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,수량이 수준 이하로 떨어질 경우 자동으로 자료 요청을 만들
 ,Item-wise Purchase Register,상품 현명한 구매 등록
 DocType: Batch,Expiry Date,유효 기간
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",재주문 수준을 설정하려면 항목은 구매 상품 또는 제조 품목이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",재주문 수준을 설정하려면 항목은 구매 상품 또는 제조 품목이어야합니다
 ,Supplier Addresses and Contacts,공급 업체 주소 및 연락처
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,첫 번째 범주를 선택하십시오
 apps/erpnext/erpnext/config/projects.py +18,Project master.,프로젝트 마스터.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,다음 통화 $ 등과 같은 모든 기호를 표시하지 마십시오.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(반나절)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(반나절)
 DocType: Supplier,Credit Days,신용 일
 DocType: Leave Type,Is Carry Forward,이월된다
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM에서 항목 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM에서 항목 가져 오기
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,시간 일 리드
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,재료 명세서 (BOM)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},행 {0} : 파티 형 파티는 채권 / 채무 계정이 필요합니다 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},행 {0} : 파티 형 파티는 채권 / 채무 계정이 필요합니다 {1}
 DocType: Dropbox Backup,Send Notifications To,알림을 보내기
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,참조 날짜
 DocType: Employee,Reason for Leaving,떠나는 이유
 DocType: Expense Claim Detail,Sanctioned Amount,제재 금액
 DocType: GL Entry,Is Opening,개시
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},행 {0} 차변 항목과 링크 될 수 없다 {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,계정 {0}이 (가) 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},행 {0} 차변 항목과 링크 될 수 없다 {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,계정 {0}이 (가) 없습니다
 DocType: Account,Cash,자금
 DocType: Employee,Short biography for website and other publications.,웹 사이트 및 기타 간행물에 대한 짧은 전기.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},직원에 대한 급여 구조를 만드십시오 {0}
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 2534135f4a..148e44489c 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Alga Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Izvēlieties Mēneša Distribution, ja jūs vēlaties, lai izsekotu, pamatojoties uz sezonalitāti."
 DocType: Employee,Divorced,Šķīries
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Brīdinājums: Same priekšmets ir ievadīts vairākas reizes.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Brīdinājums: Same priekšmets ir ievadīts vairākas reizes.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Preces jau sinhronizēts
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Atļaut punkts jāpievieno vairākas reizes darījumā
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Atcelt Materiāls Visit {0} pirms lauzt šo garantijas prasību
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Blīvēšanas plus aglomerācijas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valūta ir nepieciešama Cenrāža {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Tiks aprēķināts darījumā.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,No Material Pieprasījums
+DocType: Purchase Order,Customer Contact,Klientu Kontakti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,No Material Pieprasījums
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Darba iesniedzējs
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nav vairāk rezultātu.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Klienta vārds
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Visi eksporta saistītās jomās, piemēram, valūtas maiņas kursa, eksporta kopējā apjoma, eksporta grand kopējo utt ir pieejamas piegādes pavadzīmē, POS, citāts, pārdošanas rēķinu, Sales Order uc"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vadītāji (vai grupas), pret kuru grāmatvedības ieraksti tiek veikti, un atlikumi tiek uzturēti."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Iekavēti {0} nevar būt mazāka par nulli ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Iekavēti {0} nevar būt mazāka par nulli ({1})
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Atstājiet veida nosaukums
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series Atjaunots Veiksmīgi
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Vairāki Izstrādājumu cenas.
 DocType: SMS Center,All Supplier Contact,Visi Piegādātājs Contact
 DocType: Quality Inspection Reading,Parameter,Parametrs
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Paredzams, beigu datums nevar būt mazāki nekā paredzēts sākuma datuma"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Vai tiešām vēlaties unstop pasūtījums:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Novērtēt jābūt tāda pati kā {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Jauns atvaļinājuma pieteikums
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Jauns atvaļinājuma pieteikums
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Banka projekts
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Lai saglabātu klientu gudrs pozīcijas kods un padarīt tās meklēšanai, pamatojoties uz to kodu Izmantojiet šo opciju"
 DocType: Mode of Payment Account,Mode of Payment Account,Mode maksājumu konta
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Rādīt Varian
 DocType: Sales Invoice Item,Quantity,Daudzums
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredītiem (pasīvi)
 DocType: Employee Education,Year of Passing,Gads Passing
-sites/assets/js/erpnext.min.js +27,In Stock,In noliktavā
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Var tikai veikt maksājumus pret unbilled pārdošanas rīkojumu
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In noliktavā
 DocType: Designation,Designation,Apzīmējums
 DocType: Production Plan Item,Production Plan Item,Ražošanas plāna punktu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Lietotāja {0} jau ir piešķirts Darbinieku {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Veikt jaunu POS profils
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Veselības aprūpe
 DocType: Purchase Invoice,Monthly,Ikmēneša
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Pavadzīme
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Maksājuma kavējums (dienas)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Pavadzīme
 DocType: Maintenance Schedule Item,Periodicity,Periodiskums
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-pasta adrese
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Aizstāvēšana
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultāts (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Rinda {0}: {1}{2} nesakrīt ar {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rinda {0}: {1}{2} nesakrīt ar {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Transportlīdzekļu Nr
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Lūdzu, izvēlieties cenrādi"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Lūdzu, izvēlieties cenrādi"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Kokapstrāde
 DocType: Production Order Operation,Work In Progress,Work In Progress
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D drukāšana
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Atvēršana uz darbu.
 DocType: Item Attribute,Increment,Pieaugums
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Izvēlieties noliktava ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklāma
 DocType: Employee,Married,Precējies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
 DocType: Payment Reconciliation,Reconcile,Saskaņot
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Pārtikas veikals
 DocType: Quality Inspection Reading,Reading 1,Reading 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Padarīt Bank Entry
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Padarīt Bank Entry
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensiju fondi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Noliktava ir obligāta, ja konts veids ir noliktava"
 DocType: SMS Center,All Sales Person,Visi Sales Person
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Uzrakstiet Off izmaksu centram
 DocType: Warehouse,Warehouse Detail,Noliktava Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kredīta limits ir šķērsojis klientam {0}{1} / {2}
 DocType: Tax Rule,Tax Type,Nodokļu Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Jums nav atļauts pievienot vai atjaunināt ierakstus pirms {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Jums nav atļauts pievienot vai atjaunināt ierakstus pirms {0}
 DocType: Item,Item Image (if not slideshow),Postenis attēls (ja ne slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Klientu pastāv ar tādu pašu nosaukumu
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundu Rate / 60) * Faktiskais Darbības laiks
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Viesis
 DocType: Quality Inspection,Get Specification Details,Saņemt specifikācijas detaļas
 DocType: Lead,Interested,Ieinteresēts
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill materiālu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Atklāšana
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Atklāšana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},No {0} uz {1}
 DocType: Item,Copy From Item Group,Kopēt no posteņa grupas
 DocType: Journal Entry,Opening Entry,Atklāšanas Entry
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Produkts Pieprasījums
 DocType: Standard Reply,Owner,Īpašnieks
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ievadiet uzņēmuma pirmais
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Lūdzu, izvēlieties Company pirmais"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Lūdzu, izvēlieties Company pirmais"
 DocType: Employee Education,Under Graduate,Zem absolvents
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mērķa On
 DocType: BOM,Total Cost,Kopējās izmaksas
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Priedēklis
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Patērējamās
 DocType: Upload Attendance,Import Log,Import Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sūtīt
+DocType: Sales Invoice Item,Delivered By Supplier,Pasludināts piegādātāja
 DocType: SMS Center,All Contact,Visi Contact
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Gada alga
 DocType: Period Closing Voucher,Closing Fiscal Year,Noslēguma fiskālajā gadā
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Contra Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Rādīt Time Baļķi
 DocType: Journal Entry Account,Credit in Company Currency,Kredītu uzņēmumā Valūta
 DocType: Delivery Note,Installation Status,Instalācijas statuss
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pieņemts + Noraidīts Daudz ir jābūt vienādam ar Saņemts daudzumu postenī {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pieņemts + Noraidīts Daudz ir jābūt vienādam ar Saņemts daudzumu postenī {0}
 DocType: Item,Supply Raw Materials for Purchase,Piegādes izejvielas iegādei
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Postenis {0} jābūt iegāde punkts
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lejupielādēt veidni, aizpildīt atbilstošus datus un pievienot modificētu failu. Visi datumi un darbinieku saspēles izvēlēto periodu nāks veidnē, ar esošajiem apmeklējuma reģistru"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Postenis {0} nav aktīvs vai ir sasniegts nolietoto
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Postenis {0} nav aktīvs vai ir sasniegts nolietoto
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Atjauninās pēc pārdošanas rēķinu iesniegšanas.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Iestatījumi HR moduļa
 DocType: SMS Center,SMS Center,SMS Center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Iztaisnošana
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Ievadiet url parametrs zi
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Noteikumus cenas un atlaides.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Šoreiz Log konflikti ar {0} uz {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenrādis ir jāpiemēro pērk vai pārdod
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Uzstādīšana datums nevar būt pirms piegādes datuma postenī {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Uzstādīšana datums nevar būt pirms piegādes datuma postenī {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Atlaide Cenrādis Rate (%)
-sites/assets/js/form.min.js +279,Start,Sākums
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Sākums
 DocType: User,First Name,Vārds
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Jūsu uzstādīšana ir pabeigta. Atsvaidzinoša.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Pilna veidņu liešana
 DocType: Offer Letter,Select Terms and Conditions,Izvēlieties Noteikumi un nosacījumi
 DocType: Production Planning Tool,Sales Orders,Pārdošanas pasūtījumu
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Pret pārdošanas rēķinu posteni
 ,Production Orders in Progress,Pasūtījums Progress
 DocType: Lead,Address & Contact,Adrese un kontaktinformācija
+DocType: Leave Allocation,Add unused leaves from previous allocations,Pievienot neizmantotās lapas no iepriekšējiem piešķīrumiem
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Nākamais Atkārtojas {0} tiks izveidota {1}
 DocType: Newsletter List,Total Subscribers,Kopā Reģistrētiem
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Contact Name
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Gaida Daudz
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Izveido atalgojumu par iepriekš minētajiem kritērijiem.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pieprasīt iegādei.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double korpuss
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Tikai izvēlētais Leave apstiprinātājs var iesniegt šo atvaļinājums
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Tikai izvēlētais Leave apstiprinātājs var iesniegt šo atvaļinājums
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lapām gadā
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Lūdzu noteikt nosaukšana Series {0}, izmantojot Setup> Uzstādījumi> nosaucot Series"
 DocType: Time Log,Will be updated when batched.,"Tiks papildināts, ja batched."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rinda {0}: Lūdzu, pārbaudiet ""Vai Advance"" pret kontā {1}, ja tas ir iepriekš ieraksts."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rinda {0}: Lūdzu, pārbaudiet ""Vai Advance"" pret kontā {1}, ja tas ir iepriekš ieraksts."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Noliktava {0} nepieder uzņēmumam {1}
 DocType: Bulk Email,Message,Ziņa
 DocType: Item Website Specification,Item Website Specification,Postenis Website Specifikācija
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Atsauces Nr
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Atstājiet Bloķēts
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Gada
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Samierināšanās postenis
 DocType: Stock Entry,Sales Invoice No,Pārdošanas rēķins Nr
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Minimālais Order Daudz
 DocType: Pricing Rule,Supplier Type,Piegādātājs Type
 DocType: Item,Publish in Hub,Publicē Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Postenis {0} ir atcelts
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Materiāls Pieprasījums
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materiāls Pieprasījums
 DocType: Bank Reconciliation,Update Clearance Date,Update Klīrenss Datums
 DocType: Item,Purchase Details,Pirkuma Details
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},{0} Prece nav atrasts "Izejvielu Kopā" tabulā Pirkuma pasūtījums {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Paziņošana Control
 DocType: Lead,Suggestions,Ieteikumi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Komplekta Grupa gudrs budžetu šajā teritorijā. Jūs varat arī sezonalitāti, iestatot Distribution."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Ievadiet mātes kontu grupu, par noliktavu {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksājumu pret {0} {1} nevar būt lielāks par izcilu Summu {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksājumu pret {0} {1} nevar būt lielāks par izcilu Summu {2}
 DocType: Supplier,Address HTML,Adrese HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Izveidot Kalendārs
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Inventāra UOM
 DocType: Period Closing Voucher,Closing Account Head,Noslēguma konta vadītājs
 DocType: Employee,External Work History,Ārējā Work Vēsture
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Apļveida Reference kļūda
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Vai jūs tiešām vēlaties pārtraukt
 DocType: Communication,Closed,Slēgts
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Vārdos (eksportam) būs redzams pēc tam, kad jums ietaupīt pavadzīmi."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Vai esat pārliecināts, ka jūs vēlaties pārtraukt"
 DocType: Lead,Industry,Rūpniecība
 DocType: Employee,Job Profile,Darba Profile
 DocType: Newsletter,Newsletter,Biļetens
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Piegāde Note
 DocType: Dropbox Backup,Allow Dropbox Access,Atļaut Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Iestatīšana Nodokļi
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Maksājums Entry ir modificēts pēc velk to. Lūdzu, velciet to vēlreiz."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Kopsavilkums par šo nedēļu un izskatāmo darbību
 DocType: Workstation,Rent Cost,Rent izmaksas
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Lūdzu, izvēlieties mēnesi un gadu"
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Ātrums, kādā Klients Valūtu pārvērsts klienta bāzes valūtā"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Pieejams BOM, pavadzīme, pirkuma rēķina, ražošanas kārtību, pirkuma pasūtījuma, pirkuma čeka, pārdošanas rēķinu, pārdošanas rīkojumu, Fondu Entry, laika kontrolsaraksts"
 DocType: Item Tax,Tax Rate,Nodokļa likme
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Select postenis
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Select postenis
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Vienība: {0} izdevās partiju gudrs, nevar saskaņot, izmantojot \ Stock samierināšanās, nevis izmantot akciju Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partijas Nr jābūt tāda pati kā {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Pārvērst ne-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pirkuma saņemšana jāiesniedz
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Pašreizējā Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,(Sērijas) posteņa.
 DocType: C-Form Invoice Detail,Invoice Date,Rēķina datums
 DocType: GL Entry,Debit Amount,Debets Summa
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Tur var būt tikai 1 konts per Company {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tur var būt tikai 1 konts per Company {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Jūsu e-pasta adrese
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Lūdzu, skatiet pielikumu"
 DocType: Purchase Order,% Received,% Saņemts
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instrukcijas
 DocType: Quality Inspection,Inspected By,Pārbaudīti Līdz
 DocType: Maintenance Visit,Maintenance Type,Uzturēšānas veids
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Sērijas Nr {0} nepieder komplektāciju {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Sērijas Nr {0} nepieder komplektāciju {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Postenis kvalitātes pārbaudes parametrs
 DocType: Leave Application,Leave Approver Name,Atstājiet apstiprinātāja Vārds
 ,Schedule Date,Grafiks Datums
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Pirkuma Reģistrēties
 DocType: Landed Cost Item,Applicable Charges,Piemērojamām izmaksām
 DocType: Workstation,Consumable Cost,Patērējamās izmaksas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ir jābūt lomu 'Leave apstiprinātājs'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ir jābūt lomu 'Leave apstiprinātājs'
 DocType: Purchase Receipt,Vehicle Date,Transportlīdzekļu Datums
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicīnisks
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Iemesls zaudēt
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% Uzstādīts
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Ievadiet uzņēmuma nosaukumu pirmais
 DocType: BOM,Item Desription,Postenis Desription
 DocType: Purchase Invoice,Supplier Name,Piegādātājs Name
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lasīt ERPNext rokasgrāmatu
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automātiski iestata Serial Nos pamatojoties uz FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Pārbaudiet Piegādātājs Rēķina numurs Unikalitāte
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Master vad
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globālie uzstādījumi visām ražošanas procesiem.
 DocType: Accounts Settings,Accounts Frozen Upto,Konti Frozen Līdz pat
 DocType: SMS Log,Sent On,Nosūtīts
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
 DocType: Sales Order,Not Applicable,Nav piemērojams
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday meistars.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell formēšanas
 DocType: Material Request Item,Required Date,Nepieciešamais Datums
 DocType: Delivery Note,Billing Address,Norēķinu adrese
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Ievadiet Preces kods.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ievadiet Preces kods.
 DocType: BOM,Costing,Izmaksu
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ja atzīmēts, nodokļa summa tiks uzskatīta par jau iekļautas Print Rate / Print summa"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Kopā Daudz
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Laiks starp op
 DocType: Customer,Buyer of Goods and Services.,Pircējs Preču un pakalpojumu.
 DocType: Journal Entry,Accounts Payable,Kreditoru
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Pievienot abonenti
-sites/assets/js/erpnext.min.js +5,""" does not exists","""Neeksistē"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Neeksistē"
 DocType: Pricing Rule,Valid Upto,Derīgs Līdz pat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direct Ienākumi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nevar filtrēt, pamatojoties uz kontu, ja grupēti pēc kontu"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administratīvā amatpersona
 DocType: Payment Tool,Received Or Paid,Saņem vai maksā
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
 DocType: Stock Entry,Difference Account,Atšķirība konts
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nevar aizvērt uzdevums, jo tās atkarīgas uzdevums {0} nav slēgta."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
 DocType: Production Order,Additional Operating Cost,Papildus ekspluatācijas izmaksas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmētika
 DocType: DocField,Type,Tips
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
 DocType: Communication,Subject,Pakļauts
 DocType: Shipping Rule,Net Weight,Neto svars
 DocType: Employee,Emergency Phone,Avārijas Phone
 ,Serial No Warranty Expiry,Sērijas Nr Garantija derīguma
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,"Vai jūs tiešām vēlaties, lai apturētu šo Materiāls pieprasījums?"
 DocType: Sales Order,To Deliver,Piegādāt
 DocType: Purchase Invoice Item,Item,Punkts
 DocType: Journal Entry,Difference (Dr - Cr),Starpība (Dr - Cr)
 DocType: Account,Profit and Loss,Peļņa un zaudējumi
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Managing Apakšuzņēmēji
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Managing Apakšuzņēmēji
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Jaunais UOM NEDRĪKST tipa Visa skaits
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mēbeles un Armatūra
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Ātrums, kādā cenrādis valūta tiek pārvērsts uzņēmuma bāzes valūtā"
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Pievienot / rediģēt nod
 DocType: Purchase Invoice,Supplier Invoice No,Piegādātāju rēķinu Nr
 DocType: Territory,For reference,Par atskaites
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nevar izdzēst Sērijas Nr {0}, jo tas tiek izmantots akciju darījumiem"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Noslēguma (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Noslēguma (Cr)
 DocType: Serial No,Warranty Period (Days),Garantijas periods (dienas)
 DocType: Installation Note Item,Installation Note Item,Uzstādīšana Note postenis
 ,Pending Qty,Kamēr Daudz
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Norēķini un piegāde statuss
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Atkārtojiet Klienti
 DocType: Leave Control Panel,Allocate,Piešķirt
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Iepriekšējais
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Izvēlieties klientu pasūtījumu, no kuriem vēlaties izveidot pasūtījumu."
+DocType: Item,Delivered by Supplier (Drop Ship),Pasludināts ar piegādātāja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Algu sastāvdaļas.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database potenciālo klientu.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Klientu datu bāzi.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Akrobātika
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loģisks Noliktava pret kuru noliktavas ierakstu veikšanas.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Atsauces Nr & Reference datums ir nepieciešama {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Atsauces Nr & Reference datums ir nepieciešama {0}
 DocType: Event,Wednesday,Trešdiena
 DocType: Sales Invoice,Customer's Vendor,Klienta Vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ražošanas uzdevums ir obligāta
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Uztvērējs parametrs
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Pamatojoties uz"" un ""Group By"", nevar būt vienādi"
 DocType: Sales Person,Sales Person Targets,Sales Person Mērķi
-sites/assets/js/form.min.js +271,To,Līdz
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Ievadiet e-pasta adresi
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Līdz
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Ievadiet e-pasta adresi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,End cauruļu veidošanas
 DocType: Production Order Operation,In minutes,Minūtēs
 DocType: Issue,Resolution Date,Izšķirtspēja Datums
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,Projekti User
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Patērētā
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nav atrasts Rēķina informācija tabulā
 DocType: Company,Round Off Cost Center,Noapaļot izmaksu centru
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Uzturēšana Visit {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Uzturēšana Visit {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 DocType: Material Request,Material Transfer,Materiāls Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Atvere (DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Norīkošanu timestamp jābūt pēc {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Settings
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Izkrauti Izmaksu nodokļi un maksājumi
 DocType: Production Order Operation,Actual Start Time,Faktiskais Sākuma laiks
 DocType: BOM Operation,Operation Time,Darbība laiks
-sites/assets/js/list.min.js +5,More,Vairāk
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Vairāk
 DocType: Pricing Rule,Sales Manager,Pārdošanas vadītājs
-sites/assets/js/desk.min.js +7673,Rename,Pārdēvēt
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Pārdēvēt
 DocType: Journal Entry,Write Off Amount,Uzrakstiet Off summa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Locīšana
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Atļaut lietotāju
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight cirpšana
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Lai izsekotu objektu pārdošanas un pirkuma dokumentiem, pamatojoties uz to sērijas nos. Tas var arī izmantot, lai izsekotu garantijas informāciju par produktu."
 DocType: Purchase Receipt Item Supplied,Current Stock,Pašreizējā Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Noraidīts Noliktava ir obligāta pret regected postenī
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Noraidīts Noliktava ir obligāta pret regected postenī
 DocType: Account,Expenses Included In Valuation,Izdevumi iekļauts vērtēšanā
 DocType: Employee,Provide email id registered in company,Nodrošināt e-pasta id reģistrēts uzņēmums
 DocType: Hub Settings,Seller City,Pārdevējs City
 DocType: Email Digest,Next email will be sent on:,Nākamais e-pastu tiks nosūtīts uz:
 DocType: Offer Letter Term,Offer Letter Term,Akcija vēstule termins
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Prece ir varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} prece nav atrasta
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Gaidīts
 DocType: Journal Entry,Credit Card Entry,Kredītkarte Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Uzdevums Subject
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,"Preces, kas saņemti no piegādātājiem."
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Preces, kas saņemti no piegādātājiem."
 DocType: Communication,Open,Atvērts
 DocType: Lead,Campaign Name,Kampaņas nosaukums
 ,Reserved,Rezervēts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Vai jūs tiešām vēlaties UNSTOP
 DocType: Purchase Order,Supply Raw Materials,Piegādes izejvielas
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datums, kurā nākamais rēķins tiks radīts. Tas ir radīts apstiprināšanas."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ilgtermiņa aktīvi
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Klienta Pasūtījuma Nr
 DocType: Employee,Cell Number,Šūnu skaits
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Zaudējis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Jūs nevarat ievadīt pašreizējo kuponu in 'Pret žurnālu ierakstu kolonnā
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Jūs nevarat ievadīt pašreizējo kuponu in 'Pret žurnālu ierakstu kolonnā
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Enerģija
 DocType: Opportunity,Opportunity From,Iespēja no
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mēnešalga paziņojumu.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Atbildība
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sodīt Summa nevar būt lielāka par prasības summas rindā {0}.
 DocType: Company,Default Cost of Goods Sold Account,Default pārdotās produkcijas ražošanas izmaksas konta
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Cenrādis nav izvēlēts
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Cenrādis nav izvēlēts
 DocType: Employee,Family Background,Ģimene Background
 DocType: Process Payroll,Send Email,Sūtīt e-pastu
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nē Atļauja
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Preces ar augstāku weightage tiks parādīts augstāk
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banku samierināšanās Detail
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mani Rēķini
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Neviens darbinieks atrasts
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Neviens darbinieks atrasts
 DocType: Purchase Order,Stopped,Apturēts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,"Izvēlieties BOM, lai sāktu"
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Augšupie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nosūtīt tagad
 ,Support Analytics,Atbalsta Analytics
 DocType: Item,Website Warehouse,Mājas lapa Noliktava
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Vai jūs tiešām vēlaties pārtraukt pasūtījums:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Mēneša diena, kurā auto rēķins tiks radīts, piemēram 05, 28 utt"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultāts ir mazāks par vai vienāds ar 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form ieraksti
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Atbal
 DocType: Features Setup,"To enable ""Point of Sale"" features",Lai aktivizētu "tirdzniecības vieta" funkcijas
 DocType: Bin,Moving Average Rate,Moving vidējā likme
 DocType: Production Planning Tool,Select Items,Izvēlieties preces
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
 DocType: Comment,Reference Name,Atsauce Name
 DocType: Maintenance Visit,Completion Status,Pabeigšana statuss
 DocType: Sales Invoice Item,Target Warehouse,Mērķa Noliktava
 DocType: Item,Allow over delivery or receipt upto this percent,Atļaut pār piegādi vai saņemšanu līdz pat šim procentiem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,"Paredzams, Piegāde datums nevar būt pirms Sales Order Datums"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Paredzams, Piegāde datums nevar būt pirms Sales Order Datums"
 DocType: Upload Attendance,Import Attendance,Import apmeklējums
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Visi punkts grupas
 DocType: Process Payroll,Activity Log,Aktivitāte Log
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automātiski komponēt ziņu iesniegšanas darījumiem.
 DocType: Production Order,Item To Manufacture,Postenis ražot
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Pastāvīgs veidņu liešana
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Iegādājieties Rīkojumu Apmaksa
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statuss ir {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Iegādājieties Rīkojumu Apmaksa
 DocType: Sales Order Item,Projected Qty,Prognozēts Daudz
 DocType: Sales Invoice,Payment Due Date,Maksājuma Due Date
 DocType: Newsletter,Newsletter Manager,Biļetens vadītājs
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,Pieprasītie Numbers
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Izpildes novērtējuma.
 DocType: Sales Invoice Item,Stock Details,Stock Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekts Value
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Tirdzniecības vieta
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Nevar pārnest {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Tirdzniecības vieta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nevar pārnest {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konta atlikums jau Kredīts, jums nav atļauts noteikt ""Balance Must Be"", jo ""debets"""
 DocType: Account,Balance must be,Līdzsvars ir jābūt
 DocType: Hub Settings,Publish Pricing,Publicēt Cenas
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Pirkuma čeka
 ,Received Items To Be Billed,Saņemtie posteņi ir Jāmaksā
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Smilšstrūklas
-sites/assets/js/desk.min.js +3938,Ms,Ms
+DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valūtas maiņas kurss meistars.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nevar atrast laika nišu nākamajos {0} dienas ekspluatācijai {1}
 DocType: Production Order,Plan material for sub-assemblies,Plāns materiāls mezgliem
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,Diapazons
 DocType: Supplier,Default Payable Accounts,Noklusējuma samaksu konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
 DocType: Features Setup,Item Barcode,Postenis Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Postenis Variants {0} atjaunināta
 DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkuma rēķins Advance
 DocType: Address,Shop,Veikals
 DocType: Hub Settings,Sync Now,Sync Tagad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Rinda {0}: Credit ierakstu nevar saistīt ar {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Rinda {0}: Credit ierakstu nevar saistīt ar {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Default Bank / Naudas konts tiks automātiski atjaunināti POS Rēķinā, ja ir izvēlēts šis režīms."
 DocType: Employee,Permanent Address Is,Pastāvīga adrese ir
 DocType: Production Order Operation,Operation completed for how many finished goods?,Darbība pabeigta uz cik gatavās produkcijas?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Pabalsts pārmērīga {0} šķērsoja postenī {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Pabalsts pārmērīga {0} šķērsoja postenī {1}.
 DocType: Employee,Exit Interview Details,Iziet Intervija Details
 DocType: Item,Is Purchase Item,Vai iegāde postenis
 DocType: Journal Entry Account,Purchase Invoice,Pirkuma rēķins
 DocType: Stock Ledger Entry,Voucher Detail No,Kuponu Detail Nr
 DocType: Stock Entry,Total Outgoing Value,Kopā Izejošais vērtība
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Atvēršanas datums un aizvēršanas datums ir jāatrodas vienā fiskālā gada
 DocType: Lead,Request for Information,Lūgums sniegt informāciju
 DocType: Payment Tool,Paid,Samaksāts
 DocType: Salary Slip,Total in words,Kopā ar vārdiem
 DocType: Material Request Item,Lead Time Date,Izpildes laiks Datums
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,ir obligāta. Varbūt Valūtas ieraksts nav izveidots
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Lūdzu, norādiet Sērijas Nr postenī {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Par "produkts saišķis" vienību, noliktavu, Serial Nr un partijas Nr tiks uzskatīta no "iepakojumu sarakstu" tabulā. Ja Noliktavu un partijas Nr ir vienādas visiem iepakojuma vienības par jebkuru "produkts saišķis" posteni, šīs vērtības var ievadīt galvenajā postenis tabulas vērtības tiks kopēts "iepakojumu sarakstu galda."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Sūtījumiem uz klientiem.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Sūtījumiem uz klientiem.
 DocType: Purchase Invoice Item,Purchase Order Item,Pasūtījuma postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Netieša Ienākumi
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Uzstādīt Maksājuma summa = Outstanding Summa
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,Adrese Line 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Pretruna
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Uzņēmuma nosaukums
 DocType: SMS Center,Total Message(s),Kopējais ziņojumu (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Skatīt sarakstu ar visu palīdzību video
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izvēlieties kontu vadītājs banku, kurā tika deponēts pārbaude."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Ļauj lietotājam rediģēt Cenrādi Rate darījumos
 DocType: Pricing Rule,Max Qty,Max Daudz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rinda {0}: Samaksa pret pārdošanas / pirkšanas ordeņa vienmēr jāmarķē kā iepriekš
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rinda {0}: Samaksa pret pārdošanas / pirkšanas ordeņa vienmēr jāmarķē kā iepriekš
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Ķīmisks
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,"Visi posteņi jau ir pārskaitīta, lai šim Ražošanas ordeni."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,"Visi posteņi jau ir pārskaitīta, lai šim Ražošanas ordeni."
 DocType: Process Payroll,Select Payroll Year and Month,Izvēlieties Algas gads un mēnesis
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Iet uz atbilstošo grupā (parasti piemērošana fondu> apgrozāmo līdzekļu> bankas kontos un izveidot jaunu kontu (noklikšķinot uz Pievienot Child) tipa "Banka"
 DocType: Workstation,Electricity Cost,Elektroenerģijas izmaksas
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Balt
 DocType: SMS Center,All Lead (Open),Visi Svins (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get Avansa Paid
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pievienojiet savu attēlu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Padarīt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Padarīt
 DocType: Journal Entry,Total Amount in Words,Kopā summa vārdiem
 DocType: Workflow State,Stop,Apstāties
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Tur bija kļūda. Viens iespējamais iemesls varētu būt, ka jūs neesat saglabājis formu. Lūdzu, sazinieties ar support@erpnext.com ja problēma joprojām pastāv."
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,Iepakošanas Slip postenis
 DocType: POS Profile,Cash/Bank Account,Naudas / bankas kontu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Noņemts preces bez izmaiņām daudzumā vai vērtībā.
 DocType: Delivery Note,Delivery To,Piegāde uz
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Atribūts tabula ir obligāta
 DocType: Production Planning Tool,Get Sales Orders,Saņemt klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nevar būt negatīvs
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Iesniegšana
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"Tiks atjaunin
 DocType: Project,Internal,Iekšējs
 DocType: Task,Urgent,Steidzams
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Lūdzu, norādiet derīgu Row ID kārtas {0} tabulā {1}"
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Iet uz Desktop un sākt izmantot ERPNext
 DocType: Item,Manufacturer,Ražotājs
 DocType: Landed Cost Item,Purchase Receipt Item,Pirkuma čeka postenis
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervēts noliktavām Sales Order / gatavu preču noliktava
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Pārdošanas apjoms
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Laiks Baļķi
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jūs esat Izdevumu apstiprinātājs šā ieraksta. Lūdzu Update ""Statuss"" un Saglabāt"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jūs esat Izdevumu apstiprinātājs šā ieraksta. Lūdzu Update ""Statuss"" un Saglabāt"
 DocType: Serial No,Creation Document No,Izveide Dokumenta Nr
 DocType: Issue,Issue,Izdevums
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atribūti postenī Varianti. piemēram, lielumu, krāsu uc"
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Pret
 DocType: Item,Default Selling Cost Center,Default pārdošana Izmaksu centrs
 DocType: Sales Partner,Implementation Partner,Īstenošana Partner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} {1}
 DocType: Opportunity,Contact Info,Kontaktinformācija
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Making Krājumu
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Making Krājumu
 DocType: Packing Slip,Net Weight UOM,Neto svars UOM
 DocType: Item,Default Supplier,Default piegādātājs
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Ražošanas pielaide procentos
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Saņemt Nedēļas Off Datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Beigu Datums nevar būt mazāks par sākuma datuma
 DocType: Sales Person,Select company name first.,Izvēlieties uzņēmuma nosaukums pirmo reizi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citāti, kas saņemti no piegādātājiem."
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Uz {0} | {1}{2}
 DocType: Time Log Batch,updated via Time Logs,"atjaunināt, izmantojot Time Baļķi"
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Uzņēmuma reģistrācijas numuri jūsu atsauci. Nodokļu numurus uc
 DocType: Sales Partner,Distributor,Izplatītājs
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Grozs Piegāde noteikums
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Ražošanas Order {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ražošanas Order {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 ,Ordered Items To Be Billed,Pasūtītās posteņi ir Jāmaksā
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,No Range ir jābūt mazāk nekā svārstās
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,"Izvēlieties Time Baļķi un iesniegt, lai izveidotu jaunu pārdošanas rēķinu."
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Nodokļu
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Piegādātājiem un darbuzņēmējiem
 DocType: Account,Warehouse,Noliktava
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
 ,Purchase Order Items To Be Billed,Pirkuma pasūtījuma posteņi ir Jāmaksā
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Pirkuma rēķins postenis
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled maksā
 DocType: Global Defaults,Current Fiscal Year,Kārtējā fiskālajā gadā
 DocType: Global Defaults,Disable Rounded Total,Atslēgt noapaļotiem Kopā
 DocType: Lead,Call,Izsaukums
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dublikāts rinda {0} ar pašu {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Iestatīšana Darbinieki
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Iestatīšana Darbinieki
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Pētniecība
 DocType: Maintenance Visit Purpose,Work Done,Darbs Gatavs
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,Nosūtīts
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Senākās
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
 DocType: Communication,Delivery Status,Piegāde statuss
 DocType: Production Order,Manufacture against Sales Order,Izgatavojam pret pārdošanas rīkojumu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Pārējā pasaule
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Pārējā pasaule
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,{0} postenis nevar būt partijas
 ,Budget Variance Report,Budžets Variance ziņojums
 DocType: Salary Slip,Gross Pay,Bruto Pay
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Izmaksātajām dividendēm
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Grāmatvedības Ledger
 DocType: Stock Reconciliation,Difference Amount,Starpība Summa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Nesadalītā peļņa
 DocType: BOM Item,Item Description,Vienība Apraksts
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,Iespēja postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Pagaidu atklāšana
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Darbinieku Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Atlikums kontā {0} vienmēr jābūt {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Atlikums kontā {0} vienmēr jābūt {1}
 DocType: Address,Address Type,Adrese Īpašuma tips
 DocType: Purchase Receipt,Rejected Warehouse,Noraidīts Noliktava
 DocType: GL Entry,Against Voucher,Pret kuponu
 DocType: Item,Default Buying Cost Center,Default Pirkšana Izmaksu centrs
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Lai iegūtu labāko no ERPNext, mēs iesakām veikt kādu laiku, un skatīties šos palīdzības video."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,{0} postenis jābūt Pārdošanas punkts
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,līdz
 DocType: Item,Lead Time in days,Izpildes laiks dienās
 ,Accounts Payable Summary,Kreditoru kopsavilkums
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Nav atļauts rediģēt iesaldētā kontā {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Nav atļauts rediģēt iesaldētā kontā {0}
 DocType: Journal Entry,Get Outstanding Invoices,Saņemt neapmaksātus rēķinus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Izsniegšanas vieta
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Līgums
 DocType: Report,Disabled,Invalīdiem
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM Coversion faktors nepieciešama UOM: {0} postenī: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM Coversion faktors nepieciešama UOM: {0} postenī: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Netiešie izdevumi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rinda {0}: Daudz ir obligāta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Lauksaimniecība
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,Maksājuma veidu
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Tas ir sakne posteni grupas un to nevar rediģēt.
 DocType: Journal Entry Account,Purchase Order,Pasūtījuma
 DocType: Warehouse,Warehouse Contact Info,Noliktava Kontaktinformācija
-sites/assets/js/form.min.js +190,Name is required,Nosaukums ir obligāts
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Nosaukums ir obligāts
 DocType: Purchase Invoice,Recurring Type,Atkārtojas Type
 DocType: Address,City/Town,City / Town
 DocType: Email Digest,Annual Income,Gada ienākumi
 DocType: Serial No,Serial No Details,Sērijas Nr Details
 DocType: Purchase Invoice Item,Item Tax Rate,Postenis Nodokļu likme
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Par {0}, tikai kredīta kontus var saistīt pret citu debeta ierakstu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Par {0}, tikai kredīta kontus var saistīt pret citu debeta ierakstu"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Postenis {0} jābūt Apakšuzņēmēju postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitāla Ekipējums
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Mērķis
 DocType: Sales Invoice Item,Edit Description,Edit Apraksts
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Paredzams, piegāde datums ir mazāks nekā plānotais sākuma datums."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Piegādātājam
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,"Iestatīšana konta veidu palīdz, izvēloties šo kontu darījumos."
 DocType: Purchase Invoice,Grand Total (Company Currency),Pavisam kopā (Company valūta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Kopā Izejošais
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tur var būt tikai viens Shipping pants stāvoklis ar 0 vai tukšu vērtību ""vērtēt"""
 DocType: Authorization Rule,Transaction,Darījums
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Piezīme: Šis Izmaksas centrs ir Group. Nevar veikt grāmatvedības ierakstus pret grupām.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Darbarīki
+apps/frappe/frappe/config/desk.py +7,Tools,Darbarīki
 DocType: Item,Website Item Groups,Mājas lapa punkts Grupas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Ražošanas uzdevums numurs ir obligāta akciju ieraksta mērķis ražošanā
 DocType: Purchase Invoice,Total (Company Currency),Kopā (Uzņēmējdarbības valūta)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,Workstation Name
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pasts Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
 DocType: Sales Partner,Target Distribution,Mērķa Distribution
-sites/assets/js/desk.min.js +7652,Comments,Komentāri
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentāri
 DocType: Salary Slip,Bank Account No.,Banka Konta Nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Tas ir skaitlis no pēdējiem izveidots darījuma ar šo prefiksu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Vērtēšana Rate nepieciešams postenī {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Lūdzu, izv
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Piegādātāju rēķinu Datums
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,"Jums ir nepieciešams, lai dotu iespēju Grozs"
-sites/assets/js/form.min.js +212,No Data,Nav datu
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nav datu
 DocType: Appraisal Template Goal,Appraisal Template Goal,Izvērtēšana Template Goal
 DocType: Salary Slip,Earning,Nopelnot
 DocType: Payment Tool,Party Account Currency,Party konta valūta
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,Party konta valūta
 DocType: Purchase Taxes and Charges,Add or Deduct,Pievienot vai atrēķināt
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ja Gada budžets pārsniedz (par izdevumu kontu)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Pārklāšanās apstākļi atrasts starp:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Pret Vēstnesī Entry {0} jau ir koriģēts pret kādu citu talonu
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Pret Vēstnesī Entry {0} jau ir koriģēts pret kādu citu talonu
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Kopā pasūtījuma vērtība
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Pārtika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Novecošana Range 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Nē apmeklējumu
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Biļeteni uz kontaktiem, rezultātā."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valūta Noslēguma kontā jābūt {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Punktu summa visiem mērķiem vajadzētu būt 100. Tas ir {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Darbības nevar atstāt tukšu.
 ,Delivered Items To Be Billed,Piegādāts posteņi ir Jāmaksā
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Noliktava nevar mainīt Serial Nr
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status atjaunināts uz {0}
 DocType: DocField,Description,Apraksts
 DocType: Authorization Rule,Average Discount,Vidēji Atlaide
 DocType: Letter Head,Is Default,Vai Default
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Vienība Nodokļa summa
 DocType: Item,Maintain Stock,Uzturēt Noliktava
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Krājumu jau radīti Ražošanas Pasūtīt
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Atstāt tukšu, ja to uzskata par visiem apzīmējumiem"
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,No DATETIME
 DocType: Email Digest,For Company,Par Company
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,Piegāde Adrese Nosaukums
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontu
 DocType: Material Request,Terms and Conditions Content,Noteikumi un nosacījumi saturs
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
 DocType: Maintenance Visit,Unscheduled,Neplānotā
 DocType: Employee,Owned,Pieder
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Atkarīgs Bezalgas atvaļinājums
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garantijas / AMC statuss
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Darbinieku iestatījumi
 ,Batch-Wise Balance History,Partijas-Wise Balance Vēsture
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,To Do List
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Māceklis
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatīva Daudzums nav atļauta
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup SMS vārti iestatījumi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import neizdevās!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Neviena adrese vēl nav pievienota.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Neviena adrese vēl nav pievienota.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Darba stundu
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analītiķis
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar JV summai {2}
 DocType: Item,Inventory,Inventārs
 DocType: Features Setup,"To enable ""Point of Sale"" view",Lai aktivizētu "tirdzniecības vieta" Ņemot
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Maksājumu nevar būt par tukšu grozā
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Maksājumu nevar būt par tukšu grozā
 DocType: Item,Sales Details,Pārdošanas Details
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Ar preces
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Datums, kad nākamais rēķins tiks radīts. Tas ir radīts apstiprināšanas."
 DocType: Item Attribute,Item Attribute,Postenis Atribūtu
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Valdība
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Postenis Variants
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Postenis Variants
 DocType: Company,Services,Pakalpojumi
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Kopā ({0})
 DocType: Cost Center,Parent Cost Center,Parent Izmaksu centrs
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Finanšu gada sākuma datums
 DocType: Employee External Work History,Total Experience,Kopā pieredze
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Packing Slip (s) atcelts
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing Slip (s) atcelts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Kravu un Ekspedīcijas maksājumi
 DocType: Material Request Item,Sales Order No,Pasūtījumu Nr
 DocType: Item Group,Item Group Name,Postenis Grupas nosaukums
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materiāli Ražošana
 DocType: Pricing Rule,For Price List,Par cenrādi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,Saraksti
 DocType: Purchase Invoice Item,Net Amount,Neto summa
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nr
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Papildu Atlaide Summa (Uzņēmējdarbības valūta)
-DocType: Period Closing Voucher,CoA Help,CoA Palīdzība
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Kļūda: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Kļūda: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Lūdzu, izveidojiet jaunu kontu no kontu plāna."
 DocType: Maintenance Visit,Maintenance Visit,Uzturēšana Apmeklēt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klientu> Klientu Group> Teritorija
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Izkrauti izmaksas Palīdzība
 DocType: Event,Tuesday,Otrdiena
 DocType: Leave Block List,Block Holidays on important days.,Bloķēt Holidays par svarīgākajiem dienas.
 ,Accounts Receivable Summary,Debitoru kopsavilkums
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lapas tipa {0} jau piešķirtās Darbinieku {1} par periodu {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Lūdzu noteikt lietotāja ID lauku darbinieks ierakstā noteikt darbinieku lomu
 DocType: UOM,UOM Name,UOM Name
 DocType: Top Bar Item,Target,Mērķis
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,Sales Partner Mērķa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Grāmatvedības ieraksts par {0} var veikt tikai valūtā: {1}
 DocType: Pricing Rule,Pricing Rule,Cenu noteikums
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Izciršanai
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materiāls Pieprasījums Pirkuma pasūtījums
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiāls Pieprasījums Pirkuma pasūtījums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Atgriezās Vienība {1} jo neeksistē {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankas konti
 ,Bank Reconciliation Statement,Banku samierināšanās paziņojums
 DocType: Address,Lead Name,Lead Name
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Atvēršanas Stock Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Atvēršanas Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} jānorāda tikai vienu reizi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nav atļauts pārsūtīšana vairāk {0} nekā {1} pret Pirkuma pasūtījums {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Lapām Piešķirts Veiksmīgi par {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Lapām Piešķirts Veiksmīgi par {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nav Preces pack
 DocType: Shipping Rule Condition,From Value,No vērtība
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Summas, kas nav atspoguļots bankā"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Prasības attiecībā uz uzņēmuma rēķina.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,Kontaktinformācija Mobilais Nr
 DocType: Production Planning Tool,Select Sales Orders,Izvēlieties klientu pasūtījumu
 ,Material Requests for which Supplier Quotations are not created,"Materiāls pieprasījumi, par kuriem Piegādātājs Citāti netiek radīti"
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Izsekot objektus, izmantojot svītrkodu. Jums būs iespēja ievadīt objektus piegāde piezīmi un pārdošanas rēķinu, skenējot svītrkodu posteņa."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Atzīmēt kā Pasludināts
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Padarīt citāts
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Mēģiniet plānojot operācijas X dienas iepriekš.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday atgādinājumi
 DocType: SMS Center,Receiver List,Uztvērējs Latviešu
 DocType: Payment Tool Detail,Payment Amount,Maksājuma summa
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Patērētā summa
-sites/assets/js/erpnext.min.js +51,{0} View,{0} View
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
 DocType: Salary Structure Deduction,Salary Structure Deduction,Algu struktūra atskaitīšana
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektīvā lāzera aglomerācijas
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import veiksmīga!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Izmaksas Izdoti preces
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,Default Kreditoru konts
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Iestatījumi tiešsaistes iepirkšanās grozs, piemēram, kuģošanas noteikumus, cenrādi uc"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Jāmaksā
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Rezervēts Daudz
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervēts Daudz
 DocType: Party Account,Party Account,Party konts
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Cilvēkresursi
 DocType: Lead,Upper Income,Upper Ienākumi
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ieslēgt Grozs
 DocType: Employee,Permanent Address,Pastāvīga adrese
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Postenis {0} jābūt Service punkts.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Izmaksāto avansu pret {0} {1} nevar būt lielāks \ nekā Kopsumma {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Lūdzu izvēlieties kodu
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Samazināt atvieglojumus par Bezalgas atvaļinājums (LWP)
 DocType: Territory,Territory Manager,Teritorija vadītājs
+DocType: Delivery Note Item,To Warehouse (Optional),Lai Noliktava (pēc izvēles)
 DocType: Sales Invoice,Paid Amount (Company Currency),Apmaksātais Summa (Company valūta)
 DocType: Purchase Invoice,Additional Discount,Papildu Atlaide
 DocType: Selling Settings,Selling Settings,Pārdodot Settings
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Kalnrūpniecība
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Sveķu liešana
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Klientu grupa pastāv ar tādu pašu nosaukumu, lūdzu mainīt Klienta nosaukumu vai pārdēvēt klientu grupai"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Lūdzu, izvēlieties {0} pirmās."
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Lūdzu, izvēlieties {0} pirmās."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Teksta {0}
 DocType: Territory,Parent Territory,Parent Teritorija
 DocType: Quality Inspection Reading,Reading 2,Lasīšana 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,Partijas Nr
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Atļaut vairākas pārdošanas pasūtījumos pret Klienta Pirkuma pasūtījums
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Galvenais
 DocType: DocPerm,Delete,Izdzēst
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variants
-sites/assets/js/desk.min.js +7971,New {0},Jaunais {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variants
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Jaunais {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Uzstādīt tituls numerāciju sērijas par jūsu darījumiem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Apturēts rīkojumu nevar atcelt. Unstop lai atceltu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Apturēts rīkojumu nevar atcelt. Unstop lai atceltu.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
 DocType: Employee,Leave Encashed?,Atvaļinājums inkasēta?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Iespēja No jomā ir obligāta
 DocType: Item,Variants,Varianti
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Valsts
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adreses
 DocType: Communication,Received,Saņemti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Pret Vēstnesī Entry {0} nav nekādas nesaskaņota {1} ierakstu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Pret Vēstnesī Entry {0} nav nekādas nesaskaņota {1} ierakstu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dublēt Sērijas Nr stājās postenī {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nosacījums Shipping Reglamenta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Prece nav atļauts būt Ražošanas uzdevums.
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,Sveiciens
 DocType: Communication,Rejected,Noraidīts
 DocType: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Attieksies arī uz variantiem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Piegādāts
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Paka posteņus pēc pārdošanas laikā.
 DocType: Sales Order Item,Actual Qty,Faktiskais Daudz
 DocType: Sales Invoice Item,References,Atsauces
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,P
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Nobīdes
 DocType: Item,Has Variants,Ir Varianti
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Noklikšķiniet uz ""Make pārdošanas rēķinu"" pogu, lai izveidotu jaunu pārdošanas rēķinu."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Periods no un periods Lai datumiem obligāta atkārtojas% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Iepakojums un marķējums
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nosaukums Mēneša Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Lūdzu, norādiet noklusējuma valūtu kompānijā Master un Global noklusējumu"
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Atkārtojas rēķins
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Managing Projects
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Preču piegādātājam vai pakalpojumu.
 DocType: Budget Detail,Fiscal Year,Fiskālā gads
 DocType: Cost Center,Budget,Budžets
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Pārdod
 DocType: Employee,Salary Information,Alga informācija
 DocType: Sales Person,Name and Employee ID,Nosaukums un darbinieku ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
 DocType: Website Item Group,Website Item Group,Mājas lapa Prece Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Nodevas un nodokļi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Ievadiet Atsauces datums
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} maksājumu ierakstus nevar filtrēt pēc {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ievadiet Atsauces datums
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} maksājumu ierakstus nevar filtrēt pēc {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabula postenī, kas tiks parādīts Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Piegādāto Daudz
 DocType: Material Request Item,Material Request Item,Materiāls Pieprasījums postenis
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Koks poz grupu.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nevar atsaukties rindu skaits ir lielāks par vai vienāds ar pašreizējo rindu skaitu šim Charge veida
 ,Item-wise Purchase History,Postenis gudrs Pirkumu vēsture
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Sarkans
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Lūdzu, noklikšķiniet uz ""Generate grafiks"" atnest Sērijas Nr piebilda postenī {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Lūdzu, noklikšķiniet uz ""Generate grafiks"" atnest Sērijas Nr piebilda postenī {0}"
 DocType: Account,Frozen,Sasalis
 ,Open Production Orders,Atvērt pasūtījumu
 DocType: Installation Note,Installation Time,Uzstādīšana laiks
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Citāts tendences
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Postenis Group vienības kapteinis nav minēts par posteni {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Kā Ražošanas Pasūtīt var izdarīt šajā postenī, ir jābūt akciju postenis."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Kā Ražošanas Pasūtīt var izdarīt šajā postenī, ir jābūt akciju postenis."
 DocType: Shipping Rule Condition,Shipping Amount,Piegāde Summa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Savieno
 DocType: Authorization Rule,Above Value,Virs vērtība
 ,Pending Amount,Kamēr Summa
 DocType: Purchase Invoice Item,Conversion Factor,Conversion Factor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Pasludināts
+DocType: Purchase Order,Delivered,Pasludināts
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup ienākošā servera darba vietas e-pasta id. (Piem jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Transportlīdzekļu skaits
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datums, kurā atkārtojas rēķins tiks apstāties"
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Izplatīt Maksa Based O
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konts {0} ir jābūt tipa ""pamatlīdzeklis"", kā postenis {1} ir Asset postenis"
 DocType: HR Settings,HR Settings,HR iestatījumi
 apps/frappe/frappe/config/setup.py +130,Printing,Iespiešana
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Izdevumu Prasība tiek gaidīts apstiprinājums. Tikai Izdevumu apstiprinātājs var atjaunināt statusu.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Izdevumu Prasība tiek gaidīts apstiprinājums. Tikai Izdevumu apstiprinātājs var atjaunināt statusu.
 DocType: Purchase Invoice,Additional Discount Amount,Papildus Atlaides summa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Diena (-as), kurā jūs piesakāties atvaļinājuma ir svētki. Jums ir nepieciešams, neattiecas uz atvaļinājumu."
-sites/assets/js/desk.min.js +7805,and,un
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,un
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sporta
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,Citāts
 DocType: Salary Slip,Total Deduction,Kopā atskaitīšana
 DocType: Quotation,Maintenance User,Uzturēšanas lietotājs
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Izmaksas Atjaunots
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,"Vai esat pārliecināts, ka jūs vēlaties, lai UNSTOP"
 DocType: Employee,Date of Birth,Dzimšanas datums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Postenis {0} jau ir atgriezies
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Saimnieciskais gads ** pārstāv finanšu gads. Visus grāmatvedības ierakstus un citi lielākie darījumi kāpurķēžu pret ** fiskālā gada **.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Sekot izpārdošanām. Sekot noved citāti, Pasūtījumu utt no kampaņas, lai novērtētu atdevi no ieguldījumiem."
 DocType: Expense Claim,Approver,Apstiprinātājs
 ,SO Qty,SO Daudz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Krājumu papildinājums pastāv pret noliktavā {0}, līdz ar to jūs nevarat atkārtoti piešķirt vai mainīt noliktava"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Krājumu papildinājums pastāv pret noliktavā {0}, līdz ar to jūs nevarat atkārtoti piešķirt vai mainīt noliktava"
 DocType: Appraisal,Calculate Total Score,Aprēķināt kopējo punktu skaitu
 DocType: Supplier Quotation,Manufacturing Manager,Ražošanas vadītājs
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Sērijas Nr {0} ir garantijas līdz pat {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Piegāde piezīme paketēs.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Sūtījumi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip formēšanas
+DocType: Purchase Order,To be delivered to customer,Jāpiegādā klientam
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Laiks Log Status jāiesniedz.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sērijas Nr {0} nepieder nevienai noliktavā
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Iestatīšana
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,No Valūta
 DocType: DocField,Name,Nosaukums
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Lūdzu, izvēlieties piešķirtā summa, rēķina veidu un rēķina numura atleast vienā rindā"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Pasūtījumu nepieciešams postenī {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Pasūtījumu nepieciešams postenī {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Summas, kas nav atspoguļots sistēmā"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company valūta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Pārējie
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Uzstādīt kā Apturēts
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Nevar atrast atbilstošas ​​objektu. Lūdzu, izvēlieties kādu citu vērtību {0}."
 DocType: POS Profile,Taxes and Charges,Nodokļi un maksājumi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkts vai pakalpojums, kas tiek pirkti, pārdot vai turēt noliktavā."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nav iespējams izvēlēties maksas veidu, kā ""Par iepriekšējo rindu summas"" vai ""Par iepriekšējā rindā Total"" par pirmās rindas"
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,Izvēlieties DOCTYPE
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Caurvilkšanai
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banku
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Lūdzu, noklikšķiniet uz ""Generate grafiks"", lai saņemtu grafiku"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Jaunais Izmaksu centrs
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Jaunais Izmaksu centrs
 DocType: Bin,Ordered Quantity,Sakārtots daudzums
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","piemēram, ""Build instrumenti celtniekiem"""
 DocType: Quality Inspection,In Process,In process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Atlaide
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} pret pārdošanas ordeņa {1}
+DocType: Purchase Order Item,Reference Document Type,Atsauces dokuments Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} pret pārdošanas ordeņa {1}
 DocType: Account,Fixed Asset,Pamatlīdzeklis
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serializēja inventarizācija
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serializēja inventarizācija
 DocType: Activity Type,Default Billing Rate,Default Norēķinu Rate
 DocType: Time Log Batch,Total Billing Amount,Kopā Norēķinu summa
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Debitoru konts
 ,Stock Balance,Stock Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Sales Order to Apmaksa
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order to Apmaksa
 DocType: Expense Claim Detail,Expense Claim Detail,Izdevumu Pretenzija Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Laiks Baļķi izveidots:
 DocType: Item,Weight UOM,Svars UOM
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredīts kontā jābūt Kreditoru konts
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursijas: {0} nevar būt vecāks vai bērns {2}
 DocType: Production Order Operation,Completed Qty,Pabeigts Daudz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Par {0}, tikai debeta kontus var saistīt pret citu kredīta ierakstu"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Cenrādis {0} ir invalīds
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Par {0}, tikai debeta kontus var saistīt pret citu kredīta ierakstu"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Cenrādis {0} ir invalīds
 DocType: Manufacturing Settings,Allow Overtime,Atļaut Virsstundas
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Pasūtījumu {0} ir apturēta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} kārtas numurus, kas nepieciešami postenī {1}. Jums ir sniegušas {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Pašreizējais Vērtēšanas Rate
 DocType: Item,Customer Item Codes,Klientu punkts Codes
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Metināšanas
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Jaunais Stock UOM ir nepieciešama
 DocType: Quality Inspection,Sample Size,Izlases lielums
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Visi posteņi jau ir rēķinā
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Visi posteņi jau ir rēķinā
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Lūdzu, norādiet derīgu ""No lietā Nr '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Turpmākie izmaksu centrus var izdarīt ar grupu, bet ierakstus var izdarīt pret nepilsoņu grupām"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Turpmākie izmaksu centrus var izdarīt ar grupu, bet ierakstus var izdarīt pret nepilsoņu grupām"
 DocType: Project,External,Ārējs
 DocType: Features Setup,Item Serial Nos,Postenis Serial Nr
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Lietotāji un atļaujas
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Adrese & Kontakti
 DocType: SMS Log,Sender Name,Sūtītājs Vārds
 DocType: Page,Title,Virsraksts
-sites/assets/js/list.min.js +104,Customize,Pielāgot
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Pielāgot
 DocType: POS Profile,[Select],[Izvēlēties]
 DocType: SMS Log,Sent To,Nosūtīts
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Padarīt pārdošanas rēķinu
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,End of Life
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Ceļot
 DocType: Leave Block List,Allow Users,Atļaut lietotājiem
+DocType: Purchase Order,Customer Mobile No,Klientu Mobile Nr
 DocType: Sales Invoice,Recurring,Atkārtojas
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Izsekot atsevišķu ieņēmumi un izdevumi produktu vertikālēm vai nodaļām.
 DocType: Rename Tool,Rename Tool,Pārdēvēt rīks
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update izmaksas
 DocType: Item Reorder,Item Reorder,Postenis Pārkārtot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transfer Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Materiāls
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Norādiet operācijas, ekspluatācijas izmaksas un sniegt unikālu ekspluatācijā ne jūsu darbībām."
 DocType: Purchase Invoice,Price List Currency,Cenrādis Currency
 DocType: Naming Series,User must always select,Lietotājam ir vienmēr izvēlēties
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,Darbinieks
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importēt e-pastu no
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Uzaicināt kā lietotājs
 DocType: Features Setup,After Sale Installations,Pēc Pārdod Iekārtas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0}{1} ir pilnībā jāmaksā
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0}{1} ir pilnībā jāmaksā
 DocType: Workstation Working Hour,End Time,Beigu laiks
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standarta līguma noteikumi par pārdošanu vai pirkšanu.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupa ar kuponu
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Page,Standard,Standarts
 DocType: Rename Tool,File to Rename,Failu pārdēvēt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},"Purchse Pasūtījuma skaits, kas nepieciešams postenī {0}"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Rādīt Maksājumi
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Noteiktais BOM {0} nepastāv postenī {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Uzturēšana Kalendārs {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Uzturēšana Kalendārs {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Izmērs
 DocType: Notification Control,Expense Claim Approved,Izdevumu Pretenzija Apstiprināts
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceitisks
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,Apmeklējumu Lai datums
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup ienākošā servera pārdošanas e-pasta id. (Piem sales@example.com)
 DocType: Warranty Claim,Raised By,Paaugstināts Līdz
 DocType: Payment Tool,Payment Account,Maksājumu konts
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
-sites/assets/js/list.min.js +23,Draft,Projekts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Projekts
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensējošs Off
 DocType: Quality Inspection Reading,Accepted,Pieņemts
 DocType: User,Female,Sieviete
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Piegāde noteikums Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
 DocType: Newsletter,Test,Pārbaude
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Tā kā ir esošās akciju darījumi par šo priekšmetu, \ jūs nevarat mainīt vērtības "Has Sērijas nē", "Vai partijas Nē", "Vai Stock Vienība" un "vērtēšanas metode""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
 DocType: Employee,Previous Work Experience,Iepriekšējā darba pieredze
 DocType: Stock Entry,For Quantity,Par Daudzums
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Ievadiet Plānotais Daudzums postenī {0} pēc kārtas {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0}{1} nav iesniegta
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Lūgumus par.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0}{1} nav iesniegta
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Lūgumus par.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Atsevišķa produkcija pasūtījums tiks izveidots katrā gatavā labu posteni.
 DocType: Purchase Invoice,Terms and Conditions1,Noteikumi un Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Complete Setup
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Biļetens Mailing
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Contact,Enter department to which this Contact belongs,"Ievadiet departaments, kurā šis Kontaktinformācija pieder"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Kopā Nav
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Postenis vai noliktava rindā {0} nesakrīt Material pieprasījumu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Postenis vai noliktava rindā {0} nesakrīt Material pieprasījumu
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Mērvienības
 DocType: Fiscal Year,Year End Date,Gada beigu datums
 DocType: Task Depends On,Task Depends On,Uzdevums Atkarīgs On
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Līguma beigu datums ir jābūt lielākam nekā datums savienošana
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Trešā persona izplatītājs / tirgotājs / komisijas pārstāvis / filiāli / izplatītāja, kurš pārdod uzņēmumiem produktus komisija."
 DocType: Customer Group,Has Child Node,Ir Bērnu Mezgls
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Ievadiet statiskās url parametrus šeit (Piem. Sūtītājs = ERPNext, lietotājvārds = ERPNext, parole = 1234 uc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} nekādā aktīvā fiskālajā gadā. Lai saņemtu sīkāku informāciju, pārbaudiet {2}."
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Šis ir piemērs mājas lapā automātiski ģenerēts no ERPNext
@@ -2021,11 +2032,9 @@ DocType: Note,Note,Piezīme
 DocType: Purchase Receipt Item,Recd Quantity,Recd daudzums
 DocType: Email Account,Email Ids,E-pasta ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nevar ražot vairāk Vienību {0} nekā Pasūtījumu daudzums {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Uzstādīt kā unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
 DocType: Payment Reconciliation,Bank / Cash Account,Bankas / Naudas konts
 DocType: Tax Rule,Billing City,Norēķinu City
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Šis Atvaļinājuma pieteikums gaida apstiprinājumu. Tikai Leave apstiprinātājs var atjaunināt statusu.
 DocType: Global Defaults,Hide Currency Symbol,Slēpt valūtas simbols
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","piemēram, Bank, Cash, Credit Card"
 DocType: Journal Entry,Credit Note,Kredīts Note
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kopā (Daudz)
 DocType: Installation Note Item,Installed Qty,Uzstādītas Daudz
 DocType: Lead,Fax,Fakss
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Iesniegtie
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Iesniegtie
 DocType: Salary Structure,Total Earning,Kopā krāšana
 DocType: Purchase Receipt,Time at which materials were received,"Laiks, kurā materiāli tika saņemti"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mani adreses
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizācija
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,vai
 DocType: Sales Order,Billing Status,Norēķinu statuss
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Izdevumi
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 Virs
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Virs
 DocType: Buying Settings,Default Buying Price List,Default Pirkšana Cenrādis
 ,Download Backups,Download Backups
 DocType: Notification Control,Sales Order Message,Sales Order Message
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Izvēlieties Darbinieki
 DocType: Bank Reconciliation,To Date,Līdz šim
 DocType: Opportunity,Potential Sales Deal,Potenciālie Sales Deal
-sites/assets/js/form.min.js +308,Details,Sīkāka informācija
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Sīkāka informācija
 DocType: Purchase Invoice,Total Taxes and Charges,Kopā nodokļi un maksājumi
 DocType: Employee,Emergency Contact,Avārijas Contact
 DocType: Item,Quality Parameters,Kvalitātes parametri
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,Saņēma Daudz
 DocType: Stock Entry Detail,Serial No / Batch,Sērijas Nr / Partijas
 DocType: Product Bundle,Parent Item,Parent postenis
 DocType: Account,Account Type,Konta tips
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Uzturēšana Kalendārs nav radīts visiem posteņiem. Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Uzturēšana Kalendārs nav radīts visiem posteņiem. Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
 ,To Produce,Ražot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Par rindu {0} jo {1}. Lai iekļautu {2} vienības likmi, rindas {3} jāiekļauj arī"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikācija paketes par piegādi (drukāšanai)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Izlīdzināšana
 DocType: Account,Income Account,Ienākumu konta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Cilnis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Nodošana
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Nodošana
 DocType: Stock Reconciliation Item,Current Qty,Pašreizējais Daudz
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Skatīt ""Rate Materiālu Balstoties uz"" in tāmēšanu iedaļā"
 DocType: Appraisal Goal,Key Responsibility Area,Key Atbildība Platība
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Visas adreses.
 DocType: Company,Stock Settings,Akciju iestatījumi
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Apvienošana ir iespējama tikai tad, ja šādas īpašības ir vienādas abos ierakstos. Vai Group, Root Type, Uzņēmuma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Apvienošana ir iespējama tikai tad, ja šādas īpašības ir vienādas abos ierakstos. Vai Group, Root Type, Uzņēmuma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Pārvaldīt Klientu grupa Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Jaunais Izmaksu centrs Name
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Jaunais Izmaksu centrs Name
 DocType: Leave Control Panel,Leave Control Panel,Atstājiet Control Panel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Kavējuma Adrese Template atrasts. Lūdzu, izveidojiet jaunu no Setup> Poligrāfija un Branding> Adrese veidni."
 DocType: Appraisal,HR User,HR User
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Maksājumu Tool Detail
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Kopā Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Vietējs
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Vietējs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Aizdevumi un avansi (Aktīvi)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Liels
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Neviens darbinieks atrasts!
 DocType: C-Form Invoice Detail,Territory,Teritorija
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Lūdzu, norādiet neviena apmeklējumu nepieciešamo"
+DocType: Purchase Order,Customer Address Display,Klientu Adrese Display
 DocType: Stock Settings,Default Valuation Method,Default Vērtēšanas metode
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Pulēšanas
 DocType: Production Order Operation,Planned Start Time,Plānotais Sākuma laiks
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Piešķirtas
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Close Bilance un grāmatu peļņa vai zaudējumi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Default mērvienība postenī {0} nevar mainīt, tieši tāpēc, ka \ tu jau guvusi darījums (-us) ar citu UOM. Lai mainītu noklusēto UOM, \ izmantošana "UOM aizstāt lietderība 'līdzeklis saskaņā ar Fondu moduli."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Norādiet Valūtas kurss pārveidot vienu valūtu citā
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Citāts {0} ir atcelts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citāts {0} ir atcelts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Kopējā nesaņemtā summa
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Darbinieku {0} bija atvaļinājumā {1}. Nevar atzīmēt apmeklēšanu.
 DocType: Sales Partner,Targets,Mērķi
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"Tas ir sakne klientu grupai, un to nevar rediģēt."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Lūdzu setup savu grāmatvedības kontu plānu, pirms sākat grāmatvedības ierakstiem"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorēt cenu veidošanas likumu
-sites/assets/js/list.min.js +24,Cancelled,Atcelts
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Atcelts
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"No Datuma algu struktūru, nevar būt mazāka nekā Darbinieku Iestāšanās datums."
 DocType: Employee Education,Graduate,Absolvents
 DocType: Leave Block List,Block Days,Bloķēt dienas
 DocType: Journal Entry,Excise Entry,Akcīzes Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Brīdinājums: Sales Order {0} jau eksistē pret Klienta Pirkuma pasūtījums {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Brīdinājums: Sales Order {0} jau eksistē pret Klienta Pirkuma pasūtījums {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,Stock Saņemtā Bet ne Jāmaksā
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto Pay + Arrear Summa + Inkasāciju Summa - Kopā atskaitīšana
 DocType: Monthly Distribution,Distribution Name,Distribution vārds
 DocType: Features Setup,Sales and Purchase,Pārdošanas un iegāde
-DocType: Purchase Order Item,Material Request No,Materiāls Pieprasījums Nr
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
+DocType: Supplier Quotation Item,Material Request No,Materiāls Pieprasījums Nr
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Likmi, pēc kuras klienta valūtā tiek konvertēta uz uzņēmuma bāzes valūtā"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ir veiksmīgi anulējis no šī saraksta.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Uzņēmējdarbības valūta)
-apps/frappe/frappe/templates/base.html +132,Added,Pievienots
+apps/frappe/frappe/templates/base.html +134,Added,Pievienots
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Pārvaldīt Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Pārdošanas rēķins
 DocType: Journal Entry Account,Party Balance,Party Balance
 DocType: Sales Invoice Item,Time Log Batch,Laiks Log Partijas
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Lūdzu, izvēlieties Piesakies atlaide"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Lūdzu, izvēlieties Piesakies atlaide"
 DocType: Company,Default Receivable Account,Default pasūtītāju konta
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Izveidot Bank ierakstu par kopējo algu maksā par iepriekš izvēlētajiem kritērijiem
 DocType: Stock Entry,Material Transfer for Manufacture,Materiāls pārsūtīšana Ražošana
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Saņemt attiecīgus ierakstus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Sales team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Postenis {0} nepastāv
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Postenis {0} nepastāv
 DocType: Sales Invoice,Customer Address,Klientu adrese
 apps/frappe/frappe/desk/query_report.py +136,Total,Kopsumma
 DocType: Purchase Invoice,Apply Additional Discount On,Piesakies Papildu atlaide
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,Kvalitātes pārbaudes
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formēšana
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Brīdinājums: Materiāls Pieprasītā Daudz ir mazāks nekā minimālais pasūtījums Daudz
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Konts {0} ir sasalusi
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konts {0} ir sasalusi
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridiskā persona / meitas uzņēmums ar atsevišķu kontu plānu, kas pieder Organizācijai."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Pārtika, dzērieni un tabakas"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL vai BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Komisijas likme nevar būt lielāka par 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimālā Inventāra līmenis
 DocType: Stock Entry,Subcontract,Apakšlīgumu
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Ievadiet {0} pirmais
 DocType: Production Planning Tool,Get Items From Sales Orders,Dabūtu preces no klientu pasūtījumiem
 DocType: Production Order Operation,Actual End Time,Faktiskais Beigu laiks
 DocType: Production Planning Tool,Download Materials Required,Lejupielādēt Nepieciešamie materiāli
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,Plānotais
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Lūdzu, izvēlieties elements, "Vai Stock Vienība" ir "nē" un "Vai Pārdošanas punkts" ir "jā", un nav cita Product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izvēlieties Mēneša Distribution nevienmērīgi izplatīt mērķus visā mēnešiem.
 DocType: Purchase Invoice Item,Valuation Rate,Vērtēšanas Rate
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Postenis Row {0}: pirkuma čeka {1} neeksistē virs ""pirkumu čekus"" galda"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Darbinieku {0} jau ir pieprasījis {1} no {2} un {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Darbinieku {0} jau ir pieprasījis {1} no {2} un {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekta sākuma datums
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Līdz
 DocType: Rename Tool,Rename Log,Pārdēvēt Ieiet
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tikai lapu mezgli ir atļauts darījumā
 DocType: Expense Claim,Expense Approver,Izdevumu apstiprinātājs
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Pirkuma čeka Prece Kopā
-sites/assets/js/erpnext.min.js +48,Pay,Maksāt
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Maksāt
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Lai DATETIME
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Baļķi uzturēšanai sms piegādes statusu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slīpēšanas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink iesaiņošana
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Neapstiprinātas aktivitātes
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Neapstiprinātas aktivitātes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Apstiprināts
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Piegādātājs> Piegādātājs Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ievadiet atbrīvojot datumu.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Ie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Laikrakstu izdevēji
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Izvēlieties saimnieciskais gads
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Kausēšanas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Jūs esat Leave apstiprinātājs šā ieraksta. Lūdzu Update ""Statuss"" un Saglabāt"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pārkārtot Level
 DocType: Attendance,Attendance Date,Apmeklējumu Datums
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Alga sabrukuma pamatojoties uz izpeļņu un atskaitīšana.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Izmaksas Center ar esošajiem darījumiem, nevar pārvērst par grupai"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Nolietojums
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Piegādātājs (-i)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Nederīga periods
 DocType: Customer,Credit Limit,Kredītlimita
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Izvēlēties veidu darījumu
 DocType: GL Entry,Voucher No,Kuponu Nr
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Šabl
 DocType: Customer,Address and Contact,Adrese un kontaktinformācija
 DocType: Customer,Last Day of the Next Month,Pēdējā diena nākamajā mēnesī
 DocType: Employee,Feedback,Atsauksmes
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Grafiks
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Grafiks
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazīvs jet machining
 DocType: Stock Settings,Freeze Stock Entries,Iesaldēt krājumu papildināšanu
 DocType: Website Settings,Website Settings,Website iestatījumi
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,Izejošs
 DocType: Material Request,Requested For,Pieprasīts Par
 DocType: Quotation Item,Against Doctype,Pret DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sekot šim pavadzīmi pret jebkuru projektu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root konts nevar izdzēst
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root konts nevar izdzēst
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Rādīt krājumu papildināšanu
 ,Is Primary Address,Vai Primārā adrese
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress noliktavā
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Atsauce # {0} datēts {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Atsauce # {0} datēts {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Pārvaldīt adreses
 DocType: Pricing Rule,Item Code,Postenis Code
 DocType: Production Planning Tool,Create Production Orders,Izveidot pasūtījumu
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,Lietotājs Piezīme
 DocType: Lead,Market Segment,Tirgus segmentā
 DocType: Communication,Phone,Telefons
 DocType: Employee Internal Work History,Employee Internal Work History,Darbinieku Iekšējā Work Vēsture
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Noslēguma (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Noslēguma (Dr)
 DocType: Contact,Passive,Pasīvs
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Sērijas Nr {0} nav noliktavā
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Nodokļu veidni pārdošanas darījumu.
 DocType: Sales Invoice,Write Off Outstanding Amount,Uzrakstiet Off Izcila summa
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Pārbaudiet, vai jums ir nepieciešams automātiskā regulāru rēķinu. Pēc iesniegšanas jebkuru pārdošanas rēķinu, Atkārtotas sadaļu būs redzama."
 DocType: Account,Accounts Manager,Accounts Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',"Time Log {0} ir ""Iesniegtie"""
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Time Log {0} ir ""Iesniegtie"""
 DocType: Stock Settings,Default Stock UOM,Default Stock UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),"Izmaksu likmi, pamatojoties uz darbības veida (stundā)"
 DocType: Production Planning Tool,Create Material Requests,Izveidot Materiāls Pieprasījumi
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Banku samierināšanās
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Saņemt atjauninājumus
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Pievieno dažas izlases ierakstus
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Atstājiet Management
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Atstājiet Management
 DocType: Event,Groups,Grupas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa ar kontu
 DocType: Sales Order,Fully Delivered,Pilnībā Pasludināts
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Pārdošanas Ekstras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budžets konta {1} pret izmaksām centra {2} pārsniegs līdz {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Nosūtīts lapām
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""No Datuma 'jābūt pēc"" Uz Datumu'"
 ,Stock Projected Qty,Stock Plānotais Daudzums
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
 DocType: Sales Order,Customer's Purchase Order,Klienta Pasūtījuma
 DocType: Warranty Claim,From Company,No Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vērtība vai Daudz
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Mazumtirgotājs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredīts kontā jābūt bilance konts
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Visi Piegādātājs veidi
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Postenis Kodekss ir obligāts, jo vienība nav automātiski numurētas"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Citāts {0} nav tipa {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Postenis Kodekss ir obligāts, jo vienība nav automātiski numurētas"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Citāts {0} nav tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Uzturēšana grafiks postenis
 DocType: Sales Order,%  Delivered,% Piegādāts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Banka Overdrafts konts
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Padarīt par atalgojumu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Unstop
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Pārlūkot BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Nodrošināti aizdevumi
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Produkcija
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,Novērtējums
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-putu liešana
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Zīmējums
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datums tiek atkārtots
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Atstājiet apstiprinātājs jābūt vienam no {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Atstājiet apstiprinātājs jābūt vienam no {0}
 DocType: Hub Settings,Seller Email,Pārdevējs Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Cost iegāde (via pirkuma rēķina)
 DocType: Workstation Working Hour,Start Time,Sākuma laiks
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Summa (Uzņēmējdarbības valūta)
 DocType: BOM Operation,Hour Rate,Stunda Rate
 DocType: Stock Settings,Item Naming By,Postenis nosaukšana Līdz
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,No aptauja
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Vēl viens periods Noslēguma Entry {0} ir veikts pēc {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,No aptauja
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Vēl viens periods Noslēguma Entry {0} ir veikts pēc {1}
 DocType: Production Order,Material Transferred for Manufacturing,"Materiāls pārvietoti, lai Manufacturing"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konts {0} neeksistē
 DocType: Purchase Receipt Item,Purchase Order Item No,Pasūtījuma Pozīcijas Nr
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,Inspekcija Nepieciešamais
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Pilnībā Jāmaksā
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Piegāde noliktava nepieciešama akciju posteni {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Piegāde noliktava nepieciešama akciju posteni {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto iepakojuma svars. Parasti neto svars + iepakojuma materiālu svara. (Drukāšanai)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Lietotāji ar šo lomu ir atļauts noteikt iesaldētos kontus, un izveidot / mainīt grāmatvedības ierakstus pret iesaldētos kontus"
 DocType: Serial No,Is Cancelled,Tiek atcelta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Mani sūtījumi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mani sūtījumi
 DocType: Journal Entry,Bill Date,Bill Datums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Pat tad, ja ir vairāki cenu noteikšanas noteikumus ar augstāko prioritāti, tiek piemēroti tad šādi iekšējie prioritātes:"
 DocType: Supplier,Supplier Details,Piegādātājs Details
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Lūdzu, izvēlieties bankas kontu"
 DocType: Newsletter,Create and Send Newsletters,Izveidot un nosūtīt jaunumus
-sites/assets/js/report.min.js +107,From Date must be before To Date,No datumam jābūt pirms līdz šim datumam
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,No datumam jābūt pirms līdz šim datumam
 DocType: Sales Order,Recurring Order,Atkārtojas rīkojums
 DocType: Company,Default Income Account,Default Ienākumu konta
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klientu Group / Klientu
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Pasūtījuma {0} nav iesniegta
 ,Projected,Prognozēts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Sērijas Nr {0} nepieder noliktavu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Piezīme: Sistēma nepārbaudīs pārāk piegādi un pār-rezervāciju postenī {0} kā daudzums vai vērtība ir 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Piezīme: Sistēma nepārbaudīs pārāk piegādi un pār-rezervāciju postenī {0} kā daudzums vai vērtība ir 0
 DocType: Notification Control,Quotation Message,Citāts Message
 DocType: Issue,Opening Date,Atvēršanas datums
 DocType: Journal Entry,Remark,Piezīme
 DocType: Purchase Receipt Item,Rate and Amount,Novērtēt un Summa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Garlaicīgs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,No pārdošanas rīkojumu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,No pārdošanas rīkojumu
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Nav Jāmaksā
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Gan Noliktavas jāpieder pie pats uzņēmums
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Nav kontaktpersonu vēl nav pievienota.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nav kontaktpersonu vēl nav pievienota.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nav aktīvs
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Pret rēķinu grāmatošanas datumu
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Izkrauti izmaksas kuponu Summa
 DocType: Time Log,Batched for Billing,Batched par rēķinu
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Rēķini, ko piegādātāji izvirzītie."
 DocType: POS Profile,Write Off Account,Uzrakstiet Off kontu
-sites/assets/js/erpnext.min.js +26,Discount Amount,Atlaide Summa
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Atlaide Summa
 DocType: Purchase Invoice,Return Against Purchase Invoice,Atgriezties Pret pirkuma rēķina
 DocType: Item,Warranty Period (in days),Garantijas periods (dienās)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"piemēram, PVN"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. punkts
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konts
 DocType: Shopping Cart Settings,Quotation Series,Citāts Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Priekšmets pastāv ar tādu pašu nosaukumu ({0}), lūdzu, nomainiet priekšmets grupas nosaukumu vai pārdēvēt objektu"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Priekšmets pastāv ar tādu pašu nosaukumu ({0}), lūdzu, nomainiet priekšmets grupas nosaukumu vai pārdēvēt objektu"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Karstā metāla gāzes formēšana
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Pasludināts Daudz
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Klientu vai piegādātājs detaļas
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Uzlikt
 DocType: Lead,Lead Owner,Lead Īpašnieks
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Noliktava ir nepieciešama
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Noliktava ir nepieciešama
 DocType: Employee,Marital Status,Ģimenes statuss
 DocType: Stock Settings,Auto Material Request,Auto Materiāls Pieprasījums
 DocType: Time Log,Will be updated when billed.,"Tiks papildināts, ja jāmaksā."
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Pieejams Partijas Daudz at No noliktavas
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Pašreizējā BOM un New BOM nevar būt vienādi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Brīža līdz pensionēšanās jābūt lielākam nekā datums savienošana
 DocType: Sales Invoice,Against Income Account,Pret ienākuma kontu
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,Update Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different UOM objektus, novedīs pie nepareizas (kopā) Neto svars vērtību. Pārliecinieties, ka neto svars katru posteni ir tādā pašā UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Lūdzu pull preces no piegādes pavadzīmē
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Lūdzu pull preces no piegādes pavadzīmē
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Žurnāla ieraksti {0} ir ANO saistītas
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Record visas komunikācijas tipa e-pastu, tālruni, tērzēšana, vizītes, uc"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Lūdzu, atsaucieties uz noapaļot Cost Center Company"
 DocType: Purchase Invoice,Terms,Noteikumi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Izveidot Jauns
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Izveidot Jauns
 DocType: Buying Settings,Purchase Order Required,Pasūtījuma Obligātas
 ,Item-wise Sales History,Postenis gudrs Sales Vēsture
 DocType: Expense Claim,Total Sanctioned Amount,Kopā sodīts summa
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Alga Slip atskaitīšana
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Piezīmes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Izvēlieties grupas mezglu pirmās.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Mērķim ir jābūt vienam no {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Aizpildiet formu un saglabājiet to
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Aizpildiet formu un saglabājiet to
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Lejupielādēt ziņojumu, kurā visas izejvielas, ar savu jaunāko inventāra statusu"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forums
 DocType: Leave Application,Leave Balance Before Application,Atstājiet Balance pirms uzklāšanas
 DocType: SMS Center,Send SMS,Sūti SMS
 DocType: Company,Default Letter Head,Default Letter vadītājs
 DocType: Time Log,Billable,Billable
 DocType: Authorization Rule,This will be used for setting rule in HR module,"Tas tiks izmantota, lai noteiktu noteikumu, HR moduli"
 DocType: Account,Rate at which this tax is applied,"Ātrums, kādā tiek piemērots šis nodoklis"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Pārkārtot Daudz
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Pārkārtot Daudz
 DocType: Company,Stock Adjustment Account,Stock konta korekcijas
 DocType: Journal Entry,Write Off,Uzrakstiet Off
 DocType: Time Log,Operation ID,Darbība ID
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Atlaide Fields būs pieejama Pirkuma pasūtījums, pirkuma čeka, pirkuma rēķina"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nosaukums jaunu kontu. Piezīme: Lūdzu, nav izveidot klientu kontus un piegādātājiem"
 DocType: Report,Report Type,Ziņojums Type
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Iekraušana
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Iekraušana
 DocType: BOM Replace Tool,BOM Replace Tool,BOM aizstāšana rīks
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Valsts gudrs noklusējuma Adrese veidnes
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Piegādātājs piegādā Klientam
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Rādīt nodokļu break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Datu importēšana un eksportēšana
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Ja jūs iesaistīt ražošanas darbības. Ļauj postenis ""ir ražots"""
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Rēķina Posting Date
 DocType: Sales Invoice,Rounded Total,Noapaļota Kopā
 DocType: Product Bundle,List items that form the package.,"Saraksts priekšmeti, kas veido paketi."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentuālais sadalījums būtu vienāda ar 100%
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Lūdzu, sazinieties ar lietotāju, kurš ir Sales Master vadītājs {0} lomu"
 DocType: Company,Default Cash Account,Default Naudas konts
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nav Klients vai piegādātājs) kapteinis.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Piegāde Notes {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Piegāde Notes {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Samaksāta summa + norakstīt summa nedrīkst būt lielāka par Grand Kopā
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nav derīgs Partijas skaits postenī {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Piezīme: Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rinda {0}: Daudz nav avalable noliktavā {1} uz {2}{3}. Pieejams Daudzums: {4}, Transfer Daudzums: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postenis 3
+DocType: Purchase Order,Customer Contact Email,Klientu Kontakti Email
 DocType: Event,Sunday,Svētdiena
 DocType: Sales Team,Contribution (%),Ieguldījums (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Piezīme: Maksājumu ievades netiks izveidota, jo ""naudas vai bankas konts"" netika norādīta"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Pienākumi
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Template
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Template
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ievadiet Vismaz 1 rēķinu tabulā
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Pievienot lietotājus
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),Faktiskā Sākuma datums (via Ti
 DocType: Stock Reconciliation Item,Before reconciliation,Pirms samierināšanās
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Uz {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Nodokļi un maksājumi Pievienoja (Company valūta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
 DocType: Sales Order,Partly Billed,Daļēji Jāmaksā
 DocType: Item,Default BOM,Default BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Kopā Izcila Amt
 DocType: Time Log Batch,Total Hours,Kopējais stundu skaits
 DocType: Journal Entry,Printing Settings,Drukāšanas iestatījumi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Kopējais debets jābūt vienādam ar kopējās kredīta. Atšķirība ir {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Kopējais debets jābūt vienādam ar kopējās kredīta. Atšķirība ir {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobiļu
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Dodas uz tipam {0} jau piešķirtajām Vajadzīgi {1} fiskālajā gadā {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Ir nepieciešama postenis
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metāla iesmidzināšanas formēšanas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,No piegāde piezīme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,No piegāde piezīme
 DocType: Time Log,From Time,No Time
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investīciju banku
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,Svins ar šo e-pasta
 DocType: Stock Entry,From BOM,No BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Pamata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Akciju darījumiem pirms {0} ir iesaldēti
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Līdz šim vajadzētu būt tāds pats kā No datums par Half Day atvaļinājumu
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Līdz šim vajadzētu būt tāds pats kā No datums par Half Day atvaļinājumu
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","piemēram Kg, Unit, numurus, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Atsauces Nr ir obligāta, ja esat norādījis atsauces datumā"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Atsauces Nr ir obligāta, ja esat norādījis atsauces datumā"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datums Savieno jābūt lielākam nekā Dzimšanas datums
 DocType: Salary Structure,Salary Structure,Algu struktūra
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Vairāki Cena noteikums pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt \ konfliktu, piešķirot prioritāti. Cena Noteikumi: {0}"
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aviokompānija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Jautājums Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Jautājums Materiāls
 DocType: Material Request Item,For Warehouse,Par Noliktava
 DocType: Employee,Offer Date,Piedāvājums Datums
 DocType: Hub Settings,Access Token,Access Token
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,Atvēršanas laiks
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,No un uz datumiem nepieciešamo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vērtspapīru un preču biržu
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
+DocType: Delivery Note Item,From Warehouse,No Noliktava
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Urbšana
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow molding
 DocType: Purchase Taxes and Charges,Valuation and Total,Vērtēšana un Total
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,Grozīts No
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Izejviela
 DocType: Leave Application,Follow via Email,Sekot pa e-pastu
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Nodokļu summa pēc Atlaide Summa
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Bērnu konts pastāv šim kontam. Jūs nevarat dzēst šo kontu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Bērnu konts pastāv šim kontam. Jūs nevarat dzēst šo kontu.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Nu mērķa Daudzums vai paredzētais apjoms ir obligāta
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Nē noklusējuma BOM pastāv postenī {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
-DocType: Leave Allocation,Carry Forward,Virzīt uz priekšu
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Nē noklusējuma BOM pastāv postenī {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Atvēršanas datums būtu pirms slēgšanas datums
+DocType: Leave Control Panel,Carry Forward,Virzīt uz priekšu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,"Izmaksas Center ar esošajiem darījumiem, nevar pārvērst par virsgrāmatā"
 DocType: Department,Days for which Holidays are blocked for this department.,Dienas kuriem Brīvdienas ir bloķēta šajā departamentā.
 ,Produced,Saražotā
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kopā (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datums, kurā atkārtojas pasūtījums tiks apstāties"
 DocType: Quality Inspection,Item Serial No,Postenis Sērijas Nr
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} ir jāsamazina par {1}, vai jums vajadzētu palielināt pārplūdes toleranci"
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} ir jāsamazina par {1}, vai jums vajadzētu palielināt pārplūdes toleranci"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Kopā Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Stunda
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Sērijveida postenis {0} nevar atjaunināt \ izmantojot krājumu samierināšanās
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transfer Materiāls piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfer Materiāls piegādātājam
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"Jaunais Sērijas Nē, nevar būt noliktava. Noliktavu jānosaka ar Fondu ieceļošanas vai pirkuma čeka"
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Izveidot citāts
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Visi šie posteņi jau rēķinā
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Visi šie posteņi jau rēķinā
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Var apstiprināt ar {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Piegāde pants Nosacījumi
 DocType: BOM Replace Tool,The new BOM after replacement,Jaunais BOM pēc nomaiņas
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Darbība ID nav noteikts
 DocType: Production Order,Planned Start Date,Plānotais sākuma datums
 DocType: Serial No,Creation Document Type,Izveide Dokumenta tips
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Apmeklējums
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Apmeklējums
 DocType: Leave Type,Is Encash,Ir iekasēt skaidrā naudā
 DocType: Purchase Invoice,Mobile No,Mobile Nr
 DocType: Payment Tool,Make Journal Entry,Padarīt Journal Entry
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,Jaunas lapas Piešķirtie
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekts gudrs dati nav pieejami aptauja
 DocType: Project,Expected End Date,"Paredzams, beigu datums"
 DocType: Appraisal Template,Appraisal Template Title,Izvērtēšana Template sadaļa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Tirdzniecības
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Tirdzniecības
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent postenis {0} nedrīkst būt Stock Vienība
 DocType: Cost Center,Distribution Id,Distribution Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Cenas atribūtu {0} ir jābūt robežās no {1} līdz {2} Jo soli {3}
 DocType: Tax Rule,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,Pamatsumma
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
+DocType: Leave Allocation,Unused leaves,Neizmantotās lapas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default parādi Debitoru
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Zāģēšanas
 DocType: Tax Rule,Billing State,Norēķinu Valsts
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminēšanas
 DocType: Item Reorder,Transfer,Nodošana
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
 DocType: Authorization Rule,Applicable To (Employee),Piemērojamais Lai (Darbinieku)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date ir obligāts
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,Mazumtirdzniecība
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Klientu {0} nepastāv
 DocType: Attendance,Absent,Nekonstatē
 DocType: Product Bundle,Product Bundle,Produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Invalid atsauce {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Drupināšanas
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Pirkuma nodokļi un nodevas Template
 DocType: Upload Attendance,Download Template,Download Template
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,Piezīmes
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Izejvielas Produkta kods
 DocType: Journal Entry,Write Off Based On,Uzrakstiet Off Based On
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Uzstādīšana rekords Serial Nr
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Uzstādīšana rekords Serial Nr
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Nepārtrauktās liešanas
-sites/assets/js/erpnext.min.js +10,Please specify a,"Lūdzu, norādiet"
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Lūdzu, norādiet"
 DocType: Offer Letter,Awaiting Response,Gaida atbildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Iepriekš
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold izmēru
 DocType: Salary Slip,Earning & Deduction,Nopelnot & atskaitīšana
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konts {0} nevar būt Group
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Apgabals
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,"Pēc izvēles. Šis iestatījums tiks izmantota, lai filtrētu dažādos darījumos."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"Pēc izvēles. Šis iestatījums tiks izmantota, lai filtrētu dažādos darījumos."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatīva Vērtēšana Rate nav atļauta
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Par piemēram, 2012.gada 2012-13"
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Uztūcis
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Iztvaikošanas-modelis liešana
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Izklaides izdevumi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Pārdošanas rēķins {0} ir atcelts pirms anulējot šo klientu pasūtījumu
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Vecums
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Pārdošanas rēķins {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Vecums
 DocType: Time Log,Billing Amount,Norēķinu summa
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Noteikts posteni Invalid daudzums {0}. Daudzums ir lielāks par 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Pieteikumi atvaļinājuma.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Konts ar esošo darījumu nevar izdzēst
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konts ar esošo darījumu nevar izdzēst
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiskie izdevumi
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Mēneša diena, kurā auto pasūtījums tiks radīts, piemēram 05, 28 utt"
 DocType: Sales Invoice,Posting Time,Norīkošanu laiks
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logotips
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Atzīmējiet šo, ja vēlaties, lai piespiestu lietotājam izvēlēties vairākus pirms saglabāšanas. Nebūs noklusējuma, ja jūs pārbaudīt šo."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Pozīcijas ar Serial Nr {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Atvērt Paziņojumi
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Atvērt Paziņojumi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Tiešie izdevumi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,"Vai jūs tiešām vēlaties, lai UNSTOP Šis materiāls pieprasījums?"
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Jaunais klientu Ieņēmumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Ceļa izdevumi
 DocType: Maintenance Visit,Breakdown,Avārija
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kā datumā
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Trīšanas
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probācija
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Default Noliktava ir obligāta krājumu postenī.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Default Noliktava ir obligāta krājumu postenī.
 DocType: Feed,Full Name,Pilns nosaukums
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Uzvarot
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Samaksa algas par mēnesi {0} un gads {1}
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Pievienot rinda
 DocType: Buying Settings,Default Supplier Type,Default Piegādātājs Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Karjeru
 DocType: Production Order,Total Operating Cost,Kopā ekspluatācijas izmaksas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Piezīme: postenis {0} ieraksta vairākas reizes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Piezīme: postenis {0} ieraksta vairākas reizes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Visi Kontakti.
 DocType: Newsletter,Test Email Id,Tests Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Uzņēmuma saīsinājums
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citāti
 DocType: Stock Settings,Role Allowed to edit frozen stock,Loma Atļauts rediģēt saldētas krājumus
 ,Territory Target Variance Item Group-Wise,Teritorija Mērķa Variance Prece Group-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Visas klientu grupas
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Nodokļu veidne ir obligāta.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konts {0}: Mātes vērā {1} neeksistē
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenrādis Rate (Company valūta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',"{0}{1} statuss ir ""apturēta"""
 DocType: Account,Temporary,Pagaidu
 DocType: Address,Preferred Billing Address,Vēlamā Norēķinu adrese
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuālais sadalījums
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postenis Wise Nodokļu
 DocType: Purchase Order Item,Supplier Quotation,Piegādātājs Citāts
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Vārdos būs redzami, kad saglabājat citāts."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Gludināšanas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0}{1} ir apturēta
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0}{1} ir apturēta
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
 DocType: Lead,Add to calendar on this date,Pievienot kalendāram šajā datumā
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Noteikumi par piebilstot piegādes izmaksas.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Gaidāmie notikumi
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Gaidāmie notikumi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klientam ir pienākums
 DocType: Letter Head,Letter Head,Vēstule Head
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Quick Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ir obligāta Atgriezties
 DocType: Purchase Order,To Receive,Saņemt
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montāžas
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Vismaz viena noliktava ir obligāta
 DocType: Serial No,Out of Warranty,No Garantijas
 DocType: BOM Replace Tool,Replace,Aizstāt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Ievadiet noklusējuma mērvienības
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ievadiet noklusējuma mērvienības
 DocType: Purchase Invoice Item,Project Name,Projekta nosaukums
 DocType: Supplier,Mention if non-standard receivable account,Pieminēt ja nestandarta debitoru konts
 DocType: Workflow State,Edit,Rediģēt
 DocType: Journal Entry Account,If Income or Expense,Ja ieņēmumi vai izdevumi
 DocType: Features Setup,Item Batch Nos,Vienība Partijas Nr
 DocType: Stock Ledger Entry,Stock Value Difference,Preces vērtība Starpība
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Cilvēkresursi
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Cilvēkresursi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Maksājumu Samierināšanās Maksājumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Nodokļu Aktīvi
 DocType: BOM Item,BOM No,BOM Nr
 DocType: Contact Us Settings,Pincode,Pasta indeksa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nav konta {1} vai jau saskaņota pret citu talonu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nav konta {1} vai jau saskaņota pret citu talonu
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM kas tiks aizstāti
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Jaunais Stock UOM jāatšķiras no pašreizējās akciju UOM
 DocType: Account,Debit,Debets
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,Lapas jāpiešķir var sastāvēt no 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Lapas jāpiešķir var sastāvēt no 0.5
 DocType: Production Order,Operation Cost,Darbība izmaksas
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Augšupielādēt apmeklēšanu no .csv faila
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izcila Amt
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Noteikt
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Lai piešķirtu šo jautājumu, izmantojiet ""piešķirt"" pogu sānjoslas."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Iesaldēt Krājumi Vecāki par [dienas]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ja divi vai vairāki Cenu novērtēšanas noteikumi ir balstīti uz iepriekš minētajiem nosacījumiem, prioritāte tiek piemērota. Prioritāte ir skaitlis no 0 lìdz 20, kamēr noklusējuma vērtība ir nulle (tukšs). Lielāks skaitlis nozīmē, ka tas ir prioritāte, ja ir vairāki cenu veidošanas noteikumi, ar tādiem pašiem nosacījumiem."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Pret rēķinam
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskālā Gads: {0} neeksistē
 DocType: Currency Exchange,To Currency,Līdz Valūta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Ļauj šie lietotāji apstiprināt Leave Pieteikumi grupveida dienas.
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Likme
 DocType: Stock Entry Detail,Additional Cost,Papildu izmaksas
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Finanšu gads beigu datums
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nevar filtrēt balstīta uz kupona, ja grupēti pēc kuponu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Padarīt Piegādātāja citāts
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Padarīt Piegādātāja citāts
 DocType: Quality Inspection,Incoming,Ienākošs
 DocType: BOM,Materials Required (Exploded),Nepieciešamie materiāli (eksplodēja)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Samazināt Nopelnot par Bezalgas atvaļinājums (LWP)
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Sērijas Nr {1} nesakrīt ar {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partijas ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Piezīme: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Piezīme: {0}
 ,Delivery Note Trends,Piegāde Piezīme tendences
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ŠONEDĒĻ kopsavilkums
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} jābūt Pirkta vai Apakšuzņēmēju Ir rindā {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} jābūt Pirkta vai Apakšuzņēmēju Ir rindā {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konts: {0} var grozīt tikai ar akciju darījumiem
 DocType: GL Entry,Party,Partija
 DocType: Sales Order,Delivery Date,Piegāde Datums
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,G
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Vid. Pirkšana Rate
 DocType: Task,Actual Time (in Hours),Faktiskais laiks (stundās)
 DocType: Employee,History In Company,Vēsture Company
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Biļeteni
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Biļeteni
 DocType: Address,Shipping,Piegāde
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,Atstājiet Block saraksts
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,Revidents
 DocType: Purchase Order,End date of current order's period,Beigu datums no kārtējā pasūtījuma perioda
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Padarīt piedāvājuma vēstule
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Atgriešanās
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Default mērvienība Variant jābūt tāda pati kā Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Default mērvienība Variant jābūt tāda pati kā Template
 DocType: DocField,Fold,Salocīt
 DocType: Production Order Operation,Production Order Operation,Ražošanas Order Operation
 DocType: Pricing Rule,Disable,Atslēgt
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Ziņojumi
 DocType: SMS Settings,Enter url parameter for receiver nos,Ievadiet url parametrs uztvērēja nos
 DocType: Sales Invoice,Paid Amount,Samaksāta summa
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Noslēguma kontu {0} ir jābūt tipa 'Atbildības'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Noslēguma kontu {0} ir jābūt tipa 'Atbildības'
 ,Available Stock for Packing Items,Pieejams Stock uz iepakojuma vienības
 DocType: Item Variant,Item Variant,Postenis Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Šī adrese veidne kā noklusējuma iestatījums, jo nav cita noklusējuma"
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitātes vadība
 DocType: Production Planning Tool,Filter based on customer,"Filtrs, pamatojoties uz klientu"
 DocType: Payment Tool Detail,Against Voucher No,Pret kupona
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Ievadiet daudzumu postenī {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Ievadiet daudzumu postenī {0}
 DocType: Employee External Work History,Employee External Work History,Darbinieku Ārējās Work Vēsture
 DocType: Tax Rule,Purchase,Pirkums
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilance Daudz
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials","Kopējais grupa ** preces ** citā postenī ** *
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Sērijas numurs ir obligāta postenī {0}
 DocType: Item Variant Attribute,Attribute,Īpašība
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Lūdzu, norādiet no / uz svārstīties"
-sites/assets/js/desk.min.js +7652,Created By,Izveidoja
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Izveidoja
 DocType: Serial No,Under AMC,Zem AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Posteņu novērtēšana likme tiek pārrēķināts apsver izkraut izmaksu kupona summa
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Noklusējuma iestatījumi pārdošanas darījumu.
 DocType: BOM Replace Tool,Current BOM,Pašreizējā BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Pievienot Sērijas nr
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Pievienot Sērijas nr
 DocType: Production Order,Warehouses,Noliktavas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print un stacionārās
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Mezgls
 DocType: Payment Reconciliation,Minimum Amount,Minimālā summa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Atjaunināt Pabeigts preces
 DocType: Workstation,per hour,stundā
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Sērija {0} jau izmanto {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Sērija {0} jau izmanto {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Pārskats par noliktavas (nepārtrauktās inventarizācijas), tiks izveidots saskaņā ar šo kontu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Noliktava nevar izdzēst, jo pastāv šī noliktava akciju grāmata ierakstu."
 DocType: Company,Distribution,Sadale
-sites/assets/js/erpnext.min.js +50,Amount Paid,Samaksātā summa
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Samaksātā summa
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projekta vadītājs
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Nosūtīšana
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max atlaide atļauta posteni: {0}{1}%
 DocType: Customer,Default Taxes and Charges,Noklusējuma nodokļi un maksājumi
 DocType: Account,Receivable,Saņemams
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Nav atļauts mainīt piegādātāju, jo jau pastāv Pasūtījuma"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Loma, kas ir atļauts iesniegt darījumus, kas pārsniedz noteiktos kredīta limitus."
 DocType: Sales Invoice,Supplier Reference,Piegādātājs Reference
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ja ieslēgts, BOM uz sub-montāžas vienības tiks uzskatīts, lai iegūtu izejvielas. Pretējā gadījumā visi sub-montāžas vienības tiks uzskatīta par izejvielu."
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,Add / Remove saņēmējus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Darījums nav atļauts pret pārtrauca ražošanu Pasūtīt {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Lai uzstādītu šo taksācijas gadu kā noklusējumu, noklikšķiniet uz ""Set as Default"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup ienākošā servera atbalstu e-pasta id. (Piem support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Trūkums Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Trūkums Daudz
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
 DocType: Salary Slip,Salary Slip,Alga Slip
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Apstādījumu
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Lai datums"" ir nepieciešama"
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ja kāda no pārbaudītajiem darījumiem ir ""Iesniegtie"", e-pasts pop-up automātiski atvērta, lai nosūtītu e-pastu uz saistīto ""Kontakti"" šajā darījumā, ar darījumu kā pielikumu. Lietotājs var vai nevar nosūtīt e-pastu."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globālie iestatījumi
 DocType: Employee Education,Employee Education,Darbinieku izglītība
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Konts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Sērijas Nr {0} jau ir saņēmis
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,Manufacturing User
 DocType: Purchase Order,Raw Materials Supplied,Izejvielas Kopā
 DocType: Purchase Invoice,Recurring Print Format,Atkārtojas Print Format
 DocType: Communication,Series,Sērija
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,"Paredzams, Piegāde datums nevar būt pirms pirkuma pasūtījuma Datums"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Paredzams, Piegāde datums nevar būt pirms pirkuma pasūtījuma Datums"
 DocType: Appraisal,Appraisal Template,Izvērtēšana Template
 DocType: Communication,Email,E-pasts
 DocType: Item Group,Item Classification,Postenis klasifikācija
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,Algas iestatījumi
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match nesaistītajos rēķiniem un maksājumiem.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Pasūtīt
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nevar būt vecāks izmaksu centru
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Izvēlēties Brand ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Piemērojamais
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Darbība Time jābūt lielākam par 0 ekspluatācijai {0}
 DocType: Supplier,Address and Contacts,Adrese un kontakti
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Iegūt nepārspējamas Kuponi
 DocType: Warranty Claim,Resolved By,Atrisināts Līdz
 DocType: Appraisal,Start Date,Sākuma datums
-sites/assets/js/desk.min.js +7629,Value,Vērtība
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Vērtība
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Piešķirt atstāj uz laiku.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Klikšķiniet šeit, lai pārbaudītu"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konts {0}: Jūs nevarat piešķirt sevi kā mātes kontu
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Access Atļauts
 DocType: Dropbox Backup,Weekly,Nedēļas
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Piem. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Saņemt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Saņemt
 DocType: Maintenance Visit,Fully Completed,Pilnībā Pabeigts
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% pabeigti
 DocType: Employee,Educational Qualification,Izglītības Kvalifikācijas
 DocType: Workstation,Operating Costs,Ekspluatācijas Izmaksas
 DocType: Employee Leave Approver,Employee Leave Approver,Darbinieku Leave apstiprinātājs
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ir veiksmīgi pievienota mūsu Newsletter sarakstā.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronu kūļa machining
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pirkuma Master vadītājs
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Pievienot / rediģēt Cenas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Shēma izmaksu centriem
 ,Requested Items To Be Ordered,Pieprasītās Preces jāpiespriež
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Mani Pasūtījumi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mani Pasūtījumi
 DocType: Price List,Price List Name,Cenrādis Name
 DocType: Time Log,For Manufacturing,Par Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Kopsummas
@@ -3471,7 +3489,7 @@ DocType: Account,Income,Ienākums
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Kaut kas nogāja greizi!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Brīdinājums: Atvaļinājuma pieteikums ietver sekojošus bloķētus datumus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Pārdošanas rēķins {0} jau ir iesniegti
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Pārdošanas rēķins {0} jau ir iesniegti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Pabeigšana Datums
 DocType: Purchase Invoice Item,Amount (Company Currency),Summa (Company valūta)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die liešana
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Gads
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profils
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Lūdzu, atjauniniet SMS Settings"
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Time Log {0} jau rēķins
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} jau rēķins
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Nenodrošināti aizdevumi
 DocType: Cost Center,Cost Center Name,Cost Center Name
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,{0} prece ar Serial Nr {1} jau ir uzstādīta
 DocType: Maintenance Schedule Detail,Scheduled Date,Plānotais datums
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Kopējais apmaksātais Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Vēstules, kas pārsniedz 160 rakstzīmes tiks sadalīta vairākos ziņas"
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Saņemts un pieņemts
 ,Serial No Service Contract Expiry,Sērijas Nr Pakalpojumu līgums derīguma
 DocType: Item,Unit of Measure Conversion,Mērvienība Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Darbinieku nevar mainīt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
 DocType: Naming Series,Help HTML,Palīdzība HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Kopā weightage piešķirts vajadzētu būt 100%. Tas ir {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Pabalsts pārmērīga {0} šķērsoja postenī {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Pabalsts pārmērīga {0} šķērsoja postenī {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Nosaukums personas vai organizācijas, ka šī adrese pieder."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Jūsu Piegādātāji
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost kā tiek veikts Sales Order.
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,Konvertē
 DocType: Item,Has Serial No,Ir Sērijas nr
 DocType: Employee,Date of Issue,Izdošanas datums
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: No {0} uz {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Dators
 DocType: Item,List this Item in multiple groups on the website.,Uzskaitīt šo Prece vairākās grupās par mājas lapā.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Lūdzu, pārbaudiet multi valūtu iespēju ļaut konti citā valūtā"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Lūdzu, pārbaudiet multi valūtu iespēju ļaut konti citā valūtā"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Punkts: {0} neeksistē sistēmā
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Jums nav atļauts uzstādīt Frozen vērtību
 DocType: Payment Reconciliation,Get Unreconciled Entries,Saņemt Unreconciled Ieraksti
@@ -3524,14 +3542,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Uz noliktavu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konts {0} ir ievadīts vairāk nekā vienu reizi taksācijas gadā {1}
 ,Average Commission Rate,Vidēji Komisija likme
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Apmeklējumu nevar atzīmēti nākamajām datumiem
 DocType: Pricing Rule,Pricing Rule Help,Cenu noteikums Palīdzība
 DocType: Purchase Taxes and Charges,Account Head,Konts Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,"Atjaunināt papildu izmaksas, lai aprēķinātu izkraut objektu izmaksas"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrības
 DocType: Stock Entry,Total Value Difference (Out - In),Kopējā vērtība Starpība (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Row {0}: Valūtas kurss ir obligāta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Valūtas kurss ir obligāta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},"Lietotāja ID nav noteikts, Darbinieka {0}"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,No garantijas prasību
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,Nosaucot Series
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
 DocType: User,Enabled,Enabled
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akciju aktīvi
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Vai jūs tiešām vēlaties iesniegt visu atalgojumu par mēnesi {0} un gadu {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vai jūs tiešām vēlaties iesniegt visu atalgojumu par mēnesi {0} un gadu {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importa Reģistrētiem
 DocType: Target Detail,Target Qty,Mērķa Daudz
 DocType: Attendance,Present,Dāvana
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Piegāde piezīme {0} nedrīkst jāiesniedz
 DocType: Notification Control,Sales Invoice Message,Sales rēķins Message
 DocType: Authorization Rule,Based On,Pamatojoties uz
-,Ordered Qty,Sakārtots Daudz
+DocType: Sales Order Item,Ordered Qty,Sakārtots Daudz
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Postenis {0} ir invalīds
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Līdz pat
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Laika posmā no un periodu, lai datumiem obligātajām atkārtotu {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekta aktivitāte / uzdevums.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Izveidot algas lapas
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nav derīga e-pasta id
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Augšupielāde apmeklējums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM un ražošana daudzums ir nepieciešami
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Novecošana Range 2
-DocType: Journal Entry Account,Amount,Summa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Summa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Kniedēm
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM aizstāj
 ,Sales Analytics,Pārdošanas Analytics
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,"Paredzams, datums nevar būt pirms Material Pieprasīt Datums"
 DocType: Contact Us Settings,City,Pilsēta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultraskaņas mehāniskā
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Kļūda: Nav derīgs id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Kļūda: Nav derīgs id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Postenis {0} jābūt Pārdošanas punkts
 DocType: Naming Series,Update Series Number,Update Series skaits
 DocType: Account,Equity,Taisnīgums
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,Faktisks
 DocType: Authorization Rule,Customerwise Discount,Customerwise Atlaide
 DocType: Purchase Invoice,Against Expense Account,Pret Izdevumu kontu
 DocType: Production Order,Production Order,Ražošanas rīkojums
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Jau ir iesniegta uzstādīšana Note {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Jau ir iesniegta uzstādīšana Note {0}
 DocType: Quotation Item,Against Docname,Pret Docname
 DocType: SMS Center,All Employee (Active),Visi Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Skatīt Tagad
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Izejvielas izmaksas
 DocType: Item,Re-Order Level,Re-Order līmenis
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ievadiet preces un plānoto qty par kuru vēlaties paaugstināt ražošanas pasūtījumus vai lejupielādēt izejvielas analīzei.
-sites/assets/js/list.min.js +174,Gantt Chart,Ganta diagramma
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Ganta diagramma
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Nepilna laika
 DocType: Employee,Applicable Holiday List,Piemērojams brīvdienu sarakstu
 DocType: Employee,Cheque,Čeks
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Atjaunots
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Ziņojums Type ir obligāts
 DocType: Item,Serial Number Series,Sērijas numurs Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Noliktava ir obligāta krājuma priekšmetu {0} rindā {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Noliktava ir obligāta krājuma priekšmetu {0} rindā {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Tirdzniecība un vairumtirdzniecība
 DocType: Issue,First Responded On,First atbildēja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross uzskaitījums Prece ir vairākām grupām
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,Apmeklētība
 DocType: Page,No,Nē
 DocType: BOM,Materials,Materiāli
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ja nav atzīmēts, sarakstā būs jāpievieno katrā departamentā, kur tas ir jāpiemēro."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Norīkošanu datumu un norīkošanu laiks ir obligāta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Norīkošanu datumu un norīkošanu laiks ir obligāta
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Nodokļu veidni pārdošanas darījumus.
 ,Item Prices,Izstrādājumu cenas
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Vārdos būs redzams pēc tam, kad esat saglabāt pirkuma pasūtījuma."
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administratīvie izdevumi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Klientu Group
-sites/assets/js/erpnext.min.js +50,Change,Maiņa
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Maiņa
 DocType: Purchase Invoice,Contact Email,Kontaktpersonas e-pasta
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',"Pasūtījuma {0} ir ""apturēta"""
 DocType: Appraisal Goal,Score Earned,Score Nopelnītās
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","piemēram, ""My Company LLC"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Uzteikuma termiņa
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,Bruto svars UOM
 DocType: Email Digest,Receivables / Payables,Debitori / Parādi
 DocType: Delivery Note Item,Against Sales Invoice,Pret pārdošanas rēķinu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Zīmogošana
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kredīta konts
 DocType: Landed Cost Item,Landed Cost Item,Izkrauti izmaksu pozīcijas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Parādīt nulles vērtības
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Daudzums posteņa iegūta pēc ražošanas / pārpakošana no dotajiem izejvielu daudzumu
 DocType: Payment Reconciliation,Receivable / Payable Account,Debitoru / kreditoru konts
 DocType: Delivery Note Item,Against Sales Order Item,Pret Sales Order posteni
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
 DocType: Item,Default Warehouse,Default Noliktava
 DocType: Task,Actual End Date (via Time Logs),Faktiskā beigu datums (via Time Baļķi)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budžets nevar iedalīt pret grupas kontā {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,Atbalsta komanda
 DocType: Appraisal,Total Score (Out of 5),Total Score (no 5)
 DocType: Contact Us Settings,State,Valsts
 DocType: Batch,Batch,Partijas
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Līdzsvars
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Līdzsvars
 DocType: Project,Total Expense Claim (via Expense Claims),Kopējo izdevumu Pretenzijas (via izdevumu deklarācijas)
 DocType: User,Gender,Dzimums
 DocType: Journal Entry,Debit Note,Parādzīmi
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,Blog Abonenta
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,"Izveidot noteikumus, lai ierobežotu darījumi, pamatojoties uz vērtībām."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ja ieslēgts, Total nē. Darbadienu būs brīvdienas, un tas samazinātu vērtību Alga dienā"
 DocType: Purchase Invoice,Total Advance,Kopā Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Unstop Materiāls Pieprasījums
 DocType: Workflow State,User,Lietotājs
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Apstrāde algu
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Apstrāde algu
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Kredīta summa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Uzstādīt kā Lost
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,Kredīta Dienas Based On
 DocType: Tax Rule,Tax Rule,Nodokļu noteikums
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Uzturēt pašu likmi VISĀ pārdošanas ciklā
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plānot laiku žurnālus ārpus Workstation darba laiks.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0}{1} jau ir iesniegts
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0}{1} jau ir iesniegts
 ,Items To Be Requested,"Preces, kas jāpieprasa"
 DocType: Purchase Order,Get Last Purchase Rate,Saņemt pēdējā pirkšanas likme
 DocType: Time Log,Billing Rate based on Activity Type (per hour),"Norēķinu likme, pamatojoties uz darbības veida (stundā)"
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Uzņēmuma e-pasta ID nav atrasts, tāpēc pasts nav nosūtīts"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Līdzekļu (aktīvu)
 DocType: Production Planning Tool,Filter based on item,Filtrs balstās uz posteni
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debeta kontu
 DocType: Fiscal Year,Year Start Date,Gadu sākuma datums
 DocType: Attendance,Employee Name,Darbinieku Name
 DocType: Sales Invoice,Rounded Total (Company Currency),Noapaļota Kopā (Company valūta)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Darbinieku pabalsti
 DocType: Sales Invoice,Is POS,Ir POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
 DocType: Production Order,Manufactured Qty,Ražoti Daudz
 DocType: Purchase Receipt Item,Accepted Quantity,Pieņemts daudzums
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neeksistē
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rēķinus izvirzīti klientiem.
 DocType: DocField,Default,Saistību nepildīšana
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekts Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonenti pievienotās
 DocType: Maintenance Schedule,Schedule,Grafiks
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definēt budžets šim izmaksu centru. Lai uzstādītu budžeta pasākumus, skatiet "Uzņēmuma saraksts""
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,Mātes vērā
 DocType: Quality Inspection Reading,Reading 3,Lasīšana 3
 ,Hub,Rumba
 DocType: GL Entry,Voucher Type,Kuponu Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
 DocType: Expense Claim,Approved,Apstiprināts
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Izglītība
 DocType: Selling Settings,Campaign Naming By,Kampaņas nosaukšana Līdz
 DocType: Employee,Current Address Is,Pašreizējā adrese ir
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Pēc izvēles. Komplekti uzņēmuma noklusējuma valūtu, ja nav norādīts."
 DocType: Address,Office,Birojs
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standarta Ziņojumi
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Grāmatvedības dienasgrāmatas ieraksti.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account nesakrīt ar {1} / {2} jo {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Pieejams Daudz at No noliktavas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account nesakrīt ar {1} / {2} jo {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Lai izveidotu nodokļu kontā
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ievadiet izdevumu kontu
 DocType: Account,Stock,Krājums
 DocType: Employee,Current Address,Pašreizējā adrese
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ja prece ir variants citā postenī, tad aprakstu, attēlu, cenas, nodokļi utt tiks noteikts no šablona, ​​ja vien nav skaidri norādīts"
 DocType: Serial No,Purchase / Manufacture Details,Pirkuma / Ražošana Details
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Partijas inventarizācija
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Partijas inventarizācija
 DocType: Employee,Contract End Date,Līgums beigu datums
 DocType: Sales Order,Track this Sales Order against any Project,Sekot šim klientu pasūtījumu pret jebkuru projektu
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Pull pārdošanas pasūtījumiem (līdz piegādāt), pamatojoties uz iepriekš minētajiem kritērijiem"
 DocType: DocShare,Document Type,Dokumenta tips
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,No piegādātāja aptauja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,No piegādātāja aptauja
 DocType: Deduction Type,Deduction Type,Atskaitīšana Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Daudz
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Par Daudzums (Rūpniecības Daudzums) ir obligāts
 DocType: Stock Entry,Default Target Warehouse,Default Mērķa Noliktava
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Kopā (Company valūta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tips un partija ir piemērojama tikai pret debitoru / kreditoru kontu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tips un partija ir piemērojama tikai pret debitoru / kreditoru kontu
 DocType: Notification Control,Purchase Receipt Message,Pirkuma čeka Message
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Kopā piešķirtie lapas ir vairāk nekā periodā
 DocType: Production Order,Actual Start Date,Faktiskais sākuma datums
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materiālu piegādā pret šo pārdošanas rīkojuma
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Ierakstīt postenis kustība.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Ierakstīt postenis kustība.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Biļetens Latviešu Abonenta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Gropju iegriešanas
 DocType: Email Account,Service,Pakalpojums
 DocType: Hub Settings,Hub Settings,Hub iestatījumi
 DocType: Project,Gross Margin %,Bruto rezerve%
 DocType: BOM,With Operations,Ar operāciju
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Grāmatvedības ieraksti jau ir veikts valūtā {0} kompānijai {1}. Lūdzu, izvēlieties saņemamo vai maksājamo konts valūtā {0}."
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Grāmatvedības ieraksti jau ir veikts valūtā {0} kompānijai {1}. Lūdzu, izvēlieties saņemamo vai maksājamo konts valūtā {0}."
 ,Monthly Salary Register,Mēnešalga Reģistrēties
-apps/frappe/frappe/website/template.py +123,Next,Nākamais
+apps/frappe/frappe/website/template.py +140,Next,Nākamais
 DocType: Warranty Claim,If different than customer address,Ja savādāka nekā klientu adreses
 DocType: BOM Operation,BOM Operation,BOM Operation
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropulēšana
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,Nākamais datums
 DocType: Employee Education,Major/Optional Subjects,Lielākie / Izvēles priekšmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ievadiet nodokļiem un maksājumiem
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Mehāniskā apstrāde
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Šeit jūs varat saglabāt ģimenes informāciju, piemēram, vārdu un okupācijas mātes, laulātā un bērnu"
 DocType: Hub Settings,Seller Name,Pārdevējs Vārds
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Nodokļi un maksājumi Atskaitīts (Company valūta)
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,Lai saņemtu un Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Dizainers
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Noteikumi un nosacījumi Template
 DocType: Serial No,Delivery Details,Piegādes detaļas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automātiski izveidot Materiālu pieprasījumu, ja daudzums samazinās zem šī līmeņa"
 ,Item-wise Purchase Register,Postenis gudrs iegāde Reģistrēties
 DocType: Batch,Expiry Date,Derīguma termiņš
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Lai uzstādītu pasūtīšanas līmeni, postenis jābūt iegāde postenis vai Manufacturing postenis"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Lai uzstādītu pasūtīšanas līmeni, postenis jābūt iegāde postenis vai Manufacturing postenis"
 ,Supplier Addresses and Contacts,Piegādātāju Adreses un kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Lūdzu, izvēlieties Kategorija pirmais"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekts meistars.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nerādīt kādu simbolu, piemēram, $$ utt blakus valūtām."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(puse dienas)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(puse dienas)
 DocType: Supplier,Credit Days,Kredīta dienas
 DocType: Leave Type,Is Carry Forward,Vai Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Dabūtu preces no BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Dabūtu preces no BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Izpildes laiks dienas
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Materiālu rēķins
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tips un partija ir nepieciešama debitoru / kreditoru kontā {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tips un partija ir nepieciešama debitoru / kreditoru kontā {1}
 DocType: Dropbox Backup,Send Notifications To,Nosūtīt paziņojumus
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datums
 DocType: Employee,Reason for Leaving,Iemesls Atstājot
 DocType: Expense Claim Detail,Sanctioned Amount,Sodīts Summa
 DocType: GL Entry,Is Opening,Vai atvēršana
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Konts {0} nepastāv
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konts {0} nepastāv
 DocType: Account,Cash,Nauda
 DocType: Employee,Short biography for website and other publications.,Īsa biogrāfija mājas lapas un citas publikācijas.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Lūdzu, izveidojiet Algas struktūru darbiniekam {0}"
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 997046e3b8..31875ad3bf 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Режим на плата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Изберете Месечен Дистрибуција, ако сакате да ги пратите врз основа на сезоната."
 DocType: Employee,Divorced,Разведен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Предупредување: истата таа ствар е внесен повеќе пати.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Предупредување: истата таа ствар е внесен повеќе пати.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Предмети веќе се синхронизираат
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Точка овозможуваат да се додадат повеќе пати во една трансакција
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Откажи материјали Посетете {0} пред да го раскине овој Гаранција побарување
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Тампонирање плус синтерување
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Е потребно валута за Ценовник {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ќе се пресметува во трансакцијата.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Од материјално Барање
+DocType: Purchase Order,Customer Contact,Контакт со клиентите
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Од материјално Барање
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} дрвото
 DocType: Job Applicant,Job Applicant,Работа на апликантот
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема повеќе резултати.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Име на купувачи
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Сите области поврзани со извозот како валута, девизен курс, извоз вкупно, извоз голема вкупно итн се достапни во испорака, ПОС, цитат, Продај фактура, Продај Побарувања итн"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Глави (или групи), против кои се направени на сметководствените ставки и рамнотежи се одржува."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Најдобро за {0} не може да биде помала од нула ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Најдобро за {0} не може да биде помала од нула ({1})
 DocType: Manufacturing Settings,Default 10 mins,Стандардно 10 минути
 DocType: Leave Type,Leave Type Name,Остави видот на името
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серија успешно ажурирани
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Повеќекратни цени то
 DocType: SMS Center,All Supplier Contact,Сите Добавувачот Контакт
 DocType: Quality Inspection Reading,Parameter,Параметар
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Се очекува Крај Датум не може да биде помал од очекуваниот почеток Датум
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Дали навистина сакате да отпушвам производството со цел:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: Оцени мора да биде иста како {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Нов Оставете апликација
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Нов Оставете апликација
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банкарски нацрт
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. За да се задржи клиентите мудро код ставка и да ги пребарува врз основа на нивниот код Користете ја оваа опција
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Прикажи
 DocType: Sales Invoice Item,Quantity,Кол
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредити (Пасива)
 DocType: Employee Education,Year of Passing,Година на полагање
-sites/assets/js/erpnext.min.js +27,In Stock,Залиха
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Може само да се направи исплата против нефактурираното Продај Побарувања
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Залиха
 DocType: Designation,Designation,Ознака
 DocType: Production Plan Item,Production Plan Item,Производство план Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Корисник {0} е веќе доделен на вработените {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Направи нови ПОС Профил
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Здравствена заштита
 DocType: Purchase Invoice,Monthly,Месечен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Фактура
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Задоцнување на плаќањето (во денови)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Поените
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail адреса
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Одбрана
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Резултат (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не се поклопува со {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не се поклопува со {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ред # {0}:
 DocType: Delivery Note,Vehicle No,Возило Не
-sites/assets/js/erpnext.min.js +55,Please select Price List,Ве молиме изберете Ценовник
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Ве молиме изберете Ценовник
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Дрво
 DocType: Production Order Operation,Work In Progress,Работа во прогрес
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D печатење
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Родител Детална docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Отворање на работа.
 DocType: Item Attribute,Increment,Прираст
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Изберете Магацински ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Рекламирање
 DocType: Employee,Married,Брак
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
 DocType: Payment Reconciliation,Reconcile,Помират
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Направете банка Влегување
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Направете банка Влегување
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пензиски фондови
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Склад е задолжително ако тип на сметка е складиште
 DocType: SMS Center,All Sales Person,Сите продажбата на лице
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Отпише трошоците це
 DocType: Warehouse,Warehouse Detail,Магацински Детал
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е преминаа за клиентите {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Тип на данок
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Немате дозвола за да додадете или да ги ажурирате записи пред {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Немате дозвола за да додадете или да ги ажурирате записи пред {0}
 DocType: Item,Item Image (if not slideshow),Точка слика (доколку не слајдшоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Постои клиентите со исто име
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час Оцени / 60) * Крај на време операција
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Гостин
 DocType: Quality Inspection,Get Specification Details,Земете Спецификација Детали за
 DocType: Lead,Interested,Заинтересирани
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Бил на материјалот
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Отворање
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Отворање
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Од {0} до {1}
 DocType: Item,Copy From Item Group,Копија од став група
 DocType: Journal Entry,Opening Entry,Отворање Влегување
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Производ пребарување
 DocType: Standard Reply,Owner,Сопственикот
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ве молиме внесете компанија прв
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Ве молиме изберете ја првата компанија
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Ве молиме изберете ја првата компанија
 DocType: Employee Education,Under Graduate,Под Додипломски
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,На цел
 DocType: BOM,Total Cost,Вкупно трошоци
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Потрошни
 DocType: Upload Attendance,Import Log,Увоз Влез
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Испрати
+DocType: Sales Invoice Item,Delivered By Supplier,Дадено од страна на Добавувачот
 DocType: SMS Center,All Contact,Сите Контакт
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годишна плата
 DocType: Period Closing Voucher,Closing Fiscal Year,Затворање на фискалната година
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Контра Влегување
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Прикажи Време на дневници
 DocType: Journal Entry Account,Credit in Company Currency,Кредит во компанијата Валута
 DocType: Delivery Note,Installation Status,Инсталација Статус
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прифатени + Отфрлени Количина мора да биде еднаков Доби количество за Точка {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прифатени + Отфрлени Количина мора да биде еднаков Доби количество за Точка {0}
 DocType: Item,Supply Raw Materials for Purchase,Снабдување на суровини за набавка
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Точка {0} мора да биде Набавка Точка
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Преземете ја Шаблон, пополнете соодветни податоци и да го прикачите по промената на податотеката. Сите датуми и вработен комбинација на избраниот период ќе дојде во дефиниција, со постоечките записи посетеност"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Точка {0} не е активна или е достигнат крајот на животот
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Точка {0} не е активна или е достигнат крајот на животот
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Ќе се ажурира по Продај фактура е поднесена.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
 DocType: SMS Center,SMS Center,SMS центарот
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Зацрвстувањето
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Внесете URL пар
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Правила за примена на цените и попуст.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Овој пат се Влез во судир со {0} {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ценовник мора да се примени за купување или продавање на
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Датум на инсталација не може да биде пред датумот на испорака за Точка {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Датум на инсталација не може да биде пред датумот на испорака за Точка {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Попуст на Ценовник стапка (%)
-sites/assets/js/form.min.js +279,Start,Почеток
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Почеток
 DocType: User,First Name,Име
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Вашата конфигурација е завршена. Освежувачки.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Кастинг со полно работно мувла
 DocType: Offer Letter,Select Terms and Conditions,Изберете Услови и правила
 DocType: Production Planning Tool,Sales Orders,Продај Нарачка
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Против Продај фактура Точка
 ,Production Orders in Progress,Производство налози во прогрес
 DocType: Lead,Address & Contact,Адреса и контакт
+DocType: Leave Allocation,Add unused leaves from previous allocations,Додади неискористени листови од претходните алокации
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следна Повторувачки {0} ќе се креира {1}
 DocType: Newsletter List,Total Subscribers,Вкупно претплатници
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Име за Контакт
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,ПА очекување Колич
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создава плата се лизга за горенаведените критериуми.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Барање за купување.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двојно домување
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Остава на годишно ниво
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ве молиме да се постави Именување серија за {0} преку подесување> Settings> Именување Серија
 DocType: Time Log,Will be updated when batched.,Ќе биде обновен кога batched.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ред {0}: Ве молиме проверете "Дали напредување против сметка {1} Ако ова е однапред влез.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ред {0}: Ве молиме проверете "Дали напредување против сметка {1} Ако ова е однапред влез.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Магацински {0} не му припаѓа на компанијата {1}
 DocType: Bulk Email,Message,Порака
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox пристап Клучни
 DocType: Payment Tool,Reference No,Референтен број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Остави блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
 DocType: Stock Entry,Sales Invoice No,Продај фактура Не
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Минимална Подреди Количин
 DocType: Pricing Rule,Supplier Type,Добавувачот Тип
 DocType: Item,Publish in Hub,Објави во Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Точка {0} е откажана
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Материјал Барање
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Материјал Барање
 DocType: Bank Reconciliation,Update Clearance Date,Ажурирање Чистење Датум
 DocType: Item,Purchase Details,Купување Детали за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не се најде во "суровини испорачува" маса во нарачката {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Известување за 
 DocType: Lead,Suggestions,Предлози
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Сет точка група-мудар буџети на оваа територија. Вие исто така може да вклучува и сезоната со поставување на дистрибуција.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Ве молиме внесете група родител сметка за магацин {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаќање против {0} {1} не може да биде поголем од преостанатиот износ за наплата {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаќање против {0} {1} не може да биде поголем од преостанатиот износ за наплата {2}
 DocType: Supplier,Address HTML,HTML адреса
 DocType: Lead,Mobile No.,Мобилен број
 DocType: Maintenance Schedule,Generate Schedule,Генерирање Распоред
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Нова берза UOM
 DocType: Period Closing Voucher,Closing Account Head,Завршната сметка на главата
 DocType: Employee,External Work History,Надворешни Историја работа
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Кружни Суд Грешка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Дали навистина сакате да го прекинете
 DocType: Communication,Closed,Затвори
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Во зборови (извоз) ќе биде видлив откако ќе ја зачувате за испорака.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Дали сте сигурни дека сакате да го прекинете
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профил работа
 DocType: Newsletter,Newsletter,Билтен
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Потврда за испорака
 DocType: Dropbox Backup,Allow Dropbox Access,Им овозможи на Dropbox пристап
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Поставување Даноци
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,"Резимето на оваа недела, а во очекување на активности"
 DocType: Workstation,Rent Cost,Изнајмување на трошоците
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Ве молиме изберете месец и година
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стапка по која клиентите Валута се претвора во основната валута купувачи
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Достапен во бирото, испорака, Набавка фактура, производство цел, нарачка, купување прием, Продај фактура, Продај Побарувања, Акции влез, timesheet"
 DocType: Item Tax,Tax Rate,Даночна стапка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Одберете ја изборната ставка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Одберете ја изборната ставка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Точка: {0} успеа според групата, не може да се помири со користење \ берза помирување, наместо користење берза Влегување"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде иста како {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Претворат во не-групата
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Купување Потврда мора да се поднесе
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Моменталната з
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Серија (дел) од една ставка.
 DocType: C-Form Invoice Detail,Invoice Date,Датум на фактурата
 DocType: GL Entry,Debit Amount,Износ дебитна
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Вашиот е-мејл адреса
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Ве молиме погледнете приврзаност
 DocType: Purchase Order,% Received,% Доби
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Прегледано од страна на
 DocType: Maintenance Visit,Maintenance Type,Тип одржување
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Сериски № {0} не му припаѓа на испорака Забелешка {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Сериски № {0} не му припаѓа на испорака Забелешка {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Точка испитување квалитет Параметар
 DocType: Leave Application,Leave Approver Name,Остави Approver Име
 ,Schedule Date,Распоред Датум
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Купување Регистрирај се
 DocType: Landed Cost Item,Applicable Charges,Се применува Давачки
 DocType: Workstation,Consumable Cost,Потрошни Цена
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога "Остави Approver"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога "Остави Approver"
 DocType: Purchase Receipt,Vehicle Date,Датум на возилото
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медицинска
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за губење
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% Инсталирана
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Ве молиме внесете го името на компанијата прв
 DocType: BOM,Item Desription,Точка Desription
 DocType: Purchase Invoice,Supplier Name,Добавувачот Име
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитајте го упатството ERPNext
 DocType: Account,Is Group,Е група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматски го менува Сериски броеви врз основа на правилото FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверете Добавувачот број на фактурата Единственост
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Продажба
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобалните поставувања за сите производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Сметки замрзнати до
 DocType: SMS Log,Sent On,Испрати на
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
 DocType: Sales Order,Not Applicable,Не е применливо
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Одмор господар.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Школка во калапи
 DocType: Material Request Item,Required Date,Бараниот датум
 DocType: Delivery Note,Billing Address,Платежна адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Ве молиме внесете Точка законик.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ве молиме внесете Точка законик.
 DocType: BOM,Costing,Чини
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако е обележано, износот на данокот што ќе се смета како веќе се вклучени во Print Оцени / Печатење Износ"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Вкупно Количина
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Време п
 DocType: Customer,Buyer of Goods and Services.,Купувач на стоки и услуги.
 DocType: Journal Entry,Accounts Payable,Сметки се плаќаат
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додади претплатници
-sites/assets/js/erpnext.min.js +5,""" does not exists","Не постои
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","Не постои
 DocType: Pricing Rule,Valid Upto,Важи до
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Листа на неколку од вашите клиенти. Тие можат да бидат организации или поединци.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Директните приходи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не може да се филтрираат врз основа на сметка, ако групирани по сметка"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Административен службеник
 DocType: Payment Tool,Received Or Paid,Доби Или Платиле
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Ве молиме изберете ја компанијата
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Ве молиме изберете ја компанијата
 DocType: Stock Entry,Difference Account,Разликата профил
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Не може да се затвори задача како свој зависни задача {0} не е затворена.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
 DocType: Production Order,Additional Operating Cost,Дополнителни оперативни трошоци
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Козметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
 DocType: Communication,Subject,Предмет
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Итни Телефон
 ,Serial No Warranty Expiry,Сериски Нема гаранција Важи
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Дали навистина сакате да го прекинете овој материјал барање?
 DocType: Sales Order,To Deliver,За да овозможи
 DocType: Purchase Invoice Item,Item,Точка
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Д-р - Cr)
 DocType: Account,Profit and Loss,Добивка и загуба
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Управување Склучување
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управување Склучување
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Нов UOM не смее да биде од типот цел број
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Мебел и тела
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Стапка по која Ценовник валута е претворена во основна валута компанијата
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додај / Уреди 
 DocType: Purchase Invoice,Supplier Invoice No,Добавувачот Фактура бр
 DocType: Territory,For reference,За референца
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не можат да избришат сериски Не {0}, како што се користи во акции трансакции"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Затворање (ЦР)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Затворање (ЦР)
 DocType: Serial No,Warranty Period (Days),Гарантниот период (денови)
 DocType: Installation Note Item,Installation Note Item,Инсталација Забелешка Точка
 ,Pending Qty,Во очекување на Количина
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Платежна и испор
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повтори клиенти
 DocType: Leave Control Panel,Allocate,Распредели
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Претходната
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Продажбата Враќање
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажбата Враќање
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Изберете Продај Нарачка од која што сакате да се создаде производство наредби.
+DocType: Item,Delivered by Supplier (Drop Ship),Дадено од страна на Добавувачот (Капка Брод)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Компоненти плата.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База на податоци на потенцијални клиенти.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Клиент база на податоци.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Тркалаат
 DocType: Purchase Order Item,Billed Amt,Таксуваната Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логична Магацински против кои се направени записи парк.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Референтен број и референтен датум е потребно за {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Референтен број и референтен датум е потребно за {0}
 DocType: Event,Wednesday,Среда
 DocType: Sales Invoice,Customer's Vendor,Добавувачот на купувачи
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производство цел е задолжително
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Приемник Параметар
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Врз основа на" и "група Со" не може да биде ист
 DocType: Sales Person,Sales Person Targets,Продажбата на лице Цели
-sites/assets/js/form.min.js +271,To,Да
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Ве молиме внесете e-mail адреса
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Да
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Ве молиме внесете e-mail адреса
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Крајот цевка формирање
 DocType: Production Order Operation,In minutes,Во минути
 DocType: Issue,Resolution Date,Резолуцијата Датум
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,Проекти пристап
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Консумира
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} не се најде во Фактура Детали маса
 DocType: Company,Round Off Cost Center,Заокружување на цена центар
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Одржување Посетете {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Одржување Посетете {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 DocType: Material Request,Material Transfer,Материјал трансфер
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Отворање (д-р)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Праќање пораки во временската ознака мора да биде по {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Подесувања
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Слета Цена даноци и такси
 DocType: Production Order Operation,Actual Start Time,Старт на проектот Време
 DocType: BOM Operation,Operation Time,Операција Време
-sites/assets/js/list.min.js +5,More,Повеќе
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Повеќе
 DocType: Pricing Rule,Sales Manager,Менаџер за продажба
-sites/assets/js/desk.min.js +7673,Rename,Преименувај
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Преименувај
 DocType: Journal Entry,Write Off Amount,Отпише Износ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Виткање
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Овозможи пристап
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Директно сечење
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Да ги пратите ставка во продажба и купување на документи врз основа на нивните сериски бр. Ова е, исто така, може да се користи за следење гаранција детали за производот."
 DocType: Purchase Receipt Item Supplied,Current Stock,Тековни берза
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Одбиени Магацински е задолжително против regected точка
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Одбиени Магацински е задолжително против regected точка
 DocType: Account,Expenses Included In Valuation,Трошоци Вклучени Во Вреднување
 DocType: Employee,Provide email id registered in company,Обезбеди мејл ID регистрирани во компанијата
 DocType: Hub Settings,Seller City,Продавачот на градот
 DocType: Email Digest,Next email will be sent on:,Следната е-мејл ќе бидат испратени на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда писмо Рок
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Ставка има варијанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е пронајдена
 DocType: Bin,Stock Value,Акции вредност
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Тип на дрвото
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Добредојдовте
 DocType: Journal Entry,Credit Card Entry,Кредитна картичка за влез
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Задача Предмет
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Примената стока од добавувачите.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Примената стока од добавувачите.
 DocType: Communication,Open,Отворен
 DocType: Lead,Campaign Name,Име на кампања
 ,Reserved,Задржани
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Дали навистина сакате да отпушвам
 DocType: Purchase Order,Supply Raw Materials,Снабдување со суровини
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Датумот на кој ќе биде генериранa следната фактура. Тоа е генерирана за поднесете.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Тековни средства
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Клиентите нарачка Не
 DocType: Employee,Cell Number,Мобилен Број
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Си ја заборавивте
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во "Против весник Влегување" колона
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во "Против весник Влегување" колона
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Енергија
 DocType: Opportunity,Opportunity From,Можност од
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечен извештај плата.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да биде поголема од Тврдат Износ во ред {0}.
 DocType: Company,Default Cost of Goods Sold Account,Стандардно трошоците на продадени производи профил
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Ценовник не е избрано
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ценовник не е избрано
 DocType: Employee,Family Background,Семејно потекло
 DocType: Process Payroll,Send Email,Испрати E-mail
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Нема дозвола
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Бр
 DocType: Item,Items with higher weightage will be shown higher,Предмети со поголема weightage ќе бидат прикажани повисоки
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирување Детална
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Мои Фактури
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Не се пронајдени вработен
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не се пронајдени вработен
 DocType: Purchase Order,Stopped,Запрен
 DocType: Item,If subcontracted to a vendor,Ако иницираат да продавач
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Изберете Бум да започне
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Внес
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Испрати Сега
 ,Support Analytics,Поддршка анализи
 DocType: Item,Website Warehouse,Веб-страница Магацински
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Дали навистина сакате да го стопира производството цел:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","На ден од месецот на кој авто фактура ќе биде генериранa на пример 05, 28 итн"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Поени мора да е помала или еднаква на 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Форма записи
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,По
 DocType: Features Setup,"To enable ""Point of Sale"" features",Да им овозможи на "Точка на продажба" карактеристики
 DocType: Bin,Moving Average Rate,Преселба Просечна стапка
 DocType: Production Planning Tool,Select Items,Одбирајте ги изборните ставки
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
 DocType: Comment,Reference Name,Референца
 DocType: Maintenance Visit,Completion Status,Проектот Статус
 DocType: Sales Invoice Item,Target Warehouse,Целна Магацински
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволете врз доставувањето или приемот до овој процент
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Се очекува испорака датум не може да биде пред Продај Побарувања Датум
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Се очекува испорака датум не може да биде пред Продај Побарувања Датум
 DocType: Upload Attendance,Import Attendance,Увоз Публика
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Сите Точка групи
 DocType: Process Payroll,Activity Log,Активност Влез
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматски компонира порака на поднесување на трансакции.
 DocType: Production Order,Item To Manufacture,Ставка за производство
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постојана кастинг мувла
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Нарачка на плаќање
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус е {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Нарачка на плаќање
 DocType: Sales Order Item,Projected Qty,Проектирани Количина
 DocType: Sales Invoice,Payment Due Date,Плаќање Поради Датум
 DocType: Newsletter,Newsletter Manager,Билтен менаџер
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,Бара броеви
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Оценка.
 DocType: Sales Invoice Item,Stock Details,Детали за акцијата
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Проектот вредност
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Point-of-Продажба
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Не може да го носи напред {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Продажба
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не може да го носи напред {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс на сметка веќе во кредит, не Ви е дозволено да се постави рамнотежа мора да биде "како" дебитни ""
 DocType: Account,Balance must be,Рамнотежа мора да биде
 DocType: Hub Settings,Publish Pricing,Објавување на цени
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Купување Потврда
 ,Received Items To Be Billed,Примените предмети да бидат фактурирани
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Пескарење
-sites/assets/js/desk.min.js +3938,Ms,Г-ѓа
+DocType: Employee,Ms,Г-ѓа
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валута на девизниот курс господар.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за потсклопови
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,Опсег
 DocType: Supplier,Default Payable Accounts,Стандардно Обврски
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
 DocType: Features Setup,Item Barcode,Точка Баркод
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Точка Варијанти {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Купување на фактура напредување
 DocType: Address,Shop,Продавница
 DocType: Hub Settings,Sync Now,Sync Сега
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Ред {0}: Кредитни влез не можат да бидат поврзани со {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Ред {0}: Кредитни влез не можат да бидат поврзани со {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Стандардно банка / готовинска сметка ќе се ажурира автоматски во POS Фактура кога е избрана оваа опција.
 DocType: Employee,Permanent Address Is,Постојана адреса е
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операцијата заврши за колку готовите производи?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Бренд
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Додаток за надминување {0} преминал за Точка {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Додаток за надминување {0} преминал за Точка {1}.
 DocType: Employee,Exit Interview Details,Излез Интервју Детали за
 DocType: Item,Is Purchase Item,Е Набавка Точка
 DocType: Journal Entry Account,Purchase Invoice,Купување на фактура
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детална Не
 DocType: Stock Entry,Total Outgoing Value,Вкупниот појдовен вредност
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Датум на отворање и затворање Датум треба да биде во рамките на истата фискална година
 DocType: Lead,Request for Information,Барање за информации
 DocType: Payment Tool,Paid,Платени
 DocType: Salary Slip,Total in words,Вкупно со зборови
 DocType: Material Request Item,Lead Time Date,Водач Време Датум
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,е задолжително. Можеби рекорд Девизен не е создадена за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Ве молиме наведете Сериски Не за Точка {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За предмети "производ Бовча", складиште, сериски број и Batch нема да се смета од "Пакување Листа на 'табелата. Ако Магацински и Batch Не се исти за сите предмети за пакување ставка било "производ Бовча", тие вредности може да се влезе во главната маса точка, вредностите ќе биде копирана во "Пакување Листа на 'табелата."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Пратки на клиентите.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Пратки на клиентите.
 DocType: Purchase Invoice Item,Purchase Order Item,Нарачка Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Индиректни доход
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Сет износот на плаќање = преостанатиот износ за наплата
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,Адреса Линија 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Варијанса
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Име на компанијата
 DocType: SMS Center,Total Message(s),Вкупно пораки (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Преглед на листа на сите помош видеа
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изберете Account главата на банката во која е депониран чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Им овозможи на корисникот да ги уредувате Ценовник стапка во трансакции
 DocType: Pricing Rule,Max Qty,Макс Количина
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ред {0}: Плаќање против продажба / нарачка секогаш треба да бидат означени како однапред
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ред {0}: Плаќање против продажба / нарачка секогаш треба да бидат означени како однапред
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Хемиски
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Сите предмети се веќе префрлени за оваа цел производство.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Сите предмети се веќе префрлени за оваа цел производство.
 DocType: Process Payroll,Select Payroll Year and Month,Изберете Даноци година и месец
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Оди до соодветната група (обично Примена на фондови> Тековни средства> банкарски сметки и да се создаде нова сметка (со кликање на Додади детето) од типот "банка"
 DocType: Workstation,Electricity Cost,Цената на електричната енергија
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бе
 DocType: SMS Center,All Lead (Open),Сите Олово (Отвори)
 DocType: Purchase Invoice,Get Advances Paid,Се Напредокот Платени
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Закачите вашата слика
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Направете
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Направете
 DocType: Journal Entry,Total Amount in Words,Вкупниот износ со зборови
 DocType: Workflow State,Stop,Стоп
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Имаше грешка. Една можна причина може да биде дека не сте го зачувале форма. Ве молиме контактирајте support@erpnext.com ако проблемот продолжи.
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,Пакување фиш Точка
 DocType: POS Profile,Cash/Bank Account,Пари / банка сметка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
 DocType: Delivery Note,Delivery To,Испорака на
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Planning Tool,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да биде негативен
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Поднесување
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Ќе се аж
 DocType: Project,Internal,Внатрешна
 DocType: Task,Urgent,Итно
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Ве молиме наведете валидна ред проект за спорот {0} во табелата {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Одат на десктоп и да почне со користење ERPNext
 DocType: Item,Manufacturer,Производител
 DocType: Landed Cost Item,Purchase Receipt Item,Купување Потврда Точка
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Задржани Магацински во Продај Побарувања / готови производи Магацински
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Продажба Износ
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Време на дневници
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте на сметка Approver за овој запис. Ве молиме инсталирајте ја "статус" и заштеди
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте на сметка Approver за овој запис. Ве молиме инсталирајте ја "статус" и заштеди
 DocType: Serial No,Creation Document No,Документот за создавање Не
 DocType: Issue,Issue,Прашање
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за точка варијанти. на пример, големината, бојата и др"
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,Стандардно Продажба Цена центар
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Продај Побарувања {0} е {1}
 DocType: Opportunity,Contact Info,Контакт инфо
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Акции правење записи
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Акции правење записи
 DocType: Packing Slip,Net Weight UOM,Нето тежина UOM
 DocType: Item,Default Supplier,Стандардно Добавувачот
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Во текот на производство Додаток Процент
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Земете Неделен Off Датуми
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Датум на крајот не може да биде помал од Почеток Датум
 DocType: Sales Person,Select company name first.,Изберете името на компанијата во прв план.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Д-р
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Д-р
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Цитати добиени од добавувачи.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,ажурираат преку Време на дневници
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Броеви за регистрација на фирма за вашата препорака. Даночни броеви итн
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа за испорака Правило
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 ,Ordered Items To Be Billed,Нареди ставки за да бидат фактурирани
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Од опсег мора да биде помала од на опсег
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Изберете Време на дневници и поднесете да се создаде нов Продај фактура.
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Дано
 DocType: Lead,Lead,Водач
 DocType: Email Digest,Payables,Обврски кон добавувачите
 DocType: Account,Warehouse,Магацин
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
 ,Purchase Order Items To Be Billed,"Нарачката елементи, за да бидат фактурирани"
 DocType: Purchase Invoice Item,Net Rate,Нето стапката
 DocType: Purchase Invoice Item,Purchase Invoice Item,Купување на фактура Точка
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Неусоглас
 DocType: Global Defaults,Current Fiscal Year,Тековната фискална година
 DocType: Global Defaults,Disable Rounded Total,Оневозможи заоблени Вкупно
 DocType: Lead,Call,Повик
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"Записи" не може да биде празна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"Записи" не може да биде празна
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дупликат ред {0} со истиот {1}
 ,Trial Balance,Судскиот биланс
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Поставување на вработените
-sites/assets/js/erpnext.min.js +5,"Grid """,Мрежа "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Поставување на вработените
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Мрежа "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Ве молиме изберете префикс прв
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Истражување
 DocType: Maintenance Visit Purpose,Work Done,Работа
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,Испрати
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Види Леџер
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Први
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
 DocType: Communication,Delivery Status,Статус на Испорака
 DocType: Production Order,Manufacture against Sales Order,Производство против Продај Побарувања
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Остатокот од светот
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Остатокот од светот
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставката {0} не може да има Batch
 ,Budget Variance Report,Буџетот Варијанса Злоупотреба
 DocType: Salary Slip,Gross Pay,Бруто плата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Дивидендите кои ги исплатува
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Сметководство Леџер
 DocType: Stock Reconciliation,Difference Amount,Разликата Износ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Задржана добивка
 DocType: BOM Item,Item Description,Опис
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,Можност Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Привремено отворање
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Вработен Остави Биланс
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Биланс на сметка {0} мора секогаш да биде {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Биланс на сметка {0} мора секогаш да биде {1}
 DocType: Address,Address Type,Тип адреса
 DocType: Purchase Receipt,Rejected Warehouse,Одбиени Магацински
 DocType: GL Entry,Against Voucher,Против ваучер
 DocType: Item,Default Buying Cost Center,Стандардно Купување цена центар
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","За да го добиете најдоброто од ERPNext, ви препорачуваме да се земе некое време и да се види овие видеа помош."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Точка {0} мора да биде Продажбата Точка
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,до
 DocType: Item,Lead Time in days,Водач Време во денови
 ,Accounts Payable Summary,Сметки се плаќаат Резиме
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Кои не се овластени да ги уредувате замрзната сметка {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Кои не се овластени да ги уредувате замрзната сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Земете ненаплатени фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Место на издавање
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Договор
 DocType: Report,Disabled,Со посебни потреби
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM фактор coversion потребни за UOM: {0} во точка: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM фактор coversion потребни за UOM: {0} во точка: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Индиректни трошоци
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Количина е задолжително
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Земјоделството
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,Начин на плаќање
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ова е корен елемент група и не може да се уредува.
 DocType: Journal Entry Account,Purchase Order,Нарачката
 DocType: Warehouse,Warehouse Contact Info,Магацински Контакт Инфо
-sites/assets/js/form.min.js +190,Name is required,Потребно е име
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Потребно е име
 DocType: Purchase Invoice,Recurring Type,Повторувачки Тип
 DocType: Address,City/Town,Град / Место
 DocType: Email Digest,Annual Income,Годишен приход
 DocType: Serial No,Serial No Details,Сериски № Детали за
 DocType: Purchase Invoice Item,Item Tax Rate,Точка даночна стапка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Точка {0} мора да биде под-договор Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитал опрема
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Цел
 DocType: Sales Invoice Item,Edit Description,Измени Опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Се очекува испорака датум е помал од планираниот почеток датум.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,За Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,За Добавувачот
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Поставување тип на сметка помага во изборот на оваа сметка во трансакции.
 DocType: Purchase Invoice,Grand Total (Company Currency),Големиот Вкупно (Фирма валута)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Вкупниот појдовен
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Може да има само еден испорака Правило Состојба со 0 или празно вредност за "да го вреднуваат"
 DocType: Authorization Rule,Transaction,Трансакција
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Забелешка: Оваа цена центар е група. Не може да се направи на сметководствените ставки против групи.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Алатки
+apps/frappe/frappe/config/desk.py +7,Tools,Алатки
 DocType: Item,Website Item Groups,Веб-страница Точка групи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Производство цел број е задолжително за производство влез акции намена
 DocType: Purchase Invoice,Total (Company Currency),Вкупно (Фирма валута)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,Работна станица Име
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail билтени:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},Бум {0} не му припаѓа на точката {1}
 DocType: Sales Partner,Target Distribution,Целна Дистрибуција
-sites/assets/js/desk.min.js +7652,Comments,Коментари
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Коментари
 DocType: Salary Slip,Bank Account No.,Жиро сметка број
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ова е бројот на последниот создадена трансакција со овој префикс
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Оцени вреднување потребни за Точка {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Ве мол
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегија Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Добавувачот датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вие треба да им овозможи на Корпа
-sites/assets/js/form.min.js +212,No Data,Нема податоци
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Нема податоци
 DocType: Appraisal Template Goal,Appraisal Template Goal,Процена Шаблон Цел
 DocType: Salary Slip,Earning,Заработуваат
 DocType: Payment Tool,Party Account Currency,Партија Валута профил
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,Партија Валута про
 DocType: Purchase Taxes and Charges,Add or Deduct,Додадете или да одлежа
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ако годишниот буџет надминати (за сметка на сметка)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Преклопување состојби помеѓу:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Против весник Влегување {0} е веќе приспособена против некои други ваучер
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Против весник Влегување {0} е веќе приспособена против некои други ваучер
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Вкупно цел вредност
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Храна
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Стареењето опсег од 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Број на посети
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Билтенот на контакти, води."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на завршната сметка мора да биде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир на бодови за сите цели треба да бидат 100. Тоа е {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Операции не може да се остави празно.
 ,Delivered Items To Be Billed,"Дадени елементи, за да бидат фактурирани"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може да се промени за Сериски број
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Статус обновено на {0}
 DocType: DocField,Description,Опис
 DocType: Authorization Rule,Average Discount,Просечната попуст
 DocType: Letter Head,Is Default,Е стандардно
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Точка износ на дан
 DocType: Item,Maintain Stock,Одржување на берза
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Акции записи веќе создадена за цел производство
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставете го празно ако се земе предвид за сите ознаки
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот "Крај" во ред {0} не може да бидат вклучени во точка Оцени
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот "Крај" во ред {0} не може да бидат вклучени во точка Оцени
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Од DateTime
 DocType: Email Digest,For Company,За компанијата
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,Адреса за Испорака
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Сметковниот план
 DocType: Material Request,Terms and Conditions Content,Услови и правила Содржина
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Точка {0} не е парк Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Точка {0} не е парк Точка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи неплатено отсуство
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Гаранција / АМЦ Ста
 DocType: GL Entry,GL Entry,GL Влегување
 DocType: HR Settings,Employee Settings,Подесувања на вработените
 ,Batch-Wise Balance History,Според групата биланс Историја
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Да се ​​направи листа
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Да се ​​направи листа
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Чирак
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Негативни Кол не е дозволено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Канцеларијата изнајмување
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Поставките за поставка на SMS портал
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз Не успеав!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Постои адреса додаде уште.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Постои адреса додаде уште.
 DocType: Workstation Working Hour,Workstation Working Hour,Работна станица работен час
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналитичарот
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: распределени износ {1} мора да е помала или еднаква на JV износ {2}
 DocType: Item,Inventory,Инвентар
 DocType: Features Setup,"To enable ""Point of Sale"" view",Да им овозможи на "Точка на продажба" поглед
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Плаќање не може да се направи за празни кошничка
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плаќање не може да се направи за празни кошничка
 DocType: Item,Sales Details,Детали за продажба
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Прикачување
 DocType: Opportunity,With Items,Со предмети
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",Датумот на кој ќе биде генериранa следната фактура. Тоа е генерирана за поднесете.
 DocType: Item Attribute,Item Attribute,Точка Атрибут
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Владата
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Точка Варијанти
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Точка Варијанти
 DocType: Company,Services,Услуги
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Вкупно ({0})
 DocType: Cost Center,Parent Cost Center,Родител цена центар
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Финансиска година Почеток Датум
 DocType: Employee External Work History,Total Experience,Вкупно Искуство
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Пакување фиш (и) откажани
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Пакување фиш (и) откажани
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товар и товар пријави
 DocType: Material Request Item,Sales Order No,Продај Побарувања Не
 DocType: Item Group,Item Group Name,Точка име на група
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Земени
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Земени
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Пренос на материјали за изработка
 DocType: Pricing Rule,For Price List,За Ценовник
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Извршниот Барај
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,Распоред
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,Бум Детална Не
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Дополнителен попуст Износ (Фирма валута)
-DocType: Period Closing Voucher,CoA Help,CoA Помош
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Грешка: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Грешка: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Ве молиме да се создаде нова сметка од сметковниот план.
 DocType: Maintenance Visit,Maintenance Visit,Одржување Посета
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Клиентите> група на потрошувачи> Територија
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Слета Цена Помош
 DocType: Event,Tuesday,Вторник
 DocType: Leave Block List,Block Holidays on important days.,Забрани празници на важни датуми.
 ,Accounts Receivable Summary,Побарувања Резиме
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Заминува за видот {0} веќе наменети за вработените {1} за период {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Ве молиме поставете го полето корисничко име во евиденција на вработените да го поставите Улогата на вработените
 DocType: UOM,UOM Name,UOM Име
 DocType: Top Bar Item,Target,Целни
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,Продажбата партнер
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Сметководство за влез на {0} може да се направи само во валута: {1}
 DocType: Pricing Rule,Pricing Rule,Цените Правило
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Материјал Барање за нарачка
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материјал Барање за нарачка
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: Назад Точка {1} не постои во {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банкарски сметки
 ,Bank Reconciliation Statement,Банка помирување изјава
 DocType: Address,Lead Name,Водач Име
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Отворање берза Биланс
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Отворање берза Биланс
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} мора да се појави само еднаш
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е дозволено да tranfer повеќе {0} од {1} против нарачка {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Остава распределени успешно за {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Остава распределени успешно за {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нема податоци за пакет
 DocType: Shipping Rule Condition,From Value,Од вредност
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Производство Кол е задолжително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Производство Кол е задолжително
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Износи не се гледа во банка
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Барања за сметка на компанијата.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,Контакт Мобилни Не
 DocType: Production Planning Tool,Select Sales Orders,Изберете Продај Нарачка
 ,Material Requests for which Supplier Quotations are not created,Материјал Барања за кои не се создадени Добавувачот Цитати
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Да ги пратите предмети со помош на баркод. Вие ќе бидете во можност да влезат предмети во Испратница и Продај фактура со скенирање на баркод на ставка.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Означи како Дадени
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направете цитат
 DocType: Dependent Task,Dependent Task,Зависни Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Обидете се планира операции за X дена однапред.
 DocType: HR Settings,Stop Birthday Reminders,Стоп роденден потсетници
 DocType: SMS Center,Receiver List,Листа на примачот
 DocType: Payment Tool Detail,Payment Amount,Исплата Износ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Конзумира Износ
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Види
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Види
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура плата Одбивање
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективен ласерски синтерување
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Увоз успешно!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Цената на издадени материјали
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,Стандардно се плаќаа
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Подесувања за онлајн шопинг количка како и со правилата за испорака, ценовник, итн"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Целосно подесување
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Опишан
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Количина задржани
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Количина задржани
 DocType: Party Account,Party Account,Партијата на профилот
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Човечки ресурси
 DocType: Lead,Upper Income,Горниот дел од приходите
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Овозможи Кошничка
 DocType: Employee,Permanent Address,Постојана адреса
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Точка {0} мора да биде послужната ствар.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Однапред платени против {0} {1} не може да биде поголема \ отколку Вкупен збир {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ве молиме изберете код ставка
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Намалување Одбивање за неплатено отсуство (LWP)
 DocType: Territory,Territory Manager,Територија менаџер
+DocType: Delivery Note Item,To Warehouse (Optional),До Магацински (опционално)
 DocType: Sales Invoice,Paid Amount (Company Currency),Платениот износ (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Дополнителен попуст
 DocType: Selling Settings,Selling Settings,Продажба Settings
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Рударски
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Кастинг смола
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"А група на клиентите постои со истото име, ве молиме промена на името на клиентите или преименување на група на купувачи"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Ве молиме изберете {0} прво.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Ве молиме изберете {0} прво.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},текст {0}
 DocType: Territory,Parent Territory,Родител Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,Серија Не
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Им овозможи на повеќе Продај Нарачка против нарачка на купувачи
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Главните
 DocType: DocPerm,Delete,Избриши
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Варијанта
-sites/assets/js/desk.min.js +7971,New {0},Нов {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варијанта
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Нов {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Престана да не може да се откаже. Отпушвам да ја откажете.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Престана да не може да се откаже. Отпушвам да ја откажете.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
 DocType: Employee,Leave Encashed?,Остави Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Можност од поле е задолжително
 DocType: Item,Variants,Варијанти
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Земја
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреси
 DocType: Communication,Received,Доби
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},СТРОГО серија № влезе за точка {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за испорака Правило
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Точка не е дозволено да има цел производство.
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,Титула
 DocType: Communication,Rejected,Одбиени
 DocType: Pricing Rule,Brand,Бренд
 DocType: Item,Will also apply for variants,Ќе се применуваат и за варијанти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Дадени
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Бовча предмети на времето на продажба.
 DocType: Sales Order Item,Actual Qty,Крај на Количина
 DocType: Sales Invoice Item,References,Референци
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Сечење
 DocType: Item,Has Variants,Има варијанти
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Кликнете на копчето 'Направете Продај фактура "да се создаде нов Продај фактура.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Период од и Period До датум задолжително за повторување на% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Пакување и означување
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месечна Дистрибуција
 DocType: Sales Person,Parent Sales Person,Родител продажбата на лице
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Ве молиме наведете стандардна валута во компанијата Мајсторот и Глобал Стандардни
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox пристап Secret
 DocType: Purchase Invoice,Recurring Invoice,Повторувачки Фактура
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Управување со проекти
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Управување со проекти
 DocType: Supplier,Supplier of Goods or Services.,Снабдувач на стоки или услуги.
 DocType: Budget Detail,Fiscal Year,Фискална година
 DocType: Cost Center,Budget,Буџет
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Продажба
 DocType: Employee,Salary Information,Плата Информации
 DocType: Sales Person,Name and Employee ID,Име и вработените проект
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
 DocType: Website Item Group,Website Item Group,Веб-страница Точка група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Давачки и даноци
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Ве молиме внесете референтен датум
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} записи плаќање не може да се филтрираат од {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ве молиме внесете референтен датум
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записи плаќање не може да се филтрираат од {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Табела за елемент, кој ќе биде прикажан на веб сајтот"
 DocType: Purchase Order Item Supplied,Supplied Qty,Опрема што се испорачува Количина
 DocType: Material Request Item,Material Request Item,Материјал Барање Точка
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дрвото на
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се однесува ред број е поголема или еднаква на тековниот број на ред за овој тип на полнење
 ,Item-wise Purchase History,Точка-мудар Набавка Историја
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Црвена
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ве молиме кликнете на "Генерирање Распоред" да достигне цена Сериски Без додадеме точка за {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ве молиме кликнете на "Генерирање Распоред" да достигне цена Сериски Без додадеме точка за {0}
 DocType: Account,Frozen,Замрзнати
 ,Open Production Orders,Отворен Нарачка производство
 DocType: Installation Note,Installation Time,Инсталација време
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Трендови цитат
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Како што производството со цел да се направат по оваа точка, тој мора да биде точка на акциите."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Како што производството со цел да се направат по оваа точка, тој мора да биде точка на акциите."
 DocType: Shipping Rule Condition,Shipping Amount,Испорака Износ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Состави
 DocType: Authorization Rule,Above Value,Пред вредност
 ,Pending Amount,Во очекување Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Дадени
+DocType: Purchase Order,Delivered,Дадени
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Поставување на дојдовен сервер за работни места-мејл ID. (На пр jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Број на возило
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датумот на кој се повторуваат фактура ќе се запре
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуира
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"На сметка {0} мора да биде од типот "основни средства", како точка {1} е предност Точка"
 DocType: HR Settings,HR Settings,Поставки за човечки ресурси
 apps/frappe/frappe/config/setup.py +130,Printing,Печатење
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Сметка тврдат дека е во очекување на одобрување. Само на сметка Approver може да го ажурира статусот.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Сметка тврдат дека е во очекување на одобрување. Само на сметка Approver може да го ажурира статусот.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнителен попуст Износ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,На ден (а) на која аплицирате за дозвола се на одмор. Вие не треба да се применуваат за одмор.
-sites/assets/js/desk.min.js +7805,and,и
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr не може да биде празно или простор
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спорт
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,Цитат
 DocType: Salary Slip,Total Deduction,Вкупно Одбивање
 DocType: Quotation,Maintenance User,Одржување пристап
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Цена освежено
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Дали сте сигурни дека сакате да отпушвам
 DocType: Employee,Date of Birth,Датум на раѓање
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Точка {0} веќе се вратени
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискалната година ** претставува финансиска година. Сите сметководствени записи и други големи трансакции се следи против ** ** фискалната година.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Пратете на продажба кампањи. Пратете води, цитати, Продај Побарувања итн од кампањи за да се измери враќање на инвестицијата."
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,ПА Количина
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Записи акции постојат против магацин {0}, па затоа не можете да се ре-додели или менување Магацински"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Записи акции постојат против магацин {0}, па затоа не можете да се ре-додели или менување Магацински"
 DocType: Appraisal,Calculate Total Score,Пресмета вкупниот резултат
 DocType: Supplier Quotation,Manufacturing Manager,Производство менаџер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Сериски № {0} е под гаранција до {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит за испорака во пакети.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Пратки
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Натопи во калапи
+DocType: Purchase Order,To be delivered to customer,Да бидат доставени до клиентите
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Вклучи Статус мора да се поднесе.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Сериски Не {0} не припаѓа на ниту еден Магацински
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Поставување на
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Од валутен
 DocType: DocField,Name,Име
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Продај Побарувања потребни за Точка {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Продај Побарувања потребни за Точка {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Износи не се гледа на системот
 DocType: Purchase Invoice Item,Rate (Company Currency),Стапка (Фирма валута)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,"Други, пак,"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Постави како престана да
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Не може да се најде за појавување Точка. Ве молиме одберете некои други вредност за {0}.
 DocType: POS Profile,Taxes and Charges,Даноци и такси
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","А производ или услуга, која е купен, кои се продаваат или се чуваат во парк."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не може да го изберете типот задолжен како "На претходниот ред Износ" или "На претходниот ред Вкупно 'за првиот ред
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,Изберете DOCTYPE
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банкарство
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Ве молиме кликнете на "Генерирање Распоред" да се добие распоред
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Нова цена центар
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Нова цена центар
 DocType: Bin,Ordered Quantity,Нареди Кол
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","на пример, "Изградба на алатки за градители""
 DocType: Quality Inspection,In Process,Во процесот
 DocType: Authorization Rule,Itemwise Discount,Itemwise попуст
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} против Продај Побарувања {1}
+DocType: Purchase Order Item,Reference Document Type,Референтен документ Тип
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} против Продај Побарувања {1}
 DocType: Account,Fixed Asset,Основни средства
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Серијали Инвентар
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серијали Инвентар
 DocType: Activity Type,Default Billing Rate,Стандардно регистрации курс
 DocType: Time Log Batch,Total Billing Amount,Вкупно регистрации Износ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Побарувања профил
 ,Stock Balance,Биланс на акции
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Продај Побарувања на плаќање
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продај Побарувања на плаќање
 DocType: Expense Claim Detail,Expense Claim Detail,Барање Детална сметка
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Време на дневници на креирање:
 DocType: Item,Weight UOM,Тежина UOM
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на сметка мора да биде плаќаат сметка
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
 DocType: Production Order Operation,Completed Qty,Завршено Количина
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само задолжува сметки може да се поврзат против друга кредитна влез"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Ценовник {0} е исклучен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само задолжува сметки може да се поврзат против друга кредитна влез"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ценовник {0} е исклучен
 DocType: Manufacturing Settings,Allow Overtime,Дозволете Прекувремена работа
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Продај Побарувања {0} е запрен
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} сериски броеви потребно за Точка {1}. Сте ги доставиле {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Тековни Вреднување стапка
 DocType: Item,Customer Item Codes,Клиент Точка Код
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Заварување
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Нова берза UOM е потребно
 DocType: Quality Inspection,Sample Size,Големина на примерокот
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Сите предмети веќе се фактурира
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Сите предмети веќе се фактурира
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ве молиме наведете валидна "од случај бр '
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Понатаму центри цена може да се направи под Групи но записи може да се направи врз несрпското групи
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Понатаму центри цена може да се направи под Групи но записи може да се направи врз несрпското групи
 DocType: Project,External,Надворешни
 DocType: Features Setup,Item Serial Nos,Точка Сериски броеви
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволи
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
 DocType: SMS Log,Sender Name,Испраќачот Име
 DocType: Page,Title,Наслов
-sites/assets/js/list.min.js +104,Customize,Персонализација на
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Персонализација на
 DocType: POS Profile,[Select],[Избери]
 DocType: SMS Log,Sent To,Испратени до
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Направи Продај фактура
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Крајот на животот
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Патување
 DocType: Leave Block List,Allow Users,Им овозможи на корисниците
+DocType: Purchase Order,Customer Mobile No,Клиент Мобилни Не
 DocType: Sales Invoice,Recurring,Повторувачки
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Ги пратите одделни приходи и расходи за вертикали производ или поделби.
 DocType: Rename Tool,Rename Tool,Преименувај алатката
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ажурирање на трошоците
 DocType: Item Reorder,Item Reorder,Пренареждане точка
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Пренос на материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Пренос на материјал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведете операции, оперативните трошоци и даде единствена работа нема да вашето работење."
 DocType: Purchase Invoice,Price List Currency,Ценовник Валута
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,Вработен
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Увоз-маил од
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Покани како пристап
 DocType: Features Setup,After Sale Installations,По продажбата Инсталации
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} е целосно фактурирани
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} е целосно фактурирани
 DocType: Workstation Working Hour,End Time,Крајот на времето
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандардна условите на договорот за продажба или купување.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Група од Ваучер
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,Масовно испраќање
 DocType: Page,Standard,Стандард
 DocType: Rename Tool,File to Rename,Датотека за да ја преименувате
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Број на налогот се потребни за Точка {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Плаќања шоу
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Распоред за одржување {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Распоред за одржување {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Големина
 DocType: Notification Control,Expense Claim Approved,Сметка Тврдат Одобрени
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтската
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,Публика: Да најдам
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Поставување на дојдовен сервер за продажба-мејл ID. (На пр sales@example.com)
 DocType: Warranty Claim,Raised By,Покренати од страна на
 DocType: Payment Tool,Payment Account,Уплатна сметка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
-sites/assets/js/list.min.js +23,Draft,Нацрт
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Нацрт
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Обесштетување Off
 DocType: Quality Inspection Reading,Accepted,Прифатени
 DocType: User,Female,Женски
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Испорака Правило Етикета
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Како што постојат постојните акции трансакции за оваа точка, \ вие не може да се промени на вредностите на "Мора Сериски Не", "Дали Серија Не", "Дали берза точка" и "метода на проценка""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Брзо весник Влегување
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
 DocType: Employee,Previous Work Experience,Претходно работно искуство
 DocType: Stock Entry,For Quantity,За Кол
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Ве молиме внесете предвидено Количина за Точка {0} во ред {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} не е поднесен
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Барања за предмети.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} не е поднесен
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Барања за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одделни производни цел ќе биде направена за секоја завршена добра ствар.
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Целосно подесување
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Билтен По
 DocType: Delivery Note,Transporter Name,Превозник Име
 DocType: Contact,Enter department to which this Contact belongs,Внесете одделот на кој припаѓа оваа Контакт
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Вкупно Отсутни
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Точка или складиште ред {0} не се поклопува материјал Барање
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Точка или складиште ред {0} не се поклопува материјал Барање
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Единица мерка
 DocType: Fiscal Year,Year End Date,Година Крај Датум
 DocType: Task Depends On,Task Depends On,Задача зависи од
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Договор Крај Датум мора да биде поголема од датумот на пристап
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Трето лице дистрибутер / дилер / комисионен застапник / партнер / препродавач кој ги продава компании производи за провизија.
 DocType: Customer Group,Has Child Node,Има Јазол дете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} против нарачка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} против нарачка {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Внесете статички URL параметри тука (на пр. Испраќачот = ERPNext, корисничко име = ERPNext, лозинка = 1234 итн)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} не во било кој активен фискална година. За повеќе детали проверете {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ова е пример веб-сајт автоматски генерирани од ERPNext
@@ -2021,11 +2032,9 @@ DocType: Note,Note,Забелешка
 DocType: Purchase Receipt Item,Recd Quantity,Recd Кол
 DocType: Email Account,Email Ids,E-mail ИД
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе Точка {0} од Продај Побарувања количина {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Постави како отпушат
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовинска сметка
 DocType: Tax Rule,Billing City,Платежна Сити
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Ова напушти апликација е во фаза на одобрување. Само Остави Approver може да го ажурира статусот.
 DocType: Global Defaults,Hide Currency Symbol,Сокриј Валута Симбол
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","на пример, банка, пари, кредитни картички"
 DocType: Journal Entry,Credit Note,Кредитна Забелешка
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Вкупно (Коли
 DocType: Installation Note Item,Installed Qty,Инсталиран Количина
 DocType: Lead,Fax,Факс
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Поднесени
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Поднесени
 DocType: Salary Structure,Total Earning,Вкупно Заработувајќи
 DocType: Purchase Receipt,Time at which materials were received,На кој беа примени материјали време
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Мои адреси
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Органи
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
 DocType: Sales Order,Billing Status,Платежна Статус
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Комунални трошоци
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,Над 90-
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Над 90-
 DocType: Buying Settings,Default Buying Price List,Стандардно Купување Ценовник
 ,Download Backups,Преземи бекап
 DocType: Notification Control,Sales Order Message,Продај Побарувања порака
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Избери Вработени
 DocType: Bank Reconciliation,To Date,Датум
 DocType: Opportunity,Potential Sales Deal,Потенцијален Продај договор
-sites/assets/js/form.min.js +308,Details,Детали за
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Детали за
 DocType: Purchase Invoice,Total Taxes and Charges,Вкупно даноци и такси
 DocType: Employee,Emergency Contact,Итни Контакт
 DocType: Item,Quality Parameters,Параметри за квалитет
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,Доби Количина
 DocType: Stock Entry Detail,Serial No / Batch,Сериски Не / Batch
 DocType: Product Bundle,Parent Item,Родител Точка
 DocType: Account,Account Type,Тип на сметка
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на "Генерирање Распоред '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на "Генерирање Распоред '
 ,To Produce,Да произведе
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","На ред {0} во {1}. Да {2} вклучите во стапката точка, редови {3} исто така, мора да бидат вклучени"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификација на пакетот за испорака (за печатење)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Изедначување
 DocType: Account,Income Account,Сметка приходи
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Калапи
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Испорака
 DocType: Stock Reconciliation Item,Current Qty,Тековни Количина
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Видете "стапката на материјали врз основа на" Чини во Дел
 DocType: Appraisal Goal,Key Responsibility Area,Клучна одговорност Површина
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Сите адреси.
 DocType: Company,Stock Settings,Акции Settings
 DocType: User,Bio,Био
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управување на клиентите група на дрвото.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Нова цена центар Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Нова цена центар Име
 DocType: Leave Control Panel,Leave Control Panel,Остави контролен панел
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Не стандардно адреса Шаблон најде. Ве молиме да се создаде нов една од подесување> Печатење и Брендирање> Адреса Шаблон.
 DocType: Appraisal,HR User,HR пристап
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Плаќање алатката Детална
 ,Sales Browser,Продажбата Browser
 DocType: Journal Entry,Total Credit,Вкупно кредитни
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Локалните
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Локалните
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити и побарувања (средства)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Должниците
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Големи
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ниту еден вработен пронајдена!
 DocType: C-Form Invoice Detail,Territory,Територија
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ве молиме спомнете Број на посети бара
+DocType: Purchase Order,Customer Address Display,Клиент Адреса Покажи
 DocType: Stock Settings,Default Valuation Method,Метод за проценка стандардно
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полирање
 DocType: Production Order Operation,Planned Start Time,Планирани Почеток Време
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Распределуваат
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Затвори Биланс на состојба и книга добивка или загуба.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Стандардно единица мерка за Точка {0} може да се промени, бидејќи директно \ веќе сте направиле некои трансакција (а) со друг UOM. За да го промените стандардниот UOM \ употреба "UOM Замени комунални 'алатка под Акции модул."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведете курс за претворање на еден валута во друга
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Цитат {0} е откажана
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитат {0} е откажана
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Вкупно преостанатиот износ за наплата
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Вработен {0} е на одмор на {1}. Не може да означува присуство.
 DocType: Sales Partner,Targets,Цели
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ова е коренот на клиентите група и не може да се уредува.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Ве молиме да ги конфигурирате вашите сметковниот план пред да почнете Сметководство записи
 DocType: Purchase Invoice,Ignore Pricing Rule,Игнорирај Цените Правило
-sites/assets/js/list.min.js +24,Cancelled,Откажано
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Откажано
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Од денот на плата структура не може да биде помала од вработените Состави Датум.
 DocType: Employee Education,Graduate,Дипломиран
 DocType: Leave Block List,Block Days,Забрани дена
 DocType: Journal Entry,Excise Entry,Акцизни Влегување
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Предупредување: Продај Побарувања {0} веќе постои против нарачка на купувачи {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Предупредување: Продај Побарувања {0} веќе постои против нарачка на купувачи {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,"Акции примени, но
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Бруто плата + Arrear Износ + инкасо Износ - Вкупно Одбивање
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Features Setup,Sales and Purchase,Продажба и купување
-DocType: Purchase Order Item,Material Request No,Материјал Барање Не
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
+DocType: Supplier Quotation Item,Material Request No,Материјал Барање Не
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Стапка по која клиентите валута е претворена во основна валута компанијата
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} е успешно отпишавте од оваа листа.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Нето стапката (Фирма валута)
-apps/frappe/frappe/templates/base.html +132,Added,Додадено
+apps/frappe/frappe/templates/base.html +134,Added,Додадено
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управување со Територија на дрвото.
 DocType: Journal Entry Account,Sales Invoice,Продај фактура
 DocType: Journal Entry Account,Party Balance,Партијата Биланс
 DocType: Sales Invoice Item,Time Log Batch,Време Пријавете се Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Ве молиме изберете Примени попуст на
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Ве молиме изберете Примени попуст на
 DocType: Company,Default Receivable Account,Стандардно побарувања профил
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Создаде банка за влез на вкупниот износ на платата исплатена за над избраните критериуми
 DocType: Stock Entry,Material Transfer for Manufacture,Материјал трансфер за Производство
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Добие релевантн
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Сметководство за влез на берза
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Сковал
 DocType: Sales Invoice,Sales Team1,Продажбата Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Точка {0} не постои
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Точка {0} не постои
 DocType: Sales Invoice,Customer Address,Клиент адреса
 apps/frappe/frappe/desk/query_report.py +136,Total,Вкупниот
 DocType: Purchase Invoice,Apply Additional Discount On,Да важат и дополнителни попуст на
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,Квалитет инспекци
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Екстра Мали
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спреј формирање
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,На сметка {0} е замрзнат
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,На сметка {0} е замрзнат
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правното лице / Подружница со посебен сметковен кои припаѓаат на Организацијата.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Храна, пијалаци и тутун"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL или диплома
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Комисијата стапка не може да биде поголема од 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентар ниво
 DocType: Stock Entry,Subcontract,Поддоговор
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Ве молиме внесете {0} прв
 DocType: Production Planning Tool,Get Items From Sales Orders,Се предмети од Продај Нарачка
 DocType: Production Order Operation,Actual End Time,Крај Крај
 DocType: Production Planning Tool,Download Materials Required,Преземете потребни материјали
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,Закажана
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Ве молиме одберете ја изборната ставка каде што "Дали берза Точка" е "Не" и "е продажба точка" е "Да" и не постои друг Бовча производ
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете Месечен Дистрибуција на нерамномерно дистрибуира цели низ месеци.
 DocType: Purchase Invoice Item,Valuation Rate,Вреднување стапка
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Ценовник Валута не е избрано
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ценовник Валута не е избрано
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Точка ред {0}: Набавка Потврда {1} не постои во горната табела "Набавка Разписки"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Вработен {0} веќе има поднесено барање за {1} помеѓу {2} и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Вработен {0} веќе има поднесено барање за {1} помеѓу {2} и {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Почеток на проектот Датум
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,До
 DocType: Rename Tool,Rename Log,Преименувај Влез
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само лист јазли се дозволени во трансакција
 DocType: Expense Claim,Expense Approver,Сметка Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Купување Потврда точка Опрема што се испорачува
-sites/assets/js/erpnext.min.js +48,Pay,Плаќаат
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Плаќаат
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Да DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Дневници за одржување на статусот на испораката смс
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Мелење
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Смалуваат завиткување
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Активности во тек
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Активности во тек
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потврди
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Добавувачот> Добавувачот Тип
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ве молиме внесете ослободување датум.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"В
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изберете фискалната година
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Топење
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Вие сте на одмор Approver за овој запис. Ве молиме инсталирајте ја "статус" и заштеди
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане ниво
 DocType: Attendance,Attendance Date,Публика Датум
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распадот врз основа на заработка и одбивање.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Трошоците центар со постојните трансакции не може да се конвертира во групата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизација
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Добавувачот (и)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Неправилен период
 DocType: Customer,Credit Limit,Кредитен лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изберете тип на трансакција
 DocType: GL Entry,Voucher No,Ваучер Не
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Де
 DocType: Customer,Address and Contact,Адреса и контакт
 DocType: Customer,Last Day of the Next Month,Последниот ден од наредниот месец
 DocType: Employee,Feedback,Повратна информација
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Распоред
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Распоред
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивни авион обработка
 DocType: Stock Settings,Freeze Stock Entries,Замрзнување берза записи
 DocType: Website Settings,Website Settings,Settings веб-страница
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,Заминување
 DocType: Material Request,Requested For,Се бара за
 DocType: Quotation Item,Against Doctype,Против DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Следење на овој Испратница против било кој проект
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root сметката не може да се избришат
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root сметката не може да се избришат
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Прикажи берза записи
 ,Is Primary Address,Е Основен адреса
 DocType: Production Order,Work-in-Progress Warehouse,Работа во прогрес Магацински
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Референтен # {0} датум {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Референтен # {0} датум {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управуваат со адреси
 DocType: Pricing Rule,Item Code,Точка законик
 DocType: Production Planning Tool,Create Production Orders,Креирај Производство Нарачка
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,Корисникот Напомена
 DocType: Lead,Market Segment,Сегмент од пазарот
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Вработен внатрешна работа Историја
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Затворање (д-р)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Затворање (д-р)
 DocType: Contact,Passive,Пасивни
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Сериски № {0} не во парк
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Данок дефиниција за продажба трансакции.
 DocType: Sales Invoice,Write Off Outstanding Amount,Отпише преостанатиот износ за наплата
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Проверете дали има потреба автоматски периодични фактури. По поднесување на секоја фактура продажба, Повторувачки дел ќе бидат видливи."
 DocType: Account,Accounts Manager,Менаџер сметки
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Време Вклучи {0} мора да биде предаден "
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Време Вклучи {0} мора да биде предаден "
 DocType: Stock Settings,Default Stock UOM,Стандардно берза UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),"Чини курс, врз основа на видот на активности (на час)"
 DocType: Production Planning Tool,Create Material Requests,Креирај Материјал Барања
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Банка помирување
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Добијат ажурирања
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Материјал Барање {0} е откажана или запрена
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Додадете неколку записи примерок
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Остави менаџмент
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Остави менаџмент
 DocType: Event,Groups,Групи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Група од сметка
 DocType: Sales Order,Fully Delivered,Целосно Дадени
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Продажба Бенефиции
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} буџетот на сметка {1} од трошоците центар {2} ќе се надмине со {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Скриј ги носат Лисја
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Од датум" мора да биде по "Да најдам"
 ,Stock Projected Qty,Акции Проектирани Количина
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
 DocType: Sales Order,Customer's Purchase Order,Нарачка на купувачот
 DocType: Warranty Claim,From Company,Од компанијата
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Количина
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Трговија на мало
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сите типови на Добавувачот
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Точка законик е задолжително, бидејќи точка не се нумерирани автоматски"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Цитат {0} не е од типот на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Точка законик е задолжително, бидејќи точка не се нумерирани автоматски"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитат {0} не е од типот на {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржување Распоред Точка
 DocType: Sales Order,%  Delivered,% Дадени
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банка пречекорување на профилот
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Направете Плата фиш
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Отпушвам
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Преглед на бирото
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Препорачана кредити
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Прекрасно производи
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,Процена
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Кастинг Изгубени пена
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Цртеж
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Датум се повторува
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
 DocType: Hub Settings,Seller Email,Продавачот Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Вкупниот откуп на трошоци (преку купување фактура)
 DocType: Workstation Working Hour,Start Time,Почеток Време
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
 DocType: BOM Operation,Hour Rate,Стапка на час
 DocType: Stock Settings,Item Naming By,Точка грабеж на име со
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Од цитат
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Уште еден период Затворање Влегување {0} е направен по {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Од цитат
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Уште еден период Затворање Влегување {0} е направен по {1}
 DocType: Production Order,Material Transferred for Manufacturing,Материјал е пренесен за производство
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,На сметка {0} не постои
 DocType: Purchase Receipt Item,Purchase Order Item No,Нарачка Точка Не
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,Инспекција што се бара
 DocType: Purchase Invoice Item,PR Detail,ПР Детална
 DocType: Sales Order,Fully Billed,Целосно Опишан
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Парични средства во благајна
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Испорака магацин потребни за трговија ставка {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Испорака магацин потребни за трговија ставка {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина на пакувањето. Обично нето тежина + материјал за пакување тежина. (За печатење)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисниците со оваа улога може да поставите замрзнати сметки и да се создаде / измени на сметководствените ставки кон замрзнатите сметки
 DocType: Serial No,Is Cancelled,Е Откажано
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Мои Пратки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Мои Пратки
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Дури и ако постојат повеќе Цените правила со највисок приоритет, тогаш се применуваат следните интерни приоритети:"
 DocType: Supplier,Supplier Details,Добавувачот Детали за
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Ве молиме изберете банкарска сметка
 DocType: Newsletter,Create and Send Newsletters,Креирајте и испратете Билтени
-sites/assets/js/report.min.js +107,From Date must be before To Date,Од датум мора да е пред: Да најдам
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Од датум мора да е пред: Да најдам
 DocType: Sales Order,Recurring Order,Повторувачки Побарувања
 DocType: Company,Default Income Account,Сметка стандардно на доход
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Клиент група / клиентите
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Акции UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
 ,Projected,Проектирани
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Сериски № {0} не припаѓаат Магацински {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Забелешка: системот не ќе ги провери над-испорака и над-резервација за Точка {0}, на пример количината или сума е 0"
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Забелешка: системот не ќе ги провери над-испорака и над-резервација за Точка {0}, на пример количината или сума е 0"
 DocType: Notification Control,Quotation Message,Цитат порака
 DocType: Issue,Opening Date,Отворање датум
 DocType: Journal Entry,Remark,Напомена
 DocType: Purchase Receipt Item,Rate and Amount,Стапка и износот
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Досадни
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Од Продај Побарувања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Од Продај Побарувања
 DocType: Blog Category,Parent Website Route,Родител вебсајт Пат
 DocType: Sales Order,Not Billed,Не Опишан
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Двете Магацински мора да припаѓа на истата компанија
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Не контакти додаде уште.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Не контакти додаде уште.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Не се активни
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Врз основа на фактура во врска со Мислењата Датум
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Слета Цена ваучер Износ
 DocType: Time Log,Batched for Billing,Batched за регистрации
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Сметки кои произлегуваат од добавувачи.
 DocType: POS Profile,Write Off Account,Отпише профил
-sites/assets/js/erpnext.min.js +26,Discount Amount,Износ попуст
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Износ попуст
 DocType: Purchase Invoice,Return Against Purchase Invoice,Врати против Набавка Фактура
 DocType: Item,Warranty Period (in days),Гарантниот период (во денови)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,на пример ДДВ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Точка 4
 DocType: Journal Entry Account,Journal Entry Account,Весник Влегување профил
 DocType: Shopping Cart Settings,Quotation Series,Серија цитат
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Ставка постои со исто име ({0}), ве молиме да го смени името на ставката група или преименување на точка"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Ставка постои со исто име ({0}), ве молиме да го смени името на ставката група или преименување на точка"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Формирање жешки метални гас
 DocType: Sales Order Item,Sales Order Date,Продажбата на Ред Датум
 DocType: Sales Invoice Item,Delivered Qty,Дадени Количина
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Клиент или снабдувачот
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Поставете
 DocType: Lead,Lead Owner,Водач сопственик
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Се бара магацин
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Се бара магацин
 DocType: Employee,Marital Status,Брачен статус
 DocType: Stock Settings,Auto Material Request,Авто материјал Барање
 DocType: Time Log,Will be updated when billed.,Ќе биде обновен кога фактурирани.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Серија на располагање Количина од магацин
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Тековни Бум и Нов Бум не може да биде ист
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Денот на неговото пензионирање мора да биде поголема од датумот на пристап
 DocType: Sales Invoice,Against Income Account,Против профил доход
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,Ажурирање берза
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Различни UOM за предмети ќе доведе до неточни (Вкупно) Нето вредноста на тежината. Бидете сигурни дека нето-тежината на секоја ставка е во иста UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Бум стапка
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Ве молиме да се повлече предмети од Испратница
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Ве молиме да се повлече предмети од Испратница
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Весник записи {0} е не-поврзани
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Рекорд на сите комуникации од типот пошта, телефон, чет, посета, итн"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Ве молиме спомнете заокружуваат цена центар во компанијата
 DocType: Purchase Invoice,Terms,Услови
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Креирај нова
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Креирај нова
 DocType: Buying Settings,Purchase Order Required,Нарачка задолжителни
 ,Item-wise Sales History,Точка-мудар Продажбата Историја
 DocType: Expense Claim,Total Sanctioned Amount,Вкупно санкционира Износ
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Плата се лизга
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Белешки
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Изберете група јазол во прв план.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Целта мора да биде еден од {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Пополнете го формуларот и го спаси
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Пополнете го формуларот и го спаси
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Преземете извештај кој ги содржи сите суровини со најновите статусот инвентар
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Со кои се соочува
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форуми во заедницата
 DocType: Leave Application,Leave Balance Before Application,Остави баланс пред апликација
 DocType: SMS Center,Send SMS,Испрати СМС
 DocType: Company,Default Letter Head,Стандардно писмо Раководител
 DocType: Time Log,Billable,Фактурираните
 DocType: Authorization Rule,This will be used for setting rule in HR module,Ова ќе се користи за поставување на власт во човечки ресурси модул
 DocType: Account,Rate at which this tax is applied,Стапка по која се применува овој данок
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Пренареждане Количина
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Пренареждане Количина
 DocType: Company,Stock Adjustment Account,Акциите прилагодување профил
 DocType: Journal Entry,Write Off,Отпис
 DocType: Time Log,Operation ID,Операција проект
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Попуст полиња ќе бидат достапни во нарачката, купување прием, Набавка Фактура"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име на нова сметка. Забелешка: Ве молиме да не се создаде сметки за клиентите и добавувачите
 DocType: Report,Report Type,Тип на излагањето
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Вчитување
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Вчитување
 DocType: BOM Replace Tool,BOM Replace Tool,Бум Заменете алатката
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Земја мудро стандардно адреса Урнеци
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Снабдувачот доставува до клиентите
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Шоуто данок распадот
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Податоци за увоз и извоз
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Ако се вклучат во производна активност. Овозможува Точка "е произведен"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Датум на фактура во врска со Мислењата
 DocType: Sales Invoice,Rounded Total,Вкупно заоблени
 DocType: Product Bundle,List items that form the package.,Листа на предмети кои ја формираат пакет.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент распределба треба да биде еднаква на 100%
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
 DocType: Company,Default Cash Account,Стандардно готовинска сметка
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компанијата (не клиент или добавувач) господар.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Ве молиме внесете 'очекува испорака датум "
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Ве молиме внесете 'очекува испорака датум "
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Уплатениот износ + отпише сума не може да биде поголема од Гранд Вкупно
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не е валиден сериски број за ставката {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Забелешка: Не е доволно одмор биланс за Оставете Тип {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Ред {0}: Количина не avalable во магацин {1} на {2} {3}. Достапни Количина: {4}, пренос Количина: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Точка 3
+DocType: Purchase Order,Customer Contact Email,Контакт е-маил клиент
 DocType: Event,Sunday,Недела
 DocType: Sales Team,Contribution (%),Придонес (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од "Пари или банкарска сметка 'не е одредено,"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Шаблон
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажбата на лице Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ве молиме внесете барем 1 фактура во табелата
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Додади корисници
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),Старт на проектот
 DocType: Stock Reconciliation Item,Before reconciliation,Пред помирување
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Даноци и давачки Додадено (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
 DocType: Sales Order,Partly Billed,Делумно Опишан
 DocType: Item,Default BOM,Стандардно Бум
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Вкупно Најдобро Амт
 DocType: Time Log Batch,Total Hours,Вкупно часови
 DocType: Journal Entry,Printing Settings,Поставки за печатење
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Дебитна мора да биде еднаков Вкупно кредит. Разликата е {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Дебитна мора да биде еднаков Вкупно кредит. Разликата е {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобилски
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Остава за видот {0} веќе наменети за вработените {1} за фискалната година {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Е потребно точка
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метал шприц
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Од Испратница
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Од Испратница
 DocType: Time Log,From Time,Од време
 DocType: Notification Control,Custom Message,Прилагодено порака
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестициско банкарство
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,Водечки со 
 DocType: Stock Entry,From BOM,Од бирото
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основни
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,На акции трансакции пред {0} се замрзнати
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',Ве молиме кликнете на "Генерирање Распоред '
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Датум треба да биде иста како и од датумот за половина ден одмор
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Ве молиме кликнете на "Генерирање Распоред '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Датум треба да биде иста како и од датумот за половина ден одмор
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","на пр Kg, единица бр, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Референтен број е задолжително ако влезе референтен датум
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Референтен број е задолжително ако влезе референтен датум
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Датум на приклучување мора да биде поголем Датум на раѓање
 DocType: Salary Structure,Salary Structure,Структура плата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Повеќе Цена правило постои со истите критериуми, ве молиме решавање \ конфликт со давање приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авиокомпанијата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Материјал прашање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Материјал прашање
 DocType: Material Request Item,For Warehouse,За Магацински
 DocType: Employee,Offer Date,Датум на понуда
 DocType: Hub Settings,Access Token,Пристап знак
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,Отворање Време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Од и до датуми потребни
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Хартии од вредност и стоковни берзи
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
+DocType: Delivery Note Item,From Warehouse,Од магацин
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Дупчење
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Калапи удар
 DocType: Purchase Taxes and Charges,Valuation and Total,Вреднување и вкупно
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,Изменет Од
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Суровина
 DocType: Leave Application,Follow via Email,Следете ги преку E-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Износот на данокот По Износ попуст
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Сметка детето постои за оваа сметка. Не можете да ја избришете оваа сметка.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Сметка детето постои за оваа сметка. Не можете да ја избришете оваа сметка.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Или цел количество: Контакт лице или целниот износ е задолжително
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
-DocType: Leave Allocation,Carry Forward,Пренесување
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Отворање датум треба да биде пред крајниот датум
+DocType: Leave Control Panel,Carry Forward,Пренесување
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Трошоците центар со постојните трансакции не може да се конвертира Леџер
 DocType: Department,Days for which Holidays are blocked for this department.,Деновите за кои Празници се блокирани за овој оддел.
 ,Produced,Произведени
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Вкупно (АМТ)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Забава & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Датумот на кој периодично да се запре
 DocType: Quality Inspection,Item Serial No,Точка Сериски Не
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора да се намали од {1} или ќе треба да се зголеми претекување толеранција
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора да се намали од {1} или ќе треба да се зголеми претекување толеранција
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Вкупно Тековен
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серијали Точка {0} не може да се ажурира \ користење на берза за помирување
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Пренос на материјал за да Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Пренос на материјал за да Добавувачот
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Нова серија № не може да има складиште. Склад мора да бидат поставени од страна берза за влез или купување Потврда
 DocType: Lead,Lead Type,Водач Тип
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Креирај цитат
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Сите овие предмети веќе се фактурира
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Сите овие предмети веќе се фактурира
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може да биде одобрена од страна на {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Услови за испорака Правило
 DocType: BOM Replace Tool,The new BOM after replacement,Новиот Бум по замена
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,C-Форма
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Операција проект не е поставена
 DocType: Production Order,Planned Start Date,Планираниот почеток Датум
 DocType: Serial No,Creation Document Type,Креирање Вид на документ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Посетата
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Посетата
 DocType: Leave Type,Is Encash,Е инкасирам
 DocType: Purchase Invoice,Mobile No,Мобилни Не
 DocType: Payment Tool,Make Journal Entry,Направете весник Влегување
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,Нови лисја Распре
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект-мудар податоци не се достапни за котација
 DocType: Project,Expected End Date,Се очекува Крај Датум
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Комерцијален
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Комерцијален
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родител Точка {0} не мора да биде Акции Точка
 DocType: Cost Center,Distribution Id,Id дистрибуција
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Прекрасно Услуги
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредноста за атрибутот {0} мора да биде во рамките на опсегот на {1} до {2} во зголемувања од {3}
 DocType: Tax Rule,Sales,Продажба
 DocType: Stock Entry Detail,Basic Amount,Основицата
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
+DocType: Leave Allocation,Unused leaves,Неискористени листови
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Стандардно сметки побарувања
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Пила
 DocType: Tax Rule,Billing State,Платежна држава
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламиниране
 DocType: Item Reorder,Transfer,Трансфер
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
 DocType: Authorization Rule,Applicable To (Employee),Применливи To (вработените)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Поради Датум е задолжително
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,Трговија на мало
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Клиент {0} не постои
 DocType: Attendance,Absent,Отсутен
 DocType: Product Bundle,Product Bundle,Производ Бовча
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ред {0}: Невалидна референца {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Дробење
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купување на даноци и такси Шаблон
 DocType: Upload Attendance,Download Template,Преземи Шаблон
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,Забелешки
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина Точка законик
 DocType: Journal Entry,Write Off Based On,Отпише врз основа на
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Инсталација рекорд за сериски број
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Инсталација рекорд за сериски број
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Континуирано леење
-sites/assets/js/erpnext.min.js +10,Please specify a,Ве молиме наведете
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ве молиме наведете
 DocType: Offer Letter,Awaiting Response,Чекам одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Над
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Студената големината
 DocType: Salary Slip,Earning & Deduction,Заработувајќи & Одбивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,На сметка {0} не може да биде група
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Регионот
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Опционални. Оваа поставка ќе се користи за филтрирање на различни трансакции.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Опционални. Оваа поставка ќе се користи за филтрирање на различни трансакции.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
 DocType: Holiday List,Weekly Off,Неделен Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За пример, 2012 година, 2012-13"
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Издут
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Кастинг испарување-модел
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Забава трошоци
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Продај фактура {0} мора да биде укинат пред да го раскине овој Продај Побарувања
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Години
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Продај фактура {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Години
 DocType: Time Log,Billing Amount,Платежна Износ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Невалиден количество, дефинитивно за ставката {0}. Кол треба да биде поголем од 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Апликации за отсуство.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Сметка со постоечките трансакцијата не може да се избришат
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Сметка со постоечките трансакцијата не може да се избришат
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Правни трошоци
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","На ден од месецот на кој авто цел ќе биде генериранa на пример 05, 28 итн"
 DocType: Sales Invoice,Posting Time,Праќање пораки во Време
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Логото
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Обележете го ова ако сакате да ги принуди на корисникот за да изберете серија пред зачувување. Нема да има стандардно Ако ја изберете оваа.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Не ставка со Сериски Не {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Отворен Известувања
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Отворен Известувања
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Директни трошоци
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Дали навистина сакате да отпушвам Овој материјал барање?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Нов корисник приходи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Патни трошоци
 DocType: Maintenance Visit,Breakdown,Дефект
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Како на датум
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Усовршувајќи
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Условна казна
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Стандардно Магацински е задолжително за акциите точка.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Стандардно Магацински е задолжително за акциите точка.
 DocType: Feed,Full Name,Целосно име
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Исплата на плата за месец {0} и годината {1}
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Додадет
 DocType: Buying Settings,Default Supplier Type,Стандардно Добавувачот Тип
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Вадење на камен
 DocType: Production Order,Total Operating Cost,Вкупно оперативни трошоци
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Забелешка: Точката {0} влегоа неколку пати
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Забелешка: Точката {0} влегоа неколку пати
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Сите контакти.
 DocType: Newsletter,Test Email Id,Тест-мејл ID
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Компанијата Кратенка
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цит
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улогата дозволено да ја менувате замрзнати акции
 ,Territory Target Variance Item Group-Wise,Територија Целна Варијанса Точка група-wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Сите групи потрошувачи
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Данок Шаблон е задолжително.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,На сметка {0}: Родител на сметка {1} не постои
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник стапка (Фирма валута)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} статус е "Запрен"
 DocType: Account,Temporary,Привремено
 DocType: Address,Preferred Billing Address,Најпосакувана платежна адреса
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределба
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Точка Мудрио
 DocType: Purchase Order Item,Supplier Quotation,Добавувачот цитат
 DocType: Quotation,In Words will be visible once you save the Quotation.,Во Зборови ќе бидат видливи откако ќе го спаси котација.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Пеглање
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} е запрен
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} е запрен
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
 DocType: Lead,Add to calendar on this date,Додади во календарот на овој датум
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила за додавање на трошоците за испорака.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Престојни настани
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Престојни настани
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Се бара купувачи
 DocType: Letter Head,Letter Head,Писмо Раководител
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Брз влез
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} е задолжително за враќање
 DocType: Purchase Order,To Receive,За да добиете
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Се намалува фитинг
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Барем еден магацин е задолжително
 DocType: Serial No,Out of Warranty,Надвор од гаранција
 DocType: BOM Replace Tool,Replace,Заменете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} против Продај фактура {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Ве молиме внесете го стандардно единица мерка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} против Продај фактура {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ве молиме внесете го стандардно единица мерка
 DocType: Purchase Invoice Item,Project Name,Име на проектот
 DocType: Supplier,Mention if non-standard receivable account,Наведе ако нестандардни побарувања сметка
 DocType: Workflow State,Edit,Уреди
 DocType: Journal Entry Account,If Income or Expense,Ако приходите и расходите
 DocType: Features Setup,Item Batch Nos,Точка Серија броеви
 DocType: Stock Ledger Entry,Stock Value Difference,Акции Вредност разликата
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Човечки ресурси
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Човечки ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Плаќање помирување на плаќање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Даночни средства
 DocType: BOM Item,BOM No,Бум Не
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Весник Влегување {0} нема сметка {1} или веќе се споредуваат со други ваучер
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Весник Влегување {0} нема сметка {1} или веќе се споредуваат со други ваучер
 DocType: Item,Moving Average,Се движат просек
 DocType: BOM Replace Tool,The BOM which will be replaced,Бум на која ќе биде заменет
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Нова берза UOM мора да бидат различни од сегашните акции UOM
 DocType: Account,Debit,Дебитна
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Листови мора да бидат распределени во мултипли од 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листови мора да бидат распределени во мултипли од 0,5"
 DocType: Production Order,Operation Cost,Оперативни трошоци
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Внеси посетеност од CSV датотека
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Најдобро Амт
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Пос
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Да му ја додели на ова прашање, користете "додели" копчето во страничната лента."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Замрзнување резерви постари од [Денови]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако две или повеќе правила Цените се наоѓаат врз основа на горенаведените услови, се применува приоритет. Приоритет е број помеѓу 0 до 20, додека стандардната вредност е нула (празно). Поголем број значи дека ќе имаат предност ако има повеќе Цените правила со истите услови."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Врз основа на фактура
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Фискална година: {0} не постои
 DocType: Currency Exchange,To Currency,До Валута
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Им овозможи на овие корисници да се одобри отсуство Апликации за блок дена.
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ст
 DocType: Stock Entry Detail,Additional Cost,Дополнителни трошоци
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Финансиска година Крај Датум
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрираат врз основа на ваучер Не, ако се групираат според ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Направете Добавувачот цитат
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Направете Добавувачот цитат
 DocType: Quality Inspection,Incoming,Дојдовни
 DocType: BOM,Materials Required (Exploded),Потребни материјали (експлодира)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Намалување на заработка за неплатено отсуство (LWP)
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Сериски Не {1} не се совпаѓа со {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Обичните Leave
 DocType: Batch,Batch ID,Серија проект
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Забелешка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Забелешка: {0}
 ,Delivery Note Trends,Испратница трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Краток преглед на оваа недела
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} мора да биде купена или под-договор ставка во ред {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} мора да биде купена или под-договор ставка во ред {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Сметка: {0} можат да се ажурираат само преку акции трансакции
 DocType: GL Entry,Party,Партија
 DocType: Sales Order,Delivery Date,Датум на испорака
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Купување стапка
 DocType: Task,Actual Time (in Hours),Крај на времето (во часови)
 DocType: Employee,History In Company,Во историјата на компанијата
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Билтени
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Билтени
 DocType: Address,Shipping,Испорака
 DocType: Stock Ledger Entry,Stock Ledger Entry,Акции Леџер Влегување
 DocType: Department,Leave Block List,Остави Забрани Листа
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,Ревизор
 DocType: Purchase Order,End date of current order's period,Датум на завршување на периодот тековниот ред е
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Направете Понуда писмо
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Враќање
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Стандардно единица мерка за варијанта мора да биде иста како Шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Стандардно единица мерка за варијанта мора да биде иста како Шаблон
 DocType: DocField,Fold,Пати
 DocType: Production Order Operation,Production Order Operation,Производството со цел Операција
 DocType: Pricing Rule,Disable,Оневозможи
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Извештаи до
 DocType: SMS Settings,Enter url parameter for receiver nos,Внесете URL параметар за примачот бр
 DocType: Sales Invoice,Paid Amount,Уплатениот износ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Затворање на сметка {0} мора да биде од типот "одговорност"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Затворање на сметка {0} мора да биде од типот "одговорност"
 ,Available Stock for Packing Items,Достапни берза за материјали за пакување
 DocType: Item Variant,Item Variant,Точка Варијанта
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Поставуањето на оваа адреса Шаблон како стандардно што не постои друг стандардно
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управување со квалитет
 DocType: Production Planning Tool,Filter based on customer,Филтер врз основа на клиент
 DocType: Payment Tool Detail,Against Voucher No,Против ваучер Не
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Ве молиме внесете количество за Точка {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Ве молиме внесете количество за Точка {0}
 DocType: Employee External Work History,Employee External Work History,Вработен Надворешни Историја работа
 DocType: Tax Rule,Purchase,Купување
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Биланс Количина
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials","Агрегат група ** ** Теми во д
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Сериски Не е задолжително за Точка {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ве молиме наведете од / до движат
-sites/assets/js/desk.min.js +7652,Created By,Создадена од страна
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Создадена од страна
 DocType: Serial No,Under AMC,Според АМЦ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Точка стапка вреднување е пресметаните оглед слета ваучер износ на трошоците
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Стандардните поставувања за продажба трансакции.
 DocType: BOM Replace Tool,Current BOM,Тековни Бум
-sites/assets/js/erpnext.min.js +8,Add Serial No,Додади Сериски Не
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Додади Сериски Не
 DocType: Production Order,Warehouses,Магацини
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Печати и Стационарни
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Група Јазол
 DocType: Payment Reconciliation,Minimum Amount,Минимален износ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Ажурирање на готовите производи
 DocType: Workstation,per hour,на час
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Серија {0} веќе се користи во {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Серија {0} веќе се користи во {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Сметка за складиште (Вечен Инвентар) ќе бидат создадени во рамките на оваа сметка.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не може да биде избришан како што постои влез акции Леџер за оваа склад.
 DocType: Company,Distribution,Дистрибуција
-sites/assets/js/erpnext.min.js +50,Amount Paid,Уплатениот износ
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Уплатениот износ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Проект менаџер
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Испраќање
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс попуст дозволено за ставка: {0} е {1}%
 DocType: Customer,Default Taxes and Charges,Стандардно даноци и давачки
 DocType: Account,Receivable,Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Не е дозволено да се промени Добавувачот како веќе постои нарачка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улогата што може да поднесе трансакции кои надминуваат кредитни лимити во собата.
 DocType: Sales Invoice,Supplier Reference,Добавувачот Референтен
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ако е обележано, Бум за под-собранието предмети ќе се смета за добивање на суровини. Инаку, сите објекти под-собранието ќе бидат третирани како суровина."
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,Додадете / отстрани
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Трансакцијата не е дозволено против запре производството со цел {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да го поставите на оваа фискална година како стандарден, кликнете на "Постави како стандарден""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Поставување на дојдовен сервер за поддршка мејл ID. (На пр support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Недостаток Количина
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
 DocType: Salary Slip,Salary Slip,Плата фиш
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полирање
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"Да најдам 'е потребен
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Кога било кој од обележаните трансакции се "поднесе", е-мејл pop-up автоматски се отвори да се испрати е-маил до поврзани "Контакт" во таа трансакција, со трансакцијата како прилог. Корисникот може или не може да го испрати е-мејл."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Општи нагодувања
 DocType: Employee Education,Employee Education,Вработен образование
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
 DocType: Salary Slip,Net Pay,Нето плати
 DocType: Account,Account,Сметка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Сериски № {0} е веќе доби
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,Производство пристап
 DocType: Purchase Order,Raw Materials Supplied,Суровини Опрема што се испорачува
 DocType: Purchase Invoice,Recurring Print Format,Повторувачки печатење формат
 DocType: Communication,Series,Серија
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Се очекува испорака датум не може да биде пред нарачка Датум
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Се очекува испорака датум не може да биде пред нарачка Датум
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Communication,Email,Е-пошта
 DocType: Item Group,Item Classification,Точка Класификација
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,Settings Даноци
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Одговара на не-поврзани фактури и плаќања.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Поставите цел
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корен не може да има цена центар родител
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Изберете бренд ...
 DocType: Sales Invoice,C-Form Applicable,C-Форма Применливи
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
 DocType: Supplier,Address and Contacts,Адреса и контакти
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Земете Најдобро Ваучери
 DocType: Warranty Claim,Resolved By,Реши со
 DocType: Appraisal,Start Date,Датум на почеток
-sites/assets/js/desk.min.js +7629,Value,Вредност
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Вредност
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Распредели листови за одреден период.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Кликни тука за да се потврди
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,На сметка {0}: Вие не може да се додели како родител сметка
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Дозволено Dropbox пристап
 DocType: Dropbox Backup,Weekly,Неделен
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,На пр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Добивате
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Добивате
 DocType: Maintenance Visit,Fully Completed,Целосно завршен
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Целосно
 DocType: Employee,Educational Qualification,Образовните квалификации
 DocType: Workstation,Operating Costs,Оперативни трошоци
 DocType: Employee Leave Approver,Employee Leave Approver,Вработен Остави Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} е успешно додаден во нашиот листа Билтен.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,"Електрони, зрак обработка"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купување мајстор менаџер
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Додај / Уреди цени
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Шема на трошоците центри
 ,Requested Items To Be Ordered,Бара предмети да се средат
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Мои нарачки
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Мои нарачки
 DocType: Price List,Price List Name,Ценовник Име
 DocType: Time Log,For Manufacturing,За производство
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Одделение
@@ -3471,7 +3489,7 @@ DocType: Account,Income,Приходи
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Нешто не беше во ред!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Продај фактура {0} е веќе испратена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Продај фактура {0} е веќе испратена
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Датум на завршување
 DocType: Purchase Invoice Item,Amount (Company Currency),Износ (Фирма валута)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Леене
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Година
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Продажба Профил
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Ве молиме инсталирајте SMS Settings
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Време Вклучи {0} веќе најавена
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Време Вклучи {0} веќе најавена
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Необезбедени кредити
 DocType: Cost Center,Cost Center Name,Чини Име центар
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Точка {0} со серија № {1} е веќе инсталиран
 DocType: Maintenance Schedule Detail,Scheduled Date,Закажаниот датум
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Вкупно исплатените Амт
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Пораки поголема од 160 карактери ќе бидат поделени во повеќе пораки
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Примени и приф
 ,Serial No Service Contract Expiry,Сериски Нема договор за услуги Важи
 DocType: Item,Unit of Measure Conversion,Единица мерка конверзија
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Работникот не може да се промени
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
 DocType: Naming Series,Help HTML,Помош HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Вкупно weightage доделени треба да биде 100%. Тоа е {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Додаток за надминување {0} преминал за Точка {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Додаток за надминување {0} преминал за Точка {1}
 DocType: Address,Name of person or organization that this address belongs to.,Име на лицето или организацијата која оваа адреса припаѓа.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Вашите добавувачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,Конвертираната
 DocType: Item,Has Serial No,Има серија №
 DocType: Employee,Date of Issue,Датум на издавање
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Од {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
 DocType: Issue,Content Type,Типот на содржина
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Компјутер
 DocType: Item,List this Item in multiple groups on the website.,Листа на оваа точка во повеќе групи на веб страната.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Точка: {0} не постои во системот
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Земете неусогласеност записи
@@ -3524,14 +3542,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Да се ​​Магацински
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},На сметка {0} е внесен повеќе од еднаш за фискалната година {1}
 ,Average Commission Rate,Просечната стапка на Комисијата
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"Мора Сериски Не" не може да биде "Да" за не-парк точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"Мора Сериски Не" не може да биде "Да" за не-парк точка
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Публика не можат да бидат означени за идните датуми
 DocType: Pricing Rule,Pricing Rule Help,Цените Правило Помош
 DocType: Purchase Taxes and Charges,Account Head,Сметка на главата
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Ажурирање на дополнителни трошоци за да се пресмета слета трошоците за предмети
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Електрични
 DocType: Stock Entry,Total Value Difference (Out - In),Вкупно разликата вредност (Out - Во)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID на корисникот не е поставена за вработените {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Од Гаранција побарување
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,Именување Серија
 DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
 DocType: User,Enabled,Овозможено
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Акции средства
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Дали навистина сакате да ги достават сите Плата фиш за месец {0} и годината {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Дали навистина сакате да ги достават сите Плата фиш за месец {0} и годината {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Увоз претплатници
 DocType: Target Detail,Target Qty,Целна Количина
 DocType: Attendance,Present,Моментов
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Испратница {0} не мора да се поднесе
 DocType: Notification Control,Sales Invoice Message,Порака Продај фактура
 DocType: Authorization Rule,Based On,Врз основа на
-,Ordered Qty,Нареди Количина
+DocType: Sales Order Item,Ordered Qty,Нареди Количина
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Период од периодот и роковите на задолжителна за периодични {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектна активност / задача.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Генерирање на исплатните листи
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} не е валиден-мејл ID
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Upload Публика
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Бум Производство и Кол се бара
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Стареењето опсег 2
-DocType: Journal Entry Account,Amount,Износот
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Износот
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Возбудлив
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Бум замени
 ,Sales Analytics,Продажбата анализи
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекуваниот датум не може да биде пред Материјал Барање Датум
 DocType: Contact Us Settings,City,Градот
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ултразвучно обработка
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Грешка: Не е валидна проект?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Грешка: Не е валидна проект?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Точка {0} мора да биде Продажбата Точка
 DocType: Naming Series,Update Series Number,Ажурирање Серија број
 DocType: Account,Equity,Капитал
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,Крај
 DocType: Authorization Rule,Customerwise Discount,Customerwise попуст
 DocType: Purchase Invoice,Against Expense Account,Против сметка сметка
 DocType: Production Order,Production Order,Производството со цел
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Инсталација Забелешка {0} е веќе испратена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Инсталација Забелешка {0} е веќе испратена
 DocType: Quotation Item,Against Docname,Против Docname
 DocType: SMS Center,All Employee (Active),Сите вработените (Активни)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Прикажи Сега
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Суровина трошоци
 DocType: Item,Re-Order Level,Повторно да Ниво
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Внесете предмети и планирани Количина за која сакате да се зголеми производството наредби или преземете суровини за анализа.
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt шема
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt шема
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Скратено работно време
 DocType: Employee,Applicable Holiday List,Применливи летни Листа
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серија освежено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип на излагањето е задолжително
 DocType: Item,Serial Number Series,Сериски број Серија
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Складиште е задолжително за акциите Точка {0} во ред {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Складиште е задолжително за акциите Точка {0} во ред {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Мало и големо
 DocType: Issue,First Responded On,Прво одговорија
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крстот на оглас на точка во повеќе групи
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,Публика
 DocType: Page,No,Не
 DocType: BOM,Materials,Материјали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако не е означено, листата ќе мора да се додаде на секој оддел каде што треба да се примени."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Праќање пораки во денот и објавување време е задолжително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Праќање пораки во денот и објавување време е задолжително
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Данок дефиниција за купување трансакции.
 ,Item Prices,Точка цени
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Во Зборови ќе бидат видливи откако ќе го спаси нарачка.
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административни трошоци
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родител група на потрошувачи
-sites/assets/js/erpnext.min.js +50,Change,Промени
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промени
 DocType: Purchase Invoice,Contact Email,Контакт E-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Нарачка {0} е "престана"
 DocType: Appraisal Goal,Score Earned,Резултат Заработени
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","на пример, "Мојата компанија ДОО""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Отказен рок
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,Бруто тежина на апарат
 DocType: Email Digest,Receivables / Payables,Побарувања / Обврските
 DocType: Delivery Note Item,Against Sales Invoice,Против Продај фактура
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Сузбивање
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Слета Цена Точка
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Прикажи нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Кол од точка добиени по производство / препакување од даден количини на суровини
 DocType: Payment Reconciliation,Receivable / Payable Account,Побарувања / Платив сметка
 DocType: Delivery Note Item,Against Sales Order Item,Против Продај Побарувања Точка
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
 DocType: Item,Default Warehouse,Стандардно Магацински
 DocType: Task,Actual End Date (via Time Logs),Крај Крај Датум (преку Време на дневници)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Буџетот не може да биде доделен од група на сметка {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,Тим за поддршка
 DocType: Appraisal,Total Score (Out of 5),Вкупниот резултат (Од 5)
 DocType: Contact Us Settings,State,Држава
 DocType: Batch,Batch,Серија
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Биланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Биланс
 DocType: Project,Total Expense Claim (via Expense Claims),Вкупно расходи барање (преку трошоците побарувања)
 DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Задолжување
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,Блог Претплатникот
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Создаде правила за ограничување на трансакции врз основа на вредности.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ако е обележано, Вкупно бр. на работните денови ќе бидат вклучени празници, а со тоа ќе се намали вредноста на платата по ден"
 DocType: Purchase Invoice,Total Advance,Вкупно напредување
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Отпушвам материјал Барање
 DocType: Workflow State,User,Корисникот
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Обработка на платен список
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Обработка на платен список
 DocType: Opportunity Item,Basic Rate,Основната стапка
 DocType: GL Entry,Credit Amount,Износ на кредитот
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Постави како изгубени
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,Кредитна дена врз осно
 DocType: Tax Rule,Tax Rule,Данок Правило
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Одржување на иста стапка текот продажбата циклус
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,План Време на дневници надвор Workstation работно време.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} е веќе испратена
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} е веќе испратена
 ,Items To Be Requested,Предмети да се бара
 DocType: Purchase Order,Get Last Purchase Rate,Земете Последна Набавка стапка
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Платежна стапка врз основа на видот на активности (на час)
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Компанија е-мејл ID не е пронајден, па затоа не пошта испратена"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Примена на средства (средства)
 DocType: Production Planning Tool,Filter based on item,Филтер врз основа на точка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Дебитни сметка
 DocType: Fiscal Year,Year Start Date,Година Почеток Датум
 DocType: Attendance,Employee Name,Име на вработениот
 DocType: Sales Invoice,Rounded Total (Company Currency),Заоблени Вкупно (Фирма валута)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Бришење
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Користи за вработените
 DocType: Sales Invoice,Is POS,Е ПОС
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
 DocType: Production Order,Manufactured Qty,Произведени Количина
 DocType: Purchase Receipt Item,Accepted Quantity,Прифатени Кол
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постои
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Сметки се зголеми на клиенти.
 DocType: DocField,Default,Стандардно
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,На проект
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Додадени {0} претплатници
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Дефинираат Буџетот за оваа цена центар. За да го поставите на буџетот акција, видете "компанијата Листа""
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,Родител профил
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Центар
 DocType: GL Entry,Voucher Type,Ваучер Тип
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
 DocType: Expense Claim,Approved,Одобрени
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како "Лево"
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Образование
 DocType: Selling Settings,Campaign Naming By,Именувањето на кампањата од страна на
 DocType: Employee,Current Address Is,Тековни адреса е
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Опционални. Ја поставува стандардната валута компанијата, ако не е одредено."
 DocType: Address,Office,Канцеларија
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандардни извештаи
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Сметководствени записи во дневникот.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Забава / профилот не се поклопува со {1} / {2} со {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Количина на располагање од магацин
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Забава / профилот не се поклопува со {1} / {2} со {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Да се ​​создаде жиро сметка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ве молиме внесете сметка сметка
 DocType: Account,Stock,На акции
 DocType: Employee,Current Address,Тековна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако предмет е варијанта на друг елемент тогаш опис, слики, цени, даноци и слично ќе бидат поставени од дефиниција освен ако експлицитно не е наведено"
 DocType: Serial No,Purchase / Manufacture Details,Купување / Производство Детали за
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Серија Инвентар
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Серија Инвентар
 DocType: Employee,Contract End Date,Договор Крај Датум
 DocType: Sales Order,Track this Sales Order against any Project,Следење на овој Продај Побарувања против било кој проект
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Продажбата на налози се повлече (во очекување да се испорача) врз основа на горенаведените критериуми
 DocType: DocShare,Document Type,Тип на документ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Од Добавувачот цитат
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Од Добавувачот цитат
 DocType: Deduction Type,Deduction Type,Одбивање Тип
 DocType: Attendance,Half Day,Половина ден
 DocType: Pricing Rule,Min Qty,Мин Количина
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,За Кол (Произведени Количина) се задолжителни
 DocType: Stock Entry,Default Target Warehouse,Стандардно Целна Магацински
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Вкупно (Фирма валута)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Тип партија и Партијата се применува само против побарувања / Платив сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Тип партија и Партијата се применува само против побарувања / Платив сметка
 DocType: Notification Control,Purchase Receipt Message,Купување Потврда порака
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Вкупно одобрени Листовите се повеќе од периодот
 DocType: Production Order,Actual Start Date,Старт на проектот Датум
 DocType: Sales Order,% of materials delivered against this Sales Order,% На материјалите доставени од оваа Продај Побарувања
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Рекорд движење точка.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Рекорд движење точка.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Билтен претплатникот листа
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Услуги
 DocType: Hub Settings,Hub Settings,Settings центар
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Со операции
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Сметководствени записи се веќе направени во валута {0} за компанија {1}. Ве молиме одберете побарувања или треба да се плати сметката со валутна {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Сметководствени записи се веќе направени во валута {0} за компанија {1}. Ве молиме одберете побарувања или треба да се плати сметката со валутна {0}.
 ,Monthly Salary Register,Месечна плата Регистрирај се
-apps/frappe/frappe/website/template.py +123,Next,Следна
+apps/frappe/frappe/website/template.py +140,Next,Следна
 DocType: Warranty Claim,If different than customer address,Ако се разликува од клиент адреса
 DocType: BOM Operation,BOM Operation,Бум работа
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,Следниот датум
 DocType: Employee Education,Major/Optional Subjects,Големи / изборни предмети
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ве молиме внесете даноци и такси
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обработка
+DocType: Sales Invoice Item,Drop Ship,Капка Брод
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тука може да го задржи семејството детали како име и окупација на родител, брачен другар и деца"
 DocType: Hub Settings,Seller Name,Продавачот Име
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Даноци и такси одзема (Фирма валута)
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,За да примите и Бил
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизајнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Услови и правила Шаблон
 DocType: Serial No,Delivery Details,Детали за испорака
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматски се создаде материјал барањето, доколку количината паѓа под ова ниво"
 ,Item-wise Purchase Register,Точка-мудар Набавка Регистрирај се
 DocType: Batch,Expiry Date,Датумот на истекување
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да го поставите нивото редоследот точка мора да биде Набавка Точка или Производство Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да го поставите нивото редоследот точка мора да биде Набавка Точка или Производство Точка
 ,Supplier Addresses and Contacts,Добавувачот адреси и контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ве молиме изберете категорија во првата
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Господар на проектот.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не покажува никакви симбол како $ итн до валути.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Полудневен)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Полудневен)
 DocType: Supplier,Credit Days,Кредитна дена
 DocType: Leave Type,Is Carry Forward,Е пренесување
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Се предмети од бирото
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Се предмети од бирото
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Водач Време дена
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Бил на материјали
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Тип партија и Партијата е потребно за побарувања / Платив сметка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Тип партија и Партијата е потребно за побарувања / Платив сметка {1}
 DocType: Dropbox Backup,Send Notifications To,Доставуваат известувања до
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Реф Датум
 DocType: Employee,Reason for Leaving,Причина за напуштање
 DocType: Expense Claim Detail,Sanctioned Amount,Износ санкционира
 DocType: GL Entry,Is Opening,Се отвора
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Ред {0}: Дебитна влез не можат да бидат поврзани со {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,На сметка {0} не постои
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ред {0}: Дебитна влез не можат да бидат поврзани со {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,На сметка {0} не постои
 DocType: Account,Cash,Пари
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за веб-страница и други публикации.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Ве молиме да се создаде Плата структура за вработен {0}
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 2aa0a24f96..cfb93c970a 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,पगार मोड
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","तुम्ही हंगामी आधारित ट्रॅक करू इच्छित असल्यास, मासिक वितरण निवडा."
 DocType: Employee,Divorced,घटस्फोट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,चेतावनी: समान आयटम अनेक वेळा केलेला आहे.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,चेतावनी: समान आयटम अनेक वेळा केलेला आहे.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,आयटम आधीच समक्रमित
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,आयटम व्यवहार अनेक वेळा जोडले जाण्यास अनुमती द्या
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,साहित्य भेट द्या {0} या हमी दावा रद्द आधी रद्द करा
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,कॉम्पॅक्शन अधिक sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},चलन दर सूची आवश्यक आहे {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* व्यवहार हिशोब केला जाईल.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,साहित्य विनंती पासून
+DocType: Purchase Order,Customer Contact,ग्राहक संपर्क
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,साहित्य विनंती पासून
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} वृक्ष
 DocType: Job Applicant,Job Applicant,ईयोब अर्जदाराचे
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,अधिक परिणाम नाहीत.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,ग्राहक नाव
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","चलन, रूपांतर दर, निर्यात एकूण निर्यात गोळाबेरीज इत्यादी सर्व निर्यात संबंधित फील्ड वितरण टीप, पीओएस, कोटेशन, विक्री चलन, विक्री ऑर्डर इत्यादी उपलब्ध आहेत"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,प्रमुख (किंवा गट) ज्या लेखा नोंदी केले जातात व शिल्लक ठेवली आहेत.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),बाकी {0} असू शकत नाही कमी शून्य ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),बाकी {0} असू शकत नाही कमी शून्य ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 मि डीफॉल्ट
 DocType: Leave Type,Leave Type Name,नाव टाइप करा सोडा
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,मालिका यशस्वीपणे अद्यतनित
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,एकाधिक आयटम भा
 DocType: SMS Center,All Supplier Contact,सर्व पुरवठादार संपर्क
 DocType: Quality Inspection Reading,Parameter,मापदंड
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,अपेक्षित अंतिम तारीख अपेक्षित प्रारंभ तारीख पेक्षा कमी असू शकत नाही
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,खरोखर उत्पादन ऑर्डर बूच करू इच्छिता:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,रो # {0}: दर सारखाच असणे आवश्यक आहे {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,नवी रजेचा अर्ज
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,नवी रजेचा अर्ज
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,बँक ड्राफ्ट
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. या पर्याय चा वापर ग्राहक नुसार आयटम कोड ठेवणे आणि आयटम कोड  चा शोध करण्यासाठी करावा 
 DocType: Mode of Payment Account,Mode of Payment Account,भरणा खाते मोड
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,दर्श
 DocType: Sales Invoice Item,Quantity,प्रमाण
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),कर्ज (दायित्व)
 DocType: Employee Education,Year of Passing,उत्तीर्ण वर्ष
-sites/assets/js/erpnext.min.js +27,In Stock,स्टॉक
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,फक्त बिल न केलेली विक्री ऑर्डर रक्कम करू शकता
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,स्टॉक
 DocType: Designation,Designation,पदनाम
 DocType: Production Plan Item,Production Plan Item,उत्पादन योजना आयटम
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},सदस्य {0} आधीच कर्मचारी नियुक्त केले आहे {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,नवीन पीओएस प्रोफाइल करा
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,हेल्थ केअर
 DocType: Purchase Invoice,Monthly,मासिक
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,चलन
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),भरणा विलंब (दिवस)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,चलन
 DocType: Maintenance Schedule Item,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ई-मेल पत्ता
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,संरक्षण
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),धावसंख्या (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},रो {0}: {1} {2} सह जुळत नाही {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},रो {0}: {1} {2} सह जुळत नाही {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,रो # {0}:
 DocType: Delivery Note,Vehicle No,वाहन नाही
-sites/assets/js/erpnext.min.js +55,Please select Price List,किंमत सूची निवडा कृपया
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,किंमत सूची निवडा कृपया
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,लाकडीकामाच्या
 DocType: Production Order Operation,Work In Progress,प्रगती मध्ये कार्य
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D छपाई
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,पालक तपशील docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,किलो
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,जॉब साठी उघडत आहे.
 DocType: Item Attribute,Increment,बढती
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,वखार निवडा ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,जाहिरात
 DocType: Employee,Married,लग्न
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
 DocType: Payment Reconciliation,Reconcile,समेट
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,किराणा
 DocType: Quality Inspection Reading,Reading 1,1 वाचन
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,बँक प्रवेश करा
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,बँक प्रवेश करा
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,पेन्शन फंड्स
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,खाते प्रकार कोठार असेल तर कोठार अनिवार्य आहे
 DocType: SMS Center,All Sales Person,सर्व विक्री व्यक्ती
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,खर्च केंद्र ब
 DocType: Warehouse,Warehouse Detail,वखार तपशील
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट मर्यादा ग्राहक पार गेले आहे {0} {1} / {2}
 DocType: Tax Rule,Tax Type,कर प्रकार
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},आपण आधी नोंदी जमा करा किंवा सुधारणा करण्यासाठी अधिकृत नाही {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},आपण आधी नोंदी जमा करा किंवा सुधारणा करण्यासाठी अधिकृत नाही {0}
 DocType: Item,Item Image (if not slideshow),आयटम प्रतिमा (स्लाईड शो नाही तर)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,एक ग्राहक समान नाव अस्तित्वात
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(तास रेट / 60) * प्रत्यक्ष ऑपरेशन वेळ
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,अतिथी
 DocType: Quality Inspection,Get Specification Details,तपशील तपशील मिळवा
 DocType: Lead,Interested,इच्छुक
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,साहित्य बिल
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,उघडणे
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,उघडणे
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},पासून {0} करण्यासाठी {1}
 DocType: Item,Copy From Item Group,आयटम गट पासून कॉपी
 DocType: Journal Entry,Opening Entry,उघडणे प्रवेश
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,उत्पादन चौकशी
 DocType: Standard Reply,Owner,मालक
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,पहिल्या कंपनी प्रविष्ट करा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,पहिल्या कंपनी निवडा कृपया
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,पहिल्या कंपनी निवडा कृपया
 DocType: Employee Education,Under Graduate,पदवीधर अंतर्गत
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,लक्ष्य रोजी
 DocType: BOM,Total Cost,एकूण खर्च
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,पूर्वपद
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumable
 DocType: Upload Attendance,Import Log,आयात लॉग
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,पाठवा
+DocType: Sales Invoice Item,Delivered By Supplier,पुरवठादार करून वितरित
 DocType: SMS Center,All Contact,सर्व संपर्क
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,वार्षिक पगार
 DocType: Period Closing Voucher,Closing Fiscal Year,आर्थिक वर्ष बंद
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,विरुद्ध प्रवेश
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,दर्शवा वेळ नोंदी
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी चलन क्रेडिट
 DocType: Delivery Note,Installation Status,प्रतिष्ठापन स्थिती
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty नाकारलेले स्वीकृत + आयटम साठी प्राप्त प्रमाण समान असणे आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty नाकारलेले स्वीकृत + आयटम साठी प्राप्त प्रमाण समान असणे आवश्यक {0}
 DocType: Item,Supply Raw Materials for Purchase,पुरवठा कच्चा माल खरेदी
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,आयटम {0} खरेदी आयटम असणे आवश्यक आहे
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", साचा डाउनलोड योग्य माहिती भरा आणि नवीन संचिकेशी संलग्न. निवडलेल्या कालावधीच्या सर्व तारखा आणि कर्मचारी संयोजन विद्यमान उपस्थिती रेकॉर्ड, टेम्पलेट येईल"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,{0} आयटम सक्रिय नाही किंवा आयुष्याच्या शेवटी गाठली आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,{0} आयटम सक्रिय नाही किंवा आयुष्याच्या शेवटी गाठली आहे
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,विक्री चलन सबमिट केल्यानंतर अद्यतनित केले जाईल.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,एचआर विभाग सेटिंग्ज
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,सरळ
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,संदेश साठ
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,किंमत आणि सवलत लागू नियम.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},ही वेळ लॉग संघर्ष {0} साठी {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,किंमत सूची खरेदी किंवा विक्री लागू असणे आवश्यक आहे
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},प्रतिष्ठापन तारीख आयटम वितरणाची तारीख आधी असू शकत नाही {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},प्रतिष्ठापन तारीख आयटम वितरणाची तारीख आधी असू शकत नाही {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),दर सूची रेट सूट (%)
-sites/assets/js/form.min.js +279,Start,प्रारंभ
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,प्रारंभ
 DocType: User,First Name,प्रथम नाव
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,आपल्या सेटअप पूर्ण झाले आहे. रीफ्रेश.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,पूर्ण-मूस निर्णायक
 DocType: Offer Letter,Select Terms and Conditions,निवडा अटी आणि नियम
 DocType: Production Planning Tool,Sales Orders,विक्री ऑर्डर
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,विक्री चलन आयटम विरुद्ध
 ,Production Orders in Progress,प्रगती उत्पादन आदेश
 DocType: Lead,Address & Contact,पत्ता व संपर्क
+DocType: Leave Allocation,Add unused leaves from previous allocations,मागील वाटप पासून न वापरलेल्या पाने जोडा
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},पुढील आवर्ती {0} वर तयार केले जाईल {1}
 DocType: Newsletter List,Total Subscribers,एकूण सदस्य
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,संपर्क नाव
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,त्यामुळे प्र
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,वर उल्लेख केलेल्या निकष पगार स्लिप तयार.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,खरेदीसाठी विनंती.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,डबल गृहनिर्माण
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा मंजुरी या रजेचा अर्ज सादर करू शकतो
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा मंजुरी या रजेचा अर्ज सादर करू शकतो
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,तारीख relieving प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,दर वर्षी नाही
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} सेटअप> सेटिंग्ज द्वारे> नामांकन मालिका मालिका नामांकन सेट करा
 DocType: Time Log,Will be updated when batched.,बॅच तेव्हा अद्यतनित केले जाईल.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,रो {0}: तपासा खाते विरुद्ध 'आगाऊ आहे' {1} हा एक आगाऊ नोंद आहे तर.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,रो {0}: तपासा खाते विरुद्ध 'आगाऊ आहे' {1} हा एक आगाऊ नोंद आहे तर.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},{0} कोठार कंपनी संबंधित नाही {1}
 DocType: Bulk Email,Message,संदेश
 DocType: Item Website Specification,Item Website Specification,आयटम वेबसाइट तपशील
 DocType: Dropbox Backup,Dropbox Access Key,ड्रॉपबॉक्स प्रवेश की
 DocType: Payment Tool,Reference No,संदर्भ नाही
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,सोडा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,सोडा अवरोधित
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
 DocType: Stock Entry,Sales Invoice No,विक्री चलन नाही
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,किमान Qty
 DocType: Pricing Rule,Supplier Type,पुरवठादार प्रकार
 DocType: Item,Publish in Hub,हब मध्ये प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,{0} आयटम रद्द
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,साहित्य विनंती
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
 DocType: Item,Purchase Details,खरेदी तपशील
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरेदी करण्यासाठी 'कच्चा माल प्रदान' टेबल आढळले नाही आयटम {0} {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,सूचना नियं
 DocType: Lead,Suggestions,सूचना
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,या प्रदेश सेट आयटम गट निहाय खर्चाचे अंदाजपत्रक. आपण वितरण सेट करून हंगामी समाविष्ट करू शकता.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},कोठार मूळ खाते गट प्रविष्ट करा {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},रक्कम {0} {1} शिल्लक रक्कम पेक्षा जास्त असू शकत नाही {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},रक्कम {0} {1} शिल्लक रक्कम पेक्षा जास्त असू शकत नाही {2}
 DocType: Supplier,Address HTML,पत्ता HTML
 DocType: Lead,Mobile No.,मोबाइल क्रमांक
 DocType: Maintenance Schedule,Generate Schedule,वेळापत्रक व्युत्पन्न
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,नवीन स्टॉक UO
 DocType: Period Closing Voucher,Closing Account Head,खाते प्रमुख बंद
 DocType: Employee,External Work History,बाह्य कार्य इतिहास
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,परिपत्रक संदर्भ त्रुटी
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,आपण खरोखर थांबवू इच्छिता
 DocType: Communication,Closed,बंद
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,आपण डिलिव्हरी टीप जतन एकदा शब्द (निर्यात) मध्ये दृश्यमान होईल.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,आपण थांबवू इच्छिता आपली खात्री आहे की
 DocType: Lead,Industry,उद्योग
 DocType: Employee,Job Profile,कामाचे
 DocType: Newsletter,Newsletter,वृत्तपत्र
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,डिलिव्हरी टीप
 DocType: Dropbox Backup,Allow Dropbox Access,ड्रॉपबॉक्स प्रवेश परवानगी द्या
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,कर सेट अप
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो धावा केल्यानंतर भरणा प्रवेश सुधारणा करण्यात आली आहे. पुन्हा तो खेचणे करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} आयटम कर दोनदा प्रवेश केला
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} आयटम कर दोनदा प्रवेश केला
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,या आठवड्यात आणि प्रलंबित उपक्रम सारांश
 DocType: Workstation,Rent Cost,भाडे खर्च
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,महिना आणि वर्ष निवडा कृपया
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ग्राहक चलन ग्राहकाच्या बेस चलनात रुपांतरीत आहे जे येथे दर
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, डिलिव्हरी टीप, खरेदी चलन, उत्पादन आदेश, पर्चेस, खरेदी पावती, विक्री चलन, विक्री आदेश, शेअर प्रवेश, Timesheet उपलब्ध"
 DocType: Item Tax,Tax Rate,कर दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,आयटम निवडा
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","आयटम: {0} बॅच कुशल, त्याऐवजी वापर स्टॉक प्रवेश \ शेअर मेळ वापर समेट जाऊ शकत नाही व्यवस्थापित"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,चलन {0} आधीच सादर खरेदी
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,चलन {0} आधीच सादर खरेदी
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच कोणत्याही समान असणे आवश्यक आहे {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,नॉन-गट रूपांतरित करा
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,खरेदी पावती सादर करणे आवश्यक आहे
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,वर्तमान श
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,एक आयटम बॅच (भरपूर).
 DocType: C-Form Invoice Detail,Invoice Date,चलन तारीख
 DocType: GL Entry,Debit Amount,डेबिट रक्कम
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},फक्त कंपनी दर 1 खाते असू शकते {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},फक्त कंपनी दर 1 खाते असू शकते {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,आपला ई-मेल पत्ता
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,संलग्नक पहा कृपया
 DocType: Purchase Order,% Received,% प्राप्त
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,सूचना
 DocType: Quality Inspection,Inspected By,करून पाहणी केली
 DocType: Maintenance Visit,Maintenance Type,देखभाल प्रकार
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},सिरियल नाही {0} वितरण टीप संबंधित नाही {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},सिरियल नाही {0} वितरण टीप संबंधित नाही {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,आयटम गुणवत्ता तपासणी मापदंड
 DocType: Leave Application,Leave Approver Name,माफीचा साक्षीदार नाव सोडा
 ,Schedule Date,वेळापत्रक तारीख
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,खरेदी नोंदणी
 DocType: Landed Cost Item,Applicable Charges,लागू असलेले शुल्क
 DocType: Workstation,Consumable Cost,Consumable खर्च
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा मंजुरी' भूमिका असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा मंजुरी' भूमिका असणे आवश्यक आहे
 DocType: Purchase Receipt,Vehicle Date,वाहन तारीख
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,वैद्यकीय
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,तोट्याचा कारण
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% स्थापित
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,पहिल्या कंपनीचे नाव प्रविष्ट करा
 DocType: BOM,Item Desription,आयटम Desription
 DocType: Purchase Invoice,Supplier Name,पुरवठादार नाव
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext मॅन्युअल वाचा
 DocType: Account,Is Group,आहे गट
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,स्वयंचलितपणे FIFO आधारित संख्या सिरिअल सेट
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,चेक पुरवठादार चलन क्रमांक वेगळेपण
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,विक्र
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,सर्व उत्पादन प्रक्रिया ग्लोबल सेटिंग्ज.
 DocType: Accounts Settings,Accounts Frozen Upto,फ्रोजन पर्यंत खाती
 DocType: SMS Log,Sent On,रोजी पाठविले
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवड
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवड
 DocType: Sales Order,Not Applicable,लागू नाही
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,सुट्टी मास्टर.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,शेल काठ
 DocType: Material Request Item,Required Date,आवश्यक तारीख
 DocType: Delivery Note,Billing Address,बिलिंग पत्ता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
 DocType: BOM,Costing,भांडवलाच्या
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","तपासल्यास आधीच प्रिंट रेट / प्रिंट रक्कम समाविष्ट म्हणून, कर रक्कम विचारात घेतली जाईल"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,एकूण Qty
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),(मि) प
 DocType: Customer,Buyer of Goods and Services.,वस्तू आणि सेवा खरेदीदार.
 DocType: Journal Entry,Accounts Payable,देय खाती
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,सदस्य जोडा
-sites/assets/js/erpnext.min.js +5,""" does not exists","अस्तित्वात नाही
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","अस्तित्वात नाही
 DocType: Pricing Rule,Valid Upto,वैध पर्यंत
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,आपल्या ग्राहकांना काही करा. ते संघटना किंवा व्यक्तींना असू शकते.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,थेट उत्पन्न
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","खाते प्रमाणे गटात समाविष्ट केले, तर खाते आधारित फिल्टर करू शकत नाही"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,प्रशासकीय अधिकारी
 DocType: Payment Tool,Received Or Paid,मिळालेली किंवा दिलेली
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,कंपनी निवडा कृपया
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,कंपनी निवडा कृपया
 DocType: Stock Entry,Difference Account,फरक खाते
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,त्याच्या भोवतालची कार्य {0} बंद नाही म्हणून बंद कार्य करू शकत नाही.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,साहित्य विनंती उठविला जाईल जे भांडार प्रविष्ट करा
 DocType: Production Order,Additional Operating Cost,अतिरिक्त कार्यकारी खर्च
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
 DocType: DocField,Type,प्रकार
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
 DocType: Communication,Subject,विषय
 DocType: Shipping Rule,Net Weight,नेट वजन
 DocType: Employee,Emergency Phone,आणीबाणी फोन
 ,Serial No Warranty Expiry,सिरियल कोणतीही हमी कालावधी समाप्ती
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,आपण खरोखर हे साहित्य विनंती थांबवू इच्छिता का?
 DocType: Sales Order,To Deliver,वितरीत करण्यासाठी
 DocType: Purchase Invoice Item,Item,आयटम
 DocType: Journal Entry,Difference (Dr - Cr),फरक (डॉ - कोटी)
 DocType: Account,Profit and Loss,नफा व तोटा
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,व्यवस्थापकीय Subcontracting
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,व्यवस्थापकीय Subcontracting
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,नवी UOM प्रकार होल क्रमांक असणे आवश्यक नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,फर्निचर आणि वस्तू
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,दर प्राईस यादी चलन येथे कंपनीच्या बेस चलनात रुपांतरीत आहे
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ संपादित 
 DocType: Purchase Invoice,Supplier Invoice No,पुरवठादार चलन नाही
 DocType: Territory,For reference,संदर्भासाठी
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","हटवू शकत नाही सिरियल नाही {0}, तो स्टॉक व्यवहार वापरले जाते म्हणून"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),बंद (कोटी)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),बंद (कोटी)
 DocType: Serial No,Warranty Period (Days),वॉरंटी कालावधी (दिवस)
 DocType: Installation Note Item,Installation Note Item,प्रतिष्ठापन टीप आयटम
 ,Pending Qty,प्रलंबित Qty
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,बिलिंग आणि 
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,पुन्हा करा ग्राहक
 DocType: Leave Control Panel,Allocate,वाटप
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,मागील
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,विक्री परत
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,विक्री परत
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,आपण उत्पादन ऑर्डर तयार करू इच्छित असलेल्या पासून विक्री ऑर्डर निवडा.
+DocType: Item,Delivered by Supplier (Drop Ship),पुरवठादार द्वारे वितरित (ड्रॉप जहाज)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,पगार घटक.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,संभाव्य ग्राहकांच्या डेटाबेस.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,ग्राहक डेटाबेस.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,बिल रक्कम
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,स्टॉक नोंदी केले जातात जे विरोधात लॉजिकल वखार.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},संदर्भ नाही आणि संदर्भ तारीख आवश्यक आहे {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},संदर्भ नाही आणि संदर्भ तारीख आवश्यक आहे {0}
 DocType: Event,Wednesday,बुधवारी
 DocType: Sales Invoice,Customer's Vendor,ग्राहक च्या विक्रेता
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,उत्पादन ऑर्डर अनिवार्य आहे
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,स्वीकारणारा मापदंड
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'आधारीत' आणि 'गट करून' समान असू शकत नाही
 DocType: Sales Person,Sales Person Targets,विक्री व्यक्ती लक्ष्य
-sites/assets/js/form.min.js +271,To,करण्यासाठी
-apps/frappe/frappe/templates/base.html +143,Please enter email address,ई-मेल पत्ता प्रविष्ट करा
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,करण्यासाठी
+apps/frappe/frappe/templates/base.html +145,Please enter email address,ई-मेल पत्ता प्रविष्ट करा
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,लागत समाप्त ट्यूब
 DocType: Production Order Operation,In minutes,मिनिटे
 DocType: Issue,Resolution Date,ठराव तारीख
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,प्रकल्प विकिपीड
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,नाश
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} चलन तपशील तक्ता आढळले नाही
 DocType: Company,Round Off Cost Center,खर्च केंद्र बंद फेरीत
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,देखभाल भेट द्या {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,देखभाल भेट द्या {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 DocType: Material Request,Material Transfer,साहित्य ट्रान्सफर
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),उघडणे (डॉ)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},पोस्टिंग शिक्का नंतर असणे आवश्यक आहे {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,सेटिंग्ज
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,उतरले खर्च कर आणि शुल्क
 DocType: Production Order Operation,Actual Start Time,वास्तविक प्रारंभ वेळ
 DocType: BOM Operation,Operation Time,ऑपरेशन वेळ
-sites/assets/js/list.min.js +5,More,आणखी
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,आणखी
 DocType: Pricing Rule,Sales Manager,विक्री व्यवस्थापक
-sites/assets/js/desk.min.js +7673,Rename,पुनर्नामित करा
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,पुनर्नामित करा
 DocType: Journal Entry,Write Off Amount,रक्कम बंद लिहा
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bending
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,सदस्य परवानगी द्या
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,नीट shearing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,सिरिअल नग आधारित विक्री आणि खरेदी दस्तऐवज आयटम ट्रॅक करण्यासाठी. हे देखील उत्पादन हमी तपशील ट्रॅक वापरले करू शकता.
 DocType: Purchase Receipt Item Supplied,Current Stock,वर्तमान शेअर
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,नाकारल्याचे कोठार regected आयटम विरुद्ध अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,नाकारल्याचे कोठार regected आयटम विरुद्ध अनिवार्य आहे
 DocType: Account,Expenses Included In Valuation,खर्च मूल्यांकन मध्ये समाविष्ट
 DocType: Employee,Provide email id registered in company,कंपनी मध्ये नोंदणीकृत ई-मेल आयडी द्या
 DocType: Hub Settings,Seller City,विक्रेता सिटी
 DocType: Email Digest,Next email will be sent on:,पुढील ई-मेल वर पाठविण्यात येईल:
 DocType: Offer Letter Term,Offer Letter Term,पत्र मुदत ऑफर
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,आयटम रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,आयटम रूपे आहेत.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आयटम {0} आढळले नाही
 DocType: Bin,Stock Value,शेअर मूल्य
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,वृक्ष प्रकार
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,आपले स्वागत आहे
 DocType: Journal Entry,Credit Card Entry,क्रेडिट कार्ड प्रवेश
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,कार्य विषय
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,वस्तू पुरवठादार प्राप्त झाली.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,वस्तू पुरवठादार प्राप्त झाली.
 DocType: Communication,Open,ओपन
 DocType: Lead,Campaign Name,मोहीम नाव
 ,Reserved,राखीव
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,आपण खरोखर बूच करू इच्छिता
 DocType: Purchase Order,Supply Raw Materials,पुरवठा कच्चा माल
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"पुढील चलन निर्माण केले जातील, ज्या तारखेला. हे सबमिट निर्माण होते."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,वर्तमान मालमत्ता
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,ग्राहक च्या पर्चेस नाही
 DocType: Employee,Cell Number,सेल क्रमांक
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,गमावले
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या 'जर्नल प्रवेश विरुद्ध' सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या 'जर्नल प्रवेश विरुद्ध' सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,पासून संधी
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,मासिक पगार विधान.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,दायित्व
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,मंजूर रक्कम रो मागणी रक्कम पेक्षा जास्त असू शकत नाही {0}.
 DocType: Company,Default Cost of Goods Sold Account,वस्तू विकल्या खाते डीफॉल्ट खर्च
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,किंमत सूची निवडलेले नाही
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,किंमत सूची निवडलेले नाही
 DocType: Employee,Family Background,कौटुंबिक पार्श्वभूमी
 DocType: Process Payroll,Send Email,ईमेल पाठवा
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,कोणतीही परवानगी नाही
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,क्र
 DocType: Item,Items with higher weightage will be shown higher,उच्च महत्त्व असलेला आयटम उच्च दर्शविले जाईल
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बँक मेळ तपशील
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,माझे चलने
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,नाही कर्मचारी आढळले
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,नाही कर्मचारी आढळले
 DocType: Purchase Order,Stopped,थांबवले
 DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted तर
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,सुरू करण्यासाठी BOM निवडा
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,सी 
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,आता पाठवा
 ,Support Analytics,समर्थन Analytics
 DocType: Item,Website Warehouse,वेबसाइट कोठार
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,आपण खरोखर उत्पादन करण्यासाठी थांबवू इच्छिता नका:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो अशी यादी तयार करणे 05, 28 इत्यादी उदा निर्माण होणार महिन्याचा दिवस"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,धावसंख्या 5 या पेक्षा कमी किंवा या समान असणे आवश्यक आहे
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,सी-फॉर्म रेकॉर्ड
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,ग
 DocType: Features Setup,"To enable ""Point of Sale"" features","विक्री पॉइंट" वैशिष्ट्ये सक्षम करण्यासाठी
 DocType: Bin,Moving Average Rate,सरासरी दर हलवित
 DocType: Production Planning Tool,Select Items,निवडा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
 DocType: Comment,Reference Name,संदर्भ नाव
 DocType: Maintenance Visit,Completion Status,पूर्ण स्थिती
 DocType: Sales Invoice Item,Target Warehouse,लक्ष्य कोठार
 DocType: Item,Allow over delivery or receipt upto this percent,या टक्के पर्यंत चेंडू किंवा पावती प्रती परवानगी द्या
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,अपेक्षित वितरण तारीख विक्री ऑर्डर तारीख आधी असू शकत नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,अपेक्षित वितरण तारीख विक्री ऑर्डर तारीख आधी असू शकत नाही
 DocType: Upload Attendance,Import Attendance,आयात हजेरी
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,सर्व आयटम गट
 DocType: Process Payroll,Activity Log,क्रियाकलाप लॉग
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,स्वयंचलितपणे व्यवहार सादर संदेश तयार करा.
 DocType: Production Order,Item To Manufacture,आयटम निर्मिती करणे
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,स्थायी मूस निर्णायक
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,भरणा करण्यासाठी खरेदी
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिती {2} आहे
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,भरणा करण्यासाठी खरेदी
 DocType: Sales Order Item,Projected Qty,अंदाज Qty
 DocType: Sales Invoice,Payment Due Date,पैसे भरण्याची शेवटची तारिख
 DocType: Newsletter,Newsletter Manager,वृत्तपत्र व्यवस्थापक
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,विनंती संख्या
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,कामाचे मूल्यमापन.
 DocType: Sales Invoice Item,Stock Details,शेअर तपशील
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,प्रकल्प मूल्य
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,पॉइंट-ऑफ-विक्री
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},कॅरी फॉरवर्ड करू शकत नाही {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,पॉइंट-ऑफ-विक्री
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},कॅरी फॉरवर्ड करू शकत नाही {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","आधीच क्रेडिट खाते शिल्लक, आपण 'डेबिट' म्हणून 'शिल्लक असणे आवश्यक आहे' सेट करण्याची परवानगी नाही"
 DocType: Account,Balance must be,शिल्लक असणे आवश्यक आहे
 DocType: Hub Settings,Publish Pricing,किंमत प्रकाशित
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,खरेदी पावती
 ,Received Items To Be Billed,प्राप्त आयटम बिल करायचे
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,कठोर झपाटा
-sites/assets/js/desk.min.js +3938,Ms,श्रीमती
+DocType: Employee,Ms,श्रीमती
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,चलन विनिमय दर मास्टर.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन पुढील {0} दिवसांत वेळ शोधू शकला नाही {1}
 DocType: Production Order,Plan material for sub-assemblies,उप-विधानसभा योजना साहित्य
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,श्रेणी
 DocType: Supplier,Default Payable Accounts,मुलभूत देय खाती
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} कर्मचारी सक्रिय नाही आहे किंवा अस्तित्वात नाही
 DocType: Features Setup,Item Barcode,आयटम बारकोड
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चलन आगाऊ खरेदी
 DocType: Address,Shop,दुकान
 DocType: Hub Settings,Sync Now,समक्रमण आता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश दुवा साधला जाऊ शकत नाही {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश दुवा साधला जाऊ शकत नाही {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,या मोडमध्ये निवडलेले असताना मुलभूत बँक / रोख खाते आपोआप पीओएस चलन अद्यतनित केले जाईल.
 DocType: Employee,Permanent Address Is,स्थायी पत्ता आहे
 DocType: Production Order Operation,Operation completed for how many finished goods?,ऑपरेशन किती तयार वस्तू पूर्ण?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ब्रँड
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,{0} आयटम साठी पार over- भत्ता {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} आयटम साठी पार over- भत्ता {1}.
 DocType: Employee,Exit Interview Details,बाहेर पडा मुलाखत तपशील
 DocType: Item,Is Purchase Item,खरेदी आयटम आहे
 DocType: Journal Entry Account,Purchase Invoice,खरेदी चलन
 DocType: Stock Ledger Entry,Voucher Detail No,प्रमाणक तपशील नाही
 DocType: Stock Entry,Total Outgoing Value,एकूण जाणारे मूल्य
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,तारीख आणि अखेरची दिनांक उघडत त्याच आर्थिक वर्ष आत असावे
 DocType: Lead,Request for Information,माहिती विनंती
 DocType: Payment Tool,Paid,पेड
 DocType: Salary Slip,Total in words,शब्दात एकूण
 DocType: Material Request Item,Lead Time Date,आघाडी वेळ दिनांक
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,बंधनकारक आहे. कदाचित चलन विनिमय रेकॉर्ड तयार नाही
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},रो # {0}: आयटम नाही सिरियल निर्दिष्ट करा {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'उत्पादन बंडल' आयटम, कोठार, सिरीयल नाही आणि बॅच साठी नाही 'पॅकिंग सूची' टेबल पासून विचार केला जाईल. कोठार आणि बॅच नाही कोणताही उत्पादन बंडल 'आयटम सर्व पॅकिंग आयटम सारखीच असतात असेल, तर त्या मूल्ये मुख्य आयटम टेबल प्रविष्ट केले जाऊ शकतात, मूल्ये टेबल' यादी पॅकिंग 'कॉपी होईल."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,ग्राहकांना निर्यात.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ग्राहकांना निर्यात.
 DocType: Purchase Invoice Item,Purchase Order Item,ऑर्डर आयटम खरेदी
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,अप्रत्यक्ष उत्पन्न
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,सेट भरणा रक्कम = शिल्लक रक्कम
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,पत्ता ओळ 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,फरक
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,कंपनी नाव
 DocType: SMS Center,Total Message(s),एकूण संदेश (चे)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,मदत व्हिडिओ यादी पहा
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,चेक जमा होते जेथे बँक खाते निवडा प्रमुख.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,वापरकर्ता व्यवहार दर सूची दर संपादित करण्याची परवानगी द्या
 DocType: Pricing Rule,Max Qty,कमाल Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,रो {0}: विक्री / खरेदी आदेशा भरणा नेहमी आगाऊ म्हणून चिन्हांकित पाहिजे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,रो {0}: विक्री / खरेदी आदेशा भरणा नेहमी आगाऊ म्हणून चिन्हांकित पाहिजे
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,रासायनिक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
 DocType: Process Payroll,Select Payroll Year and Month,वेतनपट वर्ष आणि महिना निवडा
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",योग्य गट (सहसा निधी अर्ज> वर्तमान मालमत्ता> बँक खाते जा टाइप करा) बाल जोडा वर क्लिक करून (नवीन खाते तयार "बँक"
 DocType: Workstation,Electricity Cost,वीज खर्च
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,व
 DocType: SMS Center,All Lead (Open),सर्व लीड (उघडा)
 DocType: Purchase Invoice,Get Advances Paid,अग्रिम पेड करा
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,आपले चित्र संलग्न
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,करा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,करा
 DocType: Journal Entry,Total Amount in Words,शब्द एकूण रक्कम
 DocType: Workflow State,Stop,थांबवा
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,एक त्रुटी आली. एक संभाव्य कारण तुम्हाला फॉर्म जतन केले नाहीत हे असू शकते. समस्या कायम राहिल्यास support@erpnext.com संपर्क साधा.
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,पॅकिंग स्लिप
 DocType: POS Profile,Cash/Bank Account,रोख / बँक खाते
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्य नाही बदल काढली आयटम.
 DocType: Delivery Note,Delivery To,वितरण
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Planning Tool,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} नकारात्मक असू शकत नाही
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,दाखल
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',वेळ ल
 DocType: Project,Internal,अंतर्गत
 DocType: Task,Urgent,त्वरित
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},टेबल मध्ये सलग {0} एक वैध रो ID निर्दिष्ट करा {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,डेस्कटॉप वर जा आणि ERPNext वापर सुरू
 DocType: Item,Manufacturer,निर्माता
 DocType: Landed Cost Item,Purchase Receipt Item,खरेदी पावती आयटम
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,विक्री ऑर्डर / तयार वस्तू भांडार मध्ये राखीव कोठार
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,विक्री रक्कम
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,वेळ नोंदी
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,आपण या रेकॉर्डसाठी खर्चाचे माफीचा साक्षीदार आहेत. 'स्थिती' आणि जतन करा अद्यतनित करा
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,आपण या रेकॉर्डसाठी खर्चाचे माफीचा साक्षीदार आहेत. 'स्थिती' आणि जतन करा अद्यतनित करा
 DocType: Serial No,Creation Document No,निर्मिती दस्तऐवज नाही
 DocType: Issue,Issue,अंक
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","आयटम रूपे साठी विशेषता. उदा आकार, रंग इ"
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,विरुद्ध
 DocType: Item,Default Selling Cost Center,मुलभूत विक्री खर्च केंद्र
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},विक्री ऑर्डर {0} आहे ​​{1}
 DocType: Opportunity,Contact Info,संपर्क माहिती
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,शेअर नोंदी करून देणे
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,शेअर नोंदी करून देणे
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
 DocType: Item,Default Supplier,मुलभूत पुरवठादार
 DocType: Manufacturing Settings,Over Production Allowance Percentage,उत्पादन भत्ता टक्केवारी चेंडू
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,साप्ताहिक बंद तारखा मिळवा
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,समाप्ती तारीख प्रारंभ तारखेच्या पेक्षा कमी असू शकत नाही
 DocType: Sales Person,Select company name first.,प्रथम निवडा कंपनीचे नाव.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,डॉ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,डॉ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,अवतरणे पुरवठादार प्राप्त झाली.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},करण्यासाठी {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,वेळ नोंदी द्वारे अद्ययावत
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,आपल्या संदर्भासाठी कंपनी नोंदणी क्रमांक. कर संख्या इ
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,हे खरेदी सूचीत टाका शिपिंग नियम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 ,Ordered Items To Be Billed,आदेश दिले आयटम बिल करायचे
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,श्रेणी कमी असणे आवश्यक आहे पेक्षा श्रेणी
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,वेळ नोंदी निवडा आणि एक नवीन विक्री चलन तयार करण्यासाठी सबमिट करा.
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,कर 
 DocType: Lead,Lead,लीड
 DocType: Email Digest,Payables,देय
 DocType: Account,Warehouse,कोठार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: Qty खरेदी परत प्रविष्ट करणे शक्य नाही नाकारली
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: Qty खरेदी परत प्रविष्ट करणे शक्य नाही नाकारली
 ,Purchase Order Items To Be Billed,पर्चेस आयटम बिल करायचे
 DocType: Purchase Invoice Item,Net Rate,नेट दर
 DocType: Purchase Invoice Item,Purchase Invoice Item,चलन आयटम खरेदी
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled दे
 DocType: Global Defaults,Current Fiscal Year,चालू आर्थिक वर्षात वर्ष
 DocType: Global Defaults,Disable Rounded Total,गोळाबेरीज एकूण अक्षम करा
 DocType: Lead,Call,कॉल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'नोंदी' रिकामे असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'नोंदी' रिकामे असू शकत नाही
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},सह डुप्लिकेट सलग {0} त्याच {1}
 ,Trial Balance,चाचणी शिल्लक
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,कर्मचारी सेट अप
-sites/assets/js/erpnext.min.js +5,"Grid """,ग्रिड "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,कर्मचारी सेट अप
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,ग्रिड "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,पहिल्या उपसर्ग निवडा कृपया
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,संशोधन
 DocType: Maintenance Visit Purpose,Work Done,कार्य पूर्ण झाले
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,पाठविले
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,पहा लेजर
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,लवकरात लवकर
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","एक आयटम गट त्याच नावाने अस्तित्वात नाही, आयटम नाव बदलू किंवा आयटम गटाचे नाव कृपया"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","एक आयटम गट त्याच नावाने अस्तित्वात नाही, आयटम नाव बदलू किंवा आयटम गटाचे नाव कृपया"
 DocType: Communication,Delivery Status,वितरण स्थिती
 DocType: Production Order,Manufacture against Sales Order,विक्री ऑर्डर विरुद्ध उत्पादन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,उर्वरित जग
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,उर्वरित जग
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आयटम {0} बॅच असू शकत नाही
 ,Budget Variance Report,अर्थसंकल्प फरक अहवाल
 DocType: Salary Slip,Gross Pay,एकूण वेतन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,लाभांश पेड
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,लेखा लेजर
 DocType: Stock Reconciliation,Difference Amount,फरक रक्कम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,कायम ठेवण्यात कमाई
 DocType: BOM Item,Item Description,आयटम वर्णन
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,संधी आयटम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,तात्पुरती उघडणे
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,कर्मचारी रजा शिल्लक
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},खाते साठी शिल्लक {0} नेहमी असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},खाते साठी शिल्लक {0} नेहमी असणे आवश्यक आहे {1}
 DocType: Address,Address Type,पत्ता प्रकार
 DocType: Purchase Receipt,Rejected Warehouse,नाकारल्याचे कोठार
 DocType: GL Entry,Against Voucher,व्हाउचर विरुद्ध
 DocType: Item,Default Buying Cost Center,मुलभूत खरेदी खर्च केंद्र
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext बाहेर सर्वोत्तम प्राप्त करण्यासाठी, आम्ही तुम्हाला काही वेळ घ्या आणि हे मदत व्हिडिओ पाहू असे शिफारसीय आहे."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,आयटम {0} विक्री आयटम असणे आवश्यक आहे
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,ते
 DocType: Item,Lead Time in days,दिवस आघाडी वेळ
 ,Accounts Payable Summary,खाती देय सारांश
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},गोठविलेल्या खाते संपादित करण्यासाठी आपण अधिकृत नाही {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},गोठविलेल्या खाते संपादित करण्यासाठी आपण अधिकृत नाही {0}
 DocType: Journal Entry,Get Outstanding Invoices,थकबाकी पावत्या मिळवा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,समस्या ठिकाण
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,करार
 DocType: Report,Disabled,अपंग
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM आवश्यक UOM coversion घटक: {0} आयटम मध्ये: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM आवश्यक UOM coversion घटक: {0} आयटम मध्ये: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,अप्रत्यक्ष खर्च
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,रो {0}: Qty अनिवार्य आहे
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,कृषी
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,मोड ऑफ पेमेंट्
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,हा रूट आयटम गट आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: Journal Entry Account,Purchase Order,खरेदी ऑर्डर
 DocType: Warehouse,Warehouse Contact Info,वखार संपर्क माहिती
-sites/assets/js/form.min.js +190,Name is required,नाव आवश्यक आहे
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,नाव आवश्यक आहे
 DocType: Purchase Invoice,Recurring Type,आवर्ती प्रकार
 DocType: Address,City/Town,शहर / नगर
 DocType: Email Digest,Annual Income,वार्षिक उत्पन्न
 DocType: Serial No,Serial No Details,सिरियल तपशील
 DocType: Purchase Invoice Item,Item Tax Rate,आयटम कराचा दर
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,आयटम {0} सब-करारबद्ध आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,कॅपिटल उपकरणे
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,वर्णन संपादित करा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,अपेक्षित वितरण तारीख नियोजनबद्ध प्रारंभ तारीख पेक्षा कमी आहे.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,पुरवठादार साठी
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,पुरवठादार साठी
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,खाते प्रकार सेट व्यवहार हे खाते निवडून मदत करते.
 DocType: Purchase Invoice,Grand Total (Company Currency),एकूण (कंपनी चलन)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,एकूण जाणारे
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",फक्त "मूल्य" 0 किंवा रिक्त मूल्य एक शिपिंग नियम अट असू शकते
 DocType: Authorization Rule,Transaction,व्यवहार
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,टीप: हा खर्च केंद्र एक गट आहे. गट विरुद्ध लेखा नोंदी करू शकत नाही.
-apps/erpnext/erpnext/config/projects.py +43,Tools,साधने
+apps/frappe/frappe/config/desk.py +7,Tools,साधने
 DocType: Item,Website Item Groups,वेबसाइट आयटम गट
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,उत्पादन ऑर्डर क्रमांक स्टॉक नोंदणी उद्देश उत्पादन अनिवार्य आहे
 DocType: Purchase Invoice,Total (Company Currency),एकूण (कंपनी चलन)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,वर्कस्टेशन नाव
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ई-मेल सारांश:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
-sites/assets/js/desk.min.js +7652,Comments,टिप्पण्या
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,टिप्पण्या
 DocType: Salary Slip,Bank Account No.,बँक खाते क्रमांक
 DocType: Naming Series,This is the number of the last created transaction with this prefix,या हा प्रत्यय गेल्या निर्माण व्यवहार संख्या आहे
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},आयटम आवश्यक मूल्यांकन दर {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,कंपन
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,रजा
 DocType: Purchase Invoice,Supplier Invoice Date,पुरवठादार चलन तारीख
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,आपण हे खरेदी सूचीत टाका सक्षम करणे आवश्यक
-sites/assets/js/form.min.js +212,No Data,नाही डेटा
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,नाही डेटा
 DocType: Appraisal Template Goal,Appraisal Template Goal,मूल्यांकन साचा लक्ष्य
 DocType: Salary Slip,Earning,कमाई
 DocType: Payment Tool,Party Account Currency,पार्टी खाते चलन
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,पार्टी खाते च
 DocType: Purchase Taxes and Charges,Add or Deduct,जोडा किंवा वजा
 DocType: Company,If Yearly Budget Exceeded (for expense account),वार्षिक अर्थसंकल्प (खर्च खात्यासाठी) ओलांडली तर
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,दरम्यान आढळले आच्छादित अटी:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल विरुद्ध प्रवेश {0} आधीच काही इतर व्हाउचर विरुद्ध सुस्थीत केले जाते
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल विरुद्ध प्रवेश {0} आधीच काही इतर व्हाउचर विरुद्ध सुस्थीत केले जाते
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,एकूण ऑर्डर मूल्य
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,अन्न
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing श्रेणी 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,भेटी नाही
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","संपर्क वृत्तपत्रे, ठरतो."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},खाते बंद चलन असणे आवश्यक आहे {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सर्व गोल गुण सम हे आहे 100 असावे {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,संचालन रिक्त सोडले जाऊ शकत नाही.
 ,Delivered Items To Be Billed,वितरित केले आयटम बिल करायचे
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,कोठार सिरियल क्रमांक साठी बदलले जाऊ शकत नाही
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},स्थिती वर अद्यतनित केले {0}
 DocType: DocField,Description,वर्णन
 DocType: Authorization Rule,Average Discount,सरासरी सवलत
 DocType: Letter Head,Is Default,मुलभूत आहे
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,आयटम कर रक्क
 DocType: Item,Maintain Stock,शेअर ठेवा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,आधीच उत्पादन ऑर्डर तयार स्टॉक नोंदी
 DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदे विचार तर रिक्त सोडा
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार वास्तविक 'सलग प्रभारी {0} आयटम रेट समाविष्ट केले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार वास्तविक 'सलग प्रभारी {0} आयटम रेट समाविष्ट केले जाऊ शकत नाही
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},कमाल: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,DATETIME पासून
 DocType: Email Digest,For Company,कंपनी साठी
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,शिपिंग पत्ता
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,लेखा चार्ट
 DocType: Material Request,Terms and Conditions Content,अटी आणि शर्ती सामग्री
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,मालकीचे
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,पे न करता सोडू अवलंबून
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,हमी / जेथे एएम
 DocType: GL Entry,GL Entry,जी.एल. प्रवेश
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्ज
 ,Batch-Wise Balance History,बॅच-शहाणे शिल्लक इतिहास
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,सूची करावे
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,सूची करावे
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,शिकाऊ उमेदवार
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,नकारात्मक प्रमाण परवानगी नाही
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,कार्यालय भाडे
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,सेटअप एसएमएस गेटवे सेटिंग
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात अयशस्वी!
-sites/assets/js/erpnext.min.js +24,No address added yet.,नाही पत्ता अद्याप जोडले.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,नाही पत्ता अद्याप जोडले.
 DocType: Workstation Working Hour,Workstation Working Hour,वर्कस्टेशन कार्यरत तास
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा संयुक्त रक्कम बरोबरी करणे आवश्यक आहे {2}
 DocType: Item,Inventory,सूची
 DocType: Features Setup,"To enable ""Point of Sale"" view",दृश्य "विक्री पॉइंट" सक्षम करण्यासाठी
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,भरणा रिक्त कार्ट केले जाऊ शकत नाही
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,भरणा रिक्त कार्ट केले जाऊ शकत नाही
 DocType: Item,Sales Details,विक्री तपशील
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,पिन
 DocType: Opportunity,With Items,आयटम
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","पुढील चलन निर्माण केले जातील, ज्या तारखेला. हे सबमिट निर्माण होते."
 DocType: Item Attribute,Item Attribute,आयटम विशेषता
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,सरकार
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,आयटम रूपे
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,आयटम रूपे
 DocType: Company,Services,सेवा
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),एकूण ({0})
 DocType: Cost Center,Parent Cost Center,पालक खर्च केंद्र
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,आर्थिक वर्ष प्रारंभ तारीख
 DocType: Employee External Work History,Total Experience,एकूण अनुभव
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,वाहतुक आणि अग्रेषित शुल्क
 DocType: Material Request Item,Sales Order No,विक्री ऑर्डर नाही
 DocType: Item Group,Item Group Name,आयटम गट नाव
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,घेतले
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,घेतले
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,उत्पादन हस्तांतरण सामुग्री
 DocType: Pricing Rule,For Price List,किंमत सूची
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,कार्यकारी शोध
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,वेळापत्रक
 DocType: Purchase Invoice Item,Net Amount,निव्वळ रक्कम
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM तपशील नाही
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),अतिरिक्त सवलत रक्कम (कंपनी चलन)
-DocType: Period Closing Voucher,CoA Help,CoA मदत
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},त्रुटी: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},त्रुटी: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,लेखा चार्ट नवीन खाते तयार करा.
 DocType: Maintenance Visit,Maintenance Visit,देखभाल भेट द्या
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ग्राहक> ग्राहक गट> प्रदेश
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,उतरले खर्च म
 DocType: Event,Tuesday,मंगळवारी
 DocType: Leave Block List,Block Holidays on important days.,महत्वाचे दिवस अवरोधित करा सुट्ट्या.
 ,Accounts Receivable Summary,खाते प्राप्तीयोग्य सारांश
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},आधीच कालावधीसाठी कर्मचारी {1} तरतूद प्रकार {0} साठी पाने {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका सेट करण्यासाठी एक कर्मचारी रेकॉर्ड वापरकर्ता आयडी फील्ड सेट करा
 DocType: UOM,UOM Name,UOM नाव
 DocType: Top Bar Item,Target,लक्ष्य
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,विक्री भागीद
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} एकट्या फक्त प्रवेश चलनात केले जाऊ शकते: {1}
 DocType: Pricing Rule,Pricing Rule,किंमत नियम
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,तिसऱ्या क्रमांकावर
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},रो # {0}: परत आयटम {1} नाही विद्यमान नाही {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,बँक खाते
 ,Bank Reconciliation Statement,बँक मेळ विवरणपत्र
 DocType: Address,Lead Name,लीड नाव
 ,POS,पीओएस
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,उघडत स्टॉक शिल्लक
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,उघडत स्टॉक शिल्लक
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} केवळ एकदा करणे आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},अधिक tranfer परवानगी नाही {0} पेक्षा {1} पर्चेस विरुद्ध {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},यशस्वीरित्या वाटप पाने {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},यशस्वीरित्या वाटप पाने {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,आयटम नाहीत पॅक करण्यासाठी
 DocType: Shipping Rule Condition,From Value,मूल्य
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,बँक प्रतिबिंबित नाही प्रमाणात
 DocType: Quality Inspection Reading,Reading 4,4 वाचन
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,कंपनी खर्च दावे.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,संपर्क मोबाइल न
 DocType: Production Planning Tool,Select Sales Orders,विक्री ऑर्डर निवडा
 ,Material Requests for which Supplier Quotations are not created,पुरवठादार अवतरणे तयार नाहीत जे साहित्य विनंत्या
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,बारकोड वापरुन आयटम ट्रॅक करण्यासाठी. आपण आयटम बारकोड स्कॅनिंग करून वितरण टीप आणि विक्री चलन आयटम दाखल करण्यास सक्षम असेल.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,मार्क वितरित म्हणून
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,कोटेशन करा
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},माप मुलभूत युनिट रुपांतर घटक सलग 1 असणे आवश्यक आहे {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},प्रकारच्या रजा {0} जास्त असू शकत नाही {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},माप मुलभूत युनिट रुपांतर घटक सलग 1 असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},प्रकारच्या रजा {0} जास्त असू शकत नाही {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,आगाऊ एक्स दिवस ऑपरेशन नियोजन प्रयत्न करा.
 DocType: HR Settings,Stop Birthday Reminders,थांबवा वाढदिवस स्मरणपत्रे
 DocType: SMS Center,Receiver List,स्वीकारणारा यादी
 DocType: Payment Tool Detail,Payment Amount,भरणा रक्कम
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,नाश रक्कम
-sites/assets/js/erpnext.min.js +51,{0} View,{0} पहा
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} पहा
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कपात
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,पसंतीचा लेसर sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबल एकदा पेक्षा अधिक प्रविष्ट केले गेले आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबल एकदा पेक्षा अधिक प्रविष्ट केले गेले आहे
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,आयात यशस्वी!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी आयटम खर्च
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},प्रमाण जास्त असू शकत नाही {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,मुलभूत देय खात
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","जसे शिपिंग नियम, किंमत सूची इत्यादी ऑनलाइन शॉपिंग कार्ट सेटिंग्ज"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,सेटअप पूर्ण
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% बिल
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,राखीव Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,राखीव Qty
 DocType: Party Account,Party Account,पार्टी खाते
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,मानव संसाधन
 DocType: Lead,Upper Income,उच्च उत्पन्न
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,हे खरेदी सूचीत टाका सक्षम
 DocType: Employee,Permanent Address,स्थायी पत्ता
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,आयटम {0} एक सेवा आयटम असणे आवश्यक आहे.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",एकूण पेक्षा \ {0} {1} जास्त असू शकत नाही विरुद्ध दिले आगाऊ {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,आयटम कोड निवडा
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),पे न करता सोडू साठी कपात कमी (LWP)
 DocType: Territory,Territory Manager,प्रदेश व्यवस्थापक
+DocType: Delivery Note Item,To Warehouse (Optional),गुदाम (पर्यायी)
 DocType: Sales Invoice,Paid Amount (Company Currency),पेड रक्कम (कंपनी चलन)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त सवलत
 DocType: Selling Settings,Selling Settings,सेटिंग्ज विक्री
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,वजन
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,खनन
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,राळ निर्णायक
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट तत्सम नावाने विद्यमान ग्राहक नाव बदलू किंवा ग्राहक गट नाव बदला करा
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,{0} पहिल्या निवडा.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,{0} पहिल्या निवडा.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},मजकूर {0}
 DocType: Territory,Parent Territory,पालक प्रदेश
 DocType: Quality Inspection Reading,Reading 2,2 वाचन
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,बॅच नाही
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक च्या पर्चेस बहुन विक्री आदेश परवानगी द्या
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,मुख्य
 DocType: DocPerm,Delete,हटवा
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,जिच्यामध्ये variant
-sites/assets/js/desk.min.js +7971,New {0},नवी {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,जिच्यामध्ये variant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},नवी {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,थांबवले आदेश रद्द केले जाऊ शकत नाही. रद्द करण्यासाठी बूच.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,थांबवले आदेश रद्द केले जाऊ शकत नाही. रद्द करण्यासाठी बूच.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
 DocType: Employee,Leave Encashed?,पैसे मिळविता सोडा?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,शेत पासून संधी अनिवार्य आहे
 DocType: Item,Variants,रूपे
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,देश
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,पत्ते
 DocType: Communication,Received,प्राप्त
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},सिरियल नाही आयटम प्रविष्ट डुप्लिकेट {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक शिपिंग नियम एक अट
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,आयटम उत्पादन ऑर्डर आहेत करण्याची परवानगी नाही.
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,हा सलाम लिहीत आहे
 DocType: Communication,Rejected,नाकारल्याचे
 DocType: Pricing Rule,Brand,ब्रँड
 DocType: Item,Will also apply for variants,तसेच रूपे लागू राहील
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% वितरण
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,विक्रीच्या वेळी बंडल आयटम.
 DocType: Sales Order Item,Actual Qty,वास्तविक Qty
 DocType: Sales Invoice Item,References,संदर्भ
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,रूपे आहेत
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,नवीन विक्री चलन तयार करण्यासाठी 'विक्री चलन करा' बटणावर क्लिक करा.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,पासून आणि कालावधी% s च्या आवर्ती बंधनकारक तारखा कालावधी
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,पॅकेजिंग आणि लेबलिंग
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण नाव
 DocType: Sales Person,Parent Sales Person,पालक विक्री व्यक्ती
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,कंपनी मास्टर आणि ग्लोबल मुलभूत पूर्वनिर्धारीत चलन निर्दिष्ट करा
 DocType: Dropbox Backup,Dropbox Access Secret,ड्रॉपबॉक्स प्रवेश गुपित
 DocType: Purchase Invoice,Recurring Invoice,आवर्ती चलन
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,प्रकल्प व्यवस्थापकीय
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,प्रकल्प व्यवस्थापकीय
 DocType: Supplier,Supplier of Goods or Services.,वस्तू किंवा सेवा पुरवठादार.
 DocType: Budget Detail,Fiscal Year,आर्थिक वर्ष
 DocType: Cost Center,Budget,अर्थसंकल्प
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,विक्री
 DocType: Employee,Salary Information,पगार माहिती
 DocType: Sales Person,Name and Employee ID,नाव आणि कर्मचारी आयडी
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,मुळे तारीख तारीख पोस्ट करण्यापूर्वी असू शकत नाही
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,मुळे तारीख तारीख पोस्ट करण्यापूर्वी असू शकत नाही
 DocType: Website Item Group,Website Item Group,वेबसाइट आयटम गट
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,करापोटी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} पैसे नोंदी फिल्टर जाऊ शकत नाही {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} पैसे नोंदी फिल्टर जाऊ शकत नाही {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,वेब साईट मध्ये दर्शविले जाईल की आयटम टेबल
 DocType: Purchase Order Item Supplied,Supplied Qty,पुरवले Qty
 DocType: Material Request Item,Material Request Item,साहित्य विनंती आयटम
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,आयटम ग
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,या शुल्क प्रकार चालू ओळीवर पेक्षा मोठे किंवा समान ओळीवर पहा करू शकत नाही
 ,Item-wise Purchase History,आयटम निहाय खरेदी इतिहास
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,लाल
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सिरियल नाही आयटम जोडले प्राप्त करण्यासाठी 'व्युत्पन्न वेळापत्रक' वर क्लिक करा {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सिरियल नाही आयटम जोडले प्राप्त करण्यासाठी 'व्युत्पन्न वेळापत्रक' वर क्लिक करा {0}
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,ओपन उत्पादन ऑर्डर
 DocType: Installation Note,Installation Time,प्रतिष्ठापन वेळ
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,कोटेशन ट्रेन्ड
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},आयटम गट आयटम आयटम मास्टर उल्लेख केला नाही {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","उत्पादन ऑर्डर या आयटम केले जाऊ शकतात, हा एक स्टॉक आयटम असणे आवश्यक आहे."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","उत्पादन ऑर्डर या आयटम केले जाऊ शकतात, हा एक स्टॉक आयटम असणे आवश्यक आहे."
 DocType: Shipping Rule Condition,Shipping Amount,शिपिंग रक्कम
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,सामील होत
 DocType: Authorization Rule,Above Value,मूल्य वर
 ,Pending Amount,प्रलंबित रक्कम
 DocType: Purchase Invoice Item,Conversion Factor,रूपांतरण फॅक्टर
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,वितरित केले
+DocType: Purchase Order,Delivered,वितरित केले
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),रोजगार ई-मेल आयडी साठी सेटअप येणार्या सर्व्हर. (उदा jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,वाहन क्रमांक
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,आवर्ती अशी यादी तयार करणे बंद होणार तारीख
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,वितरण शु
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आयटम {1} मालमत्ता आयटम आहे म्हणून खाते {0} 'मुदत मालमत्ता' प्रकारच्या असणे आवश्यक आहे
 DocType: HR Settings,HR Settings,एचआर सेटिंग्ज
 apps/frappe/frappe/config/setup.py +130,Printing,मुद्रण
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च दावा मंजुरीसाठी प्रलंबित आहे. फक्त खर्च माफीचा साक्षीदार स्थिती अद्यतनित करू शकता.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च दावा मंजुरीसाठी प्रलंबित आहे. फक्त खर्च माफीचा साक्षीदार स्थिती अद्यतनित करू शकता.
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त सवलत रक्कम
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,तुम्ही रजा अर्ज आहेत ज्या दिवशी (चे) सुट्टी आहे. आपण रजा अर्ज गरज नाही.
-sites/assets/js/desk.min.js +7805,and,आणि
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,आणि
 DocType: Leave Block List Allow,Leave Block List Allow,ब्लॉक यादी परवानगी द्या सोडा
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,क्रीडा
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,कोटेशन
 DocType: Salary Slip,Total Deduction,एकूण कपात
 DocType: Quotation,Maintenance User,देखभाल सदस्य
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,खर्च अद्यतनित
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,आपण बूच इच्छित आपली खात्री आहे की
 DocType: Employee,Date of Birth,जन्म तारीख
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,आयटम {0} आधीच परत आले आहे
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** आर्थिक वर्ष ** एक आर्थिक वर्ष प्रस्तुत करते. सर्व लेखा नोंदणी व इतर प्रमुख व्यवहार ** ** आर्थिक वर्ष विरुद्ध नियंत्रीत केले जाते.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","विक्री मोहिमांच्या ट्रॅक ठेवा. निष्पन्न, अवतरणे मागोवा ठेवा, विक्री ऑर्डर इत्यादी मोहीमा गुंतवणूक वर परत गेज."
 DocType: Expense Claim,Approver,माफीचा साक्षीदार
 ,SO Qty,त्यामुळे Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेअर नोंदी कोठार विरुद्ध अस्तित्वात {0}, त्यामुळे आपण पुन्हा-नोंदवू किंवा कोठार सुधारणा करू शकत नाही"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेअर नोंदी कोठार विरुद्ध अस्तित्वात {0}, त्यामुळे आपण पुन्हा-नोंदवू किंवा कोठार सुधारणा करू शकत नाही"
 DocType: Appraisal,Calculate Total Score,एकूण धावसंख्या गणना
 DocType: Supplier Quotation,Manufacturing Manager,उत्पादन व्यवस्थापक
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},सिरियल नाही {0} पर्यंत हमी अंतर्गत आहे {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,संकुल स्प्लिट वितरण टीप.
 apps/erpnext/erpnext/hooks.py +84,Shipments,निर्यात
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,बुडवून काठ
+DocType: Purchase Order,To be delivered to customer,ग्राहकाला वितरित करणे
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,वेळ लॉग स्थिती सादर करणे आवश्यक आहे.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सिरियल नाही {0} कोणत्याही वखार संबंधित नाही
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,सेटअप
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,चलन पासून
 DocType: DocField,Name,नाव
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},आयटम आवश्यक विक्री ऑर्डर {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},आयटम आवश्यक विक्री ऑर्डर {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,प्रणाली प्रतिबिंबित नाही प्रमाणात
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी चलन)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,इतर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,थांबवले म्हणून सेट करा
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,एक जुळणारे आयटम शोधू शकत नाही. साठी {0} काही इतर मूल्य निवडा.
 DocType: POS Profile,Taxes and Charges,कर आणि शुल्क
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","एक उत्पादन किंवा विकत घेतले, विक्री किंवा स्टॉक मध्ये ठेवली जाते की एक सेवा."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,पहिल्या रांगेत साठी 'मागील पंक्ती एकूण रोजी' 'मागील पंक्ती रकमेवर' म्हणून जबाबदारी प्रकार निवडा किंवा करू शकत नाही
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,निवडा DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,बँकिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,वेळापत्रक प्राप्त करण्यासाठी 'व्युत्पन्न वेळापत्रक' वर क्लिक करा
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,नवी खर्च केंद्र
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,नवी खर्च केंद्र
 DocType: Bin,Ordered Quantity,आदेश दिले प्रमाण
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",उदा "बांधणाऱ्यांनी साधने बिल्ड"
 DocType: Quality Inspection,In Process,प्रक्रिया मध्ये
 DocType: Authorization Rule,Itemwise Discount,Itemwise सवलत
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} विक्री आदेशा {1}
+DocType: Purchase Order Item,Reference Document Type,संदर्भ दस्तऐवज प्रकार
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} विक्री आदेशा {1}
 DocType: Account,Fixed Asset,निश्चित मालमत्ता
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,सिरीयलाइज यादी
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,सिरीयलाइज यादी
 DocType: Activity Type,Default Billing Rate,डीफॉल्ट बिलिंग दर
 DocType: Time Log Batch,Total Billing Amount,एकूण बिलिंग रक्कम
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,प्राप्त खाते
 ,Stock Balance,शेअर शिल्लक
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,भरणा करण्यासाठी विक्री आदेश
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,भरणा करण्यासाठी विक्री आदेश
 DocType: Expense Claim Detail,Expense Claim Detail,खर्च हक्क तपशील
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,वेळ नोंदी तयार:
 DocType: Item,Weight UOM,वजन UOM
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,खाते क्रेडिट देय खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
 DocType: Production Order Operation,Completed Qty,पूर्ण Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","{0}, फक्त डेबिट खाती दुसरे क्रेडिट नोंदणी लिंक जाऊ शकते"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,किंमत सूची {0} अक्षम आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, फक्त डेबिट खाती दुसरे क्रेडिट नोंदणी लिंक जाऊ शकते"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,किंमत सूची {0} अक्षम आहे
 DocType: Manufacturing Settings,Allow Overtime,जादा वेळ परवानगी द्या
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,विक्री ऑर्डर {0} बंद आहे
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} आयटम आवश्यक सिरिअल क्रमांक {1}. आपण प्रदान केलेल्या {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,वर्तमान मूल्यांकन दर
 DocType: Item,Customer Item Codes,ग्राहक आयटम कोड
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,वेल्डिंग
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,नवी स्टॉक UOM आवश्यक आहे
 DocType: Quality Inspection,Sample Size,नमुना आकार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.','प्रकरण क्रमांक पासून' एक वैध निर्दिष्ट करा
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,पुढील खर्च केंद्रे गट अंतर्गत केले जाऊ शकते पण नोंदी नॉन-गट सुरू केले
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,पुढील खर्च केंद्रे गट अंतर्गत केले जाऊ शकते पण नोंदी नॉन-गट सुरू केले
 DocType: Project,External,बाह्य
 DocType: Features Setup,Item Serial Nos,आयटम सिरियल क्र
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,वापरकर्ते आणि परवानग्या
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,पत्ता आणि संपर्क
 DocType: SMS Log,Sender Name,प्रेषकाचे नाव
 DocType: Page,Title,शीर्षक
-sites/assets/js/list.min.js +104,Customize,सानुकूल करा
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,सानुकूल करा
 DocType: POS Profile,[Select],[निवडा]
 DocType: SMS Log,Sent To,करण्यासाठी पाठविले
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,विक्री चलन करा
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,आयुष्याच्या शेवटी
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,प्रवास
 DocType: Leave Block List,Allow Users,वापरकर्त्यांना परवानगी द्या
+DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
 DocType: Sales Invoice,Recurring,आवर्ती
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,स्वतंत्र उत्पन्न ट्रॅक आणि उत्पादन verticals किंवा विभाग लवकरात.
 DocType: Rename Tool,Rename Tool,साधन पुनर्नामित करा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,अद्यतन खर्च
 DocType: Item Reorder,Item Reorder,आयटम पुनर्क्रमित
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,ट्रान्सफर साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,ट्रान्सफर साहित्य
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ऑपरेशन, ऑपरेटिंग खर्च निर्देशीत आणि आपल्या ऑपरेशन नाही एक अद्वितीय ऑपरेशन द्या."
 DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,कर्मचारी
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,पासून आयात ईमेल
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,वापरकर्ता म्हणून आमंत्रित करा
 DocType: Features Setup,After Sale Installations,विक्री स्थापना केल्यानंतर
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} पूर्णपणे बिल आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} पूर्णपणे बिल आहे
 DocType: Workstation Working Hour,End Time,समाप्त वेळ
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,विक्री किंवा खरेदी करीता मानक करार अटी.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,व्हाउचर गट
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,मास मेलींग
 DocType: Page,Standard,मानक
 DocType: Rename Tool,File to Rename,पुनर्नामित करा फाइल
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},आयटम आवश्यक Purchse मागणी क्रमांक {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,शो देयके
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},आयटम अस्तित्वात नाही निर्दिष्ट BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,देखभाल वेळापत्रक {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,देखभाल वेळापत्रक {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,आकार
 DocType: Notification Control,Expense Claim Approved,खर्च क्लेम मंजूर
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,फार्मास्युटिकल
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,"तारीख करण्य
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),विक्री ई-मेल आयडी साठी सेटअप येणार्या सर्व्हर. (उदा sales@example.com)
 DocType: Warranty Claim,Raised By,उपस्थित
 DocType: Payment Tool,Payment Account,भरणा खाते
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
-sites/assets/js/list.min.js +23,Draft,मसुदा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,मसुदा
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,भरपाई देणारा बंद
 DocType: Quality Inspection Reading,Accepted,स्वीकारले
 DocType: User,Female,स्त्री
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,शिपिंग नियम लेबल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
 DocType: Newsletter,Test,कसोटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","सध्याच्या स्टॉक व्यवहार आपण मूल्ये बदलू शकत नाही \ या आयटम, आहेत म्हणून 'सिरियल नाही आहे' '' बॅच आहे नाही ',' शेअर आयटम आहे 'आणि' मूल्यांकन पद्धत '"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,जलद प्रवेश जर्नल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
 DocType: Employee,Previous Work Experience,मागील कार्य अनुभव
 DocType: Stock Entry,For Quantity,प्रमाण साठी
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},सलग येथे आयटम {0} साठी नियोजनबद्ध Qty प्रविष्ट करा {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,"{0} {1} सबमिट केलेली नाही,"
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,आयटम विनंती.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,"{0} {1} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,आयटम विनंती.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,स्वतंत्र उत्पादन करण्यासाठी प्रत्येक पूर्ण चांगल्या आयटम तयार केले जाईल.
 DocType: Purchase Invoice,Terms and Conditions1,अटी आणि Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,सेटअप पूर्ण
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,वृत्त
 DocType: Delivery Note,Transporter Name,वाहतुक नाव
 DocType: Contact,Enter department to which this Contact belongs,या संपर्क मालकीचे जे विभाग प्रविष्ट करा
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,एकूण अनुपिस्थत
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,सलग {0} जुळत नाही सामग्री विनंती आयटम किंवा कोठार
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,सलग {0} जुळत नाही सामग्री विनंती आयटम किंवा कोठार
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,माप युनिट
 DocType: Fiscal Year,Year End Date,वर्ष अंतिम तारीख
 DocType: Task Depends On,Task Depends On,कार्य अवलंबून असते
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,कंत्राटी अंतिम तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,एक आयोग कंपन्या उत्पादने विकतो तृतीय पक्ष जो वितरक / विक्रेता / दलाल / संलग्न / विक्रेत्याशी.
 DocType: Customer Group,Has Child Node,बाल नोड आहे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} पर्चेस विरुद्ध {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} पर्चेस विरुद्ध {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","येथे स्थिर URL मापदंड प्रविष्ट करा (उदा. प्रेषक = ERPNext, वापरकर्तानाव = ERPNext, पासवर्ड = 1234 इ)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} कोणत्याही सक्रिय आर्थिक वर्ष आहे. अधिक माहितीसाठी या तपासासाठी {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,हे नमुना वेबसाइट ERPNext पासून स्वयं-व्युत्पन्न केलेले आहे
@@ -2021,11 +2032,9 @@ DocType: Note,Note,टीप
 DocType: Purchase Receipt Item,Recd Quantity,Recd प्रमाण
 DocType: Email Account,Email Ids,ईमेल आयडी
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर प्रमाणात जास्त आयटम {0} निर्मिती करू शकत नाही {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Unstopped म्हणून सेट करा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,"शेअर प्रवेश {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,"शेअर प्रवेश {0} सबमिट केलेली नाही,"
 DocType: Payment Reconciliation,Bank / Cash Account,बँक / रोख खाते
 DocType: Tax Rule,Billing City,बिलिंग शहर
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,या रजेचा अर्ज मंजुरीसाठी प्रलंबित आहे. फक्त रजा मंजुरी स्थिती अद्यतनित करू शकता.
 DocType: Global Defaults,Hide Currency Symbol,चलन प्रतीक लपवा
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","उदा बँक, रोख, क्रेडिट कार्ड"
 DocType: Journal Entry,Credit Note,क्रेडिट टीप
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),एकूण (Qty)
 DocType: Installation Note Item,Installed Qty,स्थापित Qty
 DocType: Lead,Fax,फॅक्स
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,सबमिट
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,सबमिट
 DocType: Salary Structure,Total Earning,एकूण कमाई
 DocType: Purchase Receipt,Time at which materials were received,"साहित्य प्राप्त झाले, ज्या वेळ"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,माझे पत्ते
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,संघट
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,किंवा
 DocType: Sales Order,Billing Status,बिलिंग स्थिती
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,उपयुक्तता खर्च
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-वर
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-वर
 DocType: Buying Settings,Default Buying Price List,मुलभूत खरेदी दर सूची
 ,Download Backups,डाउनलोड साठवत
 DocType: Notification Control,Sales Order Message,विक्री ऑर्डर संदेश
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,निवडा कर्मचारी
 DocType: Bank Reconciliation,To Date,तारीख करण्यासाठी
 DocType: Opportunity,Potential Sales Deal,संभाव्य विक्री कराराचा
-sites/assets/js/form.min.js +308,Details,तपशील
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,तपशील
 DocType: Purchase Invoice,Total Taxes and Charges,एकूण कर आणि शुल्क
 DocType: Employee,Emergency Contact,तात्काळ संपर्क
 DocType: Item,Quality Parameters,दर्जा
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,प्राप्त Qty
 DocType: Stock Entry Detail,Serial No / Batch,सिरियल / नाही बॅच
 DocType: Product Bundle,Parent Item,मुख्य घटक
 DocType: Account,Account Type,खाते प्रकार
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. 'व्युत्पन्न वेळापत्रक' वर क्लिक करा
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. 'व्युत्पन्न वेळापत्रक' वर क्लिक करा
 ,To Produce,उत्पन्न करण्यासाठी
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","सलग कारण {0} मधील {1}. आयटम दर {2} समाविष्ट करण्यासाठी, पंक्ति {3} समाविष्ट करणे आवश्यक आहे"
 DocType: Packing Slip,Identification of the package for the delivery (for print),डिलिव्हरी संकुल ओळख (मुद्रण)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Flattening
 DocType: Account,Income Account,उत्पन्न खाते
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,मोल्डिंग
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,डिलिव्हरी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,डिलिव्हरी
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",पहा कोटीच्या विभाग "सामुग्री आधारित रोजी दर"
 DocType: Appraisal Goal,Key Responsibility Area,की जबाबदारी क्षेत्र
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,सर्व पत्ते.
 DocType: Company,Stock Settings,शेअर सेटिंग्ज
 DocType: User,Bio,जैव
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड समान आहेत तर, विलीन फक्त शक्य आहे. गट, रूट प्रकार, कंपनी आहे"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड समान आहेत तर, विलीन फक्त शक्य आहे. गट, रूट प्रकार, कंपनी आहे"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ग्राहक गट वृक्ष व्यवस्थापित करा.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,नवी खर्च केंद्र नाव
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,नवी खर्च केंद्र नाव
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण पॅनेल सोडा
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,डीफॉल्ट पत्ता साचा आढळले. सेटअप> मुद्रण आणि ब्रँडिंग> पत्ता साचा एक नवीन तयार करा.
 DocType: Appraisal,HR User,एचआर सदस्य
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,भरणा साधन तपशील
 ,Sales Browser,विक्री ब्राउझर
 DocType: Journal Entry,Total Credit,एकूण क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश विरुद्ध अस्तित्वात {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,स्थानिक
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश विरुद्ध अस्तित्वात {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,स्थानिक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),कर्ज मालमत्ता (assets)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,कर्जदार
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,मोठे
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,नाही कर्मचारी आढळले!
 DocType: C-Form Invoice Detail,Territory,प्रदेश
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,आवश्यक भेटी नाही उल्लेख करा
+DocType: Purchase Order,Customer Address Display,ग्राहक पत्ता प्रदर्शन
 DocType: Stock Settings,Default Valuation Method,मुलभूत मूल्यांकन पद्धत
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,कांती
 DocType: Production Order Operation,Planned Start Time,नियोजनबद्ध प्रारंभ वेळ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,वाटप
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,बंद करा ताळेबंद आणि नफा पुस्तक किंवा तोटा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","आपण आधीच दुसर्या UOM काही व्यवहार (चे) केले आहे \ कारण आयटम साठी उपाय, डीफॉल्ट युनिट {0} थेट बदलले जाऊ शकत नाही. मुलभूत UOM बदलण्यासाठी, \ वापर शेअर विभागात अंतर्गत साधन 'UOM उपयुक्तता बदला."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,विनिमय दर आणखी मध्ये एक चलन रूपांतरित करण्यात निर्देशीत
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,कोटेशन {0} रद्द
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,कोटेशन {0} रद्द
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,एकूण थकबाकी रक्कम
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} कर्मचारी वर सुट्टी घेतली होती {1}. हजेरी चिन्हांकित करू शकत नाही.
 DocType: Sales Partner,Targets,लक्ष्य
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,हे मूळ ग्राहक गट आहे आणि संपादित केला जाऊ शकत नाही.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,खाती आपल्या चार्ट सेटअप तुम्ही लेखा नोंदी सुरू करा आधी
 DocType: Purchase Invoice,Ignore Pricing Rule,किंमत नियम दुर्लक्ष करा
-sites/assets/js/list.min.js +24,Cancelled,रद्द
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,रद्द
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,तत्वे दिनांक पासून कर्मचारी सामील होत तारीख पेक्षा कमी असू शकत नाही.
 DocType: Employee Education,Graduate,पदवीधर
 DocType: Leave Block List,Block Days,ब्लॉक दिवस
 DocType: Journal Entry,Excise Entry,अबकारी प्रवेश
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},चेतावणी: विक्री ऑर्डर {0} आधीच ग्राहक च्या पर्चेस विरुद्ध अस्तित्वात {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},चेतावणी: विक्री ऑर्डर {0} आधीच ग्राहक च्या पर्चेस विरुद्ध अस्तित्वात {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,शेअर प्राप्
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,एकूण वेतन + थकबाकी रक्कम + एनकॅशमेंट रक्कम - एकूण कपात
 DocType: Monthly Distribution,Distribution Name,वितरण नाव
 DocType: Features Setup,Sales and Purchase,विक्री आणि खरेदी
-DocType: Purchase Order Item,Material Request No,साहित्य विनंती नाही
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
+DocType: Supplier Quotation Item,Material Request No,साहित्य विनंती नाही
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ग्राहकांना चलनात दर कंपनीच्या बेस चलनात रुपांतरीत आहे
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ही यादी यशस्वी सदस्यत्व रद्द केले आहे.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),निव्वळ दर (कंपनी चलन)
-apps/frappe/frappe/templates/base.html +132,Added,जोडले
+apps/frappe/frappe/templates/base.html +134,Added,जोडले
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,प्रदेश वृक्ष व्यवस्थापित करा.
 DocType: Journal Entry Account,Sales Invoice,विक्री चलन
 DocType: Journal Entry Account,Party Balance,पार्टी शिल्लक
 DocType: Sales Invoice Item,Time Log Batch,वेळ लॉग बॅच
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,सवलत लागू निवडा कृपया
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,सवलत लागू निवडा कृपया
 DocType: Company,Default Receivable Account,मुलभूत प्राप्तीयोग्य खाते
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,उपरोक्त निवडलेले निकष अदा एकूण पगार बँक प्रवेश तयार करा
 DocType: Stock Entry,Material Transfer for Manufacture,उत्पादन साठी साहित्य ट्रान्सफर
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,संबंधित नो
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,शेअर एकट्या प्रवेश
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,विक्री Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
 DocType: Sales Invoice,Customer Address,ग्राहक पत्ता
 apps/frappe/frappe/desk/query_report.py +136,Total,एकूण
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त सवलत लागू
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,गुणवत्ता तप
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त लहान
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,लागत स्प्रे
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: Qty मागणी साहित्य किमान Qty पेक्षा कमी आहे
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,खाते {0} गोठविले
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,खाते {0} गोठविले
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संघटना राहण्याचे लेखा स्वतंत्र चार्ट सह कायदेशीर अस्तित्व / उपकंपनी.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","अन्न, पेय आणि तंबाखू"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,पु किंवा बी.एस.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},फक्त रक्कम करू शकता बिल न केलेली {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,आयोगाने दर पेक्षा जास्त 100 असू शकत नाही
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,किमान सूची स्तर
 DocType: Stock Entry,Subcontract,Subcontract
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,प्रथम {0} प्रविष्ट करा
 DocType: Production Planning Tool,Get Items From Sales Orders,विक्री ऑर्डर आयटम मिळवा
 DocType: Production Order Operation,Actual End Time,वास्तविक समाप्ती वेळ
 DocType: Production Planning Tool,Download Materials Required,साहित्य डाउनलोड करण्याची आवश्यकता
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,अनुसूचित
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","नाही" आणि "विक्री आयटम आहे" "शेअर आयटम आहे" कोठे आहे? "होय" आहे आयटम निवडा आणि इतर उत्पादन बंडल आहे कृपया
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असाधारण महिने ओलांडून लक्ष्य वाटप मासिक वितरण निवडा.
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,किंमत सूची चलन निवडलेले नाही
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,किंमत सूची चलन निवडलेले नाही
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,आयटम रो {0}: {1} वरील 'खरेदी पावत्या' टेबल मध्ये अस्तित्वात नाही खरेदी पावती
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} आधीच अर्ज केला आहे {1} दरम्यान {2} आणि {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} आधीच अर्ज केला आहे {1} दरम्यान {2} आणि {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,प्रकल्प सुरू तारीख
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,पर्यंत
 DocType: Rename Tool,Rename Log,लॉग पुनर्नामित करा
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,फक्त पाने नोडस् व्यवहार अनुमत आहेत
 DocType: Expense Claim,Expense Approver,खर्च माफीचा साक्षीदार
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरेदी पावती आयटम प्रदान
-sites/assets/js/erpnext.min.js +48,Pay,द्या
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,द्या
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,DATETIME करण्यासाठी
 DocType: SMS Settings,SMS Gateway URL,एसएमएस गेटवे URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,एसएमएस स्थिती राखण्यासाठी नोंदी
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ग्राइंडर
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,ओघ संकुचित
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,प्रलंबित उपक्रम
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,प्रलंबित उपक्रम
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,पुष्टी
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,पुरवठादार> पुरवठादार प्रकार
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,तारीख relieving प्रविष्ट करा.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,च
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,वृत्तपत्र प्रकाशक
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,आर्थिक वर्ष निवडा
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,आपण या रेकॉर्ड सोडा माफीचा साक्षीदार आहेत. 'स्थिती' आणि जतन करा अद्यतनित करा
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,पुनर्क्रमित करा स्तर
 DocType: Attendance,Attendance Date,विधान परिषदेच्या तारीख
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,कमावते आणि कपात आधारित पगार चित्रपटाने.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,विद्यमान व्यवहार खर्चाच्या केंद्र गट रूपांतरीत केले जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,घसारा
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),पुरवठादार (चे)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,अवैध कालावधी
 DocType: Customer,Credit Limit,क्रेडिट मर्यादा
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,व्यवहार प्रकार निवडा
 DocType: GL Entry,Voucher No,प्रमाणक नाही
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,अ
 DocType: Customer,Address and Contact,पत्ता आणि संपर्क
 DocType: Customer,Last Day of the Next Month,पुढील महिन्याच्या शेवटच्या दिवशी
 DocType: Employee,Feedback,अभिप्राय
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,पिररक्षण. वेळापत्रक
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,पिररक्षण. वेळापत्रक
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,कठोर जेट यंत्र
 DocType: Stock Settings,Freeze Stock Entries,फ्रीझ शेअर नोंदी
 DocType: Website Settings,Website Settings,वेबसाइट सेटिंग्ज
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,जाणारे
 DocType: Material Request,Requested For,विनंती
 DocType: Quotation Item,Against Doctype,Doctype विरुद्ध
 DocType: Delivery Note,Track this Delivery Note against any Project,कोणत्याही प्रकल्पाच्या विरोधात या वितरण टीप मागोवा
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,रूट खाते हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,रूट खाते हटविले जाऊ शकत नाही
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,दर्शवा शेअर नोंदी
 ,Is Primary Address,प्राथमिक पत्ता आहे
 DocType: Production Order,Work-in-Progress Warehouse,कार्य-इन-प्रगती कोठार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,पत्ते व्यवस्थापित करा
 DocType: Pricing Rule,Item Code,आयटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन ऑर्डर तयार करा
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,सदस्य शेरा
 DocType: Lead,Market Segment,बाजार विभाग
 DocType: Communication,Phone,फोन
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी अंतर्गत कार्य इतिहास
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),बंद (डॉ)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),बंद (डॉ)
 DocType: Contact,Passive,निष्क्रीय
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,नाही स्टॉक मध्ये सिरियल नाही {0}
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,व्यवहार विक्री कर टेम्प्लेट.
 DocType: Sales Invoice,Write Off Outstanding Amount,बाकी रक्कम बंद लिहा
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","आपण स्वयंचलित आवर्ती पावत्या आवश्यकता असल्यास तपासा. कोणत्याही विक्री चलन सबमिट केल्यानंतर, विभाग आवर्ती दृश्यमान होईल."
 DocType: Account,Accounts Manager,खाते व्यवस्थापक
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',वेळ लॉग {0} 'सादर' करणे आवश्यक आहे
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',वेळ लॉग {0} 'सादर' करणे आवश्यक आहे
 DocType: Stock Settings,Default Stock UOM,डिफॉल्ट स्टॉक UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),क्रियाकलाप प्रकार आधारित दर कोटीच्या (प्रती तास)
 DocType: Production Planning Tool,Create Material Requests,साहित्य विनंत्या तयार करा
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,बँक मेळ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,अद्यतने मिळवा
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,काही नमुना रेकॉर्ड जोडा
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,व्यवस्थापन सोडा
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,व्यवस्थापन सोडा
 DocType: Event,Groups,गट
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाते गट
 DocType: Sales Order,Fully Delivered,पूर्णतः वितरण
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,विक्री अवांतर
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} खर्च केंद्र विरुद्ध खाते {1} साठी {0} बजेट करून टाकेल {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","या शेअर मेळ उदघाटन नोंद आहे पासून फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},आयटम आवश्यक मागणी क्रमांक खरेदी {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,अग्रेषित केलेले पाने कॅरी
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},आयटम आवश्यक मागणी क्रमांक खरेदी {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तारीख पासून' नंतर 'दिनांक करण्यासाठी' असणे आवश्यक आहे
 ,Stock Projected Qty,शेअर Qty अंदाज
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},संबंधित नाही {0} ग्राहक प्रोजेक्ट करण्यासाठी {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},संबंधित नाही {0} ग्राहक प्रोजेक्ट करण्यासाठी {1}
 DocType: Sales Order,Customer's Purchase Order,ग्राहकाच्या पर्चेस
 DocType: Warranty Claim,From Company,कंपनी पासून
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,मूल्य किंवा Qty
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,किरकोळ विक्रेता
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,खाते क्रेडिट ताळेबंद खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सर्व पुरवठादार प्रकार
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,आयटम स्वयंचलितपणे गणती केली नाही कारण आयटम कोड बंधनकारक आहे
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},कोटेशन {0} नाही प्रकारच्या {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,आयटम स्वयंचलितपणे गणती केली नाही कारण आयटम कोड बंधनकारक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},कोटेशन {0} नाही प्रकारच्या {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,देखभाल वेळापत्रक आयटम
 DocType: Sales Order,%  Delivered,% वितरण
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,बँक ओव्हरड्राफ्ट खाते
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,पगाराच्या स्लिप्स करा
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,बूच
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ब्राउझ करा BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,सुरक्षित कर्ज
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,अप्रतिम उत्पादने
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,मूल्यमापन
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,गमावले-फेस निर्णायक
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,चित्रकला
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,तारीख पुनरावृत्ती आहे
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},एक असणे आवश्यक आहे माफीचा साक्षीदार सोडा {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},एक असणे आवश्यक आहे माफीचा साक्षीदार सोडा {0}
 DocType: Hub Settings,Seller Email,विक्रेता ईमेल
 DocType: Project,Total Purchase Cost (via Purchase Invoice),एकूण खरेदी किंमत (खरेदी करा चलन द्वारे)
 DocType: Workstation Working Hour,Start Time,प्रारंभ वेळ
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),निव्वळ रक्कम (कंपनी चलन)
 DocType: BOM Operation,Hour Rate,तास दर
 DocType: Stock Settings,Item Naming By,आयटम करून नामांकन
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,कोटेशन पासून
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},आणखी कालावधी संवरण {0} आला आहे {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,कोटेशन पासून
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},आणखी कालावधी संवरण {0} आला आहे {1}
 DocType: Production Order,Material Transferred for Manufacturing,साहित्य उत्पादन साठी हस्तांतरित
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,खाते {0} नाही अस्तित्वात
 DocType: Purchase Receipt Item,Purchase Order Item No,ऑर्डर आयटम नाही खरेदी
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,तपासणी आवश्यक
 DocType: Purchase Invoice Item,PR Detail,जनसंपर्क तपशील
 DocType: Sales Order,Fully Billed,पूर्णतः बिल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,हातात रोख
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},डिलिव्हरी कोठार स्टॉक आयटम आवश्यक {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},डिलिव्हरी कोठार स्टॉक आयटम आवश्यक {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),संकुल एकूण वजन. सहसा निव्वळ वजन + पॅकेजिंग साहित्य वजन. (मुद्रण)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,या भूमिका वापरकर्ते गोठविलेल्या खात्यांचे विरुद्ध लेखा नोंदी गोठविलेल्या खाती सेट आणि तयार / सुधारित करण्याची अनुमती आहे
 DocType: Serial No,Is Cancelled,रद्द आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,माझे Shipments
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,माझे Shipments
 DocType: Journal Entry,Bill Date,बिल तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","सर्वोच्च प्राधान्य एकाधिक किंमत नियम आहेत जरी, तर खालील अंतर्गत प्राधान्यक्रम लागू केले आहेत:"
 DocType: Supplier,Supplier Details,पुरवठादार तपशील
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,वायर हस्तांतरण
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,बँक खाते निवडा
 DocType: Newsletter,Create and Send Newsletters,तयार करा आणि पाठवा वृत्तपत्रे
-sites/assets/js/report.min.js +107,From Date must be before To Date,तारीख दिनांक करण्यासाठी असणे आवश्यक आहे
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,तारीख दिनांक करण्यासाठी असणे आवश्यक आहे
 DocType: Sales Order,Recurring Order,आवर्ती ऑर्डर
 DocType: Company,Default Income Account,मुलभूत उत्पन्न खाते
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ग्राहक गट / ग्राहक
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,शेअर UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,"ऑर्डर {0} सबमिट केलेली नाही, खरेदी"
 ,Projected,अंदाज
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},सिरियल नाही {0} कोठार संबंधित नाही {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,टीप: {0} प्रमाणात किंवा रक्कम 0 आहे म्हणून चेंडू-प्रती आणि-बुकिंग आयटम सिस्टम तपासा नाही
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,टीप: {0} प्रमाणात किंवा रक्कम 0 आहे म्हणून चेंडू-प्रती आणि-बुकिंग आयटम सिस्टम तपासा नाही
 DocType: Notification Control,Quotation Message,कोटेशन संदेश
 DocType: Issue,Opening Date,उघडण्याच्या तारीख
 DocType: Journal Entry,Remark,शेरा
 DocType: Purchase Receipt Item,Rate and Amount,दर आणि रक्कम
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,कंटाळवाणा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,विक्री ऑर्डर पासून
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,विक्री ऑर्डर पासून
 DocType: Blog Category,Parent Website Route,पालक वेबसाइट मार्ग
 DocType: Sales Order,Not Billed,बिल नाही
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,दोन्ही कोठार त्याच कंपनी संबंधित आवश्यक
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,संपर्क अद्याप जोडले.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,संपर्क अद्याप जोडले.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,सक्रिय नाही
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,चलन पोस्टिंग तारीख विरुद्ध
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,उतरले खर्च व्हाउचर रक्कम
 DocType: Time Log,Batched for Billing,बिलिंग साठी बॅच
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,पुरवठादार उपस्थित बिल.
 DocType: POS Profile,Write Off Account,खाते बंद लिहा
-sites/assets/js/erpnext.min.js +26,Discount Amount,सवलत रक्कम
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,सवलत रक्कम
 DocType: Purchase Invoice,Return Against Purchase Invoice,विरुद्ध खरेदी चलन परत
 DocType: Item,Warranty Period (in days),(दिवस मध्ये) वॉरंटी कालावधी
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,उदा व्हॅट
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,आयटम 4
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रवेश खाते
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन मालिका
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","एक आयटम त्याच नावाने अस्तित्वात ({0}), आयटम समूहाचे नाव बदलू किंवा आयटम पुनर्नामित करा"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","एक आयटम त्याच नावाने अस्तित्वात ({0}), आयटम समूहाचे नाव बदलू किंवा आयटम पुनर्नामित करा"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,लागत हॉट मेटल गॅस
 DocType: Sales Order Item,Sales Order Date,विक्री ऑर्डर तारीख
 DocType: Sales Invoice Item,Delivered Qty,वितरित केले Qty
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,ग्राहक किंवा पुरवठादार माहिती
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,सेट
 DocType: Lead,Lead Owner,लीड मालक
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,वखार आवश्यक आहे
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,वखार आवश्यक आहे
 DocType: Employee,Marital Status,विवाहित
 DocType: Stock Settings,Auto Material Request,ऑटो साहित्य विनंती
 DocType: Time Log,Will be updated when billed.,बिल जेव्हा अपडेट केले जातील.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,वखार पासून वर उपलब्ध बॅच Qty
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,वर्तमान BOM आणि नवीन BOM समान असू शकत नाही
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,निवृत्ती तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 DocType: Sales Invoice,Against Income Account,उत्पन्न खाते विरुद्ध
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,अद्यतन शेअर
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,आयटम साठी विविध UOM अयोग्य (एकूण) निव्वळ वजन मूल्य नेईल. प्रत्येक आयटम निव्वळ वजन समान UOM आहे याची खात्री करा.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM दर
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,डिलिव्हरी टीप आयटम पुल करा
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,डिलिव्हरी टीप आयटम पुल करा
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,जर्नल नोंदी {0}-रद्द जोडलेले आहेत
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","प्रकार ई-मेल, फोन, चॅट भेट, इ सर्व संचार नोंद"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,कंपनी मध्ये गोल बंद खर्च केंद्र उल्लेख करा
 DocType: Purchase Invoice,Terms,अटी
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,नवीन तयार करा
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,नवीन तयार करा
 DocType: Buying Settings,Purchase Order Required,ऑर्डर आवश्यक खरेदी
 ,Item-wise Sales History,आयटम निहाय विक्री इतिहास
 DocType: Expense Claim,Total Sanctioned Amount,एकूण मंजूर रक्कम
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,पगाराच्या
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,नोट्स
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,प्रथम एक गट नोड निवडा.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},हेतू एक असणे आवश्यक आहे {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,फॉर्म भरा आणि तो जतन
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,फॉर्म भरा आणि तो जतन
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,त्यांच्या नवीनतम यादी स्थिती सर्व कच्चा माल असलेली एक अहवाल डाउनलोड करा
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,तोंड
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,समूह
 DocType: Leave Application,Leave Balance Before Application,अर्ज करण्यापूर्वी शिल्लक सोडा
 DocType: SMS Center,Send SMS,एसएमएस पाठवा
 DocType: Company,Default Letter Head,लेटरहेडवर डीफॉल्ट
 DocType: Time Log,Billable,बिल
 DocType: Authorization Rule,This will be used for setting rule in HR module,हे एचआर विभागात नियम सेट करण्यासाठी वापरले जाईल
 DocType: Account,Rate at which this tax is applied,हा कर लागू आहे येथे दर
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,पुनर्क्रमित करा Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,पुनर्क्रमित करा Qty
 DocType: Company,Stock Adjustment Account,शेअर समायोजन खाते
 DocType: Journal Entry,Write Off,बंद लिहा
 DocType: Time Log,Operation ID,ऑपरेशन आयडी
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","सवलत फील्ड पर्चेस, खरेदी पावती, खरेदी चलन उपलब्ध होईल"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नवीन खाते नाव. टीप: ग्राहक व पुरवठादार साठी खाती तयार करू नका
 DocType: Report,Report Type,अहवाल प्रकार
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,लोड करीत आहे
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,लोड करीत आहे
 DocType: BOM Replace Tool,BOM Replace Tool,BOM साधन बदला
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,देशनिहाय मुलभूत पत्ता टेम्पलेट
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख नंतर असू शकत नाही {0}
+DocType: Sales Order Item,Supplier delivers to Customer,पुरवठादार ग्राहक वितरण
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,शो कर ब्रेक अप
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख नंतर असू शकत नाही {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,डेटा आयात आणि निर्यात
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',तुम्ही मॅन्युफॅक्चरिंग क्रियाकलाप सहभागी तर. सक्षम आयटम 'उत्पादित आहे'
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,अशी यादी तयार करणे पोस्ट तारीख
 DocType: Sales Invoice,Rounded Total,गोळाबेरीज एकूण
 DocType: Product Bundle,List items that form the package.,पॅकेज तयार यादी आयटम.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,टक्केवारी वाटप 100% समान असावी
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,विक्री मास्टर व्यवस्थापक {0} भूमिका ज्या वापरकर्ता करण्यासाठी येथे संपर्क साधा
 DocType: Company,Default Cash Account,मुलभूत रोख खाते
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,कंपनी (नाही ग्राहक किंवा पुरवठादार) मास्टर.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date','अपेक्षित डिलिव्हरी तारीख' प्रविष्ट करा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','अपेक्षित डिलिव्हरी तारीख' प्रविष्ट करा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,पेड रक्कम रक्कम एकूण पेक्षा जास्त असू शकत नाही बंद लिहा +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} आयटम एक वैध बॅच क्रमांक नाही {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},टीप: रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","रो {0}: Qty वेअरहाऊसमध्ये avalable नाही {1} वर {2} {3}. उपलब्ध Qty: {4}, Qty हस्तांतरण: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आयटम 3
+DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Event,Sunday,रविवारी
 DocType: Sales Team,Contribution (%),योगदान (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत 'रोख किंवा बँक खाते' निर्दिष्ट नाही
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,जबाबदारी
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,साचा
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,साचा
 DocType: Sales Person,Sales Person Name,विक्री व्यक्ती नाव
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,टेबल मध्ये किमान 1 चलन प्रविष्ट करा
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,वापरकर्ते जोडा
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),वास्तविक प्
 DocType: Stock Reconciliation Item,Before reconciliation,समेट करण्यापूर्वी
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},करण्यासाठी {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),कर आणि शुल्क जोडले (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0} प्रकार कर किंवा उत्पन्न किंवा खर्चाचे किंवा भार च्या खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0} प्रकार कर किंवा उत्पन्न किंवा खर्चाचे किंवा भार च्या खाते असणे आवश्यक आहे
 DocType: Sales Order,Partly Billed,पाऊस बिल
 DocType: Item,Default BOM,मुलभूत BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,एकूण थकबाकी रक्कम
 DocType: Time Log Batch,Total Hours,एकूण तास
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक आहे {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक आहे {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,ऑटोमोटिव्ह
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},आधीच आर्थिक वर्षात {1} कर्मचारी तरतूद प्रकार {0} साठी पाने {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,आयटम आवश्यक आहे
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,मेटल इंजेक्शन मोल्डिंग
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,डिलिव्हरी टीप पासून
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,डिलिव्हरी टीप पासून
 DocType: Time Log,From Time,वेळ पासून
 DocType: Notification Control,Custom Message,सानुकूल संदेश
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,गुंतवणूक बँकिंग
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,या ई-मेल
 DocType: Stock Entry,From BOM,BOM पासून
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,मूलभूत
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} गोठविली आहेत करण्यापूर्वी शेअर व्यवहार
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule','व्युत्पन्न वेळापत्रक' वर क्लिक करा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,तारीख करण्यासाठी अर्धा दिवस रजा दिनांक पासून एकच असले पाहिजे
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','व्युत्पन्न वेळापत्रक' वर क्लिक करा
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,तारीख करण्यासाठी अर्धा दिवस रजा दिनांक पासून एकच असले पाहिजे
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","उदा किलो, युनिट, क्रमांक, मीटर"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केला असल्यास संदर्भ नाही बंधनकारक आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केला असल्यास संदर्भ नाही बंधनकारक आहे
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,प्रवेश दिनांक जन्म तारीख पेक्षा जास्त असणे आवश्यक आहे
 DocType: Salary Structure,Salary Structure,वेतन रचना
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","एकापेक्षा जास्त किंमत नियम समान निकष अस्तित्वात नाही, प्राधान्य सोपवून \ विरोधाचे निराकरण करा. किंमत नियम: {0}"
 DocType: Account,Bank,बँक
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,एयरलाईन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,समस्या साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,समस्या साहित्य
 DocType: Material Request Item,For Warehouse,वखार साठी
 DocType: Employee,Offer Date,ऑफर तारीख
 DocType: Hub Settings,Access Token,प्रवेश टोकन
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,उघडणे वेळ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,आणि आवश्यक तारखा
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,सिक्युरिटीज अँड कमोडिटी
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
+DocType: Delivery Note Item,From Warehouse,वखार पासून
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ड्रिलिंग
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,वाहणे काठ
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन आणि एकूण
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,पासून दुरुस्ती
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,कच्चा माल
 DocType: Leave Application,Follow via Email,ईमेल द्वारे अनुसरण करा
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सवलत रक्कम नंतर कर रक्कम
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,बाल खाते हे खाते विद्यमान आहे. आपण हे खाते हटवू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,बाल खाते हे खाते विद्यमान आहे. आपण हे खाते हटवू शकत नाही.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,एकतर लक्ष्य qty किंवा लक्ष्य रक्कम अनिवार्य आहे
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम विद्यमान {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,पहिल्या पोस्टिंग तारीख निवडा
-DocType: Leave Allocation,Carry Forward,कॅरी फॉरवर्ड
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम विद्यमान {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,पहिल्या पोस्टिंग तारीख निवडा
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,तारीख उघडण्याच्या तारीख बंद करण्यापूर्वी असावे
+DocType: Leave Control Panel,Carry Forward,कॅरी फॉरवर्ड
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,विद्यमान व्यवहार खर्चाच्या केंद्र लेजर रूपांतरीत केले जाऊ शकत नाही
 DocType: Department,Days for which Holidays are blocked for this department.,दिवस जे सुट्ट्या या विभागात अवरोधित केलेली आहेत.
 ,Produced,निर्मिती
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),एकूण (रक
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,मनोरंजन आणि फुरसतीचा वेळ
 DocType: Purchase Order,The date on which recurring order will be stop,आवर्ती ऑर्डर बंद होणार तारीख
 DocType: Quality Inspection,Item Serial No,आयटम सिरियल नाही
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} {1} किंवा आपण वाढ करावी, उतू सहिष्णुता कमी करणे आवश्यक आहे"
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} {1} किंवा आपण वाढ करावी, उतू सहिष्णुता कमी करणे आवश्यक आहे"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,एकूण उपस्थित
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,तास
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",सिरीयलाइज आयटम {0} शेअर मेळ वापरून \ अद्यतनित करणे शक्य नाही
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,पुरवठादार करण्यासाठी ह तांत रत
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,पुरवठादार करण्यासाठी ह तांत रत
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नवीन सिरिअल नाही कोठार आहे शकत नाही. कोठार शेअर नोंद किंवा खरेदी पावती सेट करणे आवश्यक आहे
 DocType: Lead,Lead Type,लीड प्रकार
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,कोटेशन तयार करा
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,या सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,या सर्व आयटम आधीच invoiced आहेत
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},मंजूर केले जाऊ शकते {0}
 DocType: Shipping Rule,Shipping Rule Conditions,शिपिंग नियम अटी
 DocType: BOM Replace Tool,The new BOM after replacement,बदली नवीन BOM
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,सी-फॉर्म
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ऑपरेशन आयडी सेट नाही
 DocType: Production Order,Planned Start Date,नियोजनबद्ध प्रारंभ तारीख
 DocType: Serial No,Creation Document Type,निर्मिती दस्तऐवज प्रकार
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,पिररक्षण. भेट द्या
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,पिररक्षण. भेट द्या
 DocType: Leave Type,Is Encash,रोख रकमेत बदलून आहे
 DocType: Purchase Invoice,Mobile No,मोबाइल नाही
 DocType: Payment Tool,Make Journal Entry,जर्नल प्रवेश करा
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,नवी पाने वाट
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,प्रकल्प निहाय माहिती कोटेशन उपलब्ध नाही
 DocType: Project,Expected End Date,अपेक्षित शेवटची तारीख
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन साचा शीर्षक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,व्यावसायिक
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,व्यावसायिक
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,पालक आयटम {0} शेअर आयटम असू शकत नाही
 DocType: Cost Center,Distribution Id,वितरण आयडी
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,अप्रतिम सेवा
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} विशेषता मूल्य श्रेणीत असणे आवश्यक आहे {1} करण्यासाठी {2} वाढ मध्ये {3}
 DocType: Tax Rule,Sales,विक्री
 DocType: Stock Entry Detail,Basic Amount,मूलभूत रक्कम
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},कोठार स्टॉक आयटम आवश्यक {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,कोटी
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},कोठार स्टॉक आयटम आवश्यक {0}
+DocType: Leave Allocation,Unused leaves,न वापरलेले पाने
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,कोटी
 DocType: Customer,Default Receivable Accounts,प्राप्तीयोग्य खाते डीफॉल्ट
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,बिलिंग राज्य
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,लॅमिनेट
 DocType: Item Reorder,Transfer,ट्रान्सफर
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
 DocType: Authorization Rule,Applicable To (Employee),लागू करण्यासाठी (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,मुळे तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,किरकोळ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ग्राहक {0} अस्तित्वात नाही
 DocType: Attendance,Absent,अनुपस्थित
 DocType: Product Bundle,Product Bundle,उत्पादन बंडल
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},रो {0}: अवैध संदर्भ {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,निर्णायक
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,कर आणि शुल्क साचा खरेदी
 DocType: Upload Attendance,Download Template,डाउनलोड साचा
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,शेरा
 DocType: Purchase Order Item Supplied,Raw Material Item Code,कच्चा माल आयटम कोड
 DocType: Journal Entry,Write Off Based On,आधारित बंद लिहा
 DocType: Features Setup,POS View,पीओएस पहा
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,एक सिरियल क्रमांक प्रतिष्ठापन रेकॉर्ड
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,एक सिरियल क्रमांक प्रतिष्ठापन रेकॉर्ड
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,सतत निर्णायक
-sites/assets/js/erpnext.min.js +10,Please specify a,एक निर्दिष्ट करा
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,एक निर्दिष्ट करा
 DocType: Offer Letter,Awaiting Response,प्रतिसाद प्रतीक्षा करत आहे
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,वर
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,थंड आकाराचे
 DocType: Salary Slip,Earning & Deduction,कमाई आणि कपात
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,खाते {0} एक गट असू शकत नाही
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,प्रदेश
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,पर्यायी. हे सेटिंग विविध व्यवहार फिल्टर करण्यासाठी वापरला जाईल.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,पर्यायी. हे सेटिंग विविध व्यवहार फिल्टर करण्यासाठी वापरला जाईल.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
 DocType: Holiday List,Weekly Off,साप्ताहिक बंद
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","उदा 2012, 2012-13 साठी"
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,फुगवटा
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,बाष्पीभवन-नमुना निर्णायक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,मनोरंजन खर्च
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,या विक्री ऑर्डर रद्द आधी चलन {0} रद्द करणे आवश्यक आहे विक्री
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,वय
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,या विक्री ऑर्डर रद्द आधी चलन {0} रद्द करणे आवश्यक आहे विक्री
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,वय
 DocType: Time Log,Billing Amount,बिलिंग रक्कम
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,आयटम निर्दिष्ट अवैध प्रमाण {0}. प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,निरोप साठी अनुप्रयोग.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,विद्यमान व्यवहार खाते हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,विद्यमान व्यवहार खाते हटविले जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,कायदेशीर खर्च
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ऑटो आदेश 05, 28 इत्यादी उदा निर्माण होणार महिन्याचा दिवस"
 DocType: Sales Invoice,Posting Time,पोस्टिंग वेळ
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,लोगो
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"आपण जतन करण्यापूर्वी मालिका निवडा वापरकर्ता सक्ती करायचे असल्यास या तपासा. आपण या चेक केले, तर नाही मुलभूत असेल."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},सिरियल नाही असलेले कोणतेही आयटम नाहीत {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,ओपन सूचना
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ओपन सूचना
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,थेट खर्च
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,आपण खरोखर हे साहित्य विनंती बूच इच्छा आहे काय?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,नवीन ग्राहक महसूल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,प्रवास खर्च
 DocType: Maintenance Visit,Breakdown,यंत्रातील बिघाड
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,तारखेला
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,उमेदवारीचा काळ
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,मुलभूत कोठार स्टॉक आयटम अनिवार्य आहे.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,मुलभूत कोठार स्टॉक आयटम अनिवार्य आहे.
 DocType: Feed,Full Name,पूर्ण नाव
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},महिन्यात पगार भरणा {0} आणि वर्ष {1}
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,खाती 
 DocType: Buying Settings,Default Supplier Type,मुलभूत पुरवठादार प्रकार
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,दागिने
 DocType: Production Order,Total Operating Cost,एकूण ऑपरेटिंग खर्च
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,टीप: आयटम {0} अनेक वेळा प्रवेश केला
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,टीप: आयटम {0} अनेक वेळा प्रवेश केला
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,सर्व संपर्क.
 DocType: Newsletter,Test Email Id,कसोटी ई मेल आयडी
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,कंपनी Abbreviation
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,नि
 DocType: Stock Settings,Role Allowed to edit frozen stock,भूमिका गोठविलेल्या स्टॉक संपादित करण्याची परवानगी
 ,Territory Target Variance Item Group-Wise,प्रदेश लक्ष्य फरक आयटम गट निहाय
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,सर्व ग्राहक गट
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} करणे आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} करणे आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,कर साचा बंधनकारक आहे.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,खाते {0}: पालक खाते {1} अस्तित्वात नाही
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),किंमत सूची दर (कंपनी चलन)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} स्थिती 'आवरले
 DocType: Account,Temporary,अस्थायी
 DocType: Address,Preferred Billing Address,पसंतीचे बिलिंग पत्ता
 DocType: Monthly Distribution Percentage,Percentage Allocation,टक्केवारी वाटप
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,आयटम शहा
 DocType: Purchase Order Item,Supplier Quotation,पुरवठादार कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण जतन एकदा शब्द मध्ये दृश्यमान होईल.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,इस्त्रीसाठी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} बंद आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} बंद आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
 DocType: Lead,Add to calendar on this date,या तारखेला कॅलेंडरमध्ये समाविष्ट करा
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,शिपिंग खर्च जोडून नियम.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,पुढील कार्यक्रम
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,पुढील कार्यक्रम
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ग्राहक आवश्यक आहे
 DocType: Letter Head,Letter Head,लेटरहेडवर
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,जलद प्रवेश
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} परत अनिवार्य आहे
 DocType: Purchase Order,To Receive,प्राप्त करण्यासाठी
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,समर्पक संकुचित
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,किमान एक कोठार अनिवार्य आहे
 DocType: Serial No,Out of Warranty,हमी पैकी
 DocType: BOM Replace Tool,Replace,बदला
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,माप मुलभूत युनिट प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,माप मुलभूत युनिट प्रविष्ट करा
 DocType: Purchase Invoice Item,Project Name,प्रकल्प नाव
 DocType: Supplier,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
 DocType: Workflow State,Edit,संपादित करा
 DocType: Journal Entry Account,If Income or Expense,उत्पन्न किंवा खर्च तर
 DocType: Features Setup,Item Batch Nos,आयटम बॅच क्र
 DocType: Stock Ledger Entry,Stock Value Difference,शेअर मूल्य फरक
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,मानव संसाधन
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,मानव संसाधन
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,भरणा मेळ भरणा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,कर मालमत्ता
 DocType: BOM Item,BOM No,BOM नाही
 DocType: Contact Us Settings,Pincode,पिनकोड
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रवेश {0} {1} किंवा आधीच इतर व्हाउचर जुळवले खाते नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रवेश {0} {1} किंवा आधीच इतर व्हाउचर जुळवले खाते नाही
 DocType: Item,Moving Average,हलवित सरासरी
 DocType: BOM Replace Tool,The BOM which will be replaced,पुनर्स्थित केले जाईल BOM
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,नवी स्टॉक UOM चालू स्टॉक UOM भिन्न असणे आवश्यक आहे
 DocType: Account,Debit,डेबिट
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,पाने 0.5 च्या पटीत वाटप करणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,पाने 0.5 च्या पटीत वाटप करणे आवश्यक आहे
 DocType: Production Order,Operation Cost,ऑपरेशन खर्च
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,एक .csv फाइल पासून उपस्थिती अपलोड करा
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,बाकी रक्कम
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,से
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","या समस्येचे लागू करण्यासाठी, साइडबारमध्ये "वाटप" बटण वापरा."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],फ्रीज स्टॉक जुने पेक्षा [दिवस]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","दोन किंवा अधिक किंमत नियम वरील स्थितीवर आधारित आढळल्यास, अग्रक्रम लागू आहे. डीफॉल्ट मूल्य शून्य (रिक्त) आहे, तर प्राधान्य ते 20 0 दरम्यान एक नंबर आहे. उच्च संख्या समान परिस्थिती एकाधिक किंमत नियम आहेत, तर ते श्रेष्ठत्व लागेल अर्थ."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,चलन विरुद्ध
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,आर्थिक वर्ष: {0} नाही अस्तित्वात
 DocType: Currency Exchange,To Currency,चलन
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,खालील वापरकर्त्यांना ब्लॉक दिवस रजा अर्ज मंजूर करण्याची परवानगी द्या.
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),द
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त खर्च
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,आर्थिक वर्ष अंतिम तारीख
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","व्हाउचर नाही आधारित फिल्टर करू शकत नाही, व्हाउचर प्रमाणे गटात समाविष्ट केले तर"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,पुरवठादार कोटेशन करा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,पुरवठादार कोटेशन करा
 DocType: Quality Inspection,Incoming,येणार्या
 DocType: BOM,Materials Required (Exploded),साहित्य (स्फोट झाला) आवश्यक
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),पे न करता सोडू साठी मिळवून कमी (LWP)
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},रो # {0}: सिरियल नाही {1} जुळत नाही {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,प्रासंगिक रजा
 DocType: Batch,Batch ID,बॅच आयडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},टीप: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},टीप: {0}
 ,Delivery Note Trends,डिलिव्हरी टीप ट्रेन्ड
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,या आठवड्यातील सारांश
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} एकापाठोपाठ एक खरेदी किंवा उप-करारबद्ध आयटम असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} एकापाठोपाठ एक खरेदी किंवा उप-करारबद्ध आयटम असणे आवश्यक आहे {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,खाते: {0} केवळ शेअर व्यवहार द्वारे अद्यतनित केले जाऊ शकतात
 DocType: GL Entry,Party,पार्टी
 DocType: Sales Order,Delivery Date,डिलिव्हरी तारीख
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,P
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,सरासरी. खरेदी दर
 DocType: Task,Actual Time (in Hours),(तास) वास्तविक वेळ
 DocType: Employee,History In Company,कंपनी मध्ये इतिहास
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,वृत्तपत्रे
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,वृत्तपत्रे
 DocType: Address,Shipping,शिपिंग
 DocType: Stock Ledger Entry,Stock Ledger Entry,शेअर खतावणीत नोंद
 DocType: Department,Leave Block List,ब्लॉक यादी सोडा
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,लेखापरीक्षक
 DocType: Purchase Order,End date of current order's period,चालू ऑर्डरच्या कालावधी समाप्ती तारीख
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ऑफर पत्र करा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,परत
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे
 DocType: DocField,Fold,दुमडणे
 DocType: Production Order Operation,Production Order Operation,उत्पादन ऑर्डर ऑपरेशन
 DocType: Pricing Rule,Disable,अक्षम करा
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,अहवाल
 DocType: SMS Settings,Enter url parameter for receiver nos,स्वीकारणारा नग साठी मापदंड प्रविष्ट करा
 DocType: Sales Invoice,Paid Amount,पेड रक्कम
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',खाते {0} बंद प्रकार 'दायित्व' असणे आवश्यक
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',खाते {0} बंद प्रकार 'दायित्व' असणे आवश्यक
 ,Available Stock for Packing Items,पॅकिंग आयटम उपलब्ध शेअर
 DocType: Item Variant,Item Variant,आयटम व्हेरियंट
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,नाही इतर मुलभूत आहे म्हणून हे मुलभूतरित्या पत्ता साचा सेट
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता व्यवस्थापन
 DocType: Production Planning Tool,Filter based on customer,फिल्टर ग्राहक आधारित
 DocType: Payment Tool Detail,Against Voucher No,व्हाउचर नाही विरुद्ध
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},आयटम संख्या प्रविष्ट करा {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},आयटम संख्या प्रविष्ट करा {0}
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाह्य कार्य इतिहास
 DocType: Tax Rule,Purchase,खरेदी
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,शिल्लक Qty
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials","आणखी ** आयटम मध्ये **
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},सिरियल नाही आयटम अनिवार्य आहे {0}
 DocType: Item Variant Attribute,Attribute,विशेषता
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,श्रेणी / पासून ते निर्दिष्ट करा
-sites/assets/js/desk.min.js +7652,Created By,करून तयार
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,करून तयार
 DocType: Serial No,Under AMC,एएमसी अंतर्गत
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,आयटम मूल्यांकन दर उतरले खर्च व्हाउचर रक्कम विचार recalculated आहे
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,व्यवहार विक्री डीफॉल्ट सेटिंग्ज.
 DocType: BOM Replace Tool,Current BOM,वर्तमान BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,सिरियल नाही जोडा
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,सिरियल नाही जोडा
 DocType: Production Order,Warehouses,गोदामांची
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,प्रिंट आणि स्टेशनरी
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,गट नोड
 DocType: Payment Reconciliation,Minimum Amount,किमान रक्कम
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,अद्यतन पूर्ण वस्तू
 DocType: Workstation,per hour,प्रती तास
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},आधीच वापरले मालिका {0} {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},आधीच वापरले मालिका {0} {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,कोठार (शा्वत सूची) खाते या खाते अंतर्गत तयार करण्यात येणार आहे.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,स्टॉक खतावणीत नोंद या कोठार विद्यमान म्हणून कोठार हटविला जाऊ शकत नाही.
 DocType: Company,Distribution,वितरण
-sites/assets/js/erpnext.min.js +50,Amount Paid,अदा केलेली रक्कम
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,अदा केलेली रक्कम
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,प्रकल्प व्यवस्थापक
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,पाठवणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,आयटम परवानगी कमाल सवलतीच्या: {0} {1}% आहे
 DocType: Customer,Default Taxes and Charges,मुलभूत कर आणि शुल्क
 DocType: Account,Receivable,प्राप्त
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,रो # {0}: पर्चेस आधिपासूनच अस्तित्वात आहे म्हणून पुरवठादार बदलण्याची परवानगी नाही
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,सेट क्रेडिट मर्यादा ओलांडत व्यवहार सादर करण्याची परवानगी आहे भूमिका.
 DocType: Sales Invoice,Supplier Reference,पुरवठादार संदर्भ
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","चेक केलेले असल्यास, उप-विधानसभा आयटम BOM कच्चा माल मिळत विचार केला जाईल. अन्यथा, सर्व उप-विधानसभा आयटम एक कच्चा माल म्हणून मानले जाईल."
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,घेवप्यांची ज
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},व्यवहार बंद उत्पादन विरुद्ध परवानगी नाही ऑर्डर {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", डीफॉल्ट म्हणून या आर्थिक वर्षात सेट करण्यासाठी 'डीफॉल्ट म्हणून सेट करा' वर क्लिक करा"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),मदत ईमेल आयडी सेटअप येणार्या सर्व्हर. (उदा support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,कमतरता Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,कमतरता Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
 DocType: Salary Slip,Salary Slip,पगाराच्या स्लिप्स
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'तारीख' आवश्यक आहे
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","तपासले व्यवहार कोणत्याही "सबमिट" जातात तेव्हा, एक ईमेल पॉप-अप आपोआप संलग्नक म्हणून व्यवहार, की व्यवहार संबंधित "संपर्क" एक ईमेल पाठवू उघडले. वापरकर्ता मे किंवा ई-मेल पाठवू शकत नाही."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ग्लोबल सेटिंग्ज
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षण
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,हे आयटम तपशील प्राप्त करणे आवश्यक आहे.
 DocType: Salary Slip,Net Pay,नेट पे
 DocType: Account,Account,खाते
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,सिरियल नाही {0} आधीच प्राप्त झाले आहे
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,उत्पादन सदस्य
 DocType: Purchase Order,Raw Materials Supplied,कच्चा माल प्रदान
 DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट स्वरूप
 DocType: Communication,Series,मालिका
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,अपेक्षित वितरण तारीख पर्चेस तारीख आधी असू शकत नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,अपेक्षित वितरण तारीख पर्चेस तारीख आधी असू शकत नाही
 DocType: Appraisal,Appraisal Template,मूल्यांकन साचा
 DocType: Communication,Email,ईमेल
 DocType: Item Group,Item Classification,आयटम वर्गीकरण
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,वेतनपट सेटिंग्
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,नॉन-लिंक्ड पावत्या आणि देयके जुळत.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,मागणी नोंद करा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,रूट एक पालक खर्च केंद्र असू शकत नाही
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,निवडा ब्रँड ...
 DocType: Sales Invoice,C-Form Applicable,सी-फॉर्म लागू
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन साठी 0 पेक्षा असणे आवश्यक आहे {0}
 DocType: Supplier,Address and Contacts,पत्ता आणि संपर्क
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,थकबाकी कूपन मिळवा
 DocType: Warranty Claim,Resolved By,करून निराकरण
 DocType: Appraisal,Start Date,प्रारंभ तारीख
-sites/assets/js/desk.min.js +7629,Value,मूल्य
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,मूल्य
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,एक काळ साठी पाने वाटप करा.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,सत्यापित करण्यासाठी येथे क्लिक करा
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,खाते {0}: आपण पालक खाते म्हणून स्वत: नियुक्त करू शकत नाही
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,ड्रॉपबॉक्स प्रवेश परवानगी
 DocType: Dropbox Backup,Weekly,साप्ताहिक
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,उदा. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,प्राप्त
 DocType: Maintenance Visit,Fully Completed,पूर्णतः पूर्ण
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% पूर्ण
 DocType: Employee,Educational Qualification,शैक्षणिक अर्हता
 DocType: Workstation,Operating Costs,खर्च
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी रजा मंजुरी
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} यशस्वीरित्या आमच्या वार्तापत्राचे यादीत समाविष्ट केले गेले आहे.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: एक पुनर्क्रमित अगोदरपासून या कोठार विद्यमान {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: एक पुनर्क्रमित अगोदरपासून या कोठार विद्यमान {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,इलेक्ट्रॉन बीम यंत्र
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,खरेदी मास्टर व्यवस्थापक
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,/ संपादित करा किंमती जोडा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,कॉस्ट केंद्रे चार्ट
 ,Requested Items To Be Ordered,मागणी आयटम आज्ञाप्य
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,माझे ऑर्डर
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,माझे ऑर्डर
 DocType: Price List,Price List Name,किंमत सूची नाव
 DocType: Time Log,For Manufacturing,उत्पादन साठी
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,एकूण
@@ -3471,7 +3489,7 @@ DocType: Account,Income,उत्पन्न
 DocType: Industry Type,Industry Type,उद्योग प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,काहीतरी चूक झाली!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,चेतावणी: अनुप्रयोग सोडा खालील ब्लॉक तारखा समाविष्टीत आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,चलन {0} आधीच सादर केला गेला आहे विक्री
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,चलन {0} आधीच सादर केला गेला आहे विक्री
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,पूर्ण तारीख
 DocType: Purchase Invoice Item,Amount (Company Currency),रक्कम (कंपनी चलन)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,मरतात निर्णायक
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,वर्ष
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,पॉइंट-ऑफ-विक्री प्रोफाइल
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS सेटिंग्ज अद्यतनित करा
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,आधीच बिल वेळ लॉग {0}
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,आधीच बिल वेळ लॉग {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,बिनव्याजी कर्ज
 DocType: Cost Center,Cost Center Name,खर्च केंद्र नाव
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,सिरियल नाही आयटम {0} {1} आधीपासून स्थापित केला आहे
 DocType: Maintenance Schedule Detail,Scheduled Date,अनुसूचित तारीख
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,एकूण सशुल्क रक्कम
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 वर्ण या पेक्षा मोठे संदेश एकाधिक संदेश विभागली जातील
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,प्राप्त झ
 ,Serial No Service Contract Expiry,सिरियल नाही सेवा करार कालावधी समाप्ती
 DocType: Item,Unit of Measure Conversion,माप रुपांतर युनिट
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,कर्मचारी बदलले जाऊ शकत नाही
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकाच खाते डेबिट करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकाच खाते डेबिट करू शकत नाही
 DocType: Naming Series,Help HTML,मदत HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},100% असावे नियुक्त एकूण वजन. ही सेवा विनामुल्य आहे {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},{0} आयटम साठी पार over- भत्ता {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0} आयटम साठी पार over- भत्ता {1}
 DocType: Address,Name of person or organization that this address belongs to.,या पत्त्यावर मालकीची व्यक्ती किंवा संस्थेच्या नाव.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,आपले पुरवठादार
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,विक्री आदेश केले आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,रूपांतरित
 DocType: Item,Has Serial No,सिरियल नाही आहे
 DocType: Employee,Date of Issue,समस्येच्या तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: पासून {0} साठी {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},रो # {0}: आयटम सेट करा पुरवठादार {1}
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,संगणक
 DocType: Item,List this Item in multiple groups on the website.,वेबसाइट अनेक गट या आयटम यादी.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,इतर चलन खाती परवानगी मल्टी चलन पर्याय तपासा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,इतर चलन खाती परवानगी मल्टी चलन पर्याय तपासा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,आयटम: {0} प्रणाली अस्तित्वात नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,आपण गोठविलेल्या मूल्य सेट करण्यासाठी अधिकृत नाही
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled नोंदी मिळवा
@@ -3524,14 +3542,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,गुदाम
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},खाते {0} आर्थिक वर्षात एकापेक्षा अधिक प्रविष्ट केले गेले आहे {1}
 ,Average Commission Rate,सरासरी आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'होय' असेल नॉन-स्टॉक आयटम शकत नाही 'सिरियल नाही आहे'
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'होय' असेल नॉन-स्टॉक आयटम शकत नाही 'सिरियल नाही आहे'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,विधान परिषदेच्या भविष्यात तारखा करीता चिन्हाकृत केले जाऊ शकत नाही
 DocType: Pricing Rule,Pricing Rule Help,किंमत नियम मदत
 DocType: Purchase Taxes and Charges,Account Head,खाते प्रमुख
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,आयटम उतरले किंमत काढण्यासाठी अतिरिक्त खर्च अद्यतनित करा
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,इलेक्ट्रिकल
 DocType: Stock Entry,Total Value Difference (Out - In),एकूण मूल्य फरक (आउट - मध्ये)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},वापरकर्ता आयडी कर्मचारी साठी सेट न {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,हमी दावा पासून
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,नामांकन मालिका
 DocType: Leave Block List,Leave Block List Name,ब्लॉक यादी नाव सोडा
 DocType: User,Enabled,सक्षम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,शेअर मालमत्ता
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},आपण खरोखर महिन्यात {0} या वर्षासाठी सर्व पगाराच्या स्लिप्स जमा करायचा {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},आपण खरोखर महिन्यात {0} या वर्षासाठी सर्व पगाराच्या स्लिप्स जमा करायचा {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,आयात सदस्य
 DocType: Target Detail,Target Qty,लक्ष्य Qty
 DocType: Attendance,Present,सादर
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,डिलिव्हरी टीप {0} सादर जाऊ नये
 DocType: Notification Control,Sales Invoice Message,विक्री चलन संदेश
 DocType: Authorization Rule,Based On,आधारित
-,Ordered Qty,आदेश दिले Qty
+DocType: Sales Order Item,Ordered Qty,आदेश दिले Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},पासून आणि कालावधी आवर्ती बंधनकारक तारखा करण्यासाठी कालावधी {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,प्रकल्प क्रियाकलाप / कार्य.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,पगार डाव सावरला व्युत्पन्न
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} एक वैध ई-मेल आयडी नाही
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,अपलोड करा हजेरी
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM व उत्पादन प्रमाण आवश्यक आहे
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing श्रेणी 2
-DocType: Journal Entry Account,Amount,रक्कम
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,रक्कम
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM बदलले
 ,Sales Analytics,विक्री Analytics
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,अपेक्षित तारीख साहित्य विनंती तारीख आधी असू शकत नाही
 DocType: Contact Us Settings,City,शहर
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic यंत्र
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,त्रुटी: वैध आयडी?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,त्रुटी: वैध आयडी?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,आयटम {0} विक्री आयटम असणे आवश्यक आहे
 DocType: Naming Series,Update Series Number,अद्यतन मालिका क्रमांक
 DocType: Account,Equity,इक्विटी
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,वास्तविक
 DocType: Authorization Rule,Customerwise Discount,Customerwise सवलत
 DocType: Purchase Invoice,Against Expense Account,खर्चाचे खाते विरुद्ध
 DocType: Production Order,Production Order,उत्पादन ऑर्डर
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,प्रतिष्ठापन टीप {0} आधीच सादर केला गेला आहे
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,प्रतिष्ठापन टीप {0} आधीच सादर केला गेला आहे
 DocType: Quotation Item,Against Docname,Docname विरुद्ध
 DocType: SMS Center,All Employee (Active),सर्व कर्मचारी (सक्रिय)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,आता पहा
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,कच्चा माल खर्च
 DocType: Item,Re-Order Level,पुन्हा-क्रम स्तर
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,आपण उत्पादन आदेश वाढवण्याची किंवा विश्लेषण कच्चा माल डाउनलोड करायचे आहे आयटम आणि नियोजित qty प्रविष्ट करा.
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt चार्ट
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt चार्ट
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,भाग-वेळ
 DocType: Employee,Applicable Holiday List,लागू सुट्टी यादी
 DocType: Employee,Cheque,धनादेश
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,मालिका अद्यतनित
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,अहवाल प्रकार अनिवार्य आहे
 DocType: Item,Serial Number Series,अनुक्रमांक मालिका
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},कोठार सलग शेअर आयटम {0} अनिवार्य आहे {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},कोठार सलग शेअर आयटम {0} अनिवार्य आहे {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,रिटेल अॅण्ड घाऊक
 DocType: Issue,First Responded On,प्रथम रोजी प्रतिसाद
 DocType: Website Item Group,Cross Listing of Item in multiple groups,अनेक गट आयटम च्या क्रॉस यादी
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,विधान परिषदेच्या
 DocType: Page,No,नाही
 DocType: BOM,Materials,साहित्य
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","तपासले नाही, तर यादी तो लागू करण्यात आली आहे, जेथे प्रत्येक विभाग जोडले आहे."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,तारीख पोस्ट आणि वेळ पोस्ट करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,तारीख पोस्ट आणि वेळ पोस्ट करणे आवश्यक आहे
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,व्यवहार खरेदी कर टेम्प्लेट.
 ,Item Prices,आयटम किंमती
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,तुम्ही पर्चेस जतन एकदा शब्द मध्ये दृश्यमान होईल.
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,प्रशासकीय खर्च
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,सल्ला
 DocType: Customer Group,Parent Customer Group,पालक ग्राहक गट
-sites/assets/js/erpnext.min.js +50,Change,बदला
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,बदला
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',खरेदी ऑर्डर {0} 'आवरले आहे
 DocType: Appraisal Goal,Score Earned,स्कोअर कमाई
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",उदा "माझे कंपनी LLC"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,सूचना कालावधी
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,एकूण वजन UOM
 DocType: Email Digest,Receivables / Payables,Receivables / देय
 DocType: Delivery Note Item,Against Sales Invoice,विक्री चलन विरुद्ध
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,स्टॅम्पिंग
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,क्रेडिट खाते
 DocType: Landed Cost Item,Landed Cost Item,उतरले खर्च आयटम
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,शून्य मूल्ये दर्शवा
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,आयटम प्रमाण कच्चा माल दिलेल्या प्रमाणात repacking / उत्पादन नंतर प्राप्त
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्त / देय खाते
 DocType: Delivery Note Item,Against Sales Order Item,विक्री ऑर्डर आयटम विरुद्ध
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},विशेषतेसाठी मूल्य विशेषता निर्दिष्ट करा {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},विशेषतेसाठी मूल्य विशेषता निर्दिष्ट करा {0}
 DocType: Item,Default Warehouse,मुलभूत कोठार
 DocType: Task,Actual End Date (via Time Logs),वास्तविक समाप्ती तारीख (वेळ नोंदी द्वारे)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},अर्थसंकल्पात गट खाते विरुद्ध नियुक्त केली जाऊ शकत {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,समर्थन कार्यसंघ
 DocType: Appraisal,Total Score (Out of 5),(5 पैकी) एकूण धावसंख्या
 DocType: Contact Us Settings,State,राज्य
 DocType: Batch,Batch,बॅच
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,शिल्लक
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,शिल्लक
 DocType: Project,Total Expense Claim (via Expense Claims),एकूण खर्च हक्क (खर्चाचे दावे द्वारे)
 DocType: User,Gender,लिंग
 DocType: Journal Entry,Debit Note,डेबिट टीप
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,ब्लॉग ग्राहक
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,मूल्ये आधारित व्यवहार प्रतिबंधित नियम तयार करा.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","चेक केलेले असल्यास, एकूण नाही. कार्यरत दिवस सुटी समावेश असेल, आणि या पगार प्रति दिन मूल्य कमी होईल"
 DocType: Purchase Invoice,Total Advance,एकूण आगाऊ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,बूच साहित्य विनंती
 DocType: Workflow State,User,सदस्य
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,प्रक्रिया वेतनपट
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,प्रक्रिया वेतनपट
 DocType: Opportunity Item,Basic Rate,बेसिक रेट
 DocType: GL Entry,Credit Amount,क्रेडिट रक्कम
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,हरवले म्हणून सेट करा
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,क्रेडिट दिवस आध
 DocType: Tax Rule,Tax Rule,कर नियम
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,विक्री सायकल संपूर्ण समान दर ठेवणे
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,वर्कस्टेशन कार्य तासांनंतर वेळ नोंदी योजना.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} आधीच सादर केला गेला आहे
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} आधीच सादर केला गेला आहे
 ,Items To Be Requested,आयटम विनंती करण्यासाठी
 DocType: Purchase Order,Get Last Purchase Rate,गेल्या खरेदी दर मिळवा
 DocType: Time Log,Billing Rate based on Activity Type (per hour),क्रियाकलाप प्रकार आधारित बिलिंग दर (प्रती तास)
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आयडी आढळले नाही, त्यामुळे पाठविले नाही मेल"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),निधी मालमत्ता (assets) अर्ज
 DocType: Production Planning Tool,Filter based on item,फिल्टर आयटम आधारित
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,डेबिट खाते
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ तारीख
 DocType: Attendance,Employee Name,कर्मचारी नाव
 DocType: Sales Invoice,Rounded Total (Company Currency),गोळाबेरीज एकूण (कंपनी चलन)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी फायदे
 DocType: Sales Invoice,Is POS,पीओएस आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} संख्या समान असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} संख्या समान असणे आवश्यक आहे {1}
 DocType: Production Order,Manufactured Qty,उत्पादित Qty
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकृत प्रमाण
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} नाही अस्तित्वात
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ग्राहक असण्याचा बिले.
 DocType: DocField,Default,मुलभूत
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,प्रकल्प आयडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम आहे {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम आहे {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} ग्राहक जोडले
 DocType: Maintenance Schedule,Schedule,वेळापत्रक
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","हा खर्च केंद्र अर्थसंकल्पात परिभाषित. बजेट क्रिया सेट करण्यासाठी, पाहू "कंपनी यादी""
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,पालक खाते
 DocType: Quality Inspection Reading,Reading 3,3 वाचन
 ,Hub,हब
 DocType: GL Entry,Voucher Type,प्रमाणक प्रकार
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केले नाही
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केले नाही
 DocType: Expense Claim,Approved,मंजूर
 DocType: Pricing Rule,Price,किंमत
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} असे सेट करणे आवश्यक वर मुक्त कर्मचारी लेफ्ट 'म्हणून
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,शिक्षण
 DocType: Selling Settings,Campaign Naming By,करून मोहीम नामांकन
 DocType: Employee,Current Address Is,सध्याचा पत्ता आहे
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","पर्यायी. निर्देशीत न केल्यास, कंपनीच्या मुलभूत चलन ठरवतो."
 DocType: Address,Office,कार्यालय
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,मानक अहवाल
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,लेखा जर्नल नोंदी.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,पहिल्या कर्मचारी नोंद निवडा.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},रो {0}: पक्ष / खात्याशी जुळत नाही {1} / {2} मधील {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,वखार पासून वर उपलब्ध Qty
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,पहिल्या कर्मचारी नोंद निवडा.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},रो {0}: पक्ष / खात्याशी जुळत नाही {1} / {2} मधील {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,एक कर खाते तयार करणे
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
 DocType: Account,Stock,शेअर
 DocType: Employee,Current Address,सध्याचा पत्ता
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","स्पष्टपणे निर्दिष्ट केले नसेल तर आयटम नंतर वर्णन, प्रतिमा, किंमत, कर टेम्प्लेट सेट केल्या जातील इत्यादी दुसरा आयटम प्रकार आहे तर"
 DocType: Serial No,Purchase / Manufacture Details,खरेदी / उत्पादन तपशील
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,बॅच यादी
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,बॅच यादी
 DocType: Employee,Contract End Date,करार अंतिम तारीख
 DocType: Sales Order,Track this Sales Order against any Project,कोणत्याही प्रकल्पाच्या विरोधात या विक्री ऑर्डर मागोवा
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,पुल विक्री आदेश वरील निकष आधारित (वितरीत करण्यासाठी प्रलंबित)
 DocType: DocShare,Document Type,दस्तऐवज प्रकार
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,पुरवठादार कोटेशन पासून
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,पुरवठादार कोटेशन पासून
 DocType: Deduction Type,Deduction Type,कपात प्रकार
 DocType: Attendance,Half Day,अर्धा दिवस
 DocType: Pricing Rule,Min Qty,किमान Qty
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,प्रमाण साठी (Qty उत्पादित) करणे आवश्यक आहे
 DocType: Stock Entry,Default Target Warehouse,मुलभूत लक्ष्य कोठार
 DocType: Purchase Invoice,Net Total (Company Currency),निव्वळ एकूण (कंपनी चलन)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते फक्त लागू आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते फक्त लागू आहे
 DocType: Notification Control,Purchase Receipt Message,खरेदी पावती संदेश
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,एकूण वाटप पाने कालावधी जास्त आहे
 DocType: Production Order,Actual Start Date,वास्तविक प्रारंभ तारीख
 DocType: Sales Order,% of materials delivered against this Sales Order,साहित्य% या विक्री आदेशा वितरित
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,नोंद आयटम चळवळ.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,नोंद आयटम चळवळ.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,वृत्तपत्र यादी ग्राहक
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,सेवा
 DocType: Hub Settings,Hub Settings,हब सेटिंग्ज
 DocType: Project,Gross Margin %,एकूण मार्जिन%
 DocType: BOM,With Operations,ऑपरेशन
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखा नोंदी आधीच चलनात केले गेले आहेत {0} कंपनी {1}. चलन एक प्राप्त किंवा देय असलेले खाते निवडा {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखा नोंदी आधीच चलनात केले गेले आहेत {0} कंपनी {1}. चलन एक प्राप्त किंवा देय असलेले खाते निवडा {0}.
 ,Monthly Salary Register,मासिक पगार नोंदणी
-apps/frappe/frappe/website/template.py +123,Next,पुढील
+apps/frappe/frappe/website/template.py +140,Next,पुढील
 DocType: Warranty Claim,If different than customer address,ग्राहक पत्ता पेक्षा भिन्न असेल तर
 DocType: BOM Operation,BOM Operation,BOM ऑपरेशन
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,पुढील तारीख
 DocType: Employee Education,Major/Optional Subjects,मुख्य / पर्यायी विषय
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,कर आणि शुल्क प्रविष्ट करा
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,यंत्र
+DocType: Sales Invoice Item,Drop Ship,ड्रॉप जहाज
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","येथे आपण नाव आणि पालक, पती, पत्नी आणि मुले उद्योग जसे कौटुंबिक तपशील राखण्यास मदत"
 DocType: Hub Settings,Seller Name,विक्रेता नाव
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),कर आणि शुल्क वजा (कंपनी चलन)
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,प्राप्त आणि ब
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,डिझायनर
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,अटी आणि शर्ती साचा
 DocType: Serial No,Delivery Details,वितरण तपशील
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},प्रकार करीता खर्च केंद्र सलग आवश्यक आहे {0} कर टेबल {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},प्रकार करीता खर्च केंद्र सलग आवश्यक आहे {0} कर टेबल {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"प्रमाण या पातळी खाली पडले, तर स्वयंचलितपणे साहित्य विनंती तयार"
 ,Item-wise Purchase Register,आयटम निहाय खरेदी नोंदणी
 DocType: Batch,Expiry Date,कालावधी समाप्ती तारीख
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनर्क्रमित पातळी सेट करण्यासाठी, आयटम खरेदी आयटम किंवा उत्पादन आयटम असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनर्क्रमित पातळी सेट करण्यासाठी, आयटम खरेदी आयटम किंवा उत्पादन आयटम असणे आवश्यक आहे"
 ,Supplier Addresses and Contacts,पुरवठादार पत्ते आणि संपर्क
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,पहिल्या श्रेणी निवडा
 apps/erpnext/erpnext/config/projects.py +18,Project master.,प्रकल्प मास्टर.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,चलने इ $ असे कोणत्याही प्रतीक पुढील दर्शवू नका.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(अर्धा दिवस)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(अर्धा दिवस)
 DocType: Supplier,Credit Days,क्रेडिट दिवस
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM आयटम मिळवा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM आयटम मिळवा
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,वेळ दिवस घेऊन
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,साहित्य बिल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {1}
 DocType: Dropbox Backup,Send Notifications To,सूचना पाठवा
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,संदर्भ तारीख
 DocType: Employee,Reason for Leaving,सोडत आहे कारण
 DocType: Expense Claim Detail,Sanctioned Amount,मंजूर रक्कम
 DocType: GL Entry,Is Opening,उघडत आहे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद लिंक केले जाऊ शकत नाही {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,खाते {0} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद लिंक केले जाऊ शकत नाही {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,खाते {0} अस्तित्वात नाही
 DocType: Account,Cash,रोख
 DocType: Employee,Short biography for website and other publications.,वेबसाइट आणि इतर प्रकाशने लहान चरित्र.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},कर्मचारी पगार रचना तयार करा {0}
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index f0cc6ffe5e..fbd36f463b 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,လစာ Mode ကို
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","သင်ရာသီပေါ်အခြေခံပြီးခြေရာခံချင်လျှင်, လစဉ်ဖြန့်ဖြူးကိုရွေးချယ်ပါ။"
 DocType: Employee,Divorced,ကွာရှင်း
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,သတိပေးချက်: အတူတူပါပဲတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,သတိပေးချက်: အတူတူပါပဲတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ပြီးသား Sync လုပ်ထား items
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ပစ္စည်းတစ်ခုအရောင်းအဝယ်အတွက်အကြိမ်ပေါင်းများစွာကဆက်ပြောသည်ခံရဖို့ Allow
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ဒီအာမခံပြောဆိုချက်ကိုပယ်ဖျက်မီပစ္စည်းခရီးစဉ် {0} Cancel
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compact အပေါင်း sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},ငွေကြေးစျေးနှုန်းစာရင်း {0} သည်လိုအပ်သည်
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ထိုအရောင်းအဝယ်အတွက်တွက်ချက်ခြင်းကိုခံရလိမ့်မည်။
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,ပစ္စည်းတောင်းဆိုမှုကနေ
+DocType: Purchase Order,Customer Contact,customer ဆက်သွယ်ရန်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ပစ္စည်းတောင်းဆိုမှုကနေ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,ယောဘသည်လျှောက်ထားသူ
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,နောက်ထပ်ရလဒ်များမရှိပါ။
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,ဖောက်သည်အမည်
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","ငွေကြေး, ကူးပြောင်းနှုန်းပို့ကုန်စုစုပေါင်းပို့ကုန်ခမ်းနားစုစုပေါင်းစသည်တို့ကို Delivery Note ကိုရရှိနိုင်ပါတယ်, POS စက်, စျေးနှုန်း, အရောင်းပြေစာ, အရောင်းအမိန့်စသည်တို့ကဲ့သို့သောအားလုံးသည်ပို့ကုန်နှင့်ဆက်စပ်သောလယ်​​ကွက်"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ဦးခေါင်း (သို့မဟုတ်အုပ်စုများ) စာရင်းကိုင် Entries စေကြနှင့်ချိန်ခွင်ထိန်းသိမ်းထားသည့်ဆန့်ကျင်။
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),ထူးချွန် {0} သုည ({1}) ထက်နည်းမဖြစ်နိုင်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),ထူးချွန် {0} သုည ({1}) ထက်နည်းမဖြစ်နိုင်
 DocType: Manufacturing Settings,Default 10 mins,10 မိနစ် default
 DocType: Leave Type,Leave Type Name,Type အမည် Leave
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,အကွိမျမြားစှ
 DocType: SMS Center,All Supplier Contact,အားလုံးသည်ပေးသွင်းဆက်သွယ်ရန်
 DocType: Quality Inspection Reading,Parameter,parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲမျှော်မှန်း Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,တကယ်ထုတ်လုပ်မှုအမိန့်နှငျ့လှတျချင်ပါနဲ့:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,row # {0}: {2} ({3} / {4}): Rate {1} အဖြစ်အတူတူသာဖြစ်ရမည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ဘဏ်မှမူကြမ်း
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,ဒီ option ကိုသူတို့ရဲ့ code ကိုအသုံးအပေါ်အခြေခံပြီး 1. ဖောက်သည်ပညာရှိသောသူကို item code ကိုထိန်းသိမ်းရန်နှင့်သူတို့ကိုရှာဖွေစေ
 DocType: Mode of Payment Account,Mode of Payment Account,ငွေပေးချေမှုရမည့်အကောင့်၏ Mode ကို
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Show ကို
 DocType: Sales Invoice Item,Quantity,အရေအတွက်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ချေးငွေများ (စိစစ်)
 DocType: Employee Education,Year of Passing,Pass ၏တစ်နှစ်တာ
-sites/assets/js/erpnext.min.js +27,In Stock,ကုန်ပစ္စည်းလက်ဝယ်ရှိ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,သာ unbilled အရောင်းအမိန့်ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ကုန်ပစ္စည်းလက်ဝယ်ရှိ
 DocType: Designation,Designation,သတ်မှတ်ပေးထားခြင်း
 DocType: Production Plan Item,Production Plan Item,ထုတ်လုပ်မှုစီမံကိန်း Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},အသုံးပြုသူ {0} ပြီးသားန်ထမ်း {1} မှတာဝန်ပေးသည်
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,အသစ် POS Profile ကိုလုပ်ပါ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,ကျန်းမာရေးစောင့်ရှောက်မှု
 DocType: Purchase Invoice,Monthly,လစဉ်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,ဝယ်ကုန်စာရင်း
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ငွေပေးချေမှုအတွက်နှောင့်နှေး (နေ့ရက်များ)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Maintenance Schedule Item,Periodicity,ကာလ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,အီးမေးလ်လိပ်စာ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ကာကွယ်မှု
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ရမှတ် (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},row {0}: {1} {2} {3} နှင့်အတူလိုက်ဖက်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},row {0}: {1} {2} {3} နှင့်အတူလိုက်ဖက်ပါဘူး
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,row # {0}:
 DocType: Delivery Note,Vehicle No,မော်တော်ယာဉ်မရှိပါ
-sites/assets/js/erpnext.min.js +55,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,အကယ်စင်စစ်
 DocType: Production Order Operation,Work In Progress,တိုးတက်မှုများတွင်အလုပ်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ပုံနှိပ်ခြင်း
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,မိဘ Detail docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,ကီလိုဂရမ်
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,တစ်ဦးယောဘသည်အဖွင့်။
 DocType: Item Attribute,Increment,increment
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ဂိုဒေါင်ကိုရွေးပါ ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Advertising ကြော်ငြာ
 DocType: Employee,Married,အိမ်ထောင်သည်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
 DocType: Payment Reconciliation,Reconcile,ပြန်လည်သင့်မြတ်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,ကုန်စုံ
 DocType: Quality Inspection Reading,Reading 1,1 Reading
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,ဘဏ်မှ Entry 'ပါစေ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ဘဏ်မှ Entry 'ပါစေ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,အကောင့်အမျိုးအစားကိုဂိုဒေါင်လျှင်ဂိုဒေါင်မသင်မနေရ
 DocType: SMS Center,All Sales Person,အားလုံးသည်အရောင်းပုဂ္ဂိုလ်
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,ကုန်ကျစရိတ် Cen
 DocType: Warehouse,Warehouse Detail,ဂိုဒေါင် Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},ခရက်ဒစ်န့်သတ်ချက် {1} / {2} {0} ဖောက်သည်များအတွက်ကူးခဲ့
 DocType: Tax Rule,Tax Type,အခွန် Type အမျိုးအစား
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},သင် {0} ခင် entries တွေကို add သို့မဟုတ် update ကိုမှခွင့်ပြုမထား
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},သင် {0} ခင် entries တွေကို add သို့မဟုတ် update ကိုမှခွင့်ပြုမထား
 DocType: Item,Item Image (if not slideshow),item ပုံရိပ် (Slideshow မလျှင်)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,တစ်ဦးဖုန်းဆက်သူအမည်တူနှင့်အတူတည်ရှိ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(အချိန်နာရီနှုန်း / 60) * အမှန်တကယ်စစ်ဆင်ရေးအချိန်
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,ဧည့်သည်
 DocType: Quality Inspection,Get Specification Details,Specification အသေးစိတ် Get
 DocType: Lead,Interested,စိတ်ဝင်စား
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ပစ္စည်း၏ဘီလ်
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,ဖွင့်ပွဲ
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,ဖွင့်ပွဲ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0} ကနေ {1} မှ
 DocType: Item,Copy From Item Group,Item အုပ်စု မှစ. မိတ္တူ
 DocType: Journal Entry,Opening Entry,Entry 'ဖွင့်လှစ်
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,ထုတ်ကုန်ပစ္စည်း Enquiry
 DocType: Standard Reply,Owner,ပိုင်ဆိုင်သူ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,ပထမဦးဆုံးကုမ္ပဏီတစ်ခုကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,ကုမ္ပဏီပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,ကုမ္ပဏီပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Employee Education,Under Graduate,ဘွဲ့လွန်အောက်မှာ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target ကတွင်
 DocType: BOM,Total Cost,စုစုပေါင်းကုန်ကျစရိတ်
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,ရှေ့ဆကျတှဲ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumer
 DocType: Upload Attendance,Import Log,သွင်းကုန်အထဲ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ပေးပို့
+DocType: Sales Invoice Item,Delivered By Supplier,ပေးသွင်းခြင်းအားဖြင့်ကယ်နှုတ်တော်မူ၏
 DocType: SMS Center,All Contact,အားလုံးသည်ဆက်သွယ်ရန်
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,နှစ်ပတ်လည်လစာ
 DocType: Period Closing Voucher,Closing Fiscal Year,နိဂုံးချုပ်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Contra Entry '
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show ကိုအချိန် Logs
 DocType: Journal Entry Account,Credit in Company Currency,Company မှငွေကြေးစနစ်အတွက်အကြွေး
 DocType: Delivery Note,Installation Status,Installation လုပ်တဲ့နဲ့ Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},လက်ခံထားတဲ့ + Qty Item {0} သည်ရရှိထားသည့်အရေအတွက်နှင့်ညီမျှဖြစ်ရမည်ငြင်းပယ်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},လက်ခံထားတဲ့ + Qty Item {0} သည်ရရှိထားသည့်အရေအတွက်နှင့်ညီမျှဖြစ်ရမည်ငြင်းပယ်
 DocType: Item,Supply Raw Materials for Purchase,ဝယ်ယူခြင်းအဘို့အ supply ကုန်ကြမ်း
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,item {0} တစ်ဦးဝယ်ယူ Item ဖြစ်ရမည်
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Template ကို Download, သင့်လျော်သောအချက်အလက်ဖြည့်စွက်ခြင်းနှင့်ပြုပြင်ထားသောဖိုင်ပူးတွဲ။ ရွေးချယ်ထားတဲ့ကာလအတွက်အားလုံးသည်ရက်စွဲများနှင့်ဝန်ထမ်းပေါင်းစပ်လက်ရှိတက်ရောက်သူမှတ်တမ်းများနှင့်တကွ, template မှာရောက်လိမ့်မည်"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,item {0} တက်ကြွသို့မဟုတ်အသက်၏အဆုံးသည်မဖြစ်သေးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,item {0} တက်ကြွသို့မဟုတ်အသက်၏အဆုံးသည်မဖြစ်သေးရောက်ရှိခဲ့သည်
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,အရောင်းပြေစာ Submitted ပြီးနောက် updated လိမ့်မည်။
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,HR Module သည် Settings ကို
 DocType: SMS Center,SMS Center,SMS ကို Center က
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ဖွောငျ့စေ
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,မက်ဆေ့ခ်
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,စျေးနှုန်းနှင့်လျော့စျေးလျှောက်ထားသည်နည်းဥပဒေများ။
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},ဒါဟာအချိန်အထဲ {1} {2} သည် {0} သဟဇာတ
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,စျေးနှုန်း List ကိုဝယ်ယူသို့မဟုတ်ရောင်းချသည့်အဘို့အသက်ဆိုင်သောဖြစ်ရမည်
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Installation လုပ်တဲ့နေ့စွဲ Item {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installation လုပ်တဲ့နေ့စွဲ Item {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
 DocType: Pricing Rule,Discount on Price List Rate (%),စျေးနှုန်း List ကို Rate (%) အပေါ်လျှော့စျေး
-sites/assets/js/form.min.js +279,Start,စတင်
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,စတင်
 DocType: User,First Name,နာမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,သင့်ရဲ့ setup ကိုပြီးပြည့်စုံသည်။ လန်းဆန်း။
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,full-မှိုသွန်း
 DocType: Offer Letter,Select Terms and Conditions,စည်းကမ်းသတ်မှတ်ချက်များကိုရွေးပါ
 DocType: Production Planning Tool,Sales Orders,အရောင်းအမိန့်
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,အရောင်းပြေစာ Item ဆန့်ကျင်
 ,Production Orders in Progress,တိုးတက်မှုအတွက်ထုတ်လုပ်မှုကိုအမိန့်
 DocType: Lead,Address & Contact,လိပ်စာ & ဆက်သွယ်ရန်
+DocType: Leave Allocation,Add unused leaves from previous allocations,ယခင်ခွဲတမ်းအနေဖြင့်အသုံးမပြုတဲ့အရွက် Add
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Next ကိုထပ်တလဲလဲ {0} {1} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
 DocType: Newsletter List,Total Subscribers,စုစုပေါင်း Subscribers
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ဆက်သွယ်ရန်အမည်
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Pend Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,အထက်တွင်ဖော်ပြခဲ့သောစံသတ်မှတ်ချက်များသည်လစာစလစ်ဖန်တီးပေးပါတယ်။
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ဝယ်ယူတောင်းဆိုခြင်း။
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,နှစ်ချက်အိမ်ရာ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setup ကို> Settings> အမည်စီးရီးကနေတဆင့် {0} သည်စီးရီးအမည်သတ်မှတ် ကျေးဇူးပြု.
 DocType: Time Log,Will be updated when batched.,batched သည့်အခါ updated လိမ့်မည်။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,row {0}: ဤအနေနဲ့ကြိုတင် entry ကိုဖြစ်လျှင် {1} အကောင့်ဆန့်ကျင် '' ကြိုတင်ထုတ် Is '' စစ်ဆေးပါ။
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,row {0}: ဤအနေနဲ့ကြိုတင် entry ကိုဖြစ်လျှင် {1} အကောင့်ဆန့်ကျင် '' ကြိုတင်ထုတ် Is '' စစ်ဆေးပါ။
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},ဂိုဒေါင် {0} ကုမ္ပဏီမှ {1} ပိုင်ပါဘူး
 DocType: Bulk Email,Message,message
 DocType: Item Website Specification,Item Website Specification,item ဝက်ဘ်ဆိုက် Specification
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox ကို Access Key ကို
 DocType: Payment Tool,Reference No,ကိုးကားစရာမရှိပါ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Leave Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
 DocType: Stock Entry,Sales Invoice No,အရောင်းပြေစာမရှိ
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,နိမ့်ဆုံးအမိန့် Qt
 DocType: Pricing Rule,Supplier Type,ပေးသွင်း Type
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
 DocType: Item,Purchase Details,အသေးစိတ်ဝယ်ယူ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},item {0} ဝယ်ယူခြင်းအမိန့် {1} အတွက် '' ကုန်ကြမ်းထောက်ပံ့ '' table ထဲမှာမတှေ့
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,အမိန့်ကြေ
 DocType: Lead,Suggestions,အကြံပြုချက်များ
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,ဒီနယ်မြေတွေကိုအပေါ် Item Group မှပညာဘတ်ဂျက် Set လုပ်ပါ။ ကိုလည်းသင်ဖြန့်ဖြူး setting ကြောင့်ရာသီပါဝင်နိုင်ပါသည်။
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},ဂိုဒေါင် {0} သည်မိဘအကောင့်ကိုရိုက်ထည့်ပါအုပ်စုတစ်စု ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} ထူးချွန်ပမာဏ {2} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျဆန့်ကျင်ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} ထူးချွန်ပမာဏ {2} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျဆန့်ကျင်ငွေပေးချေမှုရမည့်
 DocType: Supplier,Address HTML,လိပ်စာက HTML
 DocType: Lead,Mobile No.,မိုဘိုင်းလ်အမှတ်
 DocType: Maintenance Schedule,Generate Schedule,ဇယား Generate
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,နယူးစတော့အ
 DocType: Period Closing Voucher,Closing Account Head,နိဂုံးချုပ်အကောင့်ဌာနမှူး
 DocType: Employee,External Work History,ပြင်ပလုပ်ငန်းခွင်သမိုင်း
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,မြို့ပတ်ရထားကိုးကားစရာအမှား
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,သင်အမှန်တကယ်ရပ်တန့်ချင်ပါနဲ့
 DocType: Communication,Closed,ပိတ်ထားသော
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,သင် Delivery Note ကိုကယျတငျတျောမူပါတစ်ချိန်ကစကား (ပို့ကုန်) ခုနှစ်တွင်မြင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,သင်ရပ်တန့်ဖို့လိုသည်မှာသေချာဖြစ်ကြသည်
 DocType: Lead,Industry,စက်မှုလုပ်ငန်း
 DocType: Employee,Job Profile,ယောဘ၏ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Newsletter,Newsletter,သတင်းလွှာ
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Delivery မှတ်ချက်
 DocType: Dropbox Backup,Allow Dropbox Access,Dropbox ကို Access က Allow
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ယခုရက်သတ္တပတ်များနှင့် Pend လှုပ်ရှားမှုများအကျဉ်းချုပ်
 DocType: Workstation,Rent Cost,ငှားရန်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,လနှင့်တစ်နှစ်ကို select ကျေးဇူးပြု.
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ဖောက်သည်ငွေကြေးဖောက်သည်ရဲ့အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, Delivery မှတ်ချက်, ဝယ်ယူခြင်းပြေစာ, ထုတ်လုပ်မှုအမိန့်, ဝယ်ယူခြင်းအမိန့်, ဝယ်ယူ Receipt, အရောင်းပြေစာ, အရောင်းအမိန့်, စတော့အိတ် Entry, Timesheet အတွက်ရရှိနိုင်"
 DocType: Item Tax,Tax Rate,အခွန်နှုန်း
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Item ကိုရွေးပါ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","item: {0} သုတ်ပညာစီမံခန့်ခွဲ, \ စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. ပြန်. မရနိုင်ပါ, အစားစတော့အိတ် Entry 'ကိုသုံး"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},row # {0}: Batch မရှိပါ {1} {2} အဖြစ်အတူတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Non-Group ကမှ convert
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ဝယ်ယူခြင်းပြေစာတင်သွင်းရမည်
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,လက်ရှိစတေ
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,တစ်ဦး Item ၏ batch (အများကြီး) ။
 DocType: C-Form Invoice Detail,Invoice Date,ကုန်ပို့လွှာနေ့စွဲ
 DocType: GL Entry,Debit Amount,debit ပမာဏ
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,သင့်အီးမေးလ်လိပ်စာ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
 DocType: Purchase Order,% Received,% ရရှိထားသည့်
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,ညွှန်ကြားချက်များ
 DocType: Quality Inspection,Inspected By,အားဖြင့်ကြည့်ရှုစစ်ဆေးသည်
 DocType: Maintenance Visit,Maintenance Type,ပြုပြင်ထိန်းသိမ်းမှု Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},serial No {0} Delivery မှတ်ချက် {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},serial No {0} Delivery မှတ်ချက် {1} ပိုင်ပါဘူး
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,item အရည်အသွေးစစ်ဆေးရေး Parameter
 DocType: Leave Application,Leave Approver Name,ခွင့်ပြုချက်အမည် Leave
 ,Schedule Date,ဇယားနေ့စွဲ
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,မှတ်ပုံတင်မည်ဝယ်ယူ
 DocType: Landed Cost Item,Applicable Charges,သက်ဆိုင်စွပ်စွဲချက်
 DocType: Workstation,Consumable Cost,စားသုံးသူများကုန်ကျစရိတ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ '' ထွက်ခွာခွင့်ပြုချက် '' ရှိရမယ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ '' ထွက်ခွာခွင့်ပြုချက် '' ရှိရမယ်
 DocType: Purchase Receipt,Vehicle Date,မော်တော်ယာဉ်နေ့စွဲ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ဆေးဘက်ဆိုင်ရာ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% Installed
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,ကုမ္ပဏီအမည်ကိုပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 DocType: BOM,Item Desription,item Desription
 DocType: Purchase Invoice,Supplier Name,ပေးသွင်းအမည်
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ထို ERPNext လက်စွဲစာအုပ် Read
 DocType: Account,Is Group,အုပ်စုဖြစ်ပါတယ်
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,FIFO အပေါ်အခြေခံပြီးအလိုအလြောကျ Set Serial အမှတ်
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ပေးသွင်းပြေစာနံပါတ်ထူးခြားသောစစ်ဆေး
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,အရောင
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,အားလုံးထုတ်လုပ်မှုလုပ်ငန်းစဉ်များသည်ကမ္ဘာလုံးဆိုင်ရာ setting ကို။
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen ထိအကောင့်
 DocType: SMS Log,Sent On,တွင် Sent
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
 DocType: Sales Order,Not Applicable,မသက်ဆိုင်ပါ
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,အားလပ်ရက်မာစတာ။
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,shell အတု ယူ. ပုံသှငျး
 DocType: Material Request Item,Required Date,လိုအပ်သောနေ့စွဲ
 DocType: Delivery Note,Billing Address,ကျသင့်ငွေတောင်းခံလွှာပေးပို့မည့်လိပ်စာ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
 DocType: BOM,Costing,ကုန်ကျ
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","checked အကယ်. ထားပြီးပုံနှိပ် Rate / ပုံနှိပ်ပမာဏတွင်ထည့်သွင်းသကဲ့သို့, အခွန်ပမာဏကိုထည့်သွင်းစဉ်းစားလိမ့်မည်"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,စုစုပေါင်း Qty
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),(မိနစ
 DocType: Customer,Buyer of Goods and Services.,ကုန်စည်နှင့်ဝန်ဆောင်မှုများ၏ဝယ်သောသူ။
 DocType: Journal Entry,Accounts Payable,ပေးရန်ရှိသောစာရင်း
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Subscribers Add
-sites/assets/js/erpnext.min.js +5,""" does not exists","တည်ရှိပါဘူး
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","တည်ရှိပါဘူး
 DocType: Pricing Rule,Valid Upto,သက်တမ်းရှိအထိ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,သင့်ရဲ့ဖောက်သည်၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,တိုက်ရိုက်ဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","အကောင့်အားဖြင့်အုပ်စုဖွဲ့လျှင်, အကောင့်ပေါ်မှာအခြေခံပြီး filter နိုင်ဘူး"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
 DocType: Payment Tool,Received Or Paid,ရရှိထားသည့်ဒါမှမဟုတ် Paid
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
 DocType: Stock Entry,Difference Account,ခြားနားချက်အကောင့်
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,၎င်း၏မှီခိုအလုပ်တစ်ခုကို {0} တံခါးပိတ်မဟုတ်ပါအဖြစ်အနီးကပ်အလုပ်တစ်ခုကိုမနိုင်သလား။
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
 DocType: Production Order,Additional Operating Cost,နောက်ထပ် Operating ကုန်ကျစရိတ်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,အလှကုန်
 DocType: DocField,Type,ပုံစံ
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
 DocType: Communication,Subject,ဘာသာရပ်
 DocType: Shipping Rule,Net Weight,အသားတင်အလေးချိန်
 DocType: Employee,Emergency Phone,အရေးပေါ်ဖုန်း
 ,Serial No Warranty Expiry,serial မရှိပါအာမခံသက်တမ်းကုန်ဆုံး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,သင်အမှန်တကယ်ကဒီပစ္စည်းတောင်းဆိုခြင်းကိုရပ်တန့်ချင်ပါသလား?
 DocType: Sales Order,To Deliver,လှတျတျောမူရန်
 DocType: Purchase Invoice Item,Item,အချက်
 DocType: Journal Entry,Difference (Dr - Cr),ခြားနားချက် (ဒေါက်တာ - Cr)
 DocType: Account,Profit and Loss,အမြတ်နှင့်အရှုံး
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,နယူး UOM type ကိုလုံးအရေအတွက်၏ဖြစ်မဟုတ်ပါရမယ်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,ပရိဘောဂနှင့်ကရိယာ
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,စျေးနှုန်းစာရင်းငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ Edit ကိုအခွ
 DocType: Purchase Invoice,Supplier Invoice No,ပေးသွင်းပြေစာမရှိ
 DocType: Territory,For reference,ကိုးကားနိုင်ရန်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","ဒါကြောင့်စတော့ရှယ်ယာငွေပေးငွေယူမှာအသုံးပြုတဲ့အတိုင်း, {0} Serial No မဖျက်နိုင်ပါ"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),(Cr) ပိတ်ပစ်
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),(Cr) ပိတ်ပစ်
 DocType: Serial No,Warranty Period (Days),အာမခံကာလ (Days)
 DocType: Installation Note Item,Installation Note Item,Installation မှတ်ချက် Item
 ,Pending Qty,ဆိုင်းငံ့ထား Qty
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,ငွေတောင်းခ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,repeat Customer များ
 DocType: Leave Control Panel,Allocate,နေရာချထား
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,လွန်ခဲ့သော
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,အရောင်းသို့ပြန်သွားသည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,အရောင်းသို့ပြန်သွားသည်
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,သင်ထုတ်လုပ်မှုအမိန့်ကိုဖန်တီးရန်လိုသည့်အနေဖြင့်အရောင်းအမိန့်ကိုရွေးချယ်ပါ။
+DocType: Item,Delivered by Supplier (Drop Ship),ပေးသွင်း (Drop သင်္ဘော) ဖြင့်ကယ်လွှတ်
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,လစာအစိတ်အပိုင်းများ။
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,အလားအလာရှိသောဖောက်သည်၏ဒေတာဘေ့စ။
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,customer ဒေတာဘေ့စ။
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Bill Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,စတော့ရှယ်ယာ entries တွေကိုဖန်ဆင်းထားတဲ့ဆန့်ကျင်နေတဲ့ယုတ္တိဂိုဒေါင်။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},ကိုးကားစရာမရှိပါ & ကိုးကားစရာနေ့စွဲ {0} သည်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},ကိုးကားစရာမရှိပါ & ကိုးကားစရာနေ့စွဲ {0} သည်လိုအပ်သည်
 DocType: Event,Wednesday,ဗုဒ္ဓဟူးနေ့
 DocType: Sales Invoice,Customer's Vendor,customer ရဲ့ vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ထုတ်လုပ်မှုအမိန့်မသင်မနေရဖြစ်ပါသည်
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'' တွင် အခြေခံ. 'နဲ့' Group မှဖြင့် '' အတူတူမဖွစျနိုငျ
 DocType: Sales Person,Sales Person Targets,အရောင်းပုဂ္ဂိုလ်ပစ်မှတ်များ
-sites/assets/js/form.min.js +271,To,ရန်
-apps/frappe/frappe/templates/base.html +143,Please enter email address,အီးမေးလ်လိပ်စာရိုက်ထည့်ပေးပါ
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ရန်
+apps/frappe/frappe/templates/base.html +145,Please enter email address,အီးမေးလ်လိပ်စာရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,အဆုံးပြွန်ဖွဲ့စည်း
 DocType: Production Order Operation,In minutes,မိနစ်
 DocType: Issue,Resolution Date,resolution နေ့စွဲ
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,စီမံကိန်းများအ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,ကျွမ်းလောင်
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ပြေစာအသေးစိတ် table ထဲမှာမတှေ့
 DocType: Company,Round Off Cost Center,ကုန်ကျစရိတ် Center ကပိတ် round
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 DocType: Material Request,Material Transfer,ပစ္စည်းလွှဲပြောင်း
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),ဖွင့်ပွဲ (ဒေါက်တာ)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Post Timestamp ကို {0} နောက်မှာဖြစ်ရပါမည်
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Settings ကို
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ကုန်ကျစရိတ်အခွန်နှင့်စွပ်စွဲချက်ဆင်းသက်
 DocType: Production Order Operation,Actual Start Time,အမှန်တကယ် Start ကိုအချိန်
 DocType: BOM Operation,Operation Time,စစ်ဆင်ရေးအချိန်
-sites/assets/js/list.min.js +5,More,နောက်ထပ်
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,နောက်ထပ်
 DocType: Pricing Rule,Sales Manager,အရောင်းမန်နေဂျာ
-sites/assets/js/desk.min.js +7673,Rename,Rename
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Rename
 DocType: Journal Entry,Write Off Amount,ငွေပမာဏပိတ်ရေးထား
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,ကွေး
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,အသုံးပြုသူ Allow
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,m
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ဖြောင့်မှေးကို
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,ရောင်းအားကို item ကိုခြေရာခံနှင့်၎င်းတို့၏အမှတ်စဉ် nos အပေါ်အခြေခံပြီးစာရွက်စာတမ်းများဝယ်ယူရန်။ ဤသည်ကိုလည်းထုတ်ကုန်၏အာမခံအသေးစိတ်အချက်အလက်များကိုခြေရာခံရန်အသုံးပြုနိုင်သည်။
 DocType: Purchase Receipt Item Supplied,Current Stock,လက်ရှိစတော့အိတ်
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,ပယ်ချဂိုဒေါင် regected တဲ့ item ကိုဆန့်ကျင်မသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,ပယ်ချဂိုဒေါင် regected တဲ့ item ကိုဆန့်ကျင်မသင်မနေရ
 DocType: Account,Expenses Included In Valuation,အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်တွင်ထည့်သွင်းကုန်ကျစရိတ်
 DocType: Employee,Provide email id registered in company,ကုမ္ပဏီမှတ်ပုံတင်အီးမေးလ်က id ပေး
 DocType: Hub Settings,Seller City,ရောင်းချသူစီးတီး
 DocType: Email Digest,Next email will be sent on:,Next ကိုအီးမေးလ်အပေါ်ကိုစလှေတျပါလိမ့်မည်:
 DocType: Offer Letter Term,Offer Letter Term,ပေးစာ Term ကိုပူဇော်
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,item မျိုးကွဲရှိပါတယ်။
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,item {0} မတွေ့ရှိ
 DocType: Bin,Stock Value,စတော့အိတ် Value တစ်ခု
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,သစ်ပင်ကို Type
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ကြိုဆိုပါတယ်
 DocType: Journal Entry,Credit Card Entry,Credit Card ကို Entry '
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Subject
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,ကုန်ပစ္စည်းများပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,ကုန်ပစ္စည်းများပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
 DocType: Communication,Open,ဖွင့်လှစ်
 DocType: Lead,Campaign Name,ကင်ပိန်းအမည်
 ,Reserved,Reserved
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,သင်အမှန်တကယ်နှငျ့လှတျချင်ပါနဲ့
 DocType: Purchase Order,Supply Raw Materials,supply ကုန်ကြမ်း
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,လာမယ့်ကုန်ပို့လွှာ generated လိမ့်မည်သည့်နေ့ရက်။ ဒါဟာတင်ပြရန်အပေါ် generated ဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,လက်ရှိပိုင်ဆိုင်မှုများ
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,customer ရဲ့ဝယ်ယူခြင်းအမိန့်မရှိပါ
 DocType: Employee,Cell Number,cell အရေအတွက်
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ဆုံးရှုံး
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ '' ဂျာနယ် Entry 'ဆန့်ကျင်' 'အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ '' ဂျာနယ် Entry 'ဆန့်ကျင်' 'အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,စွမ်းအင်ဝန်ကြီးဌာန
 DocType: Opportunity,Opportunity From,မှစ. အခွင့်အလမ်း
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,လစဉ်လစာကြေငြာချက်။
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,တာဝန်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
 DocType: Company,Default Cost of Goods Sold Account,ကုန်စည်၏ default ကုန်ကျစရိတ်အကောင့်ရောင်းချ
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
 DocType: Employee,Family Background,မိသားစုနောက်ခံသမိုင်း
 DocType: Process Payroll,Send Email,အီးမေးလ်ပို့ပါ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,ပိုမိုမြင့်မားသော weightage နှင့်အတူပစ္စည်းများပိုမိုမြင့်မားပြသပါလိမ့်မည်
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး Detail
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,ငါ့အငွေတောင်းခံလွှာ
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,ဝန်ထမ်းမျှမတွေ့ပါ
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ဝန်ထမ်းမျှမတွေ့ပါ
 DocType: Purchase Order,Stopped,ရပ်တန့်
 DocType: Item,If subcontracted to a vendor,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,စတင် BOM ကိုရွေးပါ
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,CSV က
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,အခုတော့ Send
 ,Support Analytics,ပံ့ပိုးမှု Analytics
 DocType: Item,Website Warehouse,website ဂိုဒေါင်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,သင်အမှန်တကယ်ထုတ်လုပ်မှုကိုအမိန့်ကိုရပ်တန့်ချင်ပါနဲ့:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","အော်တိုကုန်ပို့လွှာ 05, 28 စသည်တို့ကိုဥပမာ generated လိမ့်မည်ဟူသောရက်နေ့တွင်လ၏နေ့"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ရမှတ်ထက်လျော့နည်းသို့မဟုတ် 5 မှတန်းတူဖြစ်ရမည်
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form တွင်မှတ်တမ်းများ
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,ဖ
 DocType: Features Setup,"To enable ""Point of Sale"" features","Point သို့ရောင်းရငွေ၏" features တွေ enable လုပ်ဖို့
 DocType: Bin,Moving Average Rate,Moving ပျမ်းမျှနှုန်း
 DocType: Production Planning Tool,Select Items,ပစ္စည်းများကိုရွေးပါ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
 DocType: Comment,Reference Name,ကိုးကားစရာအမည်
 DocType: Maintenance Visit,Completion Status,ပြီးစီးနဲ့ Status
 DocType: Sales Invoice Item,Target Warehouse,Target ကဂိုဒေါင်
 DocType: Item,Allow over delivery or receipt upto this percent,ဒီရာခိုင်နှုန်းအထိပေးပို့သို့မဟုတ်လက်ခံရရှိကျော် Allow
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုအရောင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုအရောင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
 DocType: Upload Attendance,Import Attendance,သွင်းကုန်တက်ရောက်
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,All item အဖွဲ့များ
 DocType: Process Payroll,Activity Log,လုပ်ဆောင်ချက်အထဲ
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,အလိုအလျှောက်ငွေကြေးလွှဲပြောင်းမှုမှာတင်သွင်းခဲ့တဲ့အပေါ်သတင်းစကား compose ။
 DocType: Production Order,Item To Manufacture,ထုတ်လုပ်ခြင်းရန် item
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,အမြဲတမ်းမှိုသွန်း
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,ငွေပေးချေမှုရမည့်ရန်အမိန့်ကိုဝယ်ယူရန်
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} အဆင့်အတန်းဖြစ်ပါသည်
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ငွေပေးချေမှုရမည့်ရန်အမိန့်ကိုဝယ်ယူရန်
 DocType: Sales Order Item,Projected Qty,စီမံကိန်း Qty
 DocType: Sales Invoice,Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ
 DocType: Newsletter,Newsletter Manager,သတင်းလွှာ Manager က
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,တောင်းဆိုထားသော
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,စွမ်းဆောင်ရည်အကဲဖြတ်။
 DocType: Sales Invoice Item,Stock Details,စတော့အိတ် Details ကို
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,စီမံကိန်း Value တစ်ခု
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},{0} ရှေ့ဆက်မဆောင်ရွက်နိုင်သ
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,point-of-Sale
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},{0} ရှေ့ဆက်မဆောင်ရွက်နိုင်သ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","အကောင့်ဖွင့်ချိန်ခွင်ပြီးသားချေးငွေအတွက်, သင်တင်ထားရန်ခွင့်မပြုခဲ့ကြပါတယ် '' Debit 'အဖြစ်' 'Balance ဖြစ်ရမည်' '"
 DocType: Account,Balance must be,ချိန်ခွင်ဖြစ်ရမည်
 DocType: Hub Settings,Publish Pricing,စျေးနှုန်းများထုတ်ဝေ
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,ဝယ်ယူခြင်း Receipt
 ,Received Items To Be Billed,ကြေညာတဲ့ခံရဖို့ရရှိထားသည့်ပစ္စည်းများ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ပွန်းစားခြင်းပေါက်ကွဲမှု
-sites/assets/js/desk.min.js +3938,Ms,ဒေါ်
+DocType: Employee,Ms,ဒေါ်
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,ငွေကြေးလဲလှယ်မှုနှုန်းမာစတာ။
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
 DocType: Production Order,Plan material for sub-assemblies,က sub-အသင်းတော်တို့အဘို့အစီအစဉ်ကိုပစ္စည်း
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,အကွာအဝေး
 DocType: Supplier,Default Payable Accounts,default ပေးဆောင် Accounts ကို
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Features Setup,Item Barcode,item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,item Variant {0} updated
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ဝယ်ယူခြင်းပြေစာကြိုတင်ထုတ်
 DocType: Address,Shop,ကုန်ဆိုင်
 DocType: Hub Settings,Sync Now,အခုတော့ Sync ကို
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},row {0}: Credit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},row {0}: Credit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ဒီ mode ကိုရွေးချယ်ထားသောအခါ default ဘဏ်မှ / ငွေအကောင့်ကိုအလိုအလျှောက် POS ပြေစာအတွက် updated လိမ့်မည်။
 DocType: Employee,Permanent Address Is,အမြဲတမ်းလိပ်စာ Is
 DocType: Production Order Operation,Operation completed for how many finished goods?,စစ်ဆင်ရေးမည်မျှချောကုန်ပစ္စည်းများသည်ပြီးစီးခဲ့?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,အဆိုပါအမှတ်တံဆိပ်
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,{0} over- ခွင့် Item {1} သည်ကိုကူး။
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} over- ခွင့် Item {1} သည်ကိုကူး။
 DocType: Employee,Exit Interview Details,Exit ကိုအင်တာဗျူးအသေးစိတ်ကို
 DocType: Item,Is Purchase Item,ဝယ်ယူခြင်း Item ဖြစ်ပါတယ်
 DocType: Journal Entry Account,Purchase Invoice,ဝယ်ယူခြင်းပြေစာ
 DocType: Stock Ledger Entry,Voucher Detail No,ဘောက်ချာ Detail မရှိပါ
 DocType: Stock Entry,Total Outgoing Value,စုစုပေါင်းအထွက် Value တစ်ခု
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,နေ့စွဲနှင့်ပိတ်ရက်ဖွင့်လှစ်အတူတူဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းဖြစ်သင့်
 DocType: Lead,Request for Information,ပြန်ကြားရေးဝန်ကြီးဌာနတောင်းဆိုခြင်း
 DocType: Payment Tool,Paid,Paid
 DocType: Salary Slip,Total in words,စကားစုစုပေါင်း
 DocType: Material Request Item,Lead Time Date,ခဲအချိန်နေ့စွဲ
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,မဖြစ်မနေဖြစ်ပါတယ်။ ဒီတစ်ခါလည်းငွေကြေးစနစ်အိတ်ချိန်းစံချိန်ဖန်တီးသည်မ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},row # {0}: Item {1} သည် Serial No ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'' ကုန်ပစ္စည်း Bundle ကို '' ပစ္စည်းများကို, ဂိုဒေါင်, Serial No နှင့် Batch for မရှိ '' List ကိုထုပ်ပိုး '' စားပွဲကနေစဉ်းစားကြလိမ့်မည်။ ဂိုဒေါင်နှင့် Batch မရှိဆို '' ကုန်ပစ္စည်း Bundle ကို '' တဲ့ item ပေါင်းသည်တလုံးထုပ်ပိုးပစ္စည်းများသည်အတူတူပင်ဖြစ်ကြောင်း အကယ်. အဲဒီတန်ဖိုးတွေကိုအဓိက Item table ထဲမှာသို့ဝင်နိုင်ပါတယ်, တန်ဖိုးများကို '' Pack များစာရင်း '' စားပွဲကိုမှကူးယူလိမ့်မည်။"
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,ဖောက်သည်တင်ပို့ရောင်းချမှု။
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ဖောက်သည်တင်ပို့ရောင်းချမှု။
 DocType: Purchase Invoice Item,Purchase Order Item,ဝယ်ယူခြင်းအမိန့် Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,သွယ်ဝိုက်ဝင်ငွေခွန်
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,ငွေပေးချေမှုရမည့်ငွေပမာဏ set = ထူးချွန်ပမာဏ
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,လိပ်စာစာကြော
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,ကှဲလှဲ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ကုမ္ပဏီအမည်
 DocType: SMS Center,Total Message(s),စုစုပေါင်း Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,အားလုံးအကူအညီနဲ့ဗီဒီယိုစာရင်းကိုကြည့်ခြင်း
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,စစ်ဆေးမှုများအနည်ရာဘဏ်အကောင့်ဖွင့်ဦးခေါင်းကိုရွေးချယ်ပါ။
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,အသုံးပြုသူငွေကြေးလွှဲပြောင်းမှုမှာစျေးနှုန်း List ကို Rate တည်းဖြတ်ရန် Allow
 DocType: Pricing Rule,Max Qty,max Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,row {0}: / ဝယ်ယူခြင်းအမိန့်ကိုအမြဲကြိုတင်အဖြစ်မှတ်သားထားသင့်အရောင်းဆန့်ကျင်ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,row {0}: / ဝယ်ယူခြင်းအမိန့်ကိုအမြဲကြိုတင်အဖြစ်မှတ်သားထားသင့်အရောင်းဆန့်ကျင်ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,ဓါတုဗေဒ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
 DocType: Process Payroll,Select Payroll Year and Month,လစာတစ်နှစ်တာနှင့်လကိုရွေးချယ်ပါ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",အမျိုးအစား) ကလေးသူငယ် Add ကိုနှိပ်ခြင်းအားဖြင့် ("Bank က" သင့်လျော်သောအုပ်စု (ရန်ပုံငွေကိုပုံမှန်အားဖြင့်လျှောက်လွှာ> လက်ရှိပိုင်ဆိုင်မှုများ> Bank မှ Accounts ကိုသွားပြီးသစ်တစ်ခုအကောင့်ဖန်တီး
 DocType: Workstation,Electricity Cost,လျှပ်စစ်မီးကုန်ကျစရိတ်
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,အ
 DocType: SMS Center,All Lead (Open),အားလုံးသည်ခဲ (ပွင့်လင်း)
 DocType: Purchase Invoice,Get Advances Paid,ကြိုတင်ငွေ Paid Get
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,သင်၏ရုပ်ပုံ Attach
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,လုပ်ပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,လုပ်ပါ
 DocType: Journal Entry,Total Amount in Words,စကားအတွက်စုစုပေါင်းပမာဏ
 DocType: Workflow State,Stop,ရပ်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ဆိုတဲ့ error ရှိခဲ့သည်။ တစျခုဖြစ်နိုင်သည်ဟုအကြောင်းပြချက်ကိုသင်ပုံစံကယ်တင်ခြင်းသို့မရောက်ကြပြီဖြစ်နိုင်ပါတယ်။ ပြဿနာရှိနေသေးလျှင် support@erpnext.com ကိုဆက်သွယ်ပါ။
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,ထုပ်ပိုး Item စ
 DocType: POS Profile,Cash/Bank Account,ငွေသား / ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
 DocType: Delivery Note,Delivery To,ရန် Delivery
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
 DocType: Production Planning Tool,Get Sales Orders,အရောင်းအမိန့် Get
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} အနုတ်လက္ခဏာမဖြစ်နိုင်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,FILE
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',အချိန
 DocType: Project,Internal,internal
 DocType: Task,Urgent,အမြန်လိုသော
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},{1} table ထဲမှာအတန်း {0} သည်မှန်ကန်သော Row ID ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Desktop ပေါ်တွင် Go နှင့် ERPNext စတင်သုံးစွဲ
 DocType: Item,Manufacturer,လုပ်ငန်းရှင်
 DocType: Landed Cost Item,Purchase Receipt Item,ဝယ်ယူခြင်းပြေစာ Item
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,အရောင်းအမိန့် / Finished ကုန်စည်ဂိုဒေါင်ထဲမှာ Reserved ဂိုဒေါင်
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,ငွေပမာဏရောင်းချနေ
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,အချိန် Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,သင်သည်ဤစံချိန်များအတွက်ကုန်ကျစရိတ်အတည်ပြုချက်ဖြစ်ကြ၏။ ကို 'နဲ့ Status' နှင့် Save ကို Update ကျေးဇူးပြု.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,သင်သည်ဤစံချိန်များအတွက်ကုန်ကျစရိတ်အတည်ပြုချက်ဖြစ်ကြ၏။ ကို 'နဲ့ Status' နှင့် Save ကို Update ကျေးဇူးပြု.
 DocType: Serial No,Creation Document No,ဖန်ဆင်းခြင်း Document ဖိုင်မရှိပါ
 DocType: Issue,Issue,ထုတ်ပြန်သည်
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Item Variant သည် attributes ။ ဥပမာ Size အ, အရောင်စသည်တို့"
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,ဆန့်ကျင်
 DocType: Item,Default Selling Cost Center,default ရောင်းချသည့်ကုန်ကျစရိတ် Center က
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},အရောင်းအမိန့် {0} {1} ဖြစ်ပါသည်
 DocType: Opportunity,Contact Info,Contact Info
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
 DocType: Packing Slip,Net Weight UOM,Net ကအလေးချိန် UOM
 DocType: Item,Default Supplier,default ပေးသွင်း
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ထုတ်လုပ်မှု Allow ရာခိုင်နှုန်းကျော်
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,အပတ်စဉ်ပိတ် Get နေ့ရက်များ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,အဆုံးနေ့စွဲ Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Sales Person,Select company name first.,ပထမဦးဆုံးကုမ္ပဏီ၏နာမကိုရွေးချယ်ပါ။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,ဒေါက်တာ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,ဒေါက်တာ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ကိုးကားချက်များပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{1} {2} | {0} မှ
 DocType: Time Log Batch,updated via Time Logs,အချိန် Logs ကနေတဆင့် updated
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,သင့်ရဲ့ကိုးကားနိုင်ရန်ကုမ္ပဏီမှတ်ပုံတင်နံပါတ်များ။ အခွန်နံပါတ်များစသည်တို့
 DocType: Sales Partner,Distributor,ဖြန့်ဖြူး
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,စျေးဝယ်တွန်းလှည်း Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 ,Ordered Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ထုတ်ပစ္စည်းများ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Range ထဲထဲကနေ A မျိုးမျိုးရန်ထက်လျော့နည်းဖြစ်ဖို့ရှိပါတယ်
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,အချိန် Logs ကိုရွေးပြီးအသစ်တစ်ခုကိုအရောင်းပြေစာကိုဖန်တီးရန် Submit ။
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,အခ
 DocType: Lead,Lead,ခဲ
 DocType: Email Digest,Payables,ပေးအပ်သော
 DocType: Account,Warehouse,ကုနျလှောငျရုံ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
 ,Purchase Order Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
 DocType: Purchase Invoice Item,Net Rate,Net က Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,ဝယ်ယူခြင်းပြေစာ Item
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled ငွ
 DocType: Global Defaults,Current Fiscal Year,လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 DocType: Global Defaults,Disable Rounded Total,Rounded စုစုပေါင်းကို disable
 DocType: Lead,Call,တယ်လီဖုန်းဆက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'' Entries 'လွတ်နေတဲ့မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'' Entries 'လွတ်နေတဲ့မဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},{1} တူညီနှင့်အတူအတန်း {0} Duplicate
 ,Trial Balance,ရုံးတင်စစ်ဆေး Balance
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
-sites/assets/js/erpnext.min.js +5,"Grid """,grid "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,grid "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,သုတေသန
 DocType: Maintenance Visit Purpose,Work Done,အလုပ် Done
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,ကိုစလှေတျ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,view လယ်ဂျာ
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
 DocType: Communication,Delivery Status,Delivery နဲ့ Status
 DocType: Production Order,Manufacture against Sales Order,အရောင်းအမိန့်ဆန့်ကျင်ထုတ်လုပ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,အဆိုပါ Item {0} Batch ရှိသည်မဟုတ်နိုင်
 ,Budget Variance Report,ဘဏ္ဍာငွေအရအသုံးကှဲလှဲအစီရင်ခံစာ
 DocType: Salary Slip,Gross Pay,gross Pay ကို
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Paid အမြတ်ဝေစု
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,လယ်ဂျာစာရင်းကိုင်
 DocType: Stock Reconciliation,Difference Amount,ကွာခြားချက်ပမာဏ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,ထိန်းသိမ်းထားသောဝင်ငွေများ
 DocType: BOM Item,Item Description,item ဖော်ပြချက်များ
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,အခွင့်အလမ်း Ite
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,ယာယီဖွင့်ပွဲ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,ဝန်ထမ်းထွက်ခွာ Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},အကောင့်သည်ချိန်ခွင် {0} အမြဲ {1} ဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},အကောင့်သည်ချိန်ခွင် {0} အမြဲ {1} ဖြစ်ရမည်
 DocType: Address,Address Type,လိပ်စာရိုက်ထည့်ပါ
 DocType: Purchase Receipt,Rejected Warehouse,ပယ်ချဂိုဒေါင်
 DocType: GL Entry,Against Voucher,ဘောက်ချာဆန့်ကျင်
 DocType: Item,Default Buying Cost Center,default ဝယ်ယူကုန်ကျစရိတ် Center က
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext ထဲကအကောင်းဆုံးကိုရဖို့ရန်, အကြှနျုပျတို့သညျအခြို့သောအချိန်ယူနှင့်ဤအကူအညီဗီဒီယိုများစောင့်ကြည့်ဖို့အကြံပြုလိုပါတယ်။"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,item {0} အရောင်း Item ဖြစ်ရမည်
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,ရန်
 DocType: Item,Lead Time in days,လက်ထက်ကာလ၌အချိန်ကိုဦးဆောင်
 ,Accounts Payable Summary,Accounts ကိုပေးဆောင်အကျဉ်းချုပ်
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},အေးခဲအကောင့် {0} တည်းဖြတ်ခွင့်ပြုချက်မရ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},အေးခဲအကောင့် {0} တည်းဖြတ်ခွင့်ပြုချက်မရ
 DocType: Journal Entry,Get Outstanding Invoices,ထူးချွန်ငွေတောင်းခံလွှာကိုရယူပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,အရောင်းအမိန့် {0} တရားဝင်မဟုတ်
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,ထုတ်ဝေသည့်နေရာ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,စာချုပ်
 DocType: Report,Disabled,ချို့ငဲသော
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM လိုအပ် UOM ဖုံးလွှမ်းအချက်: Item အတွက် {0}: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM လိုအပ် UOM ဖုံးလွှမ်းအချက်: Item အတွက် {0}: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,သွယ်ဝိုက်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,row {0}: Qty မသင်မနေရ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,လယ်ယာစိုက်ပျိုးရေး
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,ငွေပေးချေမှုရ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ဒါကအမြစ်ကို item အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
 DocType: Journal Entry Account,Purchase Order,ကုန်ပစ္စည်းအမှာစာ
 DocType: Warehouse,Warehouse Contact Info,ဂိုဒေါင် Contact Info
-sites/assets/js/form.min.js +190,Name is required,နာမတော်ကိုမလိုအပ်သည်
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,နာမတော်ကိုမလိုအပ်သည်
 DocType: Purchase Invoice,Recurring Type,ထပ်တလဲလဲ Type
 DocType: Address,City/Town,မြို့တော် / မြို့
 DocType: Email Digest,Annual Income,နှစ်စဉ်ဝင်ငွေ
 DocType: Serial No,Serial No Details,serial No အသေးစိတ်ကို
 DocType: Purchase Invoice Item,Item Tax Rate,item အခွန်နှုန်း
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,item {0} တစ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,မြို့တော်ပစ္စည်းများ
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,ရည်မှန်းချက်
 DocType: Sales Invoice Item,Edit Description,Edit ကိုဖော်ပြချက်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,မျှော်လင့်ထားသည့် Delivery Date ကိုစီစဉ်ထားသော Start ကိုနေ့စွဲထက်ယျဆုံးသောဖြစ်ပါတယ်။
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,ပေးသွင်းအကြောင်းမူကား
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,ပေးသွင်းအကြောင်းမူကား
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Account Type ကိုချိန်ညှိခြင်းကိစ္စများကို၌ဤအကောင့်ကိုရွေးချယ်ခြင်းအတွက်ကူညီပေးသည်။
 DocType: Purchase Invoice,Grand Total (Company Currency),က Grand စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,စုစုပေါင်းအထွက်
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",သာ "To Value တစ်ခု" ကို 0 င်သို့မဟုတ်ကွက်လပ်တန်ဖိုးကိုနှင့်တသားတ Shipping Rule အခြေအနေမရှိနိုငျ
 DocType: Authorization Rule,Transaction,ကိစ္စ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,မှတ်ချက်: ဤကုန်ကျစရိတ် Center ကတစ်ဦးအုပ်စုဖြစ်ပါတယ်။ အုပ်စုများဆန့်ကျင်စာရင်းကိုင် entries တွေကိုလုပ်မရပါ။
-apps/erpnext/erpnext/config/projects.py +43,Tools,Tools များ
+apps/frappe/frappe/config/desk.py +7,Tools,Tools များ
 DocType: Item,Website Item Groups,website Item အဖွဲ့များ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,ထုတ်လုပ်မှုအမိန့်နံပါတ်စတော့ရှယ်ယာ entry ကိုရည်ရွယ်ချက်ထုတ်လုပ်ခြင်းသည်မသင်မနေရ
 DocType: Purchase Invoice,Total (Company Currency),စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,Workstation နှင့်အမည်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,အီးမေးလ် Digest မဂ္ဂဇင်း:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Sales Partner,Target Distribution,Target ကဖြန့်ဖြူး
-sites/assets/js/desk.min.js +7652,Comments,comments
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,comments
 DocType: Salary Slip,Bank Account No.,ဘဏ်မှအကောင့်အမှတ်
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ဤရှေ့ဆက်အတူပြီးခဲ့သည့်နေသူများကဖန်တီးအရောင်းအဝယ်အရေအတွက်သည်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Item {0} လိုအပ်အဘိုးပြတ် Rate
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,တစ်က
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,အခွင့်ထူးထွက်ခွာ
 DocType: Purchase Invoice,Supplier Invoice Date,ပေးသွင်းပြေစာနေ့စွဲ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,သင်ကစျေးဝယ်ခြင်းတွန်းလှည်း enable ရန်လိုအပ်သည်
-sites/assets/js/form.min.js +212,No Data,အဘယ်သူမျှမအချက်အလက်
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,အဘယ်သူမျှမအချက်အလက်
 DocType: Appraisal Template Goal,Appraisal Template Goal,စိစစ်ရေး Template: Goal
 DocType: Salary Slip,Earning,ဝင်ငွေ
 DocType: Payment Tool,Party Account Currency,ပါတီ၏အကောင့်ကိုငွေကြေးစနစ်
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,ပါတီ၏အကောင်
 DocType: Purchase Taxes and Charges,Add or Deduct,Add သို့မဟုတ်ထုတ်ယူ
 DocType: Company,If Yearly Budget Exceeded (for expense account),နှစ်အလိုက်ဘတ်ဂျက် (စရိတ်အကောင့်) ကိုကျော်လွန်လိုလျှင်
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,အကြားတွေ့ရှိထပ်အခြေအနေများ:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,ဂျာနယ် Entry '{0} ဆန့်ကျင်နေပြီအချို့သောအခြားဘောက်ချာဆန့်ကျင်ညှိယူဖြစ်ပါတယ်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,ဂျာနယ် Entry '{0} ဆန့်ကျင်နေပြီအချို့သောအခြားဘောက်ချာဆန့်ကျင်ညှိယူဖြစ်ပါတယ်
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,စုစုပေါင်းအမိန့် Value တစ်ခု
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,အစာ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,လည်ပတ်သူများမရှိပါ
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","အဆက်အသွယ်များ, စေပြီးမှသတင်းလွှာ။"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},အနီးကပ်အကောင့်ကို၏ငွေကြေး {0} ဖြစ်ရပါမည်
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},အားလုံးပန်းတိုင်သည်ရမှတ် sum 100 ဖြစ်သင့်သည်က {0} သည်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,စစ်ဆင်ရေးအလွတ်ကျန်မရနိုင်ပါ။
 ,Delivered Items To Be Billed,ကြေညာတဲ့ခံရဖို့ကယ်နှုတ်တော်မူ၏ပစ္စည်းများ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ဂိုဒေါင် Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},{0} မှ updated status
 DocType: DocField,Description,ဖေါ်ပြချက်
 DocType: Authorization Rule,Average Discount,ပျမ်းမျှအားလျှော့
 DocType: Letter Head,Is Default,ပုံမှန်ဖြစ်
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,item အခွန်ပမာဏ
 DocType: Item,Maintain Stock,စတော့အိတ်ထိန်းသိမ်းနည်း
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries
 DocType: Leave Control Panel,Leave blank if considered for all designations,အားလုံးပုံစံတခုစဉ်းစားလျှင်အလွတ် Leave
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,'' အမှန်တကယ် '' အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,'' အမှန်တကယ် '' အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime ကနေ
 DocType: Email Digest,For Company,ကုမ္ပဏီ
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,သဘောင်္တင်ခ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ငွေစာရင်း၏ဇယား
 DocType: Material Request,Terms and Conditions Content,စည်းကမ်းသတ်မှတ်ချက်များအကြောင်းအရာ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,ပိုင်ဆိုင်
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Pay ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,အာမခံ / AMC နဲ့ St
 DocType: GL Entry,GL Entry,GL Entry '
 DocType: HR Settings,Employee Settings,ဝန်ထမ်း Settings ကို
 ,Batch-Wise Balance History,batch-ပညာရှိ Balance သမိုင်း
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,စာရင်းလုပ်ပါမှ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,စာရင်းလုပ်ပါမှ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,အလုပ်သင်သူ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,အနုတ်လက္ခဏာပမာဏခွင့်ပြုမထားဘူး
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office ကိုငှား
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,သွင်းကုန်မအောင်မြင်ပါ!
-sites/assets/js/erpnext.min.js +24,No address added yet.,အဘယ်သူမျှမလိပ်စာသေးကဆက်ပြောသည်။
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,အဘယ်သူမျှမလိပ်စာသေးကဆက်ပြောသည်။
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation နှင့်အလုပ်အဖွဲ့ Hour
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,လေ့လာဆန်းစစ်သူ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} JV ငွေပမာဏ {2} ထက်လျော့နည်းသို့မဟုတ်နှင့်ထပ်တူဖြစ်ရပါမည်
 DocType: Item,Inventory,စာရင်း
 DocType: Features Setup,"To enable ""Point of Sale"" view","Point သို့ရောင်းရငွေ၏" အမြင် enable လုပ်ဖို့
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,ငွေပေးချေမှုရမည့်အချည်းနှီးလှည်းတို့ကိုလုပ်မပြနိုင်
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ငွေပေးချေမှုရမည့်အချည်းနှီးလှည်းတို့ကိုလုပ်မပြနိုင်
 DocType: Item,Sales Details,အရောင်းအသေးစိတ်ကို
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,ပစ္စည်းများနှင့်အတူ
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",လာမယ့်ကုန်ပို့လွှာ generated လိမ့်မည်သည့်နေ့ရက်။ ဒါဟာတင်ပြရန်အပေါ် generated ဖြစ်ပါတယ်။
 DocType: Item Attribute,Item Attribute,item Attribute
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,အစိုးရ
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,item Variant
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,item Variant
 DocType: Company,Services,န်ဆောင်မှုများ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),စုစုပေါင်း ({0})
 DocType: Cost Center,Parent Cost Center,မိဘကုန်ကျစရိတ် Center က
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Employee External Work History,Total Experience,စုစုပေါင်းအတွေ့အကြုံ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက်
 DocType: Material Request Item,Sales Order No,အရောင်းအမိန့်မရှိပါ
 DocType: Item Group,Item Group Name,item Group မှအမည်
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,ယူ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ယူ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Manufacturing သည်ပစ္စည်းများလွှဲပြောင်း
 DocType: Pricing Rule,For Price List,စျေးနှုန်း List တွေ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,အချိန်ဇယားမျာ
 DocType: Purchase Invoice Item,Net Amount,Net ကပမာဏ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail မရှိပါ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),အပိုဆောင်းလျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-DocType: Period Closing Voucher,CoA Help,CoA အကူအညီ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},error: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},error: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,ငွေစာရင်း၏ Chart ဟာကနေအကောင့်သစ်ဖန်တီးပေးပါ။
 DocType: Maintenance Visit,Maintenance Visit,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ဖောက်သည်> ဖောက်သည်အုပ်စု> နယ်မြေတွေကို
@@ -1309,19 +1316,19 @@ DocType: Sales Partner,Sales Partner Target,အရောင်း Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါတယ်များအတွက်စာရင်းကိုင် Entry '
 DocType: Pricing Rule,Pricing Rule,စျေးနှုန်း Rule
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,ထစ်
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအ​​သုံးပြုမှ material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအ​​သုံးပြုမှ material တောင်းဆိုခြင်း
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},row # {0}: Return Item {1} {2} {3} ထဲမှာရှိနေပြီပါဘူး
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ဘဏ်မှ Accounts ကို
 ,Bank Reconciliation Statement,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေးထုတ်ပြန်ကြေညာချက်
 DocType: Address,Lead Name,ခဲအမည်
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,စတော့အိတ် Balance ဖွင့်လှစ်
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,စတော့အိတ် Balance ဖွင့်လှစ်
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} တစ်ခါသာပေါ်လာရကြမည်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ဝယ်ယူခြင်းအမိန့် {2} ဆန့်ကျင် {1} ထက် {0} ပိုပြီး tranfer ခွင့်မပြုခဲ့
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},{0} သည်အောင်မြင်စွာကျင်းပပြီးစီးခွဲဝေရွက်
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},{0} သည်အောင်မြင်စွာကျင်းပပြီးစီးခွဲဝေရွက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,သိမ်းဆည်းရန်ပစ္စည်းများမရှိပါ
 DocType: Shipping Rule Condition,From Value,Value တစ်ခုကနေ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,ဘဏ်ထဲမှာထင်ဟပ်မဟုတ်ပမာဏ
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ကုမ္ပဏီစရိတ်များအတွက်တောင်းဆိုမှုများ။
@@ -1334,19 +1341,20 @@ DocType: Opportunity,Contact Mobile No,မိုဘိုင်းလ်မရ
 DocType: Production Planning Tool,Select Sales Orders,အရောင်းအမိန့်ကိုရွေးပါ
 ,Material Requests for which Supplier Quotations are not created,ပေးသွင်းကိုးကားချက်များကိုဖန်ဆင်းသည်မဟုတ်သော material တောင်းဆို
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,barcode ကို အသုံးပြု. ပစ္စည်းများခြေရာခံရန်။ သင်ဟာ item ၏ barcode scan ဖတ်ခြင်းဖြင့် Delivery Note နှင့်အရောင်းပြေစာအတွက်ပစ္စည်းများဝင်နိုင်ပါလိမ့်မည်။
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,"ကယ်နှုတ်တော်မူ၏အဖြစ်, Mark"
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,စျေးနှုန်းလုပ်ပါ
 DocType: Dependent Task,Dependent Task,မှီခို Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ကြိုတင်မဲအတွက် X ကိုနေ့ရက်ကာလအဘို့စစ်ဆင်ရေးစီစဉ်ကြိုးစားပါ။
 DocType: HR Settings,Stop Birthday Reminders,မွေးနေသတိပေးချက်များကိုရပ်တန့်
 DocType: SMS Center,Receiver List,receiver များစာရင်း
 DocType: Payment Tool Detail,Payment Amount,ငွေပေးချေမှုရမည့်ငွေပမာဏ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,စားသုံးသည့်ပမာဏ
-sites/assets/js/erpnext.min.js +51,{0} View,{0} ကြည့်ရန်
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ကြည့်ရန်
 DocType: Salary Structure Deduction,Salary Structure Deduction,လစာဖွဲ့စည်းပုံထုတ်ယူ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selective လေဆာ sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,အောင်မြင်သောတင်သွင်း!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ထုတ်ပေးခြင်းပစ္စည်းများ၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
@@ -1367,7 +1375,7 @@ DocType: Company,Default Payable Account,default ပေးဆောင်အက
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ထိုကဲ့သို့သောစသည်တို့ရေကြောင်းစည်းမျဉ်းစည်းကမ်းများ, စျေးနှုန်းစာရင်းအဖြစ်အွန်လိုင်းစျေးဝယ်လှည်းသည် Settings ကို"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup ကို Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,ကြေညာတဲ့ {0}%
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reserved Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,ပါတီအကောင့်
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,လူ့အင်အားအရင်းအမြစ်
 DocType: Lead,Upper Income,အထက်ဝင်ငွေခွန်
@@ -1410,11 +1418,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,စျေးဝယ်ခြင်းတွန်းလှည်းကို Enable
 DocType: Employee,Permanent Address,အမြဲတမ်းလိပ်စာ
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,item {0} တဲ့ဝန်ဆောင်မှု Item ဖြစ်ရမည်။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0} {1} က Grand စုစုပေါင်း {2} ထက် သာ. ကြီးမြတ် \ မဖွစျနိုငျဆန့်ကျင်ပေးဆောင်ကြိုတင်မဲ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,ကို item code ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Pay (LWP) မရှိရင်ထွက်ခွာသည်ထုတ်ယူကိုလျော့ချ
 DocType: Territory,Territory Manager,နယ်မြေတွေကို Manager က
+DocType: Delivery Note Item,To Warehouse (Optional),ဂိုဒေါင် (Optional) မှ
 DocType: Sales Invoice,Paid Amount (Company Currency),Paid ပမာဏ (Company မှငွေကြေးစနစ်)
 DocType: Purchase Invoice,Additional Discount,အပိုဆောင်းလျှော့
 DocType: Selling Settings,Selling Settings,Settings ကိုရောင်းချနေ
@@ -1437,7 +1446,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,သတ္တုတူးဖော်ရေး
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ဗဓေလသစ်သွန်း
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,ပထမဦးဆုံး {0} ကို select ပေးပါ။
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,ပထမဦးဆုံး {0} ကို select ပေးပါ။
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},စာသားအ {0}
 DocType: Territory,Parent Territory,မိဘနယ်မြေတွေကို
 DocType: Quality Inspection Reading,Reading 2,2 Reading
@@ -1465,11 +1474,11 @@ DocType: Sales Invoice Item,Batch No,batch မရှိပါ
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,တစ်ဖောက်သည်ရဲ့ဝယ်ယူမိန့်ဆန့်ကျင်မျိုးစုံအရောင်းအမိန့် Allow
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,အဓိက
 DocType: DocPerm,Delete,Delete
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,မူကွဲ
-sites/assets/js/desk.min.js +7971,New {0},နယူး {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,မူကွဲ
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},နယူး {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,ရပ်တန့်နိုင်ရန်ဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့လှတျ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,ရပ်တန့်နိုင်ရန်ဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့လှတျ။
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
 DocType: Employee,Leave Encashed?,Encashed Leave?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,လယ်ပြင်၌ မှစ. အခွင့်အလမ်းမသင်မနေရ
 DocType: Item,Variants,မျိုးကွဲ
@@ -1487,7 +1496,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,ပြည်
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,လိပ်စာများ
 DocType: Communication,Received,ရရှိထားသည့်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry '{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry '{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Serial No Item {0} သည်သို့ဝင် Duplicate
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,တစ် Shipping Rule များအတွက်အခြေအနေ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,item ထုတ်လုပ်မှုအမိန့်ရှိခွင့်မပြုခဲ့တာဖြစ်ပါတယ်။
@@ -1508,7 +1517,6 @@ DocType: Employee,Salutation,နှုတ်ဆက်
 DocType: Communication,Rejected,ပယ်ချ
 DocType: Pricing Rule,Brand,ကုန်အမှတ်တံဆိပ်
 DocType: Item,Will also apply for variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% ကယ်နှုတ်တော်မူ၏
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,ရောင်းရငွေ၏အချိန်ပစ္စည်းများကို bundle ။
 DocType: Sales Order Item,Actual Qty,အမှန်တကယ် Qty
 DocType: Sales Invoice Item,References,ကိုးကား
@@ -1546,14 +1554,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,ညှပ်
 DocType: Item,Has Variants,မူကွဲရှိပါတယ်
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,အသစ်တစ်ခုကိုအရောင်းပြေစာကိုဖန်တီးရန်ခလုတ်ကို '' အရောင်းပြေစာလုပ်ပါ '' ပေါ်တွင်ကလစ်နှိပ်ပါ။
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,မှစ. နှင့်ကာလ% s ထပ်တလဲလဲတွေအတွက်မဖြစ်မနေရက်စွဲများရန်ကာလ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,ထုပ်ပိုးပစ္စည်းများနှင့်တံဆိပ်ကပ်ခြင်း
 DocType: Monthly Distribution,Name of the Monthly Distribution,အဆိုပါလစဉ်ဖြန့်ဖြူးအမည်
 DocType: Sales Person,Parent Sales Person,မိဘအရောင်းပုဂ္ဂိုလ်
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,ကုမ္ပဏီနှင့် Master နှင့် Global Defaults ကိုအတွက်ပုံမှန်ငွေကြေးစနစ်ကိုသတ်မှတ်ပေးပါ
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox ကို Access ကလျှို့ဝှက်ချက်
 DocType: Purchase Invoice,Recurring Invoice,ထပ်တလဲလဲပြေစာ
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,စီမံခန့်ခွဲမှုစီမံကိန်းများ
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,စီမံခန့်ခွဲမှုစီမံကိန်းများ
 DocType: Supplier,Supplier of Goods or Services.,ကုန်စည်သို့မဟုတ်န်ဆောင်မှုများ၏ပေးသွင်း။
 DocType: Budget Detail,Fiscal Year,ဘဏ္ဍာရေးနှစ်
 DocType: Cost Center,Budget,ဘတ်ဂျက်
@@ -1581,11 +1588,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,အရောင်းရဆုံး
 DocType: Employee,Salary Information,လစာပြန်ကြားရေး
 DocType: Sales Person,Name and Employee ID,အမည်နှင့်ထမ်း ID ကို
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
 DocType: Website Item Group,Website Item Group,website Item Group က
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,တာဝန်နှင့်အခွန်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} ငွေပေးချေမှု entries တွေကို {1} ကြောင့် filtered မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ငွေပေးချေမှု entries တွေကို {1} ကြောင့် filtered မရနိုင်ပါ
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Web Site မှာပြထားတဲ့လိမ့်မည်ဟု Item သည်စားပွဲတင်
 DocType: Purchase Order Item Supplied,Supplied Qty,supply Qty
 DocType: Material Request Item,Material Request Item,material တောင်းဆိုမှု Item
@@ -1593,7 +1600,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Item အဖွဲ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,ဒီတာဝန်ခံအမျိုးအစားသည်ထက် သာ. ကြီးမြတ်သို့မဟုတ်လက်ရှိအတန်းအရေအတွက်တန်းတူအတန်းအရေအတွက်ကိုရည်ညွှန်းနိုင်ဘူး
 ,Item-wise Purchase History,item-ပညာရှိသဝယ်ယူခြင်းသမိုင်း
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,နီသော
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Serial No ဆွဲယူဖို့ '' Generate ဇယား '' ကို click ပါ ကျေးဇူးပြု. Item {0} သည်ကဆက်ပြောသည်
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Serial No ဆွဲယူဖို့ '' Generate ဇယား '' ကို click ပါ ကျေးဇူးပြု. Item {0} သည်ကဆက်ပြောသည်
 DocType: Account,Frozen,ရေခဲသော
 ,Open Production Orders,ပွင့်လင်းထုတ်လုပ်မှုအမိန့်
 DocType: Installation Note,Installation Time,Installation လုပ်တဲ့အချိန်
@@ -1637,13 +1644,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},ကို item {0} သည်ကို item မာစတာတှငျဖျောပွမ item Group က
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",ထုတ်လုပ်မှုအမိန့်ဒီအချက်ကိုသည်ကိုဖန်ဆင်းနိုင်ပါတယ်ကြောင့်တစ်စတော့ရှယ်ယာကို item ဖြစ်ရမည်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",ထုတ်လုပ်မှုအမိန့်ဒီအချက်ကိုသည်ကိုဖန်ဆင်းနိုင်ပါတယ်ကြောင့်တစ်စတော့ရှယ်ယာကို item ဖြစ်ရမည်။
 DocType: Shipping Rule Condition,Shipping Amount,သဘောင်္တင်ခပမာဏ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,ဝင်ရောက်
 DocType: Authorization Rule,Above Value,Value တစ်ခုအထက်
 ,Pending Amount,ဆိုင်းငံ့ထားသောငွေပမာဏ
 DocType: Purchase Invoice Item,Conversion Factor,ကူးပြောင်းခြင်း Factor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,ကယ်နှုတ်တော်မူ၏
+DocType: Purchase Order,Delivered,ကယ်နှုတ်တော်မူ၏
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),အလုပ်အကိုင်အခွင့်အအီးမေးလ်က id သည် Setup ကိုအဝင် server ကို။ (ဥပမာ jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,မော်တော်ယာဉ်နံပါတ်
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ထပ်တလဲလဲကုန်ပို့လွှာရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
@@ -1660,10 +1667,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,တွင် အခြ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,အကောင့်ဖွင့် Item {1} အဖြစ် {0} အမျိုးအစားဖြစ်ရမည် '' Fixed Asset '' တစ်ဦး Asset Item ဖြစ်ပါတယ်
 DocType: HR Settings,HR Settings,HR Settings ကို
 apps/frappe/frappe/config/setup.py +130,Printing,ပုံနှိပ်ခြင်း
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,စရိတ်တောင်းဆိုမှုများအတည်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာသုံးစွဲမှုအတည်ပြုချက် status ကို update ပြုလုပ်နိုင်ပါသည်။
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,စရိတ်တောင်းဆိုမှုများအတည်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာသုံးစွဲမှုအတည်ပြုချက် status ကို update ပြုလုပ်နိုင်ပါသည်။
 DocType: Purchase Invoice,Additional Discount Amount,အပိုဆောင်းလျှော့ငွေပမာဏ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,သင်ခွင့်များအတွက်လျှောက်ထားသည့်အပေါ်အဆိုပါနေ့ရက်ကို (s) အားလပ်ရက်ဖြစ်ကြ၏။ သင်ဟာခွင့်လျှောက်ထားစရာမလိုပေ။
-sites/assets/js/desk.min.js +7805,and,နှင့်
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,နှင့်
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,အားကစား
@@ -1700,7 +1707,6 @@ DocType: Opportunity,Quotation,ကိုးကာချက်
 DocType: Salary Slip,Total Deduction,စုစုပေါင်းထုတ်ယူ
 DocType: Quotation,Maintenance User,ပြုပြင်ထိန်းသိမ်းမှုအသုံးပြုသူတို့၏
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,ကုန်ကျစရိတ် Updated
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,သင်နှငျ့လှတျလိုသည်မှာသေချာဖြစ်ကြသည်
 DocType: Employee,Date of Birth,မွေးနေ့
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,item {0} ပြီးသားပြန်ထားပြီ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ ** တစ်ဘဏ္ဍာရေးတစ်နှစ်တာကိုကိုယ်စားပြုပါတယ်။ အားလုံးသည်စာရင်းကိုင် posts များနှင့်အခြားသောအဓိကကျသည့်ကိစ္စများကို ** ** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဆန့်ကျင်ခြေရာခံထောက်လှမ်းနေကြပါတယ်။
@@ -1716,13 +1722,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","အရောင်းစည်းရုံးလှုပ်ရှားမှု၏ Track အောင်ထားပါ။ ရင်းနှီးမြှုပ်နှံမှုအပေါ်သို့ပြန်သွားသည်ကိုခန့်မှန်းရန်လှုံ့ဆော်မှုများအနေဖြင့်စသည်တို့ကိုအရောင်းအမိန့်, ကိုးကားချက်များ, ခဲခြေရာခံစောင့်ရှောက်ကြလော့။"
 DocType: Expense Claim,Approver,ခွင့်ပြုချက်
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",စတော့အိတ် entries တွေကို {0} သွားတော့သင် re-assign သို့မဟုတ်ဂိုဒေါင် modify မရပါဘူးဂိုဒေါင်ဆန့်ကျင်တည်ရှိနေ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",စတော့အိတ် entries တွေကို {0} သွားတော့သင် re-assign သို့မဟုတ်ဂိုဒေါင် modify မရပါဘူးဂိုဒေါင်ဆန့်ကျင်တည်ရှိနေ
 DocType: Appraisal,Calculate Total Score,စုစုပေါင်းရမှတ်ကိုတွက်ချက်
 DocType: Supplier Quotation,Manufacturing Manager,ကုန်ထုတ်လုပ်မှု Manager က
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},serial No {0} {1} ထိ​​အာမခံအောက်မှာဖြစ်ပါတယ်
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,packages များသို့ Delivery Note ကို Split ။
 apps/erpnext/erpnext/hooks.py +84,Shipments,တင်ပို့ရောင်းချမှု
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip အတု ယူ. ပုံသှငျး
+DocType: Purchase Order,To be delivered to customer,ဖောက်သည်မှကယ်နှုတ်တော်မူ၏ခံရဖို့
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,အချိန်အထဲနဲ့ Status Submitted ရမည်။
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,serial မရှိပါ {0} ဆိုဂိုဒေါင်ပိုင်ပါဘူး
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Up ကိုပြင်ဆင်ခြင်း
@@ -1747,11 +1754,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,ငွေကြေးစနစ်ကနေ
 DocType: DocField,Name,နာမကို
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","atleast တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Item {0} လိုအပ်အရောင်းအမိန့်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Item {0} လိုအပ်အရောင်းအမိန့်
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,စနစ်ထဲမှာထင်ဟပ်မဟုတ်ပမာဏ
 DocType: Purchase Invoice Item,Rate (Company Currency),rate (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,အခြားသူများ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,ရပ်တန့်အဖြစ် Set
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,တစ်ကိုက်ညီတဲ့ပစ္စည်းရှာမတှေ့နိုငျပါသညျ။ {0} များအတွက်အချို့သောအခြား value ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 DocType: POS Profile,Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",အဖြေထုတ်ကုန်ပစ္စည်းသို့မဟုတ်စတော့ရှယ်ယာအတွက်ဝယ်ရောင်းမစောင့်ဘဲပြုလုပ်ထားတဲ့န်ဆောင်မှု။
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ပထမဦးဆုံးအတန်းအတွက် 'ယခင် Row ပမာဏတွင်' သို့မဟုတ် '' ယခင် Row စုစုပေါင်းတွင် 'အဖြစ်တာဝန်ခံ type ကိုရွေးချယ်လို့မရပါဘူး
@@ -1760,19 +1767,20 @@ DocType: Web Form,Select DocType,DOCTYPE ကိုရွေးပါ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,ဘဏ်လုပ်ငန်း
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,အချိန်ဇယားအရ '' Generate ဇယား '' ကို click ပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,နယူးကုန်ကျစရိတ် Center က
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,နယူးကုန်ကျစရိတ် Center က
 DocType: Bin,Ordered Quantity,အမိန့်ပမာဏ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",ဥပမာ "လက်သမားသည် tools တွေကို Build"
 DocType: Quality Inspection,In Process,Process ကိုအတွက်
 DocType: Authorization Rule,Itemwise Discount,Itemwise လျှော့
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
+DocType: Purchase Order Item,Reference Document Type,ကိုးကားစရာ Document ဖိုင် Type အမျိုးအစား
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
 DocType: Account,Fixed Asset,ပုံသေ Asset
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serial Inventory
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serial Inventory
 DocType: Activity Type,Default Billing Rate,Default အနေနဲ့ငွေတောင်းခံလွှာနှုန်း
 DocType: Time Log Batch,Total Billing Amount,စုစုပေါင်း Billing ငွေပမာဏ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,receiver အကောင့်
 ,Stock Balance,စတော့အိတ် Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,ငွေပေးချေမှုရမည့်မှအရောင်းအမိန့်
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ငွေပေးချေမှုရမည့်မှအရောင်းအမိန့်
 DocType: Expense Claim Detail,Expense Claim Detail,စရိတ်တောင်းဆိုမှုများ Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,အချိန် Logs နေသူများကဖန်တီး:
 DocType: Item,Weight UOM,အလေးချိန် UOM
@@ -1808,10 +1816,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,အကောင့်ဖွင့်ရန်အကြွေးတစ်ပေးဆောင်အကောင့်ကိုရှိရမည်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
 DocType: Production Order Operation,Completed Qty,ပြီးစီး Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","{0} အဘို့, သာ debit အကောင့်အသစ်များ၏အခြားအကြွေး entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0} အဘို့, သာ debit အကောင့်အသစ်များ၏အခြားအကြွေး entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
 DocType: Manufacturing Settings,Allow Overtime,အချိန်ပို Allow
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,အရောင်းအမိန့် {0} ရပ်တန့်နေသည်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,Item {1} များအတွက်လိုအပ်သော {0} Serial Number ။ သငျသညျ {2} ထောက်ပံ့ကြပါပြီ။
 DocType: Stock Reconciliation Item,Current Valuation Rate,လက်ရှိအကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate
 DocType: Item,Customer Item Codes,customer Item ကုဒ်တွေဟာ
@@ -1820,9 +1827,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ဂဟေဆော်
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,နယူးစတော့အိတ် UOM လိုအပ်သည်
 DocType: Quality Inspection,Sample Size,နမူနာ Size အ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.','' အမှုအမှတ် မှစ. '' တရားဝင်သတ်မှတ် ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 DocType: Project,External,external
 DocType: Features Setup,Item Serial Nos,item Serial အမှတ်
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,အသုံးပြုသူများနှင့်ခွင့်ပြုချက်
@@ -1849,7 +1856,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,လိပ်စာ & ဆက်သွယ်ရန်
 DocType: SMS Log,Sender Name,ပေးပို့သူအမည်
 DocType: Page,Title,ဘှဲ့
-sites/assets/js/list.min.js +104,Customize,Customize
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Customize
 DocType: POS Profile,[Select],[ရွေးပါ]
 DocType: SMS Log,Sent To,ရန်ကိုစလှေတျ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,အရောင်းပြေစာလုပ်ပါ
@@ -1874,12 +1881,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,အသက်တာ၏အဆုံး
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ခရီးသွား
 DocType: Leave Block List,Allow Users,Allow အသုံးပြုသူများ
+DocType: Purchase Order,Customer Mobile No,ဖောက်သည်ကို Mobile မရှိပါ
 DocType: Sales Invoice,Recurring,ထပ်တလဲလဲ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ထုတ်ကုန် Vertical သို့မဟုတ်ကွဲပြားမှုသည်သီးခြားဝင်ငွေနှင့်သုံးစွဲမှုပြထားသည်။
 DocType: Rename Tool,Rename Tool,Tool ကို Rename
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update ကိုကုန်ကျစရိတ်
 DocType: Item Reorder,Item Reorder,item Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,ပစ္စည်းလွှဲပြောင်း
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",အဆိုပါစစ်ဆင်ရေးကိုသတ်မှတ်မှာ operating ကုန်ကျစရိတ်နှင့်သင်တို့၏စစ်ဆင်ရေးမှတစ်မူထူးခြားစစ်ဆင်ရေးမျှမပေး။
 DocType: Purchase Invoice,Price List Currency,စျေးနှုန်း List ကိုငွေကြေးစနစ်
 DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
@@ -1902,7 +1910,7 @@ DocType: Appraisal,Employee,လုပ်သား
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,မှစ. သွင်းကုန်အီးမေးလ်
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,အသုံးပြုသူအဖြစ် Invite
 DocType: Features Setup,After Sale Installations,အရောင်း installation ပြီးသည့်နောက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} အပြည့်အဝကြေညာတာဖြစ်ပါတယ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} အပြည့်အဝကြေညာတာဖြစ်ပါတယ်
 DocType: Workstation Working Hour,End Time,အဆုံးအချိန်
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,အရောင်းသို့မဟုတ်ဝယ်ယူခြင်းအဘို့အစံစာချုပ်ဝေါဟာရများ။
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ဘောက်ချာအားဖြင့်အုပ်စု
@@ -1911,8 +1919,9 @@ DocType: Sales Invoice,Mass Mailing,mass စာပို့
 DocType: Page,Standard,စံ
 DocType: Rename Tool,File to Rename,Rename မှ File
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Item {0} လိုအပ် Purchse အမိန့်အရေအတွက်
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,ငွေပေးချေပြရန်
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,အရွယ်
 DocType: Notification Control,Expense Claim Approved,စရိတ်တောင်းဆိုမှုများ Approved
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ဆေးဝါး
@@ -1931,8 +1940,8 @@ DocType: Upload Attendance,Attendance To Date,နေ့စွဲရန်တက
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),အရောင်းအီးမေးလ်က id သည် Setup ကိုအဝင် server ကို။ (ဥပမာ sales@example.com)
 DocType: Warranty Claim,Raised By,By ထမြောက်စေတော်
 DocType: Payment Tool,Payment Account,ငွေပေးချေမှုရမည့်အကောင့်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
-sites/assets/js/list.min.js +23,Draft,မူကြမ်း
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,မူကြမ်း
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ပိတ် Compensatory
 DocType: Quality Inspection Reading,Accepted,လက်ခံထားတဲ့
 DocType: User,Female,မိန်းမ
@@ -1945,14 +1954,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,သဘောင်္တင်ခ Rule Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
 DocType: Newsletter,Test,စမ်းသပ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","လက်ရှိစတော့ရှယ်ယာအရောင်းအဒီအချက်ကိုသည်ရှိပါတယ်အမျှ \ သင် '' Serial No ရှိခြင်း '' ၏စံတန်ဖိုးများကိုပြောင်းလဲလို့မရဘူး, '' Batch မရှိပါဖူး '' နှင့် '' အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ '' စတော့အိတ် Item Is ''"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry '
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
 DocType: Employee,Previous Work Experience,ယခင်လုပ်ငန်းအတွေ့အကြုံ
 DocType: Stock Entry,For Quantity,ပမာဏများအတွက်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},အတန်းမှာ Item {0} သည်စီစဉ်ထားသော Qty ကိုရိုက်သွင်းပါ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} တင်သွင်းသည်မဟုတ်
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,ပစ္စည်းများသည်တောင်းဆိုမှုများ။
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,ပစ္စည်းများသည်တောင်းဆိုမှုများ။
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,အသီးအသီးကောင်းဆောင်းပါးတပုဒ်ကိုလက်စသတ်သည်သီးခြားထုတ်လုပ်မှုအမိန့်ကိုဖန်တီးလိမ့်မည်။
 DocType: Purchase Invoice,Terms and Conditions1,စည်းကမ်းချက်များနှင့် Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,complete ကို Setup
@@ -1964,7 +1974,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,သတင်း
 DocType: Delivery Note,Transporter Name,Transporter အမည်
 DocType: Contact,Enter department to which this Contact belongs,ဒီဆက်သွယ်ရန်ပိုငျဆိုငျသောဌာနကိုထည့်သွင်းပါ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,စုစုပေါင်းပျက်ကွက်
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,အတန်းသည် item သို့မဟုတ်ဂိုဒေါင် {0} ပစ္စည်းတောင်းဆိုမှုနှင့်ကိုက်ညီပါဘူး
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,အတန်းသည် item သို့မဟုတ်ဂိုဒေါင် {0} ပစ္စည်းတောင်းဆိုမှုနှင့်ကိုက်ညီပါဘူး
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,တိုင်း၏ယူနစ်
 DocType: Fiscal Year,Year End Date,တစ်နှစ်တာအဆုံးနေ့စွဲ
 DocType: Task Depends On,Task Depends On,Task အပေါ်မူတည်
@@ -1990,7 +2000,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ကော်မရှင်များအတွက်ကုမ္ပဏီများကထုတ်ကုန်ရောင်းချတဲ့သူတစ်ဦးကိုတတိယပါတီဖြန့်ဖြူး / အရောင်း / ကော်မရှင်အေးဂျင့် / Affiliate / ပြန်လည်ရောင်းချသူ။
 DocType: Customer Group,Has Child Node,ကလေး Node ရှိပါတယ်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ဒီနေရာမှာ static နဲ့ url parameters တွေကိုရိုက်ထည့်ပါ (ဥပမာ။ ပေးပို့သူ = ERPNext, အသုံးပြုသူအမည် = ERPNext, စကားဝှက် = 1234 စသည်တို့)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} မတက်ကြွဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ။ အသေးစိတ်ကို {2} စစ်ဆေးပါ။
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ဒါဟာ ERPNext ကနေ Auto-generated ဥပမာတစ်ခုဝက်ဆိုက်
@@ -2021,11 +2031,9 @@ DocType: Note,Note,မှတ်ချက်
 DocType: Purchase Receipt Item,Recd Quantity,Recd ပမာဏ
 DocType: Email Account,Email Ids,အီးမေးလ် IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,လှတျအဖြစ် Set
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,စတော့အိတ် Entry '{0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,စတော့အိတ် Entry '{0} တင်သွင်းသည်မဟုတ်
 DocType: Payment Reconciliation,Bank / Cash Account,ဘဏ်မှ / ငွေအကောင့်
 DocType: Tax Rule,Billing City,ငွေတောင်းခံစီးတီး
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,ဒါဟာထွက်ခွာလျှောက်လွှာခွင့်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာထွက်ခွာခွင့်ပြုချက်အဆင့်အတန်းကို update နိုင်ပါတယ်။
 DocType: Global Defaults,Hide Currency Symbol,ငွေကြေးစနစ်သင်္ကေတဝှက်
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","ဥပမာဘဏ်, ငွေ, Credit Card ကို"
 DocType: Journal Entry,Credit Note,ခရက်ဒစ်မှတ်ချက်
@@ -2046,7 +2054,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),စုစုပေါ
 DocType: Installation Note Item,Installed Qty,Install လုပ်ရတဲ့ Qty
 DocType: Lead,Fax,ဖက်စ်
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Submitted
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Submitted
 DocType: Salary Structure,Total Earning,စုစုပေါင်းဝင်ငွေ
 DocType: Purchase Receipt,Time at which materials were received,ပစ္စည်းများလက်ခံရရှိခဲ့ကြသည်မှာအချိန်
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,အကြှနျုပျ၏လိပ်စာ
@@ -2055,7 +2063,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,"အစည်
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,သို့မဟုတ်
 DocType: Sales Order,Billing Status,ငွေတောင်းခံနဲ့ Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility ကိုအသုံးစရိတ်များ
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-အထက်
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-အထက်
 DocType: Buying Settings,Default Buying Price List,default ဝယ်ယူစျေးနှုန်းများစာရင်း
 ,Download Backups,ဒေါင်းလုပ်ရန်များ
 DocType: Notification Control,Sales Order Message,အရောင်းအမိန့် Message
@@ -2064,7 +2072,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,ဝန်ထမ်းများကိုရွေးပါ
 DocType: Bank Reconciliation,To Date,ယနေ့အထိ
 DocType: Opportunity,Potential Sales Deal,အလားအလာရှိသောအရောင်း Deal
-sites/assets/js/form.min.js +308,Details,အသေးစိတ်အချက်အလက်များကို
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,အသေးစိတ်အချက်အလက်များကို
 DocType: Purchase Invoice,Total Taxes and Charges,စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက်
 DocType: Employee,Emergency Contact,အရေးပေါ်ဆက်သွယ်ရန်
 DocType: Item,Quality Parameters,အရည်အသွေးအ Parameter များကို
@@ -2079,7 +2087,7 @@ DocType: Purchase Order Item,Received Qty,Qty ရရှိထားသည့်
 DocType: Stock Entry Detail,Serial No / Batch,serial No / Batch
 DocType: Product Bundle,Parent Item,မိဘ Item
 DocType: Account,Account Type,Account Type
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ '' Generate ဇယား '' ကို click ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ '' Generate ဇယား '' ကို click ပါ ကျေးဇူးပြု.
 ,To Produce,ထုတ်လုပ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} အတွက် {0} အတန်းသည်။ {2} Item မှုနှုန်း, အတန်း {3} ကိုလည်းထည့်သွင်းရမည်ကိုထည့်သွင်းရန်"
 DocType: Packing Slip,Identification of the package for the delivery (for print),(ပုံနှိပ်သည်) ကိုပေးပို့များအတွက်အထုပ်၏ identification
@@ -2090,7 +2098,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,ပြစ်
 DocType: Account,Income Account,ဝင်ငွေခွန်အကောင့်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,မှို
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,delivery
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,delivery
 DocType: Stock Reconciliation Item,Current Qty,လက်ရှိ Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ပုဒ်မကုန်ကျမှာ "ပစ္စည်းများအခြေတွင်အမျိုးမျိုးနှုန်း" ကိုကြည့်ပါ
 DocType: Appraisal Goal,Key Responsibility Area,Key ကိုတာဝန်သိမှုဧရိယာ
@@ -2120,9 +2128,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,အားလုံးသည်လိပ်စာ။
 DocType: Company,Stock Settings,စတော့အိတ် Settings ကို
 DocType: User,Bio,ဇီဝ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ဖောက်သည်အုပ်စု Tree Manage ။
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,နယူးကုန်ကျစရိတ် Center ကအမည်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,နယူးကုန်ကျစရိတ် Center ကအမည်
 DocType: Leave Control Panel,Leave Control Panel,Control Panel ကို Leave
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,မျှမတွေ့ပါက default လိပ်စာ Template ။ Setup ကို> ပုံနှိပ်နှင့် Branding> လိပ်စာ Template ကနေအသစ်တစ်လုံးဖန်တီးပေးပါ။
 DocType: Appraisal,HR User,HR အသုံးပြုသူတို့၏
@@ -2141,24 +2149,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,ငွေပေးချေမှုရမည့် Tool ကို Detail
 ,Sales Browser,အရောင်း Browser ကို
 DocType: Journal Entry,Total Credit,စုစုပေါင်းချေးငွေ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,ဒေသဆိုင်ရာ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ဒေသဆိုင်ရာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ချေးငွေနှင့်ကြိုတင်ငွေ (ပိုင်ဆိုင်မှုများ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ငျြ့ရမညျအကွောငျး
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,အကြီးစား
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,အဘယ်သူမျှမန်ထမ်းတွေ့ရှိ!
 DocType: C-Form Invoice Detail,Territory,နယျမွေ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,လိုအပ်သောလာရောက်လည်ပတ်သူမျှဖော်ပြထားခြင်း ကျေးဇူးပြု.
+DocType: Purchase Order,Customer Address Display,customer လိပ်စာ Display ကို
 DocType: Stock Settings,Default Valuation Method,default အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,အရောင်တင်
 DocType: Production Order Operation,Planned Start Time,စီစဉ်ထား Start ကိုအချိန်
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,ခွဲဝေ
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Balance Sheet နှင့်စာအုပ်အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်းနီးကပ်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (သို့) စေပြီ \ ဘာဖြစ်လို့လဲဆိုတော့ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ default အနေနဲ့ UOM, \ အသုံးပြုမှုကိုပြောင်းလဲဖို့တော့အိတ် module ကိုအောက်မှ tool ကို '' UOM Utility ကိုအစားထိုး '' ။"
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,အခြားသို့တစျငွေကြေး convert မှချိန်း Rate ကိုသတ်မှတ်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,စျေးနှုန်း {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,စျေးနှုန်း {0} ဖျက်သိမ်းလိုက်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,စုစုပေါင်းထူးချွန်ငွေပမာဏ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,ဝန်ထမ်း {0} {1} အပေါ်ခွင့်ရှိ၏။ တက်ရောက်သူအထိမ်းအမှတ်နိုင်ဘူး။
 DocType: Sales Partner,Targets,ပစ်မှတ်
@@ -2173,12 +2181,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"ဒါကအမြစ်ဖောက်သည်အုပ်စုဖြစ်ပြီး, edited မရနိုင်ပါ။"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,သင်စာရင်းကိုင် Entries စတင်ခင် setup ကိုအကောင့်အသစ်များ၏သင့်ရဲ့ဇယား ကျေးဇူးပြု.
 DocType: Purchase Invoice,Ignore Pricing Rule,စျေးနှုန်းများ Rule Ignore
-sites/assets/js/list.min.js +24,Cancelled,ဖျက်သိမ်း
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,ဖျက်သိမ်း
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,နေ့စွဲကနေလစာဖွဲ့စည်းပုံထဲမှာန်ထမ်းအတူနေ့စွဲထက်လျှော့နည်းလို့မရပါဘူး။
 DocType: Employee Education,Graduate,ဘွဲ့ရသည်
 DocType: Leave Block List,Block Days,block Days
 DocType: Journal Entry,Excise Entry,ယစ်မျိုး Entry '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},သတိပေးချက်: အရောင်းအမိန့် {0} ပြီးသားဖောက်သည်ရဲ့ဝယ်ယူမိန့် {1} ဆန့်ကျင်ရှိတယ်ဆိုတဲ့
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},သတိပေးချက်: အရောင်းအမိန့် {0} ပြီးသားဖောက်သည်ရဲ့ဝယ်ယူမိန့် {1} ဆန့်ကျင်ရှိတယ်ဆိုတဲ့
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2231,17 @@ DocType: Account,Stock Received But Not Billed,စတော့အိတ်ရရ
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,gross Pay ကို + ကြွေးကျန်ပမာဏ + Encashment ပမာဏ - စုစုပေါင်းထုတ်ယူ
 DocType: Monthly Distribution,Distribution Name,ဖြန့်ဖြူးအမည်
 DocType: Features Setup,Sales and Purchase,အရောင်းနှင့်ဝယ်ယူခြင်း
-DocType: Purchase Order Item,Material Request No,material တောင်းဆိုမှုမရှိပါ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
+DocType: Supplier Quotation Item,Material Request No,material တောင်းဆိုမှုမရှိပါ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ဖောက်သည်ရဲ့ငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ဒီစာရင်းထဲကအောင်မြင်စွာ unsubscribe သိရသည်။
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net က Rate (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/frappe/frappe/templates/base.html +132,Added,Added
+apps/frappe/frappe/templates/base.html +134,Added,Added
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,နယ်မြေတွေကို Tree Manage ။
 DocType: Journal Entry Account,Sales Invoice,အရောင်းပြေစာ
 DocType: Journal Entry Account,Party Balance,ပါတီ Balance
 DocType: Sales Invoice Item,Time Log Batch,အချိန်အထဲ Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,လျှော့တွင် Apply ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,လျှော့တွင် Apply ကို select ကျေးဇူးပြု.
 DocType: Company,Default Receivable Account,default receiver အကောင့်
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,အထက်ပါရွေးချယ်ထားသောသတ်မှတ်ချက်များသည်ပေးဆောင်စုစုပေါင်းလစာများအတွက်ဘဏ်မှ Entry Create
 DocType: Stock Entry,Material Transfer for Manufacture,Manufacturing သည်ပစ္စည်းလွှဲပြောင်း
@@ -2244,7 +2252,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,သက်ဆိုင်ရာ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry '
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,အရောင်း Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
 DocType: Sales Invoice,Customer Address,customer လိပ်စာ
 apps/frappe/frappe/desk/query_report.py +136,Total,စုစုပေါင်း
 DocType: Purchase Invoice,Apply Additional Discount On,Apply နောက်ထပ်လျှော့တွင်
@@ -2259,13 +2267,15 @@ DocType: Quality Inspection,Quality Inspection,အရည်အသွေးအစ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,အပိုအသေးစား
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ဖွဲ့စည်းဖြန်းလိုက်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,အဖွဲ့ပိုင်ငွေစာရင်း၏သီးခြားဇယားနှင့်အတူဥပဒေကြောင်းအရ Entity / လုပ်ငန်းခွဲများ။
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","အစားအစာ, Beverage & ဆေးရွက်ကြီး"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL သို့မဟုတ် BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,ကော်မရှင်နှုန်းက 100 မှာထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,နိမ့်ဆုံးစာရင်းအဆင့်
 DocType: Stock Entry,Subcontract,Subcontract
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,ပထမဦးဆုံး {0} မဝင်ရ ကျေးဇူးပြု.
 DocType: Production Planning Tool,Get Items From Sales Orders,အရောင်းအမိန့် မှစ. ပစ္စည်းများ Get
 DocType: Production Order Operation,Actual End Time,အမှန်တကယ် End အချိန်
 DocType: Production Planning Tool,Download Materials Required,ပစ္စည်းများလိုအပ်ပါသည် Download
@@ -2282,9 +2292,9 @@ DocType: Maintenance Visit,Scheduled,Scheduled
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","စတော့အိတ် Item ရှိ၏" ဘယ်မှာ Item ကို select "No" ဖြစ်ပါတယ်နှင့် "အရောင်း Item ရှိ၏" "ဟုတ်တယ်" ဖြစ်ပါတယ်မှတပါးအခြားသောကုန်ပစ္စည်း Bundle ကိုလည်းရှိ၏ ကျေးဇူးပြု.
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ညီလအတွင်းအနှံ့ပစ်မှတ်ဖြန့်ဝေရန်လစဉ်ဖြန့်ဖြူးကိုရွေးချယ်ပါ။
 DocType: Purchase Invoice Item,Valuation Rate,အဘိုးပြတ် Rate
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,item Row {0}: ဝယ်ယူခြင်း Receipt {1} အထက် '' ဝယ်ယူလက်ခံ '' table ထဲမှာမတည်ရှိပါဘူး
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},ဝန်ထမ်း {0} ပြီးသား {1} {2} နှင့် {3} အကြားလျှောက်ထားခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},ဝန်ထမ်း {0} ပြီးသား {1} {2} နှင့် {3} အကြားလျှောက်ထားခဲ့သည်
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project မှ Start ကိုနေ့စွဲ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,တိုငျအောငျ
 DocType: Rename Tool,Rename Log,အထဲ Rename
@@ -2311,13 +2321,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,သာအရွက်ဆုံမှတ်များအရောင်းအဝယ်အတွက်ခွင့်ပြု
 DocType: Expense Claim,Expense Approver,စရိတ်အတည်ပြုချက်
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ထောက်ပံ့ဝယ်ယူ Receipt Item
-sites/assets/js/erpnext.min.js +48,Pay,အခပေး
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,အခပေး
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime မှ
 DocType: SMS Settings,SMS Gateway URL,SMS ကို Gateway က URL ကို
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS ပေးပို့အဆင့်အတန်းကိုထိန်းသိမ်းသည် logs
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ကြိတ်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,ထုပ်ပိုးကျုံ့
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,အတည်ပြုပြောကြား
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ပေးသွင်း> ပေးသွင်း Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
@@ -2328,7 +2338,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,စ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,သတင်းစာထုတ်ဝေသူများ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ရောစပ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,သင်သည်ဤစံချိန်များအတွက်ထွက်ခွာခွင့်ပြုချက်ဖြစ်ကြ၏။ ကို 'နဲ့ Status' နှင့် Save ကို Update ကျေးဇူးပြု.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder အဆင့်
 DocType: Attendance,Attendance Date,တက်ရောက်သူနေ့စွဲ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ဝင်ငွေနဲ့ထုတ်ယူအပေါ်အခြေခံပြီးလစာအဖြစ်ခွဲထုတ်။
@@ -2364,6 +2373,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကအုပ်စုအဖြစ်ပြောင်းလဲမပြနိုင်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,တန်ဖိုး
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ပေးသွင်းသူ (များ)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,မမှန်ကန်ခြင်းကာလအတွင်း
 DocType: Customer,Credit Limit,ခရက်ဒစ်ကန့်သတ်
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,အရောင်းအဝယ်အမျိုးအစားကိုရွေးပါ
 DocType: GL Entry,Voucher No,ဘောက်ချာမရှိ
@@ -2373,8 +2383,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,ဝ
 DocType: Customer,Address and Contact,လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: Customer,Last Day of the Next Month,နောက်လ၏နောက်ဆုံးနေ့
 DocType: Employee,Feedback,တုံ့ပြန်ချက်
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,maint ။ ဇယား
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,maint ။ ဇယား
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ပွန်းစားဂျက်လေယာဉ် machine
 DocType: Stock Settings,Freeze Stock Entries,အေးစတော့အိတ် Entries
 DocType: Website Settings,Website Settings,website Settings ကို
@@ -2388,11 +2398,11 @@ DocType: Quality Inspection,Outgoing,outgoing
 DocType: Material Request,Requested For,အကြောင်းမူကားမေတ္တာရပ်ခံ
 DocType: Quotation Item,Against Doctype,DOCTYPE ဆန့်ကျင်
 DocType: Delivery Note,Track this Delivery Note against any Project,မည်သည့်စီမံကိန်းဆန့်ကျင်သည်ဤ Delivery Note ကိုခြေရာခံ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,root account ကိုဖျက်ပစ်မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,root account ကိုဖျက်ပစ်မရနိုင်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show ကိုစတော့အိတ် Entries
 ,Is Primary Address,မူလတန်းလိပ်စာဖြစ်ပါသည်
 DocType: Production Order,Work-in-Progress Warehouse,အလုပ်လုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,လိပ်စာ Manage
 DocType: Pricing Rule,Item Code,item Code ကို
 DocType: Production Planning Tool,Create Production Orders,ထုတ်လုပ်မှုအမိန့် Create
@@ -2401,14 +2411,14 @@ DocType: Journal Entry,User Remark,အသုံးပြုသူမှတ်ခ
 DocType: Lead,Market Segment,Market မှာအပိုင်း
 DocType: Communication,Phone,Phone များ
 DocType: Employee Internal Work History,Employee Internal Work History,ဝန်ထမ်းပြည်တွင်းလုပ်ငန်းခွင်သမိုင်း
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
 DocType: Contact,Passive,မလှုပ်မရှားနေသော
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,{0} မစတော့ရှယ်ယာအတွက် serial No
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,အရောင်းအရောင်းချနေသည်အခွန် Simple template ။
 DocType: Sales Invoice,Write Off Outstanding Amount,ထူးချွန်ငွေပမာဏပိတ်ရေးထား
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","သင်အလိုအလျှောက်ထပ်တလဲလဲကုန်ပို့လွှာလိုအပ်ပါကစစ်ဆေးပါ။ မည်သည့်အရောင်းကုန်ပို့လွှာတင်သွင်းခြင်း, ပြီးနောက်, ထပ်တလဲလဲအပိုင်းမြင်နိုင်ပါလိမ့်မည်။"
 DocType: Account,Accounts Manager,အကောင့်အသစ်များ၏ Manager က
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',အချိန်အထဲ {0} '' Submitted '' ရမည်
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',အချိန်အထဲ {0} '' Submitted '' ရမည်
 DocType: Stock Settings,Default Stock UOM,default စတော့အိတ် UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),(တစ်နာရီလျှင်) လုပ်ဆောင်ချက်ကအမျိုးအစားပေါ်အခြေခံပြီးကုန်ကျနှုန်း
 DocType: Production Planning Tool,Create Material Requests,ပစ္စည်းတောင်းဆို Create
@@ -2419,7 +2429,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,ဘဏ်မှပြန်လ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Updates ကိုရယူပါ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,အနည်းငယ်နမူနာမှတ်တမ်းများ Add
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,စီမံခန့်ခွဲမှု Leave
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,စီမံခန့်ခွဲမှု Leave
 DocType: Event,Groups,အုပ်စုများ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,အကောင့်အားဖြင့်အုပ်စု
 DocType: Sales Order,Fully Delivered,အပြည့်အဝကိုကယ်နှုတ်
@@ -2431,11 +2441,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,အရောင်း Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ကုန်ကျစရိတ် Center ကဆန့်ကျင်အကောင့်အတွက်ဘတ်ဂျက် {1} {2} {3} အားဖြင့်ကျော်လွန်ပါလိမ့်မယ်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
-DocType: Leave Allocation,Carry Forwarded Leaves,forward မလုပ်ရွက်သယ်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','' နေ့စွဲ မှစ. '' နေ့စွဲရန် '' နောက်မှာဖြစ်ရပါမည်
 ,Stock Projected Qty,စတော့အိတ် Qty စီမံကိန်း
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
 DocType: Sales Order,Customer's Purchase Order,customer ရဲ့အမိန့်ကိုဝယ်ယူ
 DocType: Warranty Claim,From Company,ကုမ္ပဏီအနေဖြင့်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
@@ -2448,13 +2457,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,လက်လီအရောင်းဆိုင်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,အားလုံးသည်ပေးသွင်းအမျိုးအစားများ
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Item တွေကိုအလိုအလျောက်နံပါတ်အမကဘယ်ကြောင့်ဆိုသော် item Code ကိုမသင်မနေရ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Item တွေကိုအလိုအလျောက်နံပါတ်အမကဘယ်ကြောင့်ဆိုသော် item Code ကိုမသင်မနေရ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ပြုပြင်ထိန်းသိမ်းမှုဇယား Item
 DocType: Sales Order,%  Delivered,% ကယ်နှုတ်တော်မူ၏
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ဘဏ်မှ Overdraft အကောင့်
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံလုပ်ပါ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,လှတျ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse ကို BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,လုံခြုံသောချေးငွေ
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome ကိုထုတ်ကုန်ပစ္စည်းများ
@@ -2464,7 +2472,7 @@ DocType: Appraisal,Appraisal,တန်ဖိုးခြင်း
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ဆုံးရှုံး-မြှုပ်သွန်း
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ကားပုံ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,နေ့စွဲထပ်ခါတလဲလဲဖြစ်ပါတယ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
 DocType: Hub Settings,Seller Email,ရောင်းချသူအီးမေးလ်
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(ဝယ်ယူခြင်းပြေစာကနေတဆင့်) စုစုပေါင်းဝယ်ယူကုန်ကျစရိတ်
 DocType: Workstation Working Hour,Start Time,Start ကိုအချိန်
@@ -2478,8 +2486,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net ကပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: BOM Operation,Hour Rate,အချိန်နာရီနှုန်း
 DocType: Stock Settings,Item Naming By,အားဖြင့်အမည် item
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,စျေးနှုန်းအနေဖြင့်
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},{0} {1} ပြီးနောက်ဖန်ဆင်းခဲ့နောက်ထပ်ကာလသင်တန်းဆင်းပွဲ Entry '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,စျေးနှုန်းအနေဖြင့်
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{0} {1} ပြီးနောက်ဖန်ဆင်းခဲ့နောက်ထပ်ကာလသင်တန်းဆင်းပွဲ Entry '
 DocType: Production Order,Material Transferred for Manufacturing,ကုန်ထုတ်လုပ်မှုသည်လွှဲပြောင်း material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,အကောင့်ကို {0} တည်ရှိပါဘူး
 DocType: Purchase Receipt Item,Purchase Order Item No,ဝယ်ယူခြင်းအမိန့် Item မရှိပါ
@@ -2492,11 +2500,11 @@ DocType: Item,Inspection Required,စစ်ဆေးရေးလိုအပ်
 DocType: Purchase Invoice Item,PR Detail,PR စနစ် Detail
 DocType: Sales Order,Fully Billed,အပြည့်အဝကြေညာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,လက်၌ငွေသား
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},စတော့ရှယ်ယာကို item {0} များအတွက်လိုအပ်သော delivery ဂိုဒေါင်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},စတော့ရှယ်ယာကို item {0} များအတွက်လိုအပ်သော delivery ဂိုဒေါင်
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),အထုပ်၏စုစုပေါင်းအလေးချိန်။ ပိုက်ကွန်ကိုအလေးချိန် + ထုပ်ပိုးပစ္စည်းအလေးချိန်များသောအားဖြင့်။ (ပုံနှိပ်သည်)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ဒီအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူများကအေးခဲအကောင့်အသစ်များ၏ ထား. ဖန်တီး / အေးစက်နေတဲ့အကောင့်အသစ်များ၏ဆန့်ကျင်စာရင်းကိုင် entries တွေကိုပြုပြင်မွမ်းမံဖို့ခွင့်ပြုနေကြတယ်
 DocType: Serial No,Is Cancelled,ဖျက်သိမ်းသည်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,ငါ့အတင်ပို့မှု
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,ငါ့အတင်ပို့မှု
 DocType: Journal Entry,Bill Date,ဘီလ်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","အမြင့်ဆုံးဦးစားပေးနှင့်အတူမျိုးစုံစျေးနှုန်းများနည်းဥပဒေများရှိပါတယ်တောင်မှလျှင်, အောက်ပါပြည်တွင်းရေးဦးစားပေးလျှောက်ထားနေကြပါတယ်:"
 DocType: Supplier,Supplier Details,ပေးသွင်းအသေးစိတ်ကို
@@ -2509,7 +2517,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ငွေလွှဲခြင်း
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,ဘဏ်မှအကောင့်ကို select ကျေးဇူးပြု.
 DocType: Newsletter,Create and Send Newsletters,သတင်းလွှာ Create နှင့် Send
-sites/assets/js/report.min.js +107,From Date must be before To Date,နေ့စွဲကနေနေ့စွဲရန်မီဖြစ်ရမည်
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,နေ့စွဲကနေနေ့စွဲရန်မီဖြစ်ရမည်
 DocType: Sales Order,Recurring Order,ထပ်တလဲလဲအမိန့်
 DocType: Company,Default Income Account,default ဝင်ငွေခွန်အကောင့်
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ဖောက်သည်အုပ်စု / ဖောက်သည်
@@ -2524,31 +2532,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,စတော့အိတ် UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
 ,Projected,စီမံကိန်း
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},serial No {0} ဂိုဒေါင် {1} ပိုင်ပါဘူး
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
 DocType: Notification Control,Quotation Message,စျေးနှုန်း Message
 DocType: Issue,Opening Date,နေ့စွဲဖွင့်လှစ်
 DocType: Journal Entry,Remark,ပွောဆို
 DocType: Purchase Receipt Item,Rate and Amount,rate နှင့်ငွေပမာဏ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ထွင်းဖေါက်ခြင်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,အရောင်းအမိန့်ကနေ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,အရောင်းအမိန့်ကနေ
 DocType: Blog Category,Parent Website Route,မိဘဝက်ဘ်ဆိုက်လမ်းကြောင်း
 DocType: Sales Order,Not Billed,ကြေညာတဲ့မ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,နှစ်ဦးစလုံးဂိုဒေါင်အတူတူကုမ္ပဏီပိုင်ရမယ်
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,အဘယ်သူမျှမ contacts တွေကိုသေးကဆက်ပြောသည်။
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,အဘယ်သူမျှမ contacts တွေကိုသေးကဆက်ပြောသည်။
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,တက်ကြွသောမ
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,ပြေစာ Post date ဆန့်ကျင်
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ကုန်ကျစရိတ်ဘောက်ချာငွေပမာဏဆင်းသက်
 DocType: Time Log,Batched for Billing,Billing သည် Batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,ပေးသွင်းခြင်းဖြင့်ကြီးပြင်းဥပဒေကြမ်းများ။
 DocType: POS Profile,Write Off Account,အကောင့်ပိတ်ရေးထား
-sites/assets/js/erpnext.min.js +26,Discount Amount,လျော့စျေးပမာဏ
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,လျော့စျေးပမာဏ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ဝယ်ယူခြင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 DocType: Item,Warranty Period (in days),(ရက်) ကိုအာမခံကာလ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ဥပမာ VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,item 4
 DocType: Journal Entry Account,Journal Entry Account,ဂျာနယ် Entry အကောင့်
 DocType: Shopping Cart Settings,Quotation Series,စျေးနှုန်းစီးရီး
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","တစ်ဦးကို item နာမည်တူ ({0}) နှင့်အတူရှိနေတယ်, ပစ္စည်းအုပ်စုအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းကိုအမည်ပြောင်းကျေးဇူးတင်ပါ"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","တစ်ဦးကို item နာမည်တူ ({0}) နှင့်အတူရှိနေတယ်, ပစ္စည်းအုပ်စုအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းကိုအမည်ပြောင်းကျေးဇူးတင်ပါ"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot သတ္တုဓာတ်ငွေ့ဖွဲ့စည်း
 DocType: Sales Order Item,Sales Order Date,အရောင်းအမိန့်နေ့စွဲ
 DocType: Sales Invoice Item,Delivered Qty,ကယ်နှုတ်တော်မူ၏ Qty
@@ -2580,10 +2587,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,customer သို့မဟုတ်ပေးသွင်း Details ကို
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,ထား
 DocType: Lead,Lead Owner,ခဲပိုင်ရှင်
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,ဂိုဒေါင်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,ဂိုဒေါင်လိုအပ်သည်
 DocType: Employee,Marital Status,အိမ်ထောင်ရေးအခြေအနေ
 DocType: Stock Settings,Auto Material Request,မော်တော်ကားပစ္စည်းတောင်းဆိုခြင်း
 DocType: Time Log,Will be updated when billed.,"ကြေညာတဲ့အခါ, updated လိမ့်မည်။"
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Batch Qty
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,လက်ရှိ BOM နှင့် New BOM အတူတူမဖွစျနိုငျ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Sales Invoice,Against Income Account,ဝင်ငွေခွန်အကောင့်ဆန့်ကျင်
@@ -2600,12 +2608,12 @@ DocType: POS Profile,Update Stock,စတော့အိတ် Update
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ပစ္စည်းများသည်ကွဲပြားခြားနားသော UOM မမှန်ကန် (Total) Net ကအလေးချိန်တန်ဖိုးကိုဆီသို့ဦးတည်ပါလိမ့်မယ်။ အသီးအသီးကို item ၏ Net ကအလေးချိန်တူညီ UOM အတွက်ကြောင်းသေချာပါစေ။
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Delivery မှတ်ချက်များထံမှပစ္စည်းများကိုဆွဲ ကျေးဇူးပြု.
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Delivery မှတ်ချက်များထံမှပစ္စည်းများကိုဆွဲ ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,ဂျာနယ် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","အမျိုးအစားအီးမေးလ်အားလုံးဆက်သွယ်ရေးစံချိန်, ဖုန်း, chat, အလည်အပတ်ခရီး, etc"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,ကုမ္ပဏီအတွက်က Round ပိတ်ဖော်ပြရန် ကျေးဇူးပြု. ကုန်ကျစရိတ် Center က
 DocType: Purchase Invoice,Terms,သက်မှတ်ချက်များ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,နယူး Create
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,နယူး Create
 DocType: Buying Settings,Purchase Order Required,အမိန့်လိုအပ်ပါသည်ယ်ယူ
 ,Item-wise Sales History,item-ပညာရှိသအရောင်းသမိုင်း
 DocType: Expense Claim,Total Sanctioned Amount,စုစုပေါင်းပိတ်ဆို့ငွေပမာဏ
@@ -2622,16 +2630,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,လစာစလစ်ဖြ
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,မှတ်စုများ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,ပထမဦးဆုံးအဖွဲ့တစ်ဖွဲ့ node ကိုရွေးချယ်ပါ။
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},ရည်ရွယ်ချက် {0} တယောက်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,ပုံစံဖြည့်ခြင်းနှင့်ကယ်
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ပုံစံဖြည့်ခြင်းနှင့်ကယ်
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,သူတို့ရဲ့နောက်ဆုံးစာရင်းအဆင့်အတန်းနှင့်အတူအားလုံးကုန်ကြမ်းင်တစ်ဦးအစီရင်ခံစာ Download
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,facing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ကွန်မြူနတီဖိုရမ်၏
 DocType: Leave Application,Leave Balance Before Application,လျှောက်လွှာခင်မှာ Balance Leave
 DocType: SMS Center,Send SMS,SMS ပို့
 DocType: Company,Default Letter Head,default ပေးစာဌာနမှူး
 DocType: Time Log,Billable,Billable
 DocType: Authorization Rule,This will be used for setting rule in HR module,ဒါဟာ HR module တစ်ခု၌အုပ်စိုး setting တွင်အသုံးပြုလိမ့်မည်
 DocType: Account,Rate at which this tax is applied,ဒီအခွန်လျှောက်ထားသောအချိန်တွင် rate
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Reorder Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reorder Qty
 DocType: Company,Stock Adjustment Account,စတော့အိတ်ချိန်ညှိအကောင့်
 DocType: Journal Entry,Write Off,အကြွေးလျှော်ပစ်ခြင်း
 DocType: Time Log,Operation ID,စစ်ဆင်ရေး ID ကို
@@ -2642,12 +2651,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","လျော့စျေး Fields ဝယ်ယူခြင်းအမိန့်, ဝယ်ယူ Receipt, ဝယ်ယူခြင်းပြေစာအတွက်ရရှိနိုင်ပါလိမ့်မည်"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,အသစ်သောအကောင့်အမည်ဖြစ်တယ်။ မှတ်ချက်: Customer နှင့်ပေးသွင်းများအတွက်အကောင့်တွေကိုဖန်တီးကြပါဘူးကျေးဇူးပြုပြီး
 DocType: Report,Report Type,အစီရင်ခံစာ Type
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,loading
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,loading
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Tool ကိုအစားထိုးပါ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,တိုင်းပြည်ပညာရှိသောသူကို default လိပ်စာ Templates
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
+DocType: Sales Order Item,Supplier delivers to Customer,ပေးသွင်းဖောက်သည်မှကယ်တင်
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Show ကိုအခွန်ချိုး-up က
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ဒေတာပို့ကုန်သွင်းကုန်
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',သင်ကုန်ထုတ်လုပ်မှုလုပ်ဆောင်မှုအတွက်ပါဝင်ပါ။ Item '' ကုန်ပစ္စည်းထုတ်လုပ်သည် '' နိုင်ပါတယ်
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,ငွေတောင်းခံလွှာ Post date
 DocType: Sales Invoice,Rounded Total,rounded စုစုပေါင်း
 DocType: Product Bundle,List items that form the package.,အထုပ်ဖွဲ့စည်းကြောင်းပစ္စည်းများစာရင်း။
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ရာခိုင်နှုန်းဖြန့်ဝေ 100% နဲ့ညီမျှဖြစ်သင့်
@@ -2658,8 +2670,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
 DocType: Company,Default Cash Account,default ငွေအကောင့်
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ကုမ္ပဏီ (မဖောက်သည်သို့မဟုတ်ပေးသွင်းသူ) သခင်သည်။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date','' မျှော်မှန်း Delivery Date ကို '' ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','' မျှော်မှန်း Delivery Date ကို '' ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Paid ပမာဏ + ငွေပမာဏက Grand စုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျပိတ်ရေးထား
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Item {1} သည်မှန်ကန်သော Batch နံပါတ်မဟုတ်ပါဘူး
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
@@ -2680,11 +2692,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","row {0}: Qty {2} {3} အပေါ်ဂိုဒေါင် {1} အတွက် avalable မဟုတ်။ ရရှိနိုင်သည့် Qty: {4}, Qty လွှဲပြောင်း: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,item 3
+DocType: Purchase Order,Customer Contact Email,customer ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Event,Sunday,တနင်္ဂနွေ
 DocType: Sales Team,Contribution (%),contribution (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: '' ငွေသို့မဟုတ်ဘဏ်မှအကောင့် '' သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,တာဝန်ဝတ္တရားများ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,template
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,template
 DocType: Sales Person,Sales Person Name,အရောင်းပုဂ္ဂိုလ်အမည်
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,table ထဲမှာ atleast 1 ငွေတောင်းခံလွှာကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,အသုံးပြုသူများအ Add
@@ -2693,7 +2706,7 @@ DocType: Task,Actual Start Date (via Time Logs),(အချိန် Logs ကန
 DocType: Stock Reconciliation Item,Before reconciliation,ပြန်လည်သင့်မြတ်ရေးမဖြစ်မီ
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} မှ
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Added အခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
 DocType: Sales Order,Partly Billed,တစ်စိတ်တစ်ပိုင်းကြေညာ
 DocType: Item,Default BOM,default BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2714,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,စုစုပေါင်းထူးချွန် Amt
 DocType: Time Log Batch,Total Hours,စုစုပေါင်းနာ​​ရီ
 DocType: Journal Entry,Printing Settings,ပုံနှိပ်ခြင်းက Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},စုစုပေါင်း Debit စုစုပေါင်းချေးငွေတန်းတူဖြစ်ရမည်။ အဆိုပါခြားနားချက် {0} သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},စုစုပေါင်း Debit စုစုပေါင်းချေးငွေတန်းတူဖြစ်ရမည်။ အဆိုပါခြားနားချက် {0} သည်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,မော်တော်ယာဉ်
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},{0} ပြီးသားဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} သည်ထမ်း {1} သည်ခွဲဝေ type ကိုထွက်ခွါ
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,item လိုအပ်သည်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,metal ဆေးထိုးအတု ယူ. ပုံသှငျး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Delivery မှတ်ချက်ထံမှ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Delivery မှတ်ချက်ထံမှ
 DocType: Time Log,From Time,အချိန်ကနေ
 DocType: Notification Control,Custom Message,custom Message
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,ရင်းနှီးမြှုပ်နှံမှုဘဏ်လုပ်ငန်း
@@ -2722,17 +2734,17 @@ DocType: Newsletter,A Lead with this email id should exist,ဒီအီးမေ
 DocType: Stock Entry,From BOM,BOM ကနေ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,အခြေခံပညာ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} အေးခဲနေကြပါတယ်စတော့အိတ်အရောင်းအမီ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule','' Generate ဇယား '' ကို click ပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,နေ့စွဲမှတစ်ဝက်နေ့ခွင့်ယူသည်နေ့စွဲ မှစ. အဖြစ်အတူတူဖြစ်သင့်
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','' Generate ဇယား '' ကို click ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,နေ့စွဲမှတစ်ဝက်နေ့ခွင့်ယူသည်နေ့စွဲ မှစ. အဖြစ်အတူတူဖြစ်သင့်
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","ဥပမာကီလို, ယူနစ်, အမှတ်, ဍ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,ရည်ညွန်းသင်ကိုးကားစရာနေ့စွဲသို့ဝင်လျှင်အဘယ်သူမျှမသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,ရည်ညွန်းသင်ကိုးကားစရာနေ့စွဲသို့ဝင်လျှင်အဘယ်သူမျှမသင်မနေရ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,အတူနေ့စွဲမွေးဖွားခြင်း၏နေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Salary Structure,Salary Structure,လစာဖွဲ့စည်းပုံ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","အကွိမျမြားစှာစျေးနှုန်း Rule တူညီသောစံသတ်မှတ်ချက်များနှင့်အတူရှိနေတယ်, ဦးစားပေးသတ်မှတ်ခြင်းအားဖြင့်ပဋိပက္ခဖြေရှင်းရန် \ ကိုကျေးဇူးတင်ပါ။ စျေးနှုန်းနည်းဥပဒေများ: {0}"
 DocType: Account,Bank,ကမ်း
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,လကွောငျး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,ပြဿနာပစ္စည်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ပြဿနာပစ္စည်း
 DocType: Material Request Item,For Warehouse,ဂိုဒေါင်အကြောင်းမူကား
 DocType: Employee,Offer Date,ကမ်းလှမ်းမှုကိုနေ့စွဲ
 DocType: Hub Settings,Access Token,Access Token
@@ -2755,6 +2767,7 @@ DocType: Issue,Opening Time,အချိန်ဖွင့်လှစ်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ကနေနှင့်လိုအပ်သည့်ရက်စွဲများရန်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities မှ & ကုန်စည်ဒိုင်
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
+DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ရေနံတွင်းတူး
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ထိုးနှက်အတု ယူ. ပုံသှငျး
 DocType: Purchase Taxes and Charges,Valuation and Total,အဘိုးပြတ်နှင့်စုစုပေါင်း
@@ -2776,11 +2789,12 @@ DocType: C-Form,Amended From,မှစ. ပြင်ဆင်
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,ကုန်ကြမ်း
 DocType: Leave Application,Follow via Email,အီးမေးလ်ကနေတဆင့် Follow
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,လျှော့ငွေပမာဏပြီးနောက်အခွန်ပမာဏ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,ကလေးသူငယ်အကောင့်ကိုဒီအကောင့်ရှိနေပြီ။ သင်သည်ဤအကောင့်ကိုမဖျက်နိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,ကလေးသူငယ်အကောင့်ကိုဒီအကောင့်ရှိနေပြီ။ သင်သည်ဤအကောင့်ကိုမဖျက်နိုင်ပါ။
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ပစ်မှတ် qty သို့မဟုတ်ပစ်မှတ်ပမာဏကိုဖြစ်စေမဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
-DocType: Leave Allocation,Carry Forward,Forward သယ်
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,နေ့စွဲဖွင့်လှစ်နေ့စွဲပိတ်ပြီးမတိုင်မှီဖြစ်သင့်
+DocType: Leave Control Panel,Carry Forward,Forward သယ်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Department,Days for which Holidays are blocked for this department.,အားလပ်ရက်ဒီဌာနကိုပိတ်ဆို့ထားသောနေ့ရကျ။
 ,Produced,ထုတ်လုပ်
@@ -2801,16 +2815,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),စုစုပေါ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment က & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,ထပ်တလဲလဲအမိန့်ရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
 DocType: Quality Inspection,Item Serial No,item Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} လျှော့ချရမည်သို့မဟုတ်သင်လျတ်သည်းခံစိတ်ကိုတိုးမြှင့်သင့်ပါတယ်
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} လျှော့ချရမည်သို့မဟုတ်သင်လျတ်သည်းခံစိတ်ကိုတိုးမြှင့်သင့်ပါတယ်
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,စုစုပေါင်းလက်ရှိ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,နာရီ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serial Item {0} စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. \ updated မရနိုင်ပါ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,ပေးသွင်းဖို့ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,ပေးသွင်းဖို့ပစ္စည်းလွှဲပြောင်း
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,နယူး Serial No ဂိုဒေါင်ရှိသည်မဟုတ်နိုင်။ ဂိုဒေါင်စတော့အိတ် Entry 'သို့မဟုတ်ဝယ်ယူခြင်းပြေစာအားဖြင့်သတ်မှတ်ထားရမည်
 DocType: Lead,Lead Type,ခဲ Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,စျေးနှုန်း Create
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,အားလုံးသည်ဤပစ္စည်းများကိုပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,အားလုံးသည်ဤပစ္စည်းများကိုပြီးသား invoiced ပြီ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ကအတည်ပြုနိုင်ပါတယ်
 DocType: Shipping Rule,Shipping Rule Conditions,သဘောင်္တင်ခ Rule စည်းကမ်းချက်များ
 DocType: BOM Replace Tool,The new BOM after replacement,အစားထိုးပြီးနောက်အသစ် BOM
@@ -2858,7 +2872,7 @@ DocType: C-Form,C-Form,C-Form တွင်
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,စစ်ဆင်ရေး ID ကိုစွဲလမ်းခြင်းမ
 DocType: Production Order,Planned Start Date,စီစဉ်ထား Start ကိုနေ့စွဲ
 DocType: Serial No,Creation Document Type,ဖန်ဆင်းခြင်း Document ဖိုင် Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,maint ။ အလည်အပတ်သွားရောက်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,maint ။ အလည်အပတ်သွားရောက်
 DocType: Leave Type,Is Encash,Encash ဖြစ်ပါသည်
 DocType: Purchase Invoice,Mobile No,မိုဘိုင်းလ်မရှိပါ
 DocType: Payment Tool,Make Journal Entry,ဂျာနယ် Entry 'ပါစေ
@@ -2866,7 +2880,7 @@ DocType: Leave Allocation,New Leaves Allocated,ခွဲဝေနယူးရွ
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project သည်ပညာ data တွေကိုစျေးနှုန်းသည်မရရှိနိုင်ပါသည်
 DocType: Project,Expected End Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲ
 DocType: Appraisal Template,Appraisal Template Title,စိစစ်ရေး Template: ခေါင်းစဉ်မရှိ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,မိဘတစ် Item {0} တစ်စတော့အိတ်ပစ္စည်းမဖြစ်ရပါမည်
 DocType: Cost Center,Distribution Id,ဖြန့်ဖြူး Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome ကိုန်ဆောင်မှုများ
@@ -2882,14 +2896,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Attribute တန်ဖိုး {0} {1} {3} ၏ထပ်တိုး {2} မှများ၏အကွာအဝေးအတွင်းဖြစ်ရပါမည်
 DocType: Tax Rule,Sales,အရောင်း
 DocType: Stock Entry Detail,Basic Amount,အခြေခံပညာပမာဏ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
+DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,default receiver Accounts ကို
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,ငွေတောင်းခံပြည်နယ်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ဖျင်
 DocType: Item Reorder,Transfer,လွှဲပြောင်း
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
 DocType: Authorization Rule,Applicable To (Employee),(န်ထမ်း) ရန်သက်ဆိုင်သော
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
@@ -2905,6 +2920,7 @@ DocType: Company,Retail,လက်လီ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,customer {0} မတည်ရှိပါဘူး
 DocType: Attendance,Absent,မရှိသော
 DocType: Product Bundle,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},row {0}: မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ကြိတ်ခွဲ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,အခွန်နှင့်စွပ်စွဲချက် Template ဝယ်ယူ
 DocType: Upload Attendance,Download Template,ဒေါင်းလုပ် Template:
@@ -2912,16 +2928,16 @@ DocType: GL Entry,Remarks,အမှာစကား
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ကုန်ကြမ်းပစ္စည်း Code ကို
 DocType: Journal Entry,Write Off Based On,အခြေတွင်ပိတ်ရေးထား
 DocType: Features Setup,POS View,POS ကြည့်ရန်
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,တစ် Serial နံပါတ်ထည့်သွင်းခြင်းစံချိန်တင်
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,တစ် Serial နံပါတ်ထည့်သွင်းခြင်းစံချိန်တင်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,စဉ်ဆက်မပြတ်သွန်း
-sites/assets/js/erpnext.min.js +10,Please specify a,တစ်ဦးကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,တစ်ဦးကိုသတ်မှတ်ပေးပါ
 DocType: Offer Letter,Awaiting Response,စောင့်ဆိုင်းတုန့်ပြန်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,အထက်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,အေးအရွယ်အစားညှိ
 DocType: Salary Slip,Earning & Deduction,ဝင်ငွေ & ထုတ်ယူ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,အကောင့်ကို {0} တစ်ဦးအုပ်စုမဖွစျနိုငျ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,ဒေသ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,optional ။ ဒီ setting ကိုအမျိုးမျိုးသောငွေကြေးလွှဲပြောင်းမှုမှာ filter မှအသုံးပြုလိမ့်မည်။
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,optional ။ ဒီ setting ကိုအမျိုးမျိုးသောငွေကြေးလွှဲပြောင်းမှုမှာ filter မှအသုံးပြုလိမ့်မည်။
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,negative အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate ခွင့်မပြု
 DocType: Holiday List,Weekly Off,အပတ်စဉ်ထုတ်ပိတ်
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ဥပမာ 2012 ခုနှစ်, 2012-13"
@@ -2965,12 +2981,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Bulging
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,အငွေ့ပျံခြင်း-ပုံစံကိုသွန်း
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Entertainment ကအသုံးစရိတ်များ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,အရောင်းပြေစာ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,အသက်အရွယ်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,အရောင်းပြေစာ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,အသက်အရွယ်
 DocType: Time Log,Billing Amount,ငွေတောင်းခံငွေပမာဏ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,ကို item {0} သည်သတ်မှတ်ထားသောမမှန်ကန်ခြင်းအရေအတွက်။ အရေအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်သည်။
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,ခွင့်သည်ပလီကေးရှင်း။
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုဖျက်ပစ်မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုဖျက်ပစ်မရနိုင်ပါ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ဥပဒေရေးရာအသုံးစရိတ်များ
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","အော်တိုအမိန့် 05, 28 စသည်တို့ကိုဥပမာ generated လိမ့်မည်ဟူသောရက်နေ့တွင်လ၏နေ့"
 DocType: Sales Invoice,Posting Time,posting အချိန်
@@ -2979,9 +2995,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,သင်ချွေတာရှေ့တော်၌စီးရီးကိုရွေးဖို့ user ကိုတွန်းအားပေးချင်တယ်ဆိုရင်ဒီစစ်ဆေးပါ။ သင်သည်ဤစစ်ဆေးလျှင်အဘယ်သူမျှမက default ရှိပါတယ်ဖြစ်လိမ့်မည်။
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Serial No {0} နှင့်အတူမရှိပါ Item
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,ပွင့်လင်းအသိပေးချက်များ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ပွင့်လင်းအသိပေးချက်များ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,တိုက်ရိုက်အသုံးစရိတ်များ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,သင်အမှန်တကယ်ကဒီပစ္စည်းတောင်းဆိုမှုနှငျ့လှတျချင်ပါသလား?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,နယူးဖောက်သည်အခွန်ဝန်ကြီးဌာန
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ခရီးသွားအသုံးစရိတ်များ
 DocType: Maintenance Visit,Breakdown,ပျက်သည်
@@ -2992,7 +3007,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,နေ့စွဲအပေါ်အဖြစ်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,အစမ်းထား
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,default ဂိုဒေါင်စတော့ရှယ်ယာ Item တွေအတွက်မဖြစ်မနေဖြစ်ပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,default ဂိုဒေါင်စတော့ရှယ်ယာ Item တွေအတွက်မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Feed,Full Name,နာမည်အပြည့်အစုံ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},လ {0} သည်လစာ၏ငွေပေးချေမှုရမည့်နှင့်တစ်နှစ် {1}
@@ -3015,7 +3030,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Accounts ကိ
 DocType: Buying Settings,Default Supplier Type,default ပေးသွင်း Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Quarrying
 DocType: Production Order,Total Operating Cost,စုစုပေါင်း Operating ကုန်ကျစရိတ်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,အားလုံးသည်ဆက်သွယ်ရန်။
 DocType: Newsletter,Test Email Id,စမ်းသပ်မှုအီးမေးလ် Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,ကုမ္ပဏီအတိုကောက်
@@ -3039,11 +3054,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ခဲ
 DocType: Stock Settings,Role Allowed to edit frozen stock,အေးခဲစတော့ရှယ်ယာတည်းဖြတ်ရန် Allowed အခန်းကဏ္ဍ
 ,Territory Target Variance Item Group-Wise,နယ်မြေတွေကို Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,အခွန် Template ကိုမဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} မတည်ရှိပါဘူး
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),စျေးနှုန်း List ကို Rate (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} အဆင့်အတန်း '' ရပ်တန့် '' သည်
 DocType: Account,Temporary,ယာယီ
 DocType: Address,Preferred Billing Address,ပိုဦးစားပေးသည် Billing လိပ်စာ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ရာခိုင်နှုန်းဖြန့်ဝေ
@@ -3061,13 +3075,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,item ပညာရှိ
 DocType: Purchase Order Item,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
 DocType: Quotation,In Words will be visible once you save the Quotation.,သင်စျေးနှုန်းကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,သံ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} ရပ်တန့်နေသည်
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ရပ်တန့်နေသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
 DocType: Lead,Add to calendar on this date,ဒီနေ့စွဲအပေါ်ပြက္ခဒိန်မှ Add
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,သင်္ဘောစရိတ်ပေါင်းထည့်သည်နည်းဥပဒေများ။
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,လာမည့်အဖြစ်အပျက်များ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,လာမည့်အဖြစ်အပျက်များ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,customer လိုအပ်သည်
 DocType: Letter Head,Letter Head,ပေးစာဌာနမှူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,လျင်မြန်စွာ Entry '
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} သို့ပြန်သွားသည်တွေအတွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Purchase Order,To Receive,လက်ခံမှ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,သငျ့ကျုံ့
@@ -3090,25 +3105,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast တယောက်ဂိုဒေါင်မသင်မနေရ
 DocType: Serial No,Out of Warranty,အာမခံထဲက
 DocType: BOM Replace Tool,Replace,အစားထိုးဖို့
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,တိုင်း၏ default အနေနဲ့ယူနစ်ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,တိုင်း၏ default အနေနဲ့ယူနစ်ကိုရိုက်ထည့်ပေးပါ
 DocType: Purchase Invoice Item,Project Name,စီမံကိန်းအမည်
 DocType: Supplier,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
 DocType: Workflow State,Edit,Edit ကို
 DocType: Journal Entry Account,If Income or Expense,ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုမယ်ဆိုရင်
 DocType: Features Setup,Item Batch Nos,item Batch အမှတ်
 DocType: Stock Ledger Entry,Stock Value Difference,စတော့အိတ် Value တစ်ခု Difference
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,လူ့စွမ်းအားအရင်းအမြစ်
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,လူ့စွမ်းအားအရင်းအမြစ်
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေးငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,အခွန်ပိုင်ဆိုင်မှုများ
 DocType: BOM Item,BOM No,BOM မရှိပါ
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,ဂျာနယ် Entry '{0} အကောင့်ကို {1} များသို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,ဂျာနယ် Entry '{0} အကောင့်ကို {1} များသို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
 DocType: Item,Moving Average,ပျမ်းမျှ Moving
 DocType: BOM Replace Tool,The BOM which will be replaced,အဆိုပါ BOM အစားထိုးခံရလိမ့်မည်ဟူသော
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,နယူးစတော့အိတ် UOM လက်ရှိစတော့ရှယ်ယာထံမှကွဲပြားခြားနားဖြစ်ရမည် UOM
 DocType: Account,Debit,debit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,အရွက် 0.5 အလီလီခွဲဝေရမည်
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,အရွက် 0.5 အလီလီခွဲဝေရမည်
 DocType: Production Order,Operation Cost,စစ်ဆင်ရေးကုန်ကျစရိတ်
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,တစ် .csv file ကိုထံမှတက်ရောက်သူ upload
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ထူးချွန် Amt
@@ -3116,7 +3131,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ဒီ
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","ဤပြဿနာ assign လုပ်ဖို့, sidebar မှာရှိတဲ့ "Assign" button ကိုသုံးလော့။"
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[Days] သန်း Older စတော့စျေးကွက်အေးခဲ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","နှစ်ခုသို့မဟုတ်ထို့ထက်ပိုသောစျေးနှုန်းနည်းဥပဒေများအထက်ဖော်ပြပါအခြေအနေများအပေါ် အခြေခံ. တွေ့ရှိနေတယ်ဆိုရင်, ဦးစားပေးလျှောက်ထားတာဖြစ်ပါတယ်။ default value ကိုသုည (အလွတ်) ဖြစ်ပါသည်စဉ်ဦးစားပေး 0 င်မှ 20 အကြားတစ်ဦးအရေအတွက်ဖြစ်ပါတယ်။ ပိုမိုမြင့်မားသောအရေအတွက်တူညီသည့်အခြေအနေများနှင့်အတူမျိုးစုံစျေးနှုန်းများနည်းဥပဒေများရှိပါတယ်လျှင်ဦးစားပေးယူလိမ့်မည်ဆိုလိုသည်။"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,ပြေစာဆန့်ကျင်
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ: {0} တည်ရှိပါဘူး
 DocType: Currency Exchange,To Currency,ငွေကြေးစနစ်မှ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,အောက်ပါအသုံးပြုသူများလုပ်ကွက်နေ့ရက်ကာလအဘို့ထွက်ခွာ Applications ကိုအတည်ပြုခွင့်ပြုပါ။
@@ -3145,7 +3159,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),rate
 DocType: Stock Entry Detail,Additional Cost,အပိုဆောင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,ဘဏ္ဍာရေးတစ်နှစ်တာအဆုံးနေ့စွဲ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ဘောက်ချာများကအုပ်စုဖွဲ့လျှင်, voucher မရှိပါအပေါ်အခြေခံပြီး filter နိုင်ဘူး"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
 DocType: Quality Inspection,Incoming,incoming
 DocType: BOM,Materials Required (Exploded),လိုအပ်သောပစ္စည်းများ (ပေါက်ကွဲ)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Pay (LWP) မရှိရင်ထွက်ခွာသည်အလုပ်လုပ်ပြီးဝင်ငွေကိုလျော့ချ
@@ -3153,10 +3167,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},row # {0}: Serial မရှိပါ {1} {2} {3} နှင့်ကိုက်ညီမပါဘူး
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,ကျပန်းထွက်ခွာ
 DocType: Batch,Batch ID,batch ID ကို
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},မှတ်စု: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},မှတ်စု: {0}
 ,Delivery Note Trends,Delivery မှတ်ချက်ခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,This Week ရဲ့အကျဉ်းချုပ်
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} အတန်း {1} အတွက်ဝယ်ယူသို့မဟုတ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} အတန်း {1} အတွက်ဝယ်ယူသို့မဟုတ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,အကောင့်ဖွ: {0} သာစတော့အိတ်ငွေကြေးကိစ္စရှင်းလင်းမှုကနေတဆင့် updated နိုင်ပါတယ်
 DocType: GL Entry,Party,ပါတီ
 DocType: Sales Order,Delivery Date,ကုန်ပို့ရက်စွဲ
@@ -3169,7 +3183,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,P
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,AVG ။ ဝယ်ယူ Rate
 DocType: Task,Actual Time (in Hours),(နာရီအတွက်) အမှန်တကယ်အချိန်
 DocType: Employee,History In Company,ကုမ္ပဏီခုနှစ်တွင်သမိုင်းကြောင်း
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,သတင်းလွှာ
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,သတင်းလွှာ
 DocType: Address,Shipping,သင်္ဘောဖြင့်ကုန်ပစ္စည်းပို့ခြင်း
 DocType: Stock Ledger Entry,Stock Ledger Entry,စတော့အိတ်လယ်ဂျာ Entry '
 DocType: Department,Leave Block List,Block List ကို Leave
@@ -3188,7 +3202,7 @@ DocType: Account,Auditor,စာရင်းစစ်ချုပ်
 DocType: Purchase Order,End date of current order's period,လက်ရှိအမိန့်ရဲ့ကာလ၏အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ကမ်းလှမ်းချက်ပေးစာလုပ်ပါ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ပြန်လာ
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ Template ကိုအဖြစ်အတူတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ Template ကိုအဖြစ်အတူတူဖြစ်ရပါမည်
 DocType: DocField,Fold,ခေါက်
 DocType: Production Order Operation,Production Order Operation,ထုတ်လုပ်မှုအမိန့်စစ်ဆင်ရေး
 DocType: Pricing Rule,Disable,ကို disable
@@ -3220,7 +3234,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,အစီရင်ခံစာများမှ
 DocType: SMS Settings,Enter url parameter for receiver nos,လက်ခံ nos သည် url parameter ကိုရိုက်ထည့်
 DocType: Sales Invoice,Paid Amount,Paid ငွေပမာဏ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',အကောင့် {0} ပိတ်ပြီး type ကို '' ဆိုက် '' ၏ဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',အကောင့် {0} ပိတ်ပြီး type ကို '' ဆိုက် '' ၏ဖြစ်ရမည်
 ,Available Stock for Packing Items,ပစ္စည်းများထုပ်ပိုးရရှိနိုင်ပါသည်စတော့အိတ်
 DocType: Item Variant,Item Variant,item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ငါမှတပါးအခြားသော default အရှိအဖြစ်ကို default အတိုင်းဤလိပ်စာ Template ပြင်ဆင်ခြင်း
@@ -3228,7 +3242,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
 DocType: Production Planning Tool,Filter based on customer,ဖောက်သည်အပေါ်အခြေခံပြီး filter
 DocType: Payment Tool Detail,Against Voucher No,ဘောက်ချာမရှိဆန့်ကျင်
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Item {0} သည်အရေအတွက်ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Item {0} သည်အရေအတွက်ရိုက်ထည့်ပေးပါ
 DocType: Employee External Work History,Employee External Work History,ဝန်ထမ်းပြင်ပလုပ်ငန်းခွင်သမိုင်း
 DocType: Tax Rule,Purchase,ဝယ်ခြမ်း
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,ချိန်ခွင် Qty
@@ -3265,28 +3279,29 @@ Note: BOM = Bill of Materials","အခြား ** Item သို့ ** ပစ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},serial No Item {0} သည်မသင်မနေရ
 DocType: Item Variant Attribute,Attribute,attribute
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,အကွာအဝေးမှ / ထံမှ specify ကျေးဇူးပြု.
-sites/assets/js/desk.min.js +7652,Created By,By Created
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,By Created
 DocType: Serial No,Under AMC,AMC အောက်မှာ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,item အဘိုးပြတ်မှုနှုန်းဆင်းသက်ကုန်ကျစရိတ်ဘောက်ချာပမာဏကိုထည့်သွင်းစဉ်းစားပြန်လည်တွက်ချက်နေပါတယ်
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,အရောင်းအရောင်းချနေသည် default setting များ။
 DocType: BOM Replace Tool,Current BOM,လက်ရှိ BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Serial No Add
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Serial No Add
 DocType: Production Order,Warehouses,ကုနျလှောငျရုံ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,ပုံနှိပ်နှင့်စာရေး
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,အုပ်စု Node
 DocType: Payment Reconciliation,Minimum Amount,နိမ့်ဆုံးပမာဏ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Finished ကုန်စည် Update
 DocType: Workstation,per hour,တစ်နာရီကို
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},စီးရီး {0} ပြီးသား {1} များတွင်အသုံးပြု
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},စီးရီး {0} ပြီးသား {1} များတွင်အသုံးပြု
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,အဆိုပါကုန်လှောင်ရုံ (ထာဝရစာရင်း) ကိုအကောင့်ကိုဒီအကောင့်အောက်မှာနေသူများကဖန်တီးလိမ့်မည်။
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,စတော့ရှယ်ယာလယ်ဂျာ entry ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။
 DocType: Company,Distribution,ဖြန့်ဝေ
-sites/assets/js/erpnext.min.js +50,Amount Paid,Paid ငွေပမာဏ
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Paid ငွေပမာဏ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,စီမံကိန်းမန်နေဂျာ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,item တခုကိုခွင့်ပြုထား max ကိုလျှော့စျေး: {0} သည် {1}%
 DocType: Customer,Default Taxes and Charges,Default အနေနဲ့အခွန်နှင့်စွပ်စွဲချက်
 DocType: Account,Receivable,receiver
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,row # {0}: ဝယ်ယူအ​​မိန့်ရှိနှင့်ပြီးသားအဖြစ်ပေးသွင်းပြောင်းလဲပစ်ရန်ခွင့်ပြုခဲ့မဟုတ်
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ထားချေးငွေကန့်သတ်ထက်ကျော်လွန်ကြောင်းကိစ္စများကိုတင်ပြခွင့်ပြုခဲ့ကြောင်းအခန်းကဏ္ဍကို။
 DocType: Sales Invoice,Supplier Reference,ပေးသွင်းကိုးကားစရာ
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","checked လျှင်, Sub-ပရိသပစ္စည်းများသည် BOM ကုန်ကြမ်းဆိုတော့စဉ်းစားရလိမ့်မည်။ ဒီလိုမှမဟုတ်ရင်အားလုံးက sub-ပရိသတ်အပစ္စည်းများကိုတစ်ကုန်ကြမ်းအဖြစ်ကုသရလိမ့်မည်။"
@@ -3323,8 +3338,8 @@ DocType: Email Digest,Add/Remove Recipients,Add / Remove လက်ခံရယ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},transaction ရပ်တန့်ထုတ်လုပ်ရေးအမိန့် {0} ဆန့်ကျင်ခွင့်မပြု
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Default အဖြစ်ဒီဘဏ္ဍာရေးနှစ်တစ်နှစ်တာတင်ထားရန်, '' Default အဖြစ်သတ်မှတ်ပါ '' ကို click လုပ်ပါ"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),အထောက်အပံ့အီးမေးလ်က id သည် Setup ကိုအဝင် server ကို။ (ဥပမာ support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,ပြတ်လပ်မှု Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ပြတ်လပ်မှု Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Salary Slip,Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'' နေ့စွဲရန် '' လိုအပ်သည်
@@ -3337,6 +3352,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","ထို checked ကိစ္စများကိုမဆို "Submitted" အခါ, အီးမေးလ် pop-up တခုအလိုအလျှောက်ပူးတွဲမှုအဖြစ်အရောင်းအဝယ်နှင့်အတူကြောင့်အရောင်းအဝယ်အတွက်ဆက်စပ် "ဆက်သွယ်ရန်" ရန်အီးမေးလ်ပေးပို့ဖို့ဖွင့်လှစ်ခဲ့။ အသုံးပြုသူသို့မဟုတ်မပြုစေခြင်းငှါအီးမေးလ်ပို့ပါလိမ့်မည်။"
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ကမ္ဘာလုံးဆိုင်ရာချိန်ညှိချက်များကို
 DocType: Employee Education,Employee Education,ဝန်ထမ်းပညာရေး
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
 DocType: Salary Slip,Net Pay,Net က Pay ကို
 DocType: Account,Account,အကောင့်ဖွင့်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,serial No {0} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
@@ -3369,7 +3385,7 @@ DocType: BOM,Manufacturing User,ကုန်ထုတ်လုပ်မှုအ
 DocType: Purchase Order,Raw Materials Supplied,ပေးထားသည့်ကုန်ကြမ်းပစ္စည်းများ
 DocType: Purchase Invoice,Recurring Print Format,ထပ်တလဲလဲပုံနှိပ်စီစဉ်ဖွဲ့စည်းမှုပုံစံ
 DocType: Communication,Series,စီးရီး
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုဝယ်ယူခြင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုဝယ်ယူခြင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
 DocType: Appraisal,Appraisal Template,စိစစ်ရေး Template:
 DocType: Communication,Email,အီးမေးလ်
 DocType: Item Group,Item Classification,item ခွဲခြား
@@ -3414,6 +3430,7 @@ DocType: HR Settings,Payroll Settings,လုပ်ခလစာ Settings ကိ
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Non-နှင့်ဆက်စပ်ငွေတောင်းခံလွှာနှင့်ပေးသွင်းခြင်းနှင့်ကိုက်ညီ။
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,အရပ်ဌာနအမိန့်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,အမြစ်မိဘတစ်ဦးကုန်ကျစရိတ်အလယ်ဗဟိုရှိသည်မဟုတ်နိုင်
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ကုန်အမှတ်တံဆိပ်ကိုရွေးပါ ...
 DocType: Sales Invoice,C-Form Applicable,သက်ဆိုင်သည့် C-Form တွင်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
 DocType: Supplier,Address and Contacts,လိပ်စာနှင့်ဆက်သွယ်ရန်
@@ -3424,7 +3441,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,ထူးချွန် voucher Get
 DocType: Warranty Claim,Resolved By,အားဖြင့်ပြေလည်
 DocType: Appraisal,Start Date,စတင်သည့်ရက်စွဲ
-sites/assets/js/desk.min.js +7629,Value,အဘိုး
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,အဘိုး
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,တစ်ဦးကာလသည်အရွက်ခွဲဝေချထားပေးရန်။
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,အတည်ပြုရန်ဤနေရာကိုနှိပ်ပါ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,အကောင့်ကို {0}: သင့်မိဘအကောင့်ကိုတခုအဖြစ်သတ်မှတ်လို့မရပါဘူး
@@ -3440,14 +3457,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox ကို Access က Allowed
 DocType: Dropbox Backup,Weekly,ရက်သတ္တပတ်တကြိမ်ဖြစ်သော
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,eg ။ smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,လက်ခံရရှိ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,လက်ခံရရှိ
 DocType: Maintenance Visit,Fully Completed,အပြည့်အဝပြီးစီး
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,Complete {0}%
 DocType: Employee,Educational Qualification,ပညာရေးဆိုင်ရာအရည်အချင်း
 DocType: Workstation,Operating Costs,operating ကုန်ကျစရိတ်
 DocType: Employee Leave Approver,Employee Leave Approver,ဝန်ထမ်းထွက်ခွာခွင့်ပြုချက်
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} အောင်မြင်စွာကျွန်တော်တို့ရဲ့သတင်းလွှာစာရင်းတွင်ထည့်သွင်းခဲ့သည်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,electron beam machine
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ဝယ်ယူမဟာ Manager က
@@ -3460,7 +3477,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,ကုန်ကျစရိတ်စင်တာများ၏ဇယား
 ,Requested Items To Be Ordered,အမိန့်ခံရဖို့မေတ္တာရပ်ခံပစ္စည်းများ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,ငါ့အမိ​​န့်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,ငါ့အမိ​​န့်
 DocType: Price List,Price List Name,စျေးနှုန်းစာရင်းအမည်
 DocType: Time Log,For Manufacturing,ကုန်ထုတ်လုပ်မှုများအတွက်
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,စုစုပေါင်း
@@ -3471,7 +3488,7 @@ DocType: Account,Income,ဝင်ငွေခွန်
 DocType: Industry Type,Industry Type,စက်မှုဝန်ကြီး Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,တစ်ခုခုမှားသွားတယ်!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,အရောင်းပြေစာ {0} ပြီးသားတင်သွင်းခဲ့
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,အရောင်းပြေစာ {0} ပြီးသားတင်သွင်းခဲ့
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,ပြီးစီးနေ့စွဲ
 DocType: Purchase Invoice Item,Amount (Company Currency),ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ချ. သေဆုံး
@@ -3485,10 +3502,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,ခုနှစ်
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,point-of-Sale ကိုယ်ရေးအချက်အလက်များ profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS ကို Settings ကို Update ကျေးဇူးပြု.
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,အချိန်အထဲ {0} ပြီးသားကြေညာ
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,အချိန်အထဲ {0} ပြီးသားကြေညာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,မလုံခြုံချေးငွေ
 DocType: Cost Center,Cost Center Name,ကုန်ကျ Center ကအမည်
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,item {0} Serial No {1} install လုပ်ထားပြီးသားဖြစ်ပါတယ်နှင့်အတူ
 DocType: Maintenance Schedule Detail,Scheduled Date,Scheduled နေ့စွဲ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,စုစုပေါင်း Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 ဇာတ်ကောင်ထက် သာ. ကြီးမြတ် messages အများအပြားသတင်းစကားများသို့ခွဲထွက်လိမ့်မည်
@@ -3496,10 +3512,10 @@ DocType: Purchase Receipt Item,Received and Accepted,ရရှိထားသည
 ,Serial No Service Contract Expiry,serial No Service ကိုစာချုပ်သက်တမ်းကုန်ဆုံး
 DocType: Item,Unit of Measure Conversion,တိုင်းကူးပြောင်းခြင်း၏ယူနစ်
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,ဝန်ထမ်းမပြောင်းနိုင်ဘူး
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
 DocType: Naming Series,Help HTML,HTML ကိုကူညီပါ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},တာဝန်ပေးစုစုပေါင်း weightage 100% ဖြစ်သင့်သည်။ ဒါဟာ {0} သည်
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},{0} over- ခွင့် Item {1} သည်ကိုကူး
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0} over- ခွင့် Item {1} သည်ကိုကူး
 DocType: Address,Name of person or organization that this address belongs to.,ဒီလိပ်စာကိုပိုင်ဆိုင်ကြောင်းလူတစ်ဦးသို့မဟုတ်အဖွဲ့အစည်း၏အမည်ပြောပါ။
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,သင့်ရဲ့ပေးသွင်း
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
@@ -3510,10 +3526,11 @@ DocType: Lead,Converted,ပွောငျး
 DocType: Item,Has Serial No,Serial No ရှိပါတယ်
 DocType: Employee,Date of Issue,ထုတ်ဝေသည့်ရက်စွဲ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} {1} သည် မှစ.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
 DocType: Issue,Content Type,content Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,ကွန်ပျူတာ
 DocType: Item,List this Item in multiple groups on the website.,Website တွင်အများအပြားအုပ်စုများ၌ဤ Item စာရင်း။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,item: {0} system ကိုအတွက်မတည်ရှိပါဘူး
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled Entries Get
@@ -3524,14 +3541,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,ဂိုဒေါင်မှ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},အကောင့်ကို {0} ဘဏ္ဍာရေးနှစ်များအတွက် {1} တစ်ကြိမ်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 ,Average Commission Rate,ပျမ်းမျှအားဖြင့်ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'' ဟုတ်ကဲ့ '' Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ '' Serial No ရှိခြင်း ''
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'' ဟုတ်ကဲ့ '' Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ '' Serial No ရှိခြင်း ''
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
 DocType: Pricing Rule,Pricing Rule Help,စျေးနှုန်း Rule အကူအညီ
 DocType: Purchase Taxes and Charges,Account Head,အကောင့်ဖွင့်ဦးခေါင်း
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ပစ္စည်းများဆင်းသက်ကုန်ကျစရိတ်ကိုတွက်ချက်ဖို့အပိုဆောင်းကုန်ကျစရိတ်များကို Update
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,electrical
 DocType: Stock Entry,Total Value Difference (Out - In),(- ခုနှစ်တွင် Out) စုစုပေါင်းတန်ဖိုး Difference
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,row {0}: ငွေလဲနှုန်းမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,row {0}: ငွေလဲနှုန်းမဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},အသုံးပြုသူ ID န်ထမ်း {0} သည်စွဲလမ်းခြင်းမ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,အာမခံပြောဆိုချက်ကိုထံမှ
@@ -3545,15 +3562,17 @@ DocType: Buying Settings,Naming Series,စီးရီးအမည်
 DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
 DocType: User,Enabled,Enabled
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,စတော့အိတ်ပိုင်ဆိုင်မှုများ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},သင်အမှန်တကယ်လ {0} အပေါင်းသည်လစာစလစ်ဖြတ်ပိုင်းပုံစံ Submit ချင်ပြုပါနှင့်တစ်နှစ် {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},သင်အမှန်တကယ်လ {0} အပေါင်းသည်လစာစလစ်ဖြတ်ပိုင်းပုံစံ Submit ချင်ပြုပါနှင့်တစ်နှစ် {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,သွင်းကုန် Subscribers
 DocType: Target Detail,Target Qty,Target က Qty
 DocType: Attendance,Present,လက်ဆောင်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery မှတ်ချက် {0} တင်သွင်းရမည်မဟုတ်ရပါ
 DocType: Notification Control,Sales Invoice Message,အရောင်းပြေစာ Message
 DocType: Authorization Rule,Based On,ပေါ်အခြေခံကာ
-,Ordered Qty,အမိန့် Qty
+DocType: Sales Order Item,Ordered Qty,အမိန့် Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},မှစ. နှင့်ကာလ {0} ထပ်တလဲလဲများအတွက်မဖြစ်မနေရက်စွဲများရန် period
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,လစာစလစ် Generate
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} မှန်ကန်သော email က id မဟုတ်ပါဘူး
@@ -3592,7 +3611,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,တက်ရောက် upload
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM နှင့်ကုန်ထုတ်လုပ်မှုပမာဏလိုအပ်သည်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
-DocType: Journal Entry Account,Amount,ငွေပမာဏ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,ငွေပမာဏ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM အစားထိုး
 ,Sales Analytics,အရောင်း Analytics
@@ -3619,7 +3638,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,မျှော်လင့်ထားသည့်ရက်စွဲပစ္စည်းတောင်းဆိုမှုနေ့စွဲခင်မဖွစျနိုငျ
 DocType: Contact Us Settings,City,မြို့
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic machine
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,error: မမှန်ကန်သောက id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,error: မမှန်ကန်သောက id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,item {0} တစ်ခုအရောင်း Item ဖြစ်ရမည်
 DocType: Naming Series,Update Series Number,Update ကိုစီးရီးနံပါတ်
 DocType: Account,Equity,equity
@@ -3634,7 +3653,7 @@ DocType: Purchase Taxes and Charges,Actual,အမှန်တကယ်
 DocType: Authorization Rule,Customerwise Discount,Customerwise လျှော့
 DocType: Purchase Invoice,Against Expense Account,အသုံးအကောင့်ဆန့်ကျင်
 DocType: Production Order,Production Order,ထုတ်လုပ်မှုအမိန့်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Installation မှတ်ချက် {0} ပြီးသားတင်သွင်းခဲ့
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installation မှတ်ချက် {0} ပြီးသားတင်သွင်းခဲ့
 DocType: Quotation Item,Against Docname,Docname ဆန့်ကျင်
 DocType: SMS Center,All Employee (Active),အားလုံးသည်န်ထမ်း (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,အခုတော့ကြည့်ရန်
@@ -3642,14 +3661,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,ကုန်ကြမ်းပစ္စည်းကုန်ကျစရိတ်
 DocType: Item,Re-Order Level,Re-Order အဆင့်
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ပစ္စည်းများကို Enter နှင့်သင်ထုတ်လုပ်မှုအမိန့်မြှင်သို့မဟုတ်ခွဲခြမ်းစိတ်ဖြာများအတွက်ကုန်ကြမ်းကို download လုပ်လိုသည့်အဘို့အ qty စီစဉ်ခဲ့ပါတယ်။
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt ဇယား
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt ဇယား
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,အချိန်ပိုင်း
 DocType: Employee,Applicable Holiday List,သက်ဆိုင်အားလပ်ရက်များစာရင်း
 DocType: Employee,Cheque,Cheques
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,စီးရီး Updated
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,အစီရင်ခံစာ Type မသင်မနေရ
 DocType: Item,Serial Number Series,serial နံပါတ်စီးရီး
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},ဂိုဒေါင်တန်းအတွက်စတော့ရှယ်ယာ Item {0} သည်မသင်မနေရ {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ဂိုဒေါင်တန်းအတွက်စတော့ရှယ်ယာ Item {0} သည်မသင်မနေရ {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,လက်လီလက်ကားအရောင်းဆိုင် &
 DocType: Issue,First Responded On,ပထမဦးဆုံးတွင်တုန့်ပြန်
 DocType: Website Item Group,Cross Listing of Item in multiple groups,မျိုးစုံအုပ်စုများအတွက် Item ၏လက်ဝါးကပ်တိုင်အိမ်ခန်းနှင့်
@@ -3664,7 +3683,7 @@ DocType: Attendance,Attendance,သွားရောက်ရှိနေခြ
 DocType: Page,No,မရှိပါ
 DocType: BOM,Materials,ပစ္စည်းများ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","checked မလျှင်, စာရင်းကလျှောက်ထားခံရဖို့ရှိပါတယ်ရှိရာတစ်ဦးစီဦးစီးဌာနမှထည့်သွင်းရပါလိမ့်မယ်။"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,ရက်စွဲနှင့် posting အချိန်များသို့တင်ပြမသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,ရက်စွဲနှင့် posting အချိန်များသို့တင်ပြမသင်မနေရ
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,အရောင်းအဝယ်သည်အခွန် Simple template ။
 ,Item Prices,item ဈေးနှုန်းများ
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,သင်ဝယ်ယူခြင်းအမိန့်ကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
@@ -3684,9 +3703,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,စီမံခန့်ခွဲရေးဆိုင်ရာအသုံးစရိတ်များ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,မိဘဖောက်သည်အုပ်စု
-sites/assets/js/erpnext.min.js +50,Change,ပွောငျးလဲခွငျး
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ပွောငျးလဲခွငျး
 DocType: Purchase Invoice,Contact Email,ဆက်သွယ်ရန်အီးမေးလ်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',ဝယ်ယူခြင်းအမိန့် {0} '' ရပ်တန့် '' သည်
 DocType: Appraisal Goal,Score Earned,ရမှတ်ရရှိခဲ့သည်
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",ဥပမာ "ကျနော့်ကုမ္ပဏီ LLC"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,သတိပေးချက်ကာလ
@@ -3696,12 +3714,13 @@ DocType: Packing Slip,Gross Weight UOM,gross အလေးချိန် UOM
 DocType: Email Digest,Receivables / Payables,receiver / ပေးဆောင်
 DocType: Delivery Note Item,Against Sales Invoice,အရောင်းပြေစာဆန့်ကျင်
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stamping
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,ခရက်ဒစ်အကောင့်ကို
 DocType: Landed Cost Item,Landed Cost Item,ဆင်းသက်ကုန်ကျစရိတ် Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,သုညတန်ဖိုးများကိုပြရန်
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ကုန်ကြမ်းပေးသောပမာဏကနေ repacking / ထုတ်လုပ်ပြီးနောက်ရရှိသောတဲ့ item ၏အရေအတွက်
 DocType: Payment Reconciliation,Receivable / Payable Account,receiver / ပေးဆောင်အကောင့်
 DocType: Delivery Note Item,Against Sales Order Item,အရောင်းအမိန့် Item ဆန့်ကျင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,Default Warehouse,default ဂိုဒေါင်
 DocType: Task,Actual End Date (via Time Logs),(အချိန် Logs ကနေတဆင့်) အမှန်တကယ် End Date ကို
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},ဘဏ္ဍာငွေအရအသုံး Group မှအကောင့် {0} ဆန့်ကျင်တာဝန်ပေးမရနိုင်ပါ
@@ -3715,7 +3734,7 @@ DocType: Issue,Support Team,Support Team သို့
 DocType: Appraisal,Total Score (Out of 5),(5 ထဲက) စုစုပေါင်းရမှတ်
 DocType: Contact Us Settings,State,ပြည်နယ်
 DocType: Batch,Batch,batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,ချိန်ခွင်လျှာ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,ချိန်ခွင်လျှာ
 DocType: Project,Total Expense Claim (via Expense Claims),(သုံးစွဲမှုစွပ်စွဲနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
 DocType: User,Gender,"ကျား, မ"
 DocType: Journal Entry,Debit Note,debit မှတ်ချက်
@@ -3731,9 +3750,8 @@ DocType: Lead,Blog Subscriber,ဘလော့ Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,တန်ဖိုးများကိုအပေါ်အခြေခံပြီးအရောင်းအကနျ့သစည်းမျဉ်းစည်းကမ်းတွေကိုဖန်တီးပါ။
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","checked, စုစုပေါင်းမျှမပါ။ အလုပ်အဖွဲ့ Days ၏အားလပ်ရက်ပါဝင်ပါလိမ့်မယ်, ဒီလစာ Per နေ့၏တန်ဖိုးကိုလျော့ချလိမ့်မည်"
 DocType: Purchase Invoice,Total Advance,စုစုပေါင်းကြိုတင်ထုတ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,လှတျပစ္စည်းတောင်းဆိုခြင်း
 DocType: Workflow State,User,အသုံးပြုသူ
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,အပြောင်းအလဲနဲ့လစာ
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,အပြောင်းအလဲနဲ့လစာ
 DocType: Opportunity Item,Basic Rate,အခြေခံပညာ Rate
 DocType: GL Entry,Credit Amount,အကြွေးပမာဏ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,ပျောက်ဆုံးသွားသောအဖြစ် Set
@@ -3741,7 +3759,7 @@ DocType: Customer,Credit Days Based On,တွင် အခြေခံ. credit D
 DocType: Tax Rule,Tax Rule,အခွန်စည်းမျဉ်း
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,အရောင်း Cycle တစ်လျှောက်လုံးအတူတူပါပဲ Rate ထိန်းသိမ်းနည်း
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Workstation နှင့်အလုပ်အဖွဲ့နာရီပြင​​်ပတွင်အချိန်မှတ်တမ်းများကြိုတင်စီစဉ်ထားပါ။
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} ပြီးသားတင်သွင်းခဲ့
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ပြီးသားတင်သွင်းခဲ့
 ,Items To Be Requested,တောင်းဆိုထားသောခံရဖို့ items
 DocType: Purchase Order,Get Last Purchase Rate,ပြီးခဲ့သည့်ဝယ်ယူ Rate Get
 DocType: Time Log,Billing Rate based on Activity Type (per hour),ငွေတောင်းခံနှုန်း (တစ်နာရီလျှင်) လုပ်ဆောင်ချက်ကအမျိုးအစားပေါ်အခြေခံပြီး
@@ -3750,6 +3768,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ဤအရပ်မှပို့ပေးဖို့စလှေတျတျောကိုမတှေ့မကုမ္ပဏီသည်အီးမေးလ် ID ကို,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ရန်ပုံငွေ၏လျှောက်လွှာ (ပိုင်ဆိုင်မှုများ)
 DocType: Production Planning Tool,Filter based on item,item ကို select လုပ်ထားတဲ့အပေါ်အခြေခံပြီး filter
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,debit အကောင့်ကို
 DocType: Fiscal Year,Year Start Date,တစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Attendance,Employee Name,ဝန်ထမ်းအမည်
 DocType: Sales Invoice,Rounded Total (Company Currency),rounded စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -3761,14 +3780,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
 DocType: Sales Invoice,Is POS,POS စက်ဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
 DocType: Production Order,Manufactured Qty,ထုတ်လုပ်သော Qty
 DocType: Purchase Receipt Item,Accepted Quantity,လက်ခံခဲ့သည်ပမာဏ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} တည်ရှိပါဘူး
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Customer များကြီးပြင်းဥပဒေကြမ်းများ။
 DocType: DocField,Default,ပျက်ကွက်
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,စီမံကိန်း Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,ကဆက်ပြောသည် {0} လစဉ်ကြေး ပေး.
 DocType: Maintenance Schedule,Schedule,ဇယား
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","ဒီအကုန်ကျစရိတ်စင်တာဘဏ္ဍာငွေအရအသုံး Define ။ ဘတ်ဂျက်အရေးယူတင်ထားရန်, "ကုမ္ပဏီစာရင်း" ကိုကြည့်ပါ"
@@ -3776,7 +3795,7 @@ DocType: Account,Parent Account,မိဘအကောင့်
 DocType: Quality Inspection Reading,Reading 3,3 Reading
 ,Hub,hub
 DocType: GL Entry,Voucher Type,ဘောက်ချာကအမျိုးအစား
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
 DocType: Expense Claim,Approved,Approved
 DocType: Pricing Rule,Price,စျေးနှုန်း
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} '' လက်ဝဲ 'အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
@@ -3785,23 +3804,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,ပညာရေး
 DocType: Selling Settings,Campaign Naming By,အားဖြင့်အမည်ကင်ပိန်း
 DocType: Employee,Current Address Is,လက်ရှိလိပ်စာ Is
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",optional ။ သတ်မှတ်ထားသောမဟုတ်လျှင်ကုမ္ပဏီတစ်ခုရဲ့ default ငွေကြေးသတ်မှတ်ပါတယ်။
 DocType: Address,Office,ရုံး
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,စံအစီရင်ခံစာများ
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,စာရင်းကိုင်ဂျာနယ် entries တွေကို။
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},row {0}: ပါတီ / အကောင့်ကို {3} {4} အတွက် {1} / {2} နှင့်ကိုက်ညီမပါဘူး
+DocType: Delivery Note Item,Available Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Qty
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},row {0}: ပါတီ / အကောင့်ကို {3} {4} အတွက် {1} / {2} နှင့်ကိုက်ညီမပါဘူး
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,တစ်ဦးခွန်အကောင့်ကိုဖန်တီးရန်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Stock,စတော့အိတ်
 DocType: Employee,Current Address,လက်ရှိလိပ်စာ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ကို item အခြားတဲ့ item တစ်ခုမူကွဲဖြစ်ပါတယ် အကယ်. အတိအလင်းသတ်မှတ်လိုက်သောမဟုတ်လျှင်ထို့နောက်ဖော်ပြချက်, ပုံရိပ်, စျေးနှုန်း, အခွန်စသည်တို့အတွက် template ကိုကနေသတ်မှတ်ကြလိမ့်မည်"
 DocType: Serial No,Purchase / Manufacture Details,ဝယ်ယူခြင်း / ထုတ်လုပ်ခြင်းလုပ်ငန်းအသေးစိတ်ကို
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,batch Inventory
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,batch Inventory
 DocType: Employee,Contract End Date,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲ
 DocType: Sales Order,Track this Sales Order against any Project,မည်သည့်စီမံကိန်းဆန့်ကျင်သည်ဤအရောင်းအမိန့်အားခြေရာခံ
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,အထက်ပါသတ်မှတ်ချက်များအပေါ်အခြေခံပြီးအရောင်းအမိန့် (ကယ်နှုတ်ရန်ဆိုင်းငံ့ထား) Pull
 DocType: DocShare,Document Type,စာရွက်စာတမ်းကအမျိုးအစား
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,ပေးသွင်းစျေးနှုန်းအနေဖြင့်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ပေးသွင်းစျေးနှုန်းအနေဖြင့်
 DocType: Deduction Type,Deduction Type,သဘောအယူအဆကအမျိုးအစား
 DocType: Attendance,Half Day,တစ်ဝက်နေ့
 DocType: Pricing Rule,Min Qty,min Qty
@@ -3812,20 +3833,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,ပမာဏအတွက် (Qty ကုန်ပစ္စည်းထုတ်လုပ်) မသင်မနေရ
 DocType: Stock Entry,Default Target Warehouse,default Target ကဂိုဒေါင်
 DocType: Purchase Invoice,Net Total (Company Currency),Net ကစုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကိုဆန့်ကျင်သာသက်ဆိုင်သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကိုဆန့်ကျင်သာသက်ဆိုင်သည်
 DocType: Notification Control,Purchase Receipt Message,ဝယ်ယူခြင်းပြေစာ Message
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total ကုမ္ပဏီခွဲဝေအရွက်ကာလအတွင်းထက်ပို
 DocType: Production Order,Actual Start Date,အမှန်တကယ် Start ကိုနေ့စွဲ
 DocType: Sales Order,% of materials delivered against this Sales Order,ဒီအရောင်းအမိန့်ဆန့်ကျင်ကယ်နှုတ်တော်မူ၏ပစ္စည်း%
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,စံချိန်တင်တဲ့ item လှုပ်ရှားမှု။
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,စံချိန်တင်တဲ့ item လှုပ်ရှားမှု။
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,သတင်းလွှာများစာရင်းရရှိရန် Register စာရင်းပေးသွင်း
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,ဝန်ဆောင်မှု
 DocType: Hub Settings,Hub Settings,hub Settings ကို
 DocType: Project,Gross Margin %,gross Margin%
 DocType: BOM,With Operations,စစ်ဆင်ရေးနှင့်အတူ
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 ,Monthly Salary Register,လစဉ်လစာမှတ်ပုံတင်မည်
-apps/frappe/frappe/website/template.py +123,Next,နောက်တစ်ခု
+apps/frappe/frappe/website/template.py +140,Next,နောက်တစ်ခု
 DocType: Warranty Claim,If different than customer address,ဖောက်သည်လိပ်စာတခုထက်ကွဲပြားခြားနားနေလျှင်
 DocType: BOM Operation,BOM Operation,BOM စစ်ဆင်ရေး
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3856,6 +3878,7 @@ DocType: Purchase Invoice,Next Date,Next ကိုနေ့စွဲ
 DocType: Employee Education,Major/Optional Subjects,ဗိုလ်မှူး / မလုပ်မဖြစ်ကျအောကျခံ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်ကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,machine
+DocType: Sales Invoice Item,Drop Ship,drop သင်္ဘော
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ဒီနေရာတွင်မိဘ, အိမ်ထောင်ဖက်နှင့်ကလေးများ၏အမည်နှင့်အလုပ်အကိုင်တူမိသားစုကအသေးစိတ်ထိနျးသိမျးထားနိုငျ"
 DocType: Hub Settings,Seller Name,ရောင်းချသူအမည်
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),နုတ်ယူအခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -3882,29 +3905,29 @@ DocType: Purchase Order,To Receive and Bill,လက်ခံနှင့်ဘီ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,ပုံစံရေးဆှဲသူ
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,စည်းကမ်းသတ်မှတ်ချက်များ Template:
 DocType: Serial No,Delivery Details,Delivery အသေးစိတ်ကို
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
 DocType: Item,Automatically create Material Request if quantity falls below this level,အရေအတွက်ကဤအဆင့်အောက်ကျလျှင်အလိုအလျှောက်ပစ္စည်းတောင်းဆိုမှုဖန်တီး
 ,Item-wise Purchase Register,item-ပညာရှိသောသူသည်ဝယ်ယူမှတ်ပုံတင်မည်
 DocType: Batch,Expiry Date,သက်တမ်းကုန်ဆုံးရက်
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","reorder အ level ကိုတင်ထားရန်, ကို item တစ်ခုဝယ်ယူပစ္စည်းသို့မဟုတ်ထုတ်လုပ်ခြင်းပစ္စည်းဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","reorder အ level ကိုတင်ထားရန်, ကို item တစ်ခုဝယ်ယူပစ္စည်းသို့မဟုတ်ထုတ်လုပ်ခြင်းပစ္စည်းဖြစ်ရပါမည်"
 ,Supplier Addresses and Contacts,ပေးသွင်းလိပ်စာနှင့်ဆက်သွယ်ရန်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,ပထမဦးဆုံးအမျိုးအစားလိုက်ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Project မှမာစတာ။
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ငွေကြေးကိုမှစသည်တို့ $ တူသောသင်္ကေတကိုလာမယ့်မပြပါနဲ့။
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(တစ်ဝက်နေ့)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(တစ်ဝက်နေ့)
 DocType: Supplier,Credit Days,ခရက်ဒစ် Days
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ခဲအချိန် Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,ပစ္စည်းများ၏ဘီလ်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကို {1} သည်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကို {1} သည်လိုအပ်သည်
 DocType: Dropbox Backup,Send Notifications To,ရန်အသိပေးချက်များ Send
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref နေ့စွဲ
 DocType: Employee,Reason for Leaving,ထွက်ခွာရသည့်အကြောင်းရင်း
 DocType: Expense Claim Detail,Sanctioned Amount,ပိတ်ဆို့ငွေပမာဏ
 DocType: GL Entry,Is Opening,ဖွင့်လှစ်တာဖြစ်ပါတယ်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
 DocType: Account,Cash,ငွေသား
 DocType: Employee,Short biography for website and other publications.,website နှင့်အခြားပုံနှိပ်ထုတ်ဝေအတိုကောက်အတ္ထုပ္ပတ္တိ။
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},ဝန်ထမ်း {0} သည်လစာဖွဲ့စည်းပုံဖန်တီး ကျေးဇူးပြု.
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 2af323bc58..ef9777dd98 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Salaris Modus
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selecteer Maandelijkse Distributie, als je wilt volgen op basis van seizoensinvloeden."
 DocType: Employee,Divorced,Gescheiden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Waarschuwing: Hetzelfde item is meerdere keren ingevoerd.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Waarschuwing: Hetzelfde item is meerdere keren ingevoerd.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Artikelen reeds gesynchroniseerd
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Toestaan ​​Item om meerdere keren in een transactie worden toegevoegd
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuleren Materiaal Bezoek {0} voor het annuleren van deze Garantie Claim
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Verdichting plus sinteren
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Munt is nodig voor prijslijst {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zal worden berekend in de transactie.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Van Materiaal Aanvraag
+DocType: Purchase Order,Customer Contact,Customer Contact
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Van Materiaal Aanvraag
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Boom
 DocType: Job Applicant,Job Applicant,Sollicitant
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Geen andere resultaten.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Klantnaam
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle export gerelateerde gebieden zoals valuta , wisselkoers , export totaal, export eindtotaal enz. zijn beschikbaar in Delivery Note , POS , Offerte , verkoopfactuur , Sales Order etc."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoofden (of groepen) waartegen de boekingen worden gemaakt en saldi worden gehandhaafd.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Openstaand bedrag voor {0} mag niet kleiner zijn dan nul ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Openstaand bedrag voor {0} mag niet kleiner zijn dan nul ({1})
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mins
 DocType: Leave Type,Leave Type Name,Verlof Type Naam
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Reeks succesvol bijgewerkt
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Meerdere Artikelprijzen .
 DocType: SMS Center,All Supplier Contact,Alle Leverancier Contact
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Verwachte Einddatum kan niet minder dan verwacht Startdatum zijn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Wilt u echt deze productieorder on-stoppen:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rij # {0}: Beoordeel moet hetzelfde zijn als zijn {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Nieuwe Verlofaanvraag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nieuwe Verlofaanvraag
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Om de klantgebaseerde artikelcode te onderhouden om ze zoekbaar te maken op basis van hun code; gebruik deze optie
 DocType: Mode of Payment Account,Mode of Payment Account,Modus van Betaalrekening
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Toon Varianten
 DocType: Sales Invoice Item,Quantity,Hoeveelheid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Leningen (Passiva)
 DocType: Employee Education,Year of Passing,Voorbije Jaar
-sites/assets/js/erpnext.min.js +27,In Stock,Op Voorraad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Kan alleen tegen betaling nog niet gefactureerde verkooporder maken
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Op Voorraad
 DocType: Designation,Designation,Benaming
 DocType: Production Plan Item,Production Plan Item,Productie Plan Artikel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Gebruiker {0} is al aan Werknemer toegewezen {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Maak nieuwe POS Profiel
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Gezondheidszorg
 DocType: Purchase Invoice,Monthly,Maandelijks
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Factuur
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Vertraging in de betaling (Dagen)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factuur
 DocType: Maintenance Schedule Item,Periodicity,Periodiciteit
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mailadres
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensie
 DocType: Company,Abbr,Afk
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Rij {0}: {1} {2} niet overeenkomt met {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rij {0}: {1} {2} niet overeenkomt met {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Rij # {0}:
 DocType: Delivery Note,Vehicle No,Voertuig nr.
-sites/assets/js/erpnext.min.js +55,Please select Price List,Selecteer Prijslijst
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Selecteer Prijslijst
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Houtbewerking
 DocType: Production Order Operation,Work In Progress,Onderhanden Werk
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D printing
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Bovenliggende Detail docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Vacature voor een baan.
 DocType: Item Attribute,Increment,Aanwas
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Kies Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Adverteren
 DocType: Employee,Married,Getrouwd
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
 DocType: Payment Reconciliation,Reconcile,Afletteren
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Kruidenierswinkel
 DocType: Quality Inspection Reading,Reading 1,Meting 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Maak Bank Entry
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Maak Bank Entry
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,pensioenfondsen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Magazijn is verplicht als het account type Warehouse
 DocType: SMS Center,All Sales Person,Alle Sales Person
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Afschrijvingen kostenplaats
 DocType: Warehouse,Warehouse Detail,Magazijn Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is overschreden voor de klant {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Belasting Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},U bent niet bevoegd om items toe te voegen of bij te werken voor {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},U bent niet bevoegd om items toe te voegen of bij te werken voor {0}
 DocType: Item,Item Image (if not slideshow),Artikel Afbeelding (indien niet diashow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Een klant bestaat met dezelfde naam
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief/60) * De werkelijke Operation Time
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Gast
 DocType: Quality Inspection,Get Specification Details,Get Specificatie Details
 DocType: Lead,Interested,Geïnteresseerd
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Stuklijst
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Opening
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Opening
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Van {0} tot {1}
 DocType: Item,Copy From Item Group,Kopiëren van Item Group
 DocType: Journal Entry,Opening Entry,Opening Entry
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Product Aanvraag
 DocType: Standard Reply,Owner,eigenaar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Vul aub eerst bedrijf in
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Selecteer Company eerste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Selecteer Company eerste
 DocType: Employee Education,Under Graduate,Onder Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Doel op
 DocType: BOM,Total Cost,Totale kosten
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Voorvoegsel
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Verbruiksartikelen
 DocType: Upload Attendance,Import Log,Importeren Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Verstuur
+DocType: Sales Invoice Item,Delivered By Supplier,Geleverd door Leverancier
 DocType: SMS Center,All Contact,Alle Contact
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Jaarsalaris
 DocType: Period Closing Voucher,Closing Fiscal Year,Het sluiten van het fiscale jaar
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company in Valuta
 DocType: Delivery Note,Installation Status,Installatie Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Geaccepteerde + Verworpen Aantal moet gelijk zijn aan Ontvangen aantal zijn voor Artikel {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Geaccepteerde + Verworpen Aantal moet gelijk zijn aan Ontvangen aantal zijn voor Artikel {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply Grondstoffen voor Aankoop
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Artikel {0} moet een inkoopbaar artikel zijn
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download de Template, vul de juiste gegevens en bevestig het gewijzigde bestand.
  Alle data en werknemer combinatie in de geselecteerde periode zal komen in de sjabloon, met bestaande presentielijsten"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,ARtikel {0} is niet actief of heeft einde levensduur bereikt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,ARtikel {0} is niet actief of heeft einde levensduur bereikt
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Zal worden bijgewerkt zodra verkoopfactuur is ingediend.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen "
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen "
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Instellingen voor HR Module
 DocType: SMS Center,SMS Center,SMS Center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rechttrekken
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Voer URL-parameter voor be
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regels voor de toepassing van prijzen en kortingen .
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},This Time Log in strijd met {0} voor {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prijslijst moet van toepassing zijn op Inkoop of Verkoop
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},De installatie mag niet vóór leveringsdatum voor post {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},De installatie mag niet vóór leveringsdatum voor post {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Korting op de prijslijst Rate (%)
-sites/assets/js/form.min.js +279,Start,Start
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Voornaam
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Uw installatie is voltooid. Verversen.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-mal gieten
 DocType: Offer Letter,Select Terms and Conditions,Select Voorwaarden
 DocType: Production Planning Tool,Sales Orders,Verkooporders
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Tegen Sales Invoice Item
 ,Production Orders in Progress,Productieorders in behandeling
 DocType: Lead,Address & Contact,Adres & Contact
+DocType: Leave Allocation,Add unused leaves from previous allocations,Voeg ongebruikte bladeren van de vorige toewijzingen
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Volgende terugkerende {0} zal worden gemaakt op {1}
 DocType: Newsletter List,Total Subscribers,Totaal Abonnees
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Contact Naam
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,VO afwachting Aantal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Maakt salarisstrook voor de bovengenoemde criteria.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Inkoopaanvraag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dubbele behuizing
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Verlaat per jaar
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Stel Naming Series voor {0} via Setup> Instellingen> Naamgeving Series
 DocType: Time Log,Will be updated when batched.,Zal worden bijgewerkt wanneer gedoseerd.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rij {0}: Kijk 'Is Advance' tegen Account {1} als dit is een voorschot binnenkomst.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rij {0}: Kijk 'Is Advance' tegen Account {1} als dit is een voorschot binnenkomst.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Magazijn {0} behoort niet tot bedrijf {1}
 DocType: Bulk Email,Message,Bericht
 DocType: Item Website Specification,Item Website Specification,Artikel Website Specificatie
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referentienummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Verlof Geblokkeerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,jaar-
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraad Afletteren Artikel
 DocType: Stock Entry,Sales Invoice No,Verkoopfactuur nr.
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Minimum bestel aantal
 DocType: Pricing Rule,Supplier Type,Leverancier Type
 DocType: Item,Publish in Hub,Publiceren in Hub
 ,Terretory,Regio
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Artikel {0} is geannuleerd
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,"Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,"Materiaal Aanvraag
 "
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum
 DocType: Item,Purchase Details,Inkoop Details
@@ -279,7 +281,7 @@ DocType: Notification Control,Notification Control,Notificatie Beheer
 DocType: Lead,Suggestions,Suggesties
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Item Group-wise budgetten op dit gebied. U kunt ook seizoensinvloeden door de Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Vul ouderaccount groep voor magazijn {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling tegen {0} {1} kan niet groter zijn dan openstaande bedrag te zijn {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling tegen {0} {1} kan niet groter zijn dan openstaande bedrag te zijn {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Mobiel nummer
 DocType: Maintenance Schedule,Generate Schedule,Genereer Plan
@@ -305,10 +307,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nieuwe Voorraad Eenheid
 DocType: Period Closing Voucher,Closing Account Head,Sluiten Account Hoofd
 DocType: Employee,External Work History,Externe Werk Geschiedenis
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kringverwijzing Error
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Wil je echt wilt stoppen
 DocType: Communication,Closed,Gesloten
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In woorden (Export) wordt zichtbaar zodra u de vrachtbrief opslaat.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Weet u zeker dat u wilt stoppen
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Functieprofiel
 DocType: Newsletter,Newsletter,Nieuwsbrief
@@ -323,7 +323,7 @@ DocType: Sales Invoice Item,Delivery Note,Vrachtbrief
 DocType: Dropbox Backup,Allow Dropbox Access,Laat Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Het opzetten van Belastingen
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Bericht is gewijzigd nadat u het getrokken. Neem dan trekt het weer.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Samenvatting voor deze week en in afwachting van activiteiten
 DocType: Workstation,Rent Cost,Huurkosten
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecteer maand en jaar
@@ -340,11 +340,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basisvaluta van de klant.
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verkrijgbaar in BOM , Delivery Note, aankoopfactuur, Productie Order , Bestelling , Kwitantie , verkoopfactuur , Sales Order , Voorraad Entry , Rooster"
 DocType: Item Tax,Tax Rate,Belastingtarief
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Selecteer Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selecteer Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} beheerd batchgewijs, is niet te rijmen met behulp \
  Stock Verzoening, in plaats daarvan gebruik Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rij # {0}: Batch Geen moet hetzelfde zijn als zijn {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converteren naar non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Aankoopbon moet worden ingediend
@@ -352,7 +352,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Huidige voorraad eenheid
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Partij van een artikel.
 DocType: C-Form Invoice Detail,Invoice Date,Factuurdatum
 DocType: GL Entry,Debit Amount,Debet Bedrag
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Er kan slechts 1 account per Bedrijf in zijn {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Er kan slechts 1 account per Bedrijf in zijn {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Uw e-mailadres
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Zie bijlage
 DocType: Purchase Order,% Received,% Ontvangen
@@ -362,7 +362,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instructies
 DocType: Quality Inspection,Inspected By,Geïnspecteerd door
 DocType: Maintenance Visit,Maintenance Type,Onderhoud Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} behoort niet tot Vrachtbrief {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} behoort niet tot Vrachtbrief {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Artikel Kwaliteitsinspectie Parameter
 DocType: Leave Application,Leave Approver Name,Verlaat Goedkeurder Naam
 ,Schedule Date,Plan datum
@@ -381,7 +381,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Inkoop Register
 DocType: Landed Cost Item,Applicable Charges,Toepasselijke kosten
 DocType: Workstation,Consumable Cost,Verbruikskosten
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) moet rol hebben 'Verlof Goedkeurder' hebben
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) moet rol hebben 'Verlof Goedkeurder' hebben
 DocType: Purchase Receipt,Vehicle Date,Vehicle Data
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,medisch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen
@@ -402,6 +402,7 @@ DocType: Delivery Note,% Installed,% Geïnstalleerd
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Vul aub eerst de naam van het bedrijf in
 DocType: BOM,Item Desription,Artikelomschrijving
 DocType: Purchase Invoice,Supplier Name,Leverancier Naam
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lees de ERPNext Manual
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisch instellen serienummers op basis van FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controleer Leverancier Factuurnummer Uniqueness
@@ -417,13 +418,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Master Mana
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Algemene instellingen voor alle productieprocessen.
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeningen bevroren tot
 DocType: SMS Log,Sent On,Verzonden op
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
 DocType: Sales Order,Not Applicable,Niet van toepassing
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Vakantie meester .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell moulding
 DocType: Material Request Item,Required Date,Benodigd op datum
 DocType: Delivery Note,Billing Address,Factuuradres
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Vul Artikelcode in.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vul Artikelcode in.
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Indien aangevinkt, zal de BTW-bedrag worden beschouwd als reeds in de Print Tarief / Print Bedrag"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totaal Aantal
@@ -446,31 +447,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between O
 DocType: Customer,Buyer of Goods and Services.,Koper van goederen en diensten.
 DocType: Journal Entry,Accounts Payable,Crediteuren
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Abonnees toevoegen
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" Bestaat niet"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Bestaat niet"
 DocType: Pricing Rule,Valid Upto,Geldig Tot
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Directe Inkomsten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan niet filteren op basis van Rekening, indien gegroepeerd op Rekening"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Boekhouder
 DocType: Payment Tool,Received Or Paid,Ontvangen of betaald
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Selecteer Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Selecteer Company
 DocType: Stock Entry,Difference Account,Verschillenrekening
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan niet dicht taak als haar afhankelijke taak {0} is niet gesloten.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
 DocType: Production Order,Additional Operating Cost,Additionele Operationele Kosten
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosmetica
 DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
 DocType: Communication,Subject,Onderwerp
 DocType: Shipping Rule,Net Weight,Netto Gewicht
 DocType: Employee,Emergency Phone,Noodgeval Telefoonnummer
 ,Serial No Warranty Expiry,Serienummer Garantie Afloop
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Wilt u echt deze Materiaal Aanvraag STOPPEN?
 DocType: Sales Order,To Deliver,Bezorgen
 DocType: Purchase Invoice Item,Item,Artikel
 DocType: Journal Entry,Difference (Dr - Cr),Verschil (Db - Cr)
 DocType: Account,Profit and Loss,Winst en Verlies
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Managing Subcontracting
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Managing Subcontracting
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nieuwe Eenheid mag NIET van het type Geheel getal zijn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Meubilair en Inrichting
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Koers waarmee Prijslijst valuta wordt omgerekend naar de basis bedrijfsvaluta
@@ -491,7 +491,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Toevoegen / Bewerken Bela
 DocType: Purchase Invoice,Supplier Invoice No,Factuurnr. Leverancier
 DocType: Territory,For reference,Ter referentie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan niet verwijderen Serienummer {0}, zoals het wordt gebruikt in de voorraad transacties"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Sluiten (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Sluiten (Cr)
 DocType: Serial No,Warranty Period (Days),Garantieperiode (dagen)
 DocType: Installation Note Item,Installation Note Item,Installatie Opmerking Item
 ,Pending Qty,In afwachting Aantal
@@ -523,8 +523,9 @@ DocType: Sales Order,Billing and Delivery Status,Facturering en Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Terugkerende klanten
 DocType: Leave Control Panel,Allocate,Toewijzen
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,vorig
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Terugkerende verkoop
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Terugkerende verkoop
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selecteer Verkooporders op basis waarvan u Productie Orders wilt maken.
+DocType: Item,Delivered by Supplier (Drop Ship),Geleverd door Leverancier (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Salaris componenten.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database van potentiële klanten.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Klantenbestand.
@@ -535,7 +536,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Gefactureerd Bedr
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Een logisch Magazijn waartegen voorraadboekingen worden gemaakt.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referentienummer en referentiedatum nodig is voor {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referentienummer en referentiedatum nodig is voor {0}
 DocType: Event,Wednesday,Woensdag
 DocType: Sales Invoice,Customer's Vendor,Leverancier van Klant
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Productie Order is Verplicht
@@ -568,8 +569,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Gebaseerd op' en 'Groepeer per' kunnen niet hetzelfde zijn
 DocType: Sales Person,Sales Person Targets,Verkoper Doelen
-sites/assets/js/form.min.js +271,To,naar
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Vul het e-mailadres in
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,naar
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Vul het e-mailadres in
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Eindbuis vormen
 DocType: Production Order Operation,In minutes,In minuten
 DocType: Issue,Resolution Date,Oplossing Datum
@@ -586,7 +587,7 @@ DocType: Activity Cost,Projects User,Projecten Gebruiker
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumed
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} niet gevonden in Factuur Details tabel
 DocType: Company,Round Off Cost Center,Afronden kostenplaats
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Onderhoud Bezoek {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Onderhoud Bezoek {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
 DocType: Material Request,Material Transfer,Materiaal Verplaatsing
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening ( Dr )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Plaatsing timestamp moet na {0} zijn
@@ -594,9 +595,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Instellingen
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Vrachtkosten belastingen en toeslagen
 DocType: Production Order Operation,Actual Start Time,Werkelijke Starttijd
 DocType: BOM Operation,Operation Time,Operatie Tijd
-sites/assets/js/list.min.js +5,More,Meer
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Meer
 DocType: Pricing Rule,Sales Manager,Verkoopsmanager
-sites/assets/js/desk.min.js +7673,Rename,Hernoemen
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Hernoemen
 DocType: Journal Entry,Write Off Amount,Afschrijvingsbedrag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Verbuiging
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Door gebruiker toestaan
@@ -612,13 +613,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight scheren
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Het bijhouden van een artikel in verkoop- en inkoopdocumenten op basis van het serienummer. U kunt hiermee ook de garantiedetails van het product bijhouden.
 DocType: Purchase Receipt Item Supplied,Current Stock,Huidige voorraad
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Afgewezen Magazijn is verplicht bij een afgewezen Artikel.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Afgewezen Magazijn is verplicht bij een afgewezen Artikel.
 DocType: Account,Expenses Included In Valuation,Kosten inbegrepen in waardering
 DocType: Employee,Provide email id registered in company,Zorg voor een bedrijfs e-mail ID
 DocType: Hub Settings,Seller City,Verkoper Stad
 DocType: Email Digest,Next email will be sent on:,Volgende e-mail wordt verzonden op:
 DocType: Offer Letter Term,Offer Letter Term,Aanbod Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Item heeft varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} niet gevonden
 DocType: Bin,Stock Value,Voorraad Waarde
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Boom Type
@@ -633,11 +634,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Welkom
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Taak Onderwerp
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Goederen ontvangen van leveranciers.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Goederen ontvangen van leveranciers.
 DocType: Communication,Open,Open
 DocType: Lead,Campaign Name,Campagnenaam
 ,Reserved,gereserveerd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Wilt u echt ON-STOPPEN?
 DocType: Purchase Order,Supply Raw Materials,Supply Grondstoffen
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,De datum waarop de volgende factuur wordt gegenereerd. Het wordt gegenereerd op te leggen.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Vlottende Activa
@@ -653,7 +653,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Inkoopordernummer van Klant
 DocType: Employee,Cell Number,Mobiele nummer
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Je kan niet in de huidige voucher in 'Tegen Journal Entry' kolom
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Je kan niet in de huidige voucher in 'Tegen Journal Entry' kolom
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Opportunity Van
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Maandsalaris overzicht.
@@ -722,7 +722,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Verplichting
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gesanctioneerde bedrag kan niet groter zijn dan Claim Bedrag in Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standaard kosten van verkochte goederen Account
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Prijslijst niet geselecteerd
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prijslijst niet geselecteerd
 DocType: Employee,Family Background,Familie Achtergrond
 DocType: Process Payroll,Send Email,E-mail verzenden
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Geen toestemming
@@ -733,7 +733,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nrs
 DocType: Item,Items with higher weightage will be shown higher,Items met een hogere weightage hoger zal worden getoond
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Aflettering Detail
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mijn facturen
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Geen werknemer gevonden
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Geen werknemer gevonden
 DocType: Purchase Order,Stopped,Gestopt
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Selecteer BOM te beginnen
@@ -742,7 +742,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload vo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nu verzenden
 ,Support Analytics,Support Analyse
 DocType: Item,Website Warehouse,Website Magazijn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Wil je echt wilt productieorder te stoppen:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","De dag van de maand waarop de automatische factuur zal bijvoorbeeld 05, 28 etc worden gegenereerd"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score moet lager dan of gelijk aan 5 zijn
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C -Form regels
@@ -752,12 +751,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Suppo
 DocType: Features Setup,"To enable ""Point of Sale"" features",Naar "Point of Sale" functies in te schakelen
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Selecteer Artikelen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} tegen Factuur {1} ​​gedateerd {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} tegen Factuur {1} ​​gedateerd {2}
 DocType: Comment,Reference Name,Referentie Naam
 DocType: Maintenance Visit,Completion Status,Voltooiingsstatus
 DocType: Sales Invoice Item,Target Warehouse,Doel Magazijn
 DocType: Item,Allow over delivery or receipt upto this percent,Laat dan levering of ontvangst upto deze procent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Verwachte leverdatum kan niet voor de Verkooporder Datum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Verwachte leverdatum kan niet voor de Verkooporder Datum
 DocType: Upload Attendance,Import Attendance,Import Toeschouwers
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikel Groepen
 DocType: Process Payroll,Activity Log,Activiteitenlogboek
@@ -765,7 +764,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Bericht automatisch samenstellen overlegging van transacties .
 DocType: Production Order,Item To Manufacture,Artikel te produceren
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanente mal gieten
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Aanschaffen om de betaling
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Aanschaffen om de betaling
 DocType: Sales Order Item,Projected Qty,Verwachte Aantal
 DocType: Sales Invoice,Payment Due Date,Betaling Vervaldatum
 DocType: Newsletter,Newsletter Manager,Nieuwsbrief Manager
@@ -789,8 +789,8 @@ DocType: SMS Log,Requested Numbers,Gevraagde Numbers
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Beoordeling van de prestaties.
 DocType: Sales Invoice Item,Stock Details,Voorraad Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Waarde
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Verkooppunt
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Kan niet dragen {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Verkooppunt
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan niet dragen {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo reeds in Credit, is het niet toegestaan om 'evenwicht moet worden' als 'Debet'"
 DocType: Account,Balance must be,Saldo moet worden
 DocType: Hub Settings,Publish Pricing,Publiceer Pricing
@@ -812,7 +812,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Ontvangstbevestiging
 ,Received Items To Be Billed,Ontvangen artikelen nog te factureren
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Gritstralen
-sites/assets/js/desk.min.js +3938,Ms,Mevrouw
+DocType: Employee,Ms,Mevrouw
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Wisselkoers stam.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan Time Slot in de volgende {0} dagen voor Operatie vinden {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiaal voor onderdelen
@@ -834,29 +834,31 @@ DocType: Purchase Receipt,Range,Reeks
 DocType: Supplier,Default Payable Accounts,Standaard Crediteuren Accounts
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
 DocType: Features Setup,Item Barcode,Artikel Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Item Varianten {0} bijgewerkt
 DocType: Quality Inspection Reading,Reading 6,Meting 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inkoopfactuur Voorschot
 DocType: Address,Shop,Winkelen
 DocType: Hub Settings,Sync Now,Nu synchroniseren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Rij {0}: kan creditering niet worden gekoppeld met een {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Rij {0}: kan creditering niet worden gekoppeld met een {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standaard Kas-/Bankrekening wordt automatisch bijgewerkt in POS Factuur als deze modus is geselecteerd.
 DocType: Employee,Permanent Address Is,Vast Adres is
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operatie afgerond voor hoeveel eindproducten?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,De Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Korting voor over-{0} gekruist voor post {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Korting voor over-{0} gekruist voor post {1}.
 DocType: Employee,Exit Interview Details,Exit Gesprek Details
 DocType: Item,Is Purchase Item,Is inkoopartikel
 DocType: Journal Entry Account,Purchase Invoice,Inkoopfactuur
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail nr
 DocType: Stock Entry,Total Outgoing Value,Totaal uitgaande waardeoverdrachten
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Openingsdatum en de uiterste datum moet binnen dezelfde fiscale jaar
 DocType: Lead,Request for Information,Informatieaanvraag
 DocType: Payment Tool,Paid,Betaald
 DocType: Salary Slip,Total in words,Totaal in woorden
 DocType: Material Request Item,Lead Time Date,Lead Tijd Datum
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,is verplicht. Misschien Valutawissel record is niet gemaakt voor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Rij #{0}: Voer serienummer in voor artikel {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Voor 'Product Bundel' items, Warehouse, Serienummer en Batch Geen zal worden beschouwd van de 'Packing List' tafel. Als Warehouse en Batch Geen zijn hetzelfde voor alle verpakking items voor welke 'Product Bundle' punt, kunnen die waarden in de belangrijkste Item tafel worden ingevoerd, wordt waarden worden gekopieerd naar "Packing List 'tafel."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Verzendingen naar klanten.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Verzendingen naar klanten.
 DocType: Purchase Invoice Item,Purchase Order Item,Inkooporder Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirecte Inkomsten
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Betaling Bedrag = openstaande bedrag
@@ -864,13 +866,14 @@ DocType: Contact Us Settings,Address Line 1,Adres Lijn 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variantie
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Bedrijfsnaam
 DocType: SMS Center,Total Message(s),Totaal Bericht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Bekijk een overzicht van alle hulp video's
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecteer hoofdrekening van de bank waar cheque werd gedeponeerd.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Zodat de gebruiker te bewerken prijslijst Rate bij transacties
 DocType: Pricing Rule,Max Qty,Max Aantal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rij {0}: Betaling tegen Sales / Purchase Order moet altijd worden gemarkeerd als voorschot
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rij {0}: Betaling tegen Sales / Purchase Order moet altijd worden gemarkeerd als voorschot
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemisch
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
 DocType: Process Payroll,Select Payroll Year and Month,Selecteer Payroll Jaar en Maand
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Ga naar de juiste groep (meestal Toepassing van fondsen> Vlottende activa> Bankrekeningen en maak een nieuwe account (door te klikken op Toevoegen kind) van het type "Bank"
 DocType: Workstation,Electricity Cost,elektriciteitskosten
@@ -885,7 +888,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Wit
 DocType: SMS Center,All Lead (Open),Alle Leads (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get betaalde voorschotten
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Voeg uw foto toe
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Maken
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Maken
 DocType: Journal Entry,Total Amount in Words,Totaal bedrag in woorden
 DocType: Workflow State,Stop,stoppen
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Er is een fout opgetreden . Een mogelijke reden zou kunnen zijn dat u het formulier niet hebt opgeslagen. Neem contact op met Support als het probleem aanhoudt .
@@ -909,7 +912,7 @@ DocType: Packing Slip Item,Packing Slip Item,Pakbon Artikel
 DocType: POS Profile,Cash/Bank Account,Kas/Bankrekening
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Verwijderde items met geen verandering in de hoeveelheid of waarde.
 DocType: Delivery Note,Delivery To,Leveren Aan
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attributentabel is verplicht
 DocType: Production Planning Tool,Get Sales Orders,Get Verkooporders
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan niet negatief zijn
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Archiveren
@@ -920,12 +923,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Zullen alleen w
 DocType: Project,Internal,Intern
 DocType: Task,Urgent,Dringend
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Geef een geldige rij-ID voor rij {0} in tabel {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ga naar het bureaublad en gebruiken ERPNext
 DocType: Item,Manufacturer,Fabrikant
 DocType: Landed Cost Item,Purchase Receipt Item,Ontvangstbevestiging Artikel
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gereserveerd Magazijn in Verkooporder / Magazijn Gereed Product
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Selling Bedrag
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Tijd Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Onkosten Goedkeurder voor dit record. Werk de 'Status' bij en sla op.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Onkosten Goedkeurder voor dit record. Werk de 'Status' bij en sla op.
 DocType: Serial No,Creation Document No,Aanmaken Document nr
 DocType: Issue,Issue,Uitgifte
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributen voor post Varianten. zoals grootte, kleur etc."
@@ -940,8 +944,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Tegen
 DocType: Item,Default Selling Cost Center,Standaard Verkoop kostenplaats
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} is {1}
 DocType: Opportunity,Contact Info,Contact Info
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Maken Stock Inzendingen
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Maken Stock Inzendingen
 DocType: Packing Slip,Net Weight UOM,Netto Gewicht Eenheid
 DocType: Item,Default Supplier,Standaardleverancier
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Production Allowance Percentage
@@ -950,7 +955,7 @@ DocType: Features Setup,Miscelleneous,Divers
 DocType: Holiday List,Get Weekly Off Dates,Ontvang wekelijkse Uit Data
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Einddatum kan niet vroeger zijn dan startdatum
 DocType: Sales Person,Select company name first.,Kies eerst een bedrijfsnaam.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offertes ontvangen van leveranciers.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Naar {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,bijgewerkt via Time Logs
@@ -978,7 +983,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Registratienummers van de onderneming voor uw referentie. Fiscale nummers, enz."
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Winkelwagen Verzenden Regel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Productie Order {0} moet worden geannuleerd voor het annuleren van deze verkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Productie Order {0} moet worden geannuleerd voor het annuleren van deze verkooporder
 ,Ordered Items To Be Billed,Bestelde artikelen te factureren
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Van Range moet kleiner zijn dan om het bereik
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecteer Tijd Logs en druk op Indienen om een ​​nieuwe verkoopfactuur maken.
@@ -1026,7 +1031,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Belastin
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Schulden
 DocType: Account,Warehouse,Magazijn
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
 ,Purchase Order Items To Be Billed,Inkooporder Artikelen nog te factureren
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inkoopfactuur Artikel
@@ -1041,11 +1046,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Niet-afgeletterde B
 DocType: Global Defaults,Current Fiscal Year,Huidige fiscale jaar
 DocType: Global Defaults,Disable Rounded Total,Deactiveer Afgerond Totaal
 DocType: Lead,Call,Bellen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dubbele rij {0} met dezelfde {1}
 ,Trial Balance,Proefbalans
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Het opzetten van Werknemers
-sites/assets/js/erpnext.min.js +5,"Grid ""","Rooster """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Het opzetten van Werknemers
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Rooster """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Selecteer eerst een voorvoegsel
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,onderzoek
 DocType: Maintenance Visit Purpose,Work Done,Afgerond Werk
@@ -1055,14 +1060,15 @@ DocType: Communication,Sent,verzonden
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Bekijk Grootboek
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
 DocType: Communication,Delivery Status,Verzendstatus
 DocType: Production Order,Manufacture against Sales Order,Produceren tegen Verkooporder
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Rest van de Wereld
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Rest van de Wereld
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,De Punt {0} kan niet Batch hebben
 ,Budget Variance Report,Budget Variantie Rapport
 DocType: Salary Slip,Gross Pay,Brutoloon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividenden betaald
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Accounting Ledger
 DocType: Stock Reconciliation,Difference Amount,Verschil Bedrag
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Ingehouden winsten
 DocType: BOM Item,Item Description,Artikelomschrijving
@@ -1076,15 +1082,17 @@ DocType: Opportunity Item,Opportunity Item,Opportunity Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tijdelijke Opening
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Werknemer Verlof Balans
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Saldo van rekening {0} moet altijd {1} zijn
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo van rekening {0} moet altijd {1} zijn
 DocType: Address,Address Type,Adrestype
 DocType: Purchase Receipt,Rejected Warehouse,Afgewezen Magazijn
 DocType: GL Entry,Against Voucher,Tegen Voucher
 DocType: Item,Default Buying Cost Center,Standaard Inkoop kostenplaats
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Om het beste uit ERPNext krijgen, raden wij u aan wat tijd te nemen en te kijken deze hulp video's."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Artikel {0} moet verkoopartikel zijn
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,naar
 DocType: Item,Lead Time in days,Levertijd in dagen
 ,Accounts Payable Summary,Crediteuren Samenvatting
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Niet bevoegd om bevroren rekening te bewerken {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Niet bevoegd om bevroren rekening te bewerken {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get openstaande facturen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
@@ -1100,7 +1108,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Plaats van uitgifte
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contract
 DocType: Report,Disabled,Uitgezet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Eenheid Omrekeningsfactor is nodig voor eenheid: {0} in Artikel: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Eenheid Omrekeningsfactor is nodig voor eenheid: {0} in Artikel: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirecte Kosten
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rij {0}: Aantal is verplicht
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,landbouw
@@ -1109,13 +1117,13 @@ DocType: Mode of Payment,Mode of Payment,Wijze van betaling
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dit is een basis artikelgroep en kan niet worden bewerkt .
 DocType: Journal Entry Account,Purchase Order,Inkooporder
 DocType: Warehouse,Warehouse Contact Info,Magazijn Contact Info
-sites/assets/js/form.min.js +190,Name is required,Naam is vereist
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Naam is vereist
 DocType: Purchase Invoice,Recurring Type,Terugkerende Type
 DocType: Address,City/Town,Stad / Plaats
 DocType: Email Digest,Annual Income,Jaarlijks inkomen
 DocType: Serial No,Serial No Details,Serienummer Details
 DocType: Purchase Invoice Item,Item Tax Rate,Artikel BTW-tarief
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Voor {0}, kan alleen credit accounts worden gekoppeld tegen een andere debetboeking"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Voor {0}, kan alleen credit accounts worden gekoppeld tegen een andere debetboeking"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Artikel {0} moet een uitbesteed artikel zijn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitaalgoederen
@@ -1126,14 +1134,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Doel
 DocType: Sales Invoice Item,Edit Description,Bewerken Beschrijving
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Verwachte levertijd is minder dan gepland Start Date.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,voor Leverancier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Instellen Account Type helpt bij het selecteren van deze account in transacties.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Munt)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Totaal Uitgaande
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Er kan maar één Verzendregel Voorwaarde met 0 of blanco waarde zijn voor ""To Value """
 DocType: Authorization Rule,Transaction,Transactie
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Opmerking: Deze kostenplaats is een groep. Kan geen boekingen aanmaken voor groepen.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Tools
+apps/frappe/frappe/config/desk.py +7,Tools,Tools
 DocType: Item,Website Item Groups,Website Artikelgroepen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Productieordernummer is verplicht voor voorraad binnenkomst doel de fabricage
 DocType: Purchase Invoice,Total (Company Currency),Totaal (Company valuta)
@@ -1143,7 +1151,7 @@ DocType: Workstation,Workstation Name,Naam van werkstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
 DocType: Sales Partner,Target Distribution,Doel Distributie
-sites/assets/js/desk.min.js +7652,Comments,Reacties
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Reacties
 DocType: Salary Slip,Bank Account No.,Bankrekeningnummer
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dit is het nummer van de laatst gemaakte transactie met dit voorvoegsel
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Waardering Tarief vereist voor Artikel {0}
@@ -1158,7 +1166,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Selecteer au
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Bijzonder Verlof
 DocType: Purchase Invoice,Supplier Invoice Date,Factuurdatum Leverancier
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,U moet Winkelwagen activeren.
-sites/assets/js/form.min.js +212,No Data,Geen gegevens
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Geen gegevens
 DocType: Appraisal Template Goal,Appraisal Template Goal,Beoordeling Sjabloon Doel
 DocType: Salary Slip,Earning,Verdienen
 DocType: Payment Tool,Party Account Currency,Party account Valuta
@@ -1166,7 +1174,7 @@ DocType: Payment Tool,Party Account Currency,Party account Valuta
 DocType: Purchase Taxes and Charges,Add or Deduct,Toevoegen of aftrekken
 DocType: Company,If Yearly Budget Exceeded (for expense account),Als jaarlijks budget overschreden (voor declaratierekening)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende voorwaarden gevonden tussen :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Tegen Journal Entry {0} is al aangepast tegen enkele andere voucher
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Tegen Journal Entry {0} is al aangepast tegen enkele andere voucher
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Totale orderwaarde
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Voeding
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Vergrijzing Range 3
@@ -1174,11 +1182,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Aantal bezoeken
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nieuwsbrieven naar contacten, leads."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta van de Closing rekening moet worden {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Som van de punten voor alle doelen moeten zijn 100. Het is {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Bewerkingen kan niet leeg worden gelaten.
 ,Delivered Items To Be Billed,Geleverde Artikelen nog te factureren
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazijn kan niet worden gewijzigd voor Serienummer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status bijgewerkt naar {0}
 DocType: DocField,Description,Beschrijving
 DocType: Authorization Rule,Average Discount,Gemiddelde korting
 DocType: Letter Head,Is Default,Is Standaard
@@ -1206,7 +1214,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Artikel BTW-bedrag
 DocType: Item,Maintain Stock,Handhaaf Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries al gemaakt voor de productieorder
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laat leeg indien overwogen voor alle aanduidingen
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Van Datetime
 DocType: Email Digest,For Company,Voor Bedrijf
@@ -1216,7 +1224,7 @@ DocType: Sales Invoice,Shipping Address Name,Verzenden Adres Naam
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Rekeningschema
 DocType: Material Request,Terms and Conditions Content,Algemene Voorwaarden Inhoud
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
 DocType: Maintenance Visit,Unscheduled,Ongeplande
 DocType: Employee,Owned,Eigendom
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhankelijk van onbetaald verlof
@@ -1229,7 +1237,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garantie / AMC Status
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Werknemer Instellingen
 ,Batch-Wise Balance History,Batchgewijze Balans Geschiedenis
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Actie Lijst
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Actie Lijst
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,leerling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatieve Hoeveelheid is niet toegestaan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1262,13 +1270,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kantoorhuur
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Instellingen SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importeren mislukt!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Nog geen adres toegevoegd.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nog geen adres toegevoegd.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Werken Hour
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analist
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan JV hoeveelheid {2}
 DocType: Item,Inventory,Voorraad
 DocType: Features Setup,"To enable ""Point of Sale"" view",Inschakelen "Point of Sale" view
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Betaling kan niet worden gemaakt voor een lege boodschappenmand
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan niet worden gemaakt voor een lege boodschappenmand
 DocType: Item,Sales Details,Verkoop Details
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Met Items
@@ -1278,7 +1286,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",De datum waarop de volgende factuur wordt gegenereerd. Het wordt gegenereerd op te leggen.
 DocType: Item Attribute,Item Attribute,Item Attribute
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Overheid
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Item Varianten
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varianten
 DocType: Company,Services,Services
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Totaal ({0})
 DocType: Cost Center,Parent Cost Center,Bovenliggende kostenplaats
@@ -1288,11 +1296,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Boekjaar Startdatum
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Verzinken
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Pakbon(en) geannuleerd
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakbon(en) geannuleerd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vracht-en verzendkosten
 DocType: Material Request Item,Sales Order No,Verkooporder nr.
 DocType: Item Group,Item Group Name,Artikel groepsnaam
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Ingenomen
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Ingenomen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Verplaats Materialen voor Productie
 DocType: Pricing Rule,For Price List,Voor Prijslijst
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1301,8 +1309,7 @@ DocType: Maintenance Schedule,Schedules,Schema
 DocType: Purchase Invoice Item,Net Amount,Netto Bedrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stuklijst Detail nr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Extra korting Bedrag (Company valuta)
-DocType: Period Closing Voucher,CoA Help,CoA Help
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Fout : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fout : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Maak nieuwe rekening van Rekeningschema.
 DocType: Maintenance Visit,Maintenance Visit,Onderhoud Bezoek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klant > Klantgroep > Regio
@@ -1313,6 +1320,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Vrachtkosten Help
 DocType: Event,Tuesday,Dinsdag
 DocType: Leave Block List,Block Holidays on important days.,Blokeer Vakantie op belangrijke dagen.
 ,Accounts Receivable Summary,Debiteuren Samenvatting
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Bladeren voor type {0} reeds toegewezen voor Employee {1} voor periode {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Stel User ID veld in een Werknemer record Werknemer Rol stellen
 DocType: UOM,UOM Name,Eenheid Naam
 DocType: Top Bar Item,Target,Doel
@@ -1333,19 +1341,19 @@ DocType: Sales Partner,Sales Partner Target,Verkoop Partner Doel
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Boekhouding Entry voor {0} kan alleen worden gemaakt in valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prijsbepalingsregel
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Het kerven
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materiaal aanvragen tot Purchase Order
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiaal aanvragen tot Purchase Order
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Rij # {0}: Teruggekeerde Item {1} bestaat niet in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankrekeningen
 ,Bank Reconciliation Statement,Bank Aflettering Statement
 DocType: Address,Lead Name,Lead Naam
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Het openen Stock Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Het openen Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mag slechts eenmaal voorkomen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Niet toegestaan ​​om meer tranfer {0} dan {1} tegen Purchase Order {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Verlof succesvol toegewezen aan {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Verlof succesvol toegewezen aan {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Geen Artikelen om te verpakken
 DocType: Shipping Rule Condition,From Value,Van Waarde
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Bedragen die niet terug te vinden in de bank
 DocType: Quality Inspection Reading,Reading 4,Meting 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Claims voor bedrijfsonkosten
@@ -1358,19 +1366,20 @@ DocType: Opportunity,Contact Mobile No,Contact Mobiele nummer
 DocType: Production Planning Tool,Select Sales Orders,Selecteer Verkooporders
 ,Material Requests for which Supplier Quotations are not created,Materiaal Aanvragen waarvoor Leverancier Offertes niet zijn gemaakt
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Het kunnen identificeren van artikelen mbv een streepjescode. U kunt hiermee artikelen op Vrachtbrieven en Verkoopfacturen invoeren door de streepjescode van het artikel te scannen.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Markeren als geleverd
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Maak Offerte
 DocType: Dependent Task,Dependent Task,Afhankelijke Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Probeer plan operaties voor X dagen van tevoren.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
 DocType: SMS Center,Receiver List,Ontvanger Lijst
 DocType: Payment Tool Detail,Payment Amount,Betaling Bedrag
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbruikte hoeveelheid
-sites/assets/js/erpnext.min.js +51,{0} View,{0} View
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salaris Structuur Aftrek
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selectieve lasersintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importeren succesvol!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kosten van Items Afgegeven
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
@@ -1391,7 +1400,7 @@ DocType: Company,Default Payable Account,Standaard Payable Account
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Instellingen voor online winkelwagentje zoals scheepvaart regels, prijslijst enz."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Installatie voltooid
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% gefactureerd
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Gereserveerde Hoeveelheid
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Gereserveerde Hoeveelheid
 DocType: Party Account,Party Account,Party Account
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
 DocType: Lead,Upper Income,Bovenste Inkomen
@@ -1434,11 +1443,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Inschakelen Winkelwagen
 DocType: Employee,Permanent Address,Vast Adres
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Artikel {0} moet een service-artikel zijn.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Voorschot betaald tegen {0} {1} kan niet groter zijn \ dan eindtotaal {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Selecteer artikelcode
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Verminderen Aftrek voor onbetaald verlof
 DocType: Territory,Territory Manager,Regio Manager
+DocType: Delivery Note Item,To Warehouse (Optional),Om Warehouse (optioneel)
 DocType: Sales Invoice,Paid Amount (Company Currency),Betaalde bedrag (Company Munt)
 DocType: Purchase Invoice,Additional Discount,EXTRA KORTING
 DocType: Selling Settings,Selling Settings,Verkoop Instellingen
@@ -1461,7 +1471,7 @@ DocType: Item,Weightage,Weging
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mijnbouw
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hars casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Een Klantgroep met dezelfde naam bestaat. Gelieve de naam van de Klant of de Klantgroep  wijzigen
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Selecteer eerst {0}.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Selecteer eerst {0}.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Bovenliggende Regio
 DocType: Quality Inspection Reading,Reading 2,Meting 2
@@ -1489,11 +1499,11 @@ DocType: Sales Invoice Item,Batch No,Partij nr.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Kunnen meerdere verkooporders tegen een klant bestelling
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hoofd
 DocType: DocPerm,Delete,Verwijder
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variant
-sites/assets/js/desk.min.js +7971,New {0},Nieuwe {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nieuwe {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Gestopte order kan niet worden geannuleerd. Terugdraaien om te annuleren .
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Gestopte order kan niet worden geannuleerd. Terugdraaien om te annuleren .
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
 DocType: Employee,Leave Encashed?,Verlof verzilverd?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Van veld is verplicht
 DocType: Item,Variants,Varianten
@@ -1511,7 +1521,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adressen
 DocType: Communication,Received,ontvangen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Tegen Journal Entry {0} heeft geen ongeëvenaarde {1} binnenkomst hebben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Tegen Journal Entry {0} heeft geen ongeëvenaarde {1} binnenkomst hebben
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dubbel Serienummer ingevoerd voor Artikel {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Een voorwaarde voor een Verzendregel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item is niet toegestaan ​​om Productieorder hebben.
@@ -1532,7 +1542,6 @@ DocType: Employee,Salutation,Aanhef
 DocType: Communication,Rejected,Afgewezen
 DocType: Pricing Rule,Brand,Merk
 DocType: Item,Will also apply for variants,Geldt ook voor varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Geleverd
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundel artikelen op moment van verkoop.
 DocType: Sales Order Item,Actual Qty,Werkelijk Aantal
 DocType: Sales Invoice Item,References,Referenties
@@ -1570,14 +1579,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Het scheren
 DocType: Item,Has Variants,Heeft Varianten
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik op 'Sales Invoice' knop om een ​​nieuwe verkoopfactuur maken.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Periode Van en Periode Om data verplicht voor terugkerende% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Verpakking en etikettering
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van de verdeling per maand
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Specificeer een Standaard Valuta in Bedrijfsstam en Algemene Standaardwaarden
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Toegang Secret
 DocType: Purchase Invoice,Recurring Invoice,Terugkerende Factuur
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Managing Projects
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Leverancier van goederen of diensten.
 DocType: Budget Detail,Fiscal Year,Boekjaar
 DocType: Cost Center,Budget,Begroting
@@ -1606,11 +1614,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Verkoop
 DocType: Employee,Salary Information,Salaris Informatie
 DocType: Sales Person,Name and Employee ID,Naam en Werknemer ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Verloopdatum kan niet voor de Boekingsdatum zijn
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Verloopdatum kan niet voor de Boekingsdatum zijn
 DocType: Website Item Group,Website Item Group,Website Artikel Groep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Invoerrechten en Belastingen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Vul Peildatum in
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} betaling items kunnen niet worden gefilterd door {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vul Peildatum in
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betaling items kunnen niet worden gefilterd door {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tafel voor post die in Web Site zal worden getoond
 DocType: Purchase Order Item Supplied,Supplied Qty,Meegeleverde Aantal
 DocType: Material Request Item,Material Request Item,Materiaal Aanvraag Artikel
@@ -1618,7 +1626,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Boom van Artikelg
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kan niet verwijzen rij getal groter dan of gelijk aan de huidige rijnummer voor dit type Charge
 ,Item-wise Purchase History,Artikelgebaseerde Inkoop Geschiedenis
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rood
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik op 'Genereer Planning' om serienummer op te halen voor Artikel {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik op 'Genereer Planning' om serienummer op te halen voor Artikel {0}
 DocType: Account,Frozen,Bevroren
 ,Open Production Orders,Open productieorders
 DocType: Installation Note,Installation Time,Installatie Tijd
@@ -1662,13 +1670,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Offerte Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Artikelgroep niet genoemd in Artikelstam voor Artikel {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Zoals productieorder kan worden gemaakt voor dit punt, moet het een voorraad item."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Zoals productieorder kan worden gemaakt voor dit punt, moet het een voorraad item."
 DocType: Shipping Rule Condition,Shipping Amount,Verzendbedrag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Aansluiting
 DocType: Authorization Rule,Above Value,Boven waarde
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Conversiefactor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Geleverd
+DocType: Purchase Order,Delivered,Geleverd
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup inkomende server voor banen e-id . ( b.v. jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Voertuig Aantal
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,De datum waarop terugkerende factuur stopt
@@ -1685,10 +1693,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Verdeel Toeslagen op ba
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Rekening {0} moet van het type 'vaste activa', omdat Artikel {1} een Activa Artikel is"
 DocType: HR Settings,HR Settings,HR-instellingen
 apps/frappe/frappe/config/setup.py +130,Printing,Afdrukken
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Kostendeclaratie is in afwachting van goedkeuring. Alleen de Kosten Goedkeurder kan status bijwerken.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Kostendeclaratie is in afwachting van goedkeuring. Alleen de Kosten Goedkeurder kan status bijwerken.
 DocType: Purchase Invoice,Additional Discount Amount,Extra korting Bedrag
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,De dag(en) waarvoor je verlof aanvraagt zijn feestdagen. Hier hoef je niet voor aan te vragen.
-sites/assets/js/desk.min.js +7805,and,en
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,en
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
@@ -1725,7 +1733,6 @@ DocType: Opportunity,Quotation,Offerte
 DocType: Salary Slip,Total Deduction,Totaal Aftrek
 DocType: Quotation,Maintenance User,Onderhoud Gebruiker
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kosten Bijgewerkt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Weet u zeker dat u wilt opendraaien
 DocType: Employee,Date of Birth,Geboortedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Artikel {0} is al geretourneerd
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Boekjaar** staat voor een financieel jaar. Alle boekingen en andere belangrijke transacties worden bijgehouden in **boekjaar**.
@@ -1741,13 +1748,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Blijf op de hoogte van Sales Campaigns. Blijf op de hoogte van Leads, Offertes, Sales Order etc van campagnes te meten Return on Investment. "
 DocType: Expense Claim,Approver,Goedkeurder
 ,SO Qty,VO Aantal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Voorraadboekingen bestaan al voor magazijn {0}, dus u kunt het magazijn niet wijzigen of toewijzen."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Voorraadboekingen bestaan al voor magazijn {0}, dus u kunt het magazijn niet wijzigen of toewijzen."
 DocType: Appraisal,Calculate Total Score,Bereken Totaalscore
 DocType: Supplier Quotation,Manufacturing Manager,Productie Manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serienummer {0} is onder garantie tot {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Splits Vrachtbrief in pakketten.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Zendingen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip moulding
+DocType: Purchase Order,To be delivered to customer,Om de klant te leveren
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tijd Log Status moet worden ingediend.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serienummer {0} niet behoren tot een Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opzetten
@@ -1772,11 +1780,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Van Valuta
 DocType: DocField,Name,Naam
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Verkooporder nodig voor Artikel {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Verkooporder nodig voor Artikel {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Bedragen die niet terug te vinden in het systeem
 DocType: Purchase Invoice Item,Rate (Company Currency),Tarief (Bedrijfsvaluta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,anderen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Instellen als Gestopt
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Kan een bijpassende Item niet vinden. Selecteer een andere waarde voor {0}.
 DocType: POS Profile,Taxes and Charges,Belastingen en Toeslagen
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Een Product of een Dienst dat wordt gekocht, verkocht of in voorraad wordt gehouden."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan het type lading niet selecteren als 'On Vorige Row Bedrag ' of ' On Vorige Row Totaal ' voor de eerste rij
@@ -1785,19 +1793,20 @@ DocType: Web Form,Select DocType,Selecteer DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Kotteren
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankieren
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik op 'Genereer Planning' om planning te krijgen
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nieuwe Kostenplaats
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nieuwe Kostenplaats
 DocType: Bin,Ordered Quantity,Bestelde hoeveelheid
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","bijv. ""Bouwgereedschap voor bouwers """
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Artikelgebaseerde Korting
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} tegen Verkooporder {1}
+DocType: Purchase Order Item,Reference Document Type,Referentie Document Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} tegen Verkooporder {1}
 DocType: Account,Fixed Asset,Vast Activum
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Geserialiseerde Inventory
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Geserialiseerde Inventory
 DocType: Activity Type,Default Billing Rate,Default Billing Rate
 DocType: Time Log Batch,Total Billing Amount,Totaal factuurbedrag
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Vorderingen Account
 ,Stock Balance,Voorraad Saldo
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Sales om de betaling
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales om de betaling
 DocType: Expense Claim Detail,Expense Claim Detail,Kostendeclaratie Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tijd Logs gemaakt:
 DocType: Item,Weight UOM,Gewicht Eenheid
@@ -1833,10 +1842,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Om rekening moet een betalend account zijn
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
 DocType: Production Order Operation,Completed Qty,Voltooide Aantal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Voor {0}, kan alleen debet accounts worden gekoppeld tegen een andere creditering"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Voor {0}, kan alleen debet accounts worden gekoppeld tegen een andere creditering"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
 DocType: Manufacturing Settings,Allow Overtime,Laat Overwerk
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Verkooporder {0} is gestopt
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummers vereist voor post {1}. U hebt verstrekt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Huidige Valuation Rate
 DocType: Item,Customer Item Codes,Customer Item Codes
@@ -1845,9 +1853,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Lassen
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nieuwe Voorraad Eenheid is verplicht
 DocType: Quality Inspection,Sample Size,Monster grootte
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Alle items zijn reeds gefactureerde
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle items zijn reeds gefactureerde
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Geef een geldig 'Van Zaaknummer'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostenplaatsen kan in groepen worden gemaakt, maar items kunnen worden gemaakt tegen niet-Groepen"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostenplaatsen kan in groepen worden gemaakt, maar items kunnen worden gemaakt tegen niet-Groepen"
 DocType: Project,External,Extern
 DocType: Features Setup,Item Serial Nos,Artikel Serienummers
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en machtigingen
@@ -1874,7 +1882,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Adres & Contacten
 DocType: SMS Log,Sender Name,Naam afzender
 DocType: Page,Title,Titel
-sites/assets/js/list.min.js +104,Customize,Aanpassen
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Aanpassen
 DocType: POS Profile,[Select],[Selecteer]
 DocType: SMS Log,Sent To,Verzenden Naar
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Maak verkoopfactuur
@@ -1899,12 +1907,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,End of Life
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,reizen
 DocType: Leave Block List,Allow Users,Gebruikers toestaan
+DocType: Purchase Order,Customer Mobile No,Klant Mobile Geen
 DocType: Sales Invoice,Recurring,Terugkerende
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Volg afzonderlijke baten en lasten over het product verticalen of divisies.
 DocType: Rename Tool,Rename Tool,Hernoem Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten bijwerken
 DocType: Item Reorder,Item Reorder,Artikel opnieuw ordenen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Verplaats Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Verplaats Materiaal
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties, operationele kosten en geef een unieke operatienummer aan uw activiteiten ."
 DocType: Purchase Invoice,Price List Currency,Prijslijst Valuta
 DocType: Naming Series,User must always select,Gebruiker moet altijd kiezen
@@ -1927,7 +1936,7 @@ DocType: Appraisal,Employee,Werknemer
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import e-mail van
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Uitnodigen als gebruiker
 DocType: Features Setup,After Sale Installations,Na Verkoop Installaties
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} is volledig gefactureerd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} is volledig gefactureerd
 DocType: Workstation Working Hour,End Time,Eindtijd
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standaard contractvoorwaarden voor Verkoop of Inkoop .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Groep door Voucher
@@ -1936,8 +1945,9 @@ DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Page,Standard,Standaard
 DocType: Rename Tool,File to Rename,Bestand naar hernoemen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Inkoopordernummer vereist voor Artikel {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Toon betalingen
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Gespecificeerde Stuklijst {0} bestaat niet voor Artikel {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Onderhoudsschema {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Onderhoudsschema {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Grootte
 DocType: Notification Control,Expense Claim Approved,Kostendeclaratie Goedgekeurd
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Geneesmiddel
@@ -1956,8 +1966,8 @@ DocType: Upload Attendance,Attendance To Date,Aanwezigheid graag:
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup inkomende server voor de verkoop e-id . ( b.v. sales@example.com )
 DocType: Warranty Claim,Raised By,Opgevoed door
 DocType: Payment Tool,Payment Account,Betaalrekening
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
-sites/assets/js/list.min.js +23,Draft,Ontwerp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Ontwerp
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compenserende Off
 DocType: Quality Inspection Reading,Accepted,Geaccepteerd
 DocType: User,Female,Vrouwelijk
@@ -1970,14 +1980,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Verzendregel Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Omdat er bestaande voorraad transacties voor deze post, \ u de waarden van het niet kunnen veranderen 'Heeft Serial No', 'Heeft Batch Nee', 'Is Stock Item' en 'Valuation Method'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
 DocType: Employee,Previous Work Experience,Vorige Werkervaring
 DocType: Stock Entry,For Quantity,Voor Aantal
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Vul Gepland Aantal in voor artikel {0} op rij {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} is niet ingediend
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Artikelaanvragen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} is niet ingediend
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Artikelaanvragen
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Een aparte Productie Order zal worden aangemaakt voor elk gereed product artikel
 DocType: Purchase Invoice,Terms and Conditions1,Algemene Voorwaarden1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Voltooien Setup
@@ -1989,7 +2000,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nieuwsbrief Maili
 DocType: Delivery Note,Transporter Name,Vervoerder Naam
 DocType: Contact,Enter department to which this Contact belongs,Voer afdeling in waartoe deze Contactpersoon behoort
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totaal Afwezig
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Artikel of Magazijn voor rij {0} komt niet overeen met Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artikel of Magazijn voor rij {0} komt niet overeen met Materiaal Aanvraag
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Eenheid
 DocType: Fiscal Year,Year End Date,Jaar Einddatum
 DocType: Task Depends On,Task Depends On,Taak Hangt On
@@ -2015,7 +2026,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Contract Einddatum moet groter zijn dan datum van indiensttreding zijn
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Een derde partij distributeur / dealer / commissionair / affiliate / reseller die uw producten voor een commissie verkoopt.
 DocType: Customer Group,Has Child Node,Heeft onderliggende node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Voer statische url parameters hier in (bijv. afzender=ERPNext, username = ERPNext, wachtwoord = 1234 enz.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} is niet in het actieve fiscale jaar. Voor meer informatie kijk {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dit is een voorbeeld website, automatisch gegenereerd door ERPNext"
@@ -2066,11 +2077,9 @@ DocType: Note,Note,Opmerking
 DocType: Purchase Receipt Item,Recd Quantity,Benodigde hoeveelheid
 DocType: Email Account,Email Ids,E-mail Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan niet meer produceren van Artikel {0} dan de Verkooporder hoeveelheid {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Instellen als ontsloten
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
 DocType: Payment Reconciliation,Bank / Cash Account,Bank- / Kasrekening
 DocType: Tax Rule,Billing City,Billing Stad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Deze verlofaanvraag is in afwachting van goedkeuring. Alleen de Verlof Goedkeurder kan de status bijwerken.
 DocType: Global Defaults,Hide Currency Symbol,Verberg Valutasymbool
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","bijv. Bank, Kas, Credit Card"
 DocType: Journal Entry,Credit Note,Creditnota
@@ -2091,7 +2100,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totaal (Aantal)
 DocType: Installation Note Item,Installed Qty,Aantal geïnstalleerd
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Ingediend
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Ingediend
 DocType: Salary Structure,Total Earning,Totale Winst
 DocType: Purchase Receipt,Time at which materials were received,Tijdstip waarop materialen zijn ontvangen
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mijn Adressen
@@ -2100,7 +2109,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisatie t
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,of
 DocType: Sales Order,Billing Status,Factuur Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utiliteitskosten
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Boven
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Boven
 DocType: Buying Settings,Default Buying Price List,Standaard Inkoop Prijslijst
 ,Download Backups,Download Backups
 DocType: Notification Control,Sales Order Message,Verkooporder Bericht
@@ -2109,7 +2118,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Selecteer Medewerkers
 DocType: Bank Reconciliation,To Date,Tot Datum
 DocType: Opportunity,Potential Sales Deal,Potentiële Sales Deal
-sites/assets/js/form.min.js +308,Details,Details
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Details
 DocType: Purchase Invoice,Total Taxes and Charges,Totaal belastingen en toeslagen
 DocType: Employee,Emergency Contact,Noodgeval Contact
 DocType: Item,Quality Parameters,Kwaliteitsparameters
@@ -2124,7 +2133,7 @@ DocType: Purchase Order Item,Received Qty,Ontvangen Aantal
 DocType: Stock Entry Detail,Serial No / Batch,Serienummer / Batch
 DocType: Product Bundle,Parent Item,Bovenliggend Artikel
 DocType: Account,Account Type,Rekening Type
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Onderhoudsschema wordt niet gegenereerd voor alle items . Klik op ' Generate Schedule'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Onderhoudsschema wordt niet gegenereerd voor alle items . Klik op ' Generate Schedule'
 ,To Produce,Produceren
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Voor rij {0} in {1}. Om {2} onder in punt tarief, rijen {3} moet ook opgenomen worden"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificatie van het pakket voor de levering (voor afdrukken)
@@ -2135,7 +2144,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Afvlakking
 DocType: Account,Income Account,Inkomstenrekening
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Lijstwerk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Huidige Aantal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Zie "Rate Of Materials Based On" in Costing Sectie
 DocType: Appraisal Goal,Key Responsibility Area,Key verantwoordelijkheid Area
@@ -2166,9 +2175,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adressen.
 DocType: Company,Stock Settings,Voorraad Instellingen
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samenvoegen kan alleen als volgende eigenschappen in beide registers. Is Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samenvoegen kan alleen als volgende eigenschappen in beide registers. Is Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Beheer Customer Group Boom .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nieuwe Kostenplaats Naam
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nieuwe Kostenplaats Naam
 DocType: Leave Control Panel,Leave Control Panel,Verlof Configuratiescherm
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Geen standaard-adres Template gevonden. Maak een nieuwe van Setup> Afdrukken en Branding> Address Template.
 DocType: Appraisal,HR User,HR Gebruiker
@@ -2187,24 +2196,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Verkoop verkenner
 DocType: Journal Entry,Total Credit,Totaal Krediet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokaal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokaal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Leningen en voorschotten (Activa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debiteuren
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Groot
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Geen werknemer gevonden!
 DocType: C-Form Invoice Detail,Territory,Regio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vermeld het benodigde aantal bezoeken
+DocType: Purchase Order,Customer Address Display,Customer Address Weergave
 DocType: Stock Settings,Default Valuation Method,Standaard Waarderingsmethode
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polijsten
 DocType: Production Order Operation,Planned Start Time,Geplande Starttijd
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Toegewezen
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standaard maateenheid voor post {0} kan niet direct worden gewijzigd omdat \ heb je al enkele transactie (s) met een andere UOM gemaakt. Om standaard UOM wijzigen, \ gebruik 'UOM Vervang Utility' hulpmiddel onder Stock module."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificeer Wisselkoers om een ​​valuta om te zetten in een andere
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Offerte {0} is geannuleerd
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Offerte {0} is geannuleerd
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totale uitstaande bedrag
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Werknemer {0} was met verlof op {1} . Kan aanwezigheid niet markeren .
 DocType: Sales Partner,Targets,Doelen
@@ -2219,12 +2228,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dit is een basis klantgroep en kan niet worden bewerkt .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Stel eerst uw rekeningschema op, voordat u start met het invoeren van boekingen"
 DocType: Purchase Invoice,Ignore Pricing Rule,Negeer Prijsregel
-sites/assets/js/list.min.js +24,Cancelled,Geannuleerd
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Geannuleerd
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Van datum salarisstructuur kan niet minder dan Employee Deelnemen datum.
 DocType: Employee Education,Graduate,Afstuderen
 DocType: Leave Block List,Block Days,Blokeer Dagen
 DocType: Journal Entry,Excise Entry,Accijnzen Boeking
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Waarschuwing: Sales Order {0} bestaat al tegen Klant Bestelling {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Waarschuwing: Sales Order {0} bestaat al tegen Klant Bestelling {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2281,17 +2290,17 @@ DocType: Account,Stock Received But Not Billed,Voorraad ontvangen maar nog niet
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brutoloon + achteraf Bedrag + inning Bedrag - Totaal Aftrek
 DocType: Monthly Distribution,Distribution Name,Distributie Naam
 DocType: Features Setup,Sales and Purchase,Verkoop en Inkoop
-DocType: Purchase Order Item,Material Request No,Materiaal Aanvraag nr.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
+DocType: Supplier Quotation Item,Material Request No,Materiaal Aanvraag nr.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basis bedrijfsvaluta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} heeft met succes uitgeschreven uit deze lijst geweest.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
-apps/frappe/frappe/templates/base.html +132,Added,Toegevoegd
+apps/frappe/frappe/templates/base.html +134,Added,Toegevoegd
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Beheer Grondgebied Boom.
 DocType: Journal Entry Account,Sales Invoice,Verkoopfactuur
 DocType: Journal Entry Account,Party Balance,Partij Balans
 DocType: Sales Invoice Item,Time Log Batch,Tijd Log Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Selecteer Apply Korting op
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Selecteer Apply Korting op
 DocType: Company,Default Receivable Account,Standaard Vordering Account
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Maak Bank Entry voor het totale salaris betaald voor de hierboven geselecteerde criteria
 DocType: Stock Entry,Material Transfer for Manufacture,Materiaal Verplaatsing voor Productie
@@ -2302,7 +2311,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Haal relevante gegevens op
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Boekingen voor Voorraad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Verkoop Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Artikel {0} bestaat niet
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Artikel {0} bestaat niet
 DocType: Sales Invoice,Customer Address,Klant Adres
 apps/frappe/frappe/desk/query_report.py +136,Total,Totaal
 DocType: Purchase Invoice,Apply Additional Discount On,Breng Extra Korting op
@@ -2317,13 +2326,15 @@ DocType: Quality Inspection,Quality Inspection,Kwaliteitscontrole
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray vormen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Rekening {0} is bevroren
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Rekening {0} is bevroren
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Rechtspersoon / Dochteronderneming met een aparte Rekeningschema behoren tot de Organisatie.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Voeding, Drank en Tabak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL of BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan alleen tegen betaling te maken ongefactureerde {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Commissietarief kan niet groter zijn dan 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum voorraadniveau
 DocType: Stock Entry,Subcontract,Subcontract
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Voer {0} eerste
 DocType: Production Planning Tool,Get Items From Sales Orders,Haal Artikelen van Verkooporders
 DocType: Production Order Operation,Actual End Time,Werkelijke Eindtijd
 DocType: Production Planning Tool,Download Materials Required,Download Benodigde materialen
@@ -2340,9 +2351,9 @@ DocType: Maintenance Visit,Scheduled,Geplande
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Selecteer Item, waar "Is Stock Item" is "Nee" en "Is Sales Item" is "Ja" en er is geen enkel ander product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecteer Maandelijkse Distribution om ongelijk te verdelen doelen in heel maanden.
 DocType: Purchase Invoice Item,Valuation Rate,Waardering Tarief
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Rij {0}: Kwitantie {1} bestaat niet in bovenstaande tabel 'Aankoopfacturen'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Werknemer {0} heeft reeds gesolliciteerd voor {1} tussen {2} en {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Werknemer {0} heeft reeds gesolliciteerd voor {1} tussen {2} en {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Start Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Totdat
 DocType: Rename Tool,Rename Log,Hernoemen Log
@@ -2369,13 +2380,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Alleen leaf nodes zijn toegestaan ​​in transactie
 DocType: Expense Claim,Expense Approver,Onkosten Goedkeurder
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Ontvangstbevestiging Artikel geleverd
-sites/assets/js/erpnext.min.js +48,Pay,Betalen
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betalen
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Om Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs voor het behoud van sms afleverstatus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slijpen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Krimpfolie
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Afwachting Activiteiten
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Afwachting Activiteiten
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bevestigd
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverancier > Leverancier Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vul het verlichten datum .
@@ -2386,7 +2397,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Voe
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Kranten Uitgeverijen
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecteer het fiscale jaar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,U bent de Verlof Goedkeurder voor dit record. Werk de 'Status' bij en sla op.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Bestelniveau
 DocType: Attendance,Attendance Date,Aanwezigheid Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salaris verbreken op basis Verdienen en Aftrek.
@@ -2422,6 +2432,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostenplaats met bestaande transacties kan niet worden omgezet in groep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afschrijvingskosten
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverancier(s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ongeldige periode
 DocType: Customer,Credit Limit,Kredietlimiet
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecteer type transactie
 DocType: GL Entry,Voucher No,Voucher nr.
@@ -2431,8 +2442,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Sjabl
 DocType: Customer,Address and Contact,Adres en contactgegevens
 DocType: Customer,Last Day of the Next Month,Laatste dag van de volgende maand
 DocType: Employee,Feedback,Terugkoppeling
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan ​​klantenkrediet dagen door {0} dag (en)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Rooster
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan ​​klantenkrediet dagen door {0} dag (en)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Rooster
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Schurende jet bewerkingscentra
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Website Settings,Website Settings,Website instellingen
@@ -2446,11 +2457,11 @@ DocType: Quality Inspection,Outgoing,Uitgaande
 DocType: Material Request,Requested For,Aangevraagd voor
 DocType: Quotation Item,Against Doctype,Tegen Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Track this Delivery Note against any Project 
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root-account kan niet worden verwijderd
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-account kan niet worden verwijderd
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Toon Voorraadboekingen
 ,Is Primary Address,Is Primair Adres
 DocType: Production Order,Work-in-Progress Warehouse,Onderhanden Werk Magazijn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Beheren Adressen
 DocType: Pricing Rule,Item Code,Artikelcode
 DocType: Production Planning Tool,Create Production Orders,Maak Productieorders
@@ -2459,14 +2470,14 @@ DocType: Journal Entry,User Remark,Gebruiker Opmerking
 DocType: Lead,Market Segment,Marktsegment
 DocType: Communication,Phone,Telefoon
 DocType: Employee Internal Work History,Employee Internal Work History,Werknemer Interne Werk Geschiedenis
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Sluiten (Db)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Sluiten (Db)
 DocType: Contact,Passive,Passief
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serienummer {0} niet op voorraad
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Belasting sjabloon voor verkooptransacties.
 DocType: Sales Invoice,Write Off Outstanding Amount,Afschrijving uitstaande bedrag
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",Controleer of u automatische terugkerende facturen nodig heeft. Na het indienen van elke verkoopfactuur zal de sectie Terugkeren zichtbaar zijn.
 DocType: Account,Accounts Manager,Rekeningen Beheerder
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Tijd Log {0} moet worden 'Ingediend'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Tijd Log {0} moet worden 'Ingediend'
 DocType: Stock Settings,Default Stock UOM,Standaard Voorraad Eenheid
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Costing Rate gebaseerd op Activity Type (per uur)
 DocType: Production Planning Tool,Create Material Requests,Maak Materiaal Aanvragen
@@ -2477,7 +2488,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Bank Aflettering
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Krijg Updates
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Voeg een paar monster verslagen
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Laat management
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Laat management
 DocType: Event,Groups,Groepen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groeperen per Rekening
 DocType: Sales Order,Fully Delivered,Volledig geleverd
@@ -2489,11 +2500,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Verkoop Extra's
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget voor Rekening {1} tegen kostenplaats {2} zal worden overschreden met {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Doorgestuurd Bladeren
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Van Datum' moet na 'Tot Datum' zijn
 ,Stock Projected Qty,Verwachte voorraad hoeveelheid
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
 DocType: Sales Order,Customer's Purchase Order,Klant Bestelling
 DocType: Warranty Claim,From Company,Van Bedrijf
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Waarde of Aantal
@@ -2506,13 +2516,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Retailer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit Om rekening moet een balansrekening zijn
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverancier Types
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Artikelcode is verplicht omdat Artikel niet automatisch is genummerd
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Offerte {0} niet van het type {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Artikelcode is verplicht omdat Artikel niet automatisch is genummerd
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Offerte {0} niet van het type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Onderhoudsschema Item
 DocType: Sales Order,%  Delivered,% Geleverd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Kredietrekening
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Maak Salarisstrook
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,On-stop
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Bladeren BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Leningen met onderpand
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome producten
@@ -2522,7 +2531,7 @@ DocType: Appraisal,Appraisal,Beoordeling
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-schuim casting
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tekening
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum wordt herhaald
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
 DocType: Hub Settings,Seller Email,Verkoper Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale aanschafkosten (via Purchase Invoice)
 DocType: Workstation Working Hour,Start Time,Starttijd
@@ -2536,8 +2545,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobedrag (Company valuta)
 DocType: BOM Operation,Hour Rate,Uurtarief
 DocType: Stock Settings,Item Naming By,Artikel benoeming door
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Van Offerte
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Een ander Periode sluitpost {0} is gemaakt na {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Van Offerte
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Een ander Periode sluitpost {0} is gemaakt na {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiaal Overgedragen voor Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Rekening {0} bestaat niet
 DocType: Purchase Receipt Item,Purchase Order Item No,Inkooporder Artikel nr
@@ -2550,11 +2559,11 @@ DocType: Item,Inspection Required,Inspectie Verplicht
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Volledig gefactureerd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kasvoorraad
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Levering magazijn vereist voor voorraad artikel {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Levering magazijn vereist voor voorraad artikel {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Het bruto gewicht van het pakket. Meestal nettogewicht + verpakkingsmateriaal gewicht. (Voor afdrukken)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts 
 DocType: Serial No,Is Cancelled,Is Geannuleerd
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Mijn verzendingen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mijn verzendingen
 DocType: Journal Entry,Bill Date,Factuurdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Als er meerdere Prijsbepalings Regels zijn met de hoogste prioriteit, dan wordt de volgende interene prioriteit gehanteerd:"
 DocType: Supplier,Supplier Details,Leverancier Details
@@ -2567,7 +2576,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,overboeking
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Selecteer Bankrekening
 DocType: Newsletter,Create and Send Newsletters,Maken en verzenden Nieuwsbrieven
-sites/assets/js/report.min.js +107,From Date must be before To Date,Van Datum moet voor Tot Datum
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Van Datum moet voor Tot Datum
 DocType: Sales Order,Recurring Order,Terugkerende Bestel
 DocType: Company,Default Income Account,Standaard Inkomstenrekening
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klantengroep / Klant
@@ -2582,31 +2591,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Voorraad Eenheid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Inkooporder {0} is niet ingediend
 ,Projected,verwachte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} behoort niet tot Magazijn {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
 DocType: Notification Control,Quotation Message,Offerte Bericht
 DocType: Issue,Opening Date,Openingsdatum
 DocType: Journal Entry,Remark,Opmerking
 DocType: Purchase Receipt Item,Rate and Amount,Tarief en Bedrag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Vervelend
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Van Verkooporder
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Van Verkooporder
 DocType: Blog Category,Parent Website Route,Bovenliggende Website Route
 DocType: Sales Order,Not Billed,Niet in rekening gebracht
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Beide magazijnen moeten tot hetzelfde bedrijf behoren
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Nog geen contacten toegevoegd.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nog geen contacten toegevoegd.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Niet actief
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Tegen Factuur Boekingsdatum
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Vrachtkosten Voucher Bedrag
 DocType: Time Log,Batched for Billing,Gebundeld voor facturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Facturen van leveranciers.
 DocType: POS Profile,Write Off Account,Afschrijvingsrekening
-sites/assets/js/erpnext.min.js +26,Discount Amount,Korting Bedrag
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Korting Bedrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Terug Tegen Purchase Invoice
 DocType: Item,Warranty Period (in days),Garantieperiode (in dagen)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,bijv. BTW
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punt 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry Account
 DocType: Shopping Cart Settings,Quotation Series,Offerte Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Een item bestaat met dezelfde naam ( {0} ) , wijzigt u de naam van het item groep of hernoem het item"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Een item bestaat met dezelfde naam ( {0} ) , wijzigt u de naam van het item groep of hernoem het item"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas vormen
 DocType: Sales Order Item,Sales Order Date,Verkooporder Datum
 DocType: Sales Invoice Item,Delivered Qty,Geleverd Aantal
@@ -2638,10 +2646,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Klant of leverancier Details
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Instellen
 DocType: Lead,Lead Owner,Lead Eigenaar
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Warehouse is vereist
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse is vereist
 DocType: Employee,Marital Status,Burgerlijke staat
 DocType: Stock Settings,Auto Material Request,Automatisch Materiaal Request
 DocType: Time Log,Will be updated when billed.,Zal worden bijgewerkt wanneer gefactureerd.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Beschikbaar Aantal Batch bij Van Warehouse
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Huidige Stuklijst en Nieuwe Stuklijst kunnen niet hetzelfde zijn
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan Datum van Indiensttreding
 DocType: Sales Invoice,Against Income Account,Tegen Inkomstenrekening
@@ -2658,12 +2667,12 @@ DocType: POS Profile,Update Stock,Bijwerken Voorraad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verschillende eenheden voor artikelen zal leiden tot een onjuiste (Totaal) Netto gewicht. Zorg ervoor dat Netto gewicht van elk artikel in dezelfde eenheid is.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stuklijst tarief
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Haal aub artikelen uit de Vrachtbrief
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Haal aub artikelen uit de Vrachtbrief
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journaalposten {0} zijn un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Record van alle communicatie van het type e-mail, telefoon, chat, bezoek, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Vermeld Ronde Off kostenplaats in Company
 DocType: Purchase Invoice,Terms,Voorwaarden
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Maak nieuw
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Maak nieuw
 DocType: Buying Settings,Purchase Order Required,Inkooporder verplicht
 ,Item-wise Sales History,Artikelgebaseerde Verkoop Geschiedenis
 DocType: Expense Claim,Total Sanctioned Amount,Totaal Goedgekeurd Bedrag
@@ -2680,16 +2689,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Salarisstrook Aftrek
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Opmerkingen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Selecteer eerst een groep knooppunt.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Doel moet één zijn van {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Vul het formulier in en sla het op
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vul het formulier in en sla het op
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download een rapport met alle grondstoffen met hun laatste voorraadstatus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Verlofsaldo voor aanvraag
 DocType: SMS Center,Send SMS,SMS versturen
 DocType: Company,Default Letter Head,Standaard Briefhoofd
 DocType: Time Log,Billable,Factureerbaar
 DocType: Authorization Rule,This will be used for setting rule in HR module,Deze wordt gebruikt voor instelling regel HR module
 DocType: Account,Rate at which this tax is applied,Percentage waarmee deze belasting toegepast wordt
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Bestelaantal
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Bestelaantal
 DocType: Company,Stock Adjustment Account,Voorraad Aanpassing Rekening
 DocType: Journal Entry,Write Off,Schrijf Off
 DocType: Time Log,Operation ID,Operation ID
@@ -2700,12 +2710,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Korting Velden zullen beschikbaar zijn in Inkooporder, Ontvangstbewijs, Inkoopfactuur"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,De naam van de nieuwe account. Let op: Gelieve niet goed voor klanten en leveranciers te creëren
 DocType: Report,Report Type,Rapport Type
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Laden
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Laden
 DocType: BOM Replace Tool,BOM Replace Tool,Stuklijst Vervang gereedschap
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landgebaseerde standaard Adres Template
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Verloop- / Referentie Datum kan niet na {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Leverancier levert aan de Klant
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Toon tax break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Verloop- / Referentie Datum kan niet na {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Gegevens importeren en exporteren
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Als u te betrekken in de productie -activiteit . Stelt Item ' is vervaardigd '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Factuur Boekingsdatum
 DocType: Sales Invoice,Rounded Total,Afgerond Totaal
 DocType: Product Bundle,List items that form the package.,Lijst items die het pakket vormen.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentage toewijzing moet gelijk zijn aan 100%
@@ -2716,8 +2729,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Neem dan contact op met de gebruiker die hebben Sales Master Manager {0} rol
 DocType: Company,Default Cash Account,Standaard Kasrekening
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Bedrijf ( geen klant of leverancier ) meester.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vrachtbrief {0} moet worden geannuleerd voordat het annuleren van deze Verkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vrachtbrief {0} moet worden geannuleerd voordat het annuleren van deze Verkooporder
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betaald bedrag + Afgeschreven bedrag kan niet groter zijn dan Eindtotaal
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} is geen geldig batchnummer voor Artikel {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
@@ -2739,11 +2752,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Rij {0}: Aantal niet voorradig in magazijn {1}  op {2} {3}.
 Beschikbaar aantal: {4}, Verplaats Aantal: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punt 3
+DocType: Purchase Order,Customer Contact Email,Customer Contact E-mail
 DocType: Event,Sunday,Zondag
 DocType: Sales Team,Contribution (%),Bijdrage (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opmerking: De betaling wordt niet aangemaakt, aangezien de 'Kas- of Bankrekening' niet gespecificeerd is."
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwoordelijkheden
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Sjabloon
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Sjabloon
 DocType: Sales Person,Sales Person Name,Verkoper Naam
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vul tenminste 1 factuur in in de tabel
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Gebruikers toevoegen
@@ -2752,7 +2766,7 @@ DocType: Task,Actual Start Date (via Time Logs),Werkelijke Startdatum (via Time
 DocType: Stock Reconciliation Item,Before reconciliation,Voordat verzoening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Naar {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Belastingen en Toeslagen toegevoegd (Bedrijfsvaluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
 DocType: Sales Order,Partly Billed,Deels Gefactureerd
 DocType: Item,Default BOM,Standaard Stuklijst
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2760,12 +2774,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totale uitstaande Amt
 DocType: Time Log Batch,Total Hours,Totaal Uren
 DocType: Journal Entry,Printing Settings,Instellingen afdrukken
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Totaal Debet moet gelijk zijn aan Totaal Credit. Het verschil is {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Totaal Debet moet gelijk zijn aan Totaal Credit. Het verschil is {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Verlof van type {0} reeds voor medewerker {1} voor het fiscale jaar {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Artikel is vereist
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal spuitgieten
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Van Vrachtbrief
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Van Vrachtbrief
 DocType: Time Log,From Time,Van Tijd
 DocType: Notification Control,Custom Message,Aangepast bericht
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
@@ -2781,17 +2794,17 @@ DocType: Newsletter,A Lead with this email id should exist,Een Lead met dit e-ma
 DocType: Stock Entry,From BOM,Van BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Basis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Voorraadtransacties voor {0} zijn bevroren
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',Klik op 'Genereer Planning'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Tot Datum moet dezelfde zijn als Van Datum voor een halve dag verlof
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik op 'Genereer Planning'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Tot Datum moet dezelfde zijn als Van Datum voor een halve dag verlof
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","bijv. Kg, Stuks, Doos, Paar"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referentienummer is verplicht als u een referentiedatum hebt ingevoerd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referentienummer is verplicht als u een referentiedatum hebt ingevoerd
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum van Indiensttreding moet groter zijn dan Geboortedatum
 DocType: Salary Structure,Salary Structure,Salarisstructuur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Er bestaan meerdere prijsbepalingsregels met dezelfde criteria, los aub op \ conflict bij het toewijzen van prioriteit. Prijsbepaling Regels: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,vliegmaatschappij
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Kwestie Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Kwestie Materiaal
 DocType: Material Request Item,For Warehouse,Voor Magazijn
 DocType: Employee,Offer Date,Aanbieding datum
 DocType: Hub Settings,Access Token,Toegang Token
@@ -2814,6 +2827,7 @@ DocType: Issue,Opening Time,Opening Tijd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Van en naar data vereist
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
+DocType: Delivery Note Item,From Warehouse,Van Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Boren
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow moulding
 DocType: Purchase Taxes and Charges,Valuation and Total,Waardering en Totaal
@@ -2835,11 +2849,12 @@ DocType: C-Form,Amended From,Gewijzigd Van
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,grondstof
 DocType: Leave Application,Follow via Email,Volg via e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Belasting bedrag na korting
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Onderliggende rekening bestaat voor deze rekening. U kunt deze niet verwijderen .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Onderliggende rekening bestaat voor deze rekening. U kunt deze niet verwijderen .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ofwel doelwit aantal of streefbedrag is verplicht
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Er bestaat geen standaard Stuklijst voor Artikel {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Selecteer Boekingsdatum eerste
-DocType: Leave Allocation,Carry Forward,Carry Forward
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Er bestaat geen standaard Stuklijst voor Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Selecteer Boekingsdatum eerste
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Openingsdatum moeten vóór Sluitingsdatum
+DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Kostenplaats met bestaande transacties kan niet worden omgezet naar grootboek
 DocType: Department,Days for which Holidays are blocked for this department.,Dagen waarvoor feestdagen zijn geblokkeerd voor deze afdeling.
 ,Produced,Geproduceerd
@@ -2860,17 +2875,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totaal (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Vrije Tijd
 DocType: Purchase Order,The date on which recurring order will be stop,De datum waarop terugkerende bestelling wordt te stoppen
 DocType: Quality Inspection,Item Serial No,Artikel Serienummer
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} moet worden verminderd met {1} of u moet de overboeking tolerantie verhogen
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} moet worden verminderd met {1} of u moet de overboeking tolerantie verhogen
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Totaal Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,uur
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Geserialiseerde Item {0} kan niet worden bijgewerkt \
  behulp Stock Verzoening"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transfer Material aan Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfer Material aan Leverancier
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nieuw Serienummer kan geen Magazijn krijgen. Magazijn moet via Voorraad Invoer of Ontvangst worden ingesteld.
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Maak Offerte
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Al deze items zijn reeds gefactureerde
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Al deze items zijn reeds gefactureerde
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan door {0} worden goedgekeurd
 DocType: Shipping Rule,Shipping Rule Conditions,Verzendregel Voorwaarden
 DocType: BOM Replace Tool,The new BOM after replacement,De nieuwe Stuklijst na vervanging
@@ -2918,7 +2933,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID niet ingesteld
 DocType: Production Order,Planned Start Date,Geplande Startdatum
 DocType: Serial No,Creation Document Type,Aanmaken Document type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Bezoek
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Bezoek
 DocType: Leave Type,Is Encash,Is incasseren
 DocType: Purchase Invoice,Mobile No,Mobiel nummer
 DocType: Payment Tool,Make Journal Entry,Maak Journal Entry
@@ -2926,7 +2941,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nieuwe Verloven Toegewezen
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projectgegevens zijn niet beschikbaar voor Offertes
 DocType: Project,Expected End Date,Verwachte einddatum
 DocType: Appraisal Template,Appraisal Template Title,Beoordeling Template titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,commercieel
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,commercieel
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Ouder Item {0} moet een Stock Item niet
 DocType: Cost Center,Distribution Id,Distributie Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
@@ -2942,14 +2957,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Waar voor Attribute {0} moet binnen het bereik van {1} tot {2} in de stappen van {3}
 DocType: Tax Rule,Sales,Verkoop
 DocType: Stock Entry Detail,Basic Amount,Basisbedrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
+DocType: Leave Allocation,Unused leaves,Ongebruikte bladeren
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default Debiteuren
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Zagen
 DocType: Tax Rule,Billing State,Billing State
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Lamineren
 DocType: Item Reorder,Transfer,Verplaatsen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
 DocType: Authorization Rule,Applicable To (Employee),Van toepassing zijn op (Werknemer)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date is verplicht
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
@@ -2965,6 +2981,7 @@ DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Klant {0} bestaat niet
 DocType: Attendance,Absent,Afwezig
 DocType: Product Bundle,Product Bundle,Product Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rij {0}: Invalid referentie {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Breken
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Aankoop en -heffingen Template
 DocType: Upload Attendance,Download Template,Download Template
@@ -2972,16 +2989,16 @@ DocType: GL Entry,Remarks,Opmerkingen
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Grondstof Artikelcode
 DocType: Journal Entry,Write Off Based On,Afschrijving gebaseerd op
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Installatie record voor een Serienummer
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installatie record voor een Serienummer
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Continugieten
-sites/assets/js/erpnext.min.js +10,Please specify a,Specificeer een
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Specificeer een
 DocType: Offer Letter,Awaiting Response,Wachten op antwoord
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Boven
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold sizing
 DocType: Salary Slip,Earning & Deduction,Verdienen & Aftrek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Rekening {0} kan geen groep zijn
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regio
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatieve Waarderingstarief is niet toegestaan
 DocType: Holiday List,Weekly Off,Wekelijks Vrij
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Voor bijvoorbeeld 2012, 2012-13"
@@ -3025,12 +3042,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Uitpuilende
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporative-patroon casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Representatiekosten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkoopfactuur {0} moet worden geannuleerd voordat deze verkooporder kan worden geannuleerd.
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Leeftijd
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkoopfactuur {0} moet worden geannuleerd voordat deze verkooporder kan worden geannuleerd.
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Leeftijd
 DocType: Time Log,Billing Amount,Billing Bedrag
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ongeldig aantal opgegeven voor artikel {0} . Hoeveelheid moet groter zijn dan 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Aanvragen voor verlof.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridische Kosten
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","De dag van de maand waarop de automatische bestelling wordt bijvoorbeeld 05, 28 etc worden gegenereerd"
 DocType: Sales Invoice,Posting Time,Plaatsing Time
@@ -3039,9 +3056,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Controleer dit als u wilt dwingen de gebruiker om een ​​reeks voor het opslaan te selecteren. Er zal geen standaard zijn als je dit controleren.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Geen Artikel met Serienummer {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Open Meldingen
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Open Meldingen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Directe Kosten
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Wilt u echt deze Materiaal Aanvraag ON-STOPPEN?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nieuwe klant Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Reiskosten
 DocType: Maintenance Visit,Breakdown,Storing
@@ -3052,7 +3068,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Op Date
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,proeftijd
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Standaard Magazijn is verplicht voor voorraadartikel .
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standaard Magazijn is verplicht voor voorraadartikel .
 DocType: Feed,Full Name,Volledige naam
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinchen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Betaling van salaris voor de maand {0} en jaar {1} 
@@ -3075,7 +3091,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Rijen toevoegen
 DocType: Buying Settings,Default Supplier Type,Standaard Leverancier Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Delfstoffen
 DocType: Production Order,Total Operating Cost,Totale exploitatiekosten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle contactpersonen.
 DocType: Newsletter,Test Email Id,Test E-mail ID
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Bedrijf Afkorting
@@ -3099,11 +3115,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Offerte
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol toegestaan ​​om bevroren voorraden bewerken
 ,Territory Target Variance Item Group-Wise,Regio Doel Variance Artikel Groepsgewijs
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Doelgroepen
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Belasting Template is verplicht.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Rekening {0}: Bovenliggende rekening {1} bestaat niet
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prijslijst Tarief (Bedrijfsvaluta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} status ' Gestopt '
 DocType: Account,Temporary,Tijdelijk
 DocType: Address,Preferred Billing Address,Voorkeur Factuuradres
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentage Toewijzing
@@ -3121,13 +3136,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelgebaseerde BTW D
 DocType: Purchase Order Item,Supplier Quotation,Leverancier Offerte
 DocType: Quotation,In Words will be visible once you save the Quotation.,In Woorden zijn zichtbaar zodra u de Offerte opslaat.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Strijken
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} is gestopt
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} is gestopt
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
 DocType: Lead,Add to calendar on this date,Toevoegen aan agenda op deze datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regels voor het toevoegen van verzendkosten.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,aankomende evenementen
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,aankomende evenementen
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klant is verplicht
 DocType: Letter Head,Letter Head,Brief Hoofd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Snelle invoer
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} is verplicht voor Return
 DocType: Purchase Order,To Receive,Ontvangen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink fitting
@@ -3151,25 +3167,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Tenminste een magazijn is verplicht
 DocType: Serial No,Out of Warranty,Uit de garantie
 DocType: BOM Replace Tool,Replace,Vervang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Vul Standaard eenheid in
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vul Standaard eenheid in
 DocType: Purchase Invoice Item,Project Name,Naam van het project
 DocType: Supplier,Mention if non-standard receivable account,Vermelden of niet-standaard te ontvangen rekening
 DocType: Workflow State,Edit,Bewerken
 DocType: Journal Entry Account,If Income or Expense,Indien Inkomsten (baten) of Uitgaven (lasten)
 DocType: Features Setup,Item Batch Nos,Artikel Batchnummers
 DocType: Stock Ledger Entry,Stock Value Difference,Voorraad Waarde Verschil
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Human Resource
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Human Resource
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Afletteren Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Belastingvorderingen
 DocType: BOM Item,BOM No,Stuklijst nr.
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} heeft geen rekening {1} of al vergeleken met andere voucher
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} heeft geen rekening {1} of al vergeleken met andere voucher
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,De Stuklijst die zal worden vervangen
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nieuwe Voorraad Eenheid moet verschillen van bestaande Eenheden
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Verloven moeten in veelvouden van 0,5 worden toegewezen"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Verloven moeten in veelvouden van 0,5 worden toegewezen"
 DocType: Production Order,Operation Cost,Operatie Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload aanwezigheid uit een .csv-bestand
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Openstaande Amt
@@ -3177,7 +3193,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set ric
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Om dit Issue toe te wijzen, gebruikt u de ""Toewijzen""-knop in de zijbalk."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bevries Voorraden ouder dan [dagen]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Als twee of meer Pricing Regels zijn gevonden op basis van de bovenstaande voorwaarden, wordt prioriteit toegepast. Prioriteit is een getal tussen 0 en 20, terwijl standaardwaarde nul (blanco). Hoger aantal betekent dat het voorrang krijgen als er meerdere prijzen Regels met dezelfde voorwaarden."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Tegen Factuur
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Boekjaar: {0} bestaat niet
 DocType: Currency Exchange,To Currency,Naar Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Laat de volgende gebruikers te keuren Verlof Aanvragen voor blok dagen.
@@ -3206,7 +3221,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tarie
 DocType: Stock Entry Detail,Additional Cost,Bijkomende kosten
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Boekjaar Einddatum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van Vouchernummer, indien gegroepeerd per Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Maak Leverancier Offerte
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Maak Leverancier Offerte
 DocType: Quality Inspection,Incoming,Inkomend
 DocType: BOM,Materials Required (Exploded),Benodigde materialen (uitgeklapt)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Verminderen Inkomsten voor onbetaald verlof
@@ -3214,10 +3229,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rij # {0}: Serienummer {1} komt niet overeen met {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partij ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Opmerking : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Opmerking : {0}
 ,Delivery Note Trends,Vrachtbrief Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Samenvatting van deze week
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} moet een gekocht of uitbesteed artikel zijn in rij {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} moet een gekocht of uitbesteed artikel zijn in rij {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Account: {0} kan alleen worden bijgewerkt via Voorraad Transacties
 DocType: GL Entry,Party,Partij
 DocType: Sales Order,Delivery Date,Leveringsdatum
@@ -3230,7 +3245,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,s
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gem. Buying Rate
 DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren)
 DocType: Employee,History In Company,Geschiedenis In Bedrijf
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Nieuwsbrieven
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Nieuwsbrieven
 DocType: Address,Shipping,Logistiek
 DocType: Stock Ledger Entry,Stock Ledger Entry,Voorraad Dagboek post
 DocType: Department,Leave Block List,Verlof bloklijst
@@ -3249,7 +3264,7 @@ DocType: Account,Auditor,Revisor
 DocType: Purchase Order,End date of current order's period,Einddatum van de periode huidige bestelling's
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Bod uitbrengen Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Terugkeer
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Standaard maateenheid voor Variant moet hetzelfde zijn als sjabloon
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standaard maateenheid voor Variant moet hetzelfde zijn als sjabloon
 DocType: DocField,Fold,Vouw
 DocType: Production Order Operation,Production Order Operation,Productie Order Operatie
 DocType: Pricing Rule,Disable,Uitschakelen
@@ -3281,7 +3296,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Rapporteert aan
 DocType: SMS Settings,Enter url parameter for receiver nos,Voer URL-parameter voor de ontvanger nos
 DocType: Sales Invoice,Paid Amount,Betaald Bedrag
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Closing account {0} moet van het type ' Aansprakelijkheid ' zijn
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Closing account {0} moet van het type ' Aansprakelijkheid ' zijn
 ,Available Stock for Packing Items,Beschikbaar voor Verpakking Items
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Dit adres Template instellen als standaard als er geen andere standaard
@@ -3289,7 +3304,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filteren op basis van klant
 DocType: Payment Tool Detail,Against Voucher No,Tegen blad nr
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Vul het aantal in voor artikel {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vul het aantal in voor artikel {0}
 DocType: Employee External Work History,Employee External Work History,Werknemer Externe Werk Geschiedenis
 DocType: Tax Rule,Purchase,Inkopen
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balans Aantal
@@ -3326,28 +3341,29 @@ Note: BOM = Bill of Materials","Aggregate groep ** Items ** in een ander ** Item
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serienummer is verplicht voor Artikel {0}
 DocType: Item Variant Attribute,Attribute,Attribuut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Gelieve te specificeren van / naar variëren
-sites/assets/js/desk.min.js +7652,Created By,Gemaakt door
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Gemaakt door
 DocType: Serial No,Under AMC,Onder AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Item waardering tarief wordt herberekend overweegt landde kosten voucherbedrag
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standaardinstellingen voor Verkooptransacties .
 DocType: BOM Replace Tool,Current BOM,Huidige Stuklijst
-sites/assets/js/erpnext.min.js +8,Add Serial No,Voeg Serienummer toe
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Voeg Serienummer toe
 DocType: Production Order,Warehouses,Magazijnen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Kantoorartikelen
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Groep Node
 DocType: Payment Reconciliation,Minimum Amount,Minimumbedrag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Bijwerken Gereed Product
 DocType: Workstation,per hour,per uur
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Reeks {0} al gebruikt in {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Reeks {0} al gebruikt in {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Rekening voor het magazijn wordt aangemaakt onder deze rekening.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazijn kan niet worden verwijderd omdat er voorraadboekingen zijn voor dit magazijn.
 DocType: Company,Distribution,Distributie
-sites/assets/js/erpnext.min.js +50,Amount Paid,Betaald bedrag
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Betaald bedrag
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maximale korting toegestaan voor artikel: {0} is {1}%
 DocType: Customer,Default Taxes and Charges,Standaard en -heffingen
 DocType: Account,Receivable,Vordering
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rij # {0}: Niet toegestaan ​​om van leverancier te veranderen als bestelling al bestaat
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol welke is toegestaan ​​om transacties in te dienen die gestelde kredietlimieten overschrijden .
 DocType: Sales Invoice,Supplier Reference,Leverancier Referentie
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Indien aangevinkt, zal BOM voor sub-assemblage zaken geacht voor het krijgen van grondstoffen. Anders zullen alle subeenheid items worden behandeld als een grondstof."
@@ -3384,8 +3400,8 @@ DocType: Email Digest,Add/Remove Recipients,Toevoegen / verwijderen Ontvangers
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transactie niet toegestaan met gestopte productieorder {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit boekjaar in te stellen als standaard, klik op 'Als standaard instellen'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup inkomende server voor ondersteuning e-id . ( b.v. support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Tekort Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Tekort Aantal
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
 DocType: Salary Slip,Salary Slip,Salarisstrook
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polijsten
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Tot Datum' is vereist
@@ -3398,6 +3414,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Als de aangevinkte transacties worden ""Ingediend"", wordt een e-mail pop-up automatisch geopend om een ​​e-mail te sturen naar de bijbehorende ""Contact"" in deze transactie, met de transactie als bijlage. De gebruiker heeft vervolgens de optie om de e-mail wel of niet te verzenden."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 DocType: Employee Education,Employee Education,Werknemer Opleidingen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
 DocType: Salary Slip,Net Pay,Nettoloon
 DocType: Account,Account,Rekening
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serienummer {0} is reeds ontvangen
@@ -3430,7 +3447,7 @@ DocType: BOM,Manufacturing User,Productie Gebruiker
 DocType: Purchase Order,Raw Materials Supplied,Grondstoffen Geleverd
 DocType: Purchase Invoice,Recurring Print Format,Terugkerende Print Format
 DocType: Communication,Series,Reeksen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Verwachte leverdatum kan niet voor de Inkooporder Datum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Verwachte leverdatum kan niet voor de Inkooporder Datum
 DocType: Appraisal,Appraisal Template,Beoordeling Sjabloon
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Item Classificatie
@@ -3486,6 +3503,7 @@ DocType: HR Settings,Payroll Settings,Loonadministratie Instellingen
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match niet-gekoppelde facturen en betalingen.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Plaats bestelling
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan niet een bovenliggende kostenplaats hebben
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selecteer merk ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Toepasselijk
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operatie tijd moet groter zijn dan 0 voor de operatie zijn {0}
 DocType: Supplier,Address and Contacts,Adres en Contacten
@@ -3496,7 +3514,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Krijg Outstanding Vouchers
 DocType: Warranty Claim,Resolved By,Opgelost door
 DocType: Appraisal,Start Date,Startdatum
-sites/assets/js/desk.min.js +7629,Value,Waarde
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Waarde
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Toewijzen bladeren voor een periode .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik hier om te controleren
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Rekening {0}: U kunt niet de rekening zelf toewijzen als bovenliggende rekening
@@ -3512,14 +3530,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Toegang toegestaan
 DocType: Dropbox Backup,Weekly,Wekelijks
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Bijv. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Ontvangen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Ontvangen
 DocType: Maintenance Visit,Fully Completed,Volledig afgerond
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% voltooid
 DocType: Employee,Educational Qualification,Educatieve Kwalificatie
 DocType: Workstation,Operating Costs,Bedrijfskosten
 DocType: Employee Leave Approver,Employee Leave Approver,Werknemer Verlof Fiatteur
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} is succesvol toegevoegd aan onze nieuwsbrief lijst.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren verklaren, omdat Offerte is gemaakt."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronenbundel bewerkingscentra
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Aankoop Master Manager
@@ -3532,7 +3550,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Toevoegen / bewerken Prijzen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Kostenplaatsenschema
 ,Requested Items To Be Ordered,Aangevraagde Artikelen in te kopen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Mijn Bestellingen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mijn Bestellingen
 DocType: Price List,Price List Name,Prijslijst Naam
 DocType: Time Log,For Manufacturing,Voor Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totalen
@@ -3543,7 +3561,7 @@ DocType: Account,Income,Inkomsten
 DocType: Industry Type,Industry Type,Industrie Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Er is iets fout gegaan!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Voltooiingsdatum
 DocType: Purchase Invoice Item,Amount (Company Currency),Bedrag (Company Munt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die casting
@@ -3557,10 +3575,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Jaar
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Werk SMS-instellingen bij
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Time Inloggen {0} reeds gefactureerde
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Inloggen {0} reeds gefactureerde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Leningen zonder onderpand
 DocType: Cost Center,Cost Center Name,Kostenplaats Naam
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Artikel {0} met serienummer {1} is al geïnstalleerd
 DocType: Maintenance Schedule Detail,Scheduled Date,Geplande Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Totale betaalde Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Bericht van meer dan 160 tekens worden opgesplitst in meerdere berichten
@@ -3568,10 +3585,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Ontvangen en geaccepteerd
 ,Serial No Service Contract Expiry,Serienummer Service Contract Afloop
 DocType: Item,Unit of Measure Conversion,Eenheid van Meet Conversie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Werknemer kan niet worden gewijzigd
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
 DocType: Naming Series,Help HTML,Help HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Totaal toegewezen gewicht moet 100% zijn. Het is {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Korting voor over-{0} gekruist voor post {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Korting voor over-{0} gekruist voor post {1}
 DocType: Address,Name of person or organization that this address belongs to.,Naam van de persoon of organisatie waartoe dit adres behoort.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Uw Leveranciers
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Kan niet als Verloren instellen, omdat er al een Verkoop Order is gemaakt."
@@ -3582,10 +3599,11 @@ DocType: Lead,Converted,Omgezet
 DocType: Item,Has Serial No,Heeft Serienummer
 DocType: Employee,Date of Issue,Datum van afgifte
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Van {0} voor {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Lijst deze post in meerdere groepen op de website.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Kijk Valuta optie om rekeningen met andere valuta toestaan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Kijk Valuta optie om rekeningen met andere valuta toestaan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} bestaat niet in het systeem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,U bent niet bevoegd om Bevroren waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Haal onafgeletterde transacties op
@@ -3596,14 +3614,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Tot Magazijn
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Rekening {0} is meer dan één keer ingevoerd voor het boekjaar {1}
 ,Average Commission Rate,Gemiddelde Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
 DocType: Pricing Rule,Pricing Rule Help,Prijsbepalingsregel Help
 DocType: Purchase Taxes and Charges,Account Head,Hoofdrekening
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualiseren extra kosten voor landde kosten van artikelen te berekenen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elektrisch
 DocType: Stock Entry,Total Value Difference (Out - In),Totale waarde Verschil (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Gebruikers-ID niet ingesteld voor Werknemer {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Van Garantie Claim
@@ -3617,15 +3635,17 @@ DocType: Buying Settings,Naming Series,Benoemen Series
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
 DocType: User,Enabled,Ingeschakeld
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Voorraad Activa
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Wilt u echt alle salarisstroken voor de maand {0} en jaar {1} indienen?
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Wilt u echt alle salarisstroken voor de maand {0} en jaar {1} indienen?
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Abonnees Import
 DocType: Target Detail,Target Qty,Doel Aantal
 DocType: Attendance,Present,Presenteer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Vrachtbrief {0} mag niet worden ingediend
 DocType: Notification Control,Sales Invoice Message,Verkoopfactuur bericht
 DocType: Authorization Rule,Based On,Gebaseerd op
-,Ordered Qty,Besteld Aantal
+DocType: Sales Order Item,Ordered Qty,Besteld Aantal
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Punt {0} is uitgeschakeld
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevroren Tot
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode Van en periode te data verplicht voor terugkerende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Project activiteit / taak.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Genereer Salarisstroken
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} is geen geldig e-mail ID
@@ -3664,7 +3684,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Upload Aanwezigheid
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM en Productie Hoeveelheid nodig
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Vergrijzing Range 2
-DocType: Journal Entry Account,Amount,Bedrag
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Bedrag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Klinken
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stuklijst vervangen
 ,Sales Analytics,Verkoop analyse
@@ -3691,7 +3711,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Verwachte datum kan niet voor de Material Aanvraagdatum
 DocType: Contact Us Settings,City,City
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasoon bewerken
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Fout: geen geldig id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fout: geen geldig id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Artikel {0} moet een verkoopbaar artikel zijn
 DocType: Naming Series,Update Series Number,Bijwerken Serienummer
 DocType: Account,Equity,Vermogen
@@ -3706,7 +3726,7 @@ DocType: Purchase Taxes and Charges,Actual,Werkelijk
 DocType: Authorization Rule,Customerwise Discount,Klantgebaseerde Korting
 DocType: Purchase Invoice,Against Expense Account,Tegen Kostenrekening
 DocType: Production Order,Production Order,Productieorder
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Installatie Opmerking {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installatie Opmerking {0} is al ingediend
 DocType: Quotation Item,Against Docname,Tegen Docname
 DocType: SMS Center,All Employee (Active),Alle medewerkers (Actief)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bekijk nu
@@ -3714,14 +3734,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Grondstofprijzen
 DocType: Item,Re-Order Level,Re-order Niveau
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Voer de artikelen en geplande aantallen in waarvoor u productieorders wilt aanmaken, of grondstoffen voor analyse wilt downloaden."
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt-diagram
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt-diagram
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deeltijds
 DocType: Employee,Applicable Holiday List,Toepasselijk Holiday Lijst
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Reeks bijgewerkt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapport type is verplicht
 DocType: Item,Serial Number Series,Serienummer Reeksen
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Magazijn is verplicht voor voorraadartikel {0} in rij {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazijn is verplicht voor voorraadartikel {0} in rij {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Groothandel
 DocType: Issue,First Responded On,Eerst gereageerd op
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kruis Notering van Punt in meerdere groepen
@@ -3736,7 +3756,7 @@ DocType: Attendance,Attendance,Aanwezigheid
 DocType: Page,No,Nee
 DocType: BOM,Materials,Materialen
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Indien niet gecontroleerd, wordt de lijst worden toegevoegd aan elk Department waar het moet worden toegepast."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Belasting sjabloon voor inkooptransacties .
 ,Item Prices,Artikelprijzen
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,In Woorden zijn zichtbaar zodra u de Inkooporder opslaat
@@ -3756,9 +3776,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administratie Kosten
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Bovenliggende klantgroep
-sites/assets/js/erpnext.min.js +50,Change,Verandering
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Verandering
 DocType: Purchase Invoice,Contact Email,Contact E-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',"Inkooporder {0} is ""Gestopt"""
 DocType: Appraisal Goal,Score Earned,Verdiende Score 
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","bijv. ""Mijn Bedrijf BV"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Opzegtermijn
@@ -3768,12 +3787,13 @@ DocType: Packing Slip,Gross Weight UOM,Bruto Gewicht Eenheid
 DocType: Email Digest,Receivables / Payables,Debiteuren / Crediteuren
 DocType: Delivery Note Item,Against Sales Invoice,Tegen Sales Invoice
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempelen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit Account
 DocType: Landed Cost Item,Landed Cost Item,Vrachtkosten Artikel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Toon nulwaarden
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Hoeveelheid product verkregen na productie / herverpakken van de gegeven hoeveelheden grondstoffen
 DocType: Payment Reconciliation,Receivable / Payable Account,Vorderingen / Crediteuren Account
 DocType: Delivery Note Item,Against Sales Order Item,Tegen Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
 DocType: Item,Default Warehouse,Standaard Magazijn
 DocType: Task,Actual End Date (via Time Logs),Werkelijke Einddatum (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan niet tegen Group rekening worden toegewezen {0}
@@ -3787,7 +3807,7 @@ DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Totale Score (van de 5)
 DocType: Contact Us Settings,State,Status
 DocType: Batch,Batch,Partij
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balans
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balans
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via declaraties)
 DocType: User,Gender,Geslacht
 DocType: Journal Entry,Debit Note,Debetnota
@@ -3803,9 +3823,8 @@ DocType: Lead,Blog Subscriber,Blog Abonnee
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Regels maken om transacties op basis van waarden te beperken.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Indien aangevinkt, Totaal niet. van Werkdagen zal omvatten feestdagen, en dit zal de waarde van het salaris per dag te verminderen"
 DocType: Purchase Invoice,Total Advance,Totaal Voorschot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,On-stop Materiaal Aanvraag
 DocType: Workflow State,User,Gebruiker
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Processing Payroll
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processing Payroll
 DocType: Opportunity Item,Basic Rate,Basis Tarief
 DocType: GL Entry,Credit Amount,Credit Bedrag
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Instellen als Verloren
@@ -3813,7 +3832,7 @@ DocType: Customer,Credit Days Based On,Credit dagen op basis van
 DocType: Tax Rule,Tax Rule,Belasting Regel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Handhaaf zelfde tarief gedurende verkoopcyclus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plan tijd logs buiten Workstation Arbeidstijdenwet.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} al is ingediend
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} al is ingediend
 ,Items To Be Requested,Aan te vragen artikelen
 DocType: Purchase Order,Get Last Purchase Rate,Get Laatst Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Facturering tarief gebaseerd op Activity Type (per uur)
@@ -3822,6 +3841,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Bedrijf Email-id niet gevonden, dus mail niet verzonden"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Toepassing van kapitaal (Activa)
 DocType: Production Planning Tool,Filter based on item,Filteren op basis van artikel
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debit Account
 DocType: Fiscal Year,Year Start Date,Jaar Startdatum
 DocType: Attendance,Employee Name,Werknemer Naam
 DocType: Sales Invoice,Rounded Total (Company Currency),Afgerond Totaal (Bedrijfsvaluta)
@@ -3833,14 +3853,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Employee Benefits
 DocType: Sales Invoice,Is POS,Is POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
 DocType: Production Order,Manufactured Qty,Geproduceerd Aantal
 DocType: Purchase Receipt Item,Accepted Quantity,Geaccepteerd Aantal
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} bestaat niet
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factureren aan Klanten
 DocType: DocField,Default,Standaard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnees toegevoegd
 DocType: Maintenance Schedule,Schedule,Plan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definieer begroting voor deze kostenplaats. De begroting actie, zie "Company List""
@@ -3848,7 +3868,7 @@ DocType: Account,Parent Account,Bovenliggende rekening
 DocType: Quality Inspection Reading,Reading 3,Meting 3
 ,Hub,Naaf
 DocType: GL Entry,Voucher Type,Voucher Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
 DocType: Expense Claim,Approved,Aangenomen
 DocType: Pricing Rule,Price,prijs
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
@@ -3857,23 +3877,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Onderwijs
 DocType: Selling Settings,Campaign Naming By,Campagnenaam gegeven door
 DocType: Employee,Current Address Is,Huidige adres is
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Optioneel. Stelt bedrijf prijslijst, indien niet opgegeven."
 DocType: Address,Office,Kantoor
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standaard rapporten
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Journaalposten.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Selecteer eerst Werknemer Record.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rij {0}: Party / Account komt niet overeen met {1} / {2} in {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Aantal beschikbaar bij Van Warehouse
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Selecteer eerst Werknemer Record.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rij {0}: Party / Account komt niet overeen met {1} / {2} in {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Een belastingrekening aanmaken
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Vul Kostenrekening in
 DocType: Account,Stock,Voorraad
 DocType: Employee,Current Address,Huidige adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Als artikel is een variant van een ander item dan beschrijving, afbeelding, prijzen, belastingen etc zal worden ingesteld van de sjabloon, tenzij expliciet vermeld"
 DocType: Serial No,Purchase / Manufacture Details,Inkoop / Productie Details
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch Inventory
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventory
 DocType: Employee,Contract End Date,Contract Einddatum
 DocType: Sales Order,Track this Sales Order against any Project,Volg dit Verkooporder tegen elke Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Haal verkooporders (in afwachting van levering) op basis van de bovengenoemde criteria
 DocType: DocShare,Document Type,Soort document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Van Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Van Leverancier Offerte
 DocType: Deduction Type,Deduction Type,Aftrek Type
 DocType: Attendance,Half Day,Halve dag
 DocType: Pricing Rule,Min Qty,min Aantal
@@ -3884,20 +3906,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Voor Hoeveelheid (Geproduceerd Aantal) is verplicht
 DocType: Stock Entry,Default Target Warehouse,Standaard Doelmagazijn
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totaal (Bedrijfsvaluta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rij {0}: Party Type en Party is uitsluitend van toepassing tegen Debiteuren / Crediteuren rekening
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rij {0}: Party Type en Party is uitsluitend van toepassing tegen Debiteuren / Crediteuren rekening
 DocType: Notification Control,Purchase Receipt Message,Ontvangstbevestiging Bericht
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totaal toegewezen bladeren zijn meer dan periode
 DocType: Production Order,Actual Start Date,Werkelijke Startdatum
 DocType: Sales Order,% of materials delivered against this Sales Order,% van de geleverde materialen voor deze verkooporder
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Opnemen artikelbeweging
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Opnemen artikelbeweging
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nieuwsbrief Lijst Subscriber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Uitsteekmachines
 DocType: Email Account,Service,Service
 DocType: Hub Settings,Hub Settings,Hub Instellingen
 DocType: Project,Gross Margin %,Bruto marge %
 DocType: BOM,With Operations,Met Operations
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Boekingen zijn al gemaakt in valuta {0} voor het bedrijf {1}. Selecteer een vordering of schuld gehouden met valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Boekingen zijn al gemaakt in valuta {0} voor het bedrijf {1}. Selecteer een vordering of schuld gehouden met valuta {0}.
 ,Monthly Salary Register,Maandsalaris Register
-apps/frappe/frappe/website/template.py +123,Next,volgende
+apps/frappe/frappe/website/template.py +140,Next,volgende
 DocType: Warranty Claim,If different than customer address,Indien anders dan klantadres
 DocType: BOM Operation,BOM Operation,Stuklijst Operatie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrolytisch polijsten
@@ -3928,6 +3951,7 @@ DocType: Purchase Invoice,Next Date,Volgende datum
 DocType: Employee Education,Major/Optional Subjects,Major / keuzevakken
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Voer aub Belastingen en Toeslagen in
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Machining
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier kunt u onderhouden familie gegevens zoals naam en beroep van de ouder, echtgenoot en kinderen"
 DocType: Hub Settings,Seller Name,Verkoper Naam
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Belastingen en Toeslagen afgetrokken (Bedrijfsvaluta)
@@ -3954,29 +3978,29 @@ DocType: Purchase Order,To Receive and Bill,Te ontvangen en Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Ontwerper
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Algemene voorwaarden Template
 DocType: Serial No,Delivery Details,Levering Details
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Maak automatisch Materiaal aanvragen als de hoeveelheid lager niveau
 ,Item-wise Purchase Register,Artikelgebaseerde Inkoop Register
 DocType: Batch,Expiry Date,Vervaldatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Om bestelniveau stellen, moet onderdeel van een aankoop Item of Manufacturing Item zijn"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Om bestelniveau stellen, moet onderdeel van een aankoop Item of Manufacturing Item zijn"
 ,Supplier Addresses and Contacts,Leverancier Adressen en Contacten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Selecteer eerst een Categorie
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Project stam.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Vertoon geen symbool zoals $, enz. naast valuta."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halve Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halve Dag)
 DocType: Supplier,Credit Days,Credit Dagen
 DocType: Leave Type,Is Carry Forward,Is Forward Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Artikelen ophalen van Stuklijst
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Artikelen ophalen van Stuklijst
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Dagen
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rij {0}: Party Type en Party is vereist voor Debiteuren / Crediteuren rekening {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rij {0}: Party Type en Party is vereist voor Debiteuren / Crediteuren rekening {1}
 DocType: Dropbox Backup,Send Notifications To,Verzend Notificaties naar
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Date
 DocType: Employee,Reason for Leaving,Reden voor vertrek
 DocType: Expense Claim Detail,Sanctioned Amount,Gesanctioneerde Bedrag
 DocType: GL Entry,Is Opening,Opent
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Rekening {0} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Rekening {0} bestaat niet
 DocType: Account,Cash,Kas
 DocType: Employee,Short biography for website and other publications.,Korte biografie voor website en andere publicaties.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Maak salarisstructuur voor werknemer {0}
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 0ea55e5063..30a5bf41fd 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Lønn Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Velg Månedlig Distribution, hvis du ønsker å spore basert på sesongvariasjoner."
 DocType: Employee,Divorced,Skilt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Advarsel: Samme element er angitt flere ganger.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advarsel: Samme element er angitt flere ganger.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Elementer allerede synkronisert
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillat Element som skal legges flere ganger i en transaksjon
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material Besøk {0} før den avbryter denne garantikrav
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Press pluss sintring
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for Prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil bli beregnet i transaksjonen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Fra Material Request
+DocType: Purchase Order,Customer Contact,Kundekontakt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} treet
 DocType: Job Applicant,Job Applicant,Jobbsøker
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ingen flere resultater.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Kundenavn
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle eksportrelaterte felt som valuta, valutakurs, eksport totalt, eksport grand total etc er tilgjengelig i følgeseddel, POS, sitat, salgsfaktura, Salgsordre etc."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoder (eller grupper) mot hvilke regnskapspostene er laget og balanserer opprettholdes.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre enn null ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre enn null ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minutter
 DocType: Leave Type,Leave Type Name,La Type Navn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serien er oppdatert
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Flere varepriser.
 DocType: SMS Center,All Supplier Contact,All Leverandør Kontakt
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Sluttdato kan ikke være mindre enn Tiltredelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Egentlig ønsker å Døves produksjonsordre:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris må være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,New La Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New La Application
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For å opprettholde kunde kloke elementet koden og gjøre dem søkbare basert på deres bruk kode dette alternativet
 DocType: Mode of Payment Account,Mode of Payment Account,Modus for betaling konto
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis Varianter
 DocType: Sales Invoice Item,Quantity,Antall
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (gjeld)
 DocType: Employee Education,Year of Passing,Year of Passing
-sites/assets/js/erpnext.min.js +27,In Stock,På Lager
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Kan bare gjøre betaling mot fakturert Salgsordre
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På Lager
 DocType: Designation,Designation,Betegnelse
 DocType: Production Plan Item,Production Plan Item,Produksjonsplan Sak
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruker {0} er allerede tildelt Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Gjør nye POS Profile
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Helsevesen
 DocType: Purchase Invoice,Monthly,Månedlig
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faktura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Forsinket betaling (dager)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodisitet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-Post-Adresse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Forsvars
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Nei
-sites/assets/js/erpnext.min.js +55,Please select Price List,Vennligst velg Prisliste
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vennligst velg Prisliste
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Trearbeid
 DocType: Production Order Operation,Work In Progress,Arbeid På Går
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-utskrift
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åpning for en jobb.
 DocType: Item Attribute,Increment,Tilvekst
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Velg Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Annonsering
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
 DocType: Payment Reconciliation,Reconcile,Forsone
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Dagligvare
 DocType: Quality Inspection Reading,Reading 1,Lesing 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Gjør Bank Entry
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Gjør Bank Entry
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensjonsfondene
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse er obligatorisk hvis kontotype er Warehouse
 DocType: SMS Center,All Sales Person,All Sales Person
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Skriv Av kostnadssted
 DocType: Warehouse,Warehouse Detail,Warehouse Detalj
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Skatt Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Du er ikke autorisert til å legge til eller oppdatere bloggen før {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Du er ikke autorisert til å legge til eller oppdatere bloggen før {0}
 DocType: Item,Item Image (if not slideshow),Sak Image (hvis ikke show)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Customer eksisterer med samme navn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timepris / 60) * Faktisk Operation Tid
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Gjest
 DocType: Quality Inspection,Get Specification Details,Få Spesifikasjon Detaljer
 DocType: Lead,Interested,Interessert
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åpning
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Åpning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra varegruppe
 DocType: Journal Entry,Opening Entry,Åpning Entry
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Produkt Forespørsel
 DocType: Standard Reply,Owner,Eier
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Skriv inn et selskap først
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Vennligst velg selskapet først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vennligst velg selskapet først
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target På
 DocType: BOM,Total Cost,Totalkostnad
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Konsum
 DocType: Upload Attendance,Import Log,Import Logg
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
+DocType: Sales Invoice Item,Delivered By Supplier,Levert av Leverandør
 DocType: SMS Center,All Contact,All kontakt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årslønn
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukke regnskapsår
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Contra Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logger
 DocType: Journal Entry Account,Credit in Company Currency,Kreditt i selskapet Valuta
 DocType: Delivery Note,Installation Status,Installasjon Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akseptert + Avvist Antall må være lik mottatt kvantum for Element {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akseptert + Avvist Antall må være lik mottatt kvantum for Element {0}
 DocType: Item,Supply Raw Materials for Purchase,Leverer råvare til Purchase
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Elementet {0} må være et kjøp varen
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Last ned mal, fyll riktige data og fest den endrede filen. Alle datoer og ansatt kombinasjon i den valgte perioden vil komme i malen, med eksisterende møteprotokoller"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Element {0} er ikke aktiv eller slutten av livet er nådd
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Element {0} er ikke aktiv eller slutten av livet er nådd
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil bli oppdatert etter Sales Faktura sendes inn.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Innstillinger for HR Module
 DocType: SMS Center,SMS Center,SMS-senter
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rette
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Skriv inn url parameter fo
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regler for bruk av prising og rabatt.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Denne gangen Logg konflikter med {0} for {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste må være aktuelt for å kjøpe eller selge
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Installasjonsdato kan ikke være før leveringsdato for Element {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installasjonsdato kan ikke være før leveringsdato for Element {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt på Prisliste Rate (%)
-sites/assets/js/form.min.js +279,Start,Start
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Fornavn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Oppsettet er fullført. Forfriskende.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-mold casting
 DocType: Offer Letter,Select Terms and Conditions,Velg Vilkår
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot Salg Faktura Element
 ,Production Orders in Progress,Produksjonsordrer i Progress
 DocType: Lead,Address & Contact,Adresse og kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,Legg ubrukte blader fra tidligere bevilgninger
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
 DocType: Newsletter List,Total Subscribers,Totalt Abonnenter
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Navn
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Venter Antall
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Oppretter lønn slip for ovennevnte kriterier.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Be for kjøp.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double bolig
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Later per år
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vennligst sett Naming Series for {0} via Oppsett> Innstillinger> Naming Series
 DocType: Time Log,Will be updated when batched.,Vil bli oppdatert når dosert.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rad {0}: Vennligst sjekk 'Er Advance "mot Account {1} hvis dette er et forskudd oppføring.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rad {0}: Vennligst sjekk 'Er Advance "mot Account {1} hvis dette er et forskudd oppføring.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} ikke tilhører selskapet {1}
 DocType: Bulk Email,Message,Beskjed
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Tilgang Key
 DocType: Payment Tool,Reference No,Referansenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,La Blokkert
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
 DocType: Stock Entry,Sales Invoice No,Salg Faktura Nei
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Minimum Antall
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Item,Publish in Hub,Publisere i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Materialet Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
 DocType: Item,Purchase Details,Kjøps Detaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} ble ikke funnet i 'Råvare Leveres' bord i innkjøpsordre {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Varsling kontroll
 DocType: Lead,Suggestions,Forslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-messig budsjetter på dette territoriet. Du kan også inkludere sesongvariasjoner ved å sette Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Skriv inn forelder kontogruppe for lageret {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mot {0} {1} kan ikke være større enn utestående beløp {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mot {0} {1} kan ikke være større enn utestående beløp {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generere Schedule
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New Stock målenheter
 DocType: Period Closing Voucher,Closing Account Head,Lukke konto Leder
 DocType: Employee,External Work History,Ekstern Work History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Rundskriv Reference Error
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Har du virkelig ønsker å slutte
 DocType: Communication,Closed,Stengt
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I Words (eksport) vil være synlig når du lagrer følgeseddel.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Er du sikker på at du vil stoppe
 DocType: Lead,Industry,Industry
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Nyhetsbrev
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Levering Note
 DocType: Dropbox Backup,Allow Dropbox Access,Tillat Dropbox Tilgang
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Sette opp skatter
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Entry har blitt endret etter at du trakk den. Kan trekke det igjen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Oppsummering for denne uken og ventende aktiviteter
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Velg måned og år
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hastigheten som Kunden Valuta omdannes til kundens basisvaluta
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Tilgjengelig i BOM, følgeseddel, fakturaen, produksjonsordre, innkjøpsordre, kvitteringen Salg Faktura, Salgsordre, Stock Entry, Timeregistrering"
 DocType: Item Tax,Tax Rate,Skattesats
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Velg element
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Velg element
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Sak: {0} klarte batch-messig, kan ikke forenes bruker \ Stock Forsoning, i stedet bruke Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No må være samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-konsernet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvitteringen må sendes
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Nåværende Stock målenhet
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (mye) av et element.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadato
 DocType: GL Entry,Debit Amount,Debet Beløp
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Det kan bare være en konto per Company i {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Det kan bare være en konto per Company i {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din epostadresse
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Vennligst se vedlegg
 DocType: Purchase Order,% Received,% Mottatt
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Bruksanvisning
 DocType: Quality Inspection,Inspected By,Inspisert av
 DocType: Maintenance Visit,Maintenance Type,Vedlikehold Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serial No {0} tilhører ikke følgeseddel {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serial No {0} tilhører ikke følgeseddel {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Sak Quality Inspection Parameter
 DocType: Leave Application,Leave Approver Name,La Godkjenner Name
 ,Schedule Date,Schedule Date
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Kjøp Register
 DocType: Landed Cost Item,Applicable Charges,Gjeldende avgifter
 DocType: Workstation,Consumable Cost,Forbrukskostnads
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner '
 DocType: Purchase Receipt,Vehicle Date,Vehicle Dato
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medisinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Grunnen for å tape
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% Installert
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Skriv inn firmanavn først
 DocType: BOM,Item Desription,Sak Desription
 DocType: Purchase Invoice,Supplier Name,Leverandør Name
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Les ERPNext Manual
 DocType: Account,Is Group,Is Gruppe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Sett Serial Nos basert på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sjekk Leverandør fakturanummer Unikhet
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Master mana
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale innstillinger for alle produksjonsprosesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskap Frozen Opp
 DocType: SMS Log,Sent On,Sendte På
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday mester.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell molding
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Fakturaadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Skriv inn Element Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Skriv inn Element Code.
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis det er merket, vil skattebeløpet betraktes som allerede er inkludert i Print Rate / Print Beløp"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Total Antall
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between O
 DocType: Customer,Buyer of Goods and Services.,Kjøper av varer og tjenester.
 DocType: Journal Entry,Accounts Payable,Leverandørgjeld
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Legg Abonnenter
-sites/assets/js/erpnext.min.js +5,""" does not exists","Ikke eksisterer
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","Ikke eksisterer
 DocType: Pricing Rule,Valid Upto,Gyldig Opp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Inntekt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere basert på konto, hvis gruppert etter konto"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrative Officer
 DocType: Payment Tool,Received Or Paid,Mottatt eller betalt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Vennligst velg selskapet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vennligst velg selskapet
 DocType: Stock Entry,Difference Account,Forskjellen konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke oppgaven som sin avhengige oppgave {0} er ikke lukket.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
 DocType: Production Order,Additional Operating Cost,Ekstra driftskostnader
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetikk
 DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
 DocType: Communication,Subject,Emne
 DocType: Shipping Rule,Net Weight,Netto Vekt
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Ingen garanti Utløpsserie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Har du virkelig ønsker å stoppe dette Material Request?
 DocType: Sales Order,To Deliver,Å Levere
 DocType: Purchase Invoice Item,Item,Sak
 DocType: Journal Entry,Difference (Dr - Cr),Forskjellen (Dr - Cr)
 DocType: Account,Profit and Loss,Gevinst og tap
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Administrerende Underleverandører
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Administrerende Underleverandører
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New målenheter må ikke være av typen heltall
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og ligaen
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Hastigheten som Prisliste valuta er konvertert til selskapets hovedvaluta
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Legg til / Rediger skatte
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør Faktura Nei
 DocType: Territory,For reference,For referanse
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Serial No {0}, slik det brukes i aksjetransaksjoner"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Lukking (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Lukking (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperioden (dager)
 DocType: Installation Note Item,Installation Note Item,Installasjon Merk Element
 ,Pending Qty,Venter Stk
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Fakturering og levering Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gjenta kunder
 DocType: Leave Control Panel,Allocate,Bevilge
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Velg salgsordrer som du ønsker å opprette produksjonsordrer.
+DocType: Item,Delivered by Supplier (Drop Ship),Levert av Leverandør (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Lønn komponenter.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database med potensielle kunder.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,En logisk Warehouse mot som lager oppføringer er gjort.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
 DocType: Event,Wednesday,Onsdag
 DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produksjonsordre er obligatorisk
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Mottaker Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Based On" og "Grupper etter" ikke kan være det samme
 DocType: Sales Person,Sales Person Targets,Sales Person Targets
-sites/assets/js/form.min.js +271,To,Til
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Skriv inn e-postadresse
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Til
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Skriv inn e-postadresse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,End rør forming
 DocType: Production Order Operation,In minutes,I løpet av minutter
 DocType: Issue,Resolution Date,Oppløsning Dato
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,Prosjekter User
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrukes
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ble ikke funnet i Fakturadetaljer tabellen
 DocType: Company,Round Off Cost Center,Rund av kostnadssted
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vedlikehold Besøk {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vedlikehold Besøk {0} må avbestilles før den avbryter denne salgsordre
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åpning (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Oppslaget tidsstempel må være etter {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Innstillinger
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Cost skatter og avgifter
 DocType: Production Order Operation,Actual Start Time,Faktisk Starttid
 DocType: BOM Operation,Operation Time,Operation Tid
-sites/assets/js/list.min.js +5,More,Mer
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mer
 DocType: Pricing Rule,Sales Manager,Salgssjef
-sites/assets/js/desk.min.js +7673,Rename,Gi nytt navn
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Gi nytt navn
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bøye
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillat User
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Rett klipping
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Å spore element i salgs- og kjøpsdokumenter basert på deres serie nos. Dette er kan også brukes til å spore detaljer om produktet garanti.
 DocType: Purchase Receipt Item Supplied,Current Stock,Nåværende Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Avvist Warehouse er obligatorisk mot regected element
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Avvist Warehouse er obligatorisk mot regected element
 DocType: Account,Expenses Included In Valuation,Kostnader som inngår i verdivurderings
 DocType: Employee,Provide email id registered in company,Gi e-id registrert i selskap
 DocType: Hub Settings,Seller City,Selger by
 DocType: Email Digest,Next email will be sent on:,Neste post vil bli sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilby Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Elementet har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} ikke funnet
 DocType: Bin,Stock Value,Stock Verdi
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tre Type
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Velkommen
 DocType: Journal Entry,Credit Card Entry,Kredittkort Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Subject
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Mottatte varer fra leverandører.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mottatte varer fra leverandører.
 DocType: Communication,Open,Åpen
 DocType: Lead,Campaign Name,Kampanjenavn
 ,Reserved,Reservert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Ønsker du virkelig å Døves
 DocType: Purchase Order,Supply Raw Materials,Leverer råvare
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datoen da neste faktura vil bli generert. Det genereres på send.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omløpsmidler
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Kundens innkjøpsordre Nei
 DocType: Employee,Cell Number,Cell Number
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mistet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i "Against Journal Entry-kolonnen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i "Against Journal Entry-kolonnen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Opportunity Fra
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedslønn uttalelse.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksjonert Beløpet kan ikke være større enn krav Beløp i Rad {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standard varekostnader konto
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Prisliste ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebakgrunn
 DocType: Process Payroll,Send Email,Send E-Post
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen tillatelse
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Elementer med høyere weightage vil bli vist høyere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstemming Detalj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mine Fakturaer
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Ingen ansatte funnet
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen ansatte funnet
 DocType: Purchase Order,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Velg BOM å starte
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Last opp
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send Nå
 ,Support Analytics,Støtte Analytics
 DocType: Item,Website Warehouse,Nettsted Warehouse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Har du virkelig ønsker å stoppe produksjonen rekkefølge:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dagen i måneden som auto faktura vil bli generert for eksempel 05, 28 osv"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score må være mindre enn eller lik 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form poster
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Støt
 DocType: Features Setup,"To enable ""Point of Sale"" features",For å aktivere "Point of Sale" funksjoner
 DocType: Bin,Moving Average Rate,Moving Gjennomsnittlig pris
 DocType: Production Planning Tool,Select Items,Velg Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} mot Bill {1} ​​datert {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mot Bill {1} ​​datert {2}
 DocType: Comment,Reference Name,Referanse Name
 DocType: Maintenance Visit,Completion Status,Completion Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Tillat løpet levering eller mottak opp denne prosent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Forventet Leveringsdato kan ikke være før Salgsordre Dato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Forventet Leveringsdato kan ikke være før Salgsordre Dato
 DocType: Upload Attendance,Import Attendance,Import Oppmøte
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Aktivitetsloggen
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Skriv melding automatisk ved innlevering av transaksjoner.
 DocType: Production Order,Item To Manufacture,Element for å produsere
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent mold casting
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Bestilling til betaling
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status er {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Bestilling til betaling
 DocType: Sales Order Item,Projected Qty,Anslått Antall
 DocType: Sales Invoice,Payment Due Date,Betalingsfrist
 DocType: Newsletter,Newsletter Manager,Nyhetsbrev manager
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,Etterspør Numbers
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Medarbeidersamtaler.
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Prosjektet Verdi
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Utsalgssted
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Kan ikke bære frem {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Utsalgssted
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan ikke bære frem {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo allerede i Credit, har du ikke lov til å sette "Balance må være 'som' debet '"
 DocType: Account,Balance must be,Balansen må være
 DocType: Hub Settings,Publish Pricing,Publiser Priser
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Kvitteringen
 ,Received Items To Be Billed,Mottatte elementer å bli fakturert
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sandblåsing
-sites/assets/js/desk.min.js +3938,Ms,Ms
+DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale for sub-assemblies
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,Område
 DocType: Supplier,Default Payable Accounts,Standard Leverandørgjeld
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
 DocType: Features Setup,Item Barcode,Sak Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Sak Varianter {0} oppdatert
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fakturaen Advance
 DocType: Address,Shop,Butikk
 DocType: Hub Settings,Sync Now,Synkroniser nå
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Rad {0}: Credit oppføring kan ikke være knyttet til en {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Rad {0}: Credit oppføring kan ikke være knyttet til en {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / minibank konto vil automatisk bli oppdatert i POS faktura når denne modusen er valgt.
 DocType: Employee,Permanent Address Is,Permanent Adresse Er
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasjonen gjennomført for hvor mange ferdigvarer?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,The Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krysset for Element {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krysset for Element {1}.
 DocType: Employee,Exit Interview Details,Exit Intervju Detaljer
 DocType: Item,Is Purchase Item,Er Purchase Element
 DocType: Journal Entry Account,Purchase Invoice,Fakturaen
 DocType: Stock Ledger Entry,Voucher Detail No,Kupong Detail Ingen
 DocType: Stock Entry,Total Outgoing Value,Total Utgående verdi
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Åpningsdato og sluttdato skal være innenfor samme regnskapsår
 DocType: Lead,Request for Information,Spør etter informasjon
 DocType: Payment Tool,Paid,Betalt
 DocType: Salary Slip,Total in words,Totalt i ord
 DocType: Material Request Item,Lead Time Date,Lead Tid Dato
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Vennligst oppgi serienummer for varen {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For 'Produkt Bundle' elementer, Warehouse, serienummer og Batch Ingen vil bli vurdert fra "Pakkeliste" bord. Hvis Warehouse og Batch Ingen er lik for alle pakking elementer for noen "Product Bundle 'elementet, kan disse verdiene legges inn i hoved Sak bordet, vil verdiene bli kopiert til" Pakkeliste "bord."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Forsendelser til kunder.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Forsendelser til kunder.
 DocType: Purchase Invoice Item,Purchase Order Item,Innkjøpsordre Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte inntekt
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Still Betalingsbeløp = utestående beløp
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,Adresselinje 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Selskapsnavn
 DocType: SMS Center,Total Message(s),Total melding (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vis en liste over alle hjelpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Velg kontoen leder av banken der sjekken ble avsatt.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillater brukeren å redigere Prisliste Rate i transaksjoner
 DocType: Pricing Rule,Max Qty,Max Antall
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betaling mot Salg / innkjøpsordre skal alltid merkes som forskudd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betaling mot Salg / innkjøpsordre skal alltid merkes som forskudd
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kjemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Velg Lønn år og måned
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den aktuelle gruppen (vanligvis Application of Funds> Omløpsmidler> bankkontoer og opprette en ny konto (ved å klikke på Legg Child) av typen "Bank"
 DocType: Workstation,Electricity Cost,Elektrisitet Cost
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvit
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalt forskudd
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Fest Your Picture
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Gjøre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Gjøre
 DocType: Journal Entry,Total Amount in Words,Totalbeløp i Words
 DocType: Workflow State,Stop,Stoppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Det var en feil. En mulig årsak kan være at du ikke har lagret skjemaet. Ta kontakt support@erpnext.com hvis problemet vedvarer.
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,Pakking Slip Element
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
 DocType: Delivery Note,Delivery To,Levering Å
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attributt tabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Filing
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Vil bli oppdate
 DocType: Project,Internal,Intern
 DocType: Task,Urgent,Haster
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Vennligst oppgi en gyldig Row ID for rad {0} i tabellen {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå til skrivebordet og begynne å bruke ERPNext
 DocType: Item,Manufacturer,Produsent
 DocType: Landed Cost Item,Purchase Receipt Item,Kvitteringen Element
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reservert Industribygg i salgsordre / ferdigvarelageret
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Selge Beløp
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Tid Logger
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er den Expense Godkjenner denne posten. Oppdater "Status" og Lagre
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er den Expense Godkjenner denne posten. Oppdater "Status" og Lagre
 DocType: Serial No,Creation Document No,Creation Dokument nr
 DocType: Issue,Issue,Problem
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for varen Varianter. f.eks størrelse, farge etc."
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Salgsordre {0} er {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Making Stock Entries
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Making Stock Entries
 DocType: Packing Slip,Net Weight UOM,Vekt målenheter
 DocType: Item,Default Supplier,Standard Leverandør
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produksjon Fradrag Prosent
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Få Ukentlig Off Datoer
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Sluttdato kan ikke være mindre enn startdato
 DocType: Sales Person,Select company name first.,Velg firmanavn først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sitater mottatt fra leverandører.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Til {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,oppdatert via Tid Logger
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firmaregistreringsnumre som referanse. Skatte tall osv
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Handlevogn Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Produksjonsordre {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Produksjonsordre {0} må avbestilles før den avbryter denne salgsordre
 ,Ordered Items To Be Billed,Bestilte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Fra Range må være mindre enn til kolleksjonen
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Velg Tid Logger og Send for å opprette en ny salgsfaktura.
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skatt og
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Gjeld
 DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
 ,Purchase Order Items To Be Billed,Purchase Order Elementer som skal faktureres
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Fakturaen Element
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Avstemte Betalingso
 DocType: Global Defaults,Current Fiscal Year,Værende regnskapsår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Avrundet Total
 DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Innlegg' kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Innlegg' kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rad {0} med samme {1}
 ,Trial Balance,Balanse Trial
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Sette opp ansatte
-sites/assets/js/erpnext.min.js +5,"Grid """,Grid "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Sette opp ansatte
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vennligst velg først prefiks
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbeidet Som Er Gjort
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,Sendte
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
 DocType: Communication,Delivery Status,Levering Status
 DocType: Production Order,Manufacture against Sales Order,Produserer mot kundeordre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resten Av Verden
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten Av Verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} kan ikke ha Batch
 ,Budget Variance Report,Budsjett Avvik Rapporter
 DocType: Salary Slip,Gross Pay,Brutto Lønn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Utbytte betalt
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Regnskap Ledger
 DocType: Stock Reconciliation,Difference Amount,Forskjellen Beløp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Opptjent egenkapital
 DocType: BOM Item,Item Description,Element Beskrivelse
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,Opportunity Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åpning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Ansatt La Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
 DocType: Address,Address Type,Adressetype
 DocType: Purchase Receipt,Rejected Warehouse,Avvist Warehouse
 DocType: GL Entry,Against Voucher,Mot Voucher
 DocType: Item,Default Buying Cost Center,Standard Kjøpe kostnadssted
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","For å få det beste ut av ERPNext, anbefaler vi at du tar litt tid og se på disse hjelpevideoer."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Elementet {0} må være Sales Element
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,til
 DocType: Item,Lead Time in days,Lead Tid i dager
 ,Accounts Payable Summary,Leverandørgjeld Sammendrag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Ikke autorisert til å redigere fryst kontoen {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ikke autorisert til å redigere fryst kontoen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få utestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Utstedelsessted
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakts
 DocType: Report,Disabled,Funksjonshemmede
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte kostnader
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rad {0}: Antall er obligatorisk
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landbruk
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,Modus for betaling
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rot varegruppe og kan ikke redigeres.
 DocType: Journal Entry Account,Purchase Order,Bestilling
 DocType: Warehouse,Warehouse Contact Info,Warehouse Kontaktinfo
-sites/assets/js/form.min.js +190,Name is required,Navn er påkrevd
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Navn er påkrevd
 DocType: Purchase Invoice,Recurring Type,Gjentakende Type
 DocType: Address,City/Town,Sted / by
 DocType: Email Digest,Annual Income,Årsinntekt
 DocType: Serial No,Serial No Details,Serie ingen opplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Sak Skattesats
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Equipments
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet Leveringsdato er mindre enn planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,For Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,For Leverandør
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Stille Kontotype hjelper i å velge denne kontoen i transaksjoner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Selskap Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Utgående
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Det kan bare være én Shipping Rule Forhold med 0 eller blank verdi for "å verd"
 DocType: Authorization Rule,Transaction,Transaksjons
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Merk: Denne Cost Center er en gruppe. Kan ikke gjøre regnskapspostene mot grupper.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Verktøy
+apps/frappe/frappe/config/desk.py +7,Tools,Verktøy
 DocType: Item,Website Item Groups,Website varegrupper
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produksjon varenummer er obligatorisk for aksje oppføring formål produksjon
 DocType: Purchase Invoice,Total (Company Currency),Total (Company Valuta)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,Arbeidsstasjon Name
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-post Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-sites/assets/js/desk.min.js +7652,Comments,Kommentarer
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentarer
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er nummeret på den siste laget transaksjonen med dette prefikset
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Verdsettelse Rate nødvendig for Element {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vennligst ve
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege La
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du må aktivere Handlevogn
-sites/assets/js/form.min.js +212,No Data,Ingen Data
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ingen Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Appraisal Mal Goal
 DocType: Salary Slip,Earning,Tjene
 DocType: Payment Tool,Party Account Currency,Partiet konto Valuta
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,Partiet konto Valuta
 DocType: Purchase Taxes and Charges,Add or Deduct,Legge til eller trekke fra
 DocType: Company,If Yearly Budget Exceeded (for expense account),Hvis Årlig budsjett Skredet (for regning)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende vilkår funnet mellom:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal Entry {0} er allerede justert mot en annen kupong
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal Entry {0} er allerede justert mot en annen kupong
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Total ordreverdi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Aldring Range 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Ingen av besøk
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhetsbrev til kontaktene, fører."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta ifølge kursen konto må være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summen av poeng for alle mål bør være 100. Det er {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operasjoner kan ikke stå tomt.
 ,Delivered Items To Be Billed,Leverte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke endres for Serial No.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status er oppdatert til {0}
 DocType: DocField,Description,Beskrivelse
 DocType: Authorization Rule,Average Discount,Gjennomsnittlig Rabatt
 DocType: Letter Head,Is Default,Er Standard
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Sak Skattebeløp
 DocType: Item,Maintain Stock,Oppretthold Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
 DocType: Leave Control Panel,Leave blank if considered for all designations,La stå tom hvis vurderes for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type 'Actual' i rad {0} kan ikke inkluderes i Element Ranger
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type 'Actual' i rad {0} kan ikke inkluderes i Element Ranger
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra Datetime
 DocType: Email Digest,For Company,For selskapet
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,Leveringsadresse Navn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Konto
 DocType: Material Request,Terms and Conditions Content,Betingelser innhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Element {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Ikke planlagt
 DocType: Employee,Owned,Eies
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Avhenger La Uten Pay
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Status
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Medarbeider Innstillinger
 ,Batch-Wise Balance History,Batch-Wise Balance Historie
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Gjøremålsliste
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Gjøremålsliste
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Antall er ikke tillatt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontor Leie
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislyktes!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Ingen adresse er lagt til ennå.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse er lagt til ennå.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeidsstasjon Working Hour
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik JV mengden {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",For å aktivere "Point of Sale" view
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Betaling kan ikke gjøres for tom handlevogn
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke gjøres for tom handlevogn
 DocType: Item,Sales Details,Salgs Detaljer
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Låsing
 DocType: Opportunity,With Items,Med Items
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",Datoen da neste faktura vil bli generert. Det genereres på send.
 DocType: Item Attribute,Item Attribute,Sak Egenskap
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regjeringen
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Element Varianter
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Element Varianter
 DocType: Company,Services,Tjenester
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Parent kostnadssted
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Regnskapsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Enker
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Spedisjons- og Kostnader
 DocType: Material Request Item,Sales Order No,Salgsordre Nei
 DocType: Item Group,Item Group Name,Sak Gruppenavn
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Tatt
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tatt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materialer for produksjon
 DocType: Pricing Rule,For Price List,For Prisliste
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,Rutetider
 DocType: Purchase Invoice Item,Net Amount,Nettobeløp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nei
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ekstra rabatt Beløp (Selskap Valuta)
-DocType: Period Closing Voucher,CoA Help,CoA Hjelp
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Feil: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Feil: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opprett ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedlikehold Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde> Kunde Group> Territory
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjelp
 DocType: Event,Tuesday,Tirsdag
 DocType: Leave Block List,Block Holidays on important days.,Block Ferie på viktige dager.
 ,Accounts Receivable Summary,Kundefordringer Sammendrag
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Later for typen {0} allerede bevilget for Employee {1} for perioden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Vennligst angi bruker-ID-feltet i en Employee rekord å sette Employee Rolle
 DocType: UOM,UOM Name,Målenheter Name
 DocType: Top Bar Item,Target,Target
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskap Entry for {0} kan bare gjøres i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prising Rule
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Innskjæring
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materialet Request til innkjøpsordre
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materialet Request til innkjøpsordre
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Element {1} ikke eksisterer i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkontoer
 ,Bank Reconciliation Statement,Bankavstemming Statement
 DocType: Address,Lead Name,Lead Name
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Åpning Stock Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Åpning Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må vises bare en gang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til å overfør mer {0} enn {1} mot innkjøpsordre {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Etterlater Avsatt Vellykket for {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Etterlater Avsatt Vellykket for {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingenting å pakke
 DocType: Shipping Rule Condition,From Value,Fra Verdi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Beløp ikke reflektert i bank
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav på bekostning av selskapet.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 DocType: Production Planning Tool,Select Sales Orders,Velg salgsordrer
 ,Material Requests for which Supplier Quotations are not created,Materielle Forespørsler som Leverandør Sitater ikke er opprettet
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Å spore elementer ved hjelp av strekkoden. Du vil være i stand til å legge inn elementer i følgeseddel og salgsfaktura ved å skanne strekkoden på varen.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Merk som Leveres
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Gjør sitat
 DocType: Dependent Task,Dependent Task,Avhengig Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv å planlegge operasjoner for X dager i forveien.
 DocType: HR Settings,Stop Birthday Reminders,Stop bursdagspåminnelser
 DocType: SMS Center,Receiver List,Mottaker List
 DocType: Payment Tool Detail,Payment Amount,Betalings Beløp
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrukes Beløp
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Vis
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lønn Struktur Fradrag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv laser sintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost of Utstedte Items
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Antall må ikke være mer enn {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Innstillinger for online shopping cart som skipsregler, prisliste etc."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturert
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reservert Antall
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reservert Antall
 DocType: Party Account,Party Account,Partiet konto
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Menneskelige Ressurser
 DocType: Lead,Upper Income,Øvre Inntekt
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Handlevogn
 DocType: Employee,Permanent Address,Permanent Adresse
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Elementet {0} må være en service varen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance betalt mot {0} {1} kan ikke være større \ enn Totalsum {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Velg elementet kode
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduser Fradrag for permisjon uten lønn (LWP)
 DocType: Territory,Territory Manager,Distriktssjef
+DocType: Delivery Note Item,To Warehouse (Optional),Til Warehouse (valgfritt)
 DocType: Sales Invoice,Paid Amount (Company Currency),Innbetalt beløp (Company Valuta)
 DocType: Purchase Invoice,Additional Discount,Ekstra rabatt
 DocType: Selling Settings,Selling Settings,Selge Innstillinger
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mining
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe eksisterer med samme navn kan du endre Kundens navn eller endre navn på Kundegruppe
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Vennligst velg {0} først.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vennligst velg {0} først.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,Batch No
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillat flere salgsordrer mot kundens innkjøpsordre
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hoved
 DocType: DocPerm,Delete,Slett
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variant
-sites/assets/js/desk.min.js +7971,New {0},New {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet rekkefølge kan ikke bli kansellert. Døves å avbryte.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet rekkefølge kan ikke bli kansellert. Døves å avbryte.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
 DocType: Employee,Leave Encashed?,Permisjon encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Fra-feltet er obligatorisk
 DocType: Item,Variants,Varianter
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
 DocType: Communication,Received,Mottatt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal Entry {0} har ikke noen enestående {1} oppføring
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal Entry {0} har ikke noen enestående {1} oppføring
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplisere serie Ingen kom inn for Element {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En forutsetning for en Shipping Rule
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke lov til å ha produksjonsordre.
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,Hilsen
 DocType: Communication,Rejected,Avvist
 DocType: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Vil også gjelde for varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Leveres
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Sales Order Item,Actual Qty,Selve Antall
 DocType: Sales Invoice Item,References,Referanser
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,G
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Har Varianter
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klikk på "Gjør Sales Faktura-knappen for å opprette en ny salgsfaktura.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Periode Fra og Periode Til dato obligatoriske for gjentakende% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballering og merking
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navn på Monthly Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Vennligst oppgi Standardvaluta i selskapet Master og Global Defaults
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Tilgang Secret
 DocType: Purchase Invoice,Recurring Invoice,Tilbakevendende Faktura
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Managing Projects
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Leverandør av varer eller tjenester.
 DocType: Budget Detail,Fiscal Year,Regnskapsår
 DocType: Cost Center,Budget,Budsjett
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Selling
 DocType: Employee,Salary Information,Lønn Informasjon
 DocType: Sales Person,Name and Employee ID,Navn og Employee ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
 DocType: Website Item Group,Website Item Group,Website varegruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Skatter og avgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Skriv inn Reference dato
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} oppføringer betalings kan ikke bli filtrert av {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Skriv inn Reference dato
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} oppføringer betalings kan ikke bli filtrert av {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell for element som vil bli vist på nettsiden
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antall
 DocType: Material Request Item,Material Request Item,Materialet Request Element
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke se rad tall større enn eller lik gjeldende rad nummer for denne debiteringstype
 ,Item-wise Purchase History,Element-messig Purchase History
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rød
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vennligst klikk på "Generer Schedule 'for å hente serienummer lagt for Element {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vennligst klikk på "Generer Schedule 'for å hente serienummer lagt for Element {0}
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Åpne produksjonsordrer
 DocType: Installation Note,Installation Time,Installasjon Tid
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Anførsels Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Som produksjonsordre kan gjøres for dette, må det være en lagervare."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Som produksjonsordre kan gjøres for dette, må det være en lagervare."
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbeløp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Bli med
 DocType: Authorization Rule,Above Value,Fremfor Verdi
 ,Pending Amount,Avventer Beløp
 DocType: Purchase Invoice Item,Conversion Factor,Omregningsfaktor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Levert
+DocType: Purchase Order,Delivered,Levert
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Oppsett innkommende server for jobbene e-id. (F.eks jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Vehicle Number
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datoen som tilbakevendende faktura vil bli stoppe
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere Kostnader B
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} må være av typen "Fixed Asset 'som Element {1} er en ressurs Element
 DocType: HR Settings,HR Settings,HR-innstillinger
 apps/frappe/frappe/config/setup.py +130,Printing,Utskrift
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav venter på godkjenning. Bare den Expense Godkjenner kan oppdatere status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav venter på godkjenning. Bare den Expense Godkjenner kan oppdatere status.
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatt Beløp
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dagen (e) der du søker om permisjon er ferie. Du trenger ikke søke om permisjon.
-sites/assets/js/desk.min.js +7805,and,og
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,og
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,Sitat
 DocType: Salary Slip,Total Deduction,Total Fradrag
 DocType: Quotation,Maintenance User,Vedlikehold Bruker
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kostnad Oppdatert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Er du sikker på at du vil Døves
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede returnert
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskapsår ** representerer et regnskapsår. Alle regnskapspostene og andre store transaksjoner spores mot ** regnskapsår **.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold orden på salgskampanjer. Hold styr på Leads, Sitater, Salgsordre etc fra kampanjer for å måle avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkjenner
 ,SO Qty,SO Antall
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkivoppføringer finnes mot lageret {0}, dermed kan du ikke re-tildele eller endre Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkivoppføringer finnes mot lageret {0}, dermed kan du ikke re-tildele eller endre Warehouse"
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Supplier Quotation,Manufacturing Manager,Produksjonssjef
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} er under garanti opptil {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip molding
+DocType: Purchase Order,To be delivered to customer,Som skal leveres til kunde
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tid Logg Status må sendes inn.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} tilhører ikke noen Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Setter Opp
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Fra Valuta
 DocType: DocField,Name,Navn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Salgsordre kreves for Element {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Salgsordre kreves for Element {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Beløp ikke reflektert i system
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Selskap Valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Annet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Sett som Stoppet
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finne en matchende element. Vennligst velg en annen verdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Et produkt eller en tjeneste som er kjøpt, solgt eller holdes på lager."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke velge charge type som 'On Forrige Row beløp "eller" On Forrige Row Totals for første rad
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,Velg DOCTYPE
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Rømming
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Vennligst klikk på "Generer Schedule 'for å få timeplanen
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,New kostnadssted
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,New kostnadssted
 DocType: Bin,Ordered Quantity,Bestilte Antall
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",f.eks "Bygg verktøy for utbyggere"
 DocType: Quality Inspection,In Process,Igang
 DocType: Authorization Rule,Itemwise Discount,Itemwise Rabatt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} mot Salgsordre {1}
+DocType: Purchase Order Item,Reference Document Type,Reference Document Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mot Salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serialisert Lager
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialisert Lager
 DocType: Activity Type,Default Billing Rate,Standard Billing pris
 DocType: Time Log Batch,Total Billing Amount,Total Billing Beløp
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Fordring konto
 ,Stock Balance,Stock Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Salgsordre til betaling
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Salgsordre til betaling
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tid Logger opprettet:
 DocType: Item,Weight UOM,Vekt målenheter
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kreditt til kontoen må være en Betales konto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
 DocType: Production Order Operation,Completed Qty,Fullført Antall
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan bare belastning kontoer knyttes opp mot en annen kreditt oppføring
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Prisliste {0} er deaktivert
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan bare belastning kontoer knyttes opp mot en annen kreditt oppføring
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktivert
 DocType: Manufacturing Settings,Allow Overtime,Tillat Overtid
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Salgsordre {0} er stoppet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienumre som kreves for Element {1}. Du har gitt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nåværende Verdivurdering Rate
 DocType: Item,Customer Item Codes,Kunden element Codes
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Sveising
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock målenheter er nødvendig
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Alle elementene er allerede blitt fakturert
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle elementene er allerede blitt fakturert
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Vennligst oppgi en gyldig "Fra sak nr '
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper
 DocType: Project,External,Ekstern
 DocType: Features Setup,Item Serial Nos,Sak Serial Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brukere og tillatelser
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Adresse og Kontakt
 DocType: SMS Log,Sender Name,Avsender Navn
 DocType: Page,Title,Tittel
-sites/assets/js/list.min.js +104,Customize,Tilpass
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Tilpass
 DocType: POS Profile,[Select],[Velg]
 DocType: SMS Log,Sent To,Sendt til
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Gjør Sales Faktura
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Slutten av livet
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Reise
 DocType: Leave Block List,Allow Users,Gi brukere
+DocType: Purchase Order,Customer Mobile No,Kunden Mobile No
 DocType: Sales Invoice,Recurring,Gjentakende
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat inntekter og kostnader for produkt vertikaler eller divisjoner.
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Oppdater Cost
 DocType: Item Reorder,Item Reorder,Sak Omgjøre
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transfer Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiser drift, driftskostnadene og gi en unik Operation nei til driften."
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brukeren må alltid velge
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,Ansatt
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import E-post fra
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Inviter som User
 DocType: Features Setup,After Sale Installations,Etter kjøp Installasjoner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} er fullt fakturert
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} er fullt fakturert
 DocType: Workstation Working Hour,End Time,Sluttid
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktsvilkår for salg eller kjøp.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupper etter Voucher
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,Masseutsendelse
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Filen til Rename
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Vis Betalinger
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Spesifisert BOM {0} finnes ikke for Element {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vedlikeholdsplan {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vedlikeholdsplan {0} må avbestilles før den avbryter denne salgsordre
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkjent
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,Oppmøte To Date
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Oppsett innkommende server for salg e-id. (F.eks sales@example.com)
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
-sites/assets/js/list.min.js +23,Draft,Draft
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Draft
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,Accepted,Akseptert
 DocType: User,Female,Kvinne
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Shipping Rule Etikett
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Råvare kan ikke være blank.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Ettersom det er eksisterende lagertransaksjoner for dette elementet, \ du ikke kan endre verdiene for «Har Serial No ',' Har Batch No ',' Er Stock Element" og "verdsettelsesmetode '"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hurtig Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
 DocType: Employee,Previous Work Experience,Tidligere arbeidserfaring
 DocType: Stock Entry,For Quantity,For Antall
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Skriv inn Planned Antall for Element {0} på rad {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} ikke er sendt
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Forespørsler om elementer.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} ikke er sendt
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Forespørsler om elementer.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produksjonsordre vil bli opprettet for hvert ferdige godt element.
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold 1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplett Setup
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhetsbrev postli
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Contact,Enter department to which this Contact belongs,Tast avdeling som denne kontakten tilhører
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måleenhet
 DocType: Fiscal Year,Year End Date,År Sluttdato
 DocType: Task Depends On,Task Depends On,Task Avhenger
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontraktssluttdato må være større enn tidspunktet for inntreden
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,En tredjepart distributør / forhandler / kommisjonær / agent / forhandler som selger selskaper produkter for en kommisjon.
 DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Skriv inn statiske webadresseparametere her (F.eks. Avsender = ERPNext, brukernavn = ERPNext, passord = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noen aktiv regnskapsåret. For mer informasjon sjekk {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel nettsiden automatisk generert fra ERPNext
@@ -2021,11 +2032,9 @@ DocType: Note,Note,Notat
 DocType: Purchase Receipt Item,Recd Quantity,Recd Antall
 DocType: Email Account,Email Ids,E-IDer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke produsere mer Element {0} enn Salgsordre kvantitet {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Sett som lukkes
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / minibank konto
 DocType: Tax Rule,Billing City,Fakturering By
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Dette La Søknad venter på godkjenning. Bare de La Godkjenner kan oppdatere status.
 DocType: Global Defaults,Hide Currency Symbol,Skjule Valutasymbol
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","f.eks Bank, Cash, Kredittkort"
 DocType: Journal Entry,Credit Note,Kreditnota
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Stk)
 DocType: Installation Note Item,Installed Qty,Installert antall
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Sendt inn
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Sendt inn
 DocType: Salary Structure,Total Earning,Total Tjene
 DocType: Purchase Receipt,Time at which materials were received,Tidspunktet for når materialene ble mottatt
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine adresser
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisering
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,eller
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Utgifter
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Above
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
 DocType: Buying Settings,Default Buying Price List,Standard Kjøpe Prisliste
 ,Download Backups,Last ned sikkerhetskopier
 DocType: Notification Control,Sales Order Message,Salgsordre Message
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Velg Medarbeidere
 DocType: Bank Reconciliation,To Date,To Date
 DocType: Opportunity,Potential Sales Deal,Potensielle Sales Deal
-sites/assets/js/form.min.js +308,Details,Detaljer
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detaljer
 DocType: Purchase Invoice,Total Taxes and Charges,Totale skatter og avgifter
 DocType: Employee,Emergency Contact,Nødtelefon
 DocType: Item,Quality Parameters,Kvalitetsparametere
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,Mottatt Antall
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Parent Element
 DocType: Account,Account Type,Kontotype
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedlikeholdsplan genereres ikke for alle elementene. Vennligst klikk på "Generer Schedule '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedlikeholdsplan genereres ikke for alle elementene. Vennligst klikk på "Generer Schedule '
 ,To Produce,Å Produsere
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rad {0} i {1}. For å inkludere {2} i Element rate, rader {3} må også inkluderes"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasjon av pakken for levering (for print)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Utflating
 DocType: Account,Income Account,Inntekt konto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Nåværende Antall
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se "Rate Of materialer basert på" i Costing Seksjon
 DocType: Appraisal Goal,Key Responsibility Area,Key Ansvar Område
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Aksje Innstillinger
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrere kunde Gruppe treet.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,New kostnadssted Navn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,New kostnadssted Navn
 DocType: Leave Control Panel,Leave Control Panel,La Kontrollpanel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adressemal funnet. Opprett en ny fra Oppsett> Trykking og merkevarebygging> Adresse Mal.
 DocType: Appraisal,HR User,HR User
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlån (Eiendeler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Skyldnere
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Stor
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen ansatte funnet!
 DocType: C-Form Invoice Detail,Territory,Territorium
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vennligst oppgi ingen av besøk som kreves
+DocType: Purchase Order,Customer Address Display,Kunde Adresse Skjerm
 DocType: Stock Settings,Default Valuation Method,Standard verdsettelsesmetode
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
 DocType: Production Order Operation,Planned Start Time,Planlagt Starttid
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Avsatt
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Lukk Balanse og bok resultatet.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standard Enhet for Element {0} kan ikke endres direkte fordi \ du allerede har gjort noen transaksjon (er) med en annen målenheter. For å endre standardmålenheter, \ bruk 'målenheter Erstatt Utility "verktøy i henhold Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spesifiser Exchange Rate å konvertere en valuta til en annen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Sitat {0} er kansellert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Sitat {0} er kansellert
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totalt utestående beløp
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Ansatt {0} var på permisjon på {1}. Kan ikke merke oppmøte.
 DocType: Sales Partner,Targets,Targets
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"Dette er en rot kundegruppe, og kan ikke redigeres."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Vennligst oppsettet ditt kontoplan før du begynner Regnskaps Entries
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Pricing Rule
-sites/assets/js/list.min.js +24,Cancelled,Avbrutt
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Avbrutt
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i lønn struktur kan ikke være mindre enn Employee Bli Date.
 DocType: Employee Education,Graduate,Utdannet
 DocType: Leave Block List,Block Days,Block Days
 DocType: Journal Entry,Excise Entry,Vesenet Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advarsel: Salgsordre {0} finnes allerede mot kundens innkjøpsordre {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advarsel: Salgsordre {0} finnes allerede mot kundens innkjøpsordre {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,"Stock mottatt, men ikke fakturer
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brutto lønn + etterskudd Beløp + Encashment Beløp - Total Fradrag
 DocType: Monthly Distribution,Distribution Name,Distribusjon Name
 DocType: Features Setup,Sales and Purchase,Salg og Innkjøp
-DocType: Purchase Order Item,Material Request No,Materialet Request Ingen
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
+DocType: Supplier Quotation Item,Material Request No,Materialet Request Ingen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Hastigheten som kundens valuta er konvertert til selskapets hovedvaluta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} har blitt avsluttet abonnementet fra denne listen.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Netto Rate (Selskap Valuta)
-apps/frappe/frappe/templates/base.html +132,Added,Lagt
+apps/frappe/frappe/templates/base.html +134,Added,Lagt
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrer Territory treet.
 DocType: Journal Entry Account,Sales Invoice,Salg Faktura
 DocType: Journal Entry Account,Party Balance,Fest Balance
 DocType: Sales Invoice Item,Time Log Batch,Tid Logg Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Vennligst velg Bruk rabatt på
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vennligst velg Bruk rabatt på
 DocType: Company,Default Receivable Account,Standard fordringer konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Lag Bank Entry for den totale lønn for de ovenfor valgte kriterier
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer for Produksjon
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Få Relevante Entries
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskap Entry for Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Preging
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Element {0} finnes ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Element {0} finnes ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Ytterligere rabatt på
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray forming
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Konto {0} er frosset
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er frosset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / Datterselskap med en egen konto tilhørighet til organisasjonen.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mat, drikke og tobakk"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum lagerbeholdning
 DocType: Stock Entry,Subcontract,Underentrepriser
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Fyll inn {0} først
 DocType: Production Planning Tool,Get Items From Sales Orders,Få elementer fra salgsordrer
 DocType: Production Order Operation,Actual End Time,Faktisk Sluttid
 DocType: Production Planning Tool,Download Materials Required,Last ned Materialer som er nødvendige
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,Planlagt
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vennligst velg Element der "Er Stock Item" er "Nei" og "Er Sales Item" er "Ja", og det er ingen andre Product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Velg Månedlig Distribusjon til ujevnt fordele målene gjennom måneder.
 DocType: Purchase Invoice Item,Valuation Rate,Verdivurdering Rate
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Prisliste Valuta ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Prisliste Valuta ikke valgt
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Sak Rad {0}: Kjøpskvittering {1} finnes ikke i ovenfor 'innkjøps Receipts' bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Prosjekt startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Inntil
 DocType: Rename Tool,Rename Log,Rename Logg
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Bare bladnoder er tillatt i transaksjonen
 DocType: Expense Claim,Expense Approver,Expense Godkjenner
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvitteringen Sak Leveres
-sites/assets/js/erpnext.min.js +48,Pay,Betale
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logger for å opprettholde sms leveringsstatus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Sliping
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Krympe innpakning
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Ventende Aktiviteter
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ventende Aktiviteter
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekreftet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør> Leverandør Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Skriv inn lindrende dato.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Skr
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Avis Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Velg regnskapsår
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Du er La Godkjenner denne posten. Oppdater "Status" og Lagre
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Omgjøre nivå
 DocType: Attendance,Attendance Date,Oppmøte Dato
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønn breakup basert på opptjening og fradrag.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til gruppen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Avskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ugyldig periode
 DocType: Customer,Credit Limit,Kredittgrense
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Velg type transaksjon
 DocType: GL Entry,Voucher No,Kupong Ingen
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Mal a
 DocType: Customer,Address and Contact,Adresse og Kontakt
 DocType: Customer,Last Day of the Next Month,Siste dag av neste måned
 DocType: Employee,Feedback,Tilbakemelding
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Tidsplan
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tidsplan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Slipende jet maskinering
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Website Settings,Website Settings,Nettstedinnstillinger
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,Utgående
 DocType: Material Request,Requested For,Spurt For
 DocType: Quotation Item,Against Doctype,Mot Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette følgeseddel mot ethvert prosjekt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root-kontoen kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-kontoen kan ikke slettes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Arkiv Entries
 ,Is Primary Address,Er Hovedadresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Reference # {0} datert {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} datert {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrer Adresser
 DocType: Pricing Rule,Item Code,Sak Kode
 DocType: Production Planning Tool,Create Production Orders,Opprett produksjonsordrer
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,Bruker Remark
 DocType: Lead,Market Segment,Markedssegment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Ansatt Intern Work History
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Lukking (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Lukking (Dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} ikke på lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skatt mal for å selge transaksjoner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Av utestående beløp
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Sjekk om du trenger automatiske tilbakevendende fakturaer. Etter innsending noen salgsfaktura, vil gjentakende delen være synlig."
 DocType: Account,Accounts Manager,Accounts Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Tid Logg {0} må være "Skrevet"
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Tid Logg {0} må være "Skrevet"
 DocType: Stock Settings,Default Stock UOM,Standard Stock målenheter
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Costing Prisen er basert på aktivitetstype (per time)
 DocType: Production Planning Tool,Create Material Requests,Opprett Material Forespørsler
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Bankavstemming
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Få oppdateringer
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Legg et par eksempler på poster
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,La Ledelse
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,La Ledelse
 DocType: Event,Groups,Grupper
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupper etter Account
 DocType: Sales Order,Fully Delivered,Fullt Leveres
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Salgs Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budsjett for kontoen {1} mot kostnadssted {2} vil overgå ved {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Videresendte Løv
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Fra dato" må være etter 'To Date'
 ,Stock Projected Qty,Lager Antall projiserte
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens innkjøpsordre
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Verdi eller Stk
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Elementkode er obligatorisk fordi varen ikke blir automatisk nummerert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Sitat {0} ikke av typen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Elementkode er obligatorisk fordi varen ikke blir automatisk nummerert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Sitat {0} ikke av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedlikeholdsplan Sak
 DocType: Sales Order,%  Delivered,% Leveres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kassekreditt konto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Gjør Lønn Slip
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Døves
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Bla BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikret lån
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Produkter
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,Appraisal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum avstøpning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tegning
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gjentas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},La godkjenner må være en av {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},La godkjenner må være en av {0}
 DocType: Hub Settings,Seller Email,Selger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total anskaffelseskost (via fakturaen)
 DocType: Workstation Working Hour,Start Time,Starttid
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløp (Company Valuta)
 DocType: BOM Operation,Hour Rate,Time Rate
 DocType: Stock Settings,Item Naming By,Sak Naming Av
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Fra sitat
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},En annen periode Closing Entry {0} har blitt gjort etter {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fra sitat
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En annen periode Closing Entry {0} har blitt gjort etter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materialet Overført for Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} ikke eksisterer
 DocType: Purchase Receipt Item,Purchase Order Item No,Innkjøpsordre Varenr
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,Inspeksjon påkrevd
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt Fakturert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontanter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Levering lager nødvendig for lagervare {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Levering lager nødvendig for lagervare {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Totalvekten av pakken. Vanligvis nettovekt + emballasjematerialet vekt. (For utskrift)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brukere med denne rollen har lov til å sette frosne kontoer og lage / endre regnskapspostene mot frosne kontoer
 DocType: Serial No,Is Cancelled,Er Avlyst
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Mine Forsendelser
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mine Forsendelser
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv om det er flere Prising regler med høyest prioritet, deretter følgende interne prioriteringer til grunn:"
 DocType: Supplier,Supplier Details,Leverandør Detaljer
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vennligst velg Bank Account
 DocType: Newsletter,Create and Send Newsletters,Lag og send nyhetsbrev
-sites/assets/js/report.min.js +107,From Date must be before To Date,Fra dato må være før til dato
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Fra dato må være før til dato
 DocType: Sales Order,Recurring Order,Gjentakende Bestill
 DocType: Company,Default Income Account,Standard Inntekt konto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kunden Group / Kunde
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Stock målenheter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
 ,Projected,Prosjekterte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} tilhører ikke Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
 DocType: Notification Control,Quotation Message,Sitat Message
 DocType: Issue,Opening Date,Åpningsdato
 DocType: Journal Entry,Remark,Bemerkning
 DocType: Purchase Receipt Item,Rate and Amount,Rate og Beløp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Fra salgsordre
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra salgsordre
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Ikke Fakturert
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Warehouse må tilhøre samme selskapet
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Ingen kontakter er lagt til ennå.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter er lagt til ennå.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ikke aktiv
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Mot Faktura Publiseringsdato
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløp
 DocType: Time Log,Batched for Billing,Dosert for Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger oppdratt av leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
-sites/assets/js/erpnext.min.js +26,Discount Amount,Rabattbeløp
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabattbeløp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tilbake mot fakturaen
 DocType: Item,Warranty Period (in days),Garantiperioden (i dager)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,reskontroførsel
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Sak 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konto
 DocType: Shopping Cart Settings,Quotation Series,Sitat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), må du endre navn varegruppen eller endre navn på elementet"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), må du endre navn varegruppen eller endre navn på elementet"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Varmt metall gass forming
 DocType: Sales Order Item,Sales Order Date,Salgsordre Dato
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antall
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Kunde eller leverandør Detaljer
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Lead Eier
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Warehouse er nødvendig
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse er nødvendig
 DocType: Employee,Marital Status,Sivilstatus
 DocType: Stock Settings,Auto Material Request,Auto Materiell Request
 DocType: Time Log,Will be updated when billed.,Vil bli oppdatert når fakturert.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tilgjengelig Batch Antall på From Warehouse
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nåværende BOM og New BOM kan ikke være det samme
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
 DocType: Sales Invoice,Against Income Account,Mot Inntekt konto
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,Oppdater Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ulik målenheter for elementer vil føre til feil (Total) Netto vekt verdi. Sørg for at nettovekt av hvert element er i samme målenheter.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Kan trekke elementer fra følgeseddel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Kan trekke elementer fra følgeseddel
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journal Entries {0} er un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registrering av all kommunikasjon av typen e-post, telefon, chat, besøk, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Vennligst oppgi Round Off Cost Center i selskapet
 DocType: Purchase Invoice,Terms,Vilkår
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Opprett ny
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Opprett ny
 DocType: Buying Settings,Purchase Order Required,Innkjøpsordre Påkrevd
 ,Item-wise Sales History,Element-messig Sales History
 DocType: Expense Claim,Total Sanctioned Amount,Total vedtatte beløp
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Lønn Slip Fradrag
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notater
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Velg en gruppe node først.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Hensikten må være en av {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Fyll ut skjemaet og lagre det
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Fyll ut skjemaet og lagre det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Last ned en rapport som inneholder alle råvarer med deres nyeste inventar status
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,La Balance Før Application
 DocType: SMS Center,Send SMS,Send SMS
 DocType: Company,Default Letter Head,Standard Brevhode
 DocType: Time Log,Billable,Fakturerbare
 DocType: Authorization Rule,This will be used for setting rule in HR module,Dette vil bli brukt for å sette regelen i HR-modul
 DocType: Account,Rate at which this tax is applied,Hastigheten som denne skatten er brukt
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Omgjøre Antall
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Omgjøre Antall
 DocType: Company,Stock Adjustment Account,Stock Adjustment konto
 DocType: Journal Entry,Write Off,Skriv Off
 DocType: Time Log,Operation ID,Operation ID
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabatt Fields vil være tilgjengelig i innkjøpsordre, kvitteringen fakturaen"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Merk: Vennligst ikke opprette kontoer for kunder og leverandører
 DocType: Report,Report Type,Rapporttype
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Laster
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Laster
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstatt Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Country klok standardadresse Maler
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Leverandør leverer til kunden
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Vis skatt break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Hvis du involvere i produksjon aktivitet. Aktiverer Element 'produseres'
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktura Publiseringsdato
 DocType: Sales Invoice,Rounded Total,Avrundet Total
 DocType: Product Bundle,List items that form the package.,Listeelementer som danner pakken.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosentvis Tildeling skal være lik 100%
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
 DocType: Company,Default Cash Account,Standard Cash konto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) mester.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Skriv inn "Forventet Leveringsdato '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Skriv inn "Forventet Leveringsdato '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Innbetalt beløp + avskrive Beløpet kan ikke være større enn Totalsum
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig batchnummer for varen {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rad {0}: Antall ikke avalable i lageret {1} {2} {3}. Tilgjengelig Antall: {4}, Overfør Antall: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Sak 3
+DocType: Purchase Order,Customer Contact Email,Kundekontakt E-post
 DocType: Event,Sunday,Søndag
 DocType: Sales Team,Contribution (%),Bidrag (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden "Cash eller bankkontoen ble ikke spesifisert
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområder
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Mal
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mal
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Skriv inn atleast en faktura i tabellen
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Legg til brukere
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),Faktisk startdato (via Time Logg
 DocType: Stock Reconciliation Item,Before reconciliation,Før avstemming
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og avgifter legges (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
 DocType: Sales Order,Partly Billed,Delvis Fakturert
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Outstanding Amt
 DocType: Time Log Batch,Total Hours,Totalt antall timer
 DocType: Journal Entry,Printing Settings,Utskriftsinnstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Later for typen {0} allerede bevilget for Employee {1} for regnskapsåret {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Elementet er påkrevd
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal sprøytestøping
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Fra følgeseddel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
 DocType: Time Log,From Time,Fra Time
 DocType: Notification Control,Custom Message,Standard melding
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,En Lead med denne e-i
 DocType: Stock Entry,From BOM,Fra BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grunnleggende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaksjoner før {0} er frosset
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',Vennligst klikk på "Generer Schedule '
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,To Date skal være det samme som Fra Dato for Half Day permisjon
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Vennligst klikk på "Generer Schedule '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,To Date skal være det samme som Fra Dato for Half Day permisjon
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato Bli må være større enn fødselsdato
 DocType: Salary Structure,Salary Structure,Lønn Struktur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriteriene, kan du løse \ konflikten ved å prioritere. Pris Regler: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flyselskap
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Issue Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Issue Material
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Tilbudet Dato
 DocType: Hub Settings,Access Token,Tilgang Token
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,Åpning Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kreves
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
+DocType: Delivery Note Item,From Warehouse,Fra Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Drilling
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Formblåsing
 DocType: Purchase Taxes and Charges,Valuation and Total,Verdivurdering og Total
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,Endret Fra
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Råmateriale
 DocType: Leave Application,Follow via Email,Følg via e-post
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebeløp Etter Rabattbeløp
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Barnekonto som finnes for denne kontoen. Du kan ikke slette denne kontoen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Barnekonto som finnes for denne kontoen. Du kan ikke slette denne kontoen.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten målet stk eller mål beløpet er obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Vennligst velg Publiseringsdato først
-DocType: Leave Allocation,Carry Forward,Fremføring
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vennligst velg Publiseringsdato først
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Åpningsdato bør være før påmeldingsfristens utløp
+DocType: Leave Control Panel,Carry Forward,Fremføring
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til Ledger
 DocType: Department,Days for which Holidays are blocked for this department.,Dager som Holidays er blokkert for denne avdelingen.
 ,Produced,Produsert
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Datoen da gjentakende ordre vil bli stoppe
 DocType: Quality Inspection,Item Serial No,Sak Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} må reduseres med {1} eller du bør øke overløps toleranse
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} må reduseres med {1} eller du bør øke overløps toleranse
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Time
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialisert Element {0} kan ikke oppdateres \ bruker Stock Avstemming
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Overføre materialet til Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Overføre materialet til Leverandør
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No kan ikke ha Warehouse. Warehouse må settes av Stock Entry eller Kjøpskvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Lag sitat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkjennes av {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt Regel betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM etter utskiftning
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operasjon ID ikke satt
 DocType: Production Order,Planned Start Date,Planlagt startdato
 DocType: Serial No,Creation Document Type,Creation dokumenttype
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Besøk
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Besøk
 DocType: Leave Type,Is Encash,Er encash
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Gjør Journal Entry
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nye Leaves Avsatt
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Prosjekt-messig data er ikke tilgjengelig for prisanslag
 DocType: Project,Expected End Date,Forventet sluttdato
 DocType: Appraisal Template,Appraisal Template Title,Appraisal Mal Tittel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Commercial
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Commercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Element {0} må ikke være en lagervare
 DocType: Cost Center,Distribution Id,Distribusjon Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Tjenester
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Verdi for Egenskap {0} må være innenfor rekkevidden av {1} til {2} i trinn på {3}
 DocType: Tax Rule,Sales,Salgs
 DocType: Stock Entry Detail,Basic Amount,Grunnbeløp
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
+DocType: Leave Allocation,Unused leaves,Ubrukte blader
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard Fordringer Kunde
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Saging
 DocType: Tax Rule,Billing State,Billing State
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Lamine
 DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Gjelder til (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunden {0} finnes ikke
 DocType: Attendance,Absent,Fraværende
 DocType: Product Bundle,Product Bundle,Produktet Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rad {0}: Ugyldig referanse {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Knusing
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kjøpe skatter og avgifter Mal
 DocType: Upload Attendance,Download Template,Last ned Mal
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,Bemerkninger
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Elementkode
 DocType: Journal Entry,Write Off Based On,Skriv Off basert på
 DocType: Features Setup,POS View,POS Vis
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Installasjon rekord for en Serial No.
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installasjon rekord for en Serial No.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuerlig avstøpning
-sites/assets/js/erpnext.min.js +10,Please specify a,Vennligst oppgi en
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vennligst oppgi en
 DocType: Offer Letter,Awaiting Response,Venter på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Fremfor
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold dimensjonering
 DocType: Salary Slip,Earning & Deduction,Tjene & Fradrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Valgfritt. Denne innstillingen vil bli brukt for å filtrere i forskjellige transaksjoner.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Valgfritt. Denne innstillingen vil bli brukt for å filtrere i forskjellige transaksjoner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
 DocType: Holiday List,Weekly Off,Ukentlig Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","For eksempel 2012, 2012-13"
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Svulmende
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Fordamping-mønster casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Underholdning Utgifter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Salg Faktura {0} må slettes før den sletter denne salgsordre
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Alder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Salg Faktura {0} må slettes før den sletter denne salgsordre
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
 DocType: Time Log,Billing Amount,Faktureringsbeløp
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig kvantum spesifisert for elementet {0}. Antall må være større enn 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Søknader om permisjon.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Rettshjelp
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dagen i måneden som auto ordre vil bli generert for eksempel 05, 28 osv"
 DocType: Sales Invoice,Posting Time,Postering Tid
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Sjekk dette hvis du vil tvinge brukeren til å velge en serie før du lagrer. Det blir ingen standard hvis du sjekke dette.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ingen Element med Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Åpne Påminnelser
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Åpne Påminnelser
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte kostnader
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Har du virkelig ønsker å Døves dette Material Request?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Reiseutgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på dato
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Prøvetid
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lagervare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lagervare.
 DocType: Feed,Full Name,Fullt Navn
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Utbetaling av lønn for måneden {0} og år {1}
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Legg rekker å
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Bergverk
 DocType: Production Order,Total Operating Cost,Total driftskostnader
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firma Forkortelse
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Sitater
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle tillatt å redigere frossen lager
 ,Territory Target Variance Item Group-Wise,Territorium Target Avviks varegruppe-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Skatt Mal er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} finnes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Selskap Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} status er «stoppet»
 DocType: Account,Temporary,Midlertidig
 DocType: Address,Preferred Billing Address,Foretrukne faktureringsadresse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentvis Allocation
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Sak Wise Skatt Detalj
 DocType: Purchase Order Item,Supplier Quotation,Leverandør sitat
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord vil være synlig når du lagrer Tilbud.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Stryke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
 DocType: Lead,Add to calendar on this date,Legg til i kalender på denne datoen
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for å legge til fraktkostnader.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Kommende arrangementer
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende arrangementer
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden må
 DocType: Letter Head,Letter Head,Brevhode
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hurtig Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
 DocType: Purchase Order,To Receive,Å Motta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Krympe montering
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Minst én lageret er obligatorisk
 DocType: Serial No,Out of Warranty,Ut av Garanti
 DocType: BOM Replace Tool,Replace,Erstatt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Skriv inn standard måleenhet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Skriv inn standard måleenhet
 DocType: Purchase Invoice Item,Project Name,Prosjektnavn
 DocType: Supplier,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
 DocType: Workflow State,Edit,Redigere
 DocType: Journal Entry Account,If Income or Expense,Dersom inntekt eller kostnad
 DocType: Features Setup,Item Batch Nos,Sak Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Verdi Difference
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Menneskelig Resurs
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Menneskelig Resurs
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Avstemming Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skattefordel
 DocType: BOM Item,BOM No,BOM Nei
 DocType: Contact Us Settings,Pincode,Pinkode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} ikke har konto {1} eller allerede matchet mot andre verdikupong
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} ikke har konto {1} eller allerede matchet mot andre verdikupong
 DocType: Item,Moving Average,Glidende gjennomsnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som vil bli erstattet
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock målenheter må være forskjellig fra dagens lager målenheter
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Bladene skal avsettes i multipler av 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Bladene skal avsettes i multipler av 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Last opp oppmøte fra en CSV-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Sette m
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",Å tildele dette problemet ved å bruke "tildele" -knappen i sidepanelet.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Aksjer Eldre enn [dager]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Prising Reglene er funnet basert på de ovennevnte forhold, er Priority brukt. Prioritet er et tall mellom 0 og 20, mens standardverdi er null (blank). Høyere tall betyr at det vil ha forrang dersom det er flere Prising regler med samme betingelser."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Mot Faktura
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal Year: {0} ikke eksisterer
 DocType: Currency Exchange,To Currency,Å Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillat følgende brukere å godkjenne La Applications for blokk dager.
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate
 DocType: Stock Entry Detail,Additional Cost,Tilleggs Cost
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Regnskapsårets slutt Dato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere basert på Voucher Nei, hvis gruppert etter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Gjør Leverandør sitat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Gjør Leverandør sitat
 DocType: Quality Inspection,Incoming,Innkommende
 DocType: BOM,Materials Required (Exploded),Materialer som er nødvendige (Exploded)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduser Tjene for permisjon uten lønn (LWP)
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} samsvarer ikke med {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual La
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Merk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Merk: {0}
 ,Delivery Note Trends,Levering Note Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Denne ukens oppsummering
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} må være et Kjøpt eller underleverandør til element i rad {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} må være et Kjøpt eller underleverandør til element i rad {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan bare oppdateres via lagertransaksjoner
 DocType: GL Entry,Party,Selskap
 DocType: Sales Order,Delivery Date,Leveringsdato
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,A
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Kjøpe Rate
 DocType: Task,Actual Time (in Hours),Virkelig tid (i timer)
 DocType: Employee,History In Company,Historie I selskapet
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Nyhetsbrev
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Nyhetsbrev
 DocType: Address,Shipping,Shipping
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,La Block List
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,Revisor
 DocType: Purchase Order,End date of current order's period,Sluttdato for dagens orden periode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Gjør Tilbudsbrevet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Return
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Standard Enhet for Variant må være samme som mal
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standard Enhet for Variant må være samme som mal
 DocType: DocField,Fold,Brett
 DocType: Production Order Operation,Production Order Operation,Produksjon Bestill Operation
 DocType: Pricing Rule,Disable,Deaktiver
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Rapporter til
 DocType: SMS Settings,Enter url parameter for receiver nos,Skriv inn url parameter for mottaker nos
 DocType: Sales Invoice,Paid Amount,Innbetalt beløp
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Lukke konto {0} må være av typen "Ansvar"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Lukke konto {0} må være av typen "Ansvar"
 ,Available Stock for Packing Items,Tilgjengelig på lager for pakk gjenstander
 DocType: Item Variant,Item Variant,Sak Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Sette dette Adressemal som standard så er det ingen andre standard
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetsstyring
 DocType: Production Planning Tool,Filter based on customer,Filter basert på kundens
 DocType: Payment Tool Detail,Against Voucher No,Mot Voucher Nei
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Skriv inn antall for Element {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Skriv inn antall for Element {0}
 DocType: Employee External Work History,Employee External Work History,Ansatt Ekstern Work History
 DocType: Tax Rule,Purchase,Kjøp
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balanse Antall
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials","Samlet gruppe ** Elementer ** i en annen ** Sak
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serial No er obligatorisk for Element {0}
 DocType: Item Variant Attribute,Attribute,Attributt
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Vennligst oppgi fra / til spenner
-sites/assets/js/desk.min.js +7652,Created By,Laget Av
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Laget Av
 DocType: Serial No,Under AMC,Under AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Sak verdivurdering rente beregnes på nytt vurderer inntakskost kupong beløp
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardinnstillingene for salg transaksjoner.
 DocType: BOM Replace Tool,Current BOM,Nåværende BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Legg Serial No
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Legg Serial No
 DocType: Production Order,Warehouses,Næringslokaler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stasjonær
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
 DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Oppdater ferdigvarer
 DocType: Workstation,per hour,per time
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serien {0} allerede brukt i {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serien {0} allerede brukt i {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual inventar) vil bli opprettet under denne kontoen.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse kan ikke slettes som finnes lager hovedbok oppføring for dette lageret.
 DocType: Company,Distribution,Distribusjon
-sites/assets/js/erpnext.min.js +50,Amount Paid,Beløpet Betalt
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløpet Betalt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Prosjektleder
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maks rabatt tillatt for element: {0} er {1}%
 DocType: Customer,Default Taxes and Charges,Standard Skatter og avgifter
 DocType: Account,Receivable,Fordring
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ikke lov til å endre Leverandør som innkjøpsordre allerede eksisterer
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rollen som får lov til å sende transaksjoner som overstiger kredittgrenser fastsatt.
 DocType: Sales Invoice,Supplier Reference,Leverandør Reference
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Hvis det er merket, vil BOM for sub-montering elementer vurderes for å få råvarer. Ellers vil alle sub-montering elementer bli behandlet som en råvare."
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,Legg til / fjern Mottakere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaksjonen ikke lov mot stoppet Produksjonsordre {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For å sette dette regnskapsåret som standard, klikk på "Angi som standard '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Oppsett innkommende server for støtte e-id. (F.eks support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Mangel Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antall
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
 DocType: Salary Slip,Salary Slip,Lønn Slip
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polering
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'To Date' er påkrevd
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når noen av de merkede transaksjonene "Skrevet", en e-pop-up automatisk åpnet for å sende en e-post til den tilhørende "Kontakt" i at transaksjonen med transaksjonen som et vedlegg. Brukeren kan eller ikke kan sende e-posten."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale innstillinger
 DocType: Employee Education,Employee Education,Ansatt Utdanning
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
 DocType: Salary Slip,Net Pay,Netto Lønn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} er allerede mottatt
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,Manufacturing User
 DocType: Purchase Order,Raw Materials Supplied,Råvare Leveres
 DocType: Purchase Invoice,Recurring Print Format,Gjentakende Print Format
 DocType: Communication,Series,Series
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Forventet Leveringsdato kan ikke være før Purchase Order Date
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Forventet Leveringsdato kan ikke være før Purchase Order Date
 DocType: Appraisal,Appraisal Template,Appraisal Mal
 DocType: Communication,Email,E-post
 DocType: Item Group,Item Classification,Sak Klassifisering
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,Lønn Innstillinger
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Matche ikke bundet fakturaer og betalinger.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Legg inn bestilling
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke ha en forelder kostnadssted
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Velg merke ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Gjelder
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
 DocType: Supplier,Address and Contacts,Adresse og Kontakt
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Få Utestående Kuponger
 DocType: Warranty Claim,Resolved By,Løst Av
 DocType: Appraisal,Start Date,Startdato
-sites/assets/js/desk.min.js +7629,Value,Verdi
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Verdi
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Bevilge blader for en periode.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klikk her for å verifisere
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan ikke tildele seg selv som forelder konto
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Tilgang tillatt
 DocType: Dropbox Backup,Weekly,Ukentlig
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Motta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Motta
 DocType: Maintenance Visit,Fully Completed,Fullt Fullført
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Komplett
 DocType: Employee,Educational Qualification,Pedagogiske Kvalifikasjoner
 DocType: Workstation,Operating Costs,Driftskostnader
 DocType: Employee Leave Approver,Employee Leave Approver,Ansatt La Godkjenner
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} har blitt lagt inn i vår nyhetsbrevliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle maskinering
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kjøp Master manager
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Legg til / Rediger priser
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Plan Kostnadssteder
 ,Requested Items To Be Ordered,Etterspør Elementer bestilles
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Mine bestillinger
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mine bestillinger
 DocType: Price List,Price List Name,Prisliste Name
 DocType: Time Log,For Manufacturing,For Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totals
@@ -3471,7 +3489,7 @@ DocType: Account,Income,Inntekt
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noe gikk galt!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ferdigstillelse Dato
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløp (Selskap Valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Støping
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,År
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Oppdater SMS-innstillinger
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Tid Logg {0} allerede fakturert
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Tid Logg {0} allerede fakturert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Usikret lån
 DocType: Cost Center,Cost Center Name,Kostnadssteds Name
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Element {0} med serienummer {1} er allerede installert
 DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Sum innskutt Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Meldinger som er større enn 160 tegn vil bli delt inn i flere meldinger
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Mottatt og akseptert
 ,Serial No Service Contract Expiry,Serial No Service kontraktsutløp
 DocType: Item,Unit of Measure Conversion,Måleenhet Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Arbeidstaker kan ikke endres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
 DocType: Naming Series,Help HTML,Hjelp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krysset for Element {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krysset for Element {1}
 DocType: Address,Name of person or organization that this address belongs to.,Navn på person eller organisasjon som denne adressen tilhører.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,Omregnet
 DocType: Item,Has Serial No,Har Serial No
 DocType: Employee,Date of Issue,Utstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
 DocType: Issue,Content Type,Innholdstype
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Datamaskin
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på nettstedet.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få avstemte Entries
@@ -3524,14 +3542,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} har blitt lagt inn mer enn en gang for regnskapsåret {1}
 ,Average Commission Rate,Gjennomsnittlig kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No 'kan ikke være' Ja 'for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No 'kan ikke være' Ja 'for ikke-lagervare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Oppmøte kan ikke merkes for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prising Rule Hjelp
 DocType: Purchase Taxes and Charges,Account Head,Account Leder
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Oppdater ekstra kostnader for å beregne inntakskost annonser
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Total verdi Difference (ut -)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruker-ID ikke satt for Employee {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garantikrav
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,Navngi Series
 DocType: Leave Block List,Leave Block List Name,La Block List Name
 DocType: User,Enabled,Aktivert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aksje Eiendeler
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Har du virkelig ønsker å sende all lønn slip for måneden {0} og år {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Har du virkelig ønsker å sende all lønn slip for måneden {0} og år {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
 DocType: Target Detail,Target Qty,Target Antall
 DocType: Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke sendes inn
 DocType: Notification Control,Sales Invoice Message,Salgsfaktura Message
 DocType: Authorization Rule,Based On,Basert På
-,Ordered Qty,Bestilte Antall
+DocType: Sales Order Item,Ordered Qty,Bestilte Antall
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode Fra og perioden Til dato obligatoriske for gjentakende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Prosjektet aktivitet / oppgave.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generere lønnsslipper
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} er ikke en gyldig e-id
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Last opp Oppmøte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM og Industri Antall kreves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Aldring Range 2
-DocType: Journal Entry Account,Amount,Beløp
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Medrivende
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salgs Analytics
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet Datoen kan ikke være før Material Request Dato
 DocType: Contact Us Settings,City,By
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultralyd maskinering
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Feil: Ikke en gyldig id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Feil: Ikke en gyldig id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Elementet {0} må være en Sales Element
 DocType: Naming Series,Update Series Number,Update-serien Nummer
 DocType: Account,Equity,Egenkapital
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,Faktiske
 DocType: Authorization Rule,Customerwise Discount,Customerwise Rabatt
 DocType: Purchase Invoice,Against Expense Account,Mot regning
 DocType: Production Order,Production Order,Produksjon Bestill
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Installasjon Merk {0} har allerede blitt sendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installasjon Merk {0} har allerede blitt sendt
 DocType: Quotation Item,Against Docname,Mot Docname
 DocType: SMS Center,All Employee (Active),All Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vis nå
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Raw Material Cost
 DocType: Item,Re-Order Level,Re-Order nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Skriv inn elementer og planlagt stk som du ønsker å heve produksjonsordrer eller laste råvarer for analyse.
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gjelder Holiday List
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serien Oppdatert
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporter Type er obligatorisk
 DocType: Item,Serial Number Series,Serienummer Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Element {0} i rad {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Element {0} i rad {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Først Svarte På
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering av varen i flere grupper
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,Oppmøte
 DocType: Page,No,Nei
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke sjekket, vil listen må legges til hver avdeling hvor det må brukes."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skatt mal for å kjøpe transaksjoner.
 ,Item Prices,Varepriser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,I Ord vil være synlig når du lagrer innkjøpsordre.
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrative utgifter
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Kundegruppe
-sites/assets/js/erpnext.min.js +50,Change,Endre
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Endre
 DocType: Purchase Invoice,Contact Email,Kontakt Epost
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Purchase Order {0} er «stoppet»
 DocType: Appraisal Goal,Score Earned,Resultat tjent
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",f.eks "My Company LLC"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Oppsigelsestid
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,Bruttovekt målenheter
 DocType: Email Digest,Receivables / Payables,Fordringer / gjeld
 DocType: Delivery Note Item,Against Sales Invoice,Mot Salg Faktura
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempling
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Element
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nullverdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antall element oppnådd etter produksjon / nedpakking fra gitte mengder råvarer
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordringer / gjeld konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot kundeordreposisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 DocType: Task,Actual End Date (via Time Logs),Selve Sluttdato (via Time Logger)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Total poengsum (av 5)
 DocType: Contact Us Settings,State,Stat
 DocType: Batch,Batch,Parti
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balanse
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balanse
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Utgifts Krav)
 DocType: User,Gender,Kjønn
 DocType: Journal Entry,Debit Note,Debitnota
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,Blogg Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Lage regler for å begrense transaksjoner basert på verdier.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis det er merket, Total nei. arbeidsdager vil omfatte helligdager, og dette vil redusere verdien av Lønn per dag"
 DocType: Purchase Invoice,Total Advance,Total Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Døves Material Request
 DocType: Workflow State,User,Bruker
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Processing Lønn
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processing Lønn
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Beløp
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Sett som tapte
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,Kreditt Days Based On
 DocType: Tax Rule,Tax Rule,Skatt Rule
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Opprettholde samme hastighet Gjennom Salgssyklus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlegg tids logger utenfor arbeidsstasjon arbeidstid.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} har allerede blitt sendt
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} har allerede blitt sendt
 ,Items To Be Requested,Elementer å bli forespurt
 DocType: Purchase Order,Get Last Purchase Rate,Få siste kjøp Ranger
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing pris basert på aktivitet Type (per time)
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Firma Email ID ikke funnet, derav posten sendt"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse av midler (aktiva)
 DocType: Production Planning Tool,Filter based on item,Filter basert på element
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debet konto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Ansattes Navn
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundet Total (Selskap Valuta)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Ytelser til ansatte
 DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Produsert Antall
 DocType: Purchase Receipt Item,Accepted Quantity,Akseptert Antall
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ikke eksisterer
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger hevet til kundene.
 DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Prosjekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter lagt
 DocType: Maintenance Schedule,Schedule,Tidsplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definer Budsjett for denne kostnadssted. Slik stiller budsjett handling, se "Selskapet List""
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,Parent konto
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Kupong Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
 DocType: Expense Claim,Approved,Godkjent
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som "venstre"
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Utdanning
 DocType: Selling Settings,Campaign Naming By,Kampanje Naming Av
 DocType: Employee,Current Address Is,Gjeldende adresse Er
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Valgfritt. Setter selskapets standardvaluta, hvis ikke spesifisert."
 DocType: Address,Office,Kontor
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardrapporter
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskap posteringer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Vennligst velg Employee Record først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgjengelig Antall på From Warehouse
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vennligst velg Employee Record først.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,For å opprette en Tax-konto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Skriv inn Expense konto
 DocType: Account,Stock,Lager
 DocType: Employee,Current Address,Nåværende Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis elementet er en variant av et annet element da beskrivelse, image, priser, avgifter osv vil bli satt fra malen uten eksplisitt spesifisert"
 DocType: Serial No,Purchase / Manufacture Details,Kjøp / Produksjon Detaljer
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch Lager
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Lager
 DocType: Employee,Contract End Date,Kontraktssluttdato
 DocType: Sales Order,Track this Sales Order against any Project,Spor dette Salgsordre mot ethvert prosjekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (pending å levere) basert på kriteriene ovenfor
 DocType: DocShare,Document Type,Document Type
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Fra Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Fra Leverandør sitat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Halv Dag
 DocType: Pricing Rule,Min Qty,Min Antall
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mengde (Produsert Stk) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Selskap Valuta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Party Type og Party gjelder bare mot fordringer / gjeld konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Party Type og Party gjelder bare mot fordringer / gjeld konto
 DocType: Notification Control,Purchase Receipt Message,Kvitteringen Message
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totalt tildelte bladene er mer enn perioden
 DocType: Production Order,Actual Start Date,Faktisk startdato
 DocType: Sales Order,% of materials delivered against this Sales Order,% Av materialer leveres mot denne kundeordre
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Record element bevegelse.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Record element bevegelse.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhetsbrev List Subscriber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Tjeneste
 DocType: Hub Settings,Hub Settings,Hub-innstillinger
 DocType: Project,Gross Margin %,Bruttomargin%
 DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskapspostene har allerede blitt gjort i valuta {0} for selskap {1}. Vennligst velg en fordring eller betales konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskapspostene har allerede blitt gjort i valuta {0} for selskap {1}. Vennligst velg en fordring eller betales konto med valuta {0}.
 ,Monthly Salary Register,Månedlig Lønn Register
-apps/frappe/frappe/website/template.py +123,Next,Neste
+apps/frappe/frappe/website/template.py +140,Next,Neste
 DocType: Warranty Claim,If different than customer address,Hvis annerledes enn kunden adresse
 DocType: BOM Operation,BOM Operation,BOM Operation
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,Neste dato
 DocType: Employee Education,Major/Optional Subjects,Store / valgfrie emner
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Skriv inn skatter og avgifter
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Maskinering
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opprettholde familie informasjon som navn og okkupasjon av foreldre, ektefelle og barn"
 DocType: Hub Settings,Seller Name,Selger Navn
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og avgifter fratrukket (Company Valuta)
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,Å motta og Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Betingelser Mal
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk opprette Material Forespørsel om kvantitet faller under dette nivået
 ,Item-wise Purchase Register,Element-messig Purchase Register
 DocType: Batch,Expiry Date,Utløpsdato
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Slik stiller omgjøring nivå, må varen være en innkjøpsenhet eller Manufacturing Element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Slik stiller omgjøring nivå, må varen være en innkjøpsenhet eller Manufacturing Element"
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontakter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vennligst første velg kategori
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Prosjektet mester.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ikke viser noen symbol som $ etc ved siden av valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditt Days
 DocType: Leave Type,Is Carry Forward,Er fremføring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Få Elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Få Elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledetid Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Party Type og Party er nødvendig for fordringer / gjeld kontoen {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Party Type og Party er nødvendig for fordringer / gjeld kontoen {1}
 DocType: Dropbox Backup,Send Notifications To,Send varsler til
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Grunn til å forlate
 DocType: Expense Claim Detail,Sanctioned Amount,Sanksjonert Beløp
 DocType: GL Entry,Is Opening,Er Åpnings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Konto {0} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} finnes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmeside og andre publikasjoner.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Opprett Lønn Struktur for arbeidstaker {0}
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 89e4c73d08..903d1853a1 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Wybierz dystrybucji miesięcznej, jeśli chcesz śledzić oparty na sezonowość."
 DocType: Employee,Divorced,Rozwiedziony
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Ostrzeżenie: Ta sama pozycja została wprowadzona wielokrotnie.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Ostrzeżenie: Ta sama pozycja została wprowadzona wielokrotnie.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Pozycje już synchronizowane
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Zezwoli na dodał wiele razy w transakcji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anuluj Materiał Odwiedź {0} zanim anuluje to roszczenia z tytułu gwarancji
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zagęszczania oraz spiekania
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Waluta jest wymagana dla Cenniku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zostanie policzony dla transakcji.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Od Prośby o Materiał
+DocType: Purchase Order,Customer Contact,Kontakt z klientem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od Prośby o Materiał
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Drzewo
 DocType: Job Applicant,Job Applicant,
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Brak już następnych wyników.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Nazwa klienta
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (lub grupy), przeciwko którym zapisy księgowe są i sald są utrzymywane."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Zaległość za {0} nie może być mniejsza niż ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Zaległość za {0} nie może być mniejsza niż ({1})
 DocType: Manufacturing Settings,Default 10 mins,Domyślnie 10 minut
 DocType: Leave Type,Leave Type Name,Nazwa typu urlopu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,
 DocType: SMS Center,All Supplier Contact,Dane wszystkich dostawców
 DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Spodziewana data końcowa nie może być mniejsza od spodziewanej daty startowej
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Czy naprawdę chcesz odstopować zlecenie produkcyjne:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Wiersz # {0}: Cena musi być taki sam, jak {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Przekaz bankowy
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,
 DocType: Mode of Payment Account,Mode of Payment Account,Konto księgowe dla tego rodzaju płatności
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Pokaż Wariant
 DocType: Sales Invoice Item,Quantity,Ilość
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredyty (zobowiązania)
 DocType: Employee Education,Year of Passing,
-sites/assets/js/erpnext.min.js +27,In Stock,W magazynie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Mogą jedynie wpłaty przed Unbilled zamówienia sprzedaży
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,W magazynie
 DocType: Designation,Designation,Nominacja
 DocType: Production Plan Item,Production Plan Item,Przedmiot planu produkcji
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Użytkownik {0} jest już przyporządkowany do Pracownika {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Dodaj nowy profil POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Opieka zdrowotna
 DocType: Purchase Invoice,Monthly,Miesięcznie
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faktura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Opóźnienie w płatności (dni)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Okresowość
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adres e-mail
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrona
 DocType: Company,Abbr,Skrót
 DocType: Appraisal Goal,Score (0-5),
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Wiersz {0}: {1} {2} nie zgadza się z {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Wiersz {0}: {1} {2} nie zgadza się z {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Wiersz # {0}:
 DocType: Delivery Note,Vehicle No,Nr pojazdu
-sites/assets/js/erpnext.min.js +55,Please select Price List,Wybierz Cennik
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Wybierz Cennik
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Obróbka drewna
 DocType: Production Order Operation,Work In Progress,Praca w toku
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Drukowanie 3D
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Ogłoszenie o pracę
 DocType: Item Attribute,Increment,Przyrost
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Wybierz Magazyn ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamowanie
 DocType: Employee,Married,Poślubiony
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},
 DocType: Payment Reconciliation,Reconcile,Wyrównywać
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Artykuły spożywcze
 DocType: Quality Inspection Reading,Reading 1,Odczyt 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Dodaj Bank
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Dodaj Bank
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fundusze Emerytalne
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Magazyn jest obowiązkowe, jeżeli typ konta to Magazyn"
 DocType: SMS Center,All Sales Person,
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Centrum Kosztów Odpisu
 DocType: Warehouse,Warehouse Detail,Szczegóły magazynu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Limit kredytowy został przekroczony dla klienta {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Rodzaj podatku
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Nie masz uprawnień aby zmieniać lub dodawać elementy przed {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Nie masz uprawnień aby zmieniać lub dodawać elementy przed {0}
 DocType: Item,Item Image (if not slideshow),
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Godzina Kursy / 60) * Rzeczywista Czas pracy
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Gość
 DocType: Quality Inspection,Get Specification Details,Pobierz szczegóły specyfikacji
 DocType: Lead,Interested,
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Zestawienie materiałowe
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otwarcie
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otwarcie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Skopiuj z Grupy Przedmiotów
 DocType: Journal Entry,Opening Entry,Wpis początkowy
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,
 DocType: Standard Reply,Owner,Właściciel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Proszę najpierw wpisać Firmę
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Najpierw wybierz firmę
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Najpierw wybierz firmę
 DocType: Employee Education,Under Graduate,
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,
 DocType: BOM,Total Cost,Koszt całkowity
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Konsumpcyjny
 DocType: Upload Attendance,Import Log,Log operacji importu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Wyślij
+DocType: Sales Invoice Item,Delivered By Supplier,Dostarczane przez Dostawcę
 DocType: SMS Center,All Contact,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Roczne Wynagrodzenie
 DocType: Period Closing Voucher,Closing Fiscal Year,Zamknięcie roku fiskalnego
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra Entry (Zapis przeciwstawny)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logi
 DocType: Journal Entry Account,Credit in Company Currency,Kredyt w walucie Spółki
 DocType: Delivery Note,Installation Status,Status instalacji
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
 DocType: Item,Supply Raw Materials for Purchase,Dostawa surowce Skupu
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Pobierz szablon, wypełnić odpowiednie dane i dołączyć zmodyfikowanego pliku.
  Wszystko daty i pracownik połączenie w wybranym okresie przyjdzie w szablonie, z istniejącymi rekordy frekwencji"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Zostanie zaktualizowane po wysłaniu Faktury Sprzedaży
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,
 DocType: SMS Center,SMS Center,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Prostowanie
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Wpisz URL dla wiadomości
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Tym razem konflikty Zaloguj z {0} do {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cennik musi być przyporządkowany do kupna albo sprzedaży
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},
 DocType: Pricing Rule,Discount on Price List Rate (%),Zniżka Cennik Oceń (%)
-sites/assets/js/form.min.js +279,Start,
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,
 DocType: User,First Name,Imię
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Twoja konfiguracja jest zakończona. Odświeżanie.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-formy do odlewania
 DocType: Offer Letter,Select Terms and Conditions,Wybierz Regulamin
 DocType: Production Planning Tool,Sales Orders,Zlecenia sprzedaży
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Na podstawie pozycji faktury sprzedaży
 ,Production Orders in Progress,Zamówienia Produkcji w toku
 DocType: Lead,Address & Contact,Adres i kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj niewykorzystane urlopy z poprzednich alokacji
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Następny cykliczne {0} zostanie utworzony w dniu {1}
 DocType: Newsletter List,Total Subscribers,Wszystkich zapisani
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nazwa kontaktu
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tworzy Pasek Wypłaty dla wskazanych wyżej kryteriów.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Podwójna obudowa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Data zwolnienia musi być większa od Daty Wstąpienia
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Urlopy na Rok
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Proszę ustawić Naming Series dla {0} poprzez Konfiguracja> Ustawienia> Seria Naming
 DocType: Time Log,Will be updated when batched.,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Wiersz {0}: Proszę sprawdzić ""Czy Advance"" przeciw konta {1}, jeśli jest to zaliczka wpis."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Wiersz {0}: Proszę sprawdzić ""Czy Advance"" przeciw konta {1}, jeśli jest to zaliczka wpis."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Magazyn {0} nie należy do firmy {1}
 DocType: Bulk Email,Message,Wiadomość
 DocType: Item Website Specification,Item Website Specification,
 DocType: Dropbox Backup,Dropbox Access Key,Klucz do Dostępu do Dropboxa
 DocType: Payment Tool,Reference No,Nr Odniesienia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Urlop Zablokowany
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Roczny
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Uzgodnienia Stanu Pozycja
 DocType: Stock Entry,Sales Invoice No,Nr faktury sprzedażowej
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Minimalna wartość zamówienia
 DocType: Pricing Rule,Supplier Type,Typ dostawcy
 DocType: Item,Publish in Hub,Publikowanie w Hub
 ,Terretory,Terytorium
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Zamówienie produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,
 DocType: Item,Purchase Details,Szczegóły zakupu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} nie znajdują się w "materiały dostarczane" tabeli w Zamówieniu {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Kontrola Wypowiedzenia
 DocType: Lead,Suggestions,Sugestie
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Proszę wprowadzić grupę konto rodzica magazynowy {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Płatność przed {0} {1} nie może być większa niż kwota kredytu pozostała {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Płatność przed {0} {1} nie może być większa niż kwota kredytu pozostała {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Nr tel. Komórkowego
 DocType: Maintenance Schedule,Generate Schedule,Utwórz Harmonogram
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nowa jednostka miary stanu
 DocType: Period Closing Voucher,Closing Account Head,
 DocType: Employee,External Work History,Historia Zewnętrzna Pracy
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Error Referencje
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Czy naprawdę chcesz zatrzymać
 DocType: Communication,Closed,Zamknięte
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Czy na pewno chcesz zatrzymać
 DocType: Lead,Industry,
 DocType: Employee,Job Profile,Profil Pracy
 DocType: Newsletter,Newsletter,Newsletter
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Dowód dostawy
 DocType: Dropbox Backup,Allow Dropbox Access,Pozwól na dostęp do Dropboksa
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Konfigurowanie podatki
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Wpis płatności został zmodyfikowany po ściągnięciu. Proszę ściągnąć ponownie.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Podsumowanie na ten tydzień i działań toczących
 DocType: Workstation,Rent Cost,Koszt Wynajmu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Wybierz miesiąc i rok
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty klienta
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",
 DocType: Item Tax,Tax Rate,Stawka podatku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Wybierz produkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Wybierz produkt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Pozycja: {0} udało partiami, nie da się pogodzić z wykorzystaniem \
  Zdjęcie Pojednania, zamiast używać Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Wiersz # {0}: Batch Nie musi być taki sam, jak {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Przekształć w nie-Grupę
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Potwierdzenie Zakupu musi zostać wysłane
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Bieżąca jednostka miary a
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Partia (pakiet) produktu.
 DocType: C-Form Invoice Detail,Invoice Date,Data faktury
 DocType: GL Entry,Debit Amount,Kwota Debit
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Proszę przejrzeć załącznik
 DocType: Purchase Order,% Received,% Otrzymanych
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instrukcje
 DocType: Quality Inspection,Inspected By,Skontrolowane przez
 DocType: Maintenance Visit,Maintenance Type,Typ Konserwacji
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,
 DocType: Leave Application,Leave Approver Name,Imię Zatwierdzającego Urlop
 ,Schedule Date,
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,
 DocType: Landed Cost Item,Applicable Charges,Obowiązujące opłaty
 DocType: Workstation,Consumable Cost,Koszt Konsumpcyjny
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver'
 DocType: Purchase Receipt,Vehicle Date,Pojazd Data
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medyczny
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Powód straty
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% Zainstalowanych
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Proszę najpierw wpisać nazwę Firmy
 DocType: BOM,Item Desription,Opis produktu
 DocType: Purchase Invoice,Supplier Name,Nazwa dostawcy
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Przeczytać instrukcję ERPNext
 DocType: Account,Is Group,Czy Grupa
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Nr seryjny automatycznie ustawiona w oparciu o FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sprawdź Dostawca numer faktury Wyjątkowość
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Główny Menadże
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globalne ustawienia dla wszystkich procesów produkcyjnych.
 DocType: Accounts Settings,Accounts Frozen Upto,Konta zamrożone do 
 DocType: SMS Log,Sent On,
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
 DocType: Sales Order,Not Applicable,Nie dotyczy
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Odlewnictwo Shell
 DocType: Material Request Item,Required Date,
 DocType: Delivery Note,Billing Address,Adres Faktury
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Proszę wpisać Kod Produktu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Proszę wpisać Kod Produktu
 DocType: BOM,Costing,Zestawienie kosztów
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Razem szt
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Czas między o
 DocType: Customer,Buyer of Goods and Services.,Nabywca towarów i usług.
 DocType: Journal Entry,Accounts Payable,Zobowiązania
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj abonentów
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" nie istnieje"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" nie istnieje"
 DocType: Pricing Rule,Valid Upto,Ważny do
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Przychody bezpośrednie
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nie można przefiltrować na podstawie Konta, jeśli pogrupowano z użuciem konta"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,
 DocType: Payment Tool,Received Or Paid,Otrzymane lub zapłacone
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Proszę wybrać firmę
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Proszę wybrać firmę
 DocType: Stock Entry,Difference Account,Konto Różnic
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nie można zamknąć zadanie, jak jego zależne zadaniem {0} nie jest zamknięta."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,
 DocType: Production Order,Additional Operating Cost,Dodatkowy koszt operacyjny
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetyki
 DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",
 DocType: Communication,Subject,Temat
 DocType: Shipping Rule,Net Weight,Waga netto
 DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
 ,Serial No Warranty Expiry,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Czy na pewno chcesz ZATRZYMAĆ ten wniosek o Materiał?
 DocType: Sales Order,To Deliver,Dostarczyć
 DocType: Purchase Invoice Item,Item,"Pozycja (towar, produkt lub usługa)"
 DocType: Journal Entry,Difference (Dr - Cr),Różnica (Dr - Cr)
 DocType: Account,Profit and Loss,Zyski i Straty
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Zarządzanie Podwykonawstwo
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Zarządzanie Podwykonawstwo
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Meble i osprzęt
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stawka przy użyciu której waluta Listy Cen jest konwertowana do podstawowej waluty firmy
@@ -489,7 +489,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,
 DocType: Purchase Invoice,Supplier Invoice No,Nr faktury dostawcy
 DocType: Territory,For reference,Dla referencji
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nie można usunąć nr seryjnego {0}, ponieważ jest wykorzystywany w transakcjach magazynowych"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Zamknięcie (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zamknięcie (Cr)
 DocType: Serial No,Warranty Period (Days),Okres gwarancji (dni)
 DocType: Installation Note Item,Installation Note Item,
 ,Pending Qty,Oczekuje szt
@@ -523,8 +523,9 @@ DocType: Sales Order,Billing and Delivery Status,Fakturowanie i dostawy status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Powtarzający się klient
 DocType: Leave Control Panel,Allocate,Przydziel
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Wstecz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Zwrot sprzedaży
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Zwrot sprzedaży
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,
+DocType: Item,Delivered by Supplier (Drop Ship),Dostarczane przez Dostawcę (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza danych potencjalnych klientów.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza danych klientów.
@@ -535,7 +536,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Koziołkujący
 DocType: Purchase Order Item,Billed Amt,Rozliczona Ilość
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiczny Magazyn przeciwny do zapisów.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Nr Odniesienia & Data Odniesienia jest wymagana do {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Nr Odniesienia & Data Odniesienia jest wymagana do {0}
 DocType: Event,Wednesday,Środa
 DocType: Sales Invoice,Customer's Vendor,
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produkcja Zamówienie jest obowiązkowe
@@ -568,8 +569,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Parametr Odbiorcy
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Pola ""Bazuje na"" i ""Grupuj wg."" nie mogą być takie same"
 DocType: Sales Person,Sales Person Targets,
-sites/assets/js/form.min.js +271,To,do
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Proszę wpisać adres e-mail
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,do
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Proszę wpisać adres e-mail
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Koniec rurki tworzące
 DocType: Production Order Operation,In minutes,W ciągu kilku minut
 DocType: Issue,Resolution Date,
@@ -586,7 +587,7 @@ DocType: Activity Cost,Projects User,Użytkownik projektu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Skonsumowano 
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Nie znaleziono tabeli w Szczegóły faktury
 DocType: Company,Round Off Cost Center,Zaokrąglić centrum kosztów
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wizyta Konserwacji {0} musi być anulowana przed usunięciem nakazu sprzedaży
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wizyta Konserwacji {0} musi być anulowana przed usunięciem nakazu sprzedaży
 DocType: Material Request,Material Transfer,Transfer materiałów
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Otwarcie (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},
@@ -594,9 +595,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Koszt podatków i opłat
 DocType: Production Order Operation,Actual Start Time,Rzeczywisty Czas Rozpoczęcia
 DocType: BOM Operation,Operation Time,Czas operacji
-sites/assets/js/list.min.js +5,More,Więcej
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Więcej
 DocType: Pricing Rule,Sales Manager,Menadżer Sprzedaży
-sites/assets/js/desk.min.js +7673,Rename,Zmień nazwę
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Zmień nazwę
 DocType: Journal Entry,Write Off Amount,Wartość Odpisu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Zginanie
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,
@@ -612,13 +613,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Proste cięcie
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,
 DocType: Purchase Receipt Item Supplied,Current Stock,Bieżący asortyment
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Odrzucony Magazyn jest obowiązkowy dla odrzuconych przedmiotów
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Odrzucony Magazyn jest obowiązkowy dla odrzuconych przedmiotów
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
 DocType: Employee,Provide email id registered in company,
 DocType: Hub Settings,Seller City,Sprzedawca Miasto
 DocType: Email Digest,Next email will be sent on:,
 DocType: Offer Letter Term,Offer Letter Term,Oferta List Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Pozycja ma warianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,
 DocType: Bin,Stock Value,
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,
@@ -633,11 +634,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Witamy
 DocType: Journal Entry,Credit Card Entry,Wejście kart kredytowych
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Temat zadania
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Produkty otrzymane od dostawców.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Produkty otrzymane od dostawców.
 DocType: Communication,Open,Otwarty
 DocType: Lead,Campaign Name,Nazwa kampanii
 ,Reserved,Zarezerwowany
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Czy na pewno chcesz ODSTOPOWAĆ?
 DocType: Purchase Order,Supply Raw Materials,Zaopatrzenia w surowce
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Dzień, w którym będą generowane następne faktury. Generowanie wykonywane jest na żądanie."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Aktywa finansowe
@@ -653,7 +653,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Numer Zamówienia Zakupu Klienta
 DocType: Employee,Cell Number,Numer komórki
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Straty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Szansa od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Miesięczny wyciąg do wynagrodzeń.
@@ -722,7 +722,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Zobowiązania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Usankcjonowane Kwota nie może być większa niż ilość roszczenia w wierszu {0}.
 DocType: Company,Default Cost of Goods Sold Account,Domyślne Konto Wartości Dóbr Sprzedanych
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Cennik nie wybrany
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Cennik nie wybrany
 DocType: Employee,Family Background,Tło rodzinne
 DocType: Process Payroll,Send Email,
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Brak uprawnień
@@ -733,7 +733,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Numery
 DocType: Item,Items with higher weightage will be shown higher,Produkty z wyższym weightage zostaną pokazane wyższe
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Uzgodnienia z wyciągiem bankowym - szczegóły
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moje Faktury
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Nie znaleziono pracowników
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nie znaleziono pracowników
 DocType: Purchase Order,Stopped,
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Wybierz LM zacząć
@@ -742,7 +742,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Wyślij b
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,
 ,Support Analytics,
 DocType: Item,Website Warehouse,Magazyn strony WWW
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Czy na pewno chcesz zatrzymać zlecenie produkcyjne:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dzień miesiąca, w którym auto faktury będą generowane na przykład 05, 28 itd"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,
@@ -752,12 +751,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,
 DocType: Features Setup,"To enable ""Point of Sale"" features",Aby włączyć "punkt sprzedaży" funkcje
 DocType: Bin,Moving Average Rate,
 DocType: Production Planning Tool,Select Items,Wybierz Elementy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
 DocType: Comment,Reference Name,Nazwa Odniesienia
 DocType: Maintenance Visit,Completion Status,Status ukończenia
 DocType: Sales Invoice Item,Target Warehouse,
 DocType: Item,Allow over delivery or receipt upto this percent,Pozostawić na dostawę lub odbiór zapisu do tego procent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Spodziewana data odbioru przesyłki nie może być wcześniejsza od daty sprzedaży
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Spodziewana data odbioru przesyłki nie może być wcześniejsza od daty sprzedaży
 DocType: Upload Attendance,Import Attendance,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Wszystkie grupy produktów
 DocType: Process Payroll,Activity Log,Dziennik aktywności
@@ -765,7 +764,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,
 DocType: Production Order,Item To Manufacture,Rzecz do wyprodukowania
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Stałe formy odlewniczej
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Zamówienie zakupu do płatności
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Stan jest {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Zamówienie zakupu do płatności
 DocType: Sales Order Item,Projected Qty,Prognozowana ilość
 DocType: Sales Invoice,Payment Due Date,Termin Płatności
 DocType: Newsletter,Newsletter Manager,Biuletyn Kierownik
@@ -789,8 +789,8 @@ DocType: SMS Log,Requested Numbers,Prośby Liczby
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Szacowanie osiągów
 DocType: Sales Invoice Item,Stock Details,Zdjęcie Szczegóły
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Wartość projektu
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Punkt sprzedaży
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Nie można kontynuować {0} 
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punkt sprzedaży
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nie można kontynuować {0} 
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Już Kredyty saldo konta, nie możesz ustawić ""Równowaga musi być"" za ""Debit"""
 DocType: Account,Balance must be,Bilans powinien wynosić 
 DocType: Hub Settings,Publish Pricing,Opublikuj Ceny
@@ -812,7 +812,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Potwierdzenia Zakupu
 ,Received Items To Be Billed,Otrzymane przedmioty czekające na zaksięgowanie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Czyszczenie strumieniowo-ścierne
-sites/assets/js/desk.min.js +3938,Ms,Pani
+DocType: Employee,Ms,Pani
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Główna wartość Wymiany walut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nie udało się znaleźć wolnego przedziału czasu w najbliższych {0} dniach do pracy {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiał plan podzespołów
@@ -834,29 +834,31 @@ DocType: Purchase Receipt,Range,Przedział
 DocType: Supplier,Default Payable Accounts,Domyślne Konto Płatności
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
 DocType: Features Setup,Item Barcode,Kod kreskowy
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,
 DocType: Address,Shop,Sklep
 DocType: Hub Settings,Sync Now,Synchronizuj teraz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Wiersz {0}: wejście kredytowe nie mogą być powiązane z {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Wiersz {0}: wejście kredytowe nie mogą być powiązane z {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Domyślne Konto Bank / Kasa będzie automatycznie aktualizowane za fakturą POS, gdy ten tryb zostanie wybrany."
 DocType: Employee,Permanent Address Is,Stały adres to
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacja zakończona na jak wiele wyrobów gotowych?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Marka
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Zniżki dla nadmiernie {0} przeszedł na pozycję {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Zniżki dla nadmiernie {0} przeszedł na pozycję {1}.
 DocType: Employee,Exit Interview Details,Wyjdź z szczegółów wywiadu
 DocType: Item,Is Purchase Item,Jest pozycją kupowalną
 DocType: Journal Entry Account,Purchase Invoice,Faktura zakupu
 DocType: Stock Ledger Entry,Voucher Detail No,Nr Szczegółu Bonu
 DocType: Stock Entry,Total Outgoing Value,Całkowita wartość wychodząca
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Otwarcie Data i termin powinien być w obrębie samego roku podatkowego
 DocType: Lead,Request for Information,
 DocType: Payment Tool,Paid,Zapłacono
 DocType: Salary Slip,Total in words,
 DocType: Material Request Item,Lead Time Date,Termin realizacji
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,jest obowiązkowe. Może rekord Wymiana walut nie jest stworzony dla
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Wiersz # {0}: Proszę podać nr seryjny dla pozycji {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Dla pozycji "Produkt Bundle", magazyn, nr seryjny i numer partii będą rozpatrywane z "packing list" tabeli. Jeśli magazynowe oraz Batch Nie są takie same dla wszystkich elementów Opakowanie do pozycji każdego "produkt Bundle", wartości te mogą zostać wpisane do tabeli głównej pozycji, wartości zostaną skopiowane do "packing list" tabeli."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Dostawy do klientów.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Dostawy do klientów.
 DocType: Purchase Invoice Item,Purchase Order Item,Przedmiot Zamówienia Kupna
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Przychody pośrednie
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Ustaw Kwota płatności = zaległej kwoty
@@ -864,13 +866,14 @@ DocType: Contact Us Settings,Address Line 1,Adres Linia 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Zmienność
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nazwa firmy
 DocType: SMS Center,Total Message(s),
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobacz listę wszystkich filmów pomocy
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,
 DocType: Pricing Rule,Max Qty,Maks. Ilość
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Wiersz {0}: Płatność przeciwko sprzedaży / Zamówienia powinny być zawsze oznaczone jako góry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Wiersz {0}: Płatność przeciwko sprzedaży / Zamówienia powinny być zawsze oznaczone jako góry
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemiczny
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
 DocType: Process Payroll,Select Payroll Year and Month,Wybierz Płace rok i miesiąc
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idź do odpowiedniej grupy (zwykle wykorzystania funduszy> Aktywa obrotowe> rachunków bankowych i utworzyć nowe konto (klikając na Dodaj Child) typu "Bank"
 DocType: Workstation,Electricity Cost,Koszt energii elekrycznej
@@ -885,7 +888,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bia
 DocType: SMS Center,All Lead (Open),
 DocType: Purchase Invoice,Get Advances Paid,Uzyskaj opłacone zaliczki
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Załącz własny obrazek (awatar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Stwórz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Stwórz
 DocType: Journal Entry,Total Amount in Words,
 DocType: Workflow State,Stop,Zatrzymaj
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,
@@ -909,7 +912,7 @@ DocType: Packing Slip Item,Packing Slip Item,
 DocType: POS Profile,Cash/Bank Account,Konto Kasa / Bank
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
 DocType: Delivery Note,Delivery To,Dostawa do
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Stół atrybut jest obowiązkowy
 DocType: Production Planning Tool,Get Sales Orders,Pobierz zamówienia sprzedaży
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nie może być ujemna
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Katalogowanie
@@ -920,12 +923,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"Będą aktuali
 DocType: Project,Internal,
 DocType: Task,Urgent,Pilne
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Proszę podać poprawny identyfikator wiersz dla rzędu {0} w tabeli {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Przejdź do pulpitu i rozpocząć korzystanie ERPNext
 DocType: Item,Manufacturer,Producent
 DocType: Landed Cost Item,Purchase Receipt Item,Przedmiot Potwierdzenia Zakupu
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Kwota sprzedaży
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Czas Logi
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,
 DocType: Serial No,Creation Document No,
 DocType: Issue,Issue,
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atrybuty Element wariantów. np rozmiar, kolor itd."
@@ -940,8 +944,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,
 DocType: Item,Default Selling Cost Center,Domyśle Centrum Kosztów Sprzedaży
 DocType: Sales Partner,Implementation Partner,
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Zamówienie sprzedaży jest {0} {1}
 DocType: Opportunity,Contact Info,Dane kontaktowe
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Dokonywanie stockowe Wpisy
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Dokonywanie stockowe Wpisy
 DocType: Packing Slip,Net Weight UOM,Jednostka miary wagi netto
 DocType: Item,Default Supplier,Domyślny dostawca
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad zasiłkach Procent Produkcji
@@ -950,7 +955,7 @@ DocType: Features Setup,Miscelleneous,
 DocType: Holiday List,Get Weekly Off Dates,Pobierz Tygodniowe zestawienie dat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Data zakończenia nie może być wcześniejsza, niż data rozpoczęcia"
 DocType: Sales Person,Select company name first.,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Wyceny otrzymane od dostawców
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Do {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,Zaktualizowano przed Dziennik Czasu
@@ -978,7 +983,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,
 DocType: Sales Partner,Distributor,Dystrybutor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Koszyk Wysyłka Reguła
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,
 ,Ordered Items To Be Billed,Zamówione produkty do rozliczenia
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od Zakres musi być mniejsza niż do zakresu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,
@@ -1026,7 +1031,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,
 DocType: Lead,Lead,Trop
 DocType: Email Digest,Payables,
 DocType: Account,Warehouse,Magazyn
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
 ,Purchase Order Items To Be Billed,Przedmioty oczekujące na rachunkowość Zamówienia Kupna
 DocType: Purchase Invoice Item,Net Rate,Cena netto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Przedmiot Faktury Zakupu
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Szczegóły płatno
 DocType: Global Defaults,Current Fiscal Year,Obecny rok fiskalny
 DocType: Global Defaults,Disable Rounded Total,Wyłącz Zaokrąglanie Sumy
 DocType: Lead,Call,Połączenie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Wiersz zduplikowany {0} z tym samym {1}
 ,Trial Balance,Zestawienie obrotów i sald
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Konfigurowanie Pracownicy
-sites/assets/js/erpnext.min.js +5,"Grid """,
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Konfigurowanie Pracownicy
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Badania
 DocType: Maintenance Visit Purpose,Work Done,Praca wykonana
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,Wysłano
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Podgląd księgi
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
 DocType: Communication,Delivery Status,Status dostawy
 DocType: Production Order,Manufacture against Sales Order,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Reszta świata
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Reszta świata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} nie może mieć Batch
 ,Budget Variance Report,
 DocType: Salary Slip,Gross Pay,Płaca brutto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dywidendy wypłacone
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Ledger rachunkowości
 DocType: Stock Reconciliation,Difference Amount,Kwota różnicy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Zyski zatrzymane
 DocType: BOM Item,Item Description,Opis produktu
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,Przedmiot Szansy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tymczasowe otwarcia
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Bilans zwolnień pracownika
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
 DocType: Address,Address Type,Typ Adresu
 DocType: Purchase Receipt,Rejected Warehouse,Odrzucony Magazyn
 DocType: GL Entry,Against Voucher,Dowód księgowy
 DocType: Item,Default Buying Cost Center,Domyślne Centrum Kosztów Kupowania
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Aby uzyskać najlepsze z ERPNext, zalecamy, aby poświęcić trochę czasu i oglądać te filmy pomoc."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,do
 DocType: Item,Lead Time in days,Czas oczekiwania w dniach
 ,Accounts Payable Summary,Zobowiązania Podsumowanie
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Brak autoryzacji do edycji zamrożonego Konta {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Brak autoryzacji do edycji zamrożonego Konta {0}
 DocType: Journal Entry,Get Outstanding Invoices,Uzyskaj zaległą fakturę
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
 DocType: Report,Disabled,Wyłączony
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Współczynnik konwersji jednostki miary jest wymagany dla jednostki miary: {0} w Przedmiocie: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Współczynnik konwersji jednostki miary jest wymagany dla jednostki miary: {0} w Przedmiocie: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Wydatki pośrednie
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Wiersz {0}: Ilość jest obowiązkowe
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Rolnictwo
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,Rodzaj płatności
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,
 DocType: Journal Entry Account,Purchase Order,Zamówienie kupna
 DocType: Warehouse,Warehouse Contact Info,Dane kontaktowe dla magazynu
-sites/assets/js/form.min.js +190,Name is required,Imię jest obowiązkowe
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Imię jest obowiązkowe
 DocType: Purchase Invoice,Recurring Type,Powtarzający się typ
 DocType: Address,City/Town,Miasto/Miejscowość
 DocType: Email Digest,Annual Income,Roczny dochód
 DocType: Serial No,Serial No Details,Szczegóły numeru seryjnego
 DocType: Purchase Invoice Item,Item Tax Rate,Stawka podatku dla tej pozycji
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko rachunki kredytowe mogą być połączone z innym wejściem debetowej"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko rachunki kredytowe mogą być połączone z innym wejściem debetowej"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Cel
 DocType: Sales Invoice Item,Edit Description,Edytuj opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Oczekiwany Dostawa Data jest mniejszy niż planowane daty rozpoczęcia.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Dla dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Dla dostawcy
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,
 DocType: Purchase Invoice,Grand Total (Company Currency),Całkowita suma (w walucie firmy)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Razem Wychodzące
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",
 DocType: Authorization Rule,Transaction,
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,
-apps/erpnext/erpnext/config/projects.py +43,Tools,Narzędzia
+apps/frappe/frappe/config/desk.py +7,Tools,Narzędzia
 DocType: Item,Website Item Groups,Grupy przedmiotów strony WWW
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Numer zlecenia produkcyjnego jest obowiązkowy dla celów ewidencji zapasów do produkcji
 DocType: Purchase Invoice,Total (Company Currency),Razem (Spółka Waluta)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,Nazwa stacji roboczej
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,przetwarzanie maila
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
 DocType: Sales Partner,Target Distribution,
-sites/assets/js/desk.min.js +7652,Comments,Komentarze
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentarze
 DocType: Salary Slip,Bank Account No.,Nr konta bankowego
 DocType: Naming Series,This is the number of the last created transaction with this prefix,
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Wskaźnik wyceny jest wymagany dla Przedmiotu {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Wybierz firm
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,
 DocType: Purchase Invoice,Supplier Invoice Date,
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Musisz włączyć Koszyk
-sites/assets/js/form.min.js +212,No Data,Brak danych
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Brak danych
 DocType: Appraisal Template Goal,Appraisal Template Goal,Cel szablonu oceny
 DocType: Salary Slip,Earning,Dochód
 DocType: Payment Tool,Party Account Currency,Partia konto Waluta
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,Partia konto Waluta
 DocType: Purchase Taxes and Charges,Add or Deduct,Dodatki lub Potrącenia
 DocType: Company,If Yearly Budget Exceeded (for expense account),Jeśli Roczny budżet Przekroczono (dla rachunku kosztów)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Zapis {0} jest już powiązany z innym dowodem księgowym
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Zapis {0} jest już powiązany z innym dowodem księgowym
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Łączna wartość zamówienia
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Żywność
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starzenie Zakres 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Numer wizyt
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Waluta Rachunku Zamknięcie musi być {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma punktów dla wszystkich celów powinno być 100. {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacje nie może być puste.
 ,Delivered Items To Be Billed,Dostarczone przedmioty oczekujące na fakturowanie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazyn nie może być zmieniony dla Nr Seryjnego
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},
 DocType: DocField,Description,Opis
 DocType: Authorization Rule,Average Discount,
 DocType: Letter Head,Is Default,Jest domyślny
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Wysokość podatku dla tej pozycj
 DocType: Item,Maintain Stock,Utrzymanie Zapasów
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zbiory wpisy już utworzone dla Produkcji Zakonu
 DocType: Leave Control Panel,Leave blank if considered for all designations,Zostaw puste jeśli jest to rozważane dla wszystkich nominacji
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od DateTime
 DocType: Email Digest,For Company,Dla firmy
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,Adres do wysyłki Nazwa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan Kont
 DocType: Material Request,Terms and Conditions Content,Zawartość regulaminu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,
 DocType: Maintenance Visit,Unscheduled,Nieplanowany
 DocType: Employee,Owned,Zawłaszczony
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Zależy od urlopu bezpłatnego
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Gwarancja / AMC Status
 DocType: GL Entry,GL Entry,
 DocType: HR Settings,Employee Settings,Ustawienia pracownika
 ,Batch-Wise Balance History,
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,"Lista ""Do zrobienia"""
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,"Lista ""Do zrobienia"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Uczeń
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Ilość nie może być wyrażana na minusie
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Wydatki na wynajem
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,
-sites/assets/js/erpnext.min.js +24,No address added yet.,Nie dodano jeszcze adresu.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nie dodano jeszcze adresu.
 DocType: Workstation Working Hour,Workstation Working Hour,Godziny robocze Stacji Roboczej
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analityk
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa JV ilości {2}
 DocType: Item,Inventory,Inwentarz
 DocType: Features Setup,"To enable ""Point of Sale"" view",Aby włączyć "punkt sprzedaży" widzenia
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Płatność nie może być wykonana za pusty koszyk
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Płatność nie może być wykonana za pusty koszyk
 DocType: Item,Sales Details,Szczegóły sprzedaży
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Przypinanie
 DocType: Opportunity,With Items,Z przedmiotami
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Dzień, w którym będą generowane następne faktury. Generowanie wykonywane jest na żądanie."
 DocType: Item Attribute,Item Attribute,Element Atrybut
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Rząd
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Warianty artykuł
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Warianty artykuł
 DocType: Company,Services,Usługi
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Razem ({0})
 DocType: Cost Center,Parent Cost Center,Nadrzędny dział kalkulacji kosztów
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Data początku roku finansowego
 DocType: Employee External Work History,Total Experience,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Pogłębianie
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Koszty dostaw i przesyłek
 DocType: Material Request Item,Sales Order No,Nr Zlecenia Sprzedaży
 DocType: Item Group,Item Group Name,
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Wzięty
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Wzięty
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiały transferowe dla Produkcja
 DocType: Pricing Rule,For Price List,Dla Listy Cen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Szukanie wykonawcze
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,Harmonogramy
 DocType: Purchase Invoice Item,Net Amount,Kwota netto
 DocType: Purchase Order Item Supplied,BOM Detail No,
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatkowa kwota rabatu (waluta firmy)
-DocType: Period Closing Voucher,CoA Help,
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Błąd: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Błąd: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,
 DocType: Maintenance Visit,Maintenance Visit,Wizyta Konserwacji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klient >  Grupa klientów > Terytorium
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Ugruntowany Koszt Pomocy
 DocType: Event,Tuesday,Wtorek
 DocType: Leave Block List,Block Holidays on important days.,Blok Wakacje na ważne dni.
 ,Accounts Receivable Summary,Należności Podsumowanie
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Pozostawia dla typu {0} już przydzielonego Pracodawcy dla {1} {2} okresu - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Proszę ustawić pole ID użytkownika w rekordzie pracownika do roli pracownika zestawu
 DocType: UOM,UOM Name,Nazwa Jednostki Miary
 DocType: Top Bar Item,Target,
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Wejście księgowe dla {0} może być dokonywane wyłącznie w walucie: {1}
 DocType: Pricing Rule,Pricing Rule,Reguła cenowa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Nacinania
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materiał Wniosek o Zamówieniu
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiał Wniosek o Zamówieniu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Wiersz # {0}: wracającą rzecz {1} nie istnieje w {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Konta bankowe
 ,Bank Reconciliation Statement,Stan uzgodnień z wyciągami z banku
 DocType: Address,Lead Name,Nazwa Tropu
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Saldo otwierające zapasy
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Saldo otwierające zapasy
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} musi pojawić się tylko raz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nie wolno przesyłaj więcej niż {0} {1} przeciwko Zamówienia {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Urlop przedzielony z powodzeniem dla {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Urlop przedzielony z powodzeniem dla {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Brak Przedmiotów do pakowania
 DocType: Shipping Rule Condition,From Value,Od wartości
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Kwoty nie odzwierciedlone w banku
 DocType: Quality Inspection Reading,Reading 4,Odczyt 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Zwrot wydatków
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,Numer komórkowy kontaktu
 DocType: Production Planning Tool,Select Sales Orders,
 ,Material Requests for which Supplier Quotations are not created,
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Oznacz jako Dostawa
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Dodać Oferta
 DocType: Dependent Task,Dependent Task,Zadanie zależne
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Spróbuj planowania operacji dla X dni wcześniej.
 DocType: HR Settings,Stop Birthday Reminders,
 DocType: SMS Center,Receiver List,Lista odbiorców
 DocType: Payment Tool Detail,Payment Amount,Kwota płatności
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Skonsumowana wartość
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Zobacz
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobacz
 DocType: Salary Structure Deduction,Salary Structure Deduction,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektywne spiekanie laserowe
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koszt Emitowanych Przedmiotów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Ilość nie może być większa niż {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,Domyślnie konto płatności
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ustawienia dla internetowego koszyka, takie jak zasady żeglugi, cennika itp"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Konfiguracja zakończona
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% rozliczono
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Zarezerwowana ilość
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Zarezerwowana ilość
 DocType: Party Account,Party Account,Konto Grupy
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Kadry
 DocType: Lead,Upper Income,
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Włącz Koszyk
 DocType: Employee,Permanent Address,Stały adres
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Zaliczki wypłaconej przed {0} {1} nie może być większa \ niż RAZEM {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Wybierz kod produktu
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Zmniejsz potrącenie za Bezpłatny Urlop
 DocType: Territory,Territory Manager,
+DocType: Delivery Note Item,To Warehouse (Optional),Aby Warehouse (opcjonalnie)
 DocType: Sales Invoice,Paid Amount (Company Currency),Zapłacona kwota (waluta firmy)
 DocType: Purchase Invoice,Additional Discount,Dodatkowe zniżki
 DocType: Selling Settings,Selling Settings,Ustawienia Sprzedaży
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Górnictwo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Odlewy z żywicy
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa Odbiorców posiada taką nazwę - wprowadź inną nazwę Odbiorcy lub zmień nazwę Grupy  
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Proszę najpierw wybrać {0}.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Proszę najpierw wybrać {0}.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0}
 DocType: Territory,Parent Territory,Nadrzędne terytorium
 DocType: Quality Inspection Reading,Reading 2,Odczyt 2
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,Nr Partii
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zezwalaj na wiele zleceń sprzedaży wobec Klienta Zamówienia
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Główny
 DocType: DocPerm,Delete,Usuń
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Wariant
-sites/assets/js/desk.min.js +7971,New {0},Nowy rekord {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Wariant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nowy rekord {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
 DocType: Employee,Leave Encashed?,
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Szansa Od pola jest obowiązkowe
 DocType: Item,Variants,Warianty
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Kraj
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresy
 DocType: Communication,Received,Otrzymano
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Przeciwko Urzędowym Wejście {0} nie ma niezrównaną pozycję {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Przeciwko Urzędowym Wejście {0} nie ma niezrównaną pozycję {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Zduplikowany Nr Seryjny wprowadzony dla przedmiotu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Warunkiem art wysyłka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Produkt nie może mieć produkcja na zamówienie.
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,
 DocType: Communication,Rejected,Odrzucono
 DocType: Pricing Rule,Brand,Marka
 DocType: Item,Will also apply for variants,Również zastosowanie do wariantów
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% dostarczonych
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,
 DocType: Sales Order Item,Actual Qty,Rzeczywista Ilość
 DocType: Sales Invoice Item,References,Referencje
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Strzyżenie
 DocType: Item,Has Variants,Ma Warianty
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Okres Od i Okres Do dat jest obowiązkowo dla powtarzających %s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakowania i etykietowania
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nazwa dystrybucji miesięcznej
 DocType: Sales Person,Parent Sales Person,Nadrzędny Przedstawiciel Handlowy
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Sprecyzuj domyślną walutę w ustawieniach firmy i globalnych
 DocType: Dropbox Backup,Dropbox Access Secret,Sekret do Dostępu do Dropboxa
 DocType: Purchase Invoice,Recurring Invoice,Powtarzająca się faktura
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Zarządzanie projektami
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Zarządzanie projektami
 DocType: Supplier,Supplier of Goods or Services.,Dostawca towarów lub usług.
 DocType: Budget Detail,Fiscal Year,Rok Podatkowy
 DocType: Cost Center,Budget,Budżet
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Sprzedaż
 DocType: Employee,Salary Information,
 DocType: Sales Person,Name and Employee ID,Imię i Identyfikator Pracownika
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
 DocType: Website Item Group,Website Item Group,Grupa przedmiotów strony WWW
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Podatki i cła
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} wpisy płatności nie mogą być filtrowane przez {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} wpisy płatności nie mogą być filtrowane przez {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela dla pozycji, które zostaną pokazane w Witrynie"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dostarczane szt
 DocType: Material Request Item,Material Request Item,
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,
 ,Item-wise Purchase History,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Czerwony
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},
 DocType: Account,Frozen,Zamrożony
 ,Open Production Orders,Otwórz zamówienia produkcji
 DocType: Installation Note,Installation Time,Czas instalacji
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Trendy Wyceny
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Pozycja Grupa nie wymienione w pozycji do pozycji mistrza {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debet na konto musi być rachunkiem otrzymującym
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",
 DocType: Shipping Rule Condition,Shipping Amount,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Łączący
 DocType: Authorization Rule,Above Value,Wartość Powyżej
 ,Pending Amount,Kwota Oczekiwana
 DocType: Purchase Invoice Item,Conversion Factor,Współczynnik konwersji
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Dostarczono
+DocType: Purchase Order,Delivered,Dostarczono
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),
 DocType: Purchase Receipt,Vehicle Number,Numer pojazdu
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Rozpowszechnianie opła
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,
 DocType: HR Settings,HR Settings,Ustawienia HR
 apps/frappe/frappe/config/setup.py +130,Printing,Druk
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Zwrot Kosztów jest w oczekiwaniu na potwierdzenie. Tylko osoba zatwierdzająca wydatki może uaktualnić status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Zwrot Kosztów jest w oczekiwaniu na potwierdzenie. Tylko osoba zatwierdzająca wydatki może uaktualnić status.
 DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,
-sites/assets/js/desk.min.js +7805,and,i
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,Wycena
 DocType: Salary Slip,Total Deduction,
 DocType: Quotation,Maintenance User,Użytkownik Konserwacji
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Koszt Zaktualizowano
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Czy na pewno chcesz odetkać
 DocType: Employee,Date of Birth,Data urodzenia
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Rok finansowy** reprezentuje rok finansowy. Wszystkie zapisy księgowe oraz inne znaczące transakcje są śledzone przed ** roku podatkowego **.
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Śledź kampanię sprzedażową. Śledź Tropy, Wyceny, Zamówienia Sprzedaży etc. z kampanii by zmierzyć zwrot z inwestycji."
 DocType: Expense Claim,Approver,Osoba zatwierdzająca
 ,SO Qty,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Zbiory występować przeciwko wpisy magazynu {0}, a więc nie można ponownie przypisać lub zmienić Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Zbiory występować przeciwko wpisy magazynu {0}, a więc nie można ponownie przypisać lub zmienić Warehouse"
 DocType: Appraisal,Calculate Total Score,Oblicz całkowity wynik
 DocType: Supplier Quotation,Manufacturing Manager,Kierownik Produkcji
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,
 apps/erpnext/erpnext/hooks.py +84,Shipments,Przesyłki
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Odlewnictwo DIP
+DocType: Purchase Order,To be delivered to customer,Być dostarczone do klienta
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Czas Zaloguj status musi być złożony.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Numer seryjny: {0} nie należy do żadnej Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Konfigurowanie
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Od Waluty
 DocType: DocField,Name,Imię
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Proszę wybrać Przyznana kwota, faktury i faktury Rodzaj numer w conajmniej jednym rzędzie"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Kwoty nie odzwierciedlone w systemie
 DocType: Purchase Invoice Item,Rate (Company Currency),Stawka (waluta firmy)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Inni
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Ustaw jako Stopped
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nie możesz znaleźć pasujący element. Proszę wybrać jakąś inną wartość dla {0}.
 DocType: POS Profile,Taxes and Charges,Podatki i opłaty
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt lub usługa, która jest kupiona, sprzedana lub przechowywana w magazynie."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Przeciągarki
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankowość
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nowe Centrum Kosztów
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nowe Centrum Kosztów
 DocType: Bin,Ordered Quantity,Zamówiona Ilość
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
 DocType: Quality Inspection,In Process,
 DocType: Authorization Rule,Itemwise Discount,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
+DocType: Purchase Order Item,Reference Document Type,Oznaczenie typu dokumentu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
 DocType: Account,Fixed Asset,Trwała własność
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Inwentaryzacja w odcinkach
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inwentaryzacja w odcinkach
 DocType: Activity Type,Default Billing Rate,Domyślnie Cena płatności
 DocType: Time Log Batch,Total Billing Amount,Łączna kwota płatności
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Konto Należności
 ,Stock Balance,
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Płatności do zamówienia sprzedaży
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Płatności do zamówienia sprzedaży
 DocType: Expense Claim Detail,Expense Claim Detail,Szczegóły o zwrotach kosztów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Czas Logi utworzone:
 DocType: Item,Weight UOM,Waga jednostkowa
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit To account must be a Payable account
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},
 DocType: Production Order Operation,Completed Qty,Ukończona wartość
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Dla {0}, tylko rachunki płatnicze mogą być połączone z innym wejściem kredytową"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Cennik {0} jest wyłączony
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Dla {0}, tylko rachunki płatnicze mogą być połączone z innym wejściem kredytową"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Cennik {0} jest wyłączony
 DocType: Manufacturing Settings,Allow Overtime,Pozwól Nadgodziny
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Zlecenie Sprzedaży {0} jest wstrzymane
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numery seryjne wymagane dla pozycji {1}. Podałeś {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktualny Wycena Cena
 DocType: Item,Customer Item Codes,Kody Pozycja klienta
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Spawanie
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Wymagana jest nowa jednostka miary stanu
 DocType: Quality Inspection,Sample Size,Wielkość próby
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 DocType: Project,External,Zewnętrzny
 DocType: Features Setup,Item Serial Nos,
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Użytkownicy i uprawnienia
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,M
 DocType: Sales Partner,Address & Contacts,Adresy i kontakty
 DocType: SMS Log,Sender Name,
 DocType: Page,Title,
-sites/assets/js/list.min.js +104,Customize,Dostosuj
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Dostosuj
 DocType: POS Profile,[Select],[Wybierz]
 DocType: SMS Log,Sent To,Wysłane Do
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Nowa faktura sprzedaży
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Zakończenie okresu eksploatacji
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Podróż
 DocType: Leave Block List,Allow Users,
+DocType: Purchase Order,Customer Mobile No,Komórka klienta Nie
 DocType: Sales Invoice,Recurring,Powtarzający się
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Śledź oddzielny przychodów i kosztów dla branż produktowych lub oddziałów.
 DocType: Rename Tool,Rename Tool,Zmień nazwę narzędzia
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Zaktualizuj Koszt
 DocType: Item Reorder,Item Reorder,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",
 DocType: Purchase Invoice,Price List Currency,Waluta cennika
 DocType: Naming Series,User must always select,Użytkownik musi zawsze zaznaczyć
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,Pracownik
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importowania wiadomości z
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Zaproś jako Użytkownik
 DocType: Features Setup,After Sale Installations,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} jest w pełni rozliczone
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} jest w pełni rozliczone
 DocType: Workstation Working Hour,End Time,Czas zakończenia
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupuj według Podstawy księgowania
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,
 DocType: Page,Standard,
 DocType: Rename Tool,File to Rename,Plik to zmiany nazwy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaż Płatności
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Określone BOM {0} nie istnieje dla pozycji {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plan Konserwacji {0} musi być anulowany przed usunięciem tego zamówienia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plan Konserwacji {0} musi być anulowany przed usunięciem tego zamówienia
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Rozmiar
 DocType: Notification Control,Expense Claim Approved,Zwrot Kosztów zatwierdzony
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutyczny
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),
 DocType: Warranty Claim,Raised By,Wywołany przez
 DocType: Payment Tool,Payment Account,Konto Płatność
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
-sites/assets/js/list.min.js +23,Draft,Wersja robocza
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Wersja robocza
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,
 DocType: Quality Inspection Reading,Accepted,Przyjęte
 DocType: User,Female,Kobieta
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Surowce nie może być puste.
 DocType: Newsletter,Test,
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Jak są istniejące transakcji giełdowych dla tej pozycji, \ nie można zmienić wartości "Czy numer seryjny", "Czy Batch Nie ',' Czy Pozycja Zdjęcie" i "Metoda wyceny""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Szybkie Księgowanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,
 DocType: Employee,Previous Work Experience,Poprzednie doświadczenie zawodowe
 DocType: Stock Entry,For Quantity,Dla Ilości
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} nie zostało dodane
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Zamówienia produktów.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} nie zostało dodane
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zamówienia produktów.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,
 DocType: Purchase Invoice,Terms and Conditions1,
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Pełna konfiguracja
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Biuletyn Mailing
 DocType: Delivery Note,Transporter Name,Nazwa przewoźnika
 DocType: Contact,Enter department to which this Contact belongs,"Wpisz dział, to którego należy ten kontakt"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Razem Nieobecny
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Jednostka miary
 DocType: Fiscal Year,Year End Date,Data końca roku
 DocType: Task Depends On,Task Depends On,Zadanie Zależy od
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Końcowa data kontraktu musi być większa od Daty Członkowstwa
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Dystrybutor strona trzecia / handlowiec / prowizji agenta / partner / sprzedawcę, który sprzedaje produkty firm z tytułu prowizji."
 DocType: Customer Group,Has Child Node,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Wpisz parametry statycznego URL tutaj (np. nadawca=ERPNext, nazwa użytkownika=ERPNext, hasło=1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie w każdym aktywnym roku podatkowego. Aby uzyskać więcej informacji sprawdź {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,
@@ -2067,11 +2078,9 @@ DocType: Note,Note,Notatka
 DocType: Purchase Receipt Item,Recd Quantity,Zapisana Ilość
 DocType: Email Account,Email Ids,E-mail identyfikatory
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nie można wyprodukować więcej przedmiotów {0} niż wartość {1} na Zamówieniu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Ustaw jako niezatrzymanego
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
 DocType: Payment Reconciliation,Bank / Cash Account,Konto Bank / Gotówka
 DocType: Tax Rule,Billing City,Rozliczenia Miasto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Zostaw Ta aplikacja oczekuje na zatwierdzenie. Tylko Zostaw zatwierdzająca może aktualizować status.
 DocType: Global Defaults,Hide Currency Symbol,Ukryj symbol walutowy
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","np. Bank, Gotówka, Karta kredytowa"
 DocType: Journal Entry,Credit Note,
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Razem (szt)
 DocType: Installation Note Item,Installed Qty,Liczba instalacji
 DocType: Lead,Fax,Faks
 DocType: Purchase Taxes and Charges,Parenttype,Typ Nadrzędności
-sites/assets/js/list.min.js +26,Submitted,
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,
 DocType: Salary Structure,Total Earning,
 DocType: Purchase Receipt,Time at which materials were received,
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje adresy
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,lub
 DocType: Sales Order,Billing Status,Status Faktury
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Wydatki na usługi komunalne
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Ponad
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Ponad
 DocType: Buying Settings,Default Buying Price List,Domyślna Lista Cen Kupowania
 ,Download Backups,Pobierz Kopie zapasowe
 DocType: Notification Control,Sales Order Message,Informacje Zlecenia Sprzedaży
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Wybierz Pracownicy
 DocType: Bank Reconciliation,To Date,Do daty
 DocType: Opportunity,Potential Sales Deal,Szczegóły potencjalnych sprzedaży
-sites/assets/js/form.min.js +308,Details,Szczegóły
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Szczegóły
 DocType: Purchase Invoice,Total Taxes and Charges,
 DocType: Employee,Emergency Contact,Kontakt na wypadek nieszczęśliwych wypadków
 DocType: Item,Quality Parameters,Parametry jakościowe
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,Otrzymana ilość
 DocType: Stock Entry Detail,Serial No / Batch,
 DocType: Product Bundle,Parent Item,Element nadrzędny
 DocType: Account,Account Type,Typ konta
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plan Konserwacji nie jest generowany dla wszystkich przedmiotów. Proszę naciśnij ""generuj plan"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plan Konserwacji nie jest generowany dla wszystkich przedmiotów. Proszę naciśnij ""generuj plan"""
 ,To Produce,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Do rzędu {0} w {1}. Aby dołączyć {2} w cenę towaru, wiersze {3} musi być włączone"
 DocType: Packing Slip,Identification of the package for the delivery (for print),
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Spłaszczenie
 DocType: Account,Income Account,Konto przychodów
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Odlewanie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Dostarczanie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dostarczanie
 DocType: Stock Reconciliation Item,Current Qty,Obecna ilość
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",
 DocType: Appraisal Goal,Key Responsibility Area,Kluczowy obszar obowiązków
@@ -2168,9 +2177,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Wszystkie adresy
 DocType: Company,Stock Settings,Ustawienia magazynu
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Połączenie jest możliwe tylko wtedy, gdy następujące właściwości są takie same w obu płyt. Czy Grupa Root Typ, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Połączenie jest możliwe tylko wtedy, gdy następujące właściwości są takie same w obu płyt. Czy Grupa Root Typ, Firma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nazwa nowego Centrum Kosztów
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nazwa nowego Centrum Kosztów
 DocType: Leave Control Panel,Leave Control Panel,Panel do obsługi Urlopów
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Nie znaleziono adresu domyślnego szablonu. Proszę utworzyć nowy Setup> Druk i Branding> Szablon adresowej.
 DocType: Appraisal,HR User,Kadry - użytkownik
@@ -2189,24 +2198,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Szczegóły Narzędzia Płatności
 ,Sales Browser,
 DocType: Journal Entry,Total Credit,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokalne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Inwestycje finansowe i udzielone pożyczki (aktywa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dłużnicy
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Duży
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nie znaleziono pracowników!
 DocType: C-Form Invoice Detail,Territory,Terytorium
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,
+DocType: Purchase Order,Customer Address Display,Adres klienta Wyświetlacz
 DocType: Stock Settings,Default Valuation Method,Domyślna metoda wyceny
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polerowanie
 DocType: Production Order Operation,Planned Start Time,Planowany czas rozpoczęcia
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Przydzielone
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Sporządzenie Bilansu oraz Rachunku zysków i strat.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniony bezpośrednio, ponieważ \ masz już jakąś transakcję (y) z innym UOM. Aby zmienić domyślny UOM, \ stosowanie "Jednostka miary" Utility wymienić narzędzie pod modułem Seryjna."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Określ Kursy walut konwersji jednej waluty w drugą
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Wycena {0} jest anulowana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Wycena {0} jest anulowana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Łączna kwota
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Pracownik {0} był na zwolnieniu {1}. Nie można zaznaczyć obecności.
 DocType: Sales Partner,Targets,Cele
@@ -2221,12 +2230,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Należy ustalić własny Plan Kont zanim rozpocznie się księgowanie
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignoruj Reguły ​​Cen
-sites/assets/js/list.min.js +24,Cancelled,Anulowano
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Anulowano
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od tej pory w strukturze wynagrodzeń nie może być mniejsza niż Pracowniczych Łączenie Data.
 DocType: Employee Education,Graduate,Absolwent
 DocType: Leave Block List,Block Days,
 DocType: Journal Entry,Excise Entry,Akcyza Wejścia
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Ostrzeżenie: Zamówienie sprzedaży {0} już istnieje wobec Klienta Zamówienia {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Ostrzeżenie: Zamówienie sprzedaży {0} już istnieje wobec Klienta Zamówienia {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2283,17 +2292,17 @@ DocType: Account,Stock Received But Not Billed,"Przyjęte na stan, nie zapłacon
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,
 DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji
 DocType: Features Setup,Sales and Purchase,
-DocType: Purchase Order Item,Material Request No,
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Kontrola jakości wymagana dla Przedmiotu {0}
+DocType: Supplier Quotation Item,Material Request No,
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kontrola jakości wymagana dla Przedmiotu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty firmy
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} została pomyślnie wypisany z listy.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Cena netto (Spółka Waluta)
-apps/frappe/frappe/templates/base.html +132,Added,Dodano
+apps/frappe/frappe/templates/base.html +134,Added,Dodano
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,
 DocType: Journal Entry Account,Sales Invoice,Faktura sprzedaży
 DocType: Journal Entry Account,Party Balance,Bilans Grupy
 DocType: Sales Invoice Item,Time Log Batch,
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Proszę wybrać Zastosuj RABAT
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Proszę wybrać Zastosuj RABAT
 DocType: Company,Default Receivable Account,Domyślnie konto należności
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Utwórz zapis bankowy dla sumy wynagrodzenia dla wybranych wyżej kryteriów
 DocType: Stock Entry,Material Transfer for Manufacture,Materiał transferu dla Produkcja
@@ -2304,7 +2313,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Pobierz odpowiednie pozycje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Zapis księgowy dla zapasów
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,
 DocType: Sales Invoice,Customer Address,Adres klienta
 apps/frappe/frappe/desk/query_report.py +136,Total,
 DocType: Purchase Invoice,Apply Additional Discount On,Zastosuj dodatkowe zniżki na
@@ -2319,13 +2328,15 @@ DocType: Quality Inspection,Quality Inspection,Kontrola jakości
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formowania
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Konto {0} jest zamrożone
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} jest zamrożone
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Osobowość prawna / Filia w oddzielny planu kont należących do Organizacji.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Żywność, Trunki i Tytoń"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL albo BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Wartość prowizji nie może być większa niż 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalny poziom zapasów
 DocType: Stock Entry,Subcontract,Zlecenie
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Podaj {0} pierwszy
 DocType: Production Planning Tool,Get Items From Sales Orders,Uzyskaj pozycje z zamówień sprzedaży
 DocType: Production Order Operation,Actual End Time,Rzeczywisty czas zakończenia
 DocType: Production Planning Tool,Download Materials Required,Ściągnij Potrzebne Materiały
@@ -2342,9 +2353,9 @@ DocType: Maintenance Visit,Scheduled,Zaplanowane
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Proszę wybrać produkt, gdzie "Czy Pozycja Zdjęcie" brzmi "Nie" i "Czy Sales Item" brzmi "Tak", a nie ma innego Bundle wyrobów"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Wybierz dystrybucji miesięcznej się nierównomiernie rozprowadzić cele całej miesięcy.
 DocType: Purchase Invoice Item,Valuation Rate,Wskaźnik wyceny
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Pozycja Wiersz {0}: Zakup Otrzymanie {1} nie istnieje w tabeli powyżej Zakup kwitów ''
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3} 
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3} 
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data startu projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Zmień nazwę dziennika
@@ -2371,13 +2382,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,
 DocType: Expense Claim,Expense Approver,Osoba zatwierdzająca wydatki
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,
-sites/assets/js/erpnext.min.js +48,Pay,Zapłacone
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Zapłacone
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Aby DateTime
 DocType: SMS Settings,SMS Gateway URL,
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logi do utrzymania sms stan przesyłki
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Szlifowanie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Pakowania w folię termokurczliwą
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Oczekujące Inne
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Oczekujące Inne
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potwierdzone
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dostawca> Typ dostawcy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,
@@ -2388,7 +2399,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Wpi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Wybierz rok podatkowy
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Wytapianie
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poziom Uporządkowania
 DocType: Attendance,Attendance Date,
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,
@@ -2424,6 +2434,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w grupę
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Spadek wartości
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dostawca(y)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Nieprawidłowy okres
 DocType: Customer,Credit Limit,
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Wybierz rodzaj transakcji
 DocType: GL Entry,Voucher No,Nr Podstawy księgowania
@@ -2433,8 +2444,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,
 DocType: Customer,Address and Contact,Adres i Kontakt
 DocType: Customer,Last Day of the Next Month,Ostatni dzień następnego miesiąca
 DocType: Employee,Feedback,Informacja zwrotna
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Harmonogram
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Harmonogram
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Obróbka strumieniowa ścierne
 DocType: Stock Settings,Freeze Stock Entries,Zamroź Wpisy do Asortymentu
 DocType: Website Settings,Website Settings,Ustawienia strony internetowej
@@ -2448,11 +2459,11 @@ DocType: Quality Inspection,Outgoing,Wychodzący
 DocType: Material Request,Requested For,
 DocType: Quotation Item,Against Doctype,
 DocType: Delivery Note,Track this Delivery Note against any Project,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Pokaż zapisy stanu
 ,Is Primary Address,Czy Podstawowy Adres
 DocType: Production Order,Work-in-Progress Warehouse,Magazyn z produkcją w toku
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Odnośnik #{0} wpisano z datą {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Odnośnik #{0} wpisano z datą {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Zarządzaj adresy
 DocType: Pricing Rule,Item Code,Kod identyfikacyjny
 DocType: Production Planning Tool,Create Production Orders,Utwórz Zamówienie produkcji
@@ -2461,14 +2472,14 @@ DocType: Journal Entry,User Remark,Spostrzeżenie Użytkownika
 DocType: Lead,Market Segment,
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Historia zatrudnienia pracownika w firmie
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Zamknięcie (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zamknięcie (Dr)
 DocType: Contact,Passive,
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,
 DocType: Sales Invoice,Write Off Outstanding Amount,Nieuregulowana Wartość Odpisu
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",
 DocType: Account,Accounts Manager,Menedżer kont
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',
 DocType: Stock Settings,Default Stock UOM,Domyślna jednostka miary Asortymentu
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Kalkulacja kosztów Ocena na podstawie rodzajów działalności (za godzinę)
 DocType: Production Planning Tool,Create Material Requests,
@@ -2479,7 +2490,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Uzgodnienia z wyciągiem bankow
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Pobierz aktualizacje
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodaj kilka rekordów przykładowe
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Zarządzanie urlopami
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Zarządzanie urlopami
 DocType: Event,Groups,Grupy
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupuj według konta
 DocType: Sales Order,Fully Delivered,Całkowicie Dostarczono
@@ -2491,11 +2502,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budżet dla konta {1} z MPK {2} będzie przekroczony o {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Pole 'Od daty' musi następować później niż 'Do daty'
 ,Stock Projected Qty,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Klienta Zamówienia
 DocType: Warranty Claim,From Company,Od Firmy
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Wartość albo Ilość
@@ -2508,13 +2518,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredyty na konto musi być kontem Bilans
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Typy wszystkich dostawców
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Wycena {0} nie jest typem {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Wycena {0} nie jest typem {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Przedmiot Planu Konserwacji
 DocType: Sales Order,%  Delivered,% dostarczono
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kredyt w rachunku bankowym
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Wznów
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Przeglądaj BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pożyczki
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,
@@ -2524,7 +2533,7 @@ DocType: Appraisal,Appraisal,Ocena
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Pianka do odlewania Lost-
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Rysunek
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data jest powtórzona
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Zatwierdzający urlop musi być jednym z {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Zatwierdzający urlop musi być jednym z {0}
 DocType: Hub Settings,Seller Email,Sprzedawca email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Całkowity koszt zakupu (faktura zakupu za pośrednictwem)
 DocType: Workstation Working Hour,Start Time,Czas rozpoczęcia
@@ -2538,8 +2547,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Kwota netto (Waluta Spółki)
 DocType: BOM Operation,Hour Rate,Stawka godzinowa
 DocType: Stock Settings,Item Naming By,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Z Wyceny
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Z Wyceny
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},
 DocType: Production Order,Material Transferred for Manufacturing,Materiał Przeniesiony do Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} nie istnieje
 DocType: Purchase Receipt Item,Purchase Order Item No,Nr przedmiotu Zamówienia Kupna
@@ -2552,11 +2561,11 @@ DocType: Item,Inspection Required,Wymagana kontrola
 DocType: Purchase Invoice Item,PR Detail,
 DocType: Sales Order,Fully Billed,Całkowicie Rozliczone
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Dostawa wymagane dla magazynu pozycji magazynie {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dostawa wymagane dla magazynu pozycji magazynie {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Użytkownicy z tą rolą mogą ustawiać zamrożone konta i tworzyć / modyfikować wpisy księgowe dla zamrożonych kont
 DocType: Serial No,Is Cancelled,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Moje Przesyłki
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje Przesyłki
 DocType: Journal Entry,Bill Date,Data Rachunku
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Nawet jeśli istnieje wiele przepisów dotyczących cen o najwyższym priorytecie, a następnie następujące priorytety wewnętrznej są stosowane:"
 DocType: Supplier,Supplier Details,Szczegóły dostawcy
@@ -2569,7 +2578,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Przelew
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Wybierz konto Bankowe
 DocType: Newsletter,Create and Send Newsletters,Utwórz i wyślij biuletyny
-sites/assets/js/report.min.js +107,From Date must be before To Date,Data od musi być przed datą do
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Data od musi być przed datą do
 DocType: Sales Order,Recurring Order,Powtarzające się Zamówienie
 DocType: Company,Default Income Account,Domyślne konto przychodów
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupa Klientów / Klient
@@ -2584,31 +2593,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Jednostka
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Zamówienia Kupna {0} nie zostało wysłane
 ,Projected,Prognozowany
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,
 DocType: Notification Control,Quotation Message,Wiadomość Wyceny
 DocType: Issue,Opening Date,Data Otwarcia
 DocType: Journal Entry,Remark,Uwaga
 DocType: Purchase Receipt Item,Rate and Amount,Stawka i Ilość
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Nudny
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Od Zamówienia Sprzedaży
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od Zamówienia Sprzedaży
 DocType: Blog Category,Parent Website Route,Nadrzędna Trasa Strony WWW
 DocType: Sales Order,Not Billed,Nie zaksięgowany
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Nie dodano jeszcze żadnego kontaktu.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nie dodano jeszcze żadnego kontaktu.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nie aktywny
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Data księgowania faktury przed
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Kwota Kosztu Voucheru
 DocType: Time Log,Batched for Billing,
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Rachunki od dostawców.
 DocType: POS Profile,Write Off Account,Konto Odpisu
-sites/assets/js/erpnext.min.js +26,Discount Amount,Wartość zniżki
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Wartość zniżki
 DocType: Purchase Invoice,Return Against Purchase Invoice,Powrót Against dowodu zakupu
 DocType: Item,Warranty Period (in days),Okres gwarancji (w dniach)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,np. VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pozycja 4
 DocType: Journal Entry Account,Journal Entry Account,Konto zapisu
 DocType: Shopping Cart Settings,Quotation Series,Serie Wyeceny
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",Istnieje element  o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",Istnieje element  o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gorący gaz formowania metali
 DocType: Sales Order Item,Sales Order Date,Data Zlecenia
 DocType: Sales Invoice Item,Delivered Qty,Dostarczona Liczba jednostek
@@ -2640,10 +2648,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Klienta lub dostawcy Szczegóły
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Zbiór
 DocType: Lead,Lead Owner,Właściciel Tropu
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Magazyn jest wymagany
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Magazyn jest wymagany
 DocType: Employee,Marital Status,
 DocType: Stock Settings,Auto Material Request,
 DocType: Time Log,Will be updated when billed.,
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Ilosc w serii dostępne z magazynu
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data przejścia na emeryturę musi być większa niż Data wstąpienia
 DocType: Sales Invoice,Against Income Account,Konto przychodów
@@ -2660,12 +2669,12 @@ DocType: POS Profile,Update Stock,Zaktualizuj Asortyment
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Dogładzenie
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Kursy
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Zapisy księgowe {0} są un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Zapis wszystkich komunikatów typu e-mail, telefon, czat, wizyty, itd"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Powołaj zaokrąglić centrum kosztów w Spółce
 DocType: Purchase Invoice,Terms,Warunki
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Utwórz nowy
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Utwórz nowy
 DocType: Buying Settings,Purchase Order Required,Wymagane jest Zamówienia Kupna
 ,Item-wise Sales History,
 DocType: Expense Claim,Total Sanctioned Amount,
@@ -2682,16 +2691,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notatki
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Na początku wybierz węzeł grupy.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cel musi być jednym z {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Wypełnij formularz i zapisz
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Wypełnij formularz i zapisz
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Ściągnij raport zawierający surowe dokumenty z najnowszym statusem zapasu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Społeczność Forum
 DocType: Leave Application,Leave Balance Before Application,Status Urlopu przed Wnioskiem
 DocType: SMS Center,Send SMS,
 DocType: Company,Default Letter Head,Domyślny nagłówek Listowy
 DocType: Time Log,Billable,Rozliczalny
 DocType: Authorization Rule,This will be used for setting rule in HR module,
 DocType: Account,Rate at which this tax is applied,Stawka przy użyciu której ten podatek jest aplikowany
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Ilość do ponownego zamówienia
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Ilość do ponownego zamówienia
 DocType: Company,Stock Adjustment Account,
 DocType: Journal Entry,Write Off,Strata do odpisania
 DocType: Time Log,Operation ID,Operacja ID
@@ -2702,12 +2712,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Pola zniżek będą dostępne w Zamówieniu Kupna, Potwierdzeniu Kupna, Fakturze Kupna"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nazwa nowego konta. Uwaga: Proszę nie tworzyć konta dla odbiorców i dostawców
 DocType: Report,Report Type,Typ raportu
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Wczytywanie
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Wczytywanie
 DocType: BOM Replace Tool,BOM Replace Tool,
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Szablony Adresów na dany kraj
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Dostawca dostarcza Klientowi
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Pokaż Podatek rozpad
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import i eksport danych
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktura Data zamieszczenia
 DocType: Sales Invoice,Rounded Total,Końcowa zaokrąglona kwota
 DocType: Product Bundle,List items that form the package.,
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Przydział Procentowy powinien wynosić 100%
@@ -2718,8 +2731,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0}
 DocType: Company,Default Cash Account,Domyślne Konto Gotówkowe
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Wartość zapłaty + Wartość odliczenia nie może być większa niż Cała Kwota
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},
@@ -2740,11 +2753,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Wiersz {0}: Taka ilość nie jest dostępna w magazynie {1} w {2} {3}. Dostępna liczba to: {4}, Przenieś: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pozycja 3
+DocType: Purchase Order,Customer Contact Email,Kontakt z klientem e-mail
 DocType: Event,Sunday,Niedziela
 DocType: Sales Team,Contribution (%),Udział (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Obowiązki
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Szablon
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Szablon
 DocType: Sales Person,Sales Person Name,
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj użytkowników
@@ -2753,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),Rzeczywista Data Rozpoczęcia (p
 DocType: Stock Reconciliation Item,Before reconciliation,Przed pojednania
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Do {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
 DocType: Sales Order,Partly Billed,Częściowo Zapłacono
 DocType: Item,Default BOM,Domyślny Wykaz Materiałów
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2761,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Razem Najlepszy Amt
 DocType: Time Log Batch,Total Hours,
 DocType: Journal Entry,Printing Settings,Ustawienia drukowania
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Wtrysk Metal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Od Dowodu Dostawy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od Dowodu Dostawy
 DocType: Time Log,From Time,Od czasu
 DocType: Notification Control,Custom Message,Niestandardowa wiadomość
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,
@@ -2782,10 +2795,10 @@ DocType: Newsletter,A Lead with this email id should exist,Sygnał z tym adresem
 DocType: Stock Entry,From BOM,Od BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Podstawowy
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transakcji giełdowych przed {0} są zamrożone
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Plan"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Plan"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","np. Kg, Jednostka, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Nr Odniesienia jest obowiązkowy jest wprowadzono Datę Odniesienia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Nr Odniesienia jest obowiązkowy jest wprowadzono Datę Odniesienia
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data Wstąpienie musi być większa niż Data Urodzenia
 DocType: Salary Structure,Salary Structure,
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,7 +2806,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  konfliktu przez wyznaczenie priorytet. Cena Zasady: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Linia lotnicza
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Wydanie Materiał
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Wydanie Materiał
 DocType: Material Request Item,For Warehouse,Dla magazynu
 DocType: Employee,Offer Date,Data oferty
 DocType: Hub Settings,Access Token,Dostęp Reklamowe
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,Czas Otwarcia
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Daty Od i Do są wymagane
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
+DocType: Delivery Note Item,From Warehouse,Od Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Wiercenie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Regranulat
 DocType: Purchase Taxes and Charges,Valuation and Total,Wycena i kwota całkowita
@@ -2837,11 +2851,12 @@ DocType: C-Form,Amended From,
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surowiec
 DocType: Leave Application,Follow via Email,Odpowiedz za pomocą E-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,To konto zawiera konta podrzędne. Nie można usunąć takiego konta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,To konto zawiera konta podrzędne. Nie można usunąć takiego konta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Wymagana jest ilość lub kwota docelowa
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
-DocType: Leave Allocation,Carry Forward,Przeniesienie
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data otwarcia powinien być przed Dniem Zamknięcia
+DocType: Leave Control Panel,Carry Forward,Przeniesienie
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w rejestr
 DocType: Department,Days for which Holidays are blocked for this department.,Dni kiedy urlop jest zablokowany dla tego departamentu
 ,Produced,Wyprodukowany
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Razem (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Rozrywka i relaks
 DocType: Purchase Order,The date on which recurring order will be stop,Data powracającym zamówienie zostanie zatrzymać
 DocType: Quality Inspection,Item Serial No,Nr seryjny
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musi być zmniejszona o {1} lub należy zwiększyć tolerancję nadmiaru
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musi być zmniejszona o {1} lub należy zwiększyć tolerancję nadmiaru
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Razem Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Godzina
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Odcinkach Element {0} nie może być aktualizowana \
  Zdjęcie Pojednania za pomocą"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Przenieść materiał do dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Przenieść materiał do dostawcy
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,
 DocType: Lead,Lead Type,Typ Tropu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Utwórz ofertę
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Może być zatwierdzone przez {0}
 DocType: Shipping Rule,Shipping Rule Conditions,
 DocType: BOM Replace Tool,The new BOM after replacement,
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID operacji nie zostało ustawione
 DocType: Production Order,Planned Start Date,Planowana data rozpoczęcia
 DocType: Serial No,Creation Document Type,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Odwiedzić
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Odwiedzić
 DocType: Leave Type,Is Encash,
 DocType: Purchase Invoice,Mobile No,Nr tel. Komórkowego
 DocType: Payment Tool,Make Journal Entry,Dodać Journal Entry
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,
 DocType: Project,Expected End Date,Spodziewana data końcowa
 DocType: Appraisal Template,Appraisal Template Title,Tytuł szablonu oceny
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Komercyjny
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Komercyjny
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Dominująca pozycja {0} nie może być pozycja Zdjęcie
 DocType: Cost Center,Distribution Id,ID Dystrybucji
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Wartość atrybutu {0} musi mieścić się w zakresie {1} do {2} w przyrostach {3}
 DocType: Tax Rule,Sales,Sprzedaż
 DocType: Stock Entry Detail,Basic Amount,Kwota podstawowa
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Kr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
+DocType: Leave Allocation,Unused leaves,Niewykorzystane urlopy
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Kr
 DocType: Customer,Default Receivable Accounts,Domyślne konta należności
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Piłowanie
 DocType: Tax Rule,Billing State,Stan Billing
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminowanie
 DocType: Item Reorder,Transfer,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),
 DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date jest obowiązkowe
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Klient {0} nie istnieje
 DocType: Attendance,Absent,Nieobecny
 DocType: Product Bundle,Product Bundle,Pakiet produktów
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Wiersz {0}: Nieprawidłowy odniesienia {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Miażdżący
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Szablon Podatków i Opłat kupna
 DocType: Upload Attendance,Download Template,Ściągnij Szablon
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,Uwagi
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Kod surowca
 DocType: Journal Entry,Write Off Based On,Odpis bazowano na
 DocType: Features Setup,POS View,
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Odlewanie ciągłe
-sites/assets/js/erpnext.min.js +10,Please specify a,Sprecyzuj 
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Sprecyzuj 
 DocType: Offer Letter,Awaiting Response,Oczekuje na Odpowiedź
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Powyżej
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Zimna rozmiaru
 DocType: Salary Slip,Earning & Deduction,Dochód i Odliczenie
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} nie może być Grupą (kontem dzielonym)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Opcjonalne. Te Ustawienie będzie użyte w filtrze dla różnych transacji.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcjonalne. Te Ustawienie będzie użyte w filtrze dla różnych transacji.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,
 DocType: Holiday List,Weekly Off,
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","np. 2012, 2012-13"
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Wypukły
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Wzór odlewania parowanie-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Wydatki na reprezentację
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura Sprzedaży {0} powinna być anulowana przed anulowaniem samego Zlecenia Sprzedaży
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Wiek
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura Sprzedaży {0} powinna być anulowana przed anulowaniem samego Zlecenia Sprzedaży
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Wiek
 DocType: Time Log,Billing Amount,Kwota Rozliczenia
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Wnioski o rezygnację
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Wydatki na obsługę prawną
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dzień miesiąca, w którym zamówienie zostanie wygenerowane automatycznie np 05, 28 itd"
 DocType: Sales Invoice,Posting Time,Czas publikacji
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Brak przedmiotu o podanym numerze seryjnym {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Otwarte Powiadomienia
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otwarte Powiadomienia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Wydatki bezpośrednie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Czy na pewno chcesz ODSTOPOWAĆ ten Wniosek o Materiał?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nowy Przychody klienta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Wydatki na podróże
 DocType: Maintenance Visit,Breakdown,
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,W sprawie daty
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Gładzenia
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Domyślny magazyn jest obowiązkowy dla przedmiotu z asortymentu.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Domyślny magazyn jest obowiązkowy dla przedmiotu z asortymentu.
 DocType: Feed,Full Name,Imię i nazwisko
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Zaciskanie
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Płatność pensji za miesiąć {0} i rok {1} 
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,
 DocType: Buying Settings,Default Supplier Type,Domyślny Typ Dostawcy
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Wydobywanie
 DocType: Production Order,Total Operating Cost,Całkowity koszt operacyjny
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Wszystkie kontakty.
 DocType: Newsletter,Test Email Id,
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Nazwa skrótowa firmy
@@ -3101,11 +3117,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Wycena
 DocType: Stock Settings,Role Allowed to edit frozen stock,
 ,Territory Target Variance Item Group-Wise,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Wszystkie grupy klientów
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Szablon podatkowa jest obowiązkowe.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Wartość w cenniku (waluta firmy)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0}{1} stan jest 'Zastopowany'
 DocType: Account,Temporary,Tymczasowy
 DocType: Address,Preferred Billing Address,
 DocType: Monthly Distribution Percentage,Percentage Allocation,Przydział Procentowy
@@ -3123,13 +3138,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,
 DocType: Purchase Order Item,Supplier Quotation,
 DocType: Quotation,In Words will be visible once you save the Quotation.,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Prasowanie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} jest zatrzymany
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} jest zatrzymany
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
 DocType: Lead,Add to calendar on this date,Dodaj do kalendarza pod tą datą
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,nadchodzące wydarzenia
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,nadchodzące wydarzenia
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klient jest wymagany
 DocType: Letter Head,Letter Head,Nagłówek
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Szybkie wejścia
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} jest obowiązkowe Powrót
 DocType: Purchase Order,To Receive,Otrzymać
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montażu
@@ -3153,25 +3169,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,
 DocType: Serial No,Out of Warranty,Poza Gwarancją
 DocType: BOM Replace Tool,Replace,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Proszę wpisać domyślną jednostkę miary
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Proszę wpisać domyślną jednostkę miary
 DocType: Purchase Invoice Item,Project Name,Nazwa projektu
 DocType: Supplier,Mention if non-standard receivable account,"Wspomnieć, jeśli nie standardowe konto należności"
 DocType: Workflow State,Edit,Edytuj
 DocType: Journal Entry Account,If Income or Expense,
 DocType: Features Setup,Item Batch Nos,
 DocType: Stock Ledger Entry,Stock Value Difference,
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Zasoby Ludzkie
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Zasoby Ludzkie
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Płatność Wyrównawcza Płatności
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Podatek należny (zwrot)
 DocType: BOM Item,BOM No,Nr zestawienia materiałowego
 DocType: Contact Us Settings,Pincode,Kod PIN
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Księgowanie {0} nie masz konta {1} lub już porównywane inne bon
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Księgowanie {0} nie masz konta {1} lub już porównywane inne bon
 DocType: Item,Moving Average,
 DocType: BOM Replace Tool,The BOM which will be replaced,
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,Urlop musi by przyporządkowany w mnożniku 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Urlop musi by przyporządkowany w mnożniku 0.5
 DocType: Production Order,Operation Cost,Koszt operacji
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Prześlij Frekwencję z pliku .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Zaległa wartość
@@ -3179,7 +3195,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Zamroź asortyment starszy niż [dni]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jeśli dwóch lub więcej Zasady ustalania cen na podstawie powyższych warunków, jest stosowana Priorytet. Priorytetem jest liczba z zakresu od 0 do 20, podczas gdy wartość domyślna wynosi zero (puste). Wyższa liczba oznacza, że ​​będzie mieć pierwszeństwo, jeśli istnieje wiele przepisów dotyczących cen z samych warunkach."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Na podstawie faktury
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Rok fiskalny: {0} nie istnieje
 DocType: Currency Exchange,To Currency,
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,
@@ -3208,7 +3223,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stawk
 DocType: Stock Entry Detail,Additional Cost,Dodatkowy koszt
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data końca roku finansowego
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nie można przefiltrować wg Podstawy, jeśli pogrupowano z użyciem Podstawy"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,
 DocType: Quality Inspection,Incoming,
 DocType: BOM,Materials Required (Exploded),
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmniejsz wypłatę za Bezpłatny Urlop
@@ -3216,10 +3231,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Wiersz # {0}: Numer seryjny: {1} nie jest zgodny z {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Urlop okolicznościowy
 DocType: Batch,Batch ID,Identyfikator Partii
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Uwaga: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Uwaga: {0}
 ,Delivery Note Trends,Trendy Dowodów Dostawy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Podsumowanie W tym tygodniu
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} może być aktualizowana tylko przez operacje magazynowe
 DocType: GL Entry,Party,Grupa
 DocType: Sales Order,Delivery Date,Data dostawy
@@ -3232,7 +3247,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Średnia. Kupno Cena
 DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach)
 DocType: Employee,History In Company,Historia Firmy
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Biuletyny
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Biuletyny
 DocType: Address,Shipping,Dostawa
 DocType: Stock Ledger Entry,Stock Ledger Entry,Zapis w księdze zapasów
 DocType: Department,Leave Block List,Lista Blokowanych Urlopów
@@ -3251,7 +3266,7 @@ DocType: Account,Auditor,Audytor
 DocType: Purchase Order,End date of current order's period,Data zakończenia okresu bieżącego zlecenia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Złóż ofertę 
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Powrót
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Domyślne jednostki miary dla Variant musi być taki sam jak szablon
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Domyślne jednostki miary dla Variant musi być taki sam jak szablon
 DocType: DocField,Fold,Zagiąć
 DocType: Production Order Operation,Production Order Operation,Produkcja Zamówienie Praca
 DocType: Pricing Rule,Disable,Wyłącz
@@ -3283,7 +3298,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,
 DocType: SMS Settings,Enter url parameter for receiver nos,Wpisz URL dla odbiorcy numeru
 DocType: Sales Invoice,Paid Amount,Zapłacona kwota
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',
 ,Available Stock for Packing Items,
 DocType: Item Variant,Item Variant,Pozycja Wersja
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Ustawienie tego adresu jako domyślnego szablonu, ponieważ nie ma innej domyślnej"
@@ -3291,7 +3306,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Zarządzanie jakością
 DocType: Production Planning Tool,Filter based on customer,Filtr bazujący na kliencie
 DocType: Payment Tool Detail,Against Voucher No,Dowód nr
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},
 DocType: Employee External Work History,Employee External Work History,Historia zatrudnienia pracownika poza firmą
 DocType: Tax Rule,Purchase,Zakup
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Ilość bilansu
@@ -3328,28 +3343,29 @@ Note: BOM = Bill of Materials","Łączna grupa przedmioty ** ** ** Przedmiot do
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},
 DocType: Item Variant Attribute,Attribute,Atrybut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Proszę określić zakres od/do
-sites/assets/js/desk.min.js +7652,Created By,Utworzone przez
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Utworzone przez
 DocType: Serial No,Under AMC,
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Jednostkowy wskaźnik wyceny przeliczone z uwzględnieniem kosztów ilość kupon wylądował
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Domyślne ustawienia dla transakcji sprzedaży
 DocType: BOM Replace Tool,Current BOM,Obecny BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Dodaj nr seryjny
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Dodaj nr seryjny
 DocType: Production Order,Warehouses,Magazyny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Materiały biurowe
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Węzeł Grupy
 DocType: Payment Reconciliation,Minimum Amount,Minimalna ilość
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Zaktualizuj Ukończone Dobra
 DocType: Workstation,per hour,na godzinę
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazyn nie może być skasowany tak długo jak długo istnieją zapisy w księdze stanu dla tego magazynu.
 DocType: Company,Distribution,Dystrybucja
-sites/assets/js/erpnext.min.js +50,Amount Paid,Kwota zapłacona
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Kwota zapłacona
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Wyślij
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksymalna zniżka pozwoliło na pozycji: {0} jest {1}%
 DocType: Customer,Default Taxes and Charges,Domyślne podatków i opłat
 DocType: Account,Receivable,Należności
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Wiersz # {0}: Nie wolno zmienić dostawcę, jak już istnieje Zamówienie"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,
 DocType: Sales Invoice,Supplier Reference,
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",
@@ -3387,8 +3403,8 @@ DocType: Email Digest,Add/Remove Recipients,Dodaj / Usuń odbiorców
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Niedobór szt
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Niedobór szt
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
 DocType: Salary Slip,Salary Slip,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Nagniatania
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Do daty' jest wymaganym polem
@@ -3401,6 +3417,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Ustawienia globalne
 DocType: Employee Education,Employee Education,Wykształcenie pracownika
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
 DocType: Salary Slip,Net Pay,Stawka Netto
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,
@@ -3433,7 +3450,7 @@ DocType: BOM,Manufacturing User,Produkcja użytkownika
 DocType: Purchase Order,Raw Materials Supplied,Dostarczone surowce
 DocType: Purchase Invoice,Recurring Print Format,Format wydruku cykliczne
 DocType: Communication,Series,Seria
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Spodziewana data odbioru przesyłki nie może być wcześniejsza od daty jej kupna
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Spodziewana data odbioru przesyłki nie może być wcześniejsza od daty jej kupna
 DocType: Appraisal,Appraisal Template,Szablon oceny
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Pozycja Klasyfikacja
@@ -3489,6 +3506,7 @@ DocType: HR Settings,Payroll Settings,Ustawienia Listy Płac
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Łączenie faktur z płatnościami
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Złożyć zamówienie
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Wybierz markę ...
 DocType: Sales Invoice,C-Form Applicable,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Czas działania musi być większy niż 0 do operacji {0}
 DocType: Supplier,Address and Contacts,Adres i Kontakt
@@ -3499,7 +3517,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Pobierz zaległe Kupony
 DocType: Warranty Claim,Resolved By,
 DocType: Appraisal,Start Date,
-sites/assets/js/desk.min.js +7629,Value,Wartość
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Wartość
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Przydziel zwolnienia dla tego okresu.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Kliknij tutaj, aby zweryfikować"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Nie można przypisać siebie jako konta nadrzędnego
@@ -3515,14 +3533,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dostęp do Dropboxa Dopuszczony
 DocType: Dropbox Backup,Weekly,Tygodniowo
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,np. smsgateway.com/api/send_sms.cgi 
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Odbierać
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Odbierać
 DocType: Maintenance Visit,Fully Completed,Całkowicie ukończono
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kompletne
 DocType: Employee,Educational Qualification,Kwalifikacje edukacyjne
 DocType: Workstation,Operating Costs,Koszty operacyjne
 DocType: Employee Leave Approver,Employee Leave Approver,Zgoda na zwolnienie dla pracownika
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} został pomyślnie dodany do naszego newslettera.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Obróbka wiązką elektronów
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Główny Menadżer Zakupów
@@ -3535,7 +3553,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Dodaj / Edytuj ceny
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Struktura kosztów (MPK)
 ,Requested Items To Be Ordered,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Moje Zamówienia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje Zamówienia
 DocType: Price List,Price List Name,Nazwa cennika
 DocType: Time Log,For Manufacturing,Dla Produkcji
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Sumy całkowite
@@ -3546,7 +3564,7 @@ DocType: Account,Income,Przychody
 DocType: Industry Type,Industry Type,
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Coś poszło nie tak!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Ostrzeżenie: Aplikacja o urlop zawiera następujące zablokowane daty
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data ukończenia
 DocType: Purchase Invoice Item,Amount (Company Currency),Kwota (Waluta firmy)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Odlewów
@@ -3560,10 +3578,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Rok
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Zaktualizuj Ustawienia SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Czas Zaloguj {0} już zapowiadane
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Czas Zaloguj {0} już zapowiadane
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Pożyczki bez pokrycia
 DocType: Cost Center,Cost Center Name,Nazwa Centrum Kosztów
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,
 DocType: Maintenance Schedule Detail,Scheduled Date,
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Łączna wypłacona Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,
@@ -3571,10 +3588,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Otrzymano i zaakceptowano
 ,Serial No Service Contract Expiry,
 DocType: Item,Unit of Measure Conversion,Jednostka miary Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Pracownik nie może być zmieniony
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
 DocType: Naming Series,Help HTML,
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Zniżki dla nadmiernie {0} przeszedł na pozycję {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Zniżki dla nadmiernie {0} przeszedł na pozycję {1}
 DocType: Address,Name of person or organization that this address belongs to.,Imię odoby lub organizacji do której należy adres.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Twoi Dostawcy
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,
@@ -3586,10 +3603,11 @@ DocType: Lead,Converted,Przekształcono
 DocType: Item,Has Serial No,Posiada numer seryjny
 DocType: Employee,Date of Issue,Data wydania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: od {0} do {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
 DocType: Issue,Content Type,Typ zawartości
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Pozycja: {0} nie istnieje w systemie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pobierz Wpisy nieuzgodnione
@@ -3600,14 +3618,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Do magazynu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} zostało wprowadzone więcej niż raz dla roku podatkowego {1} 
 ,Average Commission Rate,Średnia prowizja
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,
 DocType: Pricing Rule,Pricing Rule Help,Wycena Zasada Pomoc
 DocType: Purchase Taxes and Charges,Account Head,
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Zaktualizuj dodatkowe koszty do obliczenia całkowitego kosztu operacji
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektryczne
 DocType: Stock Entry,Total Value Difference (Out - In),Całkowita Wartość Różnica (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Wiersz {0}: Kurs wymiany jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Wiersz {0}: Kurs wymiany jest obowiązkowe
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID Użytkownika nie ustawiony dla Pracownika {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Kulkowania
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od Reklamacji
@@ -3621,15 +3639,17 @@ DocType: Buying Settings,Naming Series,Seria nazw
 DocType: Leave Block List,Leave Block List Name,
 DocType: User,Enabled,Włączony
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aktywa obrotowe
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Czy na pewno chcesz Wysłać wszystkie Pensje za miesiąc {0} i rok {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Czy na pewno chcesz Wysłać wszystkie Pensje za miesiąc {0} i rok {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import abonentów
 DocType: Target Detail,Target Qty,
 DocType: Attendance,Present,Obecny
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Dowód dostawy {0} nie może być wysłany
 DocType: Notification Control,Sales Invoice Message,
 DocType: Authorization Rule,Based On,Bazujący na
-,Ordered Qty,Ilość Zamówiona
+DocType: Sales Order Item,Ordered Qty,Ilość Zamówiona
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Element {0} jest wyłączony
 DocType: Stock Settings,Stock Frozen Upto,
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Okres Okres Od i Do dat obowiązkowych dla powtarzających {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Czynność / zadanie projektu
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Utwórz Paski Wypłaty
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} błędny identyfikator e-mail
@@ -3669,7 +3689,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Prześlij Frekwencję
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i ilości są wymagane Manufacturing
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starzenie Zakres 2
-DocType: Journal Entry Account,Amount,Wartość
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Wartość
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitowania
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,
 ,Sales Analytics,Analityka sprzedaży
@@ -3696,7 +3716,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Spodziewana data nie może być wcześniejsza od daty prośby o materiał
 DocType: Contact Us Settings,City,Miasto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Obróbka ultradźwiękowa
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Błąd: Nie ważne id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Błąd: Nie ważne id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,
 DocType: Naming Series,Update Series Number,Zaktualizuj Numer Serii
 DocType: Account,Equity,Kapitał własny
@@ -3711,7 +3731,7 @@ DocType: Purchase Taxes and Charges,Actual,Właściwy
 DocType: Authorization Rule,Customerwise Discount,Zniżka dla klienta
 DocType: Purchase Invoice,Against Expense Account,Konto wydatków
 DocType: Production Order,Production Order,Zamówinie produkcji
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,
 DocType: Quotation Item,Against Docname,
 DocType: SMS Center,All Employee (Active),Wszyscy pracownicy (aktywni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobacz teraz
@@ -3719,14 +3739,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Koszt surowców
 DocType: Item,Re-Order Level,Próg ponowienia zamówienia
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Wpisz nazwy przedmiotów i planowaną ilość dla której chcesz zwiększyć produkcję zamówień lub ściągnąć surowe elementy dla analizy.
-sites/assets/js/list.min.js +174,Gantt Chart,Wykres Gantta
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Wykres Gantta
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Niepełnoetatowy
 DocType: Employee,Applicable Holiday List,Stosowna Lista Urlopów
 DocType: Employee,Cheque,Czek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Typ raportu jest wymagany
 DocType: Item,Serial Number Series,
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Magazyn jest obowiązkowy dla Przedmiotu {0} w rzędzie {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazyn jest obowiązkowy dla Przedmiotu {0} w rzędzie {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,
 DocType: Issue,First Responded On,Data pierwszej odpowiedzi
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Krzyż Notowania pozycji w wielu grupach
@@ -3741,7 +3761,7 @@ DocType: Attendance,Attendance,
 DocType: Page,No,Nie
 DocType: BOM,Materials,Materiały
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Delegowanie datę i czas delegowania jest obowiązkowe
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Delegowanie datę i czas delegowania jest obowiązkowe
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,
 ,Item Prices,Ceny
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,
@@ -3761,9 +3781,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Wydatki na podstawową działalność
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Konsulting
 DocType: Customer Group,Parent Customer Group,Nadrzędna Grupa Klientów
-sites/assets/js/erpnext.min.js +50,Change,Reszta
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Reszta
 DocType: Purchase Invoice,Contact Email,E-mail kontaktu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Zamówienia Kupna {0} zostało zatrzymane
 DocType: Appraisal Goal,Score Earned,
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","np. ""Moja Firma LLC"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Okres wypowiedzenia
@@ -3773,12 +3792,13 @@ DocType: Packing Slip,Gross Weight UOM,
 DocType: Email Digest,Receivables / Payables,Należności / Zobowiązania
 DocType: Delivery Note Item,Against Sales Invoice,Na podstawie faktury sprzedaży
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Cechowanie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Konto kredytowe
 DocType: Landed Cost Item,Landed Cost Item,Koszt Przedmiotu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokaż wartości zerowe
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ilość produktu otrzymanego po produkcji / przepakowaniu z podanych ilości surowców
 DocType: Payment Reconciliation,Receivable / Payable Account,Konto Należności / Zobowiązań
 DocType: Delivery Note Item,Against Sales Order Item,Na podstawie pozycji zamówienia sprzedaży
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
 DocType: Item,Default Warehouse,Domyślny magazyn
 DocType: Task,Actual End Date (via Time Logs),Rzeczywista Data zakończenia (przez Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budżet nie może być przypisany do rachunku grupy {0}
@@ -3792,7 +3812,7 @@ DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),
 DocType: Contact Us Settings,State,Stan
 DocType: Batch,Batch,Partia
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Bilans
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Bilans
 DocType: Project,Total Expense Claim (via Expense Claims),Łączny koszt roszczenie (przez Zastrzeżeń koszty)
 DocType: User,Gender,Płeć
 DocType: Journal Entry,Debit Note,Nota debetowa
@@ -3808,9 +3828,8 @@ DocType: Lead,Blog Subscriber,
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",
 DocType: Purchase Invoice,Total Advance,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Wznów Prośbę o Materiał
 DocType: Workflow State,User,Użytkownik
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Tworzenie listy płac
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Tworzenie listy płac
 DocType: Opportunity Item,Basic Rate,Podstawowy wskaźnik
 DocType: GL Entry,Credit Amount,Kwota kredytu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,
@@ -3818,7 +3837,7 @@ DocType: Customer,Credit Days Based On,Dni kredytowe w oparciu o
 DocType: Tax Rule,Tax Rule,Reguła podatkowa
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Utrzymanie tej samej stawki przez cały cykl sprzedaży
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zaplanuj dzienniki poza godzinami Workstation Pracy.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} zostało już dodane 
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} zostało już dodane 
 ,Items To Be Requested,
 DocType: Purchase Order,Get Last Purchase Rate,Uzyskaj stawkę z ostatniego zakupu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Kursy rozliczeniowe na podstawie rodzajów działalności (za godzinę)
@@ -3827,6 +3846,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Email ID Firmy nie został znaleziony, w wyniku czego e-mail nie został wysłany"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aktywa
 DocType: Production Planning Tool,Filter based on item,Filtr bazujący na Przedmiocie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Konto debetowe
 DocType: Fiscal Year,Year Start Date,Data początku roku
 DocType: Attendance,Employee Name,Nazwisko pracownika
 DocType: Sales Invoice,Rounded Total (Company Currency),Końcowa zaokrąglona kwota (waluta firmy)
@@ -3838,14 +3858,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Wykrawanie
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Świadczenia pracownicze
 DocType: Sales Invoice,Is POS,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1} 
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1} 
 DocType: Production Order,Manufactured Qty,
 DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nie istnieje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rachunki dla klientów.
 DocType: DocField,Default,Domyślny
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonentów dodano
 DocType: Maintenance Schedule,Schedule,Harmonogram
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definiowanie budżetu tego centrum kosztów. Aby ustawić działania budżetu, patrz "Lista Spółka""
@@ -3853,7 +3873,7 @@ DocType: Account,Parent Account,Nadrzędne konto
 DocType: Quality Inspection Reading,Reading 3,Odczyt 3
 ,Hub,Piasta
 DocType: GL Entry,Voucher Type,Typ Podstawy
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
 DocType: Expense Claim,Approved,Zatwierdzono
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
@@ -3862,23 +3882,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Wykształcenie
 DocType: Selling Settings,Campaign Naming By,
 DocType: Employee,Current Address Is,Obecny adres to
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcjonalny. Ustawia domyślną walutę firmy, jeśli nie podano."
 DocType: Address,Office,Biuro
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Raporty standardowe
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Dziennik zapisów księgowych.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Wiersz {0}: Party / konto nie jest zgodny z {1} / {2} w {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Dostępne szt co z magazynu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Wiersz {0}: Party / konto nie jest zgodny z {1} / {2} w {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Aby utworzyć konto podatkowe
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Wprowadź konto Wydatków
 DocType: Account,Stock,Asortyment
 DocType: Employee,Current Address,Obecny adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jeśli pozycja jest wariant innego elementu, a następnie opis, zdjęcia, ceny, podatki itp zostanie ustalony z szablonu, o ile nie określono wyraźnie"
 DocType: Serial No,Purchase / Manufacture Details,Szczegóły Zakupu / Produkcji
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Inwentaryzacja partii
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inwentaryzacja partii
 DocType: Employee,Contract End Date,Data końcowa kontraktu
 DocType: Sales Order,Track this Sales Order against any Project,
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,
 DocType: DocShare,Document Type,Typ Dokumentu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Od Wyceny Kupna
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od Wyceny Kupna
 DocType: Deduction Type,Deduction Type,Typ odliczenia
 DocType: Attendance,Half Day,Pół Dnia
 DocType: Pricing Rule,Min Qty,Min. ilość
@@ -3889,20 +3911,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Do Ilość (Wyprodukowano kopie) są obowiązkowe
 DocType: Stock Entry,Default Target Warehouse,Domyślny magazyn docelowy
 DocType: Purchase Invoice,Net Total (Company Currency),Łączna wartość netto (waluta firmy)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Wiersz {0}: Typ i Partia Partia ma zastosowanie tylko w stosunku do otrzymania / rachunku Płatne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Wiersz {0}: Typ i Partia Partia ma zastosowanie tylko w stosunku do otrzymania / rachunku Płatne
 DocType: Notification Control,Purchase Receipt Message,Wiadomość Potwierdzenia Zakupu
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Liczba przyznanych liście są więcej niż okres
 DocType: Production Order,Actual Start Date,Rzeczywista data rozpoczęcia
 DocType: Sales Order,% of materials delivered against this Sales Order,% materiałów dostarczonych w ramach zlecenia sprzedaży
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Zapisz ruch produktu.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Zapisz ruch produktu.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Biuletyn Lista Abonent
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dłutarki
 DocType: Email Account,Service,Usługa
 DocType: Hub Settings,Hub Settings,Ustawienia Hub
 DocType: Project,Gross Margin %,Marża brutto %
 DocType: BOM,With Operations,Wraz z działaniami
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}.
 ,Monthly Salary Register,
-apps/frappe/frappe/website/template.py +123,Next,Dalej
+apps/frappe/frappe/website/template.py +140,Next,Dalej
 DocType: Warranty Claim,If different than customer address,
 DocType: BOM Operation,BOM Operation,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolerowanie
@@ -3933,6 +3956,7 @@ DocType: Purchase Invoice,Next Date,
 DocType: Employee Education,Major/Optional Subjects,Główne/Opcjonalne Tematy
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Proszę wprowadzić podatki i opłaty
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Obróbka
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",
 DocType: Hub Settings,Seller Name,Sprzedawca Nazwa
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),
@@ -3959,29 +3983,29 @@ DocType: Purchase Order,To Receive and Bill,Do odbierania i Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Projektant
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Szablony warunków i regulaminów
 DocType: Serial No,Delivery Details,Szczegóły dostawy
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatyczne tworzenie Materiał wniosku, jeżeli ilość spada poniżej tego poziomu"
 ,Item-wise Purchase Register,
 DocType: Batch,Expiry Date,Data ważności
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Aby ustawić poziom zmienić kolejność, element musi być pozycja nabycia lub przedmiotu"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Aby ustawić poziom zmienić kolejność, element musi być pozycja nabycia lub przedmiotu"
 ,Supplier Addresses and Contacts,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Proszę najpierw wybrać kategorię
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Dyrektor projektu
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nie pokazuj żadnych symboli przy walutach, takich jak $"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Pół dnia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Pół dnia)
 DocType: Supplier,Credit Days,
 DocType: Leave Type,Is Carry Forward,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Weź produkty z zestawienia materiałowego
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Weź produkty z zestawienia materiałowego
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Czas realizacji (dni)
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Zestawienie materiałów
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Wiersz {0}: Typ i Partia Partia jest wymagane w przypadku otrzymania / rachunku Płatne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Wiersz {0}: Typ i Partia Partia jest wymagane w przypadku otrzymania / rachunku Płatne {1}
 DocType: Dropbox Backup,Send Notifications To,
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Powód odejścia
 DocType: Expense Claim Detail,Sanctioned Amount,
 DocType: GL Entry,Is Opening,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Konto {0} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} nie istnieje
 DocType: Account,Cash,Gotówka
 DocType: Employee,Short biography for website and other publications.,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index 487d01f0b6..a4c1c9f652 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Modo de salário
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selecione distribuição mensal, se você quer acompanhar com base na sazonalidade."
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Itens já sincronizado
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir item a ser adicionado várias vezes em uma transação
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anular Material de Visita {0} antes de cancelar esta solicitação de garantia
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactação mais sinterização
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},É necessário informar a Moeda na Lista de Preço {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado na transação.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Do Pedido de materiais
+DocType: Purchase Order,Customer Contact,Contato do cliente
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Do Pedido de materiais
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árvore
 DocType: Job Applicant,Job Applicant,Candidato a emprego
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Não há mais resultados.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Nome do cliente
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Todos os campos relacionados à exportação, como moeda, taxa de conversão,total geral de exportação,total de exportação etc estão disponíveis na nota de entrega, POS, Cotação, Vendas fatura, Ordem de vendas etc"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (ou grupos) contra o qual as entradas de Contabilidade são feitas e os saldos são mantidos.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
 DocType: Manufacturing Settings,Default 10 mins,Padrão 10 minutos
 DocType: Leave Type,Leave Type Name,Nome do Tipo de Licença
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Série atualizado com sucesso
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Vários preços item.
 DocType: SMS Center,All Supplier Contact,Todos os Contatos de Fornecedor
 DocType: Quality Inspection Reading,Parameter,Parâmetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Data prevista End não pode ser menor do que o esperado Data de Início
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Você realmente quer desentupir ordem de produção:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa deve ser o mesmo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Aplicação deixar Nova
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Aplicação deixar Nova
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Cheque Administrativo
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Para manter o código de item do cliente e para torná-los pesquisáveis ​​com base em seu código use esta opção
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar Varian
 DocType: Sales Invoice Item,Quantity,Quantidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Empréstimos ( Passivo)
 DocType: Employee Education,Year of Passing,Ano de passagem
-sites/assets/js/erpnext.min.js +27,In Stock,Em Estoque
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Só pode fazer o pagamento contra a faturar Ordem de Vendas
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Em Estoque
 DocType: Designation,Designation,Designação
 DocType: Production Plan Item,Production Plan Item,Item do plano de produção
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Usuário {0} já está atribuído ao funcionário {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Faça novo perfil POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Atenção à Saúde
 DocType: Purchase Invoice,Monthly,Mensal
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Fatura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Atraso no pagamento (Dias)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Endereço De Email
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defesa
 DocType: Company,Abbr,Abrev
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,No veículo
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Por favor, selecione Lista de Preço"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, selecione Lista de Preço"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Carpintaria
 DocType: Production Order Operation,Work In Progress,Trabalho em andamento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impressão 3D
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Docname do Detalhe pai
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg.
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Vaga de emprego.
 DocType: Item Attribute,Increment,Incremento
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Selecione Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicidade
 DocType: Employee,Married,Casado
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Faça Banco Entry
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Faça Banco Entry
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fundos de Pensão
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Armazém é obrigatória se o tipo de conta é Armazém
 DocType: SMS Center,All Sales Person,Todos os Vendedores
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Eliminar Centro de Custos
 DocType: Warehouse,Warehouse Detail,Detalhe do Almoxarifado
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi analisado para o cliente {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Tipo de imposto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Você não está autorizado para adicionar ou atualizar entradas antes de {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Você não está autorizado para adicionar ou atualizar entradas antes de {0}
 DocType: Item,Item Image (if not slideshow),Imagem do Item (se não for slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe um cliente com o mesmo nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Taxa por Hora/ 60) * Tempo de operação atual
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Convidado
 DocType: Quality Inspection,Get Specification Details,Obter detalhes da Especificação
 DocType: Lead,Interested,Interessado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiais
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Abertura
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Abertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},A partir de {0} a {1}
 DocType: Item,Copy From Item Group,Copiar do item do grupo
 DocType: Journal Entry,Opening Entry,Abertura Entry
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Consulta de Produto
 DocType: Standard Reply,Owner,proprietário
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Por favor insira primeira empresa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Por favor, selecione Empresa primeiro"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, selecione Empresa primeiro"
 DocType: Employee Education,Under Graduate,Em Graduação
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Alvo Em
 DocType: BOM,Total Cost,Custo Total
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefixo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumíveis
 DocType: Upload Attendance,Import Log,Importar Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
+DocType: Sales Invoice Item,Delivered By Supplier,Proferido por Fornecedor
 DocType: SMS Center,All Contact,Todo o Contato
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salário Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do exercício fiscal
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Crédito em Moeda Empresa
 DocType: Delivery Note,Installation Status,Estado da Instalação
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},A qtd Aceita + Rejeitado deve ser igual a quantidade recebida para o item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},A qtd Aceita + Rejeitado deve ser igual a quantidade recebida para o item {0}
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-Primas para a Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} deve ser um item de compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Baixe o Template, preencha os dados apropriados e anexe o arquivo modificado.
  Todas as datas e empregado combinação no período selecionado virá no modelo, com registros de freqüência existentes"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Será atualizado após a fatura de vendas ser Submetida.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configurações para o Módulo de RH
 DocType: SMS Center,SMS Center,Centro de SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Endireitando
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Digite o parâmetro da url
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regras para aplicação de preços e de desconto.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Entrar conflitos desta vez com {0} para {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de Preço deve ser aplicável para comprar ou vender
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Data de instalação não pode ser anterior à data de entrega de item {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data de instalação não pode ser anterior à data de entrega de item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),% de Desconto sobre o Preço da Lista de Preços
-sites/assets/js/form.min.js +279,Start,começo
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,começo
 DocType: User,First Name,Nome
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Sua configuração está concluída. Atualizando.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,De fundição de molde completa
 DocType: Offer Letter,Select Terms and Conditions,Selecione os Termos e Condições
 DocType: Production Planning Tool,Sales Orders,Pedidos de Vendas
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra Vendas Nota Fiscal do Item
 ,Production Orders in Progress,Ordens de produção em andamento
 DocType: Lead,Address & Contact,Endereço e Contato
+DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as folhas não utilizadas de atribuições anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
 DocType: Newsletter List,Total Subscribers,Total de Assinantes
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nome do Contato
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,Qtde. pendente na OV
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de pagamento para os critérios mencionados acima.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pedido de Compra.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Caixa de duas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Folhas por ano
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, defina Naming Series para {0} em Configurar> Configurações> Naming Series"
 DocType: Time Log,Will be updated when batched.,Será atualizado quando agrupadas.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Verifique 'É Advance' contra Conta {1} se esta é uma entrada antecedência.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Verifique 'É Advance' contra Conta {1} se esta é uma entrada antecedência.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
 DocType: Bulk Email,Message,Mensagem
 DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Chave de Acesso
 DocType: Payment Tool,Reference No,Número de referência
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Deixe Bloqueados
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Deixe Bloqueados
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
 DocType: Stock Entry,Sales Invoice No,Nº da Nota Fiscal de Venda
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Pedido Mínimo
 DocType: Pricing Rule,Supplier Type,Tipo de Fornecedor
 DocType: Item,Publish in Hub,Publicar em Hub
 ,Terretory,terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Pedido de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Pedido de material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data Liquidação
 DocType: Item,Purchase Details,Detalhes da compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em 'matérias-primas fornecidas "na tabela Ordem de Compra {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Controle de Notificação
 DocType: Lead,Suggestions,Sugestões
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Definir orçamentos para Grupos de Itens neste território. Você também pode incluir a sazonalidade, defininda na Distribuição."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Digite grupo conta pai para armazém {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
 DocType: Supplier,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,Telefone Celular.
 DocType: Maintenance Schedule,Generate Schedule,Gerar Agenda
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nova UDM de estoque
 DocType: Period Closing Voucher,Closing Account Head,Conta de Fechamento
 DocType: Employee,External Work History,Histórico Profissional no Exterior
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Erro de referência circular
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Você realmente quer parar
 DocType: Communication,Closed,Fechado
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Por extenso (Exportação) será visível quando você salvar a Guia de Remessa.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Você tem certeza que quer parar
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil da Vaga
 DocType: Newsletter,Newsletter,Boletim informativo
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Guia de Remessa
 DocType: Dropbox Backup,Allow Dropbox Access,Permitir Acesso Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagamento foi modificado depois que você puxou-o. Por favor, puxe-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Workstation,Rent Cost,Rent Custo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecione mês e ano
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base do cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponível em LDM, Nota de Entrega, Fatura de Compra, Ordem de Produção, Ordem de Compra, Recibo de compra, Nota Fiscal de Venda, Ordem de Venda, Entrada no Estoque, Quadro de Horários"
 DocType: Item Tax,Tax Rate,Taxa de Imposto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Selecionar item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selecionar item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} gerido por lotes, não pode ser conciliada com \
  da Reconciliação, em vez usar da Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lote n deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converter para não-Grupo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Recibo de compra devem ser apresentados
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Unidade de Medida do Estoqu
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lote de um item.
 DocType: C-Form Invoice Detail,Invoice Date,Data da nota fiscal
 DocType: GL Entry,Debit Amount,Débito Montante
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Seu endereço de email
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, veja anexo"
 DocType: Purchase Order,% Received,Recebido %
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instruções
 DocType: Quality Inspection,Inspected By,Inspecionado por
 DocType: Maintenance Visit,Maintenance Type,Tipo de manutenção
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serial Não {0} não pertence a entrega Nota {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serial Não {0} não pertence a entrega Nota {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parâmetro de Inspeção de Qualidade do Item
 DocType: Leave Application,Leave Approver Name,Deixar Nome Approver
 ,Schedule Date,Data Agendada
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Compra Registre
 DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis
 DocType: Workstation,Consumable Cost,Custo dos consumíveis
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter papel 'Liberador'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter papel 'Liberador'
 DocType: Purchase Receipt,Vehicle Date,Veículo Data
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicamentos
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motivo para perder
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,Instalado %
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Por favor, insira o nome da empresa em primeiro lugar"
 DocType: BOM,Item Desription,Descrição do Item
 DocType: Purchase Invoice,Supplier Name,Nome do Fornecedor
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leia o manual de ERPNext
 DocType: Account,Is Group,É o grupo
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Serial N ° s automaticamente definido com base na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Verificar Fornecedor Nota Fiscal Número Unicidade
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerente de Vendas
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas até
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mestre férias .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moldagem Shell
 DocType: Material Request Item,Required Date,Data Obrigatória
 DocType: Delivery Note,Billing Address,Endereço de Cobrança
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Por favor, insira o Código Item."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Por favor, insira o Código Item."
 DocType: BOM,Costing,Custeio
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se marcado, o valor do imposto será considerado como já incluído na Impressão de Taxa / Impressão do Valor"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtde
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between O
 DocType: Customer,Buyer of Goods and Services.,Comprador de Produtos e Serviços.
 DocType: Journal Entry,Accounts Payable,Contas a Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adicionar Inscritos
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" não existe"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" não existe"
 DocType: Pricing Rule,Valid Upto,Válido até
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Resultado direto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Não é possível filtrar com base em conta , se agrupados por Conta"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Escritório Administrativo
 DocType: Payment Tool,Received Or Paid,Recebidos ou pagos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Por favor, selecione Empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, selecione Empresa"
 DocType: Stock Entry,Difference Account,Conta Diferença
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazém para que Pedido de materiais serão levantados"
 DocType: Production Order,Additional Operating Cost,Custo Operacional Adicional
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosméticos
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
 DocType: Communication,Subject,Assunto
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Telefone de emergência
 ,Serial No Warranty Expiry,Vencimento da Garantia com Nº de Série
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Você realmente quer parar esta solicitação de materiais ?
 DocType: Sales Order,To Deliver,Entregar
 DocType: Purchase Invoice Item,Item,item
 DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
 DocType: Account,Profit and Loss,Lucros e perdas
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Gerenciando Subcontratação
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gerenciando Subcontratação
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nova UOM NÃO deve ser do tipo inteiro Número
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Móveis e utensílios
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taxa na qual a moeda da lista de preços é convertida para a moeda base da empresa
@@ -489,7 +489,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impost
 DocType: Purchase Invoice,Supplier Invoice No,Fornecedor factura n
 DocType: Territory,For reference,Para referência
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Fechamento (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Fechamento (Cr)
 DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
 DocType: Installation Note Item,Installation Note Item,Item da Nota de Instalação
 ,Pending Qty,Pendente Qtde
@@ -521,8 +521,9 @@ DocType: Sales Order,Billing and Delivery Status,Faturamento e Entrega Estado
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita os clientes
 DocType: Leave Control Panel,Allocate,Alocar
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Retorno de Vendas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Retorno de Vendas
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selecione as Ordens de Venda a partir das quais você deseja criar Ordens de Produção.
+DocType: Item,Delivered by Supplier (Drop Ship),Entregue por Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariais.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Banco de Dados de Clientes
@@ -533,7 +534,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tombo
 DocType: Purchase Order Item,Billed Amt,Valor Faturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um Depósito lógico contra o qual as entradas de estoque são feitas.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
 DocType: Event,Wednesday,Quarta-feira
 DocType: Sales Invoice,Customer's Vendor,Vendedor do cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordem de produção é obrigatória
@@ -566,8 +567,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Parâmetro do recebedor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e ' Agrupar por' não podem ser o mesmo
 DocType: Sales Person,Sales Person Targets,Metas do Vendedor
-sites/assets/js/form.min.js +271,To,para
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Por favor insira o endereço de email
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,para
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Por favor insira o endereço de email
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Extremidade de tubo formando
 DocType: Production Order Operation,In minutes,Em questão de minutos
 DocType: Issue,Resolution Date,Data da Resolução
@@ -584,7 +585,7 @@ DocType: Activity Cost,Projects User,Projetos de Usuário
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela Detalhes da Nota Fiscal
 DocType: Company,Round Off Cost Center,Termine Centro de Custo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
 DocType: Material Request,Material Transfer,Transferência de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Abertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Postando timestamp deve ser posterior a {0}
@@ -592,9 +593,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Configurações
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos Custo desembarcados e Encargos
 DocType: Production Order Operation,Actual Start Time,Hora Real de Início
 DocType: BOM Operation,Operation Time,Tempo de Operação
-sites/assets/js/list.min.js +5,More,Mais
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mais
 DocType: Pricing Rule,Sales Manager,Gerente De Vendas
-sites/assets/js/desk.min.js +7673,Rename,renomear
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,renomear
 DocType: Journal Entry,Write Off Amount,Eliminar Valor
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Dobrando
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir que o usuário
@@ -610,13 +611,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,m
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Em linha reta de corte
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para acompanhar o item em documentos de vendas e de compras com base em seus números de série. Isso também pode ser usado para rastrear detalhes sobre a garantia do produto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoque Atual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Armazém Rejeitado é obrigatória na rubrica regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Armazém Rejeitado é obrigatória na rubrica regected
 DocType: Account,Expenses Included In Valuation,Despesas incluídos na avaliação
 DocType: Employee,Provide email id registered in company,Fornecer Endereço de E-mail registrado na empresa
 DocType: Hub Settings,Seller City,Cidade do Vendedor
 DocType: Email Digest,Next email will be sent on:,Próximo e-mail será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Oferecer Carta Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} não foi encontrado
 DocType: Bin,Stock Value,Valor do Estoque
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de árvore
@@ -631,11 +632,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bem vindo
 DocType: Journal Entry,Credit Card Entry,Registro de cartão de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Assunto da Tarefa
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
 DocType: Communication,Open,Abrir
 DocType: Lead,Campaign Name,Nome da Campanha
 ,Reserved,reservado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Você realmente quer liberar
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-Primas
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,A data na qual próxima fatura será gerada. Ele é gerado em enviar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativo Circulante
@@ -651,7 +651,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Ordem de Compra do Cliente Não
 DocType: Employee,Cell Number,Telefone Celular
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perdido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Você não pode lançar o comprovante atual na coluna 'Contra Entrada do Livro Diário'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Você não pode lançar o comprovante atual na coluna 'Contra Entrada do Livro Diário'
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,Oportunidade De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declaração salarial mensal.
@@ -720,7 +720,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,responsabilidade
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
 DocType: Company,Default Cost of Goods Sold Account,Custo padrão de Conta Produtos Vendidos
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Lista de Preço não selecionado
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista de Preço não selecionado
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Process Payroll,Send Email,Enviar Email
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nenhuma permissão
@@ -731,7 +731,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalhe da Reconciliação Bancária
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Minhas Faturas
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Nenhum funcionário encontrado
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum funcionário encontrado
 DocType: Purchase Order,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Selecione BOM para começar
@@ -740,7 +740,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Carregar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar agora
 ,Support Analytics,Análise do Suporte
 DocType: Item,Website Warehouse,Armazém do Site
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Você realmente quer parar de ordem de produção:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que auto factura será gerado por exemplo, 05, 28, etc"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pontuação deve ser inferior ou igual a 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registros C -Form
@@ -750,12 +749,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Supor
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para ativar "Point of Sale" recursos
 DocType: Bin,Moving Average Rate,Taxa da Média Móvel
 DocType: Production Planning Tool,Select Items,Selecione itens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data ​​{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data ​​{2}
 DocType: Comment,Reference Name,Nome de Referência
 DocType: Maintenance Visit,Completion Status,Estado de Conclusão
 DocType: Sales Invoice Item,Target Warehouse,Almoxarifado de destino
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre a entrega ou recebimento até esta cento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Vendas Data
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Vendas Data
 DocType: Upload Attendance,Import Attendance,Importação de Atendimento
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Log de Atividade
@@ -763,7 +762,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compor automaticamente mensagem no envio de transações.
 DocType: Production Order,Item To Manufacture,Item Para Fabricação
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Fundição com Molde Permanente
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Ordem de Compra para pagamento
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} estatuto é {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordem de Compra para pagamento
 DocType: Sales Order Item,Projected Qty,Qtde. Projetada
 DocType: Sales Invoice,Payment Due Date,Data de Vencimento
 DocType: Newsletter,Newsletter Manager,Boletim Gerente
@@ -787,8 +787,8 @@ DocType: SMS Log,Requested Numbers,Números solicitadas
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Avaliação de desempenho.
 DocType: Sales Invoice Item,Stock Details,Detalhes da
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do Projeto
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Ponto de venda
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Não é possível levar adiante {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Ponto de venda
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Não é possível levar adiante {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","O saldo já  está em crédito, você não tem a permissão para definir 'saldo deve ser' como 'débito'"
 DocType: Account,Balance must be,O Saldo deve ser
 DocType: Hub Settings,Publish Pricing,Publicar Pricing
@@ -810,7 +810,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Recibo de Compra
 ,Received Items To Be Billed,Itens recebidos a ser cobrado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Jateamento abrasivo
-sites/assets/js/desk.min.js +3938,Ms,Sra.
+DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Taxa de Câmbio Mestre
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar entalhe Tempo nos próximos {0} dias para a Operação {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Plano de sub-conjuntos
@@ -832,29 +832,31 @@ DocType: Purchase Receipt,Range,Alcance
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empregado {0} não está ativo ou não existe
 DocType: Features Setup,Item Barcode,Código de barras do Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Variantes item {0} atualizado
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Antecipação da Nota Fiscal de Compra
 DocType: Address,Shop,Loja
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrada de crédito não pode ser ligado com uma {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrada de crédito não pode ser ligado com uma {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conta do Banco/Caixa padrão será atualizada automaticamente na nota fiscal do PDV quando este modo for selecionado.
 DocType: Employee,Permanent Address Is,Endereço permanente é
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operação concluída por quantos produtos acabados?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,A Marca
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
 DocType: Employee,Exit Interview Details,Detalhes da Entrevista de saída
 DocType: Item,Is Purchase Item,É item de compra
 DocType: Journal Entry Account,Purchase Invoice,Nota Fiscal de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Nº do Detalhe do comprovante
 DocType: Stock Entry,Total Outgoing Value,Valor total de saída
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Abertura Data e Data de Fechamento deve estar dentro mesmo ano fiscal
 DocType: Lead,Request for Information,Pedido de Informação
 DocType: Payment Tool,Paid,Pago
 DocType: Salary Slip,Total in words,Total por extenso
 DocType: Material Request Item,Lead Time Date,Prazo de entrega
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,é mandatório. Talvez recorde de câmbios não é criado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Favor especificar Sem Serial para item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para os itens 'pacote de produtos ", Armazém, Serial e não há Batch Não será considerada a partir do' Packing List 'tabela. Se Warehouse e Batch Não são as mesmas para todos os itens de embalagem para qualquer item de 'Bundle Produto', esses valores podem ser inseridos na tabela do item principal, os valores serão copiados para 'Packing List' tabela."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Os embarques para os clientes.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Os embarques para os clientes.
 DocType: Purchase Invoice Item,Purchase Order Item,Item da Ordem de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Resultado indirecto
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Definir Valor do Pagamento = Valor Excepcional
@@ -862,13 +864,14 @@ DocType: Contact Us Settings,Address Line 1,Endereço
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variação
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nome da Empresa
 DocType: SMS Center,Total Message(s),Mensagem total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veja uma lista de todos os vídeos de ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione a Conta do banco onde o cheque foi depositado.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir ao usuário editar Taxa da Lista de Preços em transações
 DocType: Pricing Rule,Max Qty,Max Qtde
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
 DocType: Process Payroll,Select Payroll Year and Month,Selecione Payroll ano e mês
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vá para o grupo apropriado (geralmente Aplicação de Fundos> Ativo Circulante> Contas Bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo "Banco"
 DocType: Workstation,Electricity Cost,Custo de Energia Elétrica
@@ -884,7 +887,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bran
 DocType: SMS Center,All Lead (Open),Todos Prospectos (Abertos)
 DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Anexe sua imagem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Fazer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fazer
 DocType: Journal Entry,Total Amount in Words,Valor Total por extenso
 DocType: Workflow State,Stop,pare
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Houve um erro . Uma razão provável pode ser que você não tenha salvo o formulário. Entre em contato com support@erpnext.com se o problema persistir .
@@ -908,7 +911,7 @@ DocType: Packing Slip Item,Packing Slip Item,Item da Guia de Remessa
 DocType: POS Profile,Cash/Bank Account,Conta do Caixa/Banco
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Tabela de atributo é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabela de atributo é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordens de Venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} não pode ser negativo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arquivamento
@@ -919,12 +922,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Será atualizad
 DocType: Project,Internal,Interno
 DocType: Task,Urgent,Urgente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique um ID válido para Row linha {0} na tabela {1}"
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Vá para o ambiente de trabalho e começar a usar ERPNext
 DocType: Item,Manufacturer,Fabricante
 DocType: Landed Cost Item,Purchase Receipt Item,Item do Recibo de Compra
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém reservada no Pedido de Vendas / armazém de produtos acabados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Valor de venda
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Tempo Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Você é o aprovador de despesa para esse registro. Atualize o 'Estado' e salvar
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Você é o aprovador de despesa para esse registro. Atualize o 'Estado' e salvar
 DocType: Serial No,Creation Document No,Número de Criação do Documento
 DocType: Issue,Issue,Questão
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para item variantes. por exemplo, tamanho, cor etc."
@@ -939,8 +943,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Pedido de Vendas {0} é {1}
 DocType: Opportunity,Contact Info,Informações para Contato
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Fazendo de Stock Entradas
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Fazendo de Stock Entradas
 DocType: Packing Slip,Net Weight UOM,UDM do Peso Líquido
 DocType: Item,Default Supplier,Fornecedor padrão
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Ao longo de Produção Provisão Percentagem
@@ -949,7 +954,7 @@ DocType: Features Setup,Miscelleneous,Diversos
 DocType: Holiday List,Get Weekly Off Dates,Obter datas de descanso semanal
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data final não pode ser inferior a data de início
 DocType: Sales Person,Select company name first.,Selecione o nome da empresa por primeiro.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotações recebidas de fornecedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Para {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,atualizado via Time Logs
@@ -977,7 +982,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Números de registro da empresa para sua referência. Exemplo: CNPJ, IE, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrinho Rule Envio
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
 ,Ordered Items To Be Billed,Itens encomendados a serem faturados
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecione Time Logs e enviar para criar uma nova factura de venda.
@@ -1025,7 +1030,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impostos
 DocType: Lead,Lead,Prospecto
 DocType: Email Digest,Payables,Contas a pagar
 DocType: Account,Warehouse,Armazém
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
 ,Purchase Order Items To Be Billed,Ordem de Compra itens a serem faturados
 DocType: Purchase Invoice Item,Net Rate,Taxa Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Item da Nota Fiscal de Compra
@@ -1040,11 +1045,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Detalh
 DocType: Global Defaults,Current Fiscal Year,Ano Fiscal Atual
 DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
 DocType: Lead,Call,Chamar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Entradas' não pode estar vazio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entradas' não pode estar vazio
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 ,Trial Balance,Balancete
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Configurando Empregados
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurando Empregados
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Por favor seleccione prefixo primeiro
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,pesquisa
 DocType: Maintenance Visit Purpose,Work Done,Trabalho feito
@@ -1054,14 +1059,15 @@ DocType: Communication,Sent,Enviado
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ver Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais antigas
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
 DocType: Communication,Delivery Status,Estado da entrega
 DocType: Production Order,Manufacture against Sales Order,Fabricação contra a Ordem de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resto do mundo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto do mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O item {0} não pode ter Batch
 ,Budget Variance Report,Relatório de Variação de Orçamento
 DocType: Salary Slip,Gross Pay,Salário bruto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendos pagos
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Accounting Ledger
 DocType: Stock Reconciliation,Difference Amount,Diferença Montante
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Lucros Acumulados
 DocType: BOM Item,Item Description,Descrição do Item
@@ -1075,15 +1081,17 @@ DocType: Opportunity Item,Opportunity Item,Item da oportunidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Abertura temporária
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Equilíbrio Leave empregado
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Saldo da Conta {0} deve ser sempre {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo da Conta {0} deve ser sempre {1}
 DocType: Address,Address Type,Tipo de Endereço
 DocType: Purchase Receipt,Rejected Warehouse,Almoxarifado Rejeitado
 DocType: GL Entry,Against Voucher,Contra o Comprovante
 DocType: Item,Default Buying Cost Center,Compra Centro de Custo Padrão
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Para tirar o melhor proveito de ERPNext, recomendamos que você levar algum tempo e assistir a esses vídeos de ajuda."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Item {0} deve ser item de vendas
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,para
 DocType: Item,Lead Time in days,Tempo de entrega em dias
 ,Accounts Payable Summary,Resumo do Contas a Pagar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter faturas pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
@@ -1099,7 +1107,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Local de Emissão
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato
 DocType: Report,Disabled,Desativado
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Quantidade é obrigatório
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
@@ -1108,13 +1116,13 @@ DocType: Mode of Payment,Mode of Payment,Forma de Pagamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este é um grupo de itens de raiz e não pode ser editada.
 DocType: Journal Entry Account,Purchase Order,Ordem de Compra
 DocType: Warehouse,Warehouse Contact Info,Informações de Contato do Almoxarifado
-sites/assets/js/form.min.js +190,Name is required,Nome é obrigatório
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Nome é obrigatório
 DocType: Purchase Invoice,Recurring Type,Tipo de recorrência
 DocType: Address,City/Town,Cidade / Município
 DocType: Email Digest,Annual Income,Rendimento anual
 DocType: Serial No,Serial No Details,Detalhes do Nº de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Taxa de Imposto do Item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipamentos Capitais
@@ -1125,14 +1133,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data de entrega esperada é menor do que o planejado Data de Início.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,para Fornecedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Definir o Tipo de Conta ajuda na seleção desta Conta nas transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grande Total (moeda da empresa)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sainte total
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Só pode haver uma regra de envio Condição com 0 ou valor em branco para "" To Valor """
 DocType: Authorization Rule,Transaction,Transação
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este Centro de Custo é um grupo . Não pode fazer lançamentos contábeis contra grupos .
-apps/erpnext/erpnext/config/projects.py +43,Tools,Ferramentas
+apps/frappe/frappe/config/desk.py +7,Tools,Ferramentas
 DocType: Item,Website Item Groups,Grupos de Itens do site
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Número de ordem de produção é obrigatória para fabricação propósito entrada estoque
 DocType: Purchase Invoice,Total (Company Currency),Total (Companhia de moeda)
@@ -1142,7 +1150,7 @@ DocType: Workstation,Workstation Name,Nome da Estação de Trabalho
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},O BOM {0} não pertencem ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição de metas
-sites/assets/js/desk.min.js +7652,Comments,Comentários
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentários
 DocType: Salary Slip,Bank Account No.,Nº Conta Bancária
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transação criada com este prefixo
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Valorização Taxa exigida para item {0}
@@ -1157,7 +1165,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Deixar
 DocType: Purchase Invoice,Supplier Invoice Date,Fornecedor Data Fatura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,É preciso ativar o Carrinho de Compras
-sites/assets/js/form.min.js +212,No Data,No Data
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta do Modelo de Avaliação
 DocType: Salary Slip,Earning,Ganho
 DocType: Payment Tool,Party Account Currency,Partido Conta Moeda
@@ -1165,7 +1173,7 @@ DocType: Payment Tool,Party Account Currency,Partido Conta Moeda
 DocType: Purchase Taxes and Charges,Add or Deduct,Adicionar ou Reduzir
 DocType: Company,If Yearly Budget Exceeded (for expense account),Se orçamento anual excedida (para conta de despesas)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condições sobreposição encontradas entre :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Contra Journal Entry {0} já é ajustado contra algum outro comprovante
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra Journal Entry {0} já é ajustado contra algum outro comprovante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor total da ordem
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Envelhecimento 3
@@ -1173,11 +1181,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Nº de Visitas
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletters para contatos, leva."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Moeda da Conta de encerramento deve ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Soma de pontos para todos os objetivos devem ser 100. É {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,A operação não pode ser deixado em branco.
 ,Delivered Items To Be Billed,Itens entregues a serem faturados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Armazém não pode ser alterado para nº serial.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Atualizou estado para {0}
 DocType: DocField,Description,Descrição
 DocType: Authorization Rule,Average Discount,Desconto Médio
 DocType: Letter Head,Is Default,É padrão
@@ -1205,7 +1213,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Valor do Imposto do Item
 DocType: Item,Maintain Stock,Manter Estoque
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de data e hora
 DocType: Email Digest,For Company,Para a Empresa
@@ -1215,7 +1223,7 @@ DocType: Sales Invoice,Shipping Address Name,Endereço para envio Nome
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Conteúdos dos Termos e Condições
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem agendamento
 DocType: Employee,Owned,Pertencente
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licença sem vencimento
@@ -1228,7 +1236,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estado do CAM
 DocType: GL Entry,GL Entry,Lançamento GL
 DocType: HR Settings,Employee Settings,Configurações Empregado
 ,Batch-Wise Balance History,Balanço por Histórico de Lotes
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Lista de Tarefas
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Lista de Tarefas
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativo Quantidade não é permitido
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1261,13 +1269,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Aluguel do Escritório
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configurações de gateway SMS Setup
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Falha na importação !
-sites/assets/js/erpnext.min.js +24,No address added yet.,Nenhum endereço adicionado ainda.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho Workstation
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
 DocType: Item,Inventory,Inventário
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para ativar "Point of Sale" vista
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
 DocType: Item,Sales Details,Detalhes de Vendas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixando
 DocType: Opportunity,With Items,Com Itens
@@ -1277,7 +1285,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",A data na qual próxima fatura será gerada. Ele é gerado em enviar.
 DocType: Item Attribute,Item Attribute,Atributo item
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,governo
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,As variantes de item
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,As variantes de item
 DocType: Company,Services,Serviços
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
@@ -1287,11 +1295,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Escarea�o
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos
 DocType: Material Request Item,Sales Order No,Nº da Ordem de Venda
 DocType: Item Group,Item Group Name,Nome do Grupo de Itens
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiais de transferência para Fabricação
 DocType: Pricing Rule,For Price List,Para Lista de Preço
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1300,8 +1308,7 @@ DocType: Maintenance Schedule,Schedules,Horários
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
 DocType: Purchase Order Item Supplied,BOM Detail No,Nº do detalhe da LDM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montante desconto adicional (moeda da empresa)
-DocType: Period Closing Voucher,CoA Help,Ajuda CoA
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Erro: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Erro: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta de Plano de Contas ."
 DocType: Maintenance Visit,Maintenance Visit,Visita de manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo Cliente> Território
@@ -1312,6 +1319,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
 DocType: Event,Tuesday,Terça-feira
 DocType: Leave Block List,Block Holidays on important days.,Bloco Feriados em dias importantes.
 ,Accounts Receivable Summary,Resumo do Contas a Receber
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Deixa para o tipo {0} já alocado para Employee {1} para {2} período - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo ID do usuário em um registro de empregado para definir Função Funcionário"
 DocType: UOM,UOM Name,Nome da UDM
 DocType: Top Bar Item,Target,Meta
@@ -1332,19 +1340,19 @@ DocType: Sales Partner,Sales Partner Target,Metas do Parceiro de Vendas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada Contabilidade para {0} só pode ser feito em moeda: {1}
 DocType: Pricing Rule,Pricing Rule,Regra de Preços
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Pedido de material a Ordem de Compra
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Pedido de material a Ordem de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Item devolvido {1} não existe em {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Contas Bancárias
 ,Bank Reconciliation Statement,Declaração de reconciliação bancária
 DocType: Address,Lead Name,Nome do Prospecto
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Abertura da Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Abertura da Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} deve aparecer apenas uma vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranfer mais do que {0} {1} contra Pedido de Compra {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Folhas atribuídos com sucesso para {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Folhas atribuídos com sucesso para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nenhum item para embalar
 DocType: Shipping Rule Condition,From Value,De Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Manufacturing Quantidade é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Manufacturing Quantidade é obrigatório
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Valores não reflete em banco
 DocType: Quality Inspection Reading,Reading 4,Leitura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Os pedidos de despesa da empresa.
@@ -1357,19 +1365,20 @@ DocType: Opportunity,Contact Mobile No,Celular do Contato
 DocType: Production Planning Tool,Select Sales Orders,Selecione as Ordens de Venda
 ,Material Requests for which Supplier Quotations are not created,Os pedidos de materiais para os quais Fornecedor Quotations não são criados
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para rastrear itens usando código de barras. Você será capaz de inserir itens na Guia de Remessa e Nota Fiscal de Venda através do escaneamento do código de barras do item.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar como Proferido
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faça Cotação
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Parar Aniversário Lembretes
 DocType: SMS Center,Receiver List,Lista de recebedores
 DocType: Payment Tool Detail,Payment Amount,Valor do Pagamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade consumida
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Visão
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Visão
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução da Estrutura Salarial
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Seletiva sinterização a laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importe com sucesso!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Produtos Enviados
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
@@ -1390,7 +1399,7 @@ DocType: Company,Default Payable Account,Conta a Pagar Padrão
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Instalação concluída
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Cobrada
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,reservados Qtde
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,reservados Qtde
 DocType: Party Account,Party Account,Conta Party
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Renda superior
@@ -1433,11 +1442,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ativar Carrinho
 DocType: Employee,Permanent Address,Endereço permanente
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Item {0} deve ser um item de serviço .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Adiantamento pago contra {0} {1} não pode ser maior \ do total geral {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Por favor seleccione código do item
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduzir Dedução por licença sem vencimento (LWP)
 DocType: Territory,Territory Manager,Gerenciador de Territórios
+DocType: Delivery Note Item,To Warehouse (Optional),Para Warehouse (Opcional)
 DocType: Sales Invoice,Paid Amount (Company Currency),Valor pago (Empresa de moeda)
 DocType: Purchase Invoice,Additional Discount,Desconto adicional
 DocType: Selling Settings,Selling Settings,Vendendo Configurações
@@ -1460,7 +1470,7 @@ DocType: Item,Weightage,Peso
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineração
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,De moldagem de resina
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe um grupo de clientes com o mesmo nome, por favor modifique o nome do cliente ou renomeie o grupo de clientes"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Por favor seleccione {0} primeiro.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Por favor seleccione {0} primeiro.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0}
 DocType: Territory,Parent Territory,Território pai
 DocType: Quality Inspection Reading,Reading 2,Leitura 2
@@ -1488,11 +1498,11 @@ DocType: Sales Invoice Item,Batch No,Nº do Lote
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias ordens de venda contra a Ordem de Compra do Cliente
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
 DocType: DocPerm,Delete,Excluir
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
-sites/assets/js/desk.min.js +7971,New {0},Nova {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para séries de numeração em suas transações
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Licenças cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunidade De O campo é obrigatório
 DocType: Item,Variants,Variantes
@@ -1510,7 +1520,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,País
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Endereços
 DocType: Communication,Received,recebido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Journal Entry {0} não tem qualquer {1} entrada incomparável
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Journal Entry {0} não tem qualquer {1} entrada incomparável
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A condição para uma regra de Remessa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item não é permitido ter ordem de produção.
@@ -1531,7 +1541,6 @@ DocType: Employee,Salutation,Saudação
 DocType: Communication,Rejected,Rejeitado
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,Também se aplica a variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,Entregue %
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Empacotar itens no momento da venda.
 DocType: Sales Order Item,Actual Qty,Qtde Real
 DocType: Sales Invoice Item,References,Referências
@@ -1569,14 +1578,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,C
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Tem Variantes
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Clique em 'Criar Fatura de vendas' botão para criar uma nova factura de venda.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Período De e Período Para datas obrigatórias para recorrentes% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Embalagem e rotulagem
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da distribuição mensal
 DocType: Sales Person,Parent Sales Person,Vendedor pai
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifique Moeda predefinida in Company Mestre e padrões globais"
 DocType: Dropbox Backup,Dropbox Access Secret,Segredo de Acesso Dropbox
 DocType: Purchase Invoice,Recurring Invoice,Nota Fiscal Recorrente
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Gerenciamento de Projetos
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gerenciamento de Projetos
 DocType: Supplier,Supplier of Goods or Services.,Fornecedor de bens ou serviços.
 DocType: Budget Detail,Fiscal Year,Exercício fiscal
 DocType: Cost Center,Budget,Orçamento
@@ -1605,11 +1613,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Vendas
 DocType: Employee,Salary Information,Informação Salarial
 DocType: Sales Person,Name and Employee ID,Nome e identificação do funcionário
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
 DocType: Website Item Group,Website Item Group,Grupo de Itens do site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Impostos e Contribuições
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Por favor, indique data de referência"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} entradas de pagamento não podem ser filtrados por {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, indique data de referência"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pagamento não podem ser filtrados por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Fornecido Qtde
 DocType: Material Request Item,Material Request Item,Item de solicitação de material
@@ -1617,7 +1625,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árvore de Grupos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível consultar número da linha superior ou igual ao número da linha atual para este tipo de carga
 ,Item-wise Purchase History,Item-wise Histórico de compras
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Vermelho
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em "" Gerar Cronograma ' para buscar Serial Sem adição de item {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em "" Gerar Cronograma ' para buscar Serial Sem adição de item {0}"
 DocType: Account,Frozen,Congelado
 ,Open Production Orders,Pedidos em aberto Produção
 DocType: Installation Note,Installation Time,O tempo de Instalação
@@ -1661,13 +1669,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Tendências de cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Como ordem de produção pode ser feita para este item, ele deve ser um item de estoque."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Como ordem de produção pode ser feita para este item, ele deve ser um item de estoque."
 DocType: Shipping Rule Condition,Shipping Amount,Valor do transporte
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Juntando
 DocType: Authorization Rule,Above Value,Acima do Valor
 ,Pending Amount,Enquanto aguarda Valor
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Entregue
+DocType: Purchase Order,Delivered,Entregue
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuração do servidor de entrada para os trabalhos de identificação do email . ( por exemplo jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Número de veículos
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente será interrompida
@@ -1684,10 +1692,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir taxas sobre
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"A Conta {0} deve ser do tipo ""Ativo Fixo"" pois o item {1} é um item de ativos"
 DocType: HR Settings,HR Settings,Configurações de RH
 apps/frappe/frappe/config/setup.py +130,Printing,Impressão
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Despesa reivindicação está pendente de aprovação . Somente o aprovador Despesa pode atualizar status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Despesa reivindicação está pendente de aprovação . Somente o aprovador Despesa pode atualizar status.
 DocType: Purchase Invoice,Additional Discount Amount,Montante desconto adicional
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,No dia (s) em que você está se candidatando para a licença estão de férias. Você não precisa solicitar uma licença .
-sites/assets/js/desk.min.js +7805,and,e
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,e
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,esportes
@@ -1724,7 +1732,6 @@ DocType: Opportunity,Quotation,Cotação
 DocType: Salary Slip,Total Deduction,Dedução Total
 DocType: Quotation,Maintenance User,Manutenção do usuário
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Custo Atualizado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Tem certeza de que quer desentupir
 DocType: Employee,Date of Birth,Data de Nascimento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra o **Ano Fiscal**.
@@ -1740,13 +1747,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Leads, cotações, Pedido de Vendas etc de Campanhas para medir retorno sobre o investimento. "
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Qtde
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
 DocType: Appraisal,Calculate Total Score,Calcular a Pontuação Total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufatura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir Guia de Remessa em pacotes.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Os embarques
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldagem Dip
+DocType: Purchase Order,To be delivered to customer,Para ser entregue ao cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Estado devem ser apresentadas.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurando
@@ -1771,11 +1779,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,De Moeda
 DocType: DocField,Name,Nome
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Ordem de venda necessário para item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordem de venda necessário para item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Valores não reflete em sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Preço (moeda da empresa)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,outros
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Definir como parado
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Não consegue encontrar um item correspondente. Por favor, selecione algum outro valor para {0}."
 DocType: POS Profile,Taxes and Charges,Impostos e Encargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Um produto ou um serviço que é comprado, vendido ou mantido em estoque."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de carga como "" Valor Em linha anterior ' ou ' On Anterior Row Total ' para a primeira linha"
@@ -1784,19 +1792,20 @@ DocType: Web Form,Select DocType,Selecione o DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bancário
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em "" Gerar Agenda "" para obter cronograma"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Novo Centro de Custo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novo Centro de Custo
 DocType: Bin,Ordered Quantity,Quantidade encomendada
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","por exemplo ""Construa ferramentas para os construtores """
 DocType: Quality Inspection,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto relativo ao Item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} contra a Ordem de Venda {1}
+DocType: Purchase Order Item,Reference Document Type,Referência Tipo de Documento
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contra a Ordem de Venda {1}
 DocType: Account,Fixed Asset,ativos Fixos
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Inventário Serialized
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventário Serialized
 DocType: Activity Type,Default Billing Rate,Preço de Faturamento Padrão
 DocType: Time Log Batch,Total Billing Amount,Valor Total do faturamento
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Contas a Receber
 ,Stock Balance,Balanço de Estoque
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Pedido de Vendas para pagamento
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Pedido de Vendas para pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Detalhe do Pedido de Reembolso de Despesas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs criado:
 DocType: Item,Weight UOM,UDM de Peso
@@ -1832,10 +1841,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,A conta de Crédito deve ser uma conta do Contas à Pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},LDM recursão: {0} não pode ser pai ou filho de {2}
 DocType: Production Order Operation,Completed Qty,Qtde concluída
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, apenas as contas de débito pode ser ligado contra outra entrada crédito"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Preço de {0} está desativado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, apenas as contas de débito pode ser ligado contra outra entrada crédito"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Preço de {0} está desativado
 DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Ordem de Vendas {0} está parado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de série é necessários para item {1}. Você forneceu {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Taxa Atual de Avaliação
 DocType: Item,Customer Item Codes,Item de cliente Códigos
@@ -1844,9 +1852,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novo Estoque UOM é necessária
 DocType: Quality Inspection,Sample Size,Tamanho da amostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Todos os itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos os itens já foram faturados
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um válido 'De Caso No.'"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 DocType: Project,External,Externo
 DocType: Features Setup,Item Serial Nos,Nº de série de Itens
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuários e Permissões
@@ -1873,7 +1881,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Endereços e Contatos
 DocType: SMS Log,Sender Name,Nome do Remetente
 DocType: Page,Title,Título
-sites/assets/js/list.min.js +104,Customize,Personalize
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalize
 DocType: POS Profile,[Select],[ Selecionar]
 DocType: SMS Log,Sent To,Enviado Para
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Criar fatura de vendas
@@ -1898,12 +1906,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Fim de Vida
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,viagem
 DocType: Leave Block List,Allow Users,Permitir que os usuários
+DocType: Purchase Order,Customer Mobile No,Cliente Móvel Nenhum
 DocType: Sales Invoice,Recurring,Recorrente
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Acompanhe resultados separada e despesa para verticais de produtos ou divisões.
 DocType: Rename Tool,Rename Tool,Ferramenta de Renomear
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Atualize o custo
 DocType: Item Reorder,Item Reorder,Item Reordenar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,transferência de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,transferência de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações , custos operacionais e dar uma operação única não às suas operações."
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O Usuário deve sempre selecionar
@@ -1926,7 +1935,7 @@ DocType: Appraisal,Employee,Funcionário
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar e-mail do
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Convidar como Usuário
 DocType: Features Setup,After Sale Installations,Instalações Pós-Venda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} está totalmente faturado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} está totalmente faturado
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Termos do contrato padrão para vendas ou compra.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupo pela Vale
@@ -1935,8 +1944,9 @@ DocType: Sales Invoice,Mass Mailing,Divulgação em massa
 DocType: Page,Standard,Padrão
 DocType: Rename Tool,File to Rename,Arquivo para renomear
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagamentos
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamanho
 DocType: Notification Control,Expense Claim Approved,Pedido de Reembolso de Despesas Aprovado
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
@@ -1955,8 +1965,8 @@ DocType: Upload Attendance,Attendance To Date,Data Final de Comparecimento
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuração do servidor de entrada de e-mail id vendas. ( por exemplo sales@example.com )
 DocType: Warranty Claim,Raised By,Levantadas por
 DocType: Payment Tool,Payment Account,Conta de Pagamento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
-sites/assets/js/list.min.js +23,Draft,Rascunho
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Rascunho
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
 DocType: Quality Inspection Reading,Accepted,Aceito
 DocType: User,Female,Feminino
@@ -1969,14 +1979,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Rótudo da Regra de Envio
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Como existem transações com ações existentes para este item, \ não é possível alterar os valores de 'não tem Serial', 'Tem Lote n', 'é Stock item "e" Método de avaliação'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Breve Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa de se BOM mencionado em algum item
 DocType: Employee,Previous Work Experience,Experiência anterior de trabalho
 DocType: Stock Entry,For Quantity,Para Quantidade
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique Planned Qt para item {0} na linha {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} não foi enviado
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Os pedidos de itens.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} não foi enviado
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Os pedidos de itens.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Uma Ordem de Produção separada será criada para cada item acabado.
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Condições
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instalação concluída
@@ -1988,7 +1999,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Mailing List Bole
 DocType: Delivery Note,Transporter Name,Nome da Transportadora
 DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que este contato pertence
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total de Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unidade de Medida
 DocType: Fiscal Year,Year End Date,"Data final do ano
 "
@@ -2015,7 +2026,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data de Encerramento do Contrato deve ser maior que Data de Inicio
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / revendedor / comissão do agente / filial / revendedor que vende os produtos de empresas de uma comissão.
 DocType: Customer Group,Has Child Node,Tem nó filho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros da URL estática aqui (por exemplo remetente=ERPNext, usuario=ERPNext, senha=1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não consta em nenhum Ano Fiscal Ativo. Para mais detalhes consulte {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
@@ -2066,11 +2077,9 @@ DocType: Note,Note,Nota
 DocType: Purchase Receipt Item,Recd Quantity,Quantidade Recebida
 DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade Ordem de Vendas {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Definir como desimpedirão
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
 DocType: Tax Rule,Billing City,Faturamento Cidade
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Este pedido de férias está pendente de aprovação. Somente o Deixar Approver pode atualizar status.
 DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","ex: Banco, Dinheiro, Cartão de Crédito"
 DocType: Journal Entry,Credit Note,Nota de Crédito
@@ -2091,7 +2100,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtde)
 DocType: Installation Note Item,Installed Qty,Quantidade Instalada
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Enviado
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Enviado
 DocType: Salary Structure,Total Earning,Total de Ganhos
 DocType: Purchase Receipt,Time at which materials were received,Horário em que os materiais foram recebidos
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Os meus endereços
@@ -2100,7 +2109,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Mestre Organi
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ou
 DocType: Sales Order,Billing Status,Estado do Faturamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despesas com Serviços Públicos
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,Acima de 90
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Acima de 90
 DocType: Buying Settings,Default Buying Price List,Lista de preço de compra padrão
 ,Download Backups,Download de Backups
 DocType: Notification Control,Sales Order Message,Mensagem da Ordem de Venda
@@ -2109,7 +2118,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Selecione funcionários
 DocType: Bank Reconciliation,To Date,Até a Data
 DocType: Opportunity,Potential Sales Deal,Promoção de Vendas Potenciais
-sites/assets/js/form.min.js +308,Details,Detalhes
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalhes
 DocType: Purchase Invoice,Total Taxes and Charges,Total de Impostos e Encargos
 DocType: Employee,Emergency Contact,Contato de emergência
 DocType: Item,Quality Parameters,Parâmetros de Qualidade
@@ -2124,7 +2133,7 @@ DocType: Purchase Order Item,Received Qty,Qtde. recebida
 DocType: Stock Entry Detail,Serial No / Batch,N º de Série / lote
 DocType: Product Bundle,Parent Item,Item Pai
 DocType: Account,Account Type,Tipo de Conta
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerado para todos os itens. Por favor, clique em "" Gerar Agenda """
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerado para todos os itens. Por favor, clique em "" Gerar Agenda """
 ,To Produce,para Produzir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificação do pacote para a Entrega (para impressão)
@@ -2135,7 +2144,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Achatamento
 DocType: Account,Income Account,Conta de Receitas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modelagem
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Entrega
 DocType: Stock Reconciliation Item,Current Qty,Qtde atual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte "taxa de materiais baseados em" no Custeio Seção
 DocType: Appraisal Goal,Key Responsibility Area,Área Chave de Responsabilidade
@@ -2166,9 +2175,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todos os Endereços.
 DocType: Company,Stock Settings,Configurações da
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gerenciar grupos de clientes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Novo Centro de Custo Nome
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Novo Centro de Custo Nome
 DocType: Leave Control Panel,Leave Control Panel,Painel de Controle de Licenças
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No modelo padrão Endereço encontrado. Por favor, crie um novo a partir de configuração> Impressão e Branding> modelo de endereço."
 DocType: Appraisal,HR User,HR Usuário
@@ -2187,24 +2196,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Detalhe ferramenta de pagamento
 ,Sales Browser,Navegador de Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativo )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nenhum funcionário encontrado!
 DocType: C-Form Invoice Detail,Territory,Território
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
+DocType: Purchase Order,Customer Address Display,Exibir endereço do cliente
 DocType: Stock Settings,Default Valuation Method,Método de Avaliação padrão
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polimento
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Alocado
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Fechar Balanço e livro ou perda .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unidade de medida padrão para item {0} não pode ser alterado diretamente porque \ você já fez alguma transação (s) com outro UOM. Para alterar UOM padrão, \ uso 'UOM Substitua Utility "ferramenta abaixo Stock módulo."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especifique Taxa de Câmbio para converter uma moeda em outra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Cotação {0} esta cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Cotação {0} esta cancelada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Montante total em dívida
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empregado {0} estava de licença em {1} . Não pode marcar presença.
 DocType: Sales Partner,Targets,Metas
@@ -2219,12 +2228,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este é um grupo de clientes de raiz e não pode ser editada.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure o seu plano de contas antes de começar a lançamentos contábeis"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar regra de preços
-sites/assets/js/list.min.js +24,Cancelled,Cancelado
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Cancelado
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,A partir da data em Estrutura salarial não pode ser menor do que Employee Juntando Data.
 DocType: Employee Education,Graduate,Pós-graduação
 DocType: Leave Block List,Block Days,Bloco de Dias
 DocType: Journal Entry,Excise Entry,Excise Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Aviso: Pedidos de Vendas {0} já existe contra a ordem de compra do cliente {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Aviso: Pedidos de Vendas {0} já existe contra a ordem de compra do cliente {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2281,17 +2290,17 @@ DocType: Account,Stock Received But Not Billed,"Banco recebido, mas não faturad
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salário bruto + Valor em atraso + Valor de cobrança - Dedução Total
 DocType: Monthly Distribution,Distribution Name,Nome da distribuição
 DocType: Features Setup,Sales and Purchase,Vendas e Compra
-DocType: Purchase Order Item,Material Request No,Pedido de material no
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
+DocType: Supplier Quotation Item,Material Request No,Pedido de material no
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base da empresa
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} foi retirado com sucesso desta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa Líquida (Companhia de moeda)
-apps/frappe/frappe/templates/base.html +132,Added,Adicionado
+apps/frappe/frappe/templates/base.html +134,Added,Adicionado
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gerenciar territórios
 DocType: Journal Entry Account,Sales Invoice,Nota Fiscal de Venda
 DocType: Journal Entry Account,Party Balance,Balance Partido
 DocType: Sales Invoice Item,Time Log Batch,Tempo Batch Log
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
 DocType: Company,Default Receivable Account,Contas a Receber Padrão
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Criar registro bancário para o total pago de salários pelos critérios acima selecionados
 DocType: Stock Entry,Material Transfer for Manufacture,Transferência de Material de Fabricação
@@ -2302,7 +2311,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Obter entradas relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Lançamento Contábil de Estoque
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Cunhagem
 DocType: Sales Invoice,Sales Team1,Equipe de Vendas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do Cliente
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
@@ -2317,13 +2326,15 @@ DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray de formação
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: Quantidade de material solicitado é menor do que a ordem mínima 
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,A Conta {0} está congelada
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,A Conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um gráfico separado de Contas pertencente à Organização.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Fumo"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ou BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taxa de comissão não pode ser maior do que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nível Mínimo Inventory
 DocType: Stock Entry,Subcontract,Subcontratar
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Por favor, indique {0} primeiro"
 DocType: Production Planning Tool,Get Items From Sales Orders,Obter itens de Pedidos de Vendas
 DocType: Production Order Operation,Actual End Time,Tempo Final Real
 DocType: Production Planning Tool,Download Materials Required,Baixar Materiais Necessários
@@ -2340,9 +2351,9 @@ DocType: Maintenance Visit,Scheduled,Agendado
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item em que "é o estoque item" é "Não" e "é o item Vendas" é "Sim" e não há nenhum outro pacote de produtos"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione distribuição mensal para distribuir desigualmente alvos através meses.
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de Avaliação
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Lista de Preço Moeda não selecionado
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Lista de Preço Moeda não selecionado
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Row item {0}: Recibo de compra {1} não existe em cima da tabela 'recibos de compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de início do Projeto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Até
 DocType: Rename Tool,Rename Log,Renomeie Entrar
@@ -2369,13 +2380,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Somente nós-folha são permitidos em transações
 DocType: Expense Claim,Expense Approver,Despesa Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Item do Recibo de Compra Fornecido
-sites/assets/js/erpnext.min.js +48,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Datetime
 DocType: SMS Settings,SMS Gateway URL,URL de Gateway para SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Moagem
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retráctil
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Atividades pendentes
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Atividades pendentes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fornecedor> Fornecedor Tipo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, indique data alívio ."
@@ -2386,7 +2397,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Dig
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de Jornais
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecione Ano Fiscal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Você é aprovador desse registro. Atualize o 'Estado' e salve-o
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
 DocType: Attendance,Attendance Date,Data de Comparecimento
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salário com base em salário e dedução.
@@ -2422,6 +2432,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro de custo com as operações existentes não podem ser convertidos em grupo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Período inválido
 DocType: Customer,Credit Limit,Limite de Crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecione o tipo de transação
 DocType: GL Entry,Voucher No,Nº do comprovante
@@ -2431,8 +2442,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Model
 DocType: Customer,Address and Contact,Endereço e Contato
 DocType: Customer,Last Day of the Next Month,Último dia do mês seguinte
 DocType: Employee,Feedback,Comentários
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Devido / Reference Data excede dias de crédito de clientes permitidos por {0} dia (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Manut. Cronograma
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Devido / Reference Data excede dias de crédito de clientes permitidos por {0} dia (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Manut. Cronograma
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Usinagem jato abrasivo
 DocType: Stock Settings,Freeze Stock Entries,Congelar da Entries
 DocType: Website Settings,Website Settings,Configurações do site
@@ -2446,11 +2457,11 @@ DocType: Quality Inspection,Outgoing,De Saída
 DocType: Material Request,Requested For,solicitadas para
 DocType: Quotation Item,Against Doctype,Contra o Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Acompanhar este Guia de Remessa contra qualquer projeto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Conta root não pode ser excluído
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Conta root não pode ser excluído
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Banco de Entradas
 ,Is Primary Address,É primário Endereço
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referência # {0} {1} datado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gerenciar endereços
 DocType: Pricing Rule,Item Code,Código do Item
 DocType: Production Planning Tool,Create Production Orders,Criar Ordens de Produção
@@ -2459,14 +2470,14 @@ DocType: Journal Entry,User Remark,Observação do Usuário
 DocType: Lead,Market Segment,Segmento de mercado
 DocType: Communication,Phone,Telefone
 DocType: Employee Internal Work History,Employee Internal Work History,Histórico de trabalho interno do Funcionário
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Fechamento (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Fechamento (Dr)
 DocType: Contact,Passive,Indiferente
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Não {0} não em estoque
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modelo imposto pela venda de transações.
 DocType: Sales Invoice,Write Off Outstanding Amount,Eliminar saldo devedor
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Marque se você precisa de notas fiscais recorrentes automáticas. Depois de enviar qualquer nota fiscal de venda, a seção Recorrente será visível."
 DocType: Account,Accounts Manager,Gerente de Contas
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Tempo Log {0} deve ser ' enviado '
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Tempo Log {0} deve ser ' enviado '
 DocType: Stock Settings,Default Stock UOM,Padrão da UDM do Estouqe
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Preço de Custo baseado em tipo de atividade (por hora)
 DocType: Production Planning Tool,Create Material Requests,Criar Pedidos de Materiais
@@ -2477,7 +2488,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Reconciliação Bancária
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obter atualizações
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adicione alguns registros de exemplo
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Deixar de Gestão
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixar de Gestão
 DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupo por Conta
 DocType: Sales Order,Fully Delivered,Totalmente entregue
@@ -2489,11 +2500,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Extras de Vendas
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Orçamento {0} para conta {1} contra Centro de Custo {2} excederá por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Encaminhar Licenças
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',A 'Data Final' deve ser posterior a 'Data Inicial'
 ,Stock Projected Qty,Banco Projetada Qtde
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor ou Quantidade
@@ -2506,13 +2516,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Varejista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos os Tipos de Fornecedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Ítem da Programação da Manutenção
 DocType: Sales Order,%  Delivered,% Entregue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Conta Bancária Garantida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Criar folha de salário
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Liberar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Empréstimos garantidos
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Principais Produtos
@@ -2522,7 +2531,7 @@ DocType: Appraisal,Appraisal,Avaliação
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,De fundição de espuma perdida
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Desenho
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data é repetida
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
 DocType: Hub Settings,Seller Email,Email do Vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (Purchase via da fatura)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2536,8 +2545,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (Companhia de moeda)
 DocType: BOM Operation,Hour Rate,Valor por hora
 DocType: Stock Settings,Item Naming By,Item de nomeação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,De Citação
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Outra entrada no Período de Encerramento {0} foi feita após {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,De Citação
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Outra entrada no Período de Encerramento {0} foi feita após {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para Manufatura
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Conta {0} não existe
 DocType: Purchase Receipt Item,Purchase Order Item No,Nº do Item da Ordem de Compra
@@ -2550,11 +2559,11 @@ DocType: Item,Inspection Required,Inspeção Obrigatória
 DocType: Purchase Invoice Item,PR Detail,Detalhe PR
 DocType: Sales Order,Fully Billed,Totalmente Anunciado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Dinheiro na mão
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Os usuários com esta função são autorizados a estabelecer contas congeladas e criar / modificar lançamentos contábeis contra contas congeladas
 DocType: Serial No,Is Cancelled,É cancelado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Minhas remessas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Minhas remessas
 DocType: Journal Entry,Bill Date,Data de Faturamento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 DocType: Supplier,Supplier Details,Detalhes do Fornecedor
@@ -2567,7 +2576,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,por transferência bancária
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Por favor selecione a Conta Bancária
 DocType: Newsletter,Create and Send Newsletters,Criar e enviar email marketing
-sites/assets/js/report.min.js +107,From Date must be before To Date,A data inicial deve ser anterior a data final
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,A data inicial deve ser anterior a data final
 DocType: Sales Order,Recurring Order,Ordem Recorrente
 DocType: Company,Default Income Account,Conta de Rendimento padrão
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupo de Cliente/Cliente
@@ -2582,31 +2591,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,UDM do Estoque
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
 ,Projected,projetado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
 DocType: Notification Control,Quotation Message,Mensagem da Cotação
 DocType: Issue,Opening Date,Data de abertura
 DocType: Journal Entry,Remark,Observação
 DocType: Purchase Receipt Item,Rate and Amount,Preço e Total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Chato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Da Ordem de Vendas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Da Ordem de Vendas
 DocType: Blog Category,Parent Website Route,Pai site Route
 DocType: Sales Order,Not Billed,Não Faturado
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambos Armazéns devem pertencer a mesma empresa
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Nenhum contato adicionado ainda.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nenhum contato adicionado ainda.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Não ativo
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Contra Fatura Data de lançamento
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Custo Landed Comprovante Montante
 DocType: Time Log,Batched for Billing,Agrupadas para Faturamento
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers., Faturas levantada por Fornecedores.
 DocType: POS Profile,Write Off Account,Eliminar Conta
-sites/assets/js/erpnext.min.js +26,Discount Amount,Montante do Desconto
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Montante do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Regresso contra factura de compra
 DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por exemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Conta Journal Entry
 DocType: Shopping Cart Settings,Quotation Series,Cotação Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomeie o item"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomeie o item"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gás de metais a quente
 DocType: Sales Order Item,Sales Order Date,Data da Ordem de Venda
 DocType: Sales Invoice Item,Delivered Qty,Qtde entregue
@@ -2638,10 +2646,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Cliente ou fornecedor detalhes
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,conjunto
 DocType: Lead,Lead Owner,Proprietário do Prospecto
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Armazém é necessária
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Armazém é necessária
 DocType: Employee,Marital Status,Estado civil
 DocType: Stock Settings,Auto Material Request,Requisição de material automática
 DocType: Time Log,Will be updated when billed.,Será atualizado quando faturado.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponível Qtd Batch a partir do Armazém
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDM não podem ser as mesmas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Efetivação
 DocType: Sales Invoice,Against Income Account,Contra a Conta de Rendimentos
@@ -2658,12 +2667,12 @@ DocType: POS Profile,Update Stock,Atualizar Estoque
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM diferente para itens levará a incorreta valor Peso Líquido (Total ) . Certifique-se de que o peso líquido de cada item está na mesma UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Taxa
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Lançamentos {0} são un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registo de todas as comunicações do tipo de e-mail, telefone, chat, visita, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Por favor, mencione completam centro de custo na empresa"
 DocType: Purchase Invoice,Terms,condições
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Criar Novo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Criar Novo
 DocType: Buying Settings,Purchase Order Required,Ordem de Compra Obrigatória
 ,Item-wise Sales History,Item-wise Histórico de Vendas
 DocType: Expense Claim,Total Sanctioned Amount,Valor Total Sancionado
@@ -2680,16 +2689,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Dedução da folha de pagam
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notas
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Selecione um nó de grupo em primeiro lugar.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Objetivo deve ser um dos {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Preencha o formulário e salvá-lo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Preencha o formulário e salvá-lo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Baixar um relatório contendo todas as matérias-primas com o seu estado mais recente do inventário
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Revestimento
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Saldo de Licenças antes da solicitação
 DocType: SMS Center,Send SMS,Envie SMS
 DocType: Company,Default Letter Head,Cabeçalho Padrão
 DocType: Time Log,Billable,Faturável
 DocType: Authorization Rule,This will be used for setting rule in HR module,Isso será usado para a definição de regras no módulo RH
 DocType: Account,Rate at which this tax is applied,Taxa em que este imposto é aplicado
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Reordenar Qtde
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordenar Qtde
 DocType: Company,Stock Adjustment Account,Banco de Acerto de Contas
 DocType: Journal Entry,Write Off,Eliminar
 DocType: Time Log,Operation ID,Operação ID
@@ -2700,12 +2710,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Campos de desconto estarão disponíveis em Ordem de Compra, Recibo de Compra, Nota Fiscal de Compra"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nome da nova conta. Nota: Por favor, não criar contas para Clientes e Fornecedores"
 DocType: Report,Report Type,Tipo de relatório
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Carregando
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Carregando
 DocType: BOM Replace Tool,BOM Replace Tool,Ferramenta de Substituição da LDM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelos de Endereços administrados por País
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Devido / Reference Data não pode ser depois de {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Fornecedor entrega ao Cliente
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mostrar imposto break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Devido / Reference Data não pode ser depois de {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Dados de Importação e Exportação
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Se envolver em atividades de fabricação. Permite Item ' é fabricado '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fatura Data de lançamento
 DocType: Sales Invoice,Rounded Total,Total arredondado
 DocType: Product Bundle,List items that form the package.,Lista de itens que compõem o pacote.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentual de alocação deve ser igual a 100%
@@ -2716,8 +2729,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com o usuário que tem Vendas Mestre Gerente {0} papel"
 DocType: Company,Default Cash Account,Conta Caixa padrão
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,"Empresa  (a própria companhia, não se refere ao cliente, nem ao fornecedor)"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido para o item {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
@@ -2739,11 +2752,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Quantidade não avalable no armazém {1} em {2} {3}.
  Disponível Qtde: {4}, Quantidade de transferência: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
+DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
 DocType: Event,Sunday,Domingo
 DocType: Sales Team,Contribution (%),Contribuição (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Modelo
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelo
 DocType: Sales Person,Sales Person Name,Nome do Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, indique pelo menos uma fatura na tabela"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Adicionar usuários
@@ -2752,7 +2766,7 @@ DocType: Task,Actual Start Date (via Time Logs),Data de início real (via Time L
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliação
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas Adicionado (Moeda Company)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
 DocType: Sales Order,Partly Billed,Parcialmente faturado
 DocType: Item,Default BOM,LDM padrão
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2760,12 +2774,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total de Outstanding Amt
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Configurações de impressão
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,automotivo
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Deixa para o tipo {0} já alocado para Employee {1} para o Ano Fiscal {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item é necessário
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldagem por injeção de metal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,De Nota de Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De Nota de Entrega
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Mensagem personalizada
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investimento Bancário
@@ -2781,10 +2794,10 @@ DocType: Newsletter,A Lead with this email id should exist,Deve existir um Prosp
 DocType: Stock Entry,From BOM,De BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Básico
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transações com ações antes {0} são congelados
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Para data deve ser mesmo a partir da data de licença Meio Dia
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Para data deve ser mesmo a partir da data de licença Meio Dia
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","por exemplo, kg, Unidade, nº, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data de Efetivação deve ser maior do que a Data de Nascimento
 DocType: Salary Structure,Salary Structure,Estrutura Salarial
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2792,7 +2805,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  conflito, atribuindo prioridade. Regras Preço: {0}"
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Companhia Aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Para Almoxarifado
 DocType: Employee,Offer Date,Oferta Data
 DocType: Hub Settings,Access Token,Token de Acesso
@@ -2815,6 +2828,7 @@ DocType: Issue,Opening Time,Horário de abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
+DocType: Delivery Note Item,From Warehouse,Do Armazém
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perfuração
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,A moldagem por sopro
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total
@@ -2836,11 +2850,12 @@ DocType: C-Form,Amended From,Corrigido a partir de
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matéria-prima
 DocType: Leave Application,Follow via Email,Siga por e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ou qty alvo ou valor alvo é obrigatório
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},No BOM padrão existe para item {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
-DocType: Leave Allocation,Carry Forward,Encaminhar
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No BOM padrão existe para item {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Abrindo data deve ser antes da Data de Fechamento
+DocType: Leave Control Panel,Carry Forward,Encaminhar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centro de custo com as operações existentes não podem ser convertidos em registro
 DocType: Department,Days for which Holidays are blocked for this department.,Dias para que feriados são bloqueados para este departamento.
 ,Produced,produzido
@@ -2861,17 +2876,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Purchase Order,The date on which recurring order will be stop,A data em que ordem recorrente será parar
 DocType: Quality Inspection,Item Serial No,Nº de série do Item
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente total
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Item Serialized {0} não pode ser atualizado utilizando \
  da Reconciliação"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transferência de material para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferência de material para Fornecedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
 DocType: Lead,Lead Type,Tipo de Prospecto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Criar Orçamento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Todos esses itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos esses itens já foram faturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado pelo {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regra Condições de envio
 DocType: BOM Replace Tool,The new BOM after replacement,A nova LDM após substituição
@@ -2919,7 +2934,7 @@ DocType: C-Form,C-Form,Formulário-C
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operação ID não definida
 DocType: Production Order,Planned Start Date,Planejado Start Date
 DocType: Serial No,Creation Document Type,Tipo de Criação do Documento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Manut. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Manut. Visita
 DocType: Leave Type,Is Encash,É cobrança
 DocType: Purchase Invoice,Mobile No,Telefone Celular
 DocType: Payment Tool,Make Journal Entry,Faça Journal Entry
@@ -2927,7 +2942,7 @@ DocType: Leave Allocation,New Leaves Allocated,Novas Licenças alocadas
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
 DocType: Project,Expected End Date,Data Final prevista
 DocType: Appraisal Template,Appraisal Template Title,Título do Modelo de Avaliação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Comercial
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Pai item {0} não deve ser um item da
 DocType: Cost Center,Distribution Id,Id da distribuição
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Principais Serviços
@@ -2943,14 +2958,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor para o atributo {0} deve estar dentro da gama de {1} a {2} nos incrementos de {3}
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Armazém necessário para o ítem de estoque {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Armazém necessário para o ítem de estoque {0}
+DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Estado de faturamento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminação
 DocType: Item Reorder,Transfer,Transferir
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch BOM explodiu (incluindo sub-conjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch BOM explodiu (incluindo sub-conjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicável Para (Funcionário)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
@@ -2966,6 +2982,7 @@ DocType: Company,Retail,Varejo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Cliente {0} não existe
 DocType: Attendance,Absent,Ausente
 DocType: Product Bundle,Product Bundle,Bundle produto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Esmagador
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Comprar Impostos e Taxas Template
 DocType: Upload Attendance,Download Template,Baixar o Modelo
@@ -2973,16 +2990,16 @@ DocType: GL Entry,Remarks,Observações
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de Item de Matérias-Primas
 DocType: Journal Entry,Write Off Based On,Eliminar Baseado em
 DocType: Features Setup,POS View,Visualizar PDV
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Registro de instalação de um nº de série
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Registro de instalação de um nº de série
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Lingotamento contínuo
-sites/assets/js/erpnext.min.js +10,Please specify a,"Por favor, especifique um"
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique um"
 DocType: Offer Letter,Awaiting Response,Aguardando resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Acima
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamento frio
 DocType: Salary Slip,Earning & Deduction,Ganho & Dedução
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,A Conta {0} não pode ser um Grupo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Região
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Opcional . Esta configuração será usada para filtrar em várias transações.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional . Esta configuração será usada para filtrar em várias transações.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
 DocType: Holiday List,Weekly Off,Descanso semanal
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Para por exemplo 2012, 2012-13"
@@ -3026,12 +3043,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Bojudo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativo-padrão de elenco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,despesas de representação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Idade
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Idade
 DocType: Time Log,Billing Amount,Faturamento Montante
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantidade inválido especificado para o item {0} . Quantidade deve ser maior do que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Pedidos de licença.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Contas com transações existentes não pode ser excluídas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Contas com transações existentes não pode ser excluídas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,despesas legais
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","O dia do mês em que ordem auto será gerado por exemplo, 05, 28, etc"
 DocType: Sales Invoice,Posting Time,Horário da Postagem
@@ -3040,9 +3057,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logotipo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Marque esta opção se você deseja forçar o usuário a selecionar uma série antes de salvar. Não haverá nenhum padrão se você marcar isso.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Nenhum artigo com Serial Não {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Abertas Notificações
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Abertas Notificações
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Despesas Diretas
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Você realmente quer liberar este pedido de material?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nova Receita Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Despesas de viagem
 DocType: Maintenance Visit,Breakdown,Colapso
@@ -3053,7 +3069,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afiando
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,provação
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
 DocType: Feed,Full Name,Nome Completo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Conquistar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
@@ -3076,7 +3092,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adicione linhas
 DocType: Buying Settings,Default Supplier Type,Padrão de Tipo de Fornecedor
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Pedreiras
 DocType: Production Order,Total Operating Cost,Custo de Operacional Total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos os Contatos.
 DocType: Newsletter,Test Email Id,Endereço de Email de Teste
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Sigla da Empresa
@@ -3100,11 +3116,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotaç
 DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
 ,Territory Target Variance Item Group-Wise,Território Alvo Variance item Group-wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template imposto é obrigatório.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Conta {0}: A Conta Pai {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço Taxa List (moeda da empresa)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} o status é 'Parado'
 DocType: Account,Temporary,Temporário
 DocType: Address,Preferred Billing Address,Preferred Endereço de Cobrança
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação percentual
@@ -3122,13 +3137,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalhe Imposto item S
 DocType: Purchase Order Item,Supplier Quotation,Cotação do Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível quando você salvar a cotação.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Engomadoria
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} está parado
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} está parado
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
 DocType: Lead,Add to calendar on this date,Adicionar ao calendário nesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,próximos eventos
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,próximos eventos
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,O Cliente é obrigatório
 DocType: Letter Head,Letter Head,Timbrado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada Rápida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} é obrigatório para Retorno
 DocType: Purchase Order,To Receive,Receber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Encolher montagem
@@ -3152,25 +3168,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Pelo menos um almoxarifado é obrigatório
 DocType: Serial No,Out of Warranty,Fora de Garantia
 DocType: BOM Replace Tool,Replace,Substituir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
 DocType: Purchase Invoice Item,Project Name,Nome do Projeto
 DocType: Supplier,Mention if non-standard receivable account,Mencione se não padronizado conta a receber
 DocType: Workflow State,Edit,Editar
 DocType: Journal Entry Account,If Income or Expense,Se a renda ou Despesa
 DocType: Features Setup,Item Batch Nos,Nº do Lote do Item
 DocType: Stock Ledger Entry,Stock Value Difference,Banco de Valor Diferença
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Recursos Humanos
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliação Pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Ativo Fiscal
 DocType: BOM Item,BOM No,Nº da LDM
 DocType: Contact Us Settings,Pincode,CEP
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} não tem conta {1} ou já comparado com outro comprovante
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} não tem conta {1} ou já comparado com outro comprovante
 DocType: Item,Moving Average,Média móvel
 DocType: BOM Replace Tool,The BOM which will be replaced,A LDM que será substituída
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novo Estoque UOM deve ser diferente do atual UOM estoque
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
 DocType: Production Order,Operation Cost,Operação Custo
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Carregar comparecimento a partir de um arquivo CSV.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Outstanding Amt
@@ -3178,7 +3194,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Estabel
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Para atribuir esse problema a alguém, use o botão "Atribuir" na barra lateral."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congeladores Stocks mais velhos do que [ dias ]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Se duas ou mais regras de preços são encontrados com base nas condições acima, a prioridade é aplicada. Prioridade é um número entre 0 a 20, enquanto o valor padrão é zero (em branco). Número maior significa que ele terá prioridade se houver várias regras de preços com as mesmas condições."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Contra Invoice
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Ano Fiscal: {0} não existe
 DocType: Currency Exchange,To Currency,A Moeda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir que os usuários a seguir para aprovar aplicações deixam para os dias de bloco.
@@ -3207,7 +3222,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Taxa
 DocType: Stock Entry Detail,Additional Cost,Custo adicional
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Encerramento do Exercício Social Data
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Não é possível filtrar com base no Comprovante Não, se agrupados por voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Criar cotação com fornecedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Criar cotação com fornecedor
 DocType: Quality Inspection,Incoming,Entrada
 DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzir a Geração de Renda para sair sem pagar (LWP)
@@ -3215,10 +3230,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
 DocType: Batch,Batch ID,ID do Lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota de entrega Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumo da Semana
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve ser um item comprado ou subcontratado na linha {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve ser um item comprado ou subcontratado na linha {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Conta: {0} só pode ser atualizado via transações de ações
 DocType: GL Entry,Party,Parte
 DocType: Sales Order,Delivery Date,Data de entrega
@@ -3231,7 +3246,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,t
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Méd. Taxa de Compra
 DocType: Task,Actual Time (in Hours),Tempo real (em horas)
 DocType: Employee,History In Company,Histórico na Empresa
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Newsletters
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletters
 DocType: Address,Shipping,Expedição
 DocType: Stock Ledger Entry,Stock Ledger Entry,Lançamento do Livro de Inventário
 DocType: Department,Leave Block List,Deixe Lista de Bloqueios
@@ -3250,7 +3265,7 @@ DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,A data de término do período da ordem atual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Faça uma oferta Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorna
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
 DocType: DocField,Fold,Dobrar
 DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
 DocType: Pricing Rule,Disable,Desativar
@@ -3282,7 +3297,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Relatórios para
 DocType: SMS Settings,Enter url parameter for receiver nos,Digite o parâmetro da url para os números de receptores
 DocType: Sales Invoice,Paid Amount,Valor pago
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Fechando Conta {0} deve ser do tipo ' responsabilidade '
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Fechando Conta {0} deve ser do tipo ' responsabilidade '
 ,Available Stock for Packing Items,Estoque disponível para o empacotamento de Itens
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"A definição desse modelo de endereço como padrão, pois não há outro padrão"
@@ -3290,7 +3305,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
 DocType: Production Planning Tool,Filter based on customer,Filtrar baseado em cliente
 DocType: Payment Tool Detail,Against Voucher No,Contra a folha no
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
 DocType: Employee External Work History,Employee External Work History,Histórico de trabalho externo do Funcionário
 DocType: Tax Rule,Purchase,Compras
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balanço Qtde
@@ -3327,28 +3342,29 @@ Note: BOM = Bill of Materials","Grupo agregado de Itens ** ** em outro item ** *
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Não Serial é obrigatória para item {0}
 DocType: Item Variant Attribute,Attribute,Atributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique de / para variar"
-sites/assets/js/desk.min.js +7652,Created By,Criado por
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Criado por
 DocType: Serial No,Under AMC,Sob CAM
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Taxa de valorização do item é recalculado considerando valor do voucher custo desembarcou
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,As configurações padrão para a venda de transações.
 DocType: BOM Replace Tool,Current BOM,LDM atual
-sites/assets/js/erpnext.min.js +8,Add Serial No,Adicionar Serial No
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Adicionar Serial No
 DocType: Production Order,Warehouses,Armazéns
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimir e estacionária
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grupo de nós
 DocType: Payment Reconciliation,Minimum Amount,Valor mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Atualizar Produtos Acabados
 DocType: Workstation,per hour,por hora
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Série {0} já usado em {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Série {0} já usado em {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Conta para o armazém ( inventário permanente ) será criado nessa conta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Armazém não pode ser excluído pois existe entrada de material para este armazém.
 DocType: Company,Distribution,Distribuição
-sites/assets/js/erpnext.min.js +50,Amount Paid,Valor pago
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Valor pago
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,expedição
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
 DocType: Customer,Default Taxes and Charges,Impostos e Encargos padrão
 DocType: Account,Receivable,a receber
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Não é permitido mudar de fornecedor como ordem de compra já existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Papel que é permitido submeter transações que excedam os limites de crédito estabelecidos.
 DocType: Sales Invoice,Supplier Reference,Referência do Fornecedor
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Se marcado, os itens da LDM para a Sub-Montagem serão considerados para obter matérias-primas. Caso contrário, todos os itens da sub-montagem vão ser tratados como matéria-prima."
@@ -3385,8 +3401,8 @@ DocType: Email Digest,Add/Remove Recipients,Adicionar / Remover Destinatários
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transação não é permitido contra parou Ordem de produção {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir esse Ano Fiscal como padrão , clique em ' Definir como padrão '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuração do servidor de entrada para suporte e-mail id . ( por exemplo support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escassez Qtde
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de pagamento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polimento
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Data Final' é necessária
@@ -3399,6 +3415,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações marcadas são "Enviadas", um pop-up abre automaticamente para enviar um e-mail para o "Contato" associado a transação, com a transação como um anexo. O usuário pode ou não enviar o e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Definições Globais
 DocType: Employee Education,Employee Education,Escolaridade do Funcionário
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
 DocType: Salary Slip,Net Pay,Pagamento Líquido
 DocType: Account,Account,Conta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Não {0} já foi recebido
@@ -3431,7 +3448,7 @@ DocType: BOM,Manufacturing User,Manufacturing Usuário
 DocType: Purchase Order,Raw Materials Supplied,Matérias-primas em actualização
 DocType: Purchase Invoice,Recurring Print Format,Recorrente Formato de Impressão
 DocType: Communication,Series,série
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Compra Data
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Compra Data
 DocType: Appraisal,Appraisal Template,Modelo de Avaliação
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Classificação do Item
@@ -3487,6 +3504,7 @@ DocType: HR Settings,Payroll Settings,Configurações da folha de pagamento
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não relacionados.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Faça a encomenda
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root não pode ter um centro de custos pai
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selecione o cadastro ...
 DocType: Sales Invoice,C-Form Applicable,Formulário-C Aplicável
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
 DocType: Supplier,Address and Contacts,Endereços e contatos
@@ -3497,7 +3515,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Obter Circulação Vouchers
 DocType: Warranty Claim,Resolved By,Resolvido por
 DocType: Appraisal,Start Date,Data de Início
-sites/assets/js/desk.min.js +7629,Value,Valor
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alocar licenças por um período.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Clique aqui para verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Conta {0}: Você não pode definir ela mesma como uma conta principal
@@ -3513,14 +3531,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox acesso permitido
 DocType: Dropbox Backup,Weekly,Semanalmente
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Por exemplo: smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Receber
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Receber
 DocType: Maintenance Visit,Fully Completed,Totalmente concluída
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% concluída
 DocType: Employee,Educational Qualification,Qualificação Educacional
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Employee Leave Approver,Employee Leave Approver,Empregado Leave Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} foi adicionada com sucesso à nossa lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido , porque Cotação foi feita."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron usinagem feixe
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
@@ -3533,7 +3551,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Adicionar / Editar preços
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Plano de Centros de Custo
 ,Requested Items To Be Ordered,Itens solicitados devem ser pedidos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Meus pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Meus pedidos
 DocType: Price List,Price List Name,Nome da Lista de Preços
 DocType: Time Log,For Manufacturing,Para Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totais
@@ -3544,7 +3562,7 @@ DocType: Account,Income,Receitas
 DocType: Industry Type,Industry Type,Tipo de indústria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo deu errado!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Aviso: pedido de férias contém as datas de intervalos 
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data de Conclusão
 DocType: Purchase Invoice Item,Amount (Company Currency),Amount (Moeda Company)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundição
@@ -3558,10 +3576,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Ano
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Perfil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Atualize Configurações SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Tempo Log {0} já faturado
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Tempo Log {0} já faturado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Empréstimos não garantidos
 DocType: Cost Center,Cost Center Name,Nome do Centro de Custo
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Item {0} com Serial Não {1} já está instalado
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Agendada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total pago Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mensagens maiores do que 160 caracteres vão ser divididos em múltiplas mensagens
@@ -3569,10 +3586,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Recebeu e aceitou
 ,Serial No Service Contract Expiry,Vencimento do Contrato de Serviço com Nº de Série
 DocType: Item,Unit of Measure Conversion,Unidade de Conversão de Medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empregado não pode ser alterado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Você não pode ter débito e crédito na mesma conta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Você não pode ter débito e crédito na mesma conta
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total atribuído deve ser de 100 %. É {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome da pessoa ou organização a que este endereço pertence.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Seus Fornecedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Não é possível definir como perdida como ordem de venda é feita.
@@ -3583,10 +3600,11 @@ DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Tem nº de Série
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A partir de {0} para {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
 DocType: Issue,Content Type,Tipo de Conteúdo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computador
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos no site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} não existe no sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Você não está autorizado para definir o valor congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Unreconciled Entradas
@@ -3597,14 +3615,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Para Almoxarifado
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},A Conta {0} foi inserida mais de uma vez para o ano fiscal {1}
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Comparecimento não pode ser marcado para datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
 DocType: Purchase Taxes and Charges,Account Head,Conta
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo desembarcado de itens
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elétrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença Valor Total (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID do usuário não definido para Funcionário {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,A partir da solicitação de garantia
@@ -3618,15 +3636,17 @@ DocType: Buying Settings,Naming Series,Séries nomeadas
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
 DocType: User,Enabled,Habilitado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ativos estoque
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Você realmente quer submeter todos os folha de salário do mês {0} e {1} ano
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Você realmente quer submeter todos os folha de salário do mês {0} e {1} ano
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Assinantes de importação
 DocType: Target Detail,Target Qty,Qtde. de metas
 DocType: Attendance,Present,Apresentar
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Entrega Nota {0} não deve ser apresentado
 DocType: Notification Control,Sales Invoice Message,Mensagem da Nota Fiscal de Venda
 DocType: Authorization Rule,Based On,Baseado em
-,Ordered Qty,ordenada Qtde
+DocType: Sales Order Item,Ordered Qty,ordenada Qtde
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Atividade / tarefa do projeto.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Gerar folhas de pagamento
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} não é um ID de e-mail válido
@@ -3666,7 +3686,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Envie Atendimento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e Manufatura Quantidade são obrigatórios
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Envelhecimento 2
-DocType: Journal Entry Account,Amount,Quantidade
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Quantidade
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,LDM substituída
 ,Sales Analytics,Analítico de Vendas
@@ -3693,7 +3713,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista não pode ser antes de Material Data do Pedido
 DocType: Contact Us Settings,City,Cidade
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic usinagem
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Erro: Não é um ID válido?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Erro: Não é um ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} deve ser um item de vendas
 DocType: Naming Series,Update Series Number,Atualizar Números de Séries
 DocType: Account,Equity,equidade
@@ -3708,7 +3728,7 @@ DocType: Purchase Taxes and Charges,Actual,Atual
 DocType: Authorization Rule,Customerwise Discount,Desconto referente ao Cliente
 DocType: Purchase Invoice,Against Expense Account,Contra a Conta de Despesas
 DocType: Production Order,Production Order,Ordem de Produção
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
 DocType: Quotation Item,Against Docname,Contra o Docname
 DocType: SMS Center,All Employee (Active),Todos os Empregados (Ativos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Agora
@@ -3716,14 +3736,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Custo de Matéria-Prima
 DocType: Item,Re-Order Level,Re-order Nível
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Digite itens e qtde. planejada para o qual você quer levantar ordens de produção ou fazer o download de matérias-primas para a análise.
-sites/assets/js/list.min.js +174,Gantt Chart,Gráfico de Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gráfico de Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,De meio expediente
 DocType: Employee,Applicable Holiday List,Lista de Férias Aplicável
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série Atualizado
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo de relatório é obrigatória
 DocType: Item,Serial Number Series,Serial Series Número
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
 DocType: Issue,First Responded On,Primeira resposta em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Listagem cruzada dos produtos que pertencem à vários grupos
@@ -3738,7 +3758,7 @@ DocType: Attendance,Attendance,Comparecimento
 DocType: Page,No,Não
 DocType: BOM,Materials,Materiais
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Modelo de impostos para a compra de transações.
 ,Item Prices,Preços de itens
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Por extenso será visível quando você salvar a Ordem de Compra.
@@ -3758,9 +3778,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despesas Administrativas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consultoria
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
-sites/assets/js/erpnext.min.js +50,Change,Mudança
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Mudança
 DocType: Purchase Invoice,Contact Email,E-mail do Contato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Ordem de Compra {0} está ' parado '
 DocType: Appraisal Goal,Score Earned,Pontuação Obtida
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de aviso prévio
@@ -3770,12 +3789,13 @@ DocType: Packing Slip,Gross Weight UOM,UDM do Peso Bruto
 DocType: Email Digest,Receivables / Payables,Contas a receber / contas a pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra a Nota Fiscal de Venda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampagem
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Custo de desembarque do Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores de zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem a partir de determinadas quantidades de matéria-prima
 DocType: Payment Reconciliation,Receivable / Payable Account,Receber Conta / Payable
 DocType: Delivery Note Item,Against Sales Order Item,Contra a Ordem de venda do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém padrão
 DocType: Task,Actual End Date (via Time Logs),Data Real End (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
@@ -3789,7 +3809,7 @@ DocType: Issue,Support Team,Equipe de Apoio
 DocType: Appraisal,Total Score (Out of 5),Pontuação total (sobre 5)
 DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Lote
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Equilíbrio
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Equilíbrio
 DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (via relatórios de despesas)
 DocType: User,Gender,Sexo
 DocType: Journal Entry,Debit Note,Nota de Débito
@@ -3805,9 +3825,8 @@ DocType: Lead,Blog Subscriber,Assinante do Blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Criar regras para restringir operações com base em valores.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se marcado, não total. de dias de trabalho vai incluir férias, e isso vai reduzir o valor de salário por dia"
 DocType: Purchase Invoice,Total Advance,Antecipação Total
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Pedido Unstop material
 DocType: Workflow State,User,Usuário
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Processamento de folha de pagamento
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processamento de folha de pagamento
 DocType: Opportunity Item,Basic Rate,Taxa Básica
 DocType: GL Entry,Credit Amount,Quantidade de crédito
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Definir como perdida
@@ -3815,7 +3834,7 @@ DocType: Customer,Credit Days Based On,Dias crédito com base em
 DocType: Tax Rule,Tax Rule,Regra imposto
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Manter o mesmo ritmo durante todo o ciclo de vendas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar logs de tempo fora do horário de trabalho estação de trabalho.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} já foi enviado
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} já foi enviado
 ,Items To Be Requested,Itens a ser solicitado
 DocType: Purchase Order,Get Last Purchase Rate,Obter Valor da Última Compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Preço para Facturação com base no tipo de atividade (por hora)
@@ -3824,6 +3843,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","E-mail ID da Empresa não foi encontrado , portanto o e-mail não pode ser enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fundos de Aplicação ( Ativos )
 DocType: Production Planning Tool,Filter based on item,Filtrar baseado no item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Conta de debito
 DocType: Fiscal Year,Year Start Date,Data do início do ano
 DocType: Attendance,Employee Name,Nome do Funcionário
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arredondado (Moeda Company)
@@ -3835,14 +3855,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Branqueamento
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
 DocType: Sales Invoice,Is POS,É PDV
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtde. fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceita
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Faturas levantdas para Clientes.
 DocType: DocField,Default,Padrão
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} assinantes acrescentados
 DocType: Maintenance Schedule,Schedule,Agendar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir orçamento para este centro de custo. Para definir a ação orçamento, consulte "Lista de Empresas""
@@ -3850,7 +3870,7 @@ DocType: Account,Parent Account,Conta pai
 DocType: Quality Inspection Reading,Reading 3,Leitura 3
 ,Hub,Cubo
 DocType: GL Entry,Voucher Type,Tipo de comprovante
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
 DocType: Expense Claim,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
@@ -3859,23 +3879,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,educação
 DocType: Selling Settings,Campaign Naming By,Campanha de nomeação
 DocType: Employee,Current Address Is,Endereço atual é
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
 DocType: Address,Office,Escritório
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Relatórios padrão
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Lançamentos no livro Diário.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Quantidade disponível no Armazém A partir de
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para criar uma conta de impostos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Por favor insira Conta Despesa
 DocType: Account,Stock,Estoque
 DocType: Employee,Current Address,Endereço Atual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se o item é uma variante de outro item, em seguida, descrição, imagem, preços, impostos etc será definido a partir do modelo, a menos que explicitamente especificado"
 DocType: Serial No,Purchase / Manufacture Details,Detalhes Compra / Fabricação
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Inventário Batch
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inventário Batch
 DocType: Employee,Contract End Date,Data Final do contrato
 DocType: Sales Order,Track this Sales Order against any Project,Acompanhar este Ordem de Venda contra qualquer projeto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Puxar as Ordens de Venda (pendentes de entrega) com base nos critérios acima
 DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,De Fornecedor Cotação
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,De Fornecedor Cotação
 DocType: Deduction Type,Deduction Type,Tipo de dedução
 DocType: Attendance,Half Day,Meio Dia
 DocType: Pricing Rule,Min Qty,Quantidade mínima
@@ -3886,20 +3908,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
 DocType: Stock Entry,Default Target Warehouse,Almoxarifado de destino padrão
 DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (Moeda Company)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
 DocType: Notification Control,Purchase Receipt Message,Mensagem do Recibo de Compra
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de folhas alocados mais de período
 DocType: Production Order,Actual Start Date,Data de Início Real
 DocType: Sales Order,% of materials delivered against this Sales Order,% do material entregue contra esta Ordem de Venda
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Gravar o movimento item.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gravar o movimento item.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Boletim lista assinante
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Escatelar
 DocType: Email Account,Service,Serviço
 DocType: Hub Settings,Hub Settings,Configurações Hub
 DocType: Project,Gross Margin %,Margem Bruta %
 DocType: BOM,With Operations,Com Operações
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 ,Monthly Salary Register,Registrar salário mensal
-apps/frappe/frappe/website/template.py +123,Next,próximo
+apps/frappe/frappe/website/template.py +140,Next,próximo
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação da LDM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolimento
@@ -3930,6 +3953,7 @@ DocType: Purchase Invoice,Next Date,Próxima data
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcionais
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Digite Impostos e Taxas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Usinagem
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui você pode manter detalhes familiares como o nome e ocupação do cônjuge, pai e filhos"
 DocType: Hub Settings,Seller Name,Nome do Vendedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos e taxas Deduzido (Moeda Company)
@@ -3956,29 +3980,29 @@ DocType: Purchase Order,To Receive and Bill,Para receber e Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,estilista
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Modelo de Termos e Condições
 DocType: Serial No,Delivery Details,Detalhes da entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Criar automaticamente um pedido de material se a quantidade for inferior a este nível
 ,Item-wise Purchase Register,Item-wise Compra Register
 DocType: Batch,Expiry Date,Data de validade
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
 ,Supplier Addresses and Contacts,Fornecedor Endereços e contatos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Por favor seleccione Categoria primeira
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Cadastro de Projeto.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como US $ etc ao lado de moedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Meio Dia)
 DocType: Supplier,Credit Days,Dias de Crédito
 DocType: Leave Type,Is Carry Forward,É encaminhado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obter itens de BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obter itens de BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Prazo de entrega
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
 DocType: Dropbox Backup,Send Notifications To,Enviar notificações para
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motivo da saída
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
 DocType: GL Entry,Is Opening,É abertura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,A Conta {0} não existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,A Conta {0} não existe
 DocType: Account,Cash,Numerário
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o site e outras publicações.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, crie estrutura salarial por empregado {0}"
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 1c0dddaa4e..cccac52239 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Modo de salário
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selecione distribuição mensal, se você quer acompanhar com base na sazonalidade."
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Itens já sincronizado
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir item a ser adicionado várias vezes em uma transação
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anular Material de Visita {0} antes de cancelar esta solicitação de garantia
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactação mais sinterização
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Moeda é necessário para Preço de {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado na transação.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Van Materiaal Request
+DocType: Purchase Order,Customer Contact,Contato do cliente
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Van Materiaal Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árvore
 DocType: Job Applicant,Job Applicant,Candidato a emprego
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Não há mais resultados.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Nome do cliente
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Todos os campos exportados tais como, moeda, taxa de conversão, total de exportação, total de exportação final, etc estão disponíveis na nota de entrega , POS, Orçamentos, Fatura, Ordem de vendas, etc."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (ou grupos) contra o qual as entradas de Contabilidade são feitas e os saldos são mantidos.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
 DocType: Manufacturing Settings,Default 10 mins,Padrão 10 minutos
 DocType: Leave Type,Leave Type Name,Deixe Nome Tipo
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Série atualizado com sucesso
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Meerdere Artikelprijzen .
 DocType: SMS Center,All Supplier Contact,Todos os contactos de fornecedores
 DocType: Quality Inspection Reading,Parameter,Parâmetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Data prevista End não pode ser menor do que o esperado Data de Início
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Você realmente quer desentupir ordem de produção:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa deve ser o mesmo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Aplicação deixar Nova
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Aplicação deixar Nova
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,cheque administrativo
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Usar esta opção para manter o código do item a nível de clientes e para torná-los pesquisáveis ​​com base em seu código
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar Varian
 DocType: Sales Invoice Item,Quantity,Quantidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Empréstimos ( Passivo)
 DocType: Employee Education,Year of Passing,Ano de Passagem
-sites/assets/js/erpnext.min.js +27,In Stock,Em Estoque
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Só pode fazer o pagamento contra a faturar Ordem de Vendas
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Em Estoque
 DocType: Designation,Designation,Designação
 DocType: Production Plan Item,Production Plan Item,Item do plano de produção
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilizador {0} já está atribuído a Empregado {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Faça novo perfil POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Cuidados de Saúde
 DocType: Purchase Invoice,Monthly,Mensal
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Fatura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Atraso no pagamento (Dias)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Endereço De Email
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,defesa
 DocType: Company,Abbr,Abrv
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,No veículo
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Por favor, selecione Lista de Preço"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, selecione Lista de Preço"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Carpintaria
 DocType: Production Order Operation,Work In Progress,Trabalho em andamento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impressão 3D
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Docname Detalhe pai
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg.
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,A abertura para um trabalho.
 DocType: Item Attribute,Increment,Incremento
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Selecione Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,publicidade
 DocType: Employee,Married,Casado
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Faça Banco Entry
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Faça Banco Entry
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fundos de Pensão
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse é obrigatória se o tipo de conta é Warehouse
 DocType: SMS Center,All Sales Person,Todos os vendedores
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Escreva Off Centro de Custos
 DocType: Warehouse,Warehouse Detail,Detalhe Armazém
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi cruzada para o cliente {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Tipo de imposto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Você não está autorizado para adicionar ou atualizar entradas antes de {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Você não está autorizado para adicionar ou atualizar entradas antes de {0}
 DocType: Item,Item Image (if not slideshow),Imagem item (se não slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe um cliente com o mesmo nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Taxa / 60) * Tempo real Operação
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Convidado
 DocType: Quality Inspection,Get Specification Details,Obtenha detalhes de Especificação
 DocType: Lead,Interested,Interessado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiais
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Abertura
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Abertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},A partir de {0} a {1}
 DocType: Item,Copy From Item Group,Copiar do item do grupo
 DocType: Journal Entry,Opening Entry,Abertura Entry
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Produto Inquérito
 DocType: Standard Reply,Owner,eigenaar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Gelieve eerst in bedrijf
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Por favor, selecione Empresa primeiro"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, selecione Empresa primeiro"
 DocType: Employee Education,Under Graduate,Sob graduação
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Custo Total
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefixo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumíveis
 DocType: Upload Attendance,Import Log,Importar Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
+DocType: Sales Invoice Item,Delivered By Supplier,Proferido por Fornecedor
 DocType: SMS Center,All Contact,Todos os Contactos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salário Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do exercício social
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Crédito em Moeda Empresa
 DocType: Delivery Note,Installation Status,Status da instalação
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aceite + Qty Rejeitada deve ser igual a quantidade recebida por item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aceite + Qty Rejeitada deve ser igual a quantidade recebida por item {0}
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-Primas para a Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} deve ser um item de compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Baixe o Template, preencha os dados apropriados e anexe o arquivo modificado.
  Todas as datas e empregado combinação no período selecionado virá no modelo, com registros de freqüência existentes"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Será atualizado após a factura de venda é submetido.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configurações para o Módulo HR
 DocType: SMS Center,SMS Center,SMS Center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Endireitando
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Digite o parâmetro url pa
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regras para aplicação de preços e de desconto.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Entrar conflitos desta vez com {0} para {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de Preço deve ser aplicável para comprar ou vender
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Data de instalação não pode ser anterior à data de entrega de item {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data de instalação não pode ser anterior à data de entrega de item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Desconto no preço de lista Taxa (%)
-sites/assets/js/form.min.js +279,Start,begin
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,begin
 DocType: User,First Name,Nome
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Sua configuração está concluída. Refrescante.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,De fundição de molde completa
 DocType: Offer Letter,Select Terms and Conditions,Selecione os Termos e Condições
 DocType: Production Planning Tool,Sales Orders,Pedidos de Vendas
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra Vendas Nota Fiscal do Item
 ,Production Orders in Progress,Productieorders in Progress
 DocType: Lead,Address & Contact,Endereço e contacto
+DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as folhas não utilizadas de atribuições anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
 DocType: Newsletter List,Total Subscribers,Total de Assinantes
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nome de Contato
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,Está pendente de Qtde
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de salário para os critérios acima mencionados.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pedido de compra.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Caixa de duas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Folhas por ano
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, defina Naming Series para {0} em Configurar> Configurações> Naming Series"
 DocType: Time Log,Will be updated when batched.,Será atualizado quando agrupadas.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Verifique 'É Advance' contra Conta {1} se esta é uma entrada antecedência.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Verifique 'É Advance' contra Conta {1} se esta é uma entrada antecedência.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
 DocType: Bulk Email,Message,Mensagem
 DocType: Item Website Specification,Item Website Specification,Especificação Site item
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Chave de Acesso
 DocType: Payment Tool,Reference No,Número de referência
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Deixe Bloqueados
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Deixe Bloqueados
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
 DocType: Stock Entry,Sales Invoice No,Vendas factura n
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Qtde mínima
 DocType: Pricing Rule,Supplier Type,Tipo de fornecedor
 DocType: Item,Publish in Hub,Publicar em Hub
 ,Terretory,terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Pedido de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Pedido de material
 DocType: Bank Reconciliation,Update Clearance Date,Atualize Data Liquidação
 DocType: Item,Purchase Details,Detalhes de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em 'matérias-primas fornecidas "na tabela Ordem de Compra {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Controle de Notificação
 DocType: Lead,Suggestions,Sugestões
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Definir item Group-wise orçamentos sobre este território. Você também pode incluir sazonalidade, definindo a distribuição."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Digite grupo conta pai para armazém {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
 DocType: Supplier,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Gerar Agende
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nova da UOM
 DocType: Period Closing Voucher,Closing Account Head,Fechando Chefe Conta
 DocType: Employee,External Work History,Histórico Profissional no Exterior
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Erro de referência circular
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Você realmente quer parar
 DocType: Communication,Closed,Fechado
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Em Palavras (Exportação) será visível quando você salvar a Nota de Entrega.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Você tem certeza que quer parar
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil
 DocType: Newsletter,Newsletter,Boletim informativo
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Guia de remessa
 DocType: Dropbox Backup,Allow Dropbox Access,Permitir Dropbox Acesso
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagamento foi modificado depois que você puxou-o. Por favor, puxe-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} entrou duas vezes no item Imposto
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} entrou duas vezes no item Imposto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Workstation,Rent Cost,Kosten huur
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecione mês e ano
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa em que moeda do cliente é convertido para a moeda base de cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponível em BOM, nota de entrega , factura de compra , ordem de produção , ordem de compra , Recibo de compra , nota fiscal de venda , ordem de venda , Stock entrada , quadro de horários"
 DocType: Item Tax,Tax Rate,Taxa de Imposto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Selecionar item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selecionar item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} gerido por lotes, não pode ser conciliada com \
  da Reconciliação, em vez usar da Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lote n deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converter para não-Grupo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Recibo de compra devem ser apresentados
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,UOM Stock atual
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (lote) de um item.
 DocType: C-Form Invoice Detail,Invoice Date,Data da fatura
 DocType: GL Entry,Debit Amount,Débito Montante
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Seu endereço de email
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, veja anexo"
 DocType: Purchase Order,% Received,% Recebido
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instruções
 DocType: Quality Inspection,Inspected By,Inspecionado por
 DocType: Maintenance Visit,Maintenance Type,Tipo de manutenção
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serial Não {0} não pertence a entrega Nota {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serial Não {0} não pertence a entrega Nota {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Parâmetro de Inspeção de Qualidade
 DocType: Leave Application,Leave Approver Name,Deixar Nome Approver
 ,Schedule Date,tijdschema
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Compra Registre
 DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis
 DocType: Workstation,Consumable Cost,verbruiksartikelen Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter regra 'Aprovar ausência'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter regra 'Aprovar ausência'
 DocType: Purchase Receipt,Vehicle Date,Veículo Data
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% Instalado
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Vul de naam van het bedrijf voor het eerst
 DocType: BOM,Item Desription,Desription item
 DocType: Purchase Invoice,Supplier Name,Nome do Fornecedor
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leia o manual de ERPNext
 DocType: Account,Is Group,É o grupo
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Serial N ° s automaticamente definido com base na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Verificar Fornecedor Nota Fiscal Número Unicidade
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerente de Vendas
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas Upto
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Férias Principais.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moldagem Shell
 DocType: Material Request Item,Required Date,Data Obrigatória
 DocType: Delivery Note,Billing Address,Endereço de Cobrança
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Vul Item Code .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vul Item Code .
 DocType: BOM,Costing,Custeio
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se selecionado, o valor do imposto será considerado como já incluído na tarifa Impressão / Quantidade de impressão"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtde
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between O
 DocType: Customer,Buyer of Goods and Services.,Comprador de Produtos e Serviços.
 DocType: Journal Entry,Accounts Payable,Contas a Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adicionar Inscritos
-sites/assets/js/erpnext.min.js +5,""" does not exists","""Não existe"""
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Não existe"""
 DocType: Pricing Rule,Valid Upto,Válido Upto
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Resultado direto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",Kan niet filteren op basis van account als gegroepeerd per account
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Diretor Administrativo
 DocType: Payment Tool,Received Or Paid,Recebidos ou pagos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Por favor, selecione Empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, selecione Empresa"
 DocType: Stock Entry,Difference Account,verschil Account
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Vul Warehouse waarvoor Materiaal Request zal worden verhoogd
 DocType: Production Order,Additional Operating Cost,Custo Operacional adicionais
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosméticos
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Te fuseren , moeten volgende eigenschappen hetzelfde zijn voor beide posten"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Te fuseren , moeten volgende eigenschappen hetzelfde zijn voor beide posten"
 DocType: Communication,Subject,Assunto
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Caducidade Não Serial Garantia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Wil je echt wilt dit materiaal afbreken ?
 DocType: Sales Order,To Deliver,Entregar
 DocType: Purchase Invoice Item,Item,item
 DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
 DocType: Account,Profit and Loss,Lucros e perdas
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Gerenciando Subcontratação
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gerenciando Subcontratação
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nova UOM NÃO deve ser do tipo inteiro Número
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Móveis e utensílios
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taxa em que moeda lista de preços é convertido para a moeda da empresa de base
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impost
 DocType: Purchase Invoice,Supplier Invoice No,Fornecedor factura n
 DocType: Territory,For reference,Para referência
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Fechamento (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Fechamento (Cr)
 DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
 DocType: Installation Note Item,Installation Note Item,Item Nota de Instalação
 ,Pending Qty,Pendente Qtde
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,Faturamento e Entrega Estado
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita os clientes
 DocType: Leave Control Panel,Allocate,Atribuír
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,anterior
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Vendas Retorno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Vendas Retorno
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selecione Ordens de venda a partir do qual você deseja criar ordens de produção.
+DocType: Item,Delivered by Supplier (Drop Ship),Entregue por Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariais.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Banco de dados do cliente.
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tombo
 DocType: Purchase Order Item,Billed Amt,Faturado Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um armazém lógico contra o qual as entradas em existências são feitas.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
 DocType: Event,Wednesday,Quarta-feira
 DocType: Sales Invoice,Customer's Vendor,Vendedor cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordem de produção é obrigatória
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Parâmetro receptor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e ' Agrupado por ' não pode ser o mesmo
 DocType: Sales Person,Sales Person Targets,Metas de vendas Pessoa
-sites/assets/js/form.min.js +271,To,para
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Por favor insira o endereço de email
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,para
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Por favor insira o endereço de email
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Extremidade de tubo formando
 DocType: Production Order Operation,In minutes,Em questão de minutos
 DocType: Issue,Resolution Date,Data resolução
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,Projetos de Usuário
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela detalhes da fatura.
 DocType: Company,Round Off Cost Center,Termine Centro de Custo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenção Visita {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenção Visita {0} deve ser cancelado antes de cancelar esta ordem de venda
 DocType: Material Request,Material Transfer,Transferência de Material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Abertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Postando timestamp deve ser posterior a {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Configurações
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos Custo desembarcados e Encargos
 DocType: Production Order Operation,Actual Start Time,Hora de início Atual
 DocType: BOM Operation,Operation Time,Tempo de Operação
-sites/assets/js/list.min.js +5,More,Mais
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mais
 DocType: Pricing Rule,Sales Manager,Gerente De Vendas
-sites/assets/js/desk.min.js +7673,Rename,andere naam geven
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,andere naam geven
 DocType: Journal Entry,Write Off Amount,Escreva Off Quantidade
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Dobrando
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir utilizador
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,m
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Em linha reta de corte
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para acompanhar o item em documentos de vendas e de compras com base em seus números de ordem. Este é também pode ser usada para rastrear detalhes sobre a garantia do produto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock atual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Verworpen Warehouse is verplicht tegen regected post
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Verworpen Warehouse is verplicht tegen regected post
 DocType: Account,Expenses Included In Valuation,Despesas incluídos na avaliação
 DocType: Employee,Provide email id registered in company,Fornecer ID e-mail registrado na empresa
 DocType: Hub Settings,Seller City,Vendedor Cidade
 DocType: Email Digest,Next email will be sent on:,Próximo e-mail será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Oferecer Carta Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} não foi encontrado
 DocType: Bin,Stock Value,Valor da
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,boom Type
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,bem-vindo
 DocType: Journal Entry,Credit Card Entry,Entrada de cartão de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tarefa Assunto
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
 DocType: Communication,Open,Abrir
 DocType: Lead,Campaign Name,Nome da campanha
 ,Reserved,gereserveerd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Você realmente quer para desentupir
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-Primas
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,A data na qual próxima fatura será gerada. Ele é gerado em enviar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativo Circulante
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Ordem de Compra do Cliente Não
 DocType: Employee,Cell Number,Número de células
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Você não pode entrar comprovante atual em 'Against Journal Entry' coluna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Você não pode entrar comprovante atual em 'Against Journal Entry' coluna
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,Oportunidade De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declaração salário mensal.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,responsabilidade
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
 DocType: Company,Default Cost of Goods Sold Account,Custo padrão de Conta Produtos Vendidos
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Lista de Preço não selecionado
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista de Preço não selecionado
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Process Payroll,Send Email,Enviar E-mail
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nenhuma permissão
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banco Detalhe Reconciliação
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Minhas Faturas
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Nenhum funcionário encontrado
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum funcionário encontrado
 DocType: Purchase Order,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Selecione BOM para começar
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Carregar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nu verzenden
 ,Support Analytics,Analytics apoio
 DocType: Item,Website Warehouse,Armazém site
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Você realmente quer parar de ordem de produção:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que auto factura será gerado por exemplo, 05, 28, etc"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score moet lager dan of gelijk aan 5 zijn
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C -Form platen
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Supor
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para ativar "Point of Sale" recursos
 DocType: Bin,Moving Average Rate,Movendo Taxa Média
 DocType: Production Planning Tool,Select Items,Selecione itens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} contra conta {1} ​​com a data de {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra conta {1} ​​com a data de {2}
 DocType: Comment,Reference Name,Nome de referência
 DocType: Maintenance Visit,Completion Status,Status de conclusão
 DocType: Sales Invoice Item,Target Warehouse,Armazém alvo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre a entrega ou recebimento até esta cento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Vendas Data
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Vendas Data
 DocType: Upload Attendance,Import Attendance,Importação de Atendimento
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Registro de Atividade
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compor automaticamente mensagem na apresentação de transações.
 DocType: Production Order,Item To Manufacture,Item Para Fabricação
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Fundição com Molde Permanente
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Ordem de Compra para pagamento
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} estatuto é {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordem de Compra para pagamento
 DocType: Sales Order Item,Projected Qty,Qtde Projetada
 DocType: Sales Invoice,Payment Due Date,Betaling Due Date
 DocType: Newsletter,Newsletter Manager,Boletim Gerente
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,Números solicitadas
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Avaliação de desempenho.
 DocType: Sales Invoice Item,Stock Details,Detalhes da
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do projeto
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Ponto de venda
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Não é possível levar adiante {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Ponto de venda
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Não é possível levar adiante {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo já em crédito, você não tem permissão para definir 'saldo deve ser' como 'débito'"
 DocType: Account,Balance must be,Equilíbrio deve ser
 DocType: Hub Settings,Publish Pricing,Publicar Pricing
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Compra recibo
 ,Received Items To Be Billed,Itens recebidos a ser cobrado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Jateamento abrasivo
-sites/assets/js/desk.min.js +3938,Ms,Ms
+DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Mestre taxa de câmbio .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar entalhe Tempo nos próximos {0} dias para a Operação {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Plano de sub-conjuntos
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,Alcance
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empregado {0} não está ativo ou não existe
 DocType: Features Setup,Item Barcode,Código de barras do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Variantes item {0} atualizado
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Compra Antecipada Fatura
 DocType: Address,Shop,Loja
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrada de crédito não pode ser ligado com uma {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrada de crédito não pode ser ligado com uma {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conta padrão Banco / Cash será atualizado automaticamente na fatura POS quando este modo for selecionado.
 DocType: Employee,Permanent Address Is,Vast adres
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operação concluída por quantos produtos acabados?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,A Marca
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
 DocType: Employee,Exit Interview Details,Sair Detalhes Entrevista
 DocType: Item,Is Purchase Item,É item de compra
 DocType: Journal Entry Account,Purchase Invoice,Compre Fatura
 DocType: Stock Ledger Entry,Voucher Detail No,Detalhe folha no
 DocType: Stock Entry,Total Outgoing Value,Valor total de saída
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Abertura Data e Data de Fechamento deve estar dentro mesmo ano fiscal
 DocType: Lead,Request for Information,Pedido de Informação
 DocType: Payment Tool,Paid,Pago
 DocType: Salary Slip,Total in words,Total em palavras
 DocType: Material Request Item,Lead Time Date,Chumbo Data Hora
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,é mandatório. Talvez recorde de câmbios não é criado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Favor especificar Sem Serial para item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para os itens 'pacote de produtos ", Armazém, Serial e não há Batch Não será considerada a partir do' Packing List 'tabela. Se Warehouse e Batch Não são as mesmas para todos os itens de embalagem para qualquer item de 'Bundle Produto', esses valores podem ser inseridos na tabela do item principal, os valores serão copiados para 'Packing List' tabela."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Os embarques para os clientes.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Os embarques para os clientes.
 DocType: Purchase Invoice Item,Purchase Order Item,Comprar item Ordem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Resultado indirecto
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Definir Valor do Pagamento = Valor Excepcional
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,Endereço Linha 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variação
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nome da empresa
 DocType: SMS Center,Total Message(s),Mensagem total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veja uma lista de todos os vídeos de ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione cabeça conta do banco onde cheque foi depositado.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir ao utilizador editar Taxa de Lista de Preços em transações
 DocType: Pricing Rule,Max Qty,Max Qtde
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
 DocType: Process Payroll,Select Payroll Year and Month,Selecione Payroll ano e mês
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vá para o grupo apropriado (geralmente Aplicação de Fundos> Ativo Circulante> Contas Bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo "Banco"
 DocType: Workstation,Electricity Cost,elektriciteitskosten
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bran
 DocType: SMS Center,All Lead (Open),Todos chumbo (Aberto)
 DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Anexar a sua imagem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Fazer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fazer
 DocType: Journal Entry,Total Amount in Words,Valor Total em Palavras
 DocType: Workflow State,Stop,pare
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Er is een fout opgetreden . Een mogelijke reden zou kunnen zijn dat je niet hebt opgeslagen het formulier . Neem dan contact support@erpnext.com als het probleem aanhoudt .
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,Embalagem item deslizamento
 DocType: POS Profile,Cash/Bank Account,Caixa / Banco Conta
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entrega
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Tabela de atributo é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabela de atributo é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordem de Vendas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} não pode ser negativo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arquivamento
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Será atualizad
 DocType: Project,Internal,Interno
 DocType: Task,Urgent,Urgente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique um ID válido para Row linha {0} na tabela {1}"
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Vá para o ambiente de trabalho e começar a usar ERPNext
 DocType: Item,Manufacturer,Fabricante
 DocType: Landed Cost Item,Purchase Receipt Item,Comprar item recepção
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém reservada no Pedido de Vendas / armazém de produtos acabados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Valor de venda
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Tempo Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Expense Approver voor dit record . Werk van de 'Status' en opslaan
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Expense Approver voor dit record . Werk van de 'Status' en opslaan
 DocType: Serial No,Creation Document No,Creatie Document No
 DocType: Issue,Issue,Questão
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para item variantes. por exemplo, tamanho, cor etc."
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Pedido de Vendas {0} é {1}
 DocType: Opportunity,Contact Info,Informações para contato
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Fazendo de Stock Entradas
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Fazendo de Stock Entradas
 DocType: Packing Slip,Net Weight UOM,UOM Peso Líquido
 DocType: Item,Default Supplier,Fornecedor padrão
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Ao longo de Produção Provisão Percentagem
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Obter semanal Datas Off
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data final não pode ser inferior a data de início
 DocType: Sales Person,Select company name first.,Selecione o nome da empresa em primeiro lugar.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citações recebidas de fornecedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Para {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,atualizado via Time Logs
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Números da empresa de registro para sua referência. Números fiscais, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrinho Rule Envio
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
 ,Ordered Items To Be Billed,Itens ordenados a ser cobrado
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecione Time Logs e enviar para criar uma nova factura de venda.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Fiscais
 DocType: Lead,Lead,Conduzir
 DocType: Email Digest,Payables,Contas a pagar
 DocType: Account,Warehouse,Armazém
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
 ,Purchase Order Items To Be Billed,Ordem de Compra itens a serem faturados
 DocType: Purchase Invoice Item,Net Rate,Taxa Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Comprar item Fatura
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Detalh
 DocType: Global Defaults,Current Fiscal Year,Atual Exercício
 DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
 DocType: Lead,Call,Chamar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,' Entradas ' não pode estar vazio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' Entradas ' não pode estar vazio
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 ,Trial Balance,Balancete
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Configurando Empregados
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurando Empregados
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Por favor seleccione prefixo primeiro
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,pesquisa
 DocType: Maintenance Visit Purpose,Work Done,Trabalho feito
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,verzonden
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ver Diário
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mudar o nome do grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mudar o nome do grupo de itens"
 DocType: Communication,Delivery Status,Estado entrega
 DocType: Production Order,Manufacture against Sales Order,Fabricação contra a Ordem de Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resto do mundo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto do mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O item {0} não pode ter Batch
 ,Budget Variance Report,Relatório Variance Orçamento
 DocType: Salary Slip,Gross Pay,Salário bruto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendos pagos
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Accounting Ledger
 DocType: Stock Reconciliation,Difference Amount,Diferença Montante
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Lucros Acumulados
 DocType: BOM Item,Item Description,Item Descrição
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,Item oportunidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Abertura temporária
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Empregado Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Saldo Conta {0} deve ser sempre {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo Conta {0} deve ser sempre {1}
 DocType: Address,Address Type,Tipo de endereço
 DocType: Purchase Receipt,Rejected Warehouse,Armazém rejeitado
 DocType: GL Entry,Against Voucher,Contra Vale
 DocType: Item,Default Buying Cost Center,Compra Centro de Custo Padrão
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Para tirar o melhor proveito de ERPNext, recomendamos que você levar algum tempo e assistir a esses vídeos de ajuda."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Item {0} deve ser item de vendas
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,para
 DocType: Item,Lead Time in days,Tempo de entrega em dias
 ,Accounts Payable Summary,Resumo das Contas a Pagar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter Facturas Pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Local de Emissão
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,contrato
 DocType: Report,Disabled,Inválido
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Quantidade é obrigatório
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,Modo de Pagamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dit is een hoofditem groep en kan niet worden bewerkt .
 DocType: Journal Entry Account,Purchase Order,Ordem de Compra
 DocType: Warehouse,Warehouse Contact Info,Armazém Informações de Contato
-sites/assets/js/form.min.js +190,Name is required,O Nome é obrigatório
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,O Nome é obrigatório
 DocType: Purchase Invoice,Recurring Type,Tipo recorrente
 DocType: Address,City/Town,Cidade / Município
 DocType: Email Digest,Annual Income,Rendimento anual
 DocType: Serial No,Serial No Details,Serial Detalhes Nenhum
 DocType: Purchase Invoice Item,Item Tax Rate,Taxa de Imposto item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Entrega Nota {0} não é submetido
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipamentos Capitais
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data de entrega esperada é menor do que o planejado Data de Início.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,voor Leverancier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Tipo de conta Definir ajuda na seleção desta conta em transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grande Total (moeda da empresa)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sainte total
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Só pode haver uma regra de envio Condição com 0 ou valor em branco para "" To Valor """
 DocType: Authorization Rule,Transaction,Transação
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este Centro de Custo é um grupo . Não pode fazer lançamentos contábeis contra grupos .
-apps/erpnext/erpnext/config/projects.py +43,Tools,Ferramentas
+apps/frappe/frappe/config/desk.py +7,Tools,Ferramentas
 DocType: Item,Website Item Groups,Item Grupos site
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Número de ordem de produção é obrigatória para fabricação propósito entrada estoque
 DocType: Purchase Invoice,Total (Company Currency),Total (Companhia de moeda)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,Nome da Estação de Trabalho
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},O BOM {0} não pertencem ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição alvo
-sites/assets/js/desk.min.js +7652,Comments,Comentários
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentários
 DocType: Salary Slip,Bank Account No.,Banco Conta N º
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transacção criados com este prefixo
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Valorização Taxa exigida para item {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor,
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Deixar
 DocType: Purchase Invoice,Supplier Invoice Date,Fornecedor Data Fatura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,É preciso ativar o Carrinho de Compras
-sites/assets/js/form.min.js +212,No Data,No Data
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta Modelo de avaliação
 DocType: Salary Slip,Earning,Ganhando
 DocType: Payment Tool,Party Account Currency,Partido Conta Moeda
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,Partido Conta Moeda
 DocType: Purchase Taxes and Charges,Add or Deduct,Adicionar ou Deduzir
 DocType: Company,If Yearly Budget Exceeded (for expense account),Se orçamento anual excedida (para conta de despesas)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condições sobreposição encontradas entre :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diário {0} já é ajustado contra algum outro comprovante
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diário {0} já é ajustado contra algum outro comprovante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor total da ordem
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Envelhecimento 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,N º de Visitas
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletters para contatos, leva."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Moeda da Conta de encerramento deve ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Soma de pontos para todos os objetivos devem ser 100. É {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,A operação não pode ser deixado em branco.
 ,Delivered Items To Be Billed,Itens entregues a ser cobrado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazijn kan niet worden gewijzigd voor Serienummer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Atualizou estado para {0}
 DocType: DocField,Description,Descrição
 DocType: Authorization Rule,Average Discount,Desconto médio
 DocType: Letter Head,Is Default,É Default
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Valor do imposto item
 DocType: Item,Maintain Stock,Manter da
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de data e hora
 DocType: Email Digest,For Company,Para a Empresa
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,Endereço para envio Nome
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Termos e Condições conteúdo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem marcação
 DocType: Employee,Owned,Possuído
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licença sem vencimento
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garantia / AMC Estado
 DocType: GL Entry,GL Entry,Entrada GL
 DocType: HR Settings,Employee Settings,werknemer Instellingen
 ,Batch-Wise Balance History,Por lotes História Balance
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Para fazer a lista
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Para fazer a lista
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,aprendiz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativo Quantidade não é permitido
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,alugar escritório
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configurações de gateway SMS Setup
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislukt!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Nenhum endereço adicionado ainda.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho Workstation
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
 DocType: Item,Inventory,Inventário
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para ativar "Point of Sale" vista
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
 DocType: Item,Sales Details,Detalhes de vendas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixando
 DocType: Opportunity,With Items,Com Itens
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",A data na qual próxima fatura será gerada. Ele é gerado em enviar.
 DocType: Item Attribute,Item Attribute,Atributo item
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Governo
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,As variantes de item
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,As variantes de item
 DocType: Company,Services,Serviços
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Escarea�o
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos
 DocType: Material Request Item,Sales Order No,Vendas decreto n º
 DocType: Item Group,Item Group Name,Nome do Grupo item
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiais de transferência para Fabricação
 DocType: Pricing Rule,For Price List,Para Lista de Preço
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,Horários
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM nenhum detalhe
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montante desconto adicional (moeda da empresa)
-DocType: Period Closing Voucher,CoA Help,Ajuda CoA
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Erro: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Erro: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta do Plano de Contas ."
 DocType: Maintenance Visit,Maintenance Visit,Visita de manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo Cliente> Território
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
 DocType: Event,Tuesday,Terça-feira
 DocType: Leave Block List,Block Holidays on important days.,Bloco Feriados em dias importantes.
 ,Accounts Receivable Summary,Resumo das Contas a Receber
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Deixa para o tipo {0} já alocado para Employee {1} para {2} período - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo ID do usuário em um registro de empregado para definir Função Funcionário"
 DocType: UOM,UOM Name,Nome UOM
 DocType: Top Bar Item,Target,Alvo
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,Vendas Alvo Parceiro
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada Contabilidade para {0} só pode ser feito em moeda: {1}
 DocType: Pricing Rule,Pricing Rule,Regra de Preços
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Pedido de material a Ordem de Compra
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Pedido de material a Ordem de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Item devolvido {1} não existe em {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,bankrekeningen
 ,Bank Reconciliation Statement,Declaração de reconciliação bancária
 DocType: Address,Lead Name,Nome levar
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Abertura da Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Abertura da Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} deve aparecer apenas uma vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranfer mais do que {0} {1} contra Pedido de Compra {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Folhas atribuídos com sucesso para {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Folhas atribuídos com sucesso para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nenhum item para embalar
 DocType: Shipping Rule Condition,From Value,De Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Manufacturing Kwantiteit is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Manufacturing Kwantiteit is verplicht
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Valores não reflete em banco
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Os pedidos de despesa da empresa.
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,Contato móveis não
 DocType: Production Planning Tool,Select Sales Orders,Selecione Pedidos de Vendas
 ,Material Requests for which Supplier Quotations are not created,Materiaal Verzoeken waarvoor Leverancier Offertes worden niet gemaakt
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para rastrear itens usando código de barras. Você será capaz de inserir itens na nota de entrega e nota fiscal de venda pela digitalização de código de barras do item.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar como Proferido
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faça Cotação
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
 DocType: SMS Center,Receiver List,Lista de receptor
 DocType: Payment Tool Detail,Payment Amount,Valor do Pagamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade consumida
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Vista
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vista
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução Estrutura Salarial
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Seletiva sinterização a laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserido mais de uma vez na Tabela de Conversão de Fator
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserido mais de uma vez na Tabela de Conversão de Fator
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importeer Succesvol!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo de itens emitidos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,Conta a Pagar Padrão
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Instalação concluída
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Tida
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Gereserveerd Aantal
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Gereserveerd Aantal
 DocType: Party Account,Party Account,Conta Party
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Renda superior
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ativar Carrinho
 DocType: Employee,Permanent Address,Endereço permanente
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Item {0} deve ser um item de serviço .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Adiantamento pago contra {0} {1} não pode ser maior \ do total geral {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Por favor seleccione código do item
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduzir Dedução por licença sem vencimento (LWP)
 DocType: Territory,Territory Manager,Territory Manager
+DocType: Delivery Note Item,To Warehouse (Optional),Para Warehouse (Opcional)
 DocType: Sales Invoice,Paid Amount (Company Currency),Valor pago (Empresa de moeda)
 DocType: Purchase Invoice,Additional Discount,Desconto adicional
 DocType: Selling Settings,Selling Settings,Vendendo Configurações
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineração
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,De moldagem de resina
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Um grupo de clientes existente com o mesmo nome, por favor altere o nome do cliente ou renomear o grupo de clientes"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Por favor seleccione {0} primeiro.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Por favor seleccione {0} primeiro.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0}
 DocType: Territory,Parent Territory,Território pai
 DocType: Quality Inspection Reading,Reading 2,Leitura 2
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,No lote
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias ordens de venda contra a Ordem de Compra do Cliente
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,principal
 DocType: DocPerm,Delete,Excluir
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
-sites/assets/js/desk.min.js +7971,New {0},Nova {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para numeração de série em suas transações
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Deixe cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunidade De O campo é obrigatório
 DocType: Item,Variants,Variantes
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,País
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Endereços
 DocType: Communication,Received,ontvangen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diário {0} não tem qualquer {1} entrada incomparável
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diário {0} não tem qualquer {1} entrada incomparável
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A condição para uma regra de envio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item não é permitido ter ordem de produção.
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,Saudação
 DocType: Communication,Rejected,Rejeitado
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,Será que também se aplicam para as variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Entregue
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle itens no momento da venda.
 DocType: Sales Order Item,Actual Qty,Qtde Atual
 DocType: Sales Invoice Item,References,Referências
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Tem Variantes
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Clique em 'Criar Fatura de vendas' botão para criar uma nova factura de venda.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Período De e Período Para datas obrigatórias para recorrentes% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Embalagem e rotulagem
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da distribuição mensal
 DocType: Sales Person,Parent Sales Person,Vendas Pessoa pai
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifique Moeda predefinida in Company Mestre e padrões globais"
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox acesso secreta
 DocType: Purchase Invoice,Recurring Invoice,Fatura recorrente
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Gerenciamento de Projetos
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gerenciamento de Projetos
 DocType: Supplier,Supplier of Goods or Services.,Fornecedor de bens ou serviços.
 DocType: Budget Detail,Fiscal Year,Ano Fiscal
 DocType: Cost Center,Budget,Orçamento
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Vendas
 DocType: Employee,Salary Information,Informação salarial
 DocType: Sales Person,Name and Employee ID,Nome e identificação do funcionário
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
 DocType: Website Item Group,Website Item Group,Grupo Item site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Impostos e Contribuições
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Por favor, indique data de referência"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} entradas de pagamento não podem ser filtrados por {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, indique data de referência"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pagamento não podem ser filtrados por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Fornecido Qtde
 DocType: Material Request Item,Material Request Item,Item de solicitação de material
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árvore de Grupos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível consultar número da linha superior ou igual ao número da linha atual para este tipo de carga
 ,Item-wise Purchase History,Item-wise Histórico de compras
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Vermelho
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em "" Gerar Cronograma ' para buscar Serial Sem adição de item {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em "" Gerar Cronograma ' para buscar Serial Sem adição de item {0}"
 DocType: Account,Frozen,Congelado
 ,Open Production Orders,Open productieorders
 DocType: Installation Note,Installation Time,O tempo de instalação
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Tendências cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Como ordem de produção pode ser feita para este item , deve ser um item de estoque."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Como ordem de produção pode ser feita para este item , deve ser um item de estoque."
 DocType: Shipping Rule Condition,Shipping Amount,Valor do transporte
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Juntando
 DocType: Authorization Rule,Above Value,Acima de Valor
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Entregue
+DocType: Purchase Order,Delivered,Entregue
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuração do servidor de entrada para os trabalhos de identificação do email . ( por exemplo jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Número de veículos
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente será parar
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir taxas sobre
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Conta {0} deve ser do tipo "" Ativo Fixo "" como item {1} é um item de ativos"
 DocType: HR Settings,HR Settings,Configurações RH
 apps/frappe/frappe/config/setup.py +130,Printing,Impressão
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Declaratie is in afwachting van goedkeuring . Alleen de Expense Approver kan status bijwerken .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Declaratie is in afwachting van goedkeuring . Alleen de Expense Approver kan status bijwerken .
 DocType: Purchase Invoice,Additional Discount Amount,Montante desconto adicional
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,No dia (s) em que você está se candidatando para a licença estão de férias. Você não precisa solicitar uma licença .
-sites/assets/js/desk.min.js +7805,and,e
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,e
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,esportes
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,Citação
 DocType: Salary Slip,Total Deduction,Dedução Total
 DocType: Quotation,Maintenance User,Manutenção do usuário
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Custo Atualizado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Tem certeza de que não quer parar
 DocType: Employee,Date of Birth,Data de Nascimento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Ano Fiscal ** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra ** Ano Fiscal **.
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Leads, cotações, Pedido de Vendas etc de Campanhas para medir retorno sobre o investimento. "
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Aantal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
 DocType: Appraisal,Calculate Total Score,Calcular a pontuação total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufatura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Nota de Entrega dividir em pacotes.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Os embarques
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldagem Dip
+DocType: Purchase Order,To be delivered to customer,Para ser entregue ao cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Estado devem ser apresentadas.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurando
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,De Moeda
 DocType: DocField,Name,Nome
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Ordem de venda necessário para item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordem de venda necessário para item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Valores não reflete em sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (moeda da empresa)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,outros
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Definir como parado
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Não consegue encontrar um item correspondente. Por favor, selecione algum outro valor para {0}."
 DocType: POS Profile,Taxes and Charges,Impostos e Encargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Um produto ou serviço que é comprado, vendido ou mantido em stock."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de carga como "" Valor Em linha anterior ' ou ' On Anterior Row Total ' para a primeira linha"
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,Selecione DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,bancário
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em "" Gerar Agenda "" para obter cronograma"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Novo Centro de Custo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novo Centro de Custo
 DocType: Bin,Ordered Quantity,Quantidade pedida
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","Ex: ""Ferramentas de construção para construtores """
 DocType: Quality Inspection,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto Itemwise
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} contra a Ordem de Vendas {1}
+DocType: Purchase Order Item,Reference Document Type,Referência Tipo de Documento
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contra a Ordem de Vendas {1}
 DocType: Account,Fixed Asset,Activos Fixos
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Inventário Serialized
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventário Serialized
 DocType: Activity Type,Default Billing Rate,Faturamento Taxa de Inadimplência
 DocType: Time Log Batch,Total Billing Amount,Valor Total do faturamento
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Contas a Receber
 ,Stock Balance,Balanço de stock
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Pedido de Vendas para pagamento
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Pedido de Vendas para pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Detalhe de Despesas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs criado:
 DocType: Item,Weight UOM,Peso UOM
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédito em conta deve ser uma conta a pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursão: {0} não pode ser pai ou filho de {2}
 DocType: Production Order Operation,Completed Qty,Concluído Qtde
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, apenas as contas de débito pode ser ligado contra outra entrada crédito"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Preço de {0} está desativado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, apenas as contas de débito pode ser ligado contra outra entrada crédito"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Preço de {0} está desativado
 DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Ordem de Vendas {0} está parado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de série necessários para item {1}. Forneceu {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Avaliação actual Taxa
 DocType: Item,Customer Item Codes,Item de cliente Códigos
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novo stock UOM é necessária
 DocType: Quality Inspection,Sample Size,Tamanho da amostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Todos os itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos os itens já foram faturados
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um válido 'De Caso No.'"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 DocType: Project,External,Externo
 DocType: Features Setup,Item Serial Nos,Item n º s de série
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en machtigingen
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Endereço e contatos
 DocType: SMS Log,Sender Name,Nome do remetente
 DocType: Page,Title,Título
-sites/assets/js/list.min.js +104,Customize,Personalize
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalize
 DocType: POS Profile,[Select],[ Selecionar]
 DocType: SMS Log,Sent To,Enviado Para
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Maak verkoopfactuur
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Fim da Vida
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,viagem
 DocType: Leave Block List,Allow Users,Permitir utilizadores
+DocType: Purchase Order,Customer Mobile No,Cliente Móvel Nenhum
 DocType: Sales Invoice,Recurring,Recorrente
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Acompanhe resultados separada e despesa para verticais de produtos ou divisões.
 DocType: Rename Tool,Rename Tool,Renomear Ferramenta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten bijwerken
 DocType: Item Reorder,Item Reorder,Item Reordenar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transfer Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Materiaal
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties , operationele kosten en geven een unieke operatie niet aan uw activiteiten ."
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O usuário deve sempre escolher
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,Empregado
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar e-mail do
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Convidar como Usuário
 DocType: Features Setup,After Sale Installations,Após instalações Venda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} está totalmente faturado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} está totalmente faturado
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Termos do contrato padrão para vendas ou compra.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupo pela Vale
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,Divulgação em massa
 DocType: Page,Standard,Padrão
 DocType: Rename Tool,File to Rename,Arquivo para renomear
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagamentos
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamanho
 DocType: Notification Control,Expense Claim Approved,Relatório de Despesas Aprovado
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,Atendimento para a data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuração do servidor de entrada de e-mail id vendas. ( por exemplo sales@example.com )
 DocType: Warranty Claim,Raised By,Levantadas por
 DocType: Payment Tool,Payment Account,Conta de Pagamento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
-sites/assets/js/list.min.js +23,Draft,Rascunho
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Rascunho
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
 DocType: Quality Inspection Reading,Accepted,Aceite
 DocType: User,Female,Feminino
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Regra envio Rótulo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Como existem transações com ações existentes para este item, \ não é possível alterar os valores de 'não tem Serial', 'Tem Lote n', 'é Stock item "e" Método de avaliação'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Breve Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,U kunt geen koers veranderen als BOM agianst een item genoemd
 DocType: Employee,Previous Work Experience,Experiência anterior de trabalho
 DocType: Stock Entry,For Quantity,Para Quantidade
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique Planned Qt para item {0} na linha {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} não foi submetido
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Os pedidos de itens.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} não foi submetido
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Os pedidos de itens.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ordem de produção separado será criado para cada item acabado.
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instalação concluída
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Mailing List Bole
 DocType: Delivery Note,Transporter Name,Nome Transporter
 DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que pertence este contato
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total de Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unidade de Medida
 DocType: Fiscal Year,Year End Date,Data de Fim de Ano
 DocType: Task Depends On,Task Depends On,Tarefa depende de
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data Contrato Final deve ser maior que Data de Participar
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / revendedor / comissão do agente / filial / revendedor que vende os produtos de empresas de uma comissão.
 DocType: Customer Group,Has Child Node,Tem nó filho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros URL estática aqui (por exemplo remetente = ERPNext, username = ERPNext, password = 1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não em qualquer ano fiscal ativa. Para mais detalhes consulte {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
@@ -2067,11 +2078,9 @@ DocType: Note,Note,Nota
 DocType: Purchase Receipt Item,Recd Quantity,Quantidade RECD
 DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade Ordem de Vendas {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Definir como desimpedirão
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
 DocType: Tax Rule,Billing City,Faturamento Cidade
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Este pedido de férias está pendente de aprovação. Somente o Deixar Approver pode atualizar status.
 DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","por exemplo Banco, Dinheiro, cartão de crédito"
 DocType: Journal Entry,Credit Note,Nota de Crédito
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtde)
 DocType: Installation Note Item,Installed Qty,Quantidade instalada
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-sites/assets/js/list.min.js +26,Submitted,Enviado
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Enviado
 DocType: Salary Structure,Total Earning,Ganhar total
 DocType: Purchase Receipt,Time at which materials were received,Momento em que os materiais foram recebidos
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Os meus endereços
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Mestre Organi
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ou
 DocType: Sales Order,Billing Status,Estado de faturamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despesas de Utilidade
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,Acima de 90
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Acima de 90
 DocType: Buying Settings,Default Buying Price List,Standaard Buying Prijslijst
 ,Download Backups,Download de Backups
 DocType: Notification Control,Sales Order Message,Vendas Mensagem Ordem
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Selecione funcionários
 DocType: Bank Reconciliation,To Date,Conhecer
 DocType: Opportunity,Potential Sales Deal,Promoção de Vendas Potenciais
-sites/assets/js/form.min.js +308,Details,Detalhes
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalhes
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impostos e Encargos
 DocType: Employee,Emergency Contact,Emergency Contact
 DocType: Item,Quality Parameters,Parâmetros de Qualidade
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,Qtde recebeu
 DocType: Stock Entry Detail,Serial No / Batch,Serienummer / Batch
 DocType: Product Bundle,Parent Item,Item Pai
 DocType: Account,Account Type,Tipo de conta
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerado para todos os itens. Por favor, clique em "" Gerar Agenda '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerado para todos os itens. Por favor, clique em "" Gerar Agenda '"
 ,To Produce,Produce
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificação do pacote para a entrega (para impressão)
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Achatamento
 DocType: Account,Income Account,Conta Renda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modelagem
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Entrega
 DocType: Stock Reconciliation Item,Current Qty,Qtde atual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte "taxa de materiais baseados em" no Custeio Seção
 DocType: Appraisal Goal,Key Responsibility Area,Responsabilidade de Área chave
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todos os endereços.
 DocType: Company,Stock Settings,Configurações da
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gerenciar Grupo Cliente Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nome de NOvo Centro de Custo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nome de NOvo Centro de Custo
 DocType: Leave Control Panel,Leave Control Panel,Deixe Painel de Controle
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No modelo padrão Endereço encontrado. Por favor, crie um novo a partir de configuração> Impressão e Branding> modelo de endereço."
 DocType: Appraisal,HR User,HR Utilizador
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Detalhe ferramenta de pagamento
 ,Sales Browser,Navegador Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativo )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nenhum funcionário encontrado!
 DocType: C-Form Invoice Detail,Territory,Território
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
+DocType: Purchase Order,Customer Address Display,Exibir endereço do cliente
 DocType: Stock Settings,Default Valuation Method,Método de Avaliação padrão
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polimento
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Atribuído
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unidade de medida padrão para item {0} não pode ser alterado diretamente porque \ você já fez alguma transação (s) com outro UOM. Para alterar UOM padrão, \ uso 'UOM Substitua Utility "ferramenta abaixo Stock módulo."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especifique Taxa de Câmbio para converter uma moeda em outra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Cotação {0} é cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Cotação {0} é cancelada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Montante total em dívida
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empregado {0} estava de licença em {1} . Não pode marcar presença.
 DocType: Sales Partner,Targets,Metas
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dit is een wortel klantgroep en kan niet worden bewerkt .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure o seu plano de contas antes de começar a fazer lançamentos contabilísticos"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar regra de preços
-sites/assets/js/list.min.js +24,Cancelled,Cancelado
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Cancelado
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,A partir da data em Estrutura salarial não pode ser menor do que Employee Juntando Data.
 DocType: Employee Education,Graduate,Pós-graduação
 DocType: Leave Block List,Block Days,Dias bloco
 DocType: Journal Entry,Excise Entry,Excise Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Aviso: Pedidos de Vendas {0} já existe contra a ordem de compra do cliente {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Aviso: Pedidos de Vendas {0} já existe contra a ordem de compra do cliente {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,"Banco recebido, mas não faturad
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salário bruto + Valor + Valor vencido cobrança - Dedução Total
 DocType: Monthly Distribution,Distribution Name,Nome de distribuição
 DocType: Features Setup,Sales and Purchase,Vendas e Compras
-DocType: Purchase Order Item,Material Request No,Pedido de material no
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
+DocType: Supplier Quotation Item,Material Request No,Pedido de material no
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taxa na qual a moeda do cliente é convertido para a moeda da empresa de base
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} foi retirado com sucesso a partir desta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa Líquida (Companhia de moeda)
-apps/frappe/frappe/templates/base.html +132,Added,Adicionado
+apps/frappe/frappe/templates/base.html +134,Added,Adicionado
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gerenciar Árvore Território.
 DocType: Journal Entry Account,Sales Invoice,Fatura de vendas
 DocType: Journal Entry Account,Party Balance,Balance Partido
 DocType: Sales Invoice Item,Time Log Batch,Tempo Batch Log
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
 DocType: Company,Default Receivable Account,Contas a Receber Padrão
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Criar Banco de entrada para o salário total pago pelos critérios acima selecionados
 DocType: Stock Entry,Material Transfer for Manufacture,Transferência de Material de Fabricação
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Obter entradas relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entrada de Contabilidade da
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Cunhagem
 DocType: Sales Invoice,Sales Team1,Vendas team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do cliente
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray de formação
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing : Materiaal gevraagde Aantal minder dan Minimum afname
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Conta {0} está congelada
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um gráfico separado de Contas pertencente à Organização.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL of BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taxa de comissão não pode ser maior do que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nível Mínimo Inventory
 DocType: Stock Entry,Subcontract,Subcontratar
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Por favor, indique {0} primeiro"
 DocType: Production Planning Tool,Get Items From Sales Orders,Obter itens de Pedidos de Vendas
 DocType: Production Order Operation,Actual End Time,Tempo Final Atual
 DocType: Production Planning Tool,Download Materials Required,Baixe Materiais Necessários
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,Programado
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item em que "é o estoque item" é "Não" e "é o item Vendas" é "Sim" e não há nenhum outro pacote de produtos"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione distribuição mensal para distribuir desigualmente alvos através meses.
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de valorização
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Não foi indicada uma Moeda para a Lista de Preços
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Não foi indicada uma Moeda para a Lista de Preços
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Row item {0}: Recibo de compra {1} não existe em cima da tabela 'recibos de compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de início do projeto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Até
 DocType: Rename Tool,Rename Log,Renomeie Entrar
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Nós folha apenas são permitidos em operação
 DocType: Expense Claim,Expense Approver,Despesa Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra do item em actualização
-sites/assets/js/erpnext.min.js +48,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway de URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Moagem
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retráctil
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Atividades pendentes
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Atividades pendentes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fornecedor> Fornecedor Tipo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, indique data alívio ."
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Dig
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de Jornais
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecione Ano Fiscal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,U bent de Leave Approver voor dit record . Werk van de 'Status' en opslaan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
 DocType: Attendance,Attendance Date,Data de atendimento
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salário com base em salário e dedução.
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro de custo com as operações existentes não podem ser convertidos em grupo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Período inválido
 DocType: Customer,Credit Limit,Limite de Crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecione o tipo de transação
 DocType: GL Entry,Voucher No,Vale No.
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Model
 DocType: Customer,Address and Contact,Endereço e Contato
 DocType: Customer,Last Day of the Next Month,Último dia do mês seguinte
 DocType: Employee,Feedback,Comentários
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Devido / Reference Data excede dias de crédito de clientes permitidos por {0} dia (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Manut. Cronograma
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Devido / Reference Data excede dias de crédito de clientes permitidos por {0} dia (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Manut. Cronograma
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Usinagem jato abrasivo
 DocType: Stock Settings,Freeze Stock Entries,Congelar da Entries
 DocType: Website Settings,Website Settings,Configurações do site
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,Cessante
 DocType: Material Request,Requested For,gevraagd voor
 DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Acompanhar este Nota de Entrega contra qualquer projeto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Conta root não pode ser excluído
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Conta root não pode ser excluído
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Banco de Entradas
 ,Is Primary Address,É primário Endereço
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referência # {0} {1} datado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gerenciar endereços
 DocType: Pricing Rule,Item Code,Código do artigo
 DocType: Production Planning Tool,Create Production Orders,Criar ordens de produção
@@ -2460,14 +2471,14 @@ DocType: Journal Entry,User Remark,Observação de usuário
 DocType: Lead,Market Segment,Segmento de mercado
 DocType: Communication,Phone,Telefone
 DocType: Employee Internal Work History,Employee Internal Work History,Empregado História Trabalho Interno
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Fechamento (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Fechamento (Dr)
 DocType: Contact,Passive,Passiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Não {0} não em estoque
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modelo imposto pela venda de transações.
 DocType: Sales Invoice,Write Off Outstanding Amount,Escreva Off montante em dívida
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Verifique se você precisa automáticos de facturas recorrentes. Depois de apresentar qualquer nota fiscal de venda, seção Recorrente será visível."
 DocType: Account,Accounts Manager,Gestor de Contas
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Tempo Log {0} deve ser ' enviado '
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Tempo Log {0} deve ser ' enviado '
 DocType: Stock Settings,Default Stock UOM,Padrão da UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Taxa de custeio baseado em tipo de atividade (por hora)
 DocType: Production Planning Tool,Create Material Requests,Criar Pedidos de Materiais
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Banco Reconciliação
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obter atualizações
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adicione alguns registros de exemplo
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Deixar de Gestão
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixar de Gestão
 DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupo por Conta
 DocType: Sales Order,Fully Delivered,Totalmente entregue
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Extras de vendas
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} orçamento para conta {1} contra Centro de Custo {2} excederá por {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Folhas encaminhadas
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','A Data de ' deve ser depois de ' Para Data '
 ,Stock Projected Qty,Verwachte voorraad Aantal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor ou Quantidade
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Varejista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos os tipos de fornecedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item Programa de Manutenção
 DocType: Sales Order,%  Delivered,% Entregue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Conta Garantida Banco
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Maak loonstrook
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,opendraaien
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Empréstimos garantidos
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,produtos impressionantes
@@ -2523,7 +2532,7 @@ DocType: Appraisal,Appraisal,Avaliação
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,De fundição de espuma perdida
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Desenho
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data é repetido
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
 DocType: Hub Settings,Seller Email,Vendedor Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (Purchase via da fatura)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2537,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (Companhia de moeda)
 DocType: BOM Operation,Hour Rate,Taxa à hora
 DocType: Stock Settings,Item Naming By,Item de nomeação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,De Orçamento
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Outra entrada Período de Encerramento {0} foi feita após {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,De Orçamento
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Outra entrada Período de Encerramento {0} foi feita após {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para Manufatura
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Conta {0} não existe
 DocType: Purchase Receipt Item,Purchase Order Item No,Comprar item Portaria n
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,Inspeção Obrigatório
 DocType: Purchase Invoice Item,PR Detail,Detalhe PR
 DocType: Sales Order,Fully Billed,Totalmente Anunciado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Dinheiro na mão
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gebruikers met deze rol mogen bevroren accounts en maak / boekingen tegen bevroren rekeningen wijzigen
 DocType: Serial No,Is Cancelled,É cancelado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Minhas remessas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Minhas remessas
 DocType: Journal Entry,Bill Date,Data Bill
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 DocType: Supplier,Supplier Details,Detalhes fornecedor
@@ -2568,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,por transferência bancária
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Por favor seleccione Conta Bancária
 DocType: Newsletter,Create and Send Newsletters,Criar e enviar Newsletters
-sites/assets/js/report.min.js +107,From Date must be before To Date,A partir da data deve ser anterior a Data
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,A partir da data deve ser anterior a Data
 DocType: Sales Order,Recurring Order,Ordem Recorrente
 DocType: Company,Default Income Account,Conta Rendimento padrão
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / Klantenservice
@@ -2583,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Estoque UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
 ,Projected,verwachte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
 DocType: Notification Control,Quotation Message,Mensagem citação
 DocType: Issue,Opening Date,Data de abertura
 DocType: Journal Entry,Remark,Observação
 DocType: Purchase Receipt Item,Rate and Amount,Taxa e montante
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Chato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Da Ordem de Vendas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Da Ordem de Vendas
 DocType: Blog Category,Parent Website Route,Pai site Route
 DocType: Sales Order,Not Billed,Não faturado
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Beide Warehouse moeten behoren tot dezelfde Company
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Nenhum contato adicionado ainda.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nenhum contato adicionado ainda.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Não ativo
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Contra Data de lançamento da Fatura
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Custo Landed Comprovante Montante
 DocType: Time Log,Batched for Billing,Agrupadas para Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Contas levantada por Fornecedores.
 DocType: POS Profile,Write Off Account,Escreva Off Conta
-sites/assets/js/erpnext.min.js +26,Discount Amount,Montante do Desconto
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Montante do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Regresso contra factura de compra
 DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por exemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Conta Diário de entrada
 DocType: Shopping Cart Settings,Quotation Series,Cotação Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomear o item"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomear o item"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gás de metais a quente
 DocType: Sales Order Item,Sales Order Date,Vendas Data Ordem
 DocType: Sales Invoice Item,Delivered Qty,Qtde entregue
@@ -2639,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Cliente ou fornecedor detalhes
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,conjunto
 DocType: Lead,Lead Owner,Levar Proprietário
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Armazém é necessária
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Armazém é necessária
 DocType: Employee,Marital Status,Estado civil
 DocType: Stock Settings,Auto Material Request,Pedido de material Auto
 DocType: Time Log,Will be updated when billed.,Será atualizado quando faturado.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponível Qtd Batch a partir do Armazém
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Atual BOM e Nova BOM não pode ser o mesmo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Juntando
 DocType: Sales Invoice,Against Income Account,Contra Conta a Receber
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,Actualização de stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM diferente para itens levará a incorreta valor Peso Líquido (Total ) . Certifique-se de que o peso líquido de cada item está na mesma UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Taxa
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Lançamentos {0} são un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registo de todas as comunicações do tipo de e-mail, telefone, chat, visita, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Por favor, mencione completam centro de custo na empresa"
 DocType: Purchase Invoice,Terms,Voorwaarden
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Create New
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Create New
 DocType: Buying Settings,Purchase Order Required,Ordem de Compra Obrigatório
 ,Item-wise Sales History,Item-wise Histórico de Vendas
 DocType: Expense Claim,Total Sanctioned Amount,Valor total Sancionada
@@ -2681,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Dedução folha de salário
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notas
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Selecione um nó de grupo em primeiro lugar.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Objetivo deve ser um dos {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Preencha o formulário e guarde-o
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Preencha o formulário e guarde-o
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Baixe um relatório contendo todas as matérias-primas com o seu estado mais recente inventário
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Revestimento
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Deixe Equilíbrio Antes da aplicação
 DocType: SMS Center,Send SMS,Envie SMS
 DocType: Company,Default Letter Head,Cabeça Padrão Letter
 DocType: Time Log,Billable,Faturável
 DocType: Authorization Rule,This will be used for setting rule in HR module,Isso será usado para fixação de regras no módulo HR
 DocType: Account,Rate at which this tax is applied,Taxa em que este imposto é aplicado
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Reordenar Qtde
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordenar Qtde
 DocType: Company,Stock Adjustment Account,Banco de Acerto de Contas
 DocType: Journal Entry,Write Off,Eliminar
 DocType: Time Log,Operation ID,Operação ID
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Campos de desconto estará disponível em Ordem de Compra, Recibo de Compra, Nota Fiscal de Compra"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nome da nova conta. Nota: Por favor, não criar contas para Clientes e Fornecedores"
 DocType: Report,Report Type,Tipo de relatório
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Carregamento
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Carregamento
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Ferramenta Substituir
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelos País default sábio endereço
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Devido / Reference Data não pode ser depois de {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Fornecedor entrega ao Cliente
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mostrar imposto break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Devido / Reference Data não pode ser depois de {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Dados de Importação e Exportação
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Se envolver em atividades de fabricação. Permite Item ' é fabricado '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fatura Data de lançamento
 DocType: Sales Invoice,Rounded Total,Total arredondado
 DocType: Product Bundle,List items that form the package.,Lista de itens que compõem o pacote.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentual de alocação deve ser igual a 100%
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com o usuário que tem Vendas Mestre Gerente {0} papel"
 DocType: Company,Default Cash Account,Conta Caixa padrão
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company ( não cliente ou fornecedor ) mestre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido por item {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
@@ -2740,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Quantidade não avalable no armazém {1} em {2} {3}.
  Disponível Qtde: {4}, Quantidade de transferência: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
+DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
 DocType: Event,Sunday,Domingo
 DocType: Sales Team,Contribution (%),Contribuição (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Modelo
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelo
 DocType: Sales Person,Sales Person Name,Vendas Nome Pessoa
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, indique pelo menos uma fatura na tabela"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Adicionar usuários
@@ -2753,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),Data de início real (via Time L
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliação
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas Adicionado (Moeda Company)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
 DocType: Sales Order,Partly Billed,Parcialmente faturado
 DocType: Item,Default BOM,BOM padrão
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2761,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total de Outstanding Amt
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Configurações de impressão
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,automotivo
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Deixa para o tipo {0} já alocado para Employee {1} para o Ano Fiscal {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item é necessário
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldagem por injeção de metal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,De Nota de Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De Nota de Entrega
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Mensagem personalizada
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca de Investimento
@@ -2782,10 +2795,10 @@ DocType: Newsletter,A Lead with this email id should exist,Um Lead com esse ID d
 DocType: Stock Entry,From BOM,De BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,básico
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transações com ações antes {0} são congelados
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Om datum moet dezelfde zijn als Van Datum voor halve dag verlof zijn
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Om datum moet dezelfde zijn als Van Datum voor halve dag verlof zijn
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","kg por exemplo, Unidade, n, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data de Juntando deve ser maior do que o Data de Nascimento
 DocType: Salary Structure,Salary Structure,Estrutura Salarial
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,7 +2806,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  conflito, atribuindo prioridade. Regras Preço: {0}"
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Companhia aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Para Armazém
 DocType: Employee,Offer Date,aanbieding Datum
 DocType: Hub Settings,Access Token,Token de Acesso
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,Tempo de abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
+DocType: Delivery Note Item,From Warehouse,Do Armazém
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perfuração
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,A moldagem por sopro
 DocType: Purchase Taxes and Charges,Valuation and Total,Avaliação e Total
@@ -2837,11 +2851,12 @@ DocType: C-Form,Amended From,Alterado De
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matéria-prima
 DocType: Leave Application,Follow via Email,Enviar por e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Valores de Qtd Alvo ou montante alvo são obrigatórios
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},No BOM padrão existe para item {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
-DocType: Leave Allocation,Carry Forward,Transportar
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No BOM padrão existe para item {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Abrindo data deve ser antes da Data de Fechamento
+DocType: Leave Control Panel,Carry Forward,Transportar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centro de custo com as operações existentes não podem ser convertidos em livro
 DocType: Department,Days for which Holidays are blocked for this department.,Dias para que feriados são bloqueados para este departamento.
 ,Produced,geproduceerd
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Purchase Order,The date on which recurring order will be stop,A data em que ordem recorrente será parar
 DocType: Quality Inspection,Item Serial No,No item de série
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente total
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Item Serialized {0} não pode ser atualizado utilizando \
  da Reconciliação"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transferência de material para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferência de material para Fornecedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
 DocType: Lead,Lead Type,Chumbo Tipo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Maak Offerte
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Todos esses itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos esses itens já foram faturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regra Condições de envio
 DocType: BOM Replace Tool,The new BOM after replacement,O BOM novo após substituição
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operação ID não definida
 DocType: Production Order,Planned Start Date,Planejado Start Date
 DocType: Serial No,Creation Document Type,Type het maken van documenten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Manut. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Manut. Visita
 DocType: Leave Type,Is Encash,É cobrar
 DocType: Purchase Invoice,Mobile No,No móvel
 DocType: Payment Tool,Make Journal Entry,Crie Diário de entrada 
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nova Folhas alocado
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
 DocType: Project,Expected End Date,Data final esperado
 DocType: Appraisal Template,Appraisal Template Title,Título do modelo de avaliação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,comercial
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Pai item {0} não deve ser um item da
 DocType: Cost Center,Distribution Id,Id distribuição
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serviços impressionante
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor para o atributo {0} deve estar dentro da gama de {1} a {2} nos incrementos de {3}
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Armazém necessário para stock o item {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Armazém necessário para stock o item {0}
+DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Estado de faturamento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminação
 DocType: Item Reorder,Transfer,Transferir
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch ontplofte BOM ( inclusief onderdelen )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch ontplofte BOM ( inclusief onderdelen )
 DocType: Authorization Rule,Applicable To (Employee),Aplicável a (Empregado)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,Varejo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Cliente {0} não existe
 DocType: Attendance,Absent,Ausente
 DocType: Product Bundle,Product Bundle,Bundle produto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Esmagador
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Comprar Impostos e Taxas Template
 DocType: Upload Attendance,Download Template,Baixe Template
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,Observações
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Item Código de matérias-primas
 DocType: Journal Entry,Write Off Based On,Escreva Off Baseado em
 DocType: Features Setup,POS View,POS Ver
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Registro de instalação de um n º de série
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Registro de instalação de um n º de série
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Lingotamento contínuo
-sites/assets/js/erpnext.min.js +10,Please specify a,"Por favor, especifique um"
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique um"
 DocType: Offer Letter,Awaiting Response,Aguardando resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Acima
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamento frio
 DocType: Salary Slip,Earning & Deduction,Ganhar & Dedução
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Conta {0} não pode ser um grupo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Região
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Para por exemplo 2012, 2012-13"
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Bojudo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativo-padrão de elenco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,despesas de representação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Idade
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Idade
 DocType: Time Log,Billing Amount,Faturamento Montante
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantidade inválido especificado para o item {0} . Quantidade deve ser maior do que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Os pedidos de licença.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Conta com a transação existente não pode ser excluído
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Conta com a transação existente não pode ser excluído
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,despesas legais
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","O dia do mês em que ordem auto será gerado por exemplo, 05, 28, etc"
 DocType: Sales Invoice,Posting Time,Postagem Tempo
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logotipo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Marque esta opção se você deseja forçar o usuário para selecionar uma série antes de salvar. Não haverá nenhum padrão, se você verificar isso."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Nenhum artigo com Serial Não {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Abertas Notificações
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Abertas Notificações
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Despesas Diretas
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Wil je echt wilt dit materiaal aanvragen opendraaien ?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nova Receita Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Despesas de viagem
 DocType: Maintenance Visit,Breakdown,Colapso
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afiando
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,provação
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
 DocType: Feed,Full Name,Nome Completo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Conquistar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adicionar linha
 DocType: Buying Settings,Default Supplier Type,Tipo de fornecedor padrão
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Pedreiras
 DocType: Production Order,Total Operating Cost,Custo Operacional Total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos os contactos.
 DocType: Newsletter,Test Email Id,Email Id teste
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,bedrijf Afkorting
@@ -3101,11 +3117,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotaç
 DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
 ,Territory Target Variance Item Group-Wise,Território Alvo Variance item Group-wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez recorde Câmbios não é criado para {1} de {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez recorde Câmbios não é criado para {1} de {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template imposto é obrigatório.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Conta {0}: conta principal {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço Taxa List (moeda da empresa)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} estado é ' parado '
 DocType: Account,Temporary,Temporário
 DocType: Address,Preferred Billing Address,Preferred Endereço de Cobrança
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação percentual
@@ -3123,13 +3138,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalhe Imposto item S
 DocType: Purchase Order Item,Supplier Quotation,Cotação fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Em Palavras será visível quando você salvar a cotação.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Engomadoria
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} está parado
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} já utilizado em item {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} está parado
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} já utilizado em item {1}
 DocType: Lead,Add to calendar on this date,Adicionar ao calendário nesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,próximos eventos
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,próximos eventos
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,É necessário ao cliente
 DocType: Letter Head,Letter Head,Cabeça letra
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada Rápida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} é obrigatório para retorno
 DocType: Purchase Order,To Receive,Receber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Encolher montagem
@@ -3153,25 +3169,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Pelo menos um armazém é obrigatório
 DocType: Serial No,Out of Warranty,Fora de Garantia
 DocType: BOM Replace Tool,Replace,Substituir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} contra Faturas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Faturas {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
 DocType: Purchase Invoice Item,Project Name,Nome do projeto
 DocType: Supplier,Mention if non-standard receivable account,Mencione se não padronizado conta a receber
 DocType: Workflow State,Edit,Editar
 DocType: Journal Entry Account,If Income or Expense,Se a renda ou Despesa
 DocType: Features Setup,Item Batch Nos,Lote n item
 DocType: Stock Ledger Entry,Stock Value Difference,Banco de Valor Diferença
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Recursos Humanos
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliação Pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Ativo Fiscal
 DocType: BOM Item,BOM No,BOM Não
 DocType: Contact Us Settings,Pincode,PINCODE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Diário de entrada {0} não tem conta {1} ou já comparado com outro comprovante
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Diário de entrada {0} não tem conta {1} ou já comparado com outro comprovante
 DocType: Item,Moving Average,Média móvel
 DocType: BOM Replace Tool,The BOM which will be replaced,O BOM que será substituído
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novo stock UOM deve ser diferente do atual UOM stock
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
 DocType: Production Order,Operation Cost,Operação Custo
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Carregar atendimento de um arquivo CSV.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Outstanding Amt
@@ -3179,7 +3195,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Estabel
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Para atribuir esse problema, use o botão "Atribuir" na barra lateral."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congeladores Stocks mais velhos do que [ dias ]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Se duas ou mais regras de preços são encontrados com base nas condições acima, a prioridade é aplicada. Prioridade é um número entre 0 a 20, enquanto o valor padrão é zero (em branco). Número maior significa que ele terá prioridade se houver várias regras de preços com as mesmas condições."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Contra Fatura
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Ano Fiscal: {0} não existe
 DocType: Currency Exchange,To Currency,A Moeda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Permitir que os seguintes utilizadores aprovem ""Licenças"" para os dias de bloco."
@@ -3208,7 +3223,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Taxa
 DocType: Stock Entry Detail,Additional Cost,Custo adicional
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Encerramento do Exercício Social Data
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van Voucher Nee, als gegroepeerd per Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Maak Leverancier Offerte
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Maak Leverancier Offerte
 DocType: Quality Inspection,Incoming,Entrada
 DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzir a Geração de Renda para sair sem pagar (LWP)
@@ -3216,10 +3231,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
 DocType: Batch,Batch ID,Lote ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota de entrega Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumo da Semana
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve ser um item comprado ou subcontratadas na linha {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve ser um item comprado ou subcontratadas na linha {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Conta: {0} só pode ser atualizado via transações de ações
 DocType: GL Entry,Party,Festa
 DocType: Sales Order,Delivery Date,Data de entrega
@@ -3232,7 +3247,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,t
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Méd. Taxa de Compra
 DocType: Task,Actual Time (in Hours),Tempo real (em horas)
 DocType: Employee,History In Company,Historial na Empresa
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Newsletters
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletters
 DocType: Address,Shipping,Expedição
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entrada da Razão
 DocType: Department,Leave Block List,Deixe Lista de Bloqueios
@@ -3251,7 +3266,7 @@ DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,A data de término do período da ordem atual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Faça uma oferta Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorna
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
 DocType: DocField,Fold,Dobra
 DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
 DocType: Pricing Rule,Disable,incapacitar
@@ -3283,7 +3298,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Relatórios para
 DocType: SMS Settings,Enter url parameter for receiver nos,Digite o parâmetro url para nn receptor
 DocType: Sales Invoice,Paid Amount,Valor pago
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Fechando Conta {0} deve ser do tipo ' responsabilidade '
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Fechando Conta {0} deve ser do tipo ' responsabilidade '
 ,Available Stock for Packing Items,Stock disponível para items embalados
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"A definição desse modelo de endereço como padrão, pois não há outro padrão"
@@ -3291,7 +3306,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
 DocType: Production Planning Tool,Filter based on customer,Filtrar baseado em cliente
 DocType: Payment Tool Detail,Against Voucher No,Contra a folha nº
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
 DocType: Employee External Work History,Employee External Work History,Empregado história de trabalho externo
 DocType: Tax Rule,Purchase,Comprar
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Aantal
@@ -3328,28 +3343,29 @@ Note: BOM = Bill of Materials","Grupo agregado de Itens ** ** em outro item ** *
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Não Serial é obrigatória para item {0}
 DocType: Item Variant Attribute,Attribute,Atributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique de / para variar"
-sites/assets/js/desk.min.js +7652,Created By,Criado por
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Criado por
 DocType: Serial No,Under AMC,Sob AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Taxa de valorização do item é recalculado considerando valor do voucher custo desembarcou
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,As configurações padrão para a venda de transações.
 DocType: BOM Replace Tool,Current BOM,BOM atual
-sites/assets/js/erpnext.min.js +8,Add Serial No,Adicionar número de série
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Adicionar número de série
 DocType: Production Order,Warehouses,Armazéns
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimir e estacionária
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grupo de nós
 DocType: Payment Reconciliation,Minimum Amount,Montante Mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Afgewerkt update Goederen
 DocType: Workstation,per hour,por hora
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Série {0} já usado em {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Série {0} já usado em {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Uma conta para o armazém ( Perpetual Inventory ) será criada tendo como base esta conta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse não pode ser excluído como existe entrada de material de contabilidade para este armazém.
 DocType: Company,Distribution,Distribuição
-sites/assets/js/erpnext.min.js +50,Amount Paid,Valor pago
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Valor pago
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,expedição
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
 DocType: Customer,Default Taxes and Charges,Impostos e Encargos padrão
 DocType: Account,Receivable,a receber
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Não é permitido mudar de fornecedor como ordem de compra já existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Papel que é permitido submeter transações que excedam os limites de crédito estabelecidos.
 DocType: Sales Invoice,Supplier Reference,Referência fornecedor
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Se selecionado, o BOM para a sub-montagem itens serão considerados para obter matérias-primas. Caso contrário, todos os itens de sub-montagem vai ser tratado como uma matéria-prima."
@@ -3386,8 +3402,8 @@ DocType: Email Digest,Add/Remove Recipients,Adicionar / Remover Destinatários
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transação não é permitido contra parou Ordem de produção {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit fiscale jaar ingesteld als standaard , klik op ' Als standaard instellen '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuração do servidor de entrada para suporte e-mail id . ( por exemplo support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escassez Qtde
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de salário
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polimento
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' O campo Para Data ' é necessária
@@ -3400,6 +3416,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações verificadas estão "Enviado", um e-mail pop-up aberta automaticamente para enviar um e-mail para o associado "Contato", em que a transação, com a transação como um anexo. O usuário pode ou não enviar o e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Definições Globais
 DocType: Employee Education,Employee Education,Educação empregado
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
 DocType: Salary Slip,Net Pay,Pagamento Líquido
 DocType: Account,Account,Conta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Não {0} já foi recebido
@@ -3432,7 +3449,7 @@ DocType: BOM,Manufacturing User,Manufacturing Usuário
 DocType: Purchase Order,Raw Materials Supplied,Matérias-primas em actualização
 DocType: Purchase Invoice,Recurring Print Format,Recorrente Formato de Impressão
 DocType: Communication,Series,serie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Compra Data
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Compra Data
 DocType: Appraisal,Appraisal Template,Modelo de avaliação
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Classificação do Item
@@ -3488,6 +3505,7 @@ DocType: HR Settings,Payroll Settings,payroll -instellingen
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Combinar não vinculados faturas e pagamentos.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Faça a encomenda
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root não pode ter um centro de custos pai
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selecione o cadastro ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Aplicável
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
 DocType: Supplier,Address and Contacts,Endereços e contatos
@@ -3498,7 +3516,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Obter Vales Pendentes
 DocType: Warranty Claim,Resolved By,Resolvido por
 DocType: Appraisal,Start Date,Data de Início
-sites/assets/js/desk.min.js +7629,Value,Valor
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Atribuír licenças por um período .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Clique aqui para verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Conta {0}: Você não pode atribuir-se como conta principal
@@ -3514,14 +3532,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox acesso permitido
 DocType: Dropbox Backup,Weekly,Semanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex:. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Receber
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Receber
 DocType: Maintenance Visit,Fully Completed,Totalmente concluída
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% concluído
 DocType: Employee,Educational Qualification,Qualificação Educacional
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Employee Leave Approver,Employee Leave Approver,Empregado Leave Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} foi adicionada com sucesso à nossa lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan niet verklaren als verloren , omdat Offerte is gemaakt."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron usinagem feixe
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
@@ -3534,7 +3552,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Adicionar / Editar preços
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Plano de Centros de Custo
 ,Requested Items To Be Ordered,Itens solicitados devem ser pedidos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Meus pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Meus pedidos
 DocType: Price List,Price List Name,Nome da lista de preços
 DocType: Time Log,For Manufacturing,Para Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totais
@@ -3545,7 +3563,7 @@ DocType: Account,Income,renda
 DocType: Industry Type,Industry Type,Tipo indústria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo deu errado!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Atenção: Deixe o aplicativo contém seguintes datas bloco
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data de Conclusão
 DocType: Purchase Invoice Item,Amount (Company Currency),Quantidade (Moeda da Empresa)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundição
@@ -3559,10 +3577,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Ano
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Perfil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Atualize as Configurações relacionadas com o SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Tempo Log {0} já faturado
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Tempo Log {0} já faturado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Empréstimos não garantidos
 DocType: Cost Center,Cost Center Name,Custo Nome Centro
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Item {0} com Serial Não {1} já está instalado
 DocType: Maintenance Schedule Detail,Scheduled Date,Data prevista
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total pago Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mensagem maior do que 160 caracteres vai ser dividido em mesage múltipla
@@ -3570,10 +3587,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Recebeu e aceitou
 ,Serial No Service Contract Expiry,N º de Série Vencimento Contrato de Serviço
 DocType: Item,Unit of Measure Conversion,Unidade de Conversão de Medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empregado não pode ser alterado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Você não pode de crédito e débito mesma conta ao mesmo tempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Você não pode de crédito e débito mesma conta ao mesmo tempo
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total atribuído deve ser de 100 %. É {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome da pessoa ou organização que este endereço pertence.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,uw Leveranciers
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan niet ingesteld als Lost als Sales Order wordt gemaakt .
@@ -3584,10 +3601,11 @@ DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Não tem número de série
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A partir de {0} para {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
 DocType: Issue,Content Type,Tipo de conteúdo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,computador
 DocType: Item,List this Item in multiple groups on the website.,Lista este item em vários grupos no site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} não existe no sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,U bent niet bevoegd om Frozen waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Entradas não reconciliadas
@@ -3598,14 +3616,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Para Armazém
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Conta {0} foi inserida mais de uma vez para o ano fiscal {1}
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Tem número de série ' não pode ser 'Sim' para o item sem stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Tem número de série ' não pode ser 'Sim' para o item sem stock
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Atendimento não pode ser marcado para datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
 DocType: Purchase Taxes and Charges,Account Head,Conta principal
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo desembarcado de itens
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elétrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença Valor Total (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID do usuário não definido para Employee {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,A partir da solicitação de garantia
@@ -3619,15 +3637,17 @@ DocType: Buying Settings,Naming Series,Nomeando Series
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
 DocType: User,Enabled,Habilitado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock activo
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Você realmente quer submeter todos os folha de salário do mês {0} e {1} ano
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Você realmente quer submeter todos os folha de salário do mês {0} e {1} ano
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Assinantes de importação
 DocType: Target Detail,Target Qty,Qtde alvo
 DocType: Attendance,Present,Apresentar
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Entrega Nota {0} não deve ser apresentado
 DocType: Notification Control,Sales Invoice Message,Vendas Mensagem Fatura
 DocType: Authorization Rule,Based On,Baseado em
-,Ordered Qty,bestelde Aantal
+DocType: Sales Order Item,Ordered Qty,bestelde Aantal
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Fotografia congelada Upto
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Atividade de projeto / tarefa.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Gerar Folhas de Vencimento
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} não é um ID de e-mail válido
@@ -3667,7 +3687,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Envie Atendimento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e Manufatura Quantidade são obrigatórios
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Envelhecimento 2
-DocType: Journal Entry Account,Amount,Quantidade
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Quantidade
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM substituído
 ,Sales Analytics,Sales Analytics
@@ -3694,7 +3714,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Verwachte datum kan niet voor de Material Aanvraagdatum
 DocType: Contact Us Settings,City,Cidade
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic usinagem
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Erro: Não é um ID válido?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Erro: Não é um ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} deve ser um item de vendas
 DocType: Naming Series,Update Series Number,Atualização de Número de Série
 DocType: Account,Equity,equidade
@@ -3709,7 +3729,7 @@ DocType: Purchase Taxes and Charges,Actual,Atual
 DocType: Authorization Rule,Customerwise Discount,Desconto Customerwise
 DocType: Purchase Invoice,Against Expense Account,Contra a conta de despesas
 DocType: Production Order,Production Order,Ordem de Produção
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos os Empregados (Ativo)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Já
@@ -3717,14 +3737,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Custo de Matéria-Prima
 DocType: Item,Re-Order Level,Re-order Nível
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Digite itens e qty planejada para o qual você quer levantar ordens de produção ou fazer o download de matérias-primas para a análise.
-sites/assets/js/list.min.js +174,Gantt Chart,Gráfico Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gráfico Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Lista de férias aplicável
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série Atualizado
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo de relatório é obrigatória
 DocType: Item,Serial Number Series,Serienummer Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
 DocType: Issue,First Responded On,Primeiro respondeu em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz de Listagem do item em vários grupos
@@ -3739,7 +3759,7 @@ DocType: Attendance,Attendance,Comparecimento
 DocType: Page,No,Não
 DocType: BOM,Materials,Materiais
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Modelo de impostos para a compra de transações.
 ,Item Prices,Preços de itens
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Em Palavras será visível quando você salvar a Ordem de Compra.
@@ -3759,9 +3779,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despesas Administrativas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,consultor
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
-sites/assets/js/erpnext.min.js +50,Change,Mudança
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Mudança
 DocType: Purchase Invoice,Contact Email,Contato E-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Ordem de Compra {0} está ' parado '
 DocType: Appraisal Goal,Score Earned,Pontuação Agregado
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de aviso prévio
@@ -3772,12 +3791,13 @@ DocType: Packing Slip,Gross Weight UOM,UOM Peso Bruto
 DocType: Email Digest,Receivables / Payables,Contas a receber / contas a pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra a nota fiscal de venda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampagem
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Item de custo Landed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores de zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem de determinadas quantidades de matérias-primas
 DocType: Payment Reconciliation,Receivable / Payable Account,Receber Conta / Payable
 DocType: Delivery Note Item,Against Sales Order Item,Contra a Ordem de venda do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém padrão
 DocType: Task,Actual End Date (via Time Logs),Data Real End (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
@@ -3791,7 +3811,7 @@ DocType: Issue,Support Team,Equipe de Apoio
 DocType: Appraisal,Total Score (Out of 5),Pontuação total (em 5)
 DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Fornada
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Equilíbrio
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Equilíbrio
 DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (via relatórios de despesas)
 DocType: User,Gender,Sexo
 DocType: Journal Entry,Debit Note,Nota de Débito
@@ -3807,9 +3827,8 @@ DocType: Lead,Blog Subscriber,Assinante Blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Criar regras para restringir operações com base em valores.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se marcado, não total. de dias de trabalho vai incluir férias, e isso vai reduzir o valor de salário por dia"
 DocType: Purchase Invoice,Total Advance,Antecipação total
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Unstop Materiaal Request
 DocType: Workflow State,User,Utilizador
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Processamento de folha de pagamento
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processamento de folha de pagamento
 DocType: Opportunity Item,Basic Rate,Taxa Básica
 DocType: GL Entry,Credit Amount,Quantidade de crédito
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Instellen als Lost
@@ -3817,7 +3836,7 @@ DocType: Customer,Credit Days Based On,Dias crédito com base em
 DocType: Tax Rule,Tax Rule,Regra imposto
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Manter o mesmo ritmo durante todo o ciclo de vendas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar logs de tempo fora do horário de trabalho estação de trabalho.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} já foi apresentado
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} já foi apresentado
 ,Items To Be Requested,Items worden aangevraagd
 DocType: Purchase Order,Get Last Purchase Rate,Obter Última Tarifa de Compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Taxa de facturação com base no tipo de atividade (por hora)
@@ -3826,6 +3845,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Empresa E-mail ID não foi encontrado , daí mail não enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicações de Recursos ( Ativos )
 DocType: Production Planning Tool,Filter based on item,Filtrar com base no item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Conta de debito
 DocType: Fiscal Year,Year Start Date,Data de início do ano
 DocType: Attendance,Employee Name,Nome do Funcionário
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arredondado (Moeda Company)
@@ -3837,14 +3857,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Branqueamento
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
 DocType: Sales Invoice,Is POS,É POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtde fabricados
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceite
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Contas levantou a Clientes.
 DocType: DocField,Default,Omissão
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} assinantes acrescentado
 DocType: Maintenance Schedule,Schedule,Programar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir orçamento para este centro de custo. Para definir a ação orçamento, consulte "Lista de Empresas""
@@ -3852,7 +3872,7 @@ DocType: Account,Parent Account,Conta pai
 DocType: Quality Inspection Reading,Reading 3,Leitura 3
 ,Hub,Cubo
 DocType: GL Entry,Voucher Type,Tipo de Vale
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
 DocType: Expense Claim,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
@@ -3861,23 +3881,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,educação
 DocType: Selling Settings,Campaign Naming By,Campanha de nomeação
 DocType: Employee,Current Address Is,Huidige adres wordt
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
 DocType: Address,Office,Escritório
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Relatórios padrão
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Lançamentos contábeis em diários
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Quantidade disponível no Armazém A partir de
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para criar uma conta de impostos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Por favor insira Conta Despesa
 DocType: Account,Stock,Stock
 DocType: Employee,Current Address,Endereço Atual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se o item é uma variante de outro item, em seguida, descrição, imagem, preços, impostos etc será definido a partir do modelo, a menos que explicitamente especificado"
 DocType: Serial No,Purchase / Manufacture Details,Aankoop / Productie Details
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Inventário Batch
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inventário Batch
 DocType: Employee,Contract End Date,Data final do contrato
 DocType: Sales Order,Track this Sales Order against any Project,Acompanhar este Ordem de vendas contra qualquer projeto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Puxe pedidos de vendas pendentes (de entregar) com base nos critérios acima
 DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Do Orçamento de Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Do Orçamento de Fornecedor
 DocType: Deduction Type,Deduction Type,Tipo de dedução
 DocType: Attendance,Half Day,Meio Dia
 DocType: Pricing Rule,Min Qty,min Qty
@@ -3888,20 +3910,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
 DocType: Stock Entry,Default Target Warehouse,Armazém alvo padrão
 DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (Moeda Company)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
 DocType: Notification Control,Purchase Receipt Message,Mensagem comprar Recebimento
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de folhas alocados mais de período
 DocType: Production Order,Actual Start Date,Atual Data de início
 DocType: Sales Order,% of materials delivered against this Sales Order,% dos materiais entregues contra esta Ordem de Vendas
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Gravar o movimento item.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gravar o movimento item.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Boletim lista assinante
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Escatelar
 DocType: Email Account,Service,serviço
 DocType: Hub Settings,Hub Settings,Configurações Hub
 DocType: Project,Gross Margin %,Margem Bruta%
 DocType: BOM,With Operations,Com Operações
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 ,Monthly Salary Register,Salário mensal Registrar
-apps/frappe/frappe/website/template.py +123,Next,próximo
+apps/frappe/frappe/website/template.py +140,Next,próximo
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolimento
@@ -3932,6 +3955,7 @@ DocType: Purchase Invoice,Next Date,Data próxima
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcional
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Digite Impostos e Taxas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Usinagem
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui você pode manter detalhes como o nome da família e ocupação do cônjuge, pai e filhos"
 DocType: Hub Settings,Seller Name,Vendedor Nome
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos e taxas Deduzido (Moeda Company)
@@ -3958,29 +3982,29 @@ DocType: Purchase Order,To Receive and Bill,Para receber e Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,estilista
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termos e Condições de modelo
 DocType: Serial No,Delivery Details,Detalhes da entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Criar automaticamente um pedido de material se a quantidade for inferior a este nível
 ,Item-wise Purchase Register,Item-wise Compra Register
 DocType: Batch,Expiry Date,Data de validade
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
 ,Supplier Addresses and Contacts,Leverancier Adressen en Contacten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Selecteer Categorie eerst
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projeto mestre.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como US $ etc ao lado de moedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Meio Dia)
 DocType: Supplier,Credit Days,Dias de crédito
 DocType: Leave Type,Is Carry Forward,É Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obter itens da Lista de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obter itens da Lista de Material
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Levar dias Tempo
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
 DocType: Dropbox Backup,Send Notifications To,Enviar notificações para
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motivo da saída
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
 DocType: GL Entry,Is Opening,Está abrindo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Conta {0} não existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Conta {0} não existe
 DocType: Account,Cash,Numerário
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o site e outras publicações.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, crie estrutura salarial por empregado {0}"
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 48aaa6a8f5..cef7fc129f 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Mod de salariu
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selectați Distributie lunar, dacă doriți să urmăriți bazat pe sezonalitate."
 DocType: Employee,Divorced,Divorțat/a
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Atenție: Same articol a fost introdus de mai multe ori.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Atenție: Same articol a fost introdus de mai multe ori.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Articole deja sincronizate
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permiteți Element care trebuie adăugate mai multe ori într-o tranzacție
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anulează Stivuitoare Vizitați {0} înainte de a anula acest revendicarea Garanție
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactare plus sinterizare
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Moneda este necesară pentru lista de prețuri {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Va fi calculat în cadrul tranzacției.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Din Cerere de Material
+DocType: Purchase Order,Customer Contact,Clientul A lua legatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Din Cerere de Material
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} arbore
 DocType: Job Applicant,Job Applicant,Solicitant loc de muncă
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nu mai multe rezultate.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Nume client
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Toate câmpurile legate de export, cum ar fi moneda, rata de conversie, export total, export total general etc. sunt disponibile în notă de livrare, POS, Cotație, factură de vânzări, comandă de vânzări, etc"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (sau grupuri) față de care înregistrările contabile sunt făcute și soldurile sunt menținute.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Restante pentru {0} nu poate fi mai mică decât zero ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Restante pentru {0} nu poate fi mai mică decât zero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Implicit 10 minute
 DocType: Leave Type,Leave Type Name,Denumire Tip Concediu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seria Actualizat cu succes
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Mai multe prețuri element.
 DocType: SMS Center,All Supplier Contact,Toate contactele furnizorului
 DocType: Quality Inspection Reading,Parameter,Parametru
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Așteptat Data de încheiere nu poate fi mai mică de Data de începere așteptată
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Doriti intr-adevar sa nu opriti Ordinul de Productie: 
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rata trebuie să fie aceeași ca și {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Noua cerere de concediu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Noua cerere de concediu
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Ciorna bancară
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 Pentru a menține codul de client element înțelept și pentru a le face pe baza utilizării lor cod de această opțiune
 DocType: Mode of Payment Account,Mode of Payment Account,Modul de cont de plăți
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Arată Variant
 DocType: Sales Invoice Item,Quantity,Cantitate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Imprumuturi (Raspunderi)
 DocType: Employee Education,Year of Passing,Ani de la promovarea
-sites/assets/js/erpnext.min.js +27,In Stock,În Stoc
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Poate face doar plata împotriva vânzări nefacturată comandă
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,În Stoc
 DocType: Designation,Designation,Destinatie
 DocType: Production Plan Item,Production Plan Item,Planul de producție Articol
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilizatorul {0} este deja alocat Angajat {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Face noi POS profil
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Servicii de Sanatate
 DocType: Purchase Invoice,Monthly,Lunar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Factură
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Întârziere de plată (zile)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factură
 DocType: Maintenance Schedule Item,Periodicity,Periodicitate
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adresa De E-Mail
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Apărare
 DocType: Company,Abbr,Presc
 DocType: Appraisal Goal,Score (0-5),Scor (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Rând {0}: {1} {2} nu se potrivește cu {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rând {0}: {1} {2} nu se potrivește cu {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,
 DocType: Delivery Note,Vehicle No,Vehicul Nici
-sites/assets/js/erpnext.min.js +55,Please select Price List,Vă rugăm să selectați lista de prețuri
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vă rugăm să selectați lista de prețuri
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Prelucrarea lemnului
 DocType: Production Order Operation,Work In Progress,Lucrări în curs
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Imprimare 3D
@@ -100,13 +100,14 @@ DocType: Packed Item,Parent Detail docname,Părinte Detaliu docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Deschidere pentru un loc de muncă.
 DocType: Item Attribute,Increment,Creștere
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Selectați Depozit ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicitate
 DocType: Employee,Married,Căsătorit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
 DocType: Payment Reconciliation,Reconcile,Reconcilierea
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Băcănie
 DocType: Quality Inspection Reading,Reading 1,Reading 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Asigurați-Bank intrare
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Asigurați-Bank intrare
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondurile de pensii
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Depozit este obligatorie dacă tipul de cont este de depozit
 DocType: SMS Center,All Sales Person,Toate persoanele de vânzăril
@@ -119,7 +120,7 @@ DocType: POS Profile,Write Off Cost Center,Scrie Off cost Center
 DocType: Warehouse,Warehouse Detail,Depozit Detaliu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Limita de credit a fost trecut de client {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Tipul de impozitare
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Nu sunteți autorizat să adăugați sau să actualizați intrări înainte de {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Nu sunteți autorizat să adăugați sau să actualizați intrări înainte de {0}
 DocType: Item,Item Image (if not slideshow),Imagine Articol (dacă nu exista prezentare)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Există un client cu același nume
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif orar / 60) * Timp efectiv de operare
@@ -129,7 +130,7 @@ DocType: Blog Post,Guest,Oaspete
 DocType: Quality Inspection,Get Specification Details,Obține detaliile specificațiilor
 DocType: Lead,Interested,Interesat
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Factură de material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Deschidere
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Deschidere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},De la {0} {1} la
 DocType: Item,Copy From Item Group,Copiere din Grupul de Articole
 DocType: Journal Entry,Opening Entry,Deschiderea de intrare
@@ -139,7 +140,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Intrebare produs
 DocType: Standard Reply,Owner,Proprietar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Va rugam sa introduceti prima companie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Vă rugăm să selectați Company primul
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vă rugăm să selectați Company primul
 DocType: Employee Education,Under Graduate,Sub Absolvent
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Țintă pe
 DocType: BOM,Total Cost,Cost total
@@ -157,6 +158,7 @@ DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumabile
 DocType: Upload Attendance,Import Log,Import Conectare
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Trimiteți
+DocType: Sales Invoice Item,Delivered By Supplier,Livrate de Furnizor
 DocType: SMS Center,All Contact,Toate contactele
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salariu anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Închiderea Anului Fiscal
@@ -166,15 +168,15 @@ DocType: Journal Entry,Contra Entry,Contra intrare
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Arată timp Busteni
 DocType: Journal Entry Account,Credit in Company Currency,Credit în companie valutar
 DocType: Delivery Note,Installation Status,Starea de instalare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cant acceptată + respinsă trebuie să fie egală cu cantitatea recepționată pentru articolul {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cant acceptată + respinsă trebuie să fie egală cu cantitatea recepționată pentru articolul {0}
 DocType: Item,Supply Raw Materials for Purchase,Materii prime de alimentare pentru cumparare
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Articolul {0} trebuie să fie un Articol de Cumparare
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descărcați șablonul, umple de date corespunzătoare și atașați fișierul modificat.
  Toate datele și angajat combinație în perioada selectata va veni în șablon, cu înregistrări nervi existente"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Articolul {0} nu este activ sau sfarsitul ciclului sau de viata a fost atins
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Articolul {0} nu este activ sau sfarsitul ciclului sau de viata a fost atins
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vor fi actualizate după Factura Vanzare este prezentat.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Setările pentru modul HR
 DocType: SMS Center,SMS Center,SMS Center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Îndreptare
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Introduceți parametru url
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Normele de aplicare de stabilire a prețurilor și de scont.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Acest timp Autentificare conflicte cu {0} pentru {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de prețuri trebuie să fie aplicabilă pentru cumpărarea sau vânzarea de
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Data de instalare nu poate fi înainte de data de livrare pentru postul {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data de instalare nu poate fi înainte de data de livrare pentru postul {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Reducere la Lista de preturi Rate (%)
-sites/assets/js/form.min.js +279,Start,Început(Pornire)
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Început(Pornire)
 DocType: User,First Name,Prenume
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Procesul de configurare este complet. Pagina se reinprospătează.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Turnare full-mucegai
 DocType: Offer Letter,Select Terms and Conditions,Selectați Termeni și condiții
 DocType: Production Planning Tool,Sales Orders,Comenzi de vânzări
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Comparativ articolului facturii de vânzări
 ,Production Orders in Progress,Comenzile de producție în curs de desfășurare
 DocType: Lead,Address & Contact,Adresă și contact
+DocType: Leave Allocation,Add unused leaves from previous allocations,Adauga frunze neutilizate de alocări anterioare
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
 DocType: Newsletter List,Total Subscribers,Abonații totale
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nume Persoana de Contact
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,SO așteptare Cantitate
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Creare fluturas de salariu pentru criteriile mentionate mai sus.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Cere pentru cumpărare.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Locuințe dublu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Frunze pe an
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vă rugăm să setați Numirea Series pentru {0} prin Configurare> Setări> Seria Naming
 DocType: Time Log,Will be updated when batched.,Vor fi actualizate atunci când dozate.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rând {0}: Vă rugăm să verificați ""Este Advance"" împotriva Cont {1} dacă aceasta este o intrare în avans."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rând {0}: Vă rugăm să verificați ""Este Advance"" împotriva Cont {1} dacă aceasta este o intrare în avans."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Depozit {0} nu aparține companiei {1}
 DocType: Bulk Email,Message,Mesaj
 DocType: Item Website Specification,Item Website Specification,Specificație Site Articol
 DocType: Dropbox Backup,Dropbox Access Key,Cheie de Acces Dropbox 
 DocType: Payment Tool,Reference No,De referință nr
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Concediu Blocat
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock reconciliere Articol
 DocType: Stock Entry,Sales Invoice No,Factură de vânzări Nu
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Comanda minima Cantitate
 DocType: Pricing Rule,Supplier Type,Furnizor Tip
 DocType: Item,Publish in Hub,Publica in Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Articolul {0} este anulat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Cerere de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Cerere de material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizare Clearance Data
 DocType: Item,Purchase Details,Detalii de cumpărare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Postul {0} nu a fost găsit în "Materii prime furnizate" masă în Comandă {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Controlul notificare
 DocType: Lead,Suggestions,Sugestii
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Set bugetelor Grupa înțelept Articol de pe acest teritoriu. Puteți include, de asemenea, sezonier prin setarea distribuție."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Va rugam sa introduceti grup considerare mamă pentru depozit {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plata împotriva {0} {1} nu poate fi mai mare decât Impresionant Suma {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plata împotriva {0} {1} nu poate fi mai mare decât Impresionant Suma {2}
 DocType: Supplier,Address HTML,Adresă HTML
 DocType: Lead,Mobile No.,Mobil Nu.
 DocType: Maintenance Schedule,Generate Schedule,Generează orar
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Nou Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Închidere Cont Principal
 DocType: Employee,External Work History,Istoricul lucrului externă
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Eroare de referință Circular
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Doriti intr-adevar sa va OPRITI
 DocType: Communication,Closed,Închis
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,În cuvinte (de export) va fi vizibil după ce a salva de livrare Nota.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Sunteţi sigur că doriți să vă opriți
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Profilul postului
 DocType: Newsletter,Newsletter,Newsletter
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Nota de Livrare
 DocType: Dropbox Backup,Allow Dropbox Access,Permiteţi accesul Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurarea Impozite
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Plata intrare a fost modificat după ce-l tras. Vă rugăm să trage din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Rezumat pentru această săptămână și a activităților în curs
 DocType: Workstation,Rent Cost,Chirie Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vă rugăm selectați luna și anul
@@ -338,11 +338,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rata la care Clientul valuta este convertită în valuta de bază a clientului
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibil în BOM, nota de livrare, factura de cumparare, comanda de producție, comanda de cumparare, chitanţa de cumpărare, factura de vânzare,comanda de vânzare, intrare de stoc, pontaj"
 DocType: Item Tax,Tax Rate,Cota de impozitare
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Selectați articol
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selectați articol
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Postul: {0} în șarje, nu pot fi reconciliate cu ajutorul \
  stoc reconciliere, utilizați în schimb stoc intrare gestionate"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Lot nr trebuie să fie aceeași ca și {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converti la non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Primirea cumparare trebuie depuse
@@ -350,7 +350,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Stoc Curent UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lotul (lot) unui articol.
 DocType: C-Form Invoice Detail,Invoice Date,Data facturii
 DocType: GL Entry,Debit Amount,Suma debit
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Nu poate fi doar un cont per companie în {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Nu poate fi doar un cont per companie în {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Adresa dvs. de e-mail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Vă rugăm să consultați atașament
 DocType: Purchase Order,% Received,% Primit
@@ -360,7 +360,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instrucţiuni
 DocType: Quality Inspection,Inspected By,Inspectat de
 DocType: Maintenance Visit,Maintenance Type,Tip Mentenanta
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nu aparține de livrare Nota {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nu aparține de livrare Nota {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametru Inspecție de Calitate Articol 
 DocType: Leave Application,Leave Approver Name,Lăsați Nume aprobator
 ,Schedule Date,Program Data
@@ -379,7 +379,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Cumpărare Inregistrare
 DocType: Landed Cost Item,Applicable Charges,Taxe aplicabile
 DocType: Workstation,Consumable Cost,Cost Consumabile
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) trebuie să dețină rolul ""aprobator concediu"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) trebuie să dețină rolul ""aprobator concediu"""
 DocType: Purchase Receipt,Vehicle Date,Vehicul Data
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiv pentru a pierde
@@ -400,6 +400,7 @@ DocType: Delivery Note,% Installed,% Instalat
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Va rugam sa introduceti numele companiei în primul rând
 DocType: BOM,Item Desription,Descriere Articol
 DocType: Purchase Invoice,Supplier Name,Furnizor Denumire
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Citiți manualul ERPNext
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Setat automat Serial nr bazat pe FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Cec Furnizor Numărul facturii Unicitatea
@@ -415,13 +416,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Vânzări Maestru
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Setările globale pentru toate procesele de producție.
 DocType: Accounts Settings,Accounts Frozen Upto,Conturile sunt Blocate Până la
 DocType: SMS Log,Sent On,A trimis pe
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
 DocType: Sales Order,Not Applicable,Nu se aplică
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Maestru de vacanta.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell laminat
 DocType: Material Request Item,Required Date,Date necesare
 DocType: Delivery Note,Billing Address,Adresa de facturare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
 DocType: BOM,Costing,Cost
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","In cazul in care se bifeaza, suma taxelor va fi considerată ca fiind deja inclusa în Rata de Imprimare / Suma de Imprimare"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Raport Cantitate
@@ -444,31 +445,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Timp între op
 DocType: Customer,Buyer of Goods and Services.,Cumpărător de produse și servicii.
 DocType: Journal Entry,Accounts Payable,Conturi de plată
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adăugaţi Abonați
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" nu există"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" nu există"
 DocType: Pricing Rule,Valid Upto,Valid Până la
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Venituri Directe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nu se poate filtra pe baza de cont, în cazul gruparii in functie de Cont"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Ofițer administrativ
 DocType: Payment Tool,Received Or Paid,Primite sau plătite
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Vă rugăm să selectați Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vă rugăm să selectați Company
 DocType: Stock Entry,Difference Account,Diferența de Cont
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Nu poate sarcină aproape ca misiune dependente {0} nu este închis.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
 DocType: Production Order,Additional Operating Cost,Costuri de operare adiţionale
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosmetică
 DocType: DocField,Type,Tip
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
 DocType: Communication,Subject,Subiect
 DocType: Shipping Rule,Net Weight,Greutate netă
 DocType: Employee,Emergency Phone,Telefon de Urgență
 ,Serial No Warranty Expiry,Serial Nu Garantie pana
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Doriti intr-adevar sa OPRITI această Cerere Material?
 DocType: Sales Order,To Deliver,A Livra
 DocType: Purchase Invoice Item,Item,Obiect
 DocType: Journal Entry,Difference (Dr - Cr),Diferența (Dr - Cr)
 DocType: Account,Profit and Loss,Profit și pierdere
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Gestionarea Subcontractarea
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestionarea Subcontractarea
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM nu trebuie să fie de tip Număr întreg
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilier si Accesorii
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Rata la care lista de prețuri moneda este convertit în moneda de bază a companiei
@@ -488,7 +488,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adaugaţi / editaţi taxe
 DocType: Purchase Invoice,Supplier Invoice No,Furnizor Factura Nu
 DocType: Territory,For reference,Pentru referință
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nu se poate șterge de serie nr {0}, așa cum este utilizat în tranzacțiile bursiere"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),De închidere (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),De închidere (Cr)
 DocType: Serial No,Warranty Period (Days),Perioada de garanție (zile)
 DocType: Installation Note Item,Installation Note Item,Instalare Notă Postul
 ,Pending Qty,Așteptare Cantitate
@@ -520,8 +520,9 @@ DocType: Sales Order,Billing and Delivery Status,Facturare și de livrare Starea
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clienții repetate
 DocType: Leave Control Panel,Allocate,Alocaţi
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Precedenta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Vânzări de returnare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Vânzări de returnare
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selectați comenzi de vânzări de la care doriți să creați comenzi de producție.
+DocType: Item,Delivered by Supplier (Drop Ship),Livrate de Furnizor (Drop navelor)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componente salariale.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza de date cu clienți potențiali.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza de Date Client.
@@ -532,7 +533,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Suma facturată
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un depozit logic față de care se efectuează înregistrări de stoc.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Nu referință și de referință Data este necesar pentru {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Nu referință și de referință Data este necesar pentru {0}
 DocType: Event,Wednesday,Miercuri
 DocType: Sales Invoice,Customer's Vendor,Vanzator Client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Producția Comanda este obligatorie
@@ -565,8 +566,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Receptor Parametru
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Bazat pe' și 'Grupat dupa' nu pot fi identice
 DocType: Sales Person,Sales Person Targets,Obiective de vânzări Persoana
-sites/assets/js/form.min.js +271,To,Până la data
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Introduceți adresa de e-mail
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Până la data
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Introduceți adresa de e-mail
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tub de formare a capetelor
 DocType: Production Order Operation,In minutes,In cateva minute
 DocType: Issue,Resolution Date,Data rezoluție
@@ -583,7 +584,7 @@ DocType: Activity Cost,Projects User,Proiecte de utilizare
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nu a fost găsit în tabelul detalii factură
 DocType: Company,Round Off Cost Center,Rotunji cost Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vizita de Mentenanta {0} trebuie sa fie anulată înainte de a anula această Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vizita de Mentenanta {0} trebuie sa fie anulată înainte de a anula această Comandă de Vânzări
 DocType: Material Request,Material Transfer,Transfer de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Deschidere (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Timestamp postarea trebuie să fie după {0}
@@ -591,9 +592,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Setări
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impozite cost debarcate și Taxe
 DocType: Production Order Operation,Actual Start Time,Timpul efectiv de începere
 DocType: BOM Operation,Operation Time,Funcționare Ora
-sites/assets/js/list.min.js +5,More,Mai mult
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mai mult
 DocType: Pricing Rule,Sales Manager,Director De Vânzări
-sites/assets/js/desk.min.js +7673,Rename,Redenumire
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Redenumire
 DocType: Journal Entry,Write Off Amount,Scrie Off Suma
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Îndoire
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permiteţi utilizator
@@ -609,13 +610,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Forfecare drept
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Pentru a urmări element în vânzări și a documentelor de achiziție, pe baza lor de serie nr. Acest lucru se poate, de asemenea, utilizat pentru a urmări detalii de garanție ale produsului."
 DocType: Purchase Receipt Item Supplied,Current Stock,Stoc curent
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Warehouse respins este obligatorie împotriva articol regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Warehouse respins este obligatorie împotriva articol regected
 DocType: Account,Expenses Included In Valuation,Cheltuieli Incluse în Evaluare
 DocType: Employee,Provide email id registered in company,Furnizarea id-ul de e-mail înregistrată în societate
 DocType: Hub Settings,Seller City,Vânzător oraș
 DocType: Email Digest,Next email will be sent on:,E-mail viitor va fi trimis la:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Scrisoare Termen
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Element are variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolul {0} nu a fost găsit
 DocType: Bin,Stock Value,Valoare stoc
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Arbore Tip
@@ -630,11 +631,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bine ați venit
 DocType: Journal Entry,Credit Card Entry,Card de credit intrare
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Sarcina Subiect
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Bunuri primite de la furnizori.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Bunuri primite de la furnizori.
 DocType: Communication,Open,Deschide
 DocType: Lead,Campaign Name,Denumire campanie
 ,Reserved,Rezervat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP, Doriti intr-adevar sa NU VA OPRITI
 DocType: Purchase Order,Supply Raw Materials,Aprovizionarea cu materii prime
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Data la care va fi generat următoarea factură. Acesta este generată pe prezinte.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Active Curente
@@ -650,7 +650,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Nr. Comanda de Aprovizionare Client
 DocType: Employee,Cell Number,Număr Celula
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Pierdut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul intrare"" coloană"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul intrare"" coloană"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Oportunitate de la
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declarația salariu lunar.
@@ -719,7 +719,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Răspundere
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sancționat Suma nu poate fi mai mare decât revendicarea Suma în rândul {0}.
 DocType: Company,Default Cost of Goods Sold Account,Implicit Costul cont bunuri vândute
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Lista de prețuri nu selectat
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista de prețuri nu selectat
 DocType: Employee,Family Background,Context familial
 DocType: Process Payroll,Send Email,Trimiteți-ne email
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nici o permisiune
@@ -730,7 +730,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Articole cu weightage mare va fi afișat mai mare
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detaliu reconciliere bancară
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Facturile mele
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Nu a fost gasit angajat
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nu a fost gasit angajat
 DocType: Purchase Order,Stopped,Oprita
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Selectați BOM pentru a începe
@@ -739,7 +739,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Încărca
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Trimite Acum
 ,Support Analytics,Suport Analytics
 DocType: Item,Website Warehouse,Site-ul Warehouse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Doriti intr-adevar sa opriti ordinul de productie:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Scorul trebuie să fie mai mică sau egală cu 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Înregistrări formular-C
@@ -749,12 +748,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Inter
 DocType: Features Setup,"To enable ""Point of Sale"" features",Pentru a activa "punct de vânzare" caracteristici
 DocType: Bin,Moving Average Rate,Rata medie mobilă
 DocType: Production Planning Tool,Select Items,Selectați Elemente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} ​​din data de {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} ​​din data de {2}
 DocType: Comment,Reference Name,Nume de referință
 DocType: Maintenance Visit,Completion Status,Stare Finalizare
 DocType: Sales Invoice Item,Target Warehouse,Țintă Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Permiteți peste livrare sau primire pana la acest procent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Vanzare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Vanzare
 DocType: Upload Attendance,Import Attendance,Import Spectatori
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Toate grupurile articolului
 DocType: Process Payroll,Activity Log,Jurnal Activitate
@@ -762,7 +761,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compune în mod automat un mesaj la introducere de tranzacții.
 DocType: Production Order,Item To Manufacture,Articol pentru Fabricare
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Turnare mucegai permanent
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Comandă de aprovizionare de plata
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stare este {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Comandă de aprovizionare de plata
 DocType: Sales Order Item,Projected Qty,Proiectat Cantitate
 DocType: Sales Invoice,Payment Due Date,Data scadentă de plată
 DocType: Newsletter,Newsletter Manager,Newsletter Director
@@ -786,8 +786,8 @@ DocType: SMS Log,Requested Numbers,Numere solicitate
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,De evaluare a performantei.
 DocType: Sales Invoice Item,Stock Details,Stoc Detalii
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valoare proiect
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Punct de vânzare
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Nu se poate duce mai departe {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punct de vânzare
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nu se poate duce mai departe {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Debit""."
 DocType: Account,Balance must be,Bilanţul trebuie să fie
 DocType: Hub Settings,Publish Pricing,Publica Prețuri
@@ -809,7 +809,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Primirea de cumpărare
 ,Received Items To Be Billed,Articole primite Pentru a fi facturat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sablare
-sites/assets/js/desk.min.js +3938,Ms,Ms
+DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Maestru cursului de schimb valutar.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Imposibilitatea de a găsi timp Slot în următorii {0} zile pentru Operațiunea {1}
 DocType: Production Order,Plan material for sub-assemblies,Material Plan de subansambluri
@@ -831,29 +831,31 @@ DocType: Purchase Receipt,Range,Interval
 DocType: Supplier,Default Payable Accounts,Implicit conturi de plătit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
 DocType: Features Setup,Item Barcode,Element de coduri de bare
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Postul variante {0} actualizat
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de cumpărare în avans
 DocType: Address,Shop,Magazin
 DocType: Hub Settings,Sync Now,Sincronizare acum
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Rând {0}: intrare de credit nu poate fi legat de o {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Rând {0}: intrare de credit nu poate fi legat de o {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Contul Bancar / de Numerar implicit va fi actualizat automat în Factura POS atunci când acest mod este selectat.
 DocType: Employee,Permanent Address Is,Adresa permanentă este
 DocType: Production Order Operation,Operation completed for how many finished goods?,Funcționare completat de cât de multe bunuri finite?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Marca
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Alocație mai mare decât -{0} anulată pentru articolul {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Alocație mai mare decât -{0} anulată pentru articolul {1}.
 DocType: Employee,Exit Interview Details,Detalii Interviu de Iesire
 DocType: Item,Is Purchase Item,Este de cumparare Articol
 DocType: Journal Entry Account,Purchase Invoice,Factura de cumpărare
 DocType: Stock Ledger Entry,Voucher Detail No,Detaliu voucher Nu
 DocType: Stock Entry,Total Outgoing Value,Valoarea totală de ieșire
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Deschiderea și data inchiderii ar trebui să fie în același an fiscal
 DocType: Lead,Request for Information,Cerere de informații
 DocType: Payment Tool,Paid,Plătit
 DocType: Salary Slip,Total in words,Total în cuvinte
 DocType: Material Request Item,Lead Time Date,Data Timp Conducere
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,este obligatorie. Poate înregistrare de schimb valutar nu este creat pentru
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Rând # {0}: Vă rugăm să specificați Nu serial pentru postul {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pentru elementele "produse Bundle", Warehouse, Serial No și lot nr vor fi luate în considerare de la "ambalare List" masa. Dacă Warehouse și Lot nr sunt aceleași pentru toate elementele de ambalaj pentru produs orice "Bundle produs", aceste valori pot fi introduse în tabelul de punctul principal, valorile vor fi copiate "de ambalare Lista" masă."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Transporturile către clienți.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Transporturile către clienți.
 DocType: Purchase Invoice Item,Purchase Order Item,Comandă de aprovizionare Articol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Venituri indirecte
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set de plată Suma = suma restantă
@@ -861,13 +863,14 @@ DocType: Contact Us Settings,Address Line 1,Adresă Linie 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variație
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Denumire Companie
 DocType: SMS Center,Total Message(s),Total mesaj(e)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vizualizați o listă cu toate filmele de ajutor
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Selectați contul șef al băncii, unde de verificare a fost depus."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permiteţi utilizatorului să editeze lista ratelor preturilor din tranzacții
 DocType: Pricing Rule,Max Qty,Max Cantitate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rând {0}: Plata împotriva Vânzări / Ordinului de Procurare ar trebui să fie întotdeauna marcate ca avans
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rând {0}: Plata împotriva Vânzări / Ordinului de Procurare ar trebui să fie întotdeauna marcate ca avans
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chimic
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
 DocType: Process Payroll,Select Payroll Year and Month,Selectați Salarizare anul și luna
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Du-te la grupul corespunzător (de obicei, de aplicare fondurilor> Active curente> Conturi bancare și de a crea un nou cont (făcând clic pe Adăugați pentru copii) de tip "Banca""
 DocType: Workstation,Electricity Cost,Cost energie electrică
@@ -882,7 +885,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Alb
 DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
 DocType: Purchase Invoice,Get Advances Paid,Obtine Avansurile Achitate
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Atașați imaginea dvs.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Realizare
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Realizare
 DocType: Journal Entry,Total Amount in Words,Suma totală în cuvinte
 DocType: Workflow State,Stop,Oprire
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Nu a fost o eroare. Un motiv probabil ar putea fi că nu ați salvat formularul. Vă rugăm să contactați support@erpnext.com dacă problema persistă.
@@ -906,7 +909,7 @@ DocType: Packing Slip Item,Packing Slip Item,Bonul Articol
 DocType: POS Profile,Cash/Bank Account,Numerar/Cont Bancar
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
 DocType: Delivery Note,Delivery To,De Livrare la
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabelul atribut este obligatoriu
 DocType: Production Planning Tool,Get Sales Orders,Obține comenzile de vânzări
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nu poate fi negativ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Depozit
@@ -917,12 +920,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Va fi actualiza
 DocType: Project,Internal,Intern
 DocType: Task,Urgent,De urgență
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Vă rugăm să specificați un ID rând valabil pentru rând {0} în tabelul {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Du-te la desktop și începe să utilizați ERPNext
 DocType: Item,Manufacturer,Producător
 DocType: Landed Cost Item,Purchase Receipt Item,Primirea de cumpărare Postul
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervat Warehouse în Vânzări Ordine / Produse finite Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Vanzarea Suma
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Timp Busteni
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sunteți aprobator cheltuieli pentru acest record. Vă rugăm Actualizați ""statutul"" și Salvare"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sunteți aprobator cheltuieli pentru acest record. Vă rugăm Actualizați ""statutul"" și Salvare"
 DocType: Serial No,Creation Document No,Creare Document Nr.
 DocType: Issue,Issue,Problem
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributele pentru variante articol. de exemplu  dimensiune, culoare etc."
@@ -937,8 +941,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Comparativ
 DocType: Item,Default Selling Cost Center,Centru de Cost Vanzare Implicit
 DocType: Sales Partner,Implementation Partner,Partener de punere în aplicare
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Comandă de vânzări {0} este {1}
 DocType: Opportunity,Contact Info,Informaţii Persoana de Contact
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Efectuarea de stoc Entries
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Efectuarea de stoc Entries
 DocType: Packing Slip,Net Weight UOM,Greutate neta UOM
 DocType: Item,Default Supplier,Furnizor Implicit
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Peste producție Reduceri Procentaj
@@ -947,7 +952,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Obtine Perioada Libera Saptamanala 
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data de Incheiere nu poate fi anterioara Datei de Incepere
 DocType: Sales Person,Select company name first.,Selectați numele companiei în primul rând.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotatiilor primite de la furnizori.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Pentru a {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,actualizat prin timp Busteni
@@ -975,7 +980,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Numerele de înregistrare companie pentru referință. Numerele fiscale etc
 DocType: Sales Partner,Distributor,Distribuitor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Cosul de cumparaturi Articolul Transport
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Producția de Ordine {0} trebuie anulată înainte de a anula această comandă de vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Producția de Ordine {0} trebuie anulată înainte de a anula această comandă de vânzări
 ,Ordered Items To Be Billed,Comandat de Articole Pentru a fi facturat
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Din Gama trebuie să fie mai mică de la gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selectați Timp Busteni Trimite pentru a crea o nouă factură de vânzare.
@@ -1023,7 +1028,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impozitu
 DocType: Lead,Lead,Conducere
 DocType: Email Digest,Payables,Datorii
 DocType: Account,Warehouse,Depozit
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
 ,Purchase Order Items To Be Billed,Cumparare Ordine Articole Pentru a fi facturat
 DocType: Purchase Invoice Item,Net Rate,Rata netă
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de cumpărare Postul
@@ -1038,11 +1043,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Nereconciliate Deta
 DocType: Global Defaults,Current Fiscal Year,An Fiscal Curent
 DocType: Global Defaults,Disable Rounded Total,Dezactivati Totalul Rotunjit
 DocType: Lead,Call,Apelaţi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Intrările' nu pot fi vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Intrările' nu pot fi vide
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Inregistrare {0} este duplicata cu aceeași {1}
 ,Trial Balance,Balanta
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Configurarea angajati
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurarea angajati
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vă rugăm să selectați prefix întâi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Cercetarea
 DocType: Maintenance Visit Purpose,Work Done,Activitatea desfășurată
@@ -1052,14 +1057,15 @@ DocType: Communication,Sent,Trimis
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vezi Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
 DocType: Communication,Delivery Status,Starea de Livrare
 DocType: Production Order,Manufacture against Sales Order,Fabricarea de comandă de vânzări
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Restul lumii
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Restul lumii
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postul {0} nu poate avea Lot
 ,Budget Variance Report,Raport de variaţie buget
 DocType: Salary Slip,Gross Pay,Plata Bruta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendele plătite
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Contabilitate Ledger
 DocType: Stock Reconciliation,Difference Amount,Diferența Suma
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Venituri Reținute
 DocType: BOM Item,Item Description,Descriere Articol
@@ -1073,15 +1079,17 @@ DocType: Opportunity Item,Opportunity Item,Oportunitate Articol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Deschiderea temporară
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Bilant Concediu Angajat
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Bilanţă pentru contul {0} trebuie să fie întotdeauna {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilanţă pentru contul {0} trebuie să fie întotdeauna {1}
 DocType: Address,Address Type,Tip adresă
 DocType: Purchase Receipt,Rejected Warehouse,Depozit Respins
 DocType: GL Entry,Against Voucher,Comparativ voucherului
 DocType: Item,Default Buying Cost Center,Centru de Cost Cumparare Implicit 
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Pentru a obține cele mai bune din ERPNext, vă recomandăm să luați ceva timp și de ceas aceste filme de ajutor."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Articolul {0} trebuie să fie un Articol de Vânzări
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,la
 DocType: Item,Lead Time in days,Timp de plumb în zile
 ,Accounts Payable Summary,Rezumat conturi pentru plăți
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita contul congelate {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita contul congelate {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtine Facturi Neachitate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
@@ -1097,7 +1105,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Locul eliberării
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contract
 DocType: Report,Disabled,Dezactivat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Factor coversion UOM UOM necesare pentru: {0} in articol: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Factor coversion UOM UOM necesare pentru: {0} in articol: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Cheltuieli indirecte
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rând {0}: Cant este obligatorie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultură
@@ -1106,13 +1114,13 @@ DocType: Mode of Payment,Mode of Payment,Mod de plata
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Acesta este un grup element rădăcină și nu pot fi editate.
 DocType: Journal Entry Account,Purchase Order,Comandă de aprovizionare
 DocType: Warehouse,Warehouse Contact Info,Date de contact depozit
-sites/assets/js/form.min.js +190,Name is required,Este necesar numele
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Este necesar numele
 DocType: Purchase Invoice,Recurring Type,Tip recurent
 DocType: Address,City/Town,Oras/Localitate
 DocType: Email Digest,Annual Income,Venit anual
 DocType: Serial No,Serial No Details,Serial Nu Detalii
 DocType: Purchase Invoice Item,Item Tax Rate,Rata de Impozitare Articol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Pentru {0}, numai conturi de credit poate fi legat de o altă intrare în debit"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pentru {0}, numai conturi de credit poate fi legat de o altă intrare în debit"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Articolul {0} trebuie să fie un Articol Sub-contractat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Echipamente de Capital
@@ -1123,14 +1131,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Obiectiv
 DocType: Sales Invoice Item,Edit Description,Edit Descriere
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Așteptat Data de livrare este mai mică decât era planificat Începere Data.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Pentru furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Pentru furnizor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Setarea Tipul de cont ajută în selectarea acest cont în tranzacții.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total general (Valuta Companie)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Raport de ieșire
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Nu poate fi doar o singură regulă Condiții presetate cu 0 sau o valoare necompletată pentru ""la valoarea"""
 DocType: Authorization Rule,Transaction,Tranzacție
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Notă: Acest centru de cost este un grup. Nu pot face înregistrări contabile impotriva grupuri.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Instrumente
+apps/frappe/frappe/config/desk.py +7,Tools,Instrumente
 DocType: Item,Website Item Groups,Site-ul Articol Grupuri
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Numărul de ordine Producția este obligatorie pentru intrarea stoc scop înregistrării
 DocType: Purchase Invoice,Total (Company Currency),Total (Company valutar)
@@ -1140,7 +1148,7 @@ DocType: Workstation,Workstation Name,Stație de lucru Nume
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest: 
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
 DocType: Sales Partner,Target Distribution,Țintă Distribuție
-sites/assets/js/desk.min.js +7652,Comments,Comentarii
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentarii
 DocType: Salary Slip,Bank Account No.,Cont bancar nr.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Acesta este numărul ultimei tranzacții create cu acest prefix
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Rata de evaluare necesar pentru postul {0}
@@ -1155,7 +1163,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vă rugăm s
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege concediu
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizor Data facturii
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Trebuie să activați Cosul de cumparaturi
-sites/assets/js/form.min.js +212,No Data,No Data
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Obiectiv model expertivă
 DocType: Salary Slip,Earning,Câștig Salarial
 DocType: Payment Tool,Party Account Currency,Partidul cont valutar
@@ -1163,7 +1171,7 @@ DocType: Payment Tool,Party Account Currency,Partidul cont valutar
 DocType: Purchase Taxes and Charges,Add or Deduct,Adăugaţi sau deduceţi
 DocType: Company,If Yearly Budget Exceeded (for expense account),Dacă bugetul anual depășită (pentru contul de cheltuieli)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiții se suprapun găsite între:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Comparativ intrării {0} în jurnal este deja ajustată comparativ altui voucher
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Comparativ intrării {0} în jurnal este deja ajustată comparativ altui voucher
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valoarea totală Comanda
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Produse Alimentare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Clasă de uzură 3
@@ -1171,11 +1179,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Nu de vizite
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Buletine de contacte, conduce."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta contului de închidere trebuie să fie {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puncte pentru toate obiectivele ar trebui să fie 100. este {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operațiunile nu poate fi lasat necompletat.
 ,Delivered Items To Be Billed,Produse Livrate Pentru a fi Facturate
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depozit nu poate fi schimbat pentru Serial No.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Starea actualizat la {0}
 DocType: DocField,Description,Descriere
 DocType: Authorization Rule,Average Discount,Discount mediiu
 DocType: Letter Head,Is Default,Este Implicit
@@ -1203,7 +1211,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Suma Taxa Articol
 DocType: Item,Maintain Stock,Menține Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lăsați necompletat dacă se consideră pentru toate denumirile
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,De la Datetime
 DocType: Email Digest,For Company,Pentru Companie
@@ -1213,7 +1221,7 @@ DocType: Sales Invoice,Shipping Address Name,Transport Adresa Nume
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Grafic Conturi
 DocType: Material Request,Terms and Conditions Content,Termeni și condiții de conținut
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
 DocType: Maintenance Visit,Unscheduled,Neprogramat
 DocType: Employee,Owned,Deținut
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depinde de concediu fără plată
@@ -1226,7 +1234,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garanție / AMC Starea
 DocType: GL Entry,GL Entry,Intrari GL
 DocType: HR Settings,Employee Settings,Setări Angajat
 ,Batch-Wise Balance History,Istoricul balanţei principale aferente lotului
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,To do list
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To do list
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Începător
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Nu este permisă cantitate negativă
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1259,12 +1267,12 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Birou inchiriat
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import a eșuat!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Nici adresa adăugat încă.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nici adresa adăugat încă.
 DocType: Workstation Working Hour,Workstation Working Hour,Statie de lucru de ore de lucru
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
 DocType: Item,Inventory,Inventarierea
 DocType: Features Setup,"To enable ""Point of Sale"" view",Pentru a activa "punct de vânzare" vedere
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Plata nu se poate face pentru cart gol
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plata nu se poate face pentru cart gol
 DocType: Item,Sales Details,Detalii vânzări
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixarea
 DocType: Opportunity,With Items,Cu articole
@@ -1274,7 +1282,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",Data la care va fi generat următoarea factură. Acesta este generată pe prezinte.
 DocType: Item Attribute,Item Attribute,Postul Atribut
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Guvern
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Variante Postul
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variante Postul
 DocType: Company,Services,Servicii
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Părinte Cost Center
@@ -1284,11 +1292,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Data de Inceput An Financiar
 DocType: Employee External Work History,Total Experience,Experiența totală
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Zencuire
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Incarcatura și Taxe de Expediere
 DocType: Material Request Item,Sales Order No,Vânzări Ordinul nr
 DocType: Item Group,Item Group Name,Denumire Grup Articol
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Luate
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Luate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiale de transfer de Fabricare
 DocType: Pricing Rule,For Price List,Pentru Lista de Preturi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Cautare Executiva
@@ -1297,8 +1305,7 @@ DocType: Maintenance Schedule,Schedules,Orarele
 DocType: Purchase Invoice Item,Net Amount,Cantitate netă
 DocType: Purchase Order Item Supplied,BOM Detail No,Detaliu BOM nr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Discount suplimentar Suma (companie de valuta)
-DocType: Period Closing Voucher,CoA Help,Ajutor CoA
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Eroare: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Eroare: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Vă rugăm să creați un cont nou de Planul de conturi.
 DocType: Maintenance Visit,Maintenance Visit,Vizita Mentenanta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Client Group> Teritoriul
@@ -1309,6 +1316,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Costul Ajutor Landed
 DocType: Event,Tuesday,Marți
 DocType: Leave Block List,Block Holidays on important days.,Blocaţi zile de sărbătoare în zilele importante.
 ,Accounts Receivable Summary,Rezumat conturi de încasare
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Frunze de tip {0} deja alocate pentru Angajat {1} pentru perioada {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Vă rugăm să setați câmp ID de utilizator într-o înregistrare angajat să stabilească Angajat rol
 DocType: UOM,UOM Name,Numele UOM
 DocType: Top Bar Item,Target,Țintă
@@ -1329,18 +1337,18 @@ DocType: Sales Partner,Sales Partner Target,Vânzări Partner țintă
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Intrarea contabilitate pentru {0} se poate face numai în valută: {1}
 DocType: Pricing Rule,Pricing Rule,Regula de stabilire a prețurilor
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Crestare
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Cerere de material de cumpărare Ordine
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Cerere de material de cumpărare Ordine
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conturi bancare
 ,Bank Reconciliation Statement,Extras de cont reconciliere bancară
 DocType: Address,Lead Name,Nume Conducere
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Sold Stock
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Sold Stock
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} trebuie să apară doar o singură dată
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nu este permis să transferam mai {0} {1} decât împotriva Comandă {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Concedii alocate cu succes pentru {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Concedii alocate cu succes pentru {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nu sunt produse în ambalaj
 DocType: Shipping Rule Condition,From Value,Din Valoare
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Sumele nu sunt corespunzătoare cu banca
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Cererile pentru cheltuieli companie.
@@ -1353,19 +1361,20 @@ DocType: Opportunity,Contact Mobile No,Nr. Mobil Persoana de Contact
 DocType: Production Planning Tool,Select Sales Orders,Selectați comenzi de vânzări
 ,Material Requests for which Supplier Quotations are not created,Cererile de materiale pentru care nu sunt create Cotațiile Furnizor
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Pentru a urmări elemente utilizând coduri de bare. Va fi capabil de a intra articole în nota de livrare și factură de vânzare prin scanarea codului de bare de element.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark livrate
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Face ofertă
 DocType: Dependent Task,Dependent Task,Sarcina dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Încercați planificarea operațiunilor de X zile în avans.
 DocType: HR Settings,Stop Birthday Reminders,De oprire de naștere Memento
 DocType: SMS Center,Receiver List,Receptor Lista
 DocType: Payment Tool Detail,Payment Amount,Plata Suma
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumat Suma
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Vezi
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vezi
 DocType: Salary Structure Deduction,Salary Structure Deduction,Structura Salariul Deducerea
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterizare cu laser selectivă
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importa cu succes!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costul de articole emise
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
@@ -1386,7 +1395,7 @@ DocType: Company,Default Payable Account,Implicit cont furnizori
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Setări pentru cosul de cumparaturi on-line, cum ar fi normele de transport maritim, lista de preturi, etc."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configurare complet
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Taxat
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Rezervate Cantitate
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervate Cantitate
 DocType: Party Account,Party Account,Party Account
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Resurse umane
 DocType: Lead,Upper Income,Venituri de sus
@@ -1429,11 +1438,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Activați cosul de cumparaturi
 DocType: Employee,Permanent Address,Permanent Adresa
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Articolul {0} trebuie să fie un Articol de Service.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Avansul plătit împotriva {0} {1} nu poate fi mai mare \ decât Grand total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vă rugăm să selectați codul de articol
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduce Deducerea pentru concediu fără plată (LWP)
 DocType: Territory,Territory Manager,Teritoriu Director
+DocType: Delivery Note Item,To Warehouse (Optional),Pentru a Depozit (opțional)
 DocType: Sales Invoice,Paid Amount (Company Currency),Plătit Suma (Compania de valuta)
 DocType: Purchase Invoice,Additional Discount,Discount suplimentar
 DocType: Selling Settings,Selling Settings,Vanzarea Setări
@@ -1456,7 +1466,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minerit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Turnare de rășină
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Există un grup de clienți cu același nume vă rugăm să schimbați numele clientului sau să redenumiți grupul de clienți
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Vă rugăm să selectați {0} primul.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vă rugăm să selectați {0} primul.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Textul {0}
 DocType: Territory,Parent Territory,Teritoriul părinte
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1484,11 +1494,11 @@ DocType: Sales Invoice Item,Batch No,Lot nr.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permite mai multor comenzi de vânzări împotriva Ordinului de Procurare unui client
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
 DocType: DocPerm,Delete,Șterge
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variantă
-sites/assets/js/desk.min.js +7971,New {0},Nou {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variantă
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nou {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Pentru a opri nu pot fi anulate. Unstop pentru a anula.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Pentru a opri nu pot fi anulate. Unstop pentru a anula.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
 DocType: Employee,Leave Encashed?,Concediu Incasat ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitatea de la câmp este obligatoriu
 DocType: Item,Variants,Variante
@@ -1506,7 +1516,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Ţară
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adrese
 DocType: Communication,Received,Primita
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Comparativ intrării {0} în jurnal nu are nici o intrare nepotrivită {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Comparativ intrării {0} în jurnal nu are nici o intrare nepotrivită {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Nr. Serial introdus pentru articolul {0} este duplicat
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,O condiție pentru o normă de transport
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Postul nu este permis să aibă producție comandă.
@@ -1527,7 +1537,6 @@ DocType: Employee,Salutation,Salut
 DocType: Communication,Rejected,Respinse
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,"Va aplică, de asemenea pentru variante"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Livrat
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Set de articole în momemntul vânzării.
 DocType: Sales Order Item,Actual Qty,Cant efectivă
 DocType: Sales Invoice Item,References,Referințe
@@ -1565,14 +1574,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,R
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Tuns
 DocType: Item,Has Variants,Are variante
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Clic pe butonul 'Intocmeste Factura Vanzare' pentru a crea o nouă Factură de Vânzare.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Perioada de la și perioada la datele obligatorii pentru recurente% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Ambalare și etichetare
 DocType: Monthly Distribution,Name of the Monthly Distribution,Numele de Distributie lunar
 DocType: Sales Person,Parent Sales Person,Mamă Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Vă rugăm să precizați implicit de valuta în Compania de Master și setări implicite globale
 DocType: Dropbox Backup,Dropbox Access Secret,Secret pentru Acces Dropbox 
 DocType: Purchase Invoice,Recurring Invoice,Factura recurent
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Managementul Proiectelor
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Managementul Proiectelor
 DocType: Supplier,Supplier of Goods or Services.,Furnizor de bunuri sau servicii.
 DocType: Budget Detail,Fiscal Year,An Fiscal
 DocType: Cost Center,Budget,Buget
@@ -1599,11 +1607,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,De vânzare
 DocType: Employee,Salary Information,Informațiile de salarizare
 DocType: Sales Person,Name and Employee ID,Nume și ID angajat
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
 DocType: Website Item Group,Website Item Group,Site-ul Grupa de articole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Impozite și taxe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Vă rugăm să introduceți data de referință
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} înregistrări de plată nu pot fi filtrate de {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vă rugăm să introduceți data de referință
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} înregistrări de plată nu pot fi filtrate de {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabelul pentru postul care va fi afișat în site-ul
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizat Cantitate
 DocType: Material Request Item,Material Request Item,Material Cerere Articol
@@ -1611,7 +1619,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Arborele de Postu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nu se poate face referire la un număr de inregistare mai mare sau egal cu numărul curent de inregistrare pentru acest tip de Incasare
 ,Item-wise Purchase History,Istoric Achizitii Articol-Avizat
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Roșu
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Vă rugăm să faceți clic pe ""Generate Program"", pentru a aduce ordine adăugat pentru postul {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Vă rugăm să faceți clic pe ""Generate Program"", pentru a aduce ordine adăugat pentru postul {0}"
 DocType: Account,Frozen,Congelat
 ,Open Production Orders,Comenzi deschis de producție
 DocType: Installation Note,Installation Time,Timp de instalare
@@ -1655,13 +1663,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Cotație Tendințe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupa de articole care nu sunt menționate la punctul de master pentru element {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Deoarece se poate întocmi ordin de producție aferent acestui articol, acesta trebuie să fie un articol de stoc."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Deoarece se poate întocmi ordin de producție aferent acestui articol, acesta trebuie să fie un articol de stoc."
 DocType: Shipping Rule Condition,Shipping Amount,Suma de transport maritim
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Aderarea
 DocType: Authorization Rule,Above Value,Valoarea de mai sus
 ,Pending Amount,În așteptarea Suma
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversie
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Livrat
+DocType: Purchase Order,Delivered,Livrat
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configurare de server de intrare pentru ocuparea forței de muncă id-ul de e-mail. (De exemplu jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Numărul de vehicule
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data la care factura recurente vor fi opri
@@ -1678,10 +1686,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Împărțiți taxelor p
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Contul {0} trebuie să fie de tipul 'valoare stabilită' deoarece articolul {1} este un articol de valoare
 DocType: HR Settings,HR Settings,Setări Resurse Umane
 apps/frappe/frappe/config/setup.py +130,Printing,Tipărire
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Revendicarea Cheltuielilor este în curs de aprobare. Doar Aprobatorul de Cheltuieli poate actualiza statusul.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Revendicarea Cheltuielilor este în curs de aprobare. Doar Aprobatorul de Cheltuieli poate actualiza statusul.
 DocType: Purchase Invoice,Additional Discount Amount,Reducere suplimentară Suma
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,A doua zi (e) pe care aplici pentru concediu sunt vacanță. Tu nu trebuie să se aplice pentru concediu.
-sites/assets/js/desk.min.js +7805,and,și
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,și
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
@@ -1717,7 +1725,6 @@ DocType: Opportunity,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Total de deducere
 DocType: Quotation,Maintenance User,Întreținere utilizator
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Cost actualizat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Sunteţi sigur că doriți să nu vă opriți
 DocType: Employee,Date of Birth,Data Nașterii
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Articolul {0} a fost deja returnat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anul fiscal** reprezintă un an financiar. Toate intrările contabile și alte tranzacții majore sunt monitorizate comparativ cu ** Anul fiscal **.
@@ -1733,13 +1740,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Păstra Tractor de campanii de vanzari. Țineți evidența de afaceri, Cotațiile, comandă de vânzări, etc de la Campanii pentru a evalua Return on Investment. "
 DocType: Expense Claim,Approver,Aprobator
 ,SO Qty,SO Cantitate
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Intrări din stocul exista împotriva depozit {0}, deci nu puteți re-atribui sau modifica Depozit"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Intrări din stocul exista împotriva depozit {0}, deci nu puteți re-atribui sau modifica Depozit"
 DocType: Appraisal,Calculate Total Score,Calculaţi scor total
 DocType: Supplier Quotation,Manufacturing Manager,Manufacturing Manager de
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Nu {0} este în garanție pana {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Împărțit de livrare Notă în pachete.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Transporturile
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Formare prin imersie
+DocType: Purchase Order,To be delivered to customer,Pentru a fi livrat clientului
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Ora Log Starea trebuie să fie prezentate.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial nr {0} nu apartine nici unei Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurarea
@@ -1764,11 +1772,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Din moneda
 DocType: DocField,Name,Nume
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Sumele nu sunt corespunzătoare cu sistemul
 DocType: Purchase Invoice Item,Rate (Company Currency),Rata de (Compania de valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altel
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Setați ca Oprit
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nu pot găsi o potrivire articol. Vă rugăm să selectați o altă valoare pentru {0}.
 DocType: POS Profile,Taxes and Charges,Impozite și Taxe
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un produs sau un serviciu care este cumpărat, vândut sau păstrat în stoc."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nu se poate selecta tipul de incasare ca 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta' pentru prima inregistrare
@@ -1777,19 +1785,20 @@ DocType: Web Form,Select DocType,Selectați DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broșare
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bancar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Vă rugăm să faceți clic pe ""Generate Program"", pentru a obține programul"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Centru de cost nou
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Centru de cost nou
 DocType: Bin,Ordered Quantity,Ordonat Cantitate
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","de exemplu ""Construi instrumente de constructori """
 DocType: Quality Inspection,In Process,În procesul de
 DocType: Authorization Rule,Itemwise Discount,Reducere Articol-Avizat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
+DocType: Purchase Order Item,Reference Document Type,Referință Document Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
 DocType: Account,Fixed Asset,Activ Fix
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Inventarul serializat
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventarul serializat
 DocType: Activity Type,Default Billing Rate,Rata de facturare implicit
 DocType: Time Log Batch,Total Billing Amount,Suma totală de facturare
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Contul de încasat
 ,Stock Balance,Stoc Sold
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Comanda de vânzări la plată
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Comanda de vânzări la plată
 DocType: Expense Claim Detail,Expense Claim Detail,Detaliu Revendicare Cheltuieli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Timp Busteni creat:
 DocType: Item,Weight UOM,Greutate UOM
@@ -1825,10 +1834,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Pentru cont trebuie să fie un cont de plati
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
 DocType: Production Order Operation,Completed Qty,Cantitate Finalizata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Pentru {0}, numai conturi de debit poate fi legat de o altă intrare în credit"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Pentru {0}, numai conturi de debit poate fi legat de o altă intrare în credit"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
 DocType: Manufacturing Settings,Allow Overtime,Permiteți ore suplimentare
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Comandă de vânzări {0} este oprit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numere de serie necesare pentru postul {1}. Ați furnizat {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Rata de evaluare curentă
 DocType: Item,Customer Item Codes,Coduri client Postul
@@ -1837,9 +1845,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Sudare
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM este necesar
 DocType: Quality Inspection,Sample Size,Eșantionul de dimensiune
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Toate articolele au fost deja facturate
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Toate articolele au fost deja facturate
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vă rugăm să specificați un valabil ""Din cauza nr"""
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centre de costuri pot fi realizate în grupuri, dar intrările pot fi făcute împotriva non-Grupuri"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centre de costuri pot fi realizate în grupuri, dar intrările pot fi făcute împotriva non-Grupuri"
 DocType: Project,External,Extern
 DocType: Features Setup,Item Serial Nos,Nr. de Serie Articol
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilizatori și permisiuni
@@ -1866,7 +1874,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Adresă şi contacte
 DocType: SMS Log,Sender Name,Sender Name
 DocType: Page,Title,Titlu
-sites/assets/js/list.min.js +104,Customize,Personalizeaza
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalizeaza
 DocType: POS Profile,[Select],[Selectati]
 DocType: SMS Log,Sent To,Trimis La
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Realizeaza Factura de Vanzare
@@ -1891,12 +1899,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Sfârsitul vieții
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Călători
 DocType: Leave Block List,Allow Users,Permiteți utilizatori
+DocType: Purchase Order,Customer Mobile No,Client Mobile Nu
 DocType: Sales Invoice,Recurring,Recurent
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Urmăriți Venituri separat și cheltuieli verticale produse sau divizii.
 DocType: Rename Tool,Rename Tool,Redenumirea Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualizare Cost
 DocType: Item Reorder,Item Reorder,Reordonare Articol
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Material de transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Material de transfer
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifica operațiunilor, costurile de exploatare și să dea o operațiune unică nu pentru operațiunile dumneavoastră."
 DocType: Purchase Invoice,Price List Currency,Lista de pret Valuta
 DocType: Naming Series,User must always select,Utilizatorul trebuie să selecteze întotdeauna
@@ -1919,7 +1928,7 @@ DocType: Appraisal,Employee,Angajat
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email la
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Invitați ca utilizator
 DocType: Features Setup,After Sale Installations,Echipamente premergătoare vânzării
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} este complet facturat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} este complet facturat
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Clauzele contractuale standard pentru vânzări sau de cumpărare.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grup in functie de Voucher
@@ -1928,8 +1937,9 @@ DocType: Sales Invoice,Mass Mailing,Corespondență în masă
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Fișier de Redenumiți
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Număr de ordine Purchse necesar pentru postul {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Afiseaza Plati
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM specificată {0} nu există pentru postul {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programul de Mentenanta {0} trebuie anulat înainte de a anula aceasta Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programul de Mentenanta {0} trebuie anulat înainte de a anula aceasta Comandă de Vânzări
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Dimensiune
 DocType: Notification Control,Expense Claim Approved,Revendicare Cheltuieli Aprobata
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutic
@@ -1948,8 +1958,8 @@ DocType: Upload Attendance,Attendance To Date,Prezenţa până la data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configurare de server de intrare pentru ID-ul de e-mail de vânzări. (De exemplu sales@example.com)
 DocType: Warranty Claim,Raised By,Ridicate de
 DocType: Payment Tool,Payment Account,Cont de plăți
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
-sites/assets/js/list.min.js +23,Draft,Ciornă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Ciornă
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Fara Masuri Compensatorii
 DocType: Quality Inspection Reading,Accepted,Acceptat
 DocType: User,Female,Feminin
@@ -1962,14 +1972,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Regula de transport maritim Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Deoarece există tranzacții bursiere existente pentru acest element, \ nu puteți schimba valorile "nu are nici o serie", "are lot nr", "Este Piesa" și "Metoda de evaluare""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Jurnal de intrare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
 DocType: Employee,Previous Work Experience,Anterior Work Experience
 DocType: Stock Entry,For Quantity,Pentru Cantitate
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Va rugam sa introduceti planificate Cantitate pentru postul {0} la rândul {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} nu este introdus
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Cererile de elemente.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} nu este introdus
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Cererile de elemente.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pentru producerea separată va fi creat pentru fiecare articol bun finit.
 DocType: Purchase Invoice,Terms and Conditions1,Termeni și Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup, Setare Finalizata
@@ -1981,7 +1992,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailin
 DocType: Delivery Note,Transporter Name,Transporter Nume
 DocType: Contact,Enter department to which this Contact belongs,Introduceti departamentul de care apartine acest Contact
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Raport Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Articolul sau Depozitul aferent inregistrariii {0} nu se potrivește cu Cererea de Material
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Articolul sau Depozitul aferent inregistrariii {0} nu se potrivește cu Cererea de Material
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unitate de măsură
 DocType: Fiscal Year,Year End Date,Anul Data de încheiere
 DocType: Task Depends On,Task Depends On,Sarcina Depinde
@@ -2007,7 +2018,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuitor terță parte / dealer / agent comision / afiliat / reseller care vinde produsele companiilor pentru un comision.
 DocType: Customer Group,Has Child Node,Are nod fiu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduceți parametrii url statici aici (de exemplu, expeditor = ERPNext, numele de utilizator = ERPNext, parola = 1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nu în nici un activ anul fiscal. Pentru mai multe detalii verifica {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Acesta este un site web exemplu auto-generat de ERPNext
@@ -2058,11 +2069,9 @@ DocType: Note,Note,Notă
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantitate
 DocType: Email Account,Email Ids,Email Id-urile
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nu se pot produce mai multe Articole {0} decât cantitatea din Ordinul de Vânzări {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Setați ca destupate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
 DocType: Payment Reconciliation,Bank / Cash Account,Cont bancă / numerar 
 DocType: Tax Rule,Billing City,Oraș de facturare
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Această aplicație concediul este în curs de aprobare. Numai Leave aprobator poate actualiza starea.
 DocType: Global Defaults,Hide Currency Symbol,Ascunde simbol moneda
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","de exemplu, bancar, Cash, Card de credit"
 DocType: Journal Entry,Credit Note,Nota de Credit
@@ -2083,7 +2092,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantitate)
 DocType: Installation Note Item,Installed Qty,Instalat Cantitate
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-sites/assets/js/list.min.js +26,Submitted,Inscrisa
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Inscrisa
 DocType: Salary Structure,Total Earning,Câștigul salarial total de
 DocType: Purchase Receipt,Time at which materials were received,Timp în care s-au primit materiale
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Adresele mele
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Ramură organ
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,sau
 DocType: Sales Order,Billing Status,Stare facturare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Cheltuieli de utilitate
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-sus
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-sus
 DocType: Buying Settings,Default Buying Price List,Lista de POrețuri de Cumparare Implicita
 ,Download Backups,Descarca Backup
 DocType: Notification Control,Sales Order Message,Comandă de vânzări Mesaj
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Selectați angajati
 DocType: Bank Reconciliation,To Date,La Data
 DocType: Opportunity,Potential Sales Deal,Oferta potențiale Vânzări
-sites/assets/js/form.min.js +308,Details,Detalii
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalii
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impozite și Taxe
 DocType: Employee,Emergency Contact,Contact de Urgență
 DocType: Item,Quality Parameters,Parametri de calitate
@@ -2116,7 +2125,7 @@ DocType: Purchase Order Item,Received Qty,Primit Cantitate
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / lot
 DocType: Product Bundle,Parent Item,Părinte Articol
 DocType: Account,Account Type,Tipul Contului
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programul de Mentenanta nu este generat pentru toate articolele. Vă rugăm să faceți clic pe 'Generare Program'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programul de Mentenanta nu este generat pentru toate articolele. Vă rugăm să faceți clic pe 'Generare Program'
 ,To Produce,Pentru a produce
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pentru rândul {0} în {1}. Pentru a include {2} ratei punctul, randuri {3} De asemenea, trebuie să fie incluse"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificarea pachetului pentru livrare (pentru imprimare)
@@ -2127,7 +2136,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplatizare
 DocType: Account,Income Account,Contul de venit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Turnare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Livrare
 DocType: Stock Reconciliation Item,Current Qty,Cantitate curentă
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","A se vedea ""Rate de materiale bazate pe"" în Costing Secțiunea"
 DocType: Appraisal Goal,Key Responsibility Area,Domeni de Responsabilitate Cheie
@@ -2158,9 +2167,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Toate adresele.
 DocType: Company,Stock Settings,Setări stoc
 DocType: User,Bio,Biografie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Fuziune este posibilă numai în cazul în care următoarele proprietăți sunt aceleași în ambele registre. Este Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Fuziune este posibilă numai în cazul în care următoarele proprietăți sunt aceleași în ambele registre. Este Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gestioneaza Ramificatiile de Group a Clientului.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Numele noului centru de cost
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Numele noului centru de cost
 DocType: Leave Control Panel,Leave Control Panel,Panou de Control Concediu
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Nu Format implicit Adresa găsit. Vă rugăm să creați unul nou de la Setup> Imprimare și Branding> Format Adresa.
 DocType: Appraisal,HR User,Utilizator HR
@@ -2179,24 +2188,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Plata Instrumentul Detalii
 ,Sales Browser,Vânzări Browser
 DocType: Journal Entry,Total Credit,Total credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Împrumuturi și Avansuri (Active)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorii
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Mare
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nici un angajat nu a fost gasit!
 DocType: C-Form Invoice Detail,Territory,Teritoriu
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vă rugăm să menționați nici de vizite necesare
+DocType: Purchase Order,Customer Address Display,Adresa de afișare client
 DocType: Stock Settings,Default Valuation Method,Metoda de Evaluare Implicită
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Lustruire
 DocType: Production Order Operation,Planned Start Time,Planificate Ora de începere
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Alocat
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Inchideti Bilanțul și registrul Profit sau Pierdere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Unitatea de măsură implicită pentru postul {0} nu poate fi schimbată în mod direct, deoarece \ aveti si voi deja unele tranzacții (i) cu un alt UOM. Pentru a schimba implicit UOM, \ utilizarea "UOM Înlocuiți Utility" instrument în modul stoc."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Precizați Rata de schimb a converti o monedă în alta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Citat {0} este anulat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} este anulat
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Suma Impresionant
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Angajatul {0} a fost în concediu pe {1}. Nu se poate marca prezență.
 DocType: Sales Partner,Targets,Obiective
@@ -2211,12 +2220,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Acesta este un grup de clienți rădăcină și nu pot fi editate.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Vă rugăm configurarea diagrama de conturi înainte de a începe înregistrările contabile
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignora Regula Preturi
-sites/assets/js/list.min.js +24,Cancelled,Anulat
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Anulat
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,De la data la structura salariului nu poate fi mai mică decât Angajat Aderarea Data.
 DocType: Employee Education,Graduate,Absolvent
 DocType: Leave Block List,Block Days,Zile de blocare
 DocType: Journal Entry,Excise Entry,Intrare accize
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Atenție: comandă de vânzări {0} există deja împotriva Ordinului de Procurare clientului {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Atenție: comandă de vânzări {0} există deja împotriva Ordinului de Procurare clientului {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2273,17 +2282,17 @@ DocType: Account,Stock Received But Not Billed,"Stock primite, dar nu Considerat
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brut Suma de plată + restante Suma + încasări - Total Deducerea
 DocType: Monthly Distribution,Distribution Name,Denumire Distribuție
 DocType: Features Setup,Sales and Purchase,Vanzari si cumparare
-DocType: Purchase Order Item,Material Request No,Cerere de material Nu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
+DocType: Supplier Quotation Item,Material Request No,Cerere de material Nu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rata la care moneda clientului este convertită în valuta de bază a companiei
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} a fost dezabonat cu succes din această listă.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Rata netă (companie de valuta)
-apps/frappe/frappe/templates/base.html +132,Added,Adăugat
+apps/frappe/frappe/templates/base.html +134,Added,Adăugat
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gestioneaza Ramificatiile Teritoriule.
 DocType: Journal Entry Account,Sales Invoice,Factură de vânzări
 DocType: Journal Entry Account,Party Balance,Balanța Party
 DocType: Sales Invoice Item,Time Log Batch,Timp Log lot
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Vă rugăm să selectați Aplicați Discount On
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vă rugăm să selectați Aplicați Discount On
 DocType: Company,Default Receivable Account,Implicit cont de încasat
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Creați Banca intrare pentru salariul totală plătită pentru criteriile de mai sus selectate
 DocType: Stock Entry,Material Transfer for Manufacture,Transfer de material pentru fabricarea
@@ -2294,7 +2303,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Obține intrările relevante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Intrare contabilitate pentru stoc
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Articolul {0} nu există
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Articolul {0} nu există
 DocType: Sales Invoice,Customer Address,Adresă client
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicați Discount suplimentare La
@@ -2309,13 +2318,15 @@ DocType: Quality Inspection,Quality Inspection,Inspecție de calitate
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray de formare
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Contul {0} este Blocat
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Contul {0} este Blocat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitate juridică / Filiala cu o Grafic separat de conturi aparținând Organizației.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Produse Alimentare, Bauturi si Tutun"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL sau BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rata de comision nu poate fi mai mare decat 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivelul minim Inventarul
 DocType: Stock Entry,Subcontract,Subcontract
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Va rugam sa introduceti {0} primul
 DocType: Production Planning Tool,Get Items From Sales Orders,Obține Articole din Comenzi de Vânzări
 DocType: Production Order Operation,Actual End Time,Timp efectiv de sfârşit
 DocType: Production Planning Tool,Download Materials Required,Descărcare Materiale Necesara
@@ -2332,8 +2343,8 @@ DocType: Maintenance Visit,Scheduled,Programat
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Vă rugăm să selectați postul unde "Este Piesa" este "nu" și "Este punctul de vânzare" este "da" și nu este nici un alt produs Bundle
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selectați Distributie lunar pentru a distribui neuniform obiective pe luni.
 DocType: Purchase Invoice Item,Valuation Rate,Rata de evaluare
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Lista de pret Valuta nu selectat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Angajatul {0} a aplicat deja pentru {1} între {2} și {3}
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Lista de pret Valuta nu selectat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Angajatul {0} a aplicat deja pentru {1} între {2} și {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de începere a proiectului
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Până la
 DocType: Rename Tool,Rename Log,Redenumi Conectare
@@ -2360,13 +2371,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Numai noduri frunze sunt permise în tranzacție
 DocType: Expense Claim,Expense Approver,Cheltuieli aprobator
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Primirea de cumpărare Articol Livrat
-sites/assets/js/erpnext.min.js +48,Pay,Plăti
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Plăti
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Pentru a Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Busteni pentru menținerea statutului de livrare sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Măcinare
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink ambalaj
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Activități în curs
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activități în curs
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Furnizor> Furnizor Tip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
@@ -2377,7 +2388,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Int
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editorii de ziare
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selectați anul fiscal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Metalurgie
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Sunteți aprobator Lăsați pentru această înregistrare. Vă rugăm Actualizați ""statutul"" și Salvare"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordonare nivel
 DocType: Attendance,Attendance Date,Dată prezenţă
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salariul despartire bazat privind câștigul salarial și deducere.
@@ -2413,6 +2423,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centrul de Cost cu tranzacții existente nu poate fi transformat în grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciere
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizor (e)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Perioada de invalid
 DocType: Customer,Credit Limit,Limita de Credit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selectați tipul de tranzacție
 DocType: GL Entry,Voucher No,Voletul nr
@@ -2422,8 +2433,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Șabl
 DocType: Customer,Address and Contact,Adresa si Contact
 DocType: Customer,Last Day of the Next Month,Ultima zi a lunii următoare
 DocType: Employee,Feedback,Reactie
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Program
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Program
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Prelucrare cu jet abraziv
 DocType: Stock Settings,Freeze Stock Entries,Blocheaza Intrarile in Stoc
 DocType: Website Settings,Website Settings,Setarile site-ului
@@ -2437,11 +2448,11 @@ DocType: Quality Inspection,Outgoing,Trimise
 DocType: Material Request,Requested For,Pentru a solicitat
 DocType: Quotation Item,Against Doctype,Comparativ tipului documentului
 DocType: Delivery Note,Track this Delivery Note against any Project,Urmareste acest Livrare Note împotriva oricărui proiect
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Contul de root nu pot fi șterse
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Contul de root nu pot fi șterse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Arată stoc Entries
 ,Is Primary Address,Este primar Adresa
 DocType: Production Order,Work-in-Progress Warehouse,De lucru-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Reference # {0} din {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} din {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gestionați Adrese
 DocType: Pricing Rule,Item Code,Cod articol
 DocType: Production Planning Tool,Create Production Orders,Creare Comenzi de Producție
@@ -2450,14 +2461,14 @@ DocType: Journal Entry,User Remark,Observație utilizator
 DocType: Lead,Market Segment,Segmentul de piață
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Istoric Intern Locuri de Munca Angajat
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),De închidere (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),De închidere (Dr)
 DocType: Contact,Passive,Pasiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Nu {0} nu este în stoc
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Șablon impozit pentru tranzacțiile de vânzare.
 DocType: Sales Invoice,Write Off Outstanding Amount,Scrie Off remarcabile Suma
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Verificați dacă aveți nevoie de facturi recurente automate. După introducerea oricarei factură de vânzare, sectiunea Recurente va fi vizibila."
 DocType: Account,Accounts Manager,Manager de Conturi
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',"Ora Log {0} trebuie să fie ""Înscris"""
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Ora Log {0} trebuie să fie ""Înscris"""
 DocType: Stock Settings,Default Stock UOM,Stoc UOM Implicit
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Rata costa în funcție de activitatea de tip (pe oră)
 DocType: Production Planning Tool,Create Material Requests,Creare Necesar de Materiale
@@ -2468,7 +2479,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Reconciliere bancară
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obțineți actualizări
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adaugă câteva înregistrări eșantion
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Lasă Managementul
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lasă Managementul
 DocType: Event,Groups,Grupuri
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grup in functie de Cont
 DocType: Sales Order,Fully Delivered,Livrat complet
@@ -2480,11 +2491,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Extras de vânzare
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},bugetul {0} pentru contul {1} ​​comparativ centrului de cost {2} va fi depășit cu {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Trasmite Concedii Inaintate
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie ulterior 'Până în Data'
 ,Stock Projected Qty,Stoc proiectată Cantitate
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
 DocType: Sales Order,Customer's Purchase Order,Comandă clientului
 DocType: Warranty Claim,From Company,De la Compania
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valoare sau Cantitate
@@ -2497,13 +2507,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Vânzător cu amănuntul
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit în contul trebuie să fie un cont de bilanț
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Toate tipurile de furnizor
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Cod articol este obligatorie, deoarece postul nu este numerotat automat"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Citat {0} nu de tip {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Cod articol este obligatorie, deoarece postul nu este numerotat automat"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Citat {0} nu de tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Articol Program Mentenanta
 DocType: Sales Order,%  Delivered,% Livrat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Descoperire cont bancar
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Realizeaza Fluturas de Salar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Unstop
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navigare BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Împrumuturi garantate
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produse extraordinare
@@ -2513,7 +2522,7 @@ DocType: Appraisal,Appraisal,Expertiză
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Turnare a pierdut-spumă
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Desen
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data se repetă
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Aprobator Concediu trebuie să fie unul din {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Aprobator Concediu trebuie să fie unul din {0}
 DocType: Hub Settings,Seller Email,Vânzător de e-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de achiziție (prin cumparare factură)
 DocType: Workstation Working Hour,Start Time,Ora de începere
@@ -2527,8 +2536,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Suma netă (companie de valuta)
 DocType: BOM Operation,Hour Rate,Rata Oră
 DocType: Stock Settings,Item Naming By,Denumire Articol Prin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Din Ofertă
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},O altă intrare închidere de perioada {0} a fost efectuată după {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Din Ofertă
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},O altă intrare închidere de perioada {0} a fost efectuată după {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Transferat pentru Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Contul {0} nu există
 DocType: Purchase Receipt Item,Purchase Order Item No,Comandă de aprovizionare Punctul nr
@@ -2541,11 +2550,11 @@ DocType: Item,Inspection Required,Inspecție obligatorii
 DocType: Purchase Invoice Item,PR Detail,PR Detaliu
 DocType: Sales Order,Fully Billed,Complet Taxat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Bani în mână
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Depozit de livrare necesar pentru articol stoc {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Depozit de livrare necesar pentru articol stoc {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"Greutatea brută a pachetului. Greutate + ambalare, de obicei, greutate netă de material. (Pentru imprimare)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Utilizatorii cu acest rol li se permite să stabilească în conturile înghețate și de a crea / modifica intrări contabile împotriva conturile înghețate
 DocType: Serial No,Is Cancelled,Este anulat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Livrările mele
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Livrările mele
 DocType: Journal Entry,Bill Date,Dată factură
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Chiar dacă există mai multe reguli de stabilire a prețurilor, cu cea mai mare prioritate, se aplică apoi următoarele priorități interne:"
 DocType: Supplier,Supplier Details,Detalii furnizor
@@ -2558,7 +2567,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vă rugăm să selectați cont bancar
 DocType: Newsletter,Create and Send Newsletters,A crea și trimite Buletine
-sites/assets/js/report.min.js +107,From Date must be before To Date,Din Data trebuie să fie anterioara Pana la Data
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Din Data trebuie să fie anterioara Pana la Data
 DocType: Sales Order,Recurring Order,Comanda recurent
 DocType: Company,Default Income Account,Contul Venituri Implicit
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup Client / Client
@@ -2573,31 +2582,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Stoc UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
 ,Projected,Proiectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Nu {0} nu apartine Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
 DocType: Notification Control,Quotation Message,Citat Mesaj
 DocType: Issue,Opening Date,Data deschiderii
 DocType: Journal Entry,Remark,Remarcă
 DocType: Purchase Receipt Item,Rate and Amount,Rata și volumul
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Plictisitor
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Din Comanda de Vânzări
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Din Comanda de Vânzări
 DocType: Blog Category,Parent Website Route,Părinte Site Route
 DocType: Sales Order,Not Billed,Nu Taxat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambele depozite trebuie să aparțină aceleiași companii
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Nu contact adăugat încă.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nu contact adăugat încă.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nu este activ
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Comparativ datei de afișare factură
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Costul Landed Voucher Suma
 DocType: Time Log,Batched for Billing,Transformat în lot pentru facturare
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Facturi cu valoarea ridicată de către furnizori.
 DocType: POS Profile,Write Off Account,Scrie Off cont
-sites/assets/js/erpnext.min.js +26,Discount Amount,Reducere Suma
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Reducere Suma
 DocType: Purchase Invoice,Return Against Purchase Invoice,Reveni Împotriva cumparare factură
 DocType: Item,Warranty Period (in days),Perioada de garanție (în zile)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"de exemplu, TVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punctul 4
 DocType: Journal Entry Account,Journal Entry Account,Jurnal de cont intrare
 DocType: Shopping Cart Settings,Quotation Series,Ofertă Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Există un articol cu aceeaşi denumire ({0}), vă rugăm să schimbați denumirea grupului articolului sau să redenumiţi articolul"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Există un articol cu aceeaşi denumire ({0}), vă rugăm să schimbați denumirea grupului articolului sau să redenumiţi articolul"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gaz de metal la cald
 DocType: Sales Order Item,Sales Order Date,Comandă de vânzări Data
 DocType: Sales Invoice Item,Delivered Qty,Cantitate Livrata
@@ -2629,10 +2637,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Client sau furnizor Detalii
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Setează
 DocType: Lead,Lead Owner,Proprietar Conducere
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Este necesar depozit
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Este necesar depozit
 DocType: Employee,Marital Status,Stare civilă
 DocType: Stock Settings,Auto Material Request,Auto cerere de material
 DocType: Time Log,Will be updated when billed.,Vor fi actualizate atunci când facturat.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponibil lot Cantitate puțin din Warehouse
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,FDM-ul curent și FDM-ul nou nu pot fi identici
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data Pensionare trebuie să fie ulterioara Datei Aderării
 DocType: Sales Invoice,Against Income Account,Comparativ contului de venit
@@ -2648,12 +2657,12 @@ DocType: POS Profile,Update Stock,Actualizare stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinisare
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Un UOM diferit pentru articole va conduce la o valoare incorecta pentru Greutate Neta (Total). Asigurați-vă că Greutatea Netă a fiecărui articol este în același UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Rată BOM
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Vă rugăm să trage elemente de livrare Nota
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Vă rugăm să trage elemente de livrare Nota
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Jurnalul Intrările {0} sunt ne-legate
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Înregistrare a tuturor comunicărilor de tip e-mail, telefon, chat-ul, vizita, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Vă rugăm să menționați rotunji Center cost în companie
 DocType: Purchase Invoice,Terms,Termeni
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Creeaza Nou
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Creeaza Nou
 DocType: Buying Settings,Purchase Order Required,Comandă de aprovizionare necesare
 ,Item-wise Sales History,Istoric Vanzari Articol-Avizat
 DocType: Expense Claim,Total Sanctioned Amount,Suma totală sancționat
@@ -2670,16 +2679,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Salariul Slip Deducerea
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Observații
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Selectați un nod grup prim.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Scopul trebuie să fie una dintre {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Completați formularul și salvați-l
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Completați formularul și salvați-l
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descărcati un raport care conține toate materiile prime cu ultimul lor status de inventar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Cu care se confruntă
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Balanta Concediu Inainte de Aplicare
 DocType: SMS Center,Send SMS,Trimite SMS
 DocType: Company,Default Letter Head,Implicit Scrisoare Șef
 DocType: Time Log,Billable,Facturabil
 DocType: Authorization Rule,This will be used for setting rule in HR module,Aceasta va fi utilizată pentru stabilirea regulă în modul de HR
 DocType: Account,Rate at which this tax is applied,Rata la care se aplică acest impozit
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Reordonare Cantitate
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordonare Cantitate
 DocType: Company,Stock Adjustment Account,Cont Ajustarea stoc
 DocType: Journal Entry,Write Off,Achita
 DocType: Time Log,Operation ID,Operațiunea ID
@@ -2690,10 +2700,12 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Campurile cu Reduceri vor fi disponibile în Ordinul de Cumparare, Chitanta de Cumparare, Factura de Cumparare"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Numele de cont nou. Notă: Vă rugăm să nu creați conturi pentru clienți și furnizori
 DocType: Report,Report Type,Tip de raport
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Încărcare
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Încărcare
 DocType: BOM Replace Tool,BOM Replace Tool,Mijloc de înlocuire BOM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Șabloanele țară înțelept adresa implicită
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Furnizor livrează la client
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Arată impozit break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Datele de import și export
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Dacă vă implicati în activitatea de producție. Permite Articolului 'Este Fabricat'
 Ignore,Ignora
@@ -2808,6 +2820,7 @@ Item Code,Cod Articol
 Item Code and Warehouse should already exist.,Cod Articol și Depozit trebuie să existe deja.
 Item Code cannot be changed for Serial No.,Cod Articol nu poate fi schimbat pentru Nr. de Serie
 Item Code is mandatory because Item is not automatically numbered,Codul Articol este obligatoriu deoarece Articolul nu este numerotat automat"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Postarea factură Data
 DocType: Sales Invoice,Rounded Total,Rotunjite total
 DocType: Product Bundle,List items that form the package.,Listeaza articole care formează pachetul.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Alocarea procent ar trebui să fie egală cu 100%
@@ -2818,8 +2831,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Vă rugăm să contactați pentru utilizatorul care au Sales Maestru de Management {0} rol
 DocType: Company,Default Cash Account,Cont de Numerar Implicit
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Directorul Companiei(nu al Clientului sau al Furnizorui).
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Vă rugăm să introduceți ""Data de livrare așteptată"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Livrare {0} trebuie sa fie anulată înainte de a anula aceasta Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Vă rugăm să introduceți ""Data de livrare așteptată"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Livrare {0} trebuie sa fie anulată înainte de a anula aceasta Comandă de Vânzări
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Suma plătită + Scrie Off Suma nu poate fi mai mare decât Grand total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nu este un număr de lot valid aferent articolului {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {0}
@@ -2841,11 +2854,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Rând {0}: Cant nu avalable în depozit {1} în {2} {3}.
  Disponibil Cantitate: {4}, Transfer Cantitate: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punctul 3
+DocType: Purchase Order,Customer Contact Email,Contact Email client
 DocType: Event,Sunday,Duminică
 DocType: Sales Team,Contribution (%),Contribuție (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Notă: Plata de intrare nu va fi creat deoarece ""Cash sau cont bancar"" nu a fost specificat"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitati
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Șablon
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Șablon
 DocType: Sales Person,Sales Person Name,Sales Person Nume
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Va rugam sa introduceti cel putin 1 factura în tabelul
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Adauga utilizatori
@@ -2854,7 +2868,7 @@ DocType: Task,Actual Start Date (via Time Logs),Data efectivă de început (prin
 DocType: Stock Reconciliation Item,Before reconciliation,Premergător reconcilierii
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Pentru a {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impozite și Taxe adăugate (Compania de valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
 DocType: Sales Order,Partly Billed,Parțial Taxat
 DocType: Item,Default BOM,FDM Implicit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2862,12 +2876,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totală restantă Amt
 DocType: Time Log Batch,Total Hours,Total ore
 DocType: Journal Entry,Printing Settings,Setări de imprimare
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Autopropulsat
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Concedii pentru tipul {0} au fost deja alocate pentru Angajat {1} pentru Anul Fiscal {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Este necesară Articol
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,De turnare prin injecție de metal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Din Nota de Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Din Nota de Livrare
 DocType: Time Log,From Time,Din Time
 DocType: Notification Control,Custom Message,Mesaj Personalizat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
@@ -2883,10 +2896,10 @@ DocType: Newsletter,A Lead with this email id should exist,Un Lider cu acest id
 DocType: Stock Entry,From BOM,De la BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Elementar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Tranzacțiilor bursiere înainte de {0} sunt înghețate
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Vă rugăm să faceți clic pe ""Generate Program"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Pentru a Data trebuie să fie aceeași ca la data de concediu de jumatate de zi
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Vă rugăm să faceți clic pe ""Generate Program"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Pentru a Data trebuie să fie aceeași ca la data de concediu de jumatate de zi
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","de exemplu, Kg, Unitatea, nr, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,De referință nu este obligatorie în cazul în care ați introdus Reference Data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,De referință nu este obligatorie în cazul în care ați introdus Reference Data
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data Aderării trebuie să fie ulterioara Datei Nașterii
 DocType: Salary Structure,Salary Structure,Structura salariu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2894,7 +2907,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  prin atribuirea prioritate. Reguli Pret: {0}"
 DocType: Account,Bank,Bancă
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Linie aeriană
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Eliberarea Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Eliberarea Material
 DocType: Material Request Item,For Warehouse,Pentru Depozit
 DocType: Employee,Offer Date,Oferta Date
 DocType: Hub Settings,Access Token,Acces Token
@@ -2917,6 +2930,7 @@ DocType: Issue,Opening Time,Timp de deschidere
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Datele De La și Pana La necesare
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
+DocType: Delivery Note Item,From Warehouse,Din depozitul
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Foraj
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Modelare prin suflare
 DocType: Purchase Taxes and Charges,Valuation and Total,Evaluare și Total
@@ -2938,11 +2952,12 @@ DocType: C-Form,Amended From,Modificat din
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Material brut
 DocType: Leave Application,Follow via Email,Urmați prin e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma taxa După Discount Suma
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Contul copil există pentru acest cont. Nu puteți șterge acest cont.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Contul copil există pentru acest cont. Nu puteți șterge acest cont.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cantitatea țintă sau valoarea țintă este obligatorie
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
-DocType: Leave Allocation,Carry Forward,Transmite Inainte
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Deschiderea Data ar trebui să fie, înainte de Data inchiderii"
+DocType: Leave Control Panel,Carry Forward,Transmite Inainte
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centrul de Cost cu tranzacții existente nu poate fi transformat în registru contabil
 DocType: Department,Days for which Holidays are blocked for this department.,Zile pentru care Sărbătorile sunt blocate pentru acest departament.
 ,Produced,Produs
@@ -2963,17 +2978,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Divertisment & Relaxare
 DocType: Purchase Order,The date on which recurring order will be stop,Data la care comanda recurent va fi opri
 DocType: Quality Inspection,Item Serial No,Nr. de Serie Articol
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} trebuie să fie redus cu {1} sau dvs. ar trebui să incrementați toleranța în exces
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} trebuie să fie redus cu {1} sau dvs. ar trebui să incrementați toleranța în exces
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Raport Prezent
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Oră
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Postul serializate {0} nu poate fi actualizat \
  folosind stoc Reconciliere"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transfer de material la furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfer de material la furnizor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Noua ordine nu pot avea Warehouse. Depozit trebuie să fie stabilite de către Bursa de intrare sau de primire de cumparare
 DocType: Lead,Lead Type,Tip Conducere
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Creare Ofertă
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Toate aceste articole au fost deja facturate
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Toate aceste articole au fost deja facturate
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Poate fi aprobat/a de către {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condiții Regula de transport maritim
 DocType: BOM Replace Tool,The new BOM after replacement,Noul BOM după înlocuirea
@@ -3021,7 +3036,7 @@ DocType: C-Form,C-Form,Formular-C
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID operațiune nu este setat
 DocType: Production Order,Planned Start Date,Start data planificată
 DocType: Serial No,Creation Document Type,Tip de document creație
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Vizita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Vizita
 DocType: Leave Type,Is Encash,Este încasa
 DocType: Purchase Invoice,Mobile No,Mobil Nu
 DocType: Payment Tool,Make Journal Entry,Asigurați Jurnal intrare
@@ -3029,7 +3044,7 @@ DocType: Leave Allocation,New Leaves Allocated,Frunze noi alocate
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Date proiect-înțelept nu este disponibilă pentru ofertă
 DocType: Project,Expected End Date,Data de Incheiere Preconizata
 DocType: Appraisal Template,Appraisal Template Title,Titlu model expertivă
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Comercial
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Postul părinte {0} nu trebuie să fie un articol stoc
 DocType: Cost Center,Distribution Id,Id distribuție
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicii extraordinare
@@ -3045,14 +3060,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valoare pentru Atribut {0} trebuie să fie în intervalul de {1} la {2} în trepte de {3}
 DocType: Tax Rule,Sales,Vânzări
 DocType: Stock Entry Detail,Basic Amount,Suma de bază
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
+DocType: Leave Allocation,Unused leaves,Frunze neutilizate
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Implicit Conturi creanțe
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Tăierea
 DocType: Tax Rule,Billing State,Stat de facturare
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminare
 DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
 DocType: Authorization Rule,Applicable To (Employee),Aplicabil pentru (angajat)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date este obligatorie
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
@@ -3075,16 +3091,16 @@ DocType: GL Entry,Remarks,Remarci
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Material brut Articol Cod
 DocType: Journal Entry,Write Off Based On,Scrie Off bazat pe
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Înregistrare de instalare pentru un nr de serie
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Înregistrare de instalare pentru un nr de serie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Turnare continuă
-sites/assets/js/erpnext.min.js +10,Please specify a,Vă rugăm să specificați un
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vă rugăm să specificați un
 DocType: Offer Letter,Awaiting Response,Se aşteaptă răspuns
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Sus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionarea rece
 DocType: Salary Slip,Earning & Deduction,Câștig Salarial si Deducere
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Contul {0} nu poate fi un Grup
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regiune
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Opțional. Această setare va fi utilizat pentru a filtra în diverse tranzacții.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opțional. Această setare va fi utilizat pentru a filtra în diverse tranzacții.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativ Rata de evaluare nu este permis
 DocType: Holiday List,Weekly Off,Săptămânal Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","De exemplu, 2012, 2012-13"
@@ -3128,12 +3144,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Lărgire
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Turnare evaporare-model
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Cheltuieli de Divertisment
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factură de vânzări {0} trebuie anulată înainte de a anula această comandă de vânzări
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Vârstă
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factură de vânzări {0} trebuie anulată înainte de a anula această comandă de vânzări
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Vârstă
 DocType: Time Log,Billing Amount,Suma de facturare
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Cantitate nevalidă specificată pentru element {0}. Cantitatea ar trebui să fie mai mare decât 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Cererile de concediu.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Un cont cu tranzacții existente nu poate fi șters
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Un cont cu tranzacții existente nu poate fi șters
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Cheltuieli Juridice
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Zi a lunii în care comanda automat va fi generat de exemplu 05, 28 etc"
 DocType: Sales Invoice,Posting Time,Postarea de timp
@@ -3142,9 +3158,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Bifati dacă doriți sa fortati utilizatorul să selecteze o serie înainte de a salva. Nu va exista nici o valoare implicita dacă se bifeaza aici."""
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Nici un articol cu ​​ordine {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Notificări deschise
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Notificări deschise
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Cheltuieli Directe
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Doriti intr-adevar sa NU OPRITI această Cerere Material?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Noi surse de venit pentru clienți
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Cheltuieli de călătorie
 DocType: Maintenance Visit,Breakdown,Avarie
@@ -3155,7 +3170,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ca pe data
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Finisare
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probă
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Depozitul Implicit este obligatoriu pentru articol din stoc.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Depozitul Implicit este obligatoriu pentru articol din stoc.
 DocType: Feed,Full Name,Nume complet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Concludent
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Plata salariului pentru luna {0} și {1 an}
@@ -3178,7 +3193,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adaugaţi rând
 DocType: Buying Settings,Default Supplier Type,Tip Furnizor Implicit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Cariere
 DocType: Production Order,Total Operating Cost,Cost total de operare
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Toate contactele.
 DocType: Newsletter,Test Email Id,Test de e-mail Id-ul
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviere Companie
@@ -3202,11 +3217,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citate
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol permise pentru a edita stoc congelate
 ,Territory Target Variance Item Group-Wise,Teritoriul țintă Variance Articol Grupa Înțelept
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Toate grupurile de clienți
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Format de impozitare este obligatorie.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Contul {0}: cont părinte {1} nu există
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista de prețuri Rate (Compania de valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} este în starea 'Oprit'
 DocType: Account,Temporary,Temporar
 DocType: Address,Preferred Billing Address,Adresa de facturare preferat
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocarea procent
@@ -3224,13 +3238,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detaliu Taxa Avizata Ar
 DocType: Purchase Order Item,Supplier Quotation,Furnizor ofertă
 DocType: Quotation,In Words will be visible once you save the Quotation.,În cuvinte va fi vizibil după ce salvați citat.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Calcat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} este oprit
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} este oprit
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
 DocType: Lead,Add to calendar on this date,Adăugaţi în calendar la această dată
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reguli pentru a adăuga costurile de transport maritim.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,evenimente viitoare
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,evenimente viitoare
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Clientul este necesar
 DocType: Letter Head,Letter Head,Antet Scrisoare
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Intrarea rapidă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} este obligatorie pentru returnare
 DocType: Purchase Order,To Receive,A Primi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montaj
@@ -3254,25 +3269,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Cel puţin un depozit este obligatoriu
 DocType: Serial No,Out of Warranty,Ieșit din garanție
 DocType: BOM Replace Tool,Replace,Înlocuirea
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Va rugam sa introduceti Unitatea de măsură prestabilită
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Va rugam sa introduceti Unitatea de măsură prestabilită
 DocType: Purchase Invoice Item,Project Name,Denumirea proiectului
 DocType: Supplier,Mention if non-standard receivable account,Mentionati daca non-standard cont de primit
 DocType: Workflow State,Edit,Editare
 DocType: Journal Entry Account,If Income or Expense,In cazul Veniturilor sau Cheltuielilor
 DocType: Features Setup,Item Batch Nos,Lot nr element
 DocType: Stock Ledger Entry,Stock Value Difference,Valoarea Stock Diferența
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Resurse Umane
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Resurse Umane
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliere de plata
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Active fiscale
 DocType: BOM Item,BOM No,Nr. BOM
 DocType: Contact Us Settings,Pincode,Parola așa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal de intrare {0} nu are cont {1} sau deja comparate cu alte voucher
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal de intrare {0} nu are cont {1} sau deja comparate cu alte voucher
 DocType: Item,Moving Average,Mutarea medie
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM care va fi înlocuit
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM trebuie să fie diferit de curent stoc UOM
 DocType: Account,Debit,Debitare
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Concediile trebuie să fie alocate în multipli de 0.5"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Concediile trebuie să fie alocate în multipli de 0.5"""
 DocType: Production Order,Operation Cost,Funcționare cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Încărcați de participare dintr-un fișier csv.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Impresionant Amt
@@ -3280,7 +3295,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Stabile
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Pentru a atribui această problemă, utilizați butonul ""Assign"" în bara laterală."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Blocheaza Stocurile Mai Vechi De [zile]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","În cazul în care două sau mai multe reguli de stabilire a prețurilor sunt găsite bazează pe condițiile de mai sus, se aplică prioritate. Prioritatea este un număr între 0 și 20 în timp ce valoarea implicită este zero (gol). Numărul mai mare înseamnă că va avea prioritate în cazul în care există mai multe norme de stabilire a prețurilor, cu aceleași condiții."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Comparativ facturii
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Anul fiscal: {0} nu există
 DocType: Currency Exchange,To Currency,Pentru a valutar
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permiteţi următorilor utilizatori să aprobe cereri de concediu pentru zile blocate.
@@ -3309,17 +3323,17 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate
 DocType: Stock Entry Detail,Additional Cost,Cost aditional
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data de Incheiere An Financiar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nu se poate filtra pe baza voucher Nr., în cazul gruparii in functie de Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Realizeaza Ofertă Furnizor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Realizeaza Ofertă Furnizor
 DocType: Quality Inspection,Incoming,Primite
 DocType: BOM,Materials Required (Exploded),Materiale necesare (explodat)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduce Câștigul salarial de concediu fără plată (LWP)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Adăugați utilizatori la organizația dvs., altele decât tine"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Concediu Aleator
 DocType: Batch,Batch ID,ID-ul lotului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Notă: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Notă: {0}
 ,Delivery Note Trends,Tendințe Nota de Livrare
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Rezumat această săptămână
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} trebuie sa fie un articol cumpărat sau subcontractat în rândul {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} trebuie sa fie un articol cumpărat sau subcontractat în rândul {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Contul: {0} poate fi actualizat doar prin tranzacții de stoc
 DocType: GL Entry,Party,Grup
 DocType: Sales Order,Delivery Date,Data de Livrare
@@ -3332,7 +3346,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,M
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Rată de cumparare medie
 DocType: Task,Actual Time (in Hours),Timpul efectiv (în ore)
 DocType: Employee,History In Company,Istoric In Companie
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Buletine
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Buletine
 DocType: Address,Shipping,Transport
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stoc Ledger intrare
 DocType: Department,Leave Block List,Lista Concedii Blocate
@@ -3351,7 +3365,7 @@ DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Data de încheiere a perioadei ordin curent
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Face Scrisoare Oferta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Întoarcere
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Unitatea implicit de măsură pentru Variant trebuie să fie aceeași ca șablon
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unitatea implicit de măsură pentru Variant trebuie să fie aceeași ca șablon
 DocType: DocField,Fold,Plia
 DocType: Production Order Operation,Production Order Operation,Producția Comanda Funcționare
 DocType: Pricing Rule,Disable,Dezactivati
@@ -3383,7 +3397,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Rapoarte
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduceți parametru url pentru receptor nos
 DocType: Sales Invoice,Paid Amount,Suma plătită
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Inchiderea Contului {0} trebuie să fie de tip 'Răspundere'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Inchiderea Contului {0} trebuie să fie de tip 'Răspundere'
 ,Available Stock for Packing Items,Stoc disponibil pentru articole destinate împachetării
 DocType: Item Variant,Item Variant,Postul Varianta
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Setarea acestei Format Adresa implicit ca nu exista nici un alt implicit
@@ -3391,7 +3405,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Managementul calității
 DocType: Production Planning Tool,Filter based on customer,Filtru bazat pe client
 DocType: Payment Tool Detail,Against Voucher No,Comparativ voucherului nr
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Va rugam sa introduceti cantitatea pentru postul {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Va rugam sa introduceti cantitatea pentru postul {0}
 DocType: Employee External Work History,Employee External Work History,Istoric Extern Locuri de Munca Angajat
 DocType: Tax Rule,Purchase,Cumpărarea
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Cantitate de bilanţ
@@ -3428,28 +3442,29 @@ Note: BOM = Bill of Materials","Grup agregat de articole ** ** în alt articol *
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Nu serial este obligatorie pentru postul {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Vă rugăm să precizați de la / la gama
-sites/assets/js/desk.min.js +7652,Created By,Creat de
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creat de
 DocType: Serial No,Under AMC,Sub AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Rata de evaluare Articolul este recalculat în vedere aterizat sumă voucher de cost
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Setări implicite pentru tranzacțiile de vânzare.
 DocType: BOM Replace Tool,Current BOM,FDM curent
-sites/assets/js/erpnext.min.js +8,Add Serial No,Adăugaţi Nr. de Serie
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Adăugaţi Nr. de Serie
 DocType: Production Order,Warehouses,Depozite
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimare și staționare
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nod Group
 DocType: Payment Reconciliation,Minimum Amount,Suma minima
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Marfuri actualizare finite
 DocType: Workstation,per hour,pe oră
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Series {0} folosit deja în {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Series {0} folosit deja în {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Contul aferent depozitului (Inventar Permanent) va fi creat in cadrul acest Cont.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depozit nu pot fi șterse ca exista intrare stoc registrul pentru acest depozit.
 DocType: Company,Distribution,Distribuire
-sites/assets/js/erpnext.min.js +50,Amount Paid,Sumă plătită
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Sumă plătită
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Manager de Proiect
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Expediere
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Discount maxim permis pentru articol: {0} este {1}%
 DocType: Customer,Default Taxes and Charges,Impozite și taxe prestabilite
 DocType: Account,Receivable,De încasat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nu este permis să schimbe furnizorul ca Comandă există deja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol care i se permite să prezinte tranzacțiile care depășesc limitele de credit stabilite.
 DocType: Sales Invoice,Supplier Reference,Furnizor de referință
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","In cazul in care se bifeaza, FDM pentru un articol sub-asamblare va fi luat în considerare pentru obținere materii prime. În caz contrar, toate articolele de sub-asamblare vor fi tratate ca si materie primă."
@@ -3486,8 +3501,8 @@ DocType: Email Digest,Add/Remove Recipients,Adăugaţi/Stergeţi Destinatari
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Tranzacție nu este permis împotriva oprit comandă de producție {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pentru a seta acest an fiscal ca implicit, faceți clic pe ""Set as Default"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configurare de server de intrare pentru suport de e-mail id. (De exemplu support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Lipsă Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Lipsă Cantitate
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
 DocType: Salary Slip,Salary Slip,Salariul Slip
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Lustruire
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Până la data' este necesară
@@ -3500,6 +3515,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Atunci când oricare dintre tranzacțiile verificate sunt ""Trimis"", un e-mail de tip pop-up a deschis în mod automat pentru a trimite un e-mail la ""Contact"", asociat în această operațiune, cu tranzacția ca un atașament. Utilizatorul poate sau nu poate trimite e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Setări globale
 DocType: Employee Education,Employee Education,Educație Angajat
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
 DocType: Salary Slip,Net Pay,Plată netă
 DocType: Account,Account,Cont
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Nu {0} a fost deja primit
@@ -3532,7 +3548,7 @@ DocType: BOM,Manufacturing User,Producție de utilizare
 DocType: Purchase Order,Raw Materials Supplied,Materii prime furnizate
 DocType: Purchase Invoice,Recurring Print Format,Recurente Print Format
 DocType: Communication,Series,Serii
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Cumparare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Cumparare
 DocType: Appraisal,Appraisal Template,Model expertiză
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Postul Clasificare
@@ -3588,6 +3604,7 @@ DocType: HR Settings,Payroll Settings,Setări de salarizare
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Potrivesc Facturi non-legate și plăți.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Locul de comandă
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Rădăcină nu poate avea un centru de cost părinte
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selectați Marca ...
 DocType: Sales Invoice,C-Form Applicable,Formular-C aplicabil
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Funcționarea timp trebuie să fie mai mare decât 0 pentru funcționare {0}
 DocType: Supplier,Address and Contacts,Adresa si contact
@@ -3598,7 +3615,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Ia restante Tichete
 DocType: Warranty Claim,Resolved By,Rezolvat prin
 DocType: Appraisal,Start Date,Data începerii
-sites/assets/js/desk.min.js +7629,Value,Valoare
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valoare
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alocaţi concedii pentru o perioadă.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Click aici pentru a verifica
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Contul {0}: nu puteți atribui contului în sine calitatea de cont părinte
@@ -3614,14 +3631,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Acces Dropbox Permis
 DocType: Dropbox Backup,Weekly,Săptămânal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,De exemplu. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Primi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Primi
 DocType: Maintenance Visit,Fully Completed,Completat in Intregime
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complet
 DocType: Employee,Educational Qualification,Detalii Calificare de Învățământ
 DocType: Workstation,Operating Costs,Costuri de operare
 DocType: Employee Leave Approver,Employee Leave Approver,Aprobator Concediu Angajat
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} a fost adăugat cu succes la lista noastră Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron prelucrare cu fascicul
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Cumpărare Maestru de Management
@@ -3634,7 +3651,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Adăugați / editați preturi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafic Centre de Cost
 ,Requested Items To Be Ordered,Elemente solicitate să fie comandate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Comenzile mele
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Comenzile mele
 DocType: Price List,Price List Name,Lista de prețuri Nume
 DocType: Time Log,For Manufacturing,Pentru Producție
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaluri
@@ -3645,7 +3662,7 @@ DocType: Account,Income,Venit
 DocType: Industry Type,Industry Type,Industrie Tip
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Ceva a mers prost!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Atenție: Lăsați aplicație conține următoarele date de bloc
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Finalizare
 DocType: Purchase Invoice Item,Amount (Company Currency),Sumă (monedă companie)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Turnarea
@@ -3659,10 +3676,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,An
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Punctul de vânzare profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Vă rugăm să actualizați Setări SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Timp Log {0} deja facturat
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Timp Log {0} deja facturat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Creditele negarantate
 DocType: Cost Center,Cost Center Name,Nume Centrul de Cost
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Articolul {0} cu Nr. de Serie {1} este deja instalat
 DocType: Maintenance Schedule Detail,Scheduled Date,Data programată
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total plătit Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesaje mai mari de 160 de caractere vor fi împărțite în mai multe mesaje
@@ -3670,10 +3686,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Primite și acceptate
 ,Serial No Service Contract Expiry,Serial Nu Service Contract de expirare
 DocType: Item,Unit of Measure Conversion,Unitate de măsură de conversie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Angajat nu poate fi schimbat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,"Nu puteți credit și de debit același cont, în același timp,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Nu puteți credit și de debit același cont, în același timp,"
 DocType: Naming Series,Help HTML,Ajutor HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Alocație mai mare decât -{0} anulată pentru articolul {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Alocație mai mare decât -{0} anulată pentru articolul {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nume de persoană sau organizație care această adresă aparține.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Furnizorii dumneavoastră
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
@@ -3684,10 +3700,11 @@ DocType: Lead,Converted,Transformat
 DocType: Item,Has Serial No,Are nr. de serie
 DocType: Employee,Date of Issue,Data Problemei
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: de la {0} pentru {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
 DocType: Issue,Content Type,Tip Conținut
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Listeaza acest articol in grupuri multiple de pe site-ul.\
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Vă rugăm să verificați Multi opțiune de valuta pentru a permite conturi cu altă valută
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Vă rugăm să verificați Multi opțiune de valuta pentru a permite conturi cu altă valută
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Postul: {0} nu există în sistemul
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nu esti autorizat pentru a configura valoarea Congelat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ia nereconciliate Entries
@@ -3698,14 +3715,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Pentru Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Contul {0} a fost introdus de mai multe ori pentru anul fiscal {1}
 ,Average Commission Rate,Rată de comision medie
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Are numarul de serie' nu poate fi 'Da' pentru articolele care nu sunt in stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Are numarul de serie' nu poate fi 'Da' pentru articolele care nu sunt in stoc
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
 DocType: Pricing Rule,Pricing Rule Help,Regula de stabilire a prețurilor de ajutor
 DocType: Purchase Taxes and Charges,Account Head,Titularul Contului
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualizati costuri suplimentare pentru a calcula costul aterizat de articole
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Electric
 DocType: Stock Entry,Total Value Difference (Out - In),Diferența Valoarea totală (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate este obligatorie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate este obligatorie
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID-ul de utilizator nu este setat pentru Angajat {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Prelucrare stropire
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De la garanție revendicarea
@@ -3719,15 +3736,17 @@ DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
 DocType: User,Enabled,Activat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Active stoc
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Doriti intr-adevar sa introduceti toti Fluturasii de Salar pentru luna {0} și anul {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Doriti intr-adevar sa introduceti toti Fluturasii de Salar pentru luna {0} și anul {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Abonații de import
 DocType: Target Detail,Target Qty,Țintă Cantitate
 DocType: Attendance,Present,Prezenta
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Livrare {0} nu trebuie sa fie introdusa
 DocType: Notification Control,Sales Invoice Message,Factură de vânzări Mesaj
 DocType: Authorization Rule,Based On,Bazat pe
-,Ordered Qty,Ordonat Cantitate
+DocType: Sales Order Item,Ordered Qty,Ordonat Cantitate
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Postul {0} este dezactivat
 DocType: Stock Settings,Stock Frozen Upto,Stoc Frozen Până la
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Perioada de la si perioadă la datele obligatorii pentru recurente {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitatea de proiect / sarcină.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generează fluturașe de salariu
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nu este un id de email valid
@@ -3767,7 +3786,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Încărcați Spectatori
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM și cantitatea de producție sunt necesare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Clasă de uzură 2
-DocType: Journal Entry Account,Amount,Sumă
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Sumă
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nituire
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM înlocuit
 ,Sales Analytics,Analytics de vânzare
@@ -3794,7 +3813,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data Preconizata nu poate fi anterioara Datei Cererii de Materiale
 DocType: Contact Us Settings,City,Oraș
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Prelucrare cu ultrasunete
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Eroare: Nu a id valid?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Eroare: Nu a id valid?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Articolul {0} trebuie să fie un Articol de Vânzări
 DocType: Naming Series,Update Series Number,Actualizare Serii Număr
 DocType: Account,Equity,Echitate
@@ -3809,7 +3828,7 @@ DocType: Purchase Taxes and Charges,Actual,Efectiv
 DocType: Authorization Rule,Customerwise Discount,Reducere Client
 DocType: Purchase Invoice,Against Expense Account,Comparativ contului de cheltuieli
 DocType: Production Order,Production Order,Număr Comandă Producţie:
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
 DocType: Quotation Item,Against Docname,Comparativ denumirii documentului
 DocType: SMS Center,All Employee (Active),Toți angajații (activi)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vizualizează acum
@@ -3817,14 +3836,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Materie primă Cost
 DocType: Item,Re-Order Level,Nivelul de re-comandă
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduceti articole și cant planificată pentru care doriți să intocmiti ordine de producție sau sa descărcati materii prime pentru analiză.
-sites/assets/js/list.min.js +174,Gantt Chart,Diagrama Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Listă de concedii aplicabile
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seria Actualizat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tip de raport este obligatorie
 DocType: Item,Serial Number Series,Serial Number Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Depozit este obligatorie pentru stocul de postul {0} în rândul {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Depozit este obligatorie pentru stocul de postul {0} în rândul {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Primul Răspuns la
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Crucea Listarea de punctul în mai multe grupuri
@@ -3839,7 +3858,7 @@ DocType: Attendance,Attendance,Prezență
 DocType: Page,No,Nu
 DocType: BOM,Materials,Materiale
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","In cazul in care este debifat, lista va trebui să fie adăugata fiecarui Departament unde trebuie sa fie aplicată."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Data postării și postarea de timp este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Data postării și postarea de timp este obligatorie
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Șablon taxa pentru tranzacțiilor de cumpărare.
 ,Item Prices,Preturi Articol
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,În cuvinte va fi vizibil după ce a salva Ordinul de cumparare.
@@ -3859,9 +3878,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Cheltuieli administrative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consilia
 DocType: Customer Group,Parent Customer Group,Părinte Client Group
-sites/assets/js/erpnext.min.js +50,Change,Schimbare
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Schimbare
 DocType: Purchase Invoice,Contact Email,Email Persoana de Contact
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',"Achiziția comandă {0} este ""Oprit"""
 DocType: Appraisal Goal,Score Earned,Scor Earned
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","de exemplu ""My Company LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Perioada De Preaviz
@@ -3871,12 +3889,13 @@ DocType: Packing Slip,Gross Weight UOM,Greutate Brută UOM
 DocType: Email Digest,Receivables / Payables,Creanțe / Datorii
 DocType: Delivery Note Item,Against Sales Invoice,Comparativ facturii de vânzări
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Ștanțare
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Cont de credit
 DocType: Landed Cost Item,Landed Cost Item,Cost Final Articol 
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Afiseaza valorile nule
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantitatea de produs obținut după fabricarea / reambalare de la cantități date de materii prime
 DocType: Payment Reconciliation,Receivable / Payable Account,De încasat de cont / de plătit
 DocType: Delivery Note Item,Against Sales Order Item,Comparativ articolului comenzii de vânzări
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
 DocType: Item,Default Warehouse,Depozit Implicit
 DocType: Task,Actual End Date (via Time Logs),Dată efectivă de sfârşit (prin Jurnale de Timp)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Buget nu pot fi atribuite în Grupa Contul {0}
@@ -3890,7 +3909,7 @@ DocType: Issue,Support Team,Echipa de Suport
 DocType: Appraisal,Total Score (Out of 5),Scor total (din 5)
 DocType: Contact Us Settings,State,Stat
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Bilanţ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Bilanţ
 DocType: Project,Total Expense Claim (via Expense Claims),Revendicarea Total cheltuieli (prin formularele de decont)
 DocType: User,Gender,Sex
 DocType: Journal Entry,Debit Note,Nota de Debit
@@ -3906,9 +3925,8 @@ DocType: Lead,Blog Subscriber,Abonat blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Creare reguli pentru restricționare tranzacții bazate pe valori.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","In cazul in care se bifeaza, nr. total de zile lucratoare va include si sarbatorile, iar acest lucru va reduce valoarea Salariul pe Zi"
 DocType: Purchase Invoice,Total Advance,Total de Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Unstop Material Cerere
 DocType: Workflow State,User,Utilizator
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Prelucrare de salarizare
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Prelucrare de salarizare
 DocType: Opportunity Item,Basic Rate,Rată elementară
 DocType: GL Entry,Credit Amount,Suma de credit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Setați ca Lost
@@ -3916,7 +3934,7 @@ DocType: Customer,Credit Days Based On,Zile de credit pe baza
 DocType: Tax Rule,Tax Rule,Regula de impozitare
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Menține Aceeași Rată in Cursul Ciclului de Vânzări
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planificați busteni de timp în afara orelor de lucru de lucru.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} a fost deja introdus
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} a fost deja introdus
 ,Items To Be Requested,Articole care vor fi solicitate
 DocType: Purchase Order,Get Last Purchase Rate,Obtine Ultima Rate de Cumparare
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Rata de facturare bazat pe activitatea de tip (pe oră)
@@ -3925,6 +3943,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID-ul de e-mail al Companiei nu a fost găsit, prin urmare, e-mail nu a fost trimis"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicţie a fondurilor (active)
 DocType: Production Planning Tool,Filter based on item,Filtru bazata pe articol
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Contul debit
 DocType: Fiscal Year,Year Start Date,An Data începerii
 DocType: Attendance,Employee Name,Nume angajat
 DocType: Sales Invoice,Rounded Total (Company Currency),Rotunjite total (Compania de valuta)
@@ -3936,14 +3955,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Înnegrire
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficiile angajatului
 DocType: Sales Invoice,Is POS,Este POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
 DocType: Production Order,Manufactured Qty,Produs Cantitate
 DocType: Purchase Receipt Item,Accepted Quantity,Cantitatea Acceptata
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nu există
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Facturi cu valoarea ridicată pentru clienți.
 DocType: DocField,Default,Implicit
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id-ul proiectului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonați adăugați
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definirea Bugetul pentru acest centru de cost. Pentru a seta o acțiune buget, consultați "Lista Firme""
@@ -3951,7 +3970,7 @@ DocType: Account,Parent Account,Contul părinte
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Butuc
 DocType: GL Entry,Voucher Type,Tip Voucher
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
 DocType: Expense Claim,Approved,Aprobat
 DocType: Pricing Rule,Price,Preț
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
@@ -3960,22 +3979,24 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Educație
 DocType: Selling Settings,Campaign Naming By,Campanie denumita de
 DocType: Employee,Current Address Is,Adresa Actuală Este
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opțional. Setează implicit moneda companiei, în cazul în care nu este specificat."
 DocType: Address,Office,Birou
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Rapoarte standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Inregistrari contabile de jurnal.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
+DocType: Delivery Note Item,Available Qty at From Warehouse,Cantitate Disponibil la Depozitul
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Pentru a crea un cont fiscală
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
 DocType: Account,Stock,Stoc
 DocType: Employee,Current Address,Adresa actuală
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Dacă elementul este o variantă de un alt element atunci descriere, imagine, de stabilire a prețurilor, impozite etc vor fi stabilite de șablon dacă nu se specifică în mod explicit"
 DocType: Serial No,Purchase / Manufacture Details,Detalii de cumpărare / Fabricarea
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Lot Inventarul
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Lot Inventarul
 DocType: Employee,Contract End Date,Data de Incheiere Contract
 DocType: Sales Order,Track this Sales Order against any Project,Urmareste acest Ordin de vânzări față de orice proiect
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Trage comenzi de vânzări (în curs de a livra), pe baza criteriilor de mai sus"
 DocType: DocShare,Document Type,Tip Document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Din Furnizor de Ofertă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Din Furnizor de Ofertă
 DocType: Deduction Type,Deduction Type,Tip Deducerea
 DocType: Attendance,Half Day,Jumătate de zi
 DocType: Pricing Rule,Min Qty,Min Cantitate
@@ -3986,20 +4007,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pentru Cantitate (fabricat Cant) este obligatorie
 DocType: Stock Entry,Default Target Warehouse,Depozit Tinta Implicit
 DocType: Purchase Invoice,Net Total (Company Currency),Net total (Compania de valuta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partidul Tip și Partidul se aplică numai împotriva creanțe / cont de plati
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partidul Tip și Partidul se aplică numai împotriva creanțe / cont de plati
 DocType: Notification Control,Purchase Receipt Message,Primirea de cumpărare Mesaj
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total frunze alocate sunt mai mult decât perioada de
 DocType: Production Order,Actual Start Date,Dată Efectivă de Început
 DocType: Sales Order,% of materials delivered against this Sales Order,% din materialele livrate comparativ cu această comandă de vânzări
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Mișcare element înregistrare.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Mișcare element înregistrare.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Listă Abonat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortezat
 DocType: Email Account,Service,Servicii
 DocType: Hub Settings,Hub Settings,Setări Hub
 DocType: Project,Gross Margin %,Marja Bruta%
 DocType: BOM,With Operations,Cu Operațiuni
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Înregistrări contabile au fost deja efectuate în valută {0} pentru compania {1}. Vă rugăm să selectați un cont de primit sau de plătit cu moneda {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Înregistrări contabile au fost deja efectuate în valută {0} pentru compania {1}. Vă rugăm să selectați un cont de primit sau de plătit cu moneda {0}.
 ,Monthly Salary Register,Salariul lunar Inregistrare
-apps/frappe/frappe/website/template.py +123,Next,Următor
+apps/frappe/frappe/website/template.py +140,Next,Următor
 DocType: Warranty Claim,If different than customer address,In cazul in care difera de adresa clientului
 DocType: BOM Operation,BOM Operation,Operațiune BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electrochimică
@@ -4030,6 +4052,7 @@ DocType: Purchase Invoice,Next Date,Data viitoare
 DocType: Employee Education,Major/Optional Subjects,Subiecte Majore / Opționale
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Va rugam sa introduceti impozite și taxe
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Prelucrare
+DocType: Sales Invoice Item,Drop Ship,Drop navelor
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aici puteți stoca detalii despre familie, cum ar fi numele și ocupația parintelui, sotului/sotiei și copiilor"
 DocType: Hub Settings,Seller Name,Nume vânzător
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impozite și taxe deduse (Compania de valuta)
@@ -4056,29 +4079,29 @@ DocType: Purchase Order,To Receive and Bill,Pentru a primi și Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Proiectant
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termeni și condiții Format
 DocType: Serial No,Delivery Details,Detalii Livrare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crea automat Material Cerere dacă cantitate scade sub acest nivel
 ,Item-wise Purchase Register,Registru Achizitii Articol-Avizat
 DocType: Batch,Expiry Date,Data expirării
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pentru a seta nivelul de reordona, element trebuie să fie un articol de cumparare sau de fabricație Postul"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pentru a seta nivelul de reordona, element trebuie să fie un articol de cumparare sau de fabricație Postul"
 ,Supplier Addresses and Contacts,Adrese furnizorului și de Contacte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vă rugăm să selectați categoria întâi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Maestru proiect.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nu afisa nici un simbol de genul $ etc alături de valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Jumatate de zi)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Jumatate de zi)
 DocType: Supplier,Credit Days,Zile de Credit
 DocType: Leave Type,Is Carry Forward,Este Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Obține articole din FDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obține articole din FDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Timpul in Zile Conducere
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Proiect de lege de materiale
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {1}
 DocType: Dropbox Backup,Send Notifications To,Trimite notificări
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motiv pentru Lăsând
 DocType: Expense Claim Detail,Sanctioned Amount,Sancționate Suma
 DocType: GL Entry,Is Opening,Se deschide
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Contul {0} nu există
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Contul {0} nu există
 DocType: Account,Cash,Numerar
 DocType: Employee,Short biography for website and other publications.,Scurta biografie pentru site-ul web și alte publicații.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Vă rugăm să creați Structura Salariul pentru angajat {0}
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 14837b83e1..04f15c155c 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Режим Зарплата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Выберите ежемесячное распределение, если вы хотите, чтобы отслеживать на основе сезонности."
 DocType: Employee,Divorced,Разведенный
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Внимание: То же пункт был введен несколько раз.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Внимание: То же пункт был введен несколько раз.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Элементы уже синхронизированы
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Разрешить пункт будет добавлен несколько раз в сделке
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Отменить Материал Визит {0} до отмены этой претензии по гарантийным обязательствам
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Уплотнение плюс спекания
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Валюта необходима для Прейскурантом {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Будет рассчитана в сделке.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Из материалов запрос
+DocType: Purchase Order,Customer Contact,Контакты с клиентами
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Из материалов запрос
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дерево
 DocType: Job Applicant,Job Applicant,Соискатель работы
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нет больше результатов.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Наименование заказчика
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Все экспорт смежных областях, как валюты, обменный курс, экспорт Количество, экспорт общего итога и т.д. доступны в накладной, POS, цитаты, счет-фактура, заказ клиента и т.д."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (или группы), против которого бухгалтерских проводок производится и остатки сохраняются."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ({1})
 DocType: Manufacturing Settings,Default 10 mins,По умолчанию 10 минут
 DocType: Leave Type,Leave Type Name,Оставьте Тип Название
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серия Обновлено Успешно
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Несколько цены товар
 DocType: SMS Center,All Supplier Contact,Все поставщиком Связаться
 DocType: Quality Inspection Reading,Parameter,Параметр
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Ожидаемая Дата окончания не может быть меньше, чем ожидалось Дата начала"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Есть действительно хотите откупоривать производственный заказ:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: цена должна быть такой же, как {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Новый Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Новый Оставить заявку
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банковский счет
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Используйте данную опцию для поддержания клиентско-удобных кодов и для возможности удобного поиска по ним
 DocType: Mode of Payment Account,Mode of Payment Account,Форма оплаты счета
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Показат
 DocType: Sales Invoice Item,Quantity,Количество
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредиты (обязательства)
 DocType: Employee Education,Year of Passing,Год Passing
-sites/assets/js/erpnext.min.js +27,In Stock,В Наличии
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Могу только осуществить платеж против незаконченного фактурного ордена продаж
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличии
 DocType: Designation,Designation,Назначение
 DocType: Production Plan Item,Production Plan Item,Производственный план Пункт
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен сотрудником {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Создайте новый POS профиля
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Здравоохранение
 DocType: Purchase Invoice,Monthly,Ежемесячно
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Счет-фактура
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Задержка в оплате (дни)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Счет-фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичность
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Адрес Электронной Почты
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Оборона
 DocType: Company,Abbr,Аббревиатура
 DocType: Appraisal Goal,Score (0-5),Оценка (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не соответствует {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не соответствует {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ряд # {0}:
 DocType: Delivery Note,Vehicle No,Автомобиль №
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Пожалуйста, выберите прайс-лист"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Пожалуйста, выберите прайс-лист"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Деревообрабатывающий
 DocType: Production Order Operation,Work In Progress,Работа продолжается
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-печать
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Родитель Деталь DOCNAME
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Открытие на работу.
 DocType: Item Attribute,Increment,Приращение
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Выберите Склад ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Реклама
 DocType: Employee,Married,Замужем
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,Согласовать
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Продуктовый
 DocType: Quality Inspection Reading,Reading 1,Чтение 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Сделать Банк Стажер
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Сделать Банк Стажер
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пенсионные фонды
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Склад является обязательным, если тип учетной записи: Склад"
 DocType: SMS Center,All Sales Person,Все менеджеры по продажам
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Списание МВЗ
 DocType: Warehouse,Warehouse Detail,Склад Подробно
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Кредитный лимит был перейден для клиента {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Налоги Тип
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},"Вы не авторизованы, чтобы добавить или обновить записи до {0}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},"Вы не авторизованы, чтобы добавить или обновить записи до {0}"
 DocType: Item,Item Image (if not slideshow),Пункт изображения (если не слайд-шоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существует клиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Почасовая Ставка / 60) * Фактическая время работы
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Гость
 DocType: Quality Inspection,Get Specification Details,Получить спецификации подробно
 DocType: Lead,Interested,Заинтересованный
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Накладная на материалы
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Открытие
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Открытие
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},От {0} до {1}
 DocType: Item,Copy From Item Group,Скопируйте Из группы товаров
 DocType: Journal Entry,Opening Entry,Открытие запись
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Product Enquiry
 DocType: Standard Reply,Owner,Владелец
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Пожалуйста, введите компанию первой"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Пожалуйста, выберите КОМПАНИЯ Первый"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Пожалуйста, выберите КОМПАНИЯ Первый"
 DocType: Employee Education,Under Graduate,Под Выпускник
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Целевая На
 DocType: BOM,Total Cost,Общая стоимость
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Потребляемый
 DocType: Upload Attendance,Import Log,Лог импорта
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Отправить
+DocType: Sales Invoice Item,Delivered By Supplier,Поставляется Поставщиком
 DocType: SMS Center,All Contact,Все Связаться
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годовой оклад
 DocType: Period Closing Voucher,Closing Fiscal Year,Закрытие финансового года
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra запись
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Показать журналы Время
 DocType: Journal Entry Account,Credit in Company Currency,Кредит в валюте компании
 DocType: Delivery Note,Installation Status,Состояние установки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
 DocType: Item,Supply Raw Materials for Purchase,Поставка сырья для покупки
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Пункт {0} должен быть Покупка товара
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Скачать шаблон, заполнить соответствующие данные и приложить измененный файл.
  Все даты и сотрудник сочетание в выбранный период придет в шаблоне, с существующими посещаемости"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Будет обновлена после Расходная накладная представляется.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,SMS центр
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Выпрямление
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Введите парам
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Правила применения цен и скидки.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},На этот раз зарегистрируйтесь конфликты с {0} для {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист должен быть применим для покупки или продажи
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Дата установки не может быть до даты доставки для Пункт {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Дата установки не может быть до даты доставки для Пункт {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Скидка на Прайс-лист ставка (%)
-sites/assets/js/form.min.js +279,Start,Начать
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Начать
 DocType: User,First Name,Имя
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Ваша установка завершена. Обновление.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Литье Полное формы
 DocType: Offer Letter,Select Terms and Conditions,Выберите Сроки и условия
 DocType: Production Planning Tool,Sales Orders,Заказы
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,На накладная Пункт
 ,Production Orders in Progress,Производственные заказы в Прогресс
 DocType: Lead,Address & Contact,Адрес и контакт
+DocType: Leave Allocation,Add unused leaves from previous allocations,Добавить неиспользуемые листья от предыдущих ассигнований
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следующая Периодическая {0} будет создан на {1}
 DocType: Newsletter List,Total Subscribers,Всего Подписчики
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Имя Контакта
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,ТАК В ожидании Кол-
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создает ведомость расчета зарплаты за вышеуказанные критерии.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Запрос на покупку.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двухместный жилья
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Листья в год
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Пожалуйста, установите именования серия для {0} через Setup> Настройки> именования серии"
 DocType: Time Log,Will be updated when batched.,Будет обновляться при пакетном.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Пожалуйста, проверьте 'Как Advance ""против счета {1}, если это заранее запись."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Пожалуйста, проверьте 'Как Advance ""против счета {1}, если это заранее запись."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Склад {0} не принадлежит компания {1}
 DocType: Bulk Email,Message,Сообщение
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Спецификация
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Ключ доступа
 DocType: Payment Tool,Reference No,Ссылка Нет
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Оставьте Заблокированные
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,За год
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирение товара
 DocType: Stock Entry,Sales Invoice No,Счет Продажи Нет
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Минимальное количество за
 DocType: Pricing Rule,Supplier Type,Тип поставщика
 DocType: Item,Publish in Hub,Опубликовать в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Заказ материалов
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Заказ материалов
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
 DocType: Item,Purchase Details,Покупка Подробности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} не найден в "давальческое сырье" таблицы в Заказе {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Контроль Уведом
 DocType: Lead,Suggestions,Предложения
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Установите группу товаров стрелке бюджеты на этой территории. Вы можете также включить сезонность, установив распределение."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Пожалуйста, введите родительскую группу счета для склада {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата с {0} {1} не может быть больше, чем суммы задолженности {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата с {0} {1} не может быть больше, чем суммы задолженности {2}"
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Мобильный номер
 DocType: Maintenance Schedule,Generate Schedule,Создать расписание
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Новый фонда UOM
 DocType: Period Closing Voucher,Closing Account Head,Закрытие счета руководитель
 DocType: Employee,External Work History,Внешний Работа История
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циклическая ссылка Ошибка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,"Вы действительно хотите, чтобы остановить"
 DocType: Communication,Closed,Закрыт
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,В Слов (Экспорт) будут видны только вы сохраните накладной.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Вы уверены, что хотите, чтобы остановить"
 DocType: Lead,Industry,Промышленность
 DocType: Employee,Job Profile,Профиль работы
 DocType: Newsletter,Newsletter,Рассылка новостей
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,· Отметки о доставке
 DocType: Dropbox Backup,Allow Dropbox Access,Разрешить Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Настройка Налоги
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} вводится дважды в пункт налог
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} вводится дважды в пункт налог
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме на этой неделе и в ожидании деятельности
 DocType: Workstation,Rent Cost,Стоимость аренды
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Пожалуйста, выберите месяц и год"
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Скорость, с которой Заказчик валют преобразуется в базовой валюте клиента"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступный в спецификации, накладной, счете-фактуре, производственного заказа, заказа на поставку, покупка получение, счет-фактура, заказ клиента, фондовой въезда, расписания"
 DocType: Item Tax,Tax Rate,Размер налога
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Выбрать пункт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Выбрать пункт
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Пункт: {0} удалось порционно, не могут быть согласованы с помощью \
  со примирения, вместо этого использовать со запись"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетное Нет должно быть таким же, как {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Преобразовать в негрупповой
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Покупка Получение должны быть представлены
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Наличие на скл
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Партия элементов.
 DocType: C-Form Invoice Detail,Invoice Date,Дата выставления счета
 DocType: GL Entry,Debit Amount,Дебет Сумма
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваш адрес электронной почты
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Пожалуйста, см. приложение"
 DocType: Purchase Order,% Received,% Получено
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Проверено
 DocType: Maintenance Visit,Maintenance Type,Тип технического обслуживания
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Серийный номер {0} не принадлежит накладной {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Серийный номер {0} не принадлежит накладной {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Пункт Контроль качества Параметр
 DocType: Leave Application,Leave Approver Name,Оставить Имя утверждающего
 ,Schedule Date,Дата планирования
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Покупка Становиться на учет
 DocType: Landed Cost Item,Applicable Charges,Взимаемых платежах
 DocType: Workstation,Consumable Cost,Расходные Стоимость
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Подтверждающего Отсутствие"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Подтверждающего Отсутствие"""
 DocType: Purchase Receipt,Vehicle Date,Дата
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина потери
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% Установлено
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Пожалуйста, введите название компании сначала"
 DocType: BOM,Item Desription,Пункт Desription
 DocType: Purchase Invoice,Supplier Name,Наименование поставщика
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитайте руководство ERPNext
 DocType: Account,Is Group,Является Группа
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматически указан серийный пп на основе FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверьте Поставщик Номер счета Уникальность
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Мастер Ме
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобальные настройки для всех производственных процессов.
 DocType: Accounts Settings,Accounts Frozen Upto,Счета заморожены До
 DocType: SMS Log,Sent On,Направлено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбрано несколько раз в таблице атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбрано несколько раз в таблице атрибутов
 DocType: Sales Order,Not Applicable,Не применяется
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Мастер отдыха.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell литье
 DocType: Material Request Item,Required Date,Требуется Дата
 DocType: Delivery Note,Billing Address,Адрес для выставления счетов
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Пожалуйста, введите Код товара."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Пожалуйста, введите Код товара."
 DocType: BOM,Costing,Стоимость
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Если флажок установлен, сумма налога будет считаться уже включены в Печать Оценить / Количество печати"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Всего Кол-во
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Время м
 DocType: Customer,Buyer of Goods and Services.,Покупатель товаров и услуг.
 DocType: Journal Entry,Accounts Payable,Счета к оплате
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Добавить Подписчики
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" не существует"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" не существует"
 DocType: Pricing Rule,Valid Upto,Действительно До
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Перечислите несколько ваших клиентов. Они могут быть организации или частные лица.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Прямая прибыль
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не можете фильтровать на основе счета, если сгруппированы по Счет"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Администратор
 DocType: Payment Tool,Received Or Paid,Полученные или уплаченные
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Пожалуйста, выберите компанию"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Пожалуйста, выберите компанию"
 DocType: Stock Entry,Difference Account,Счет разницы
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Невозможно закрыть задача, как ее зависит задача {0} не закрыт."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
 DocType: Production Order,Additional Operating Cost,Дополнительные Эксплуатационные расходы
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Косметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
 DocType: Communication,Subject,Тема
 DocType: Shipping Rule,Net Weight,Вес нетто
 DocType: Employee,Emergency Phone,В случае чрезвычайных ситуаций
 ,Serial No Warranty Expiry,не Серийный Нет Гарантия Срок
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,"Вы действительно хотите, чтобы остановить эту запросу материал?"
 DocType: Sales Order,To Deliver,Доставлять
 DocType: Purchase Invoice Item,Item,Элемент
 DocType: Journal Entry,Difference (Dr - Cr),Отличия (д-р - Cr)
 DocType: Account,Profit and Loss,Прибыль и убытки
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Управление субподряда
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управление субподряда
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Новая единица измерения НЕ должна быть целочисленной
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Мебель и приспособления
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Скорость, с которой Прайс-лист валюта конвертируется в базовую валюту компании"
@@ -489,7 +489,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавить / Изм
 DocType: Purchase Invoice,Supplier Invoice No,Поставщик Счет Нет
 DocType: Territory,For reference,Для справки
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не удается удалить Серийный номер {0}, так как он используется в сделках с акциями"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Закрытие (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Закрытие (Cr)
 DocType: Serial No,Warranty Period (Days),Гарантийный срок (дней)
 DocType: Installation Note Item,Installation Note Item,Установка Примечание Пункт
 ,Pending Qty,В ожидании Кол-во
@@ -523,8 +523,9 @@ DocType: Sales Order,Billing and Delivery Status,Биллинг и достав
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постоянных клиентов
 DocType: Leave Control Panel,Allocate,Выделить
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Предыдущая
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Продажи Вернуться
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажи Вернуться
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Выберите Заказы из которого вы хотите создать производственных заказов.
+DocType: Item,Delivered by Supplier (Drop Ship),Поставляется Поставщиком (Drop кораблей)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Зарплата компоненты.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База данных потенциальных клиентов.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,База данных клиентов.
@@ -535,7 +536,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Акробатика
 DocType: Purchase Order Item,Billed Amt,Счетов выдано кол-во
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логика Склада,по которому сделаны складские записи"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Event,Wednesday,Среда
 DocType: Sales Invoice,Customer's Vendor,Производитель Клиентам
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Заказ продукции является обязательным
@@ -568,8 +569,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Приемник Параметр
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основании"" и ""Группировка по"" не могут быть одинаковыми"
 DocType: Sales Person,Sales Person Targets,Менеджера по продажам Цели
-sites/assets/js/form.min.js +271,To,для
-apps/frappe/frappe/templates/base.html +143,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,для
+apps/frappe/frappe/templates/base.html +145,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Конец трубки формирования
 DocType: Production Order Operation,In minutes,Через несколько минут
 DocType: Issue,Resolution Date,Разрешение Дата
@@ -586,7 +587,7 @@ DocType: Activity Cost,Projects User,Проекты Пользователь
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Потребляемая
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0} {1} не найден в  таблице счета
 DocType: Company,Round Off Cost Center,Округление Стоимость центр
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
 DocType: Material Request,Material Transfer,О передаче материала
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Открытие (д-р)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Средняя отметка должна быть после {0}
@@ -594,9 +595,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Настройки
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Стоимость Налоги и сборы
 DocType: Production Order Operation,Actual Start Time,Фактическое начало Время
 DocType: BOM Operation,Operation Time,Время работы
-sites/assets/js/list.min.js +5,More,Далее
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Далее
 DocType: Pricing Rule,Sales Manager,Менеджер По Продажам
-sites/assets/js/desk.min.js +7673,Rename,Переименовать
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Переименовать
 DocType: Journal Entry,Write Off Amount,Списание Количество
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Изгиб
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Разрешить пользователю
@@ -612,13 +613,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Прямо ножницы
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Чтобы отслеживать пункт в купли-продажи документов по их серийных NOS. Это также может использоваться для отслеживания гарантийные детали продукта.
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличие на складе
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Отклонен Склад является обязательным против regected пункта
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Отклонен Склад является обязательным против regected пункта
 DocType: Account,Expenses Included In Valuation,"Затрат, включаемых в оценке"
 DocType: Employee,Provide email id registered in company,Обеспечить электронный идентификатор зарегистрирован в компании
 DocType: Hub Settings,Seller City,Продавец Город
 DocType: Email Digest,Next email will be sent on:,Следующее письмо будет отправлено на:
 DocType: Offer Letter Term,Offer Letter Term,Предложение Письмо срок
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Пункт имеет варианты.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Пункт имеет варианты.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Стоимость акций
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
@@ -633,11 +634,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Добро пожаловать
 DocType: Journal Entry,Credit Card Entry,Вступление Кредитная карта
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Тема Задача
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,"Товары, полученные от поставщиков."
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Товары, полученные от поставщиков."
 DocType: Communication,Open,Открыт
 DocType: Lead,Campaign Name,Название кампании
 ,Reserved,Зарезервировано
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,"Вы действительно хотите, чтобы откупоривать"
 DocType: Purchase Order,Supply Raw Materials,Поставка сырья
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Дата, на которую будет генерироваться следующий счет-фактура. Он создается на форму."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Оборотные активы
@@ -653,7 +653,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Клиентам Заказ Нет
 DocType: Employee,Cell Number,Количество звонков
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Поражений
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Вы не можете ввести текущий ваучер в «Против Запись в журнале 'колонке
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вы не можете ввести текущий ваучер в «Против Запись в журнале 'колонке
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Энергоэффективность
 DocType: Opportunity,Opportunity From,Возможность От
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Ежемесячная выписка зарплата.
@@ -722,7 +722,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Ответственность сторон
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкционированный сумма не может быть больше, чем претензии Сумма в строке {0}."
 DocType: Company,Default Cost of Goods Sold Account,По умолчанию Себестоимость проданных товаров счет
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Прайс-лист не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Семья Фон
 DocType: Process Payroll,Send Email,Отправить e-mail
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Нет разрешения
@@ -733,7 +733,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,кол-в
 DocType: Item,Items with higher weightage will be shown higher,"Элементы с более высокой weightage будет показано выше,"
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банковская сверка подробно
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Мои Счета
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Сотрудник не найден
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Сотрудник не найден
 DocType: Purchase Order,Stopped,Приостановлено
 DocType: Item,If subcontracted to a vendor,Если по субподряду поставщика
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,"Выберите спецификацию, чтобы начать"
@@ -742,7 +742,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Загр
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Отправить Сейчас
 ,Support Analytics,Поддержка Аналитика
 DocType: Item,Website Warehouse,Сайт Склад
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,"Вы действительно хотите, чтобы остановить производственный заказ:"
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День месяца, в который автоматически счет-фактура будет создан, например, 05, 28 и т.д."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Оценка должна быть меньше или равна 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,С-форма записи
@@ -752,12 +751,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,По
 DocType: Features Setup,"To enable ""Point of Sale"" features",Чтобы включить "Точки продаж" Особенности
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Выберите товары
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
 DocType: Comment,Reference Name,Ссылка Имя
 DocType: Maintenance Visit,Completion Status,Статус завершения
 DocType: Sales Invoice Item,Target Warehouse,Целевая Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Разрешить доставку на получение или Шифрование до этого процента
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Импорт Посещаемость
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Все группы товаров
 DocType: Process Payroll,Activity Log,Журнал активности
@@ -765,7 +764,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок.
 DocType: Production Order,Item To Manufacture,Элемент Производство
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постоянная форма
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Заказ на Оплата
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Заказ на Оплата
 DocType: Sales Order Item,Projected Qty,Прогнозируемый Количество
 DocType: Sales Invoice,Payment Due Date,Дата платежа
 DocType: Newsletter,Newsletter Manager,Рассылка менеджер
@@ -789,8 +789,8 @@ DocType: SMS Log,Requested Numbers,Требуемые Номера
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Служебная аттестация.
 DocType: Sales Invoice Item,Stock Details,Фото Детали
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Значимость проекта
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Торговая точка
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Не можете переносить {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Торговая точка
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не можете переносить {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс счета в Кредите, запрещена установка 'Баланс должен быть' как 'Дебет'"
 DocType: Account,Balance must be,Баланс должен быть
 DocType: Hub Settings,Publish Pricing,Опубликовать Цены
@@ -812,7 +812,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Покупка Получение
 ,Received Items To Be Billed,Полученные товары быть выставлен счет
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Абразивоструйное
-sites/assets/js/desk.min.js +3938,Ms,Госпожа
+DocType: Employee,Ms,Госпожа
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Мастер Валютный курс.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал для Субсборки
@@ -834,29 +834,31 @@ DocType: Purchase Receipt,Range,температур
 DocType: Supplier,Default Payable Accounts,По умолчанию задолженность Кредиторская
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Features Setup,Item Barcode,Пункт Штрих
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Пункт Варианты {0} обновляются
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
 DocType: Address,Shop,Магазин
 DocType: Hub Settings,Sync Now,Синхронизировать сейчас
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитная запись не может быть связан с {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитная запись не может быть связан с {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,По умолчанию Счет в банке / Наличные будут автоматически обновляться в POS фактуре когда выбран этот режим.
 DocType: Employee,Permanent Address Is,Постоянный адрес Является
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операция выполнена На сколько готовой продукции?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Марка
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Учет по-{0} скрещенными за Пункт {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Учет по-{0} скрещенными за Пункт {1}.
 DocType: Employee,Exit Interview Details,Выход Интервью Подробности
 DocType: Item,Is Purchase Item,Является Покупка товара
 DocType: Journal Entry Account,Purchase Invoice,Покупка Счет
 DocType: Stock Ledger Entry,Voucher Detail No,Подробности ваучера №
 DocType: Stock Entry,Total Outgoing Value,Всего исходящее значение
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Открытие Дата и Дата закрытия должна быть в пределах той же финансовый год
 DocType: Lead,Request for Information,Запрос на предоставление информации
 DocType: Payment Tool,Paid,Платный
 DocType: Salary Slip,Total in words,Всего в словах
 DocType: Material Request Item,Lead Time Date,Время выполнения Дата
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,"является обязательным. Может быть, Обмен валюты запись не создана для"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Пожалуйста, сформулируйте Серийный номер для Пункт {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Для элементов "продукта" Bundle, склад, серийный номер и серия № будет рассматриваться с "упаковочный лист 'таблицы. Если Склад и пакетная Нет являются одинаковыми для всех упаковочных деталей для любой "продукта" Bundle пункта, эти значения могут быть введены в основной таблице Item, значения будут скопированы в "список упаковки" таблицу."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Поставки клиентам.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Поставки клиентам.
 DocType: Purchase Invoice Item,Purchase Order Item,Заказ товара
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Косвенная прибыль
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Установите Сумма платежа = сумма Выдающийся
@@ -864,13 +866,14 @@ DocType: Contact Us Settings,Address Line 1,Адрес (1-я строка)
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Дисперсия
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Название компании
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Выбрать пункт трансфера
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Выбрать пункт трансфера
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Просмотреть список всех справочных видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Выберите учетную запись глава банка, в котором проверка была размещена."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Разрешить пользователю редактировать Прайс-лист Оценить в сделках
 DocType: Pricing Rule,Max Qty,Макс Кол-во
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Платеж по покупке / продаже порядок должен всегда быть помечены как заранее
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Платеж по покупке / продаже порядок должен всегда быть помечены как заранее
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Химический
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
 DocType: Process Payroll,Select Payroll Year and Month,Выберите Payroll год и месяц
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Перейти к соответствующей группе (обычно использования средств> Текущие активы> Банковские счета и создать новый аккаунт (нажав на Добавить Ребенка) типа "банк"
 DocType: Workstation,Electricity Cost,Стоимость электроэнергии
@@ -885,7 +888,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бе
 DocType: SMS Center,All Lead (Open),Все лиды (Открыть)
 DocType: Purchase Invoice,Get Advances Paid,Получить авансы выданные
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепите свою фотографию
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Сделать
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Сделать
 DocType: Journal Entry,Total Amount in Words,Общая сумма в словах
 DocType: Workflow State,Stop,стоп
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Был ошибка. Один вероятной причиной может быть то, что вы не сохранили форму. Пожалуйста, свяжитесь с support@erpnext.com если проблема не устранена."
@@ -909,7 +912,7 @@ DocType: Packing Slip Item,Packing Slip Item,Упаковочный лист П
 DocType: POS Profile,Cash/Bank Account, Наличные / Банковский счет
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Атрибут стол является обязательным
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Атрибут стол является обязательным
 DocType: Production Planning Tool,Get Sales Orders,Получить заказов клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не может быть отрицательным
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Подача
@@ -920,12 +923,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Будет об
 DocType: Project,Internal,Внутренний
 DocType: Task,Urgent,Важно
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Пожалуйста, укажите действительный идентификатор строки для строки {0} в таблице {1}"
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Перейдите на рабочий стол и начать использовать ERPNext
 DocType: Item,Manufacturer,Производитель
 DocType: Landed Cost Item,Purchase Receipt Item,Покупка Получение товара
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервировано Склад в заказ клиента / склад готовой продукции
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Продажа Сумма
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Журналы Время
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Вы Утверждающий Расходы для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Вы Утверждающий Расходы для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
 DocType: Serial No,Creation Document No,Создание документа Нет
 DocType: Issue,Issue,Проблема
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибуты для товара Variant. например, размер, цвет и т.д."
@@ -940,8 +944,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Продажи Заказать {0} {1}
 DocType: Opportunity,Contact Info,Контактная информация
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Создание изображения в дневнике
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Создание изображения в дневнике
 DocType: Packing Slip,Net Weight UOM,Вес нетто единица измерения
 DocType: Item,Default Supplier,По умолчанию Поставщик
 DocType: Manufacturing Settings,Over Production Allowance Percentage,За квота на производство Процент
@@ -950,7 +955,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Получить Weekly Выкл Даты
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Дата окончания не может быть меньше, чем Дата начала"
 DocType: Sales Person,Select company name first.,Выберите название компании в первую очередь.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Доктор
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Доктор
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Котировки полученных от поставщиков.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Для {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,обновляется через журналы Time
@@ -978,7 +983,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Регистрационные номера компании для вашей справки. Налоговые числа и т.д.
 DocType: Sales Partner,Distributor,Дистрибьютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корзина Правило Доставка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
 ,Ordered Items To Be Billed,"Заказал пунктов, которые будут Объявленный"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"С Диапазон должен быть меньше, чем диапазон"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Выберите Журналы время и предоставить для создания нового счета-фактуры.
@@ -1026,7 +1031,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Нало
 DocType: Lead,Lead,Лид
 DocType: Email Digest,Payables,Кредиторская задолженность
 DocType: Account,Warehouse,Склад
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Отклонено Кол-во не может быть введен в приобретении Вернуться
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Отклонено Кол-во не может быть введен в приобретении Вернуться
 ,Purchase Order Items To Be Billed,Покупка Заказ позиции быть выставлен счет
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
 DocType: Purchase Invoice Item,Purchase Invoice Item,Покупка Счет Пункт
@@ -1041,11 +1046,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Несогласо
 DocType: Global Defaults,Current Fiscal Year,Текущий финансовый год
 DocType: Global Defaults,Disable Rounded Total,Отключение закругленными Итого
 DocType: Lead,Call,Звонок
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробный баланс
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Настройка сотрудников
-sites/assets/js/erpnext.min.js +5,"Grid ""","Сетка """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Настройка сотрудников
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Сетка """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Пожалуйста, выберите префикс первым"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Исследования
 DocType: Maintenance Visit Purpose,Work Done,Сделано
@@ -1055,14 +1060,15 @@ DocType: Communication,Sent,Отправлено
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Посмотреть Леджер
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Communication,Delivery Status,Статус доставки
 DocType: Production Order,Manufacture against Sales Order,Производство против заказ клиента
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Пункт {0} не может иметь Batch
 ,Budget Variance Report,Бюджет Разница Сообщить
 DocType: Salary Slip,Gross Pay,Зарплата до вычетов
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,"Дивиденды, выплачиваемые"
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Учет книга
 DocType: Stock Reconciliation,Difference Amount,Разница Сумма
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Нераспределенная Прибыль
 DocType: BOM Item,Item Description,Описание позиции
@@ -1076,15 +1082,17 @@ DocType: Opportunity Item,Opportunity Item,Возможность Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Временное открытие
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Сотрудник Оставить Баланс
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Address,Address Type,Тип адреса
 DocType: Purchase Receipt,Rejected Warehouse,Отклонен Склад
 DocType: GL Entry,Against Voucher,Против ваучером
 DocType: Item,Default Buying Cost Center,По умолчанию Покупка МВЗ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Чтобы получить лучшее из ERPNext, мы рекомендуем вам потребуется некоторое время и смотреть эти справки видео."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Пункт {0} должно быть продажи товара
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,для
 DocType: Item,Lead Time in days,Время в днях
 ,Accounts Payable Summary,Кредиторская задолженность Основная
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Получить неоплаченных счетов-фактур
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
@@ -1100,7 +1108,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Место выдачи
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Контракт
 DocType: Report,Disabled,Отключено
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ряд {0}: Кол-во является обязательным
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Сельское хозяйство
@@ -1109,13 +1117,13 @@ DocType: Mode of Payment,Mode of Payment,Способ оплаты
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Это корень группу товаров и не могут быть изменены.
 DocType: Journal Entry Account,Purchase Order,Заказ на покупку
 DocType: Warehouse,Warehouse Contact Info,Склад Контактная информация
-sites/assets/js/form.min.js +190,Name is required,Имя обязательно
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Имя обязательно
 DocType: Purchase Invoice,Recurring Type,Периодическое Тип
 DocType: Address,City/Town,Город / поселок
 DocType: Email Digest,Annual Income,Годовой доход
 DocType: Serial No,Serial No Details,Серийный номер подробнее
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Налоговая ставка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с другой дебету"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с другой дебету"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
@@ -1126,14 +1134,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Цель
 DocType: Sales Invoice Item,Edit Description,Редактировать описание
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Ожидаемая дата поставки меньше, чем Запланированная дата начала."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Для поставщиков
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Для поставщиков
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Установка Тип аккаунта помогает в выборе этого счет в сделках.
 DocType: Purchase Invoice,Grand Total (Company Currency),Общий итог (Компания Валюта)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Всего Исходящие
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Там может быть только один Правило Начальные с 0 или пустое значение для ""To Размер"""
 DocType: Authorization Rule,Transaction,Транзакция
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Примечание: Эта МВЗ является Группа. Невозможно сделать бухгалтерские проводки против групп.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Инструментарий
+apps/frappe/frappe/config/desk.py +7,Tools,Инструментарий
 DocType: Item,Website Item Groups,Сайт Группы товаров
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Номер заказа Продукция является обязательным для производства фондового входа назначения
 DocType: Purchase Invoice,Total (Company Currency),Всего (Компания валют)
@@ -1143,7 +1151,7 @@ DocType: Workstation,Workstation Name,Имя рабочей станции
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Электронная почта Дайджест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} не принадлежит к пункту {1}
 DocType: Sales Partner,Target Distribution,Целевая Распределение
-sites/assets/js/desk.min.js +7652,Comments,Комментарии
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Комментарии
 DocType: Salary Slip,Bank Account No.,Счет №
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Это число последнего созданного сделки с этим префиксом
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Оценка Оцените требуется для Пункт {0}
@@ -1158,7 +1166,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Пожал
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Поставщик Дата выставления счета
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вам необходимо включить Корзину
-sites/assets/js/form.min.js +212,No Data,нет данных
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,нет данных
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оценка шаблона Гол
 DocType: Salary Slip,Earning,Зарабатывание
 DocType: Payment Tool,Party Account Currency,Партия Валюта счета
@@ -1166,7 +1174,7 @@ DocType: Payment Tool,Party Account Currency,Партия Валюта счет
 DocType: Purchase Taxes and Charges,Add or Deduct,Добавить или вычесть
 DocType: Company,If Yearly Budget Exceeded (for expense account),Если годовой бюджет превышен (за счет расходов)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Перекрытие условия найдено между:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Против Запись в журнале {0} уже настроен против какой-либо другой ваучер
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Против Запись в журнале {0} уже настроен против какой-либо другой ваучер
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Общая стоимость заказа
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Еда
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старение Диапазон 3
@@ -1174,11 +1182,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Нет посещений
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Бюллетени для контактов, приводит."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закрытии счета должны быть {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сумма баллов за все цели должны быть 100. Это {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,"Операции, не может быть пустым."
 ,Delivered Items To Be Billed,Поставленные товары быть выставлен счет
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не может быть изменен для серийный номер
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Статус обновлен до {0}
 DocType: DocField,Description,Описание
 DocType: Authorization Rule,Average Discount,Средняя скидка
 DocType: Letter Head,Is Default,Является умолчанию
@@ -1206,7 +1214,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Пункт Сумма налог
 DocType: Item,Maintain Stock,Поддержание складе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставьте пустым, если рассматривать для всех обозначений"
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,С DateTime
 DocType: Email Digest,For Company,За компанию
@@ -1216,7 +1224,7 @@ DocType: Sales Invoice,Shipping Address Name,Адрес доставки Имя
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,План счетов
 DocType: Material Request,Terms and Conditions Content,Условия Содержимое
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
@@ -1229,7 +1237,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Гарантия / АМК Стат
 DocType: GL Entry,GL Entry,GL Вступление
 DocType: HR Settings,Employee Settings,Работники Настройки
 ,Batch-Wise Balance History,Партиями Баланс История
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Список задач
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Список задач
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Ученик
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Отрицательный Количество не допускается
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1262,13 +1270,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Настройки Настройка SMS Gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Ошибка при импортировании!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Адрес не добавлено ни.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адрес не добавлено ни.
 DocType: Workstation Working Hour,Workstation Working Hour,Рабочая станция Рабочие часы
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Строка {0}: С номером количество {1} должен быть меньше или равен количеству СП {2}
 DocType: Item,Inventory,Инвентаризация
 DocType: Features Setup,"To enable ""Point of Sale"" view",Чтобы включить "Точка зрения" Продажа
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Оплата не может быть сделано для пустого корзину
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Оплата не может быть сделано для пустого корзину
 DocType: Item,Sales Details,Продажи Подробности
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Закрепление
 DocType: Opportunity,With Items,С элементами
@@ -1278,7 +1286,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Дата, на которую будет генерироваться следующий счет-фактура. Он создается на форму."
 DocType: Item Attribute,Item Attribute,Пункт Атрибут
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Правительство
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Предмет Варианты
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Предмет Варианты
 DocType: Company,Services,Услуги
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Всего ({0})
 DocType: Cost Center,Parent Cost Center,Родитель МВЗ
@@ -1288,11 +1296,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Начало финансового периода
 DocType: Employee External Work History,Total Experience,Суммарный опыт
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Зенкование
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Material Request Item,Sales Order No,Заказ на продажу Нет
 DocType: Item Group,Item Group Name,Пункт Название группы
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Взятый
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Взятый
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Передача материалов для производства
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1301,8 +1309,7 @@ DocType: Maintenance Schedule,Schedules,Расписание
 DocType: Purchase Invoice Item,Net Amount,Чистая сумма
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM детали №
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Дополнительная скидка Сумма (валюта компании)
-DocType: Period Closing Voucher,CoA Help,КоА Помощь
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Ошибка: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Ошибка: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Пожалуйста, создайте новую учетную запись с Планом счетов бухгалтерского учета."
 DocType: Maintenance Visit,Maintenance Visit,Техническое обслуживание Посетить
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Клиент> Группа клиентов> Территория
@@ -1313,6 +1320,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Земельные Стоимос
 DocType: Event,Tuesday,Вторник
 DocType: Leave Block List,Block Holidays on important days.,Блок Отдых на важных дней.
 ,Accounts Receivable Summary,Дебиторская задолженность Резюме
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},"Листья для типа {0}, уже выделенных на работника {1} для периода {2} - {3}"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Пожалуйста, установите поле идентификатора пользователя в Сотрудника Запись, чтобы настроить Employee роль"
 DocType: UOM,UOM Name,Имя единица измерения
 DocType: Top Bar Item,Target,цель
@@ -1333,19 +1341,19 @@ DocType: Sales Partner,Sales Partner Target,Партнеры по сбыту ц
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Учет Вход для {0} могут быть сделаны только в валюте: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Насечка
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Материал Заказать орденом
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материал Заказать орденом
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ряд # {0}: возвращенный деталь {1} не существует в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банковские счета
 ,Bank Reconciliation Statement,Банковская сверка состояние
 DocType: Address,Lead Name,Ведущий Имя
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Открытие акции Остаток
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Открытие акции Остаток
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} должен появиться только один раз
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Не разрешается Tranfer более {0}, чем {1} против Заказа {2}"
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нет объектов для упаковки
 DocType: Shipping Rule Condition,From Value,От стоимости
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Производство Количество является обязательным
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Производство Количество является обязательным
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Суммы не отражается в банке
 DocType: Quality Inspection Reading,Reading 4,Чтение 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Претензии по счет компании.
@@ -1358,19 +1366,20 @@ DocType: Opportunity,Contact Mobile No,Связаться Мобильный Н
 DocType: Production Planning Tool,Select Sales Orders,Выберите заказы на продажу
 ,Material Requests for which Supplier Quotations are not created,"Материал Запросы, для которых Поставщик Котировки не создаются"
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Чтобы отслеживать предметы, используя штрих-код. Вы сможете ввести элементы в накладной и счет-фактуру путем сканирования штрих-кода товара."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Отметить как при поставке
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Сделать цитаты
 DocType: Dependent Task,Dependent Task,Зависит Задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Попробуйте планировании операций для X дней.
 DocType: HR Settings,Stop Birthday Reminders,Стоп День рождения Напоминания
 DocType: SMS Center,Receiver List,Приемник Список
 DocType: Payment Tool Detail,Payment Amount,Сумма платежа
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Израсходованное количество
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Просмотр
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Просмотр
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Вычет
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективный лазерного спекания
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Успешно импортированно!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Стоимость эмиссионных пунктов
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количество должно быть не более {0}
@@ -1391,7 +1400,7 @@ DocType: Company,Default Payable Account,По умолчанию оплачив
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки для онлайн корзины, такие как правилами перевозок, прайс-лист и т.д."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Завершение установки
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Объявленный
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Зарезервированное кол-во
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Зарезервированное кол-во
 DocType: Party Account,Party Account,Партия аккаунт
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Кадры
 DocType: Lead,Upper Income,Верхний Доход
@@ -1434,11 +1443,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Включить Корзина
 DocType: Employee,Permanent Address,Постоянный адрес
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Пункт {0} должен быть Service Элемент.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","Advance платный против {0} {1} не может быть больше \, чем общий итог {2}"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Пожалуйста, выберите элемент кода"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Уменьшите вычет для отпуска без сохранения (LWP)
 DocType: Territory,Territory Manager,Territory Manager
+DocType: Delivery Note Item,To Warehouse (Optional),На склад (Необязательно)
 DocType: Sales Invoice,Paid Amount (Company Currency),Платные Сумма (Компания валют)
 DocType: Purchase Invoice,Additional Discount,Дополнительная скидка
 DocType: Selling Settings,Selling Settings,Продажа Настройки
@@ -1461,7 +1471,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Добыча
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Литье смолы
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Пожалуйста, выберите {0} в первую очередь."
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Пожалуйста, выберите {0} в первую очередь."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0}
 DocType: Territory,Parent Territory,Родитель Территория
 DocType: Quality Inspection Reading,Reading 2,Чтение 2
@@ -1489,11 +1499,11 @@ DocType: Sales Invoice Item,Batch No,№ партии
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Разрешить несколько заказов на продажу от Заказа Клиента
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Основные
 DocType: DocPerm,Delete,Удалить
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Вариант
-sites/assets/js/desk.min.js +7971,New {0},Новый {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Вариант
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Новый {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,"Приостановленный заказ не может быть отменен. Снимите с заказа статус ""Приостановлено"" для отмены"
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Приостановленный заказ не может быть отменен. Снимите с заказа статус ""Приостановлено"" для отмены"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
 DocType: Employee,Leave Encashed?,Оставьте инкассированы?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Возможность поле От обязательна
 DocType: Item,Variants,Варианты
@@ -1511,7 +1521,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Страна
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреса
 DocType: Communication,Received,Получено
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условия для правил перевозки
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Деталь не разрешается иметь производственного заказа.
@@ -1532,7 +1542,6 @@ DocType: Employee,Salutation,Обращение
 DocType: Communication,Rejected,Отклоненные
 DocType: Pricing Rule,Brand,Бренд
 DocType: Item,Will also apply for variants,Будет также применяться для вариантов
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Доставлен
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle детали на момент продажи.
 DocType: Sales Order Item,Actual Qty,Фактический Кол-во
 DocType: Sales Invoice Item,References,Рекомендации
@@ -1570,14 +1579,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Сдвиг
 DocType: Item,Has Variants,Имеет Варианты
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Нажмите на кнопку ""Создать Расходная накладная», чтобы создать новый счет-фактуру."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Период с и срок датам обязательных для повторяющихся% S
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Упаковка и маркировка
 DocType: Monthly Distribution,Name of the Monthly Distribution,Название ежемесячное распределение
 DocType: Sales Person,Parent Sales Person,Лицо Родительские продаж
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Пожалуйста, сформулируйте Базовая валюта в компании Мастер и общие настройки по умолчанию"
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Секретный ключ
 DocType: Purchase Invoice,Recurring Invoice,Периодическое Счет
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Управление проектами
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Управление проектами
 DocType: Supplier,Supplier of Goods or Services.,Поставщик товаров или услуг.
 DocType: Budget Detail,Fiscal Year,Отчетный год
 DocType: Cost Center,Budget,Бюджет
@@ -1606,11 +1614,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Продажа
 DocType: Employee,Salary Information,Информация о зарплате
 DocType: Sales Person,Name and Employee ID,Имя и ID сотрудника
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сайт Пункт Группа
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Пошлины и налоги
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} записи оплаты не могут быть отфильтрованы по {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записи оплаты не могут быть отфильтрованы по {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблица для элемента, который будет показан на веб-сайте"
 DocType: Purchase Order Item Supplied,Supplied Qty,Поставляется Кол-во
 DocType: Material Request Item,Material Request Item,Материал Запрос товара
@@ -1618,7 +1626,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дерево то
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки, превышающую или равную текущему номеру строки для этого типа зарядки"
 ,Item-wise Purchase History,Пункт мудрый История покупок
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Красный
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы принести Серийный номер добавлен для Пункт {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,замороженные
 ,Open Production Orders,Открыть Производственные заказы
 DocType: Installation Note,Installation Time,Время установки
@@ -1662,13 +1670,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Как Производственный заказ можно сделать по этой статье, он должен быть запас пункт."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Как Производственный заказ можно сделать по этой статье, он должен быть запас пункт."
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Количество
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Присоединение
 DocType: Authorization Rule,Above Value,Выше стоимости
 ,Pending Amount,В ожидании Сумма
 DocType: Purchase Invoice Item,Conversion Factor,Коэффициент преобразования
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Доставлено
+DocType: Purchase Order,Delivered,Доставлено
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Настройка сервера входящей подрабатывать электронный идентификатор. (Например jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Количество транспортных средств
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на которую повторяющихся счет будет остановить"
@@ -1685,10 +1693,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Распределит
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа 'Основные средства', товар {1} является активом"
 DocType: HR Settings,HR Settings,Настройки HR
 apps/frappe/frappe/config/setup.py +130,Printing,Печать
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходов претензии ожидает одобрения. Только расходов утверждающий можете обновить статус.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходов претензии ожидает одобрения. Только расходов утверждающий можете обновить статус.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнительная скидка Сумма
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"День (дни), на котором вы подаете заявление на отпуск, отпуск. Вам не нужно обратиться за разрешением."
-sites/assets/js/desk.min.js +7805,and,и
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спорт
@@ -1725,7 +1733,6 @@ DocType: Opportunity,Quotation,Расценки
 DocType: Salary Slip,Total Deduction,Всего Вычет
 DocType: Quotation,Maintenance User,Уход за инструментом
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Стоимость Обновлено
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,"Вы уверены, что хотите откупоривать"
 DocType: Employee,Date of Birth,Дата рождения
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискальный год** представляет собой финансовый год. Все бухгалтерские записи и другие крупные сделки отслеживаются по **Фискальному году**.
@@ -1741,13 +1748,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следите продаж кампаний. Следите за проводами, цитаты, заказа на закупку и т.д. из кампаний, чтобы оценить отдачу от инвестиций. "
 DocType: Expense Claim,Approver,Утверждаю
 ,SO Qty,ТАК Кол-во
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток есть записи с склада {0}, следовательно, вы не сможете повторно назначить или изменить Склад"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток есть записи с склада {0}, следовательно, вы не сможете повторно назначить или изменить Склад"
 DocType: Appraisal,Calculate Total Score,Рассчитать общую сумму
 DocType: Supplier Quotation,Manufacturing Manager,Производство менеджер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит Delivery Note в пакеты.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Поставки
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Окунитесь литье
+DocType: Purchase Order,To be delivered to customer,Для поставляться заказчику
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Время входа Статус должен быть представлен.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серийный номер {0} не принадлежит ни к одной Склад
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Настройка
@@ -1772,11 +1780,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Из валюты
 DocType: DocField,Name,Имя
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Суммы не отражается в системе
 DocType: Purchase Invoice Item,Rate (Company Currency),Тариф (Компания Валюта)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Другое
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Установить как Остановился
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Не можете найти соответствующий пункт. Пожалуйста, выберите другое значение для {0}."
 DocType: POS Profile,Taxes and Charges,Налоги и сборы
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Продукт или услуга, которая покупается, продается, или хранятся на складе."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда, как «О предыдущего ряда Сумма» или «О предыдущего ряда Всего 'для первой строки"
@@ -1785,19 +1793,20 @@ DocType: Web Form,Select DocType,Выберите тип документа
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Протяжные
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банковские операции
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы получить график"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Новый Центр Стоимость
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Новый Центр Стоимость
 DocType: Bin,Ordered Quantity,Заказанное количество
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","например ""Построить инструменты для строителей """
 DocType: Quality Inspection,In Process,В процессе
 DocType: Authorization Rule,Itemwise Discount,Itemwise Скидка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} против заказов клиентов {1}
+DocType: Purchase Order Item,Reference Document Type,Ссылка Тип документа
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} против заказов клиентов {1}
 DocType: Account,Fixed Asset,Исправлена активами
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Серийный Инвентарь
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серийный Инвентарь
 DocType: Activity Type,Default Billing Rate,По умолчанию Платежная Оценить
 DocType: Time Log Batch,Total Billing Amount,Всего счетов Сумма
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Дебиторская задолженность аккаунт
 ,Stock Balance,Баланс запасов
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Продажи Приказ Оплата
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продажи Приказ Оплата
 DocType: Expense Claim Detail,Expense Claim Detail,Расходов претензии Подробно
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Журналы Время создания:
 DocType: Item,Weight UOM,Вес Единица измерения
@@ -1833,10 +1842,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на счету должно быть оплачивается счет
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
 DocType: Production Order Operation,Completed Qty,Завершено Кол-во
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, только дебетовые счета могут быть связаны с другой кредитной вступления"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Прайс-лист {0} отключена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, только дебетовые счета могут быть связаны с другой кредитной вступления"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Прайс-лист {0} отключена
 DocType: Manufacturing Settings,Allow Overtime,Разрешить Овертайм
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Заказ на продажу {0} остановлен
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} Серийные номера, необходимые для Пункт {1}. Вы предоставили {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Текущая оценка Оценить
 DocType: Item,Customer Item Codes,Заказчик Предмет коды
@@ -1845,9 +1853,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Сварка
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Новый фонда Единица измерения требуется
 DocType: Quality Inspection,Sample Size,Размер выборки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,На все товары уже выставлены счета
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,На все товары уже выставлены счета
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Пожалуйста, сформулируйте действительный 'От делу №'"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
 DocType: Project,External,Внешний  GPS с RS232
 DocType: Features Setup,Item Serial Nos,Пункт Серийный Нос
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Пользователи и разрешения
@@ -1874,7 +1882,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,Адрес и контакты
 DocType: SMS Log,Sender Name,Имя отправителя
 DocType: Page,Title,Заголовок
-sites/assets/js/list.min.js +104,Customize,Выполнять по индивидуальному заказу
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Выполнять по индивидуальному заказу
 DocType: POS Profile,[Select],[Выберите]
 DocType: SMS Log,Sent To,Отправить
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Сделать Расходная накладная
@@ -1899,12 +1907,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Конец срока службы
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Путешествия
 DocType: Leave Block List,Allow Users,Разрешить пользователям
+DocType: Purchase Order,Customer Mobile No,Заказчик Мобильная Нет
 DocType: Sales Invoice,Recurring,Периодическая
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Подписка отдельный доходы и расходы за вертикалей продукции или подразделений.
 DocType: Rename Tool,Rename Tool,Переименование файлов
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Обновление Стоимость
 DocType: Item Reorder,Item Reorder,Пункт Переупоряд
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,О передаче материала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,О передаче материала
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","не Укажите операции, эксплуатационные расходы и дать уникальную операцию не в вашей деятельности."
 DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
@@ -1927,7 +1936,7 @@ DocType: Appraisal,Employee,Сотрудник
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Импорт E-mail С
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Пригласить в пользователя
 DocType: Features Setup,After Sale Installations,После продажи установок
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} полностью выставлен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} полностью выставлен
 DocType: Workstation Working Hour,End Time,Время окончания
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартные условия договора для продажи или покупки.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Группа по ваучером
@@ -1936,8 +1945,9 @@ DocType: Sales Invoice,Mass Mailing,Массовая рассылка
 DocType: Page,Standard,Стандартный
 DocType: Rename Tool,File to Rename,Файл Переименовать
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Показать платежи
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Указано BOM {0} не существует для п {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Размер
 DocType: Notification Control,Expense Claim Approved,Расходов претензии Утверждено
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтический
@@ -1956,8 +1966,8 @@ DocType: Upload Attendance,Attendance To Date,Посещаемость To Date
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Настройка сервера входящей для продажи электронный идентификатор. (Например sales@example.com)
 DocType: Warranty Claim,Raised By,Поднятый По
 DocType: Payment Tool,Payment Account,Оплата счета
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
-sites/assets/js/list.min.js +23,Draft,Черновик
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Черновик
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,Accepted,Принято
 DocType: User,Female,Жен
@@ -1970,14 +1980,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Правило ярлыке
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Сырье не может быть пустым.
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Как есть существующие биржевые операции по этому пункту, \ вы не можете изменить значения 'Имеет серийный номер "," Имеет Batch Нет »,« Является ли со Пункт "и" Оценка Метод ""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Быстрый журнал запись
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
 DocType: Employee,Previous Work Experience,Предыдущий опыт работы
 DocType: Stock Entry,For Quantity,Для Количество
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} не проведен
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Запросы на предметы.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} не проведен
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Запросы на предметы.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отдельный производственный заказ будет создан для каждого готового хорошего пункта.
 DocType: Purchase Invoice,Terms and Conditions1,Сроки и условиях1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Завершение установки
@@ -1989,7 +2000,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Рассылка
 DocType: Delivery Note,Transporter Name,Transporter Имя
 DocType: Contact,Enter department to which this Contact belongs,"Введите отдел, к которому принадлежит этого контакт"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Всего Отсутствует
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Единица Измерения
 DocType: Fiscal Year,Year End Date,Дата окончания года
 DocType: Task Depends On,Task Depends On,Задачи зависит от
@@ -2015,7 +2026,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Третья сторона дистрибьютор / дилер / комиссионер / филиал / реселлера, который продает продукты компании для комиссии."
 DocType: Customer Group,Has Child Node,Имеет дочерний узел
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} против Заказа {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} против Заказа {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Введите статические параметры адрес здесь (Например отправитель = ERPNext, имя пользователя = ERPNext, пароль = 1234 и т.д.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1}, ни в каком-либо активном финансовом году. Для более подробной информации проверить {2}."
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
@@ -2066,11 +2077,9 @@ DocType: Note,Note,Заметка
 DocType: Purchase Receipt Item,Recd Quantity,RECD Количество
 DocType: Email Account,Email Ids,E-mail идентификаторы
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0}, чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Установить как отверзутся
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Фото Элемент {0} не представлены
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Фото Элемент {0} не представлены
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Расчетный счет
 DocType: Tax Rule,Billing City,Биллинг Город
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Это оставьте заявку ожидает одобрения. Только Оставить утверждающий можете обновить статус.
 DocType: Global Defaults,Hide Currency Symbol,Скрыть Символ Валюты
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","например банк, наличные, кредитная карта"
 DocType: Journal Entry,Credit Note,Кредит-нота
@@ -2091,7 +2100,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всего (кол-в
 DocType: Installation Note Item,Installed Qty,Установленная Кол-во
 DocType: Lead,Fax,Факс:
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-sites/assets/js/list.min.js +26,Submitted,Представленный
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Представленный
 DocType: Salary Structure,Total Earning,Всего Заработок
 DocType: Purchase Receipt,Time at which materials were received,"Момент, в который были получены материалы"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Мои Адреса
@@ -2100,7 +2109,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Органи
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
 DocType: Sales Order,Billing Status,Статус Биллинг
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Коммунальные расходы
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Над
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Над
 DocType: Buying Settings,Default Buying Price List,По умолчанию Покупка Прайс-лист
 ,Download Backups,Скачать Резервные копии
 DocType: Notification Control,Sales Order Message,Заказ на продажу Сообщение
@@ -2109,7 +2118,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Выберите Сотрудники
 DocType: Bank Reconciliation,To Date,Чтобы Дата
 DocType: Opportunity,Potential Sales Deal,Сделка потенциальных продаж
-sites/assets/js/form.min.js +308,Details,Подробности
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Подробности
 DocType: Purchase Invoice,Total Taxes and Charges,Всего Налоги и сборы
 DocType: Employee,Emergency Contact,Экстренная связь
 DocType: Item,Quality Parameters,Параметры качества
@@ -2124,7 +2133,7 @@ DocType: Purchase Order Item,Received Qty,Поступило Кол-во
 DocType: Stock Entry Detail,Serial No / Batch,Серийный номер / Партия
 DocType: Product Bundle,Parent Item,Родитель Пункт
 DocType: Account,Account Type,Тип учетной записи
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 ,To Produce,Чтобы продукты
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряда {0} {1}. Чтобы включить {2} в размере Item ряды также должны быть включены {3}
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификация пакета на поставку (для печати)
@@ -2135,7 +2144,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Уплощение
 DocType: Account,Income Account,Счет Доходов
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Молдинг
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Текущий Кол-во
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","См. ""Оценить материалов на основе"" в калькуляции раздел"
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Ответственность Площадь
@@ -2166,9 +2175,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Все адреса.
 DocType: Company,Stock Settings,Акции Настройки
 DocType: User,Bio,Ваша Биография
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление групповой клиентов дерево.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Новый Центр Стоимость Имя
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Новый Центр Стоимость Имя
 DocType: Leave Control Panel,Leave Control Panel,Оставьте панели управления
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Нет умолчанию Адрес шаблона не найдено. Пожалуйста, создайте новый из Setup> Печать и брендинга> Адресная шаблон."
 DocType: Appraisal,HR User,HR Пользователь
@@ -2187,24 +2196,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,"Деталь платежный инструмент,"
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Всего очков
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Локальные
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Локальные
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы (активы)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Должники
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Большой
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Сотрудник не найден!
 DocType: C-Form Invoice Detail,Territory,Территория
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений, необходимых"
+DocType: Purchase Order,Customer Address Display,Заказчик Адрес Показать
 DocType: Stock Settings,Default Valuation Method,Метод по умолчанию Оценка
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полировка
 DocType: Production Order Operation,Planned Start Time,Планируемые Время
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Выделенные
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Закрыть баланс и книга прибыли или убытка.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что \ вы уже сделали некоторые сделки (сделок) с другим UOM. Чтобы изменить стандартную UOM, \ использование "Единица измерения Заменить Utility 'инструмент под фондовой модуля."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Укажите Курс конвертировать одну валюту в другую
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Цитата {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитата {0} отменяется
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Общей суммой задолженности
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Сотрудник {0} был в отпусках по {1}. Невозможно отметить посещаемость.
 DocType: Sales Partner,Targets,Цели
@@ -2219,12 +2228,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Это корневая группа клиентов и не могут быть изменены.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Пожалуйста, установите свой план счетов, прежде чем начать бухгалтерских проводок"
 DocType: Purchase Invoice,Ignore Pricing Rule,Игнорировать Цены Правило
-sites/assets/js/list.min.js +24,Cancelled,Отменено
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Отменено
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"С даты зарплаты структура не может быть меньше, чем Сотрудника Присоединение Дата."
 DocType: Employee Education,Graduate,Выпускник
 DocType: Leave Block List,Block Days,Блок дня
 DocType: Journal Entry,Excise Entry,Акцизный запись
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Внимание: Продажи Заказать {0} уже существует в отношении Заказа Клиента {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Внимание: Продажи Заказать {0} уже существует в отношении Заказа Клиента {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2281,17 +2290,17 @@ DocType: Account,Stock Received But Not Billed,"Фото со получен, н
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Валовой Платное + просроченной задолженности суммы + Инкассация Сумма - Всего Вычет
 DocType: Monthly Distribution,Distribution Name,Распределение Имя
 DocType: Features Setup,Sales and Purchase,Купли-продажи
-DocType: Purchase Order Item,Material Request No,Материал Запрос Нет
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
+DocType: Supplier Quotation Item,Material Request No,Материал Запрос Нет
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Скорость, с которой валюта клиента превращается в базовой валюте компании"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} успешно отписались от этого списка.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Чистая скорость (Компания валют)
-apps/frappe/frappe/templates/base.html +132,Added,Добавленной
+apps/frappe/frappe/templates/base.html +134,Added,Добавленной
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управление Территория дерево.
 DocType: Journal Entry Account,Sales Invoice,Счет по продажам
 DocType: Journal Entry Account,Party Balance,Баланс партия
 DocType: Sales Invoice Item,Time Log Batch,Время входа Пакетный
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Пожалуйста, выберите Применить скидки на"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Пожалуйста, выберите Применить скидки на"
 DocType: Company,Default Receivable Account,По умолчанию задолженность аккаунт
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Создать банк запись на общую заработной платы, выплачиваемой за над выбранными критериями"
 DocType: Stock Entry,Material Transfer for Manufacture,Материал Передача для производства
@@ -2302,7 +2311,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Получить соотве
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Бухгалтерский учет Вход для запасе
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Команда1 продаж
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Клиент Адрес
 apps/frappe/frappe/desk/query_report.py +136,Total,Общая сумма
 DocType: Purchase Invoice,Apply Additional Discount On,Применить Дополнительная скидка на
@@ -2317,13 +2326,15 @@ DocType: Quality Inspection,Quality Inspection,Контроль качества
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Очень Маленький
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спрей формирования
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Счет {0} заморожен
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическое лицо / Вспомогательный с отдельным Планом счетов бухгалтерского учета, принадлежащего Организации."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Продукты питания, напитки и табак"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL или BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимальный уровень запасов
 DocType: Stock Entry,Subcontract,Субподряд
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Пожалуйста, введите {0} в первую очередь"
 DocType: Production Planning Tool,Get Items From Sales Orders,Получить элементов из заказов клиента
 DocType: Production Order Operation,Actual End Time,Фактическая Время окончания
 DocType: Production Planning Tool,Download Materials Required,Скачать Необходимые материалы
@@ -2340,9 +2351,9 @@ DocType: Maintenance Visit,Scheduled,Запланированно
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Пожалуйста, выберите пункт, где "ли со Пункт" "Нет" и "является продажа товара" "Да", и нет никакой другой Связка товаров"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Выберите ежемесячное распределение к неравномерно распределять цели по различным месяцам.
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оцените
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Прайс-лист Обмен не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Прайс-лист Обмен не выбран
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Пункт Row {0}: Покупка Получение {1}, не существует в таблице выше ""Купить ПОСТУПЛЕНИЯ"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Дата начала проекта
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,До
 DocType: Rename Tool,Rename Log,Переименовать Входить
@@ -2369,13 +2380,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Только листовые узлы допускаются в сделке
 DocType: Expense Claim,Expense Approver,Расходы утверждающим
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Получение товара Поставляется
-sites/assets/js/erpnext.min.js +48,Pay,Платить
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Платить
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Для DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Журналы для просмотра статуса доставки смс
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Измельчение
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Упаковка в термоусадочную пленку
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,В ожидании Деятельность
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,В ожидании Деятельность
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Подтвердил
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Поставщик > Тип поставщика
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Пожалуйста, введите даты снятия."
@@ -2386,7 +2397,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"В
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Газетных издателей
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Выберите финансовый год
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Выплавка
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Вы Утверждающий Убытки для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Изменить порядок Уровень
 DocType: Attendance,Attendance Date,Посещаемость Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Зарплата распада на основе Заработок и дедукции.
@@ -2422,6 +2432,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Поставщик (и)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Неверный период
 DocType: Customer,Credit Limit,{0}{/0} {1}Кредитный лимит {/1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Выберите тип сделки
 DocType: GL Entry,Voucher No,Ваучер №
@@ -2431,8 +2442,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Ша
 DocType: Customer,Address and Contact,Адрес и контактная
 DocType: Customer,Last Day of the Next Month,Последний день следующего месяца
 DocType: Employee,Feedback,Обратная связь
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. График
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. График
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивной обработки струя
 DocType: Stock Settings,Freeze Stock Entries,Замораживание акций Записи
 DocType: Website Settings,Website Settings,Настройки сайта
@@ -2446,11 +2457,11 @@ DocType: Quality Inspection,Outgoing,Исходящий
 DocType: Material Request,Requested For,Запрашиваемая Для
 DocType: Quotation Item,Against Doctype,Против Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Подписка на Delivery Note против любого проекта
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Корневая учетная запись не может быть удалена
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Корневая учетная запись не может быть удалена
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показать изображения в дневнике
 ,Is Primary Address,Является первичным Адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа-в-Прогресс Склад
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управление адресов
 DocType: Pricing Rule,Item Code,Код элемента
 DocType: Production Planning Tool,Create Production Orders,Создание производственных заказов
@@ -2459,14 +2470,14 @@ DocType: Journal Entry,User Remark,Примечание Пользователь
 DocType: Lead,Market Segment,Сегмент рынка
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Сотрудник внутреннего Работа История
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Закрытие (д-р)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Закрытие (д-р)
 DocType: Contact,Passive,Пассивный
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серийный номер {0} не в наличии
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Налоговый шаблон для продажи сделок.
 DocType: Sales Invoice,Write Off Outstanding Amount,Списание суммы задолженности
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Узнать, нужен автоматические повторяющихся счетов. После представления любого счет продаж, Периодическое раздел будет виден."
 DocType: Account,Accounts Manager,Диспетчер учетных записей
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Время входа {0} должен быть 'Представленные'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Время входа {0} должен быть 'Представленные'
 DocType: Stock Settings,Default Stock UOM,По умолчанию со UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Калькуляция Оценить на основе вида деятельности (за час)
 DocType: Production Planning Tool,Create Material Requests,Создать запросы Материал
@@ -2477,7 +2488,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Банковская сверк
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Получить обновления
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Добавить несколько пробных записей
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Оставить управления
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставить управления
 DocType: Event,Groups,Группы
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
 DocType: Sales Order,Fully Delivered,Полностью Поставляются
@@ -2489,11 +2500,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Продажи Дополнительно
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} к МВЗ {2} будет превышать {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry направляются листья
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
 ,Stock Projected Qty,Фото со Прогнозируемый Количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Заказ клиента
 DocType: Warranty Claim,From Company,От компании
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Значение или Кол-во
@@ -2506,13 +2516,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Розничный торговец
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Все типы поставщиков
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Цитата {0} не типа {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График обслуживания позиции
 DocType: Sales Order,%  Delivered,% Доставлен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк овердрафтовый счет
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Сделать Зарплата Слип
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Откупоривать
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Просмотр спецификации
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Обеспеченные кредиты
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие продукты
@@ -2522,7 +2531,7 @@ DocType: Appraisal,Appraisal,Оценка
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Литья по выплавляемым пены
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Рисунок
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата повторяется
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
 DocType: Hub Settings,Seller Email,Продавец Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общая стоимость покупки (через счет покупки)
 DocType: Workstation Working Hour,Start Time,Время
@@ -2536,8 +2545,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чистая сумма (Компания валют)
 DocType: BOM Operation,Hour Rate,Часовой разряд
 DocType: Stock Settings,Item Naming By,Пункт Именование По
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Из цитаты
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Из цитаты
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
 DocType: Production Order,Material Transferred for Manufacturing,Материал переведен на Производство
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Счет {0} не существует
 DocType: Purchase Receipt Item,Purchase Order Item No,Заказ товара Нет
@@ -2550,11 +2559,11 @@ DocType: Item,Inspection Required,Инспекция Обязательные
 DocType: Purchase Invoice Item,PR Detail,PR Подробно
 DocType: Sales Order,Fully Billed,Полностью Объявленный
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Наличность кассы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Склад Доставка требуется для фондового пункта {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Склад Доставка требуется для фондового пункта {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Общий вес пакета. Обычно вес нетто + упаковочный материал вес. (Для печати)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Пользователи с этой ролью могут замороживать счета, а также создавать / изменять бухгалтерские проводки замороженных счетов"
 DocType: Serial No,Is Cancelled,Является Отмененные
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Мои заказы
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Мои заказы
 DocType: Journal Entry,Bill Date,Дата оплаты
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Даже если есть несколько правил ценообразования с наивысшим приоритетом, то следующие внутренние приоритеты применяются:"
 DocType: Supplier,Supplier Details,Подробная информация о поставщике
@@ -2567,7 +2576,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Банковский перевод
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Пожалуйста, выберите банковский счет"
 DocType: Newsletter,Create and Send Newsletters,Создание и отправка рассылки
-sites/assets/js/report.min.js +107,From Date must be before To Date,"С даты должны быть, прежде чем к дате"
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,"С даты должны быть, прежде чем к дате"
 DocType: Sales Order,Recurring Order,Периодическая Заказать
 DocType: Company,Default Income Account,По умолчанию Счет Доходы
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Группа клиентов / клиентов
@@ -2582,31 +2591,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Фото со UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 ,Projected,Проектированный
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по-доставки и избыточного бронирования по пункту {0} как количестве 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по-доставки и избыточного бронирования по пункту {0} как количестве 0
 DocType: Notification Control,Quotation Message,Цитата Сообщение
 DocType: Issue,Opening Date,Открытие Дата
 DocType: Journal Entry,Remark,Примечание
 DocType: Purchase Receipt Item,Rate and Amount,Ставку и сумму
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Скучный
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,От заказа клиента
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,От заказа клиента
 DocType: Blog Category,Parent Website Route,Родитель Сайт Маршрут
 DocType: Sales Order,Not Billed,Не Объявленный
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Оба Склад должены принадлежать одной Компании
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Нет контактов Пока еще не добавлено.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Нет контактов Пока еще не добавлено.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Не действует
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,На счета-фактуры Дата размещения
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Земельные стоимости путевки сумма
 DocType: Time Log,Batched for Billing,Укомплектовать для выставления счета
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Законопроекты, поднятые поставщиков."
 DocType: POS Profile,Write Off Account,Списание счет
-sites/assets/js/erpnext.min.js +26,Discount Amount,Сумма скидки
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Вернуться против счет покупки
 DocType: Item,Warranty Period (in days),Гарантийный срок (в днях)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"например, НДС"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Пункт 4
 DocType: Journal Entry Account,Journal Entry Account,Запись в журнале аккаунт
 DocType: Shopping Cart Settings,Quotation Series,Цитата серии
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0}), пожалуйста, измените название группы или переименовать пункт"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0}), пожалуйста, измените название группы или переименовать пункт"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Горячая металла газа формирования
 DocType: Sales Order Item,Sales Order Date,Продажи Порядок Дата
 DocType: Sales Invoice Item,Delivered Qty,Поставляется Кол-во
@@ -2638,10 +2646,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Заказчик или Поставщик Подробности
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Задать
 DocType: Lead,Lead Owner,Ведущий Владелец
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Склад требуется
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Склад требуется
 DocType: Employee,Marital Status,Семейное положение
 DocType: Stock Settings,Auto Material Request,Авто Материал Запрос
 DocType: Time Log,Will be updated when billed.,Будет обновляться при счет.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Доступные Пакетная Кол-во на со склада
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,"Текущий спецификации и Нью-BOM не может быть таким же,"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 DocType: Sales Invoice,Against Income Account,Против ДОХОДОВ
@@ -2658,12 +2667,12 @@ DocType: POS Profile,Update Stock,Обновление стока
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Суперфиниширование
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто. Убедитесь, что вес нетто каждого элемента находится в том же UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Оценить
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Записи в журнале {0} не-связаны
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Запись всех коммуникаций типа электронной почте, телефону, в чате, посещение и т.д."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Пожалуйста, укажите округлить МВЗ в компании"
 DocType: Purchase Invoice,Terms,Термины
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Создать новый
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Создать новый
 DocType: Buying Settings,Purchase Order Required,"Покупка порядке, предусмотренном"
 ,Item-wise Sales History,Пункт мудрый История продаж
 DocType: Expense Claim,Total Sanctioned Amount,Всего Санкционированный Количество
@@ -2680,16 +2689,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Зарплата сколь
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Заметки
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Выберите узел группы в первую очередь.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цель должна быть одна из {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Заполните форму и сохранить его
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Заполните форму и сохранить его
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Скачать отчет содержащий все материал со статусом  последней инвентаризации
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Облицовочный
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
 DocType: Leave Application,Leave Balance Before Application,Оставьте баланс перед нанесением
 DocType: SMS Center,Send SMS,Отправить SMS
 DocType: Company,Default Letter Head,По умолчанию бланке
 DocType: Time Log,Billable,Оплачиваемый
 DocType: Authorization Rule,This will be used for setting rule in HR module,Эта информация будет использоваться для установки правило в модуле HR
 DocType: Account,Rate at which this tax is applied,"Скорость, с которой этот налог применяется"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Изменить порядок Кол-во
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Изменить порядок Кол-во
 DocType: Company,Stock Adjustment Account,Регулирование счета запасов
 DocType: Journal Entry,Write Off,Списать
 DocType: Time Log,Operation ID,Код операции
@@ -2700,12 +2710,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Скидка Поля будут доступны в заказе на, покупка получение, в счете-фактуре"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Имя нового Пользователя. Примечание: Пожалуйста, не создавать учетные записи для клиентов и поставщиков"
 DocType: Report,Report Type,Тип отчета
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Идёт загрузка
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Идёт загрузка
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Заменить Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Шаблоны Страна мудрый адрес по умолчанию
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Поставщик поставляет Покупателю
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Показать налог распад
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Импорт и экспорт данных
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Если вы привлечь в производственной деятельности. Включает элемент 'производится'
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Счет Дата размещения
 DocType: Sales Invoice,Rounded Total,Округлые Всего
 DocType: Product Bundle,List items that form the package.,"Список предметов, которые формируют пакет."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
@@ -2716,8 +2729,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
 DocType: Company,Default Cash Account,Расчетный счет по умолчанию
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компания (не клиента или поставщика) хозяин.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Пожалуйста, введите 'ожидаемой даты поставки """
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Пожалуйста, введите 'ожидаемой даты поставки """
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не является допустимым Номером Партии для позиции {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
@@ -2739,11 +2752,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Ряд {0}: Кол-во не Имеющийся на складе {1} {2} {3}.
  Доступно Кол-во: {4}, трансфер Количество: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
+DocType: Purchase Order,Customer Contact Email,Контакты с клиентами E-mail
 DocType: Event,Sunday,Воскресенье
 DocType: Sales Team,Contribution (%),Вклад (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Обязанности
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Шаблон
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Человек по продажам Имя
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Пожалуйста, введите не менее чем 1-фактуру в таблице"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Добавить пользователей
@@ -2752,7 +2766,7 @@ DocType: Task,Actual Start Date (via Time Logs),Фактическая дата
 DocType: Stock Reconciliation Item,Before reconciliation,Перед примирения
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Для {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Налоги и сборы Добавил (Компания Валюта)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Небольшая Объявленный
 DocType: Item,Default BOM,По умолчанию BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2760,12 +2774,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общая сумма задолженности по Amt
 DocType: Time Log Batch,Total Hours,Общее количество часов
 DocType: Journal Entry,Printing Settings,Настройки печати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобилестроение
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Листья для типа {0} уже выделено Требуются {1} для финансового года {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Пункт требуется
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Металл литья под давлением
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Из накладной
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Из накладной
 DocType: Time Log,From Time,От времени
 DocType: Notification Control,Custom Message,Текст сообщения
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестиционно-банковская деятельность
@@ -2781,10 +2794,10 @@ DocType: Newsletter,A Lead with this email id should exist,Руководите
 DocType: Stock Entry,From BOM,Из спецификации
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Биржевые операции до {0} заморожены
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку ""Generate Расписание"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,"Чтобы Дата должна быть такой же, как С даты в течение половины дня отпуска"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку ""Generate Расписание"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,"Чтобы Дата должна быть такой же, как С даты в течение половины дня отпуска"
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","например кг, единицы, Нос, м"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
 DocType: Salary Structure,Salary Structure,Зарплата Структура
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2792,7 +2805,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  конфликта отдавая приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банк:
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авиалиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Материал Выпуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Материал Выпуск
 DocType: Material Request Item,For Warehouse,Для Склада
 DocType: Employee,Offer Date,Предложение Дата
 DocType: Hub Settings,Access Token,Маркер доступа
@@ -2815,6 +2828,7 @@ DocType: Issue,Opening Time,Открытие Время
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты, необходимых"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Ценные бумаги и товарных бирж
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
+DocType: Delivery Note Item,From Warehouse,От Склад
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Бурение
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Удар литье
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Всего
@@ -2836,11 +2850,12 @@ DocType: C-Form,Amended From,Измененный С
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Спецификации сырья
 DocType: Leave Application,Follow via Email,Следуйте по электронной почте
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи. Вы не можете удалить этот аккаунт.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи. Вы не можете удалить этот аккаунт.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Либо целевой Количество или целевое количество является обязательным
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
-DocType: Leave Allocation,Carry Forward,Переносить
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Открытие Дата должна быть, прежде чем Дата закрытия"
+DocType: Leave Control Panel,Carry Forward,Переносить
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,МВЗ с существующими сделок не могут быть преобразованы в книге
 DocType: Department,Days for which Holidays are blocked for this department.,"Дни, для которых Праздники заблокированные для этого отдела."
 ,Produced,Произведено
@@ -2861,17 +2876,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всего (АМТ)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
 DocType: Purchase Order,The date on which recurring order will be stop,"Дата, на которую повторяющееся заказ будет остановить"
 DocType: Quality Inspection,Item Serial No,Пункт Серийный номер
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} должен быть уменьшен на {1} или вы должны увеличить толерантность переполнения
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} должен быть уменьшен на {1} или вы должны увеличить толерантность переполнения
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Итого Текущая
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серийный товара {0} не может быть обновлен \
  использованием Stock примирения"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Перевести Материал Поставщику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Перевести Материал Поставщику
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад. Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Ведущий Тип
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Создание цитаты
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Все эти предметы уже выставлен счет
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Все эти предметы уже выставлен счет
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Может быть одобрено {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Правило Доставка Условия
 DocType: BOM Replace Tool,The new BOM after replacement,Новая спецификация после замены
@@ -2919,7 +2934,7 @@ DocType: C-Form,C-Form,C-образный
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Код операции не установлен
 DocType: Production Order,Planned Start Date,Планируемая дата начала
 DocType: Serial No,Creation Document Type,Создание типа документа
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Посещение
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Посещение
 DocType: Leave Type,Is Encash,Является Обналичивание
 DocType: Purchase Invoice,Mobile No,Мобильный номер
 DocType: Payment Tool,Make Journal Entry,Сделать запись журнала
@@ -2927,7 +2942,7 @@ DocType: Leave Allocation,New Leaves Allocated,Новые листья Выде
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Ожидаемая дата завершения
 DocType: Appraisal Template,Appraisal Template Title,Оценка шаблона Название
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Коммерческий сектор
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Коммерческий сектор
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родитель товара {0} не должны быть со пункт
 DocType: Cost Center,Distribution Id,Распределение Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
@@ -2943,14 +2958,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Соответствие атрибутов {0} должно быть в пределах {1} до {2} в приращений {3}
 DocType: Tax Rule,Sales,Скидки
 DocType: Stock Entry Detail,Basic Amount,Основное количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+DocType: Leave Allocation,Unused leaves,Неиспользованные листья
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,По умолчанию Дебиторская задолженность
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Распиловка
 DocType: Tax Rule,Billing State,Государственный счетов
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламинирование
 DocType: Item Reorder,Transfer,Переложить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
 DocType: Authorization Rule,Applicable To (Employee),Применимо к (Сотрудник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Благодаря Дата является обязательным
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
@@ -2966,6 +2982,7 @@ DocType: Company,Retail,Розничная торговля
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Отсутствует
 DocType: Product Bundle,Product Bundle,Связка товаров
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Дробление
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купить налоги и сборы шаблон
 DocType: Upload Attendance,Download Template,Скачать шаблон
@@ -2973,16 +2990,16 @@ DocType: GL Entry,Remarks,Примечания
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Сырье Код товара
 DocType: Journal Entry,Write Off Based On,Списание на основе
 DocType: Features Setup,POS View,POS Посмотреть
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Установка рекорд для серийный номер
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Установка рекорд для серийный номер
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Непрерывная разливка
-sites/assets/js/erpnext.min.js +10,Please specify a,"Пожалуйста, сформулируйте"
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Пожалуйста, сформулируйте"
 DocType: Offer Letter,Awaiting Response,В ожидании ответа
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Выше
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Холодная размеров
 DocType: Salary Slip,Earning & Deduction,Заработок & Вычет
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Счет {0} не может быть группой
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Область
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
 DocType: Holiday List,Weekly Off,Еженедельный Выкл
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Для, например 2012, 2012-13"
@@ -3026,12 +3043,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Выпуклый
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Литье испарительного-модель
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Представительские расходы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Возраст
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Возраст
 DocType: Time Log,Billing Amount,Биллинг Сумма
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Неверное количество, указанное для элемента {0}. Количество должно быть больше 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Заявки на отпуск.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Счет существующей проводки не может быть удален
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Счет существующей проводки не может быть удален
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Судебные издержки
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","День месяца, в который автоматически заказ формируется например 05, 28 и т.д."
 DocType: Sales Invoice,Posting Time,Средняя Время
@@ -3040,9 +3057,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Логотип
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Проверьте это, если вы хотите, чтобы заставить пользователя выбрать серию перед сохранением. Там не будет по умолчанию, если вы проверить это."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Нет товара с серийным № {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Открытые Уведомления
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Открытые Уведомления
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Прямые расходы
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,"Вы действительно хотите, чтобы Unstop этот материал запрос?"
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Новый Выручка клиентов
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Командировочные Pасходы
 DocType: Maintenance Visit,Breakdown,Разбивка
@@ -3053,7 +3069,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,По состоянию на Дата
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Хонингование
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Испытательный срок
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт.
 DocType: Feed,Full Name,Полное имя
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Клинч
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
@@ -3076,7 +3092,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Добавьт
 DocType: Buying Settings,Default Supplier Type,По умолчанию Тип Поставщик
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Карьер
 DocType: Production Order,Total Operating Cost,Общие эксплуатационные расходы
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Примечание: Пункт {0} имеет несколько вхождений
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Примечание: Пункт {0} имеет несколько вхождений
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Все контакты.
 DocType: Newsletter,Test Email Id,Тест электронный идентификатор
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Аббревиатура компании
@@ -3100,11 +3116,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Кот
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль разрешено редактировать Замороженный исходный
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Налоговый шаблона является обязательным.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Счет {0}: Родитель счета {1} не существует
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Прайс-лист Тариф (Компания Валюта)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',"{0} {1} статус ""Остановлен"""
 DocType: Account,Temporary,Временный
 DocType: Address,Preferred Billing Address,Популярные Адрес для выставления счета
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределение
@@ -3122,13 +3137,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый
 DocType: Purchase Order Item,Supplier Quotation,Поставщик цитаты
 DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,По глажению одежды
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} остановлен
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} остановлен
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
 DocType: Lead,Add to calendar on this date,Добавить в календарь в этот день
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила для добавления стоимости доставки.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Предстоящие События
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящие События
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Требуется клиентов
 DocType: Letter Head,Letter Head,Заголовок письма
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Быстрый доступ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} является обязательным для возврата
 DocType: Purchase Order,To Receive,Получить
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Термоусадочная Место
@@ -3152,25 +3168,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
 DocType: Serial No,Out of Warranty,По истечении гарантийного срока
 DocType: BOM Replace Tool,Replace,Заменить
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} против чека {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} против чека {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
 DocType: Purchase Invoice Item,Project Name,Название проекта
 DocType: Supplier,Mention if non-standard receivable account,Упоминание если нестандартная задолженность счет
 DocType: Workflow State,Edit,Редактировать
 DocType: Journal Entry Account,If Income or Expense,Если доходов или расходов
 DocType: Features Setup,Item Batch Nos,Пункт Пакетное Нос
 DocType: Stock Ledger Entry,Stock Value Difference,Фото Значение Разница
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Человеческими ресурсами
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Человеческими ресурсами
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата Примирение Оплата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Налоговые активы
 DocType: BOM Item,BOM No,BOM №
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Запись в журнале {0} не имеете учет {1} или уже сравнивается с другой ваучер
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Запись в журнале {0} не имеете учет {1} или уже сравнивается с другой ваучер
 DocType: Item,Moving Average,Скользящее среднее
 DocType: BOM Replace Tool,The BOM which will be replaced,"В спецификации, которые будут заменены"
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Новый фонда единица измерения должна отличаться от текущей фондовой UOM
 DocType: Account,Debit,Дебет
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
 DocType: Production Order,Operation Cost,Стоимость эксплуатации
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Добавить посещаемость от. Файл CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Выдающийся Amt
@@ -3178,7 +3194,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Уст
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Чтобы назначить эту проблему, используйте кнопку ""Назначить"" в боковой панели."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Морозильники Акции старше, чем [дней]"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Если два или более Ценообразование правила содержатся на основании указанных выше условиях, приоритет применяется. Приоритет номер от 0 до 20, а значение по умолчанию равно нулю (пустой). Большее число означает, что он будет иметь приоритет, если есть несколько правил ценообразования с одинаковыми условиями."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,На счета-фактуры
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Финансовый год: {0} не существует
 DocType: Currency Exchange,To Currency,В валюту
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Разрешить следующие пользователи утвердить Leave приложений для блочных дней.
@@ -3207,7 +3222,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ст
 DocType: Stock Entry Detail,Additional Cost,Дополнительная стоимость
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Окончание финансового периода 
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фильтровать на основе ваучером Нет, если сгруппированы по ваучером"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Сделать Поставщик цитаты
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Сделать Поставщик цитаты
 DocType: Quality Inspection,Incoming,Входящий
 DocType: BOM,Materials Required (Exploded),Необходимые материалы (в разобранном)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Уменьшите Набор для отпуска без сохранения (LWP)
@@ -3215,10 +3230,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серийный номер {1}, не соответствует {2} {3}"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,ID партии
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Доставка Примечание тенденции
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Резюме этой недели
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} позиция должна быть куплена или получена на основе субподряда в строке {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} позиция должна быть куплена или получена на основе субподряда в строке {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Счет: {0} можно обновить только с помощью биржевых операций
 DocType: GL Entry,Party,Сторона
 DocType: Sales Order,Delivery Date,Дата поставки
@@ -3231,7 +3246,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Покупка Оценить
 DocType: Task,Actual Time (in Hours),Фактическое время (в часах)
 DocType: Employee,History In Company,История В компании
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Рассылка
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Рассылка
 DocType: Address,Shipping,Доставка
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фото со Ledger Entry
 DocType: Department,Leave Block List,Оставьте список есть
@@ -3250,7 +3265,7 @@ DocType: Account,Auditor,Аудитор
 DocType: Purchase Order,End date of current order's period,Дата окончания периода текущего заказа
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Сделать предложение письмо
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Возвращение
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,"По умолчанию Единица измерения для варианта должны быть такими же, как шаблон"
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,"По умолчанию Единица измерения для варианта должны быть такими же, как шаблон"
 DocType: DocField,Fold,Сложить
 DocType: Production Order Operation,Production Order Operation,Производство Порядок работы
 DocType: Pricing Rule,Disable,Отключить
@@ -3282,7 +3297,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Доклады
 DocType: SMS Settings,Enter url parameter for receiver nos,Введите параметр URL для приемника NOS
 DocType: Sales Invoice,Paid Amount,Выплаченная сумма
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',"Закрытие счета {0} должен быть типа ""ответственности"""
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Закрытие счета {0} должен быть типа ""ответственности"""
 ,Available Stock for Packing Items,Доступные Stock для упаковки товаров
 DocType: Item Variant,Item Variant,Пункт Вариант
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Установка этого Адрес шаблон по умолчанию, поскольку нет никакого другого умолчанию"
@@ -3290,7 +3305,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управление качеством
 DocType: Production Planning Tool,Filter based on customer,Фильтр на основе клиента
 DocType: Payment Tool Detail,Against Voucher No,На Сертификаты Нет
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Сотрудник Внешний Работа История
 DocType: Tax Rule,Purchase,Купить
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Баланс Кол-во
@@ -3327,28 +3342,29 @@ Note: BOM = Bill of Materials","Совокупный группа ** ** Пози
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Серийный номер является обязательным для п. {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Пожалуйста, сформулируйте из / в диапазоне"
-sites/assets/js/desk.min.js +7652,Created By,Созданный
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Созданный
 DocType: Serial No,Under AMC,Под КУА
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Пункт ставка оценка пересчитывается с учетом приземлился затрат количество ваучеров
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Настройки по умолчанию для продажи сделок.
 DocType: BOM Replace Tool,Current BOM,Текущий BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Добавить серийный номер
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Добавить серийный номер
 DocType: Production Order,Warehouses,Склады
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Печать и стационарное
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Узел Группа
 DocType: Payment Reconciliation,Minimum Amount,Минимальная сумма
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Обновление Готовые изделия
 DocType: Workstation,per hour,в час
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Серия {0} уже используется в {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Серия {0} уже используется в {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Счет для склада (непрерывной инвентаризации) будет создан для этого счета.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада.
 DocType: Company,Distribution,Распределение
-sites/assets/js/erpnext.min.js +50,Amount Paid,Выплачиваемая сумма
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Выплачиваемая сумма
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Руководитель проекта
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Отправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс скидка позволило пункта: {0} {1}%
 DocType: Customer,Default Taxes and Charges,По умолчанию Налоги и сборы
 DocType: Account,Receivable,Дебиторская задолженность
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Не разрешено изменять Поставщик как уже существует заказа
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, которая имеет право на представление операции, превышающие лимиты кредитования, установленные."
 DocType: Sales Invoice,Supplier Reference,Поставщик Ссылка
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Если отмечено, спецификации для суб-монтажными деталями будут рассмотрены для получения сырья. В противном случае, все элементы В сборе будет рассматриваться в качестве сырья."
@@ -3385,8 +3401,8 @@ DocType: Email Digest,Add/Remove Recipients,Добавить / Удалить п
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Для установки в этом финансовом году, как по умолчанию, нажмите на кнопку ""Установить по умолчанию"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Настройка сервера входящей для поддержки электронный идентификатор. (Например support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Нехватка Кол-во
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата скольжения
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полировальный
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"Поле ""До Даты"" является обязательным для заполнения"
@@ -3399,6 +3415,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Когда любой из проверенных операций ""Представленные"", по электронной почте всплывающее автоматически открывается, чтобы отправить письмо в соответствующий «Контакт» в этой транзакции, с транзакцией в качестве вложения. Пользователь может или не может отправить по электронной почте."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Общие настройки
 DocType: Employee Education,Employee Education,Сотрудник Образование
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Он необходим для извлечения Подробности Элемента.
 DocType: Salary Slip,Net Pay,Чистая Платное
 DocType: Account,Account,Аккаунт
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Серийный номер {0} уже существует
@@ -3431,7 +3448,7 @@ DocType: BOM,Manufacturing User,Производство пользовател
 DocType: Purchase Order,Raw Materials Supplied,Давальческого сырья
 DocType: Purchase Invoice,Recurring Print Format,Периодическая Формат печати
 DocType: Communication,Series,Серии значений
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Ожидаемая дата поставки не может быть до заказа на Дата
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Ожидаемая дата поставки не может быть до заказа на Дата
 DocType: Appraisal,Appraisal Template,Оценка шаблона
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Пункт Классификация
@@ -3487,6 +3504,7 @@ DocType: HR Settings,Payroll Settings,Настройки по заработно
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,"Подходим, не связанных Счета и платежи."
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Разместить заказ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корневая не может иметь родителей МВЗ
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Выберите бренд ...
 DocType: Sales Invoice,C-Form Applicable,C-образный Применимо
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
 DocType: Supplier,Address and Contacts,Адрес и контакты
@@ -3497,7 +3515,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Высочайшая ваучеры
 DocType: Warranty Claim,Resolved By,Решили По
 DocType: Appraisal,Start Date,Дата Начала
-sites/assets/js/desk.min.js +7629,Value,Значение
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Значение
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Выделите листья на определенный срок.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Нажмите здесь, чтобы проверить,"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Счет {0}: Вы не можете назначить себя как родительским счетом
@@ -3513,14 +3531,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox доступ разрешен
 DocType: Dropbox Backup,Weekly,Еженедельно
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Например. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Получать
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Получать
 DocType: Maintenance Visit,Fully Completed,Полностью завершен
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}%
 DocType: Employee,Educational Qualification,Образовательный ценз
 DocType: Workstation,Operating Costs,Операционные расходы
 DocType: Employee Leave Approver,Employee Leave Approver,Сотрудник Оставить утверждающий
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} был успешно добавлен в список наших новостей.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Электронно-лучевая обработка
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Мастер-менеджер
@@ -3533,7 +3551,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Добавить / Изменить цены
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,План МВЗ
 ,Requested Items To Be Ordered,Требуемые товары заказываются
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Мои Заказы
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Мои Заказы
 DocType: Price List,Price List Name,Цена Имя
 DocType: Time Log,For Manufacturing,Для изготовления
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Всего:
@@ -3544,7 +3562,7 @@ DocType: Account,Income,Доход
 DocType: Industry Type,Industry Type,Промышленность Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Что-то пошло не так!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Предупреждение: Оставьте приложение содержит следующие даты блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Дата завершения
 DocType: Purchase Invoice Item,Amount (Company Currency),Сумма (Компания Валюта)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Литье под давлением
@@ -3558,10 +3576,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Год
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Точка-в-продажи профиля
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Обновите SMS Настройки
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Время входа {0} уже выставлен
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Время входа {0} уже выставлен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Название учетного отдела
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Пункт {0} с серийным № уже установлена {1}
 DocType: Maintenance Schedule Detail,Scheduled Date,Запланированная дата
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Всего выплачено Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Сообщения больше, чем 160 символов будет разделен на несколько сообщений"
@@ -3569,10 +3586,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Получил и прин
 ,Serial No Service Contract Expiry,Серийный номер Сервисный контракт Срок
 DocType: Item,Unit of Measure Conversion,Единица измерения конверсии
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Сотрудник не может быть изменен
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Вы не можете кредитные и дебетовые же учетную запись в то же время
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Вы не можете кредитные и дебетовые же учетную запись в то же время
 DocType: Naming Series,Help HTML,Помощь HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100%. Это {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Учет по-{0} скрещенными за Пункт {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Учет по-{0} скрещенными за Пункт {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Имя лица или организации, что этот адрес принадлежит."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ваши Поставщики
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
@@ -3583,10 +3600,11 @@ DocType: Lead,Converted,Переделанный
 DocType: Item,Has Serial No,Имеет Серийный номер
 DocType: Employee,Date of Issue,Дата выдачи
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: С {0} для {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
 DocType: Issue,Content Type,Тип контента
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Компьютер
 DocType: Item,List this Item in multiple groups on the website.,Перечислите этот пункт в нескольких группах на веб-сайте.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Состояние: {0} не существует в системе
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
 DocType: Payment Reconciliation,Get Unreconciled Entries,Получить непримиримыми Записи
@@ -3597,14 +3615,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Для Склад
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Счет {0} был введен более чем один раз в течение финансового года {1}
 ,Average Commission Rate,Средний Комиссия курс
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Посещаемость не могут быть отмечены для будущих дат
 DocType: Pricing Rule,Pricing Rule Help,Цены Правило Помощь
 DocType: Purchase Taxes and Charges,Account Head,Основной счет
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Обновление дополнительных затрат для расчета приземлился стоимость товаров
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Общая стоимость Разница (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс является обязательным
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс является обязательным
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен для сотрудника {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Упрочнения
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,От претензий по гарантии
@@ -3619,15 +3637,17 @@ DocType: Leave Block List,Leave Block List Name,Оставьте Имя Блок
 DocType: User,Enabled,Включено
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"Капитал запасов
 "
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},"Вы действительно хотите, чтобы представить все Зарплата Слип для месяца {0} и год {1}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Вы действительно хотите, чтобы представить все Зарплата Слип для месяца {0} и год {1}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Импорт подписчиков
 DocType: Target Detail,Target Qty,Целевая Кол-во
 DocType: Attendance,Present,Настоящее.
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Доставка Примечание {0} не должны быть представлены
 DocType: Notification Control,Sales Invoice Message,Счет по продажам Написать письмо
 DocType: Authorization Rule,Based On,На основании
-,Ordered Qty,Заказал Кол-во
+DocType: Sales Order Item,Ordered Qty,Заказал Кол-во
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Период с Период и датам обязательных для повторяющихся {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектная деятельность / задачи.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Создать зарплат Slips
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} не является допустимым E-mail ID
@@ -3667,7 +3687,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Добавить посещаемости
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Спецификация и производство Количество требуется
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старение Диапазон 2
-DocType: Journal Entry Account,Amount,Сумма
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Сумма
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Клепка
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменить
 ,Sales Analytics,Продажи Аналитика
@@ -3694,7 +3714,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Ожидаемая дата не может быть до Материал Дата заказа
 DocType: Contact Us Settings,City,Город
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ультразвуковой обработки
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Ошибка: Не действует ID?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Ошибка: Не действует ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
 DocType: Naming Series,Update Series Number,Обновление Номер серии
 DocType: Account,Equity,Ценные бумаги
@@ -3709,7 +3729,7 @@ DocType: Purchase Taxes and Charges,Actual,Фактически
 DocType: Authorization Rule,Customerwise Discount,Customerwise Скидка
 DocType: Purchase Invoice,Against Expense Account,Против Expense Счет
 DocType: Production Order,Production Order,Производственный заказ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
 DocType: Quotation Item,Against Docname,Против DOCNAME
 DocType: SMS Center,All Employee (Active),Все Сотрудник (Активный)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Просмотр сейчас
@@ -3717,14 +3737,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Сырье Стоимость
 DocType: Item,Re-Order Level,Re-ордера и уровней
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введите предметы и плановый Количество, для которых необходимо повысить производственные заказы или скачать сырье для анализа."
-sites/assets/js/list.min.js +174,Gantt Chart,Диаграмма Ганта
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Диаграмма Ганта
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Неполная занятость
 DocType: Employee,Applicable Holiday List,Применимо Список праздников
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серийный Номер серии
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Розничная и оптовая торговля
 DocType: Issue,First Responded On,Впервые Ответил на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крест Листинг пункта в нескольких группах
@@ -3739,7 +3759,7 @@ DocType: Attendance,Attendance,Посещаемость
 DocType: Page,No,Нет
 DocType: BOM,Materials,Материалы
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Если не установлен, то список нужно будет добавлен в каждом департаменте, где он должен быть применен."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Дата публикации и размещения время является обязательным
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Дата публикации и размещения время является обязательным
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Налоговый шаблон для покупки сделок.
 ,Item Prices,Предмет цены
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,По словам будет виден только вы сохраните заказ на поставку.
@@ -3759,9 +3779,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административные затраты
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родительский клиент Группа
-sites/assets/js/erpnext.min.js +50,Change,Изменение
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Изменение
 DocType: Purchase Invoice,Contact Email,Эл. адрес
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',"Заказ на {0} 'Остановлена """
 DocType: Appraisal Goal,Score Earned,Оценка Заработано
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","например ""Моя компания ООО """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Срок Уведомления
@@ -3771,12 +3790,13 @@ DocType: Packing Slip,Gross Weight UOM,Вес брутто Единица изм
 DocType: Email Digest,Receivables / Payables,Кредиторской / дебиторской задолженности
 DocType: Delivery Note Item,Against Sales Invoice,Против продаж счета-фактуры
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Тиснение
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитный счет
 DocType: Landed Cost Item,Landed Cost Item,Посадка Статьи затрат
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Показать нулевые значения
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количество пункта получены после изготовления / переупаковка от заданных величин сырья
 DocType: Payment Reconciliation,Receivable / Payable Account,/ Дебиторская задолженность аккаунт
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
 DocType: Item,Default Warehouse,По умолчанию Склад
 DocType: Task,Actual End Date (via Time Logs),Фактическая Дата окончания (через журналы Time)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Бюджет не может быть назначен на учетную запись группы {0}
@@ -3790,7 +3810,7 @@ DocType: Issue,Support Team,Команда поддержки
 DocType: Appraisal,Total Score (Out of 5),Всего рейтинг (из 5)
 DocType: Contact Us Settings,State,Состояние
 DocType: Batch,Batch,Партия
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Всего расходов претензии (с помощью расходные Претензии)
 DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Дебет-нота
@@ -3806,9 +3826,8 @@ DocType: Lead,Blog Subscriber,Блог подписчика
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Создание правил для ограничения операций на основе значений.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Если флажок установлен, все время не. рабочих дней будет включать в себя праздники, и это приведет к снижению стоимости Зарплата в день"
 DocType: Purchase Invoice,Total Advance,Всего Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Unstop Материал Запрос
 DocType: Workflow State,User,Пользователь
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Расчета заработной платы
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Расчета заработной платы
 DocType: Opportunity Item,Basic Rate,Основная ставка
 DocType: GL Entry,Credit Amount,Сумма кредита
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Установить как Остаться в живых
@@ -3816,7 +3835,7 @@ DocType: Customer,Credit Days Based On,Кредитные дней основа
 DocType: Tax Rule,Tax Rule,Налоговое положение
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Поддержание же скоростью протяжении цикла продаж
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планировать время журналы за пределами рабочего времени рабочих станций.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} уже проведен
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} уже проведен
 ,Items To Be Requested,"Предметы, будет предложено"
 DocType: Purchase Order,Get Last Purchase Rate,Получить последнюю покупку Оценить
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Платежная Оценить на основе вида деятельности (за час)
@@ -3825,6 +3844,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Не найден e-mail ID предприятия, поэтому почта не отправляется"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств (активов)
 DocType: Production Planning Tool,Filter based on item,Фильтр на основе пункта
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Дебетовый счет
 DocType: Fiscal Year,Year Start Date,Дата начала года
 DocType: Attendance,Employee Name,Имя Сотрудника
 DocType: Sales Invoice,Rounded Total (Company Currency),Округлые Всего (Компания Валюта)
@@ -3836,14 +3856,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Гашение
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Вознаграждения работникам
 DocType: Sales Invoice,Is POS,Является POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Изготовлено Кол-во
 DocType: Purchase Receipt Item,Accepted Quantity,Принято Количество
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не существует
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,"Законопроекты, поднятые для клиентов."
 DocType: DocField,Default,По умолчанию
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Нет {0}: Сумма не может быть больше, чем ожидании Сумма против Расход претензии {1}. В ожидании сумма {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Нет {0}: Сумма не может быть больше, чем ожидании Сумма против Расход претензии {1}. В ожидании сумма {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} подписчики добавлены
 DocType: Maintenance Schedule,Schedule,Расписание
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",Определить бюджет для этого МВЗ. Чтобы установить бюджета действие см "Список компании"
@@ -3851,7 +3871,7 @@ DocType: Account,Parent Account,Родитель счета
 DocType: Quality Inspection Reading,Reading 3,Чтение 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Ваучер Тип
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Прайс-лист не найден или отключен
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Прайс-лист не найден или отключен
 DocType: Expense Claim,Approved,Утверждено
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
@@ -3860,23 +3880,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Образование
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Текущий адрес
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Необязательный. Устанавливает по умолчанию валюту компании, если не указано."
 DocType: Address,Office,Офис
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартные отчеты
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Журнал бухгалтерских записей.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партия / счета не соответствует {1} / {2} в {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кол-во на со склада
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партия / счета не соответствует {1} / {2} в {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Чтобы создать налоговый учет
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Пожалуйста, введите Expense счет"
 DocType: Account,Stock,Склад
 DocType: Employee,Current Address,Текущий адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Если деталь вариант другого элемента, то описание, изображение, ценообразование, налоги и т.д., будет установлен из шаблона, если явно не указано"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Подробнее
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Пакетная Инвентарь
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Пакетная Инвентарь
 DocType: Employee,Contract End Date,Конец контракта Дата
 DocType: Sales Order,Track this Sales Order against any Project,Подписка на заказ клиента против любого проекта
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Потяните заказы на продажу (в ожидании, чтобы доставить) на основе вышеуказанных критериев"
 DocType: DocShare,Document Type,Тип документа
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,От поставщика цитаты
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,От поставщика цитаты
 DocType: Deduction Type,Deduction Type,Вычет Тип
 DocType: Attendance,Half Day,Полдня
 DocType: Pricing Rule,Min Qty,Мин Кол-во
@@ -3887,20 +3909,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Для Количество (Изготовитель Количество) является обязательным
 DocType: Stock Entry,Default Target Warehouse,Цель по умолчанию Склад
 DocType: Purchase Invoice,Net Total (Company Currency),Чистая Всего (Компания Валюта)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партия Тип и партия применяется только в отношении / дебиторская задолженность счет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партия Тип и партия применяется только в отношении / дебиторская задолженность счет
 DocType: Notification Control,Purchase Receipt Message,Покупка Получение Сообщение
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Суммарное количество выделенных листья более периода
 DocType: Production Order,Actual Start Date,Фактическое Дата начала
 DocType: Sales Order,% of materials delivered against this Sales Order,% материалов доставлено по данному Заказу
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Запись движений предмета.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Запись движений предмета.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Рассылка подписчика
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Услуга
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Валовая маржа %
 DocType: BOM,With Operations,С операций
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерские уже были сделаны в валюте {0} для компании {1}. Пожалуйста, выберите дебиторской или кредиторской задолженности счет с валютой {0}."
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерские уже были сделаны в валюте {0} для компании {1}. Пожалуйста, выберите дебиторской или кредиторской задолженности счет с валютой {0}."
 ,Monthly Salary Register,Заработная плата Зарегистрироваться
-apps/frappe/frappe/website/template.py +123,Next,Далее
+apps/frappe/frappe/website/template.py +140,Next,Далее
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,BOM Операция
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Электрополировка
@@ -3931,6 +3954,7 @@ DocType: Purchase Invoice,Next Date,Следующая дата
 DocType: Employee Education,Major/Optional Subjects,Основные / факультативных предметов
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Пожалуйста, введите налогов и сборов"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обработка
+DocType: Sales Invoice Item,Drop Ship,Корабль падения
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Здесь Вы можете сохранить семейные подробности, как имя и оккупации родитель, супруг и детей"
 DocType: Hub Settings,Seller Name,Продавец Имя
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),"Налоги, которые вычитаются (Компания Валюта)"
@@ -3957,29 +3981,29 @@ DocType: Purchase Order,To Receive and Bill,Для приема и Билл
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Условия шаблона
 DocType: Serial No,Delivery Details,Подробности доставки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматическое создание материала Запрос если количество падает ниже этого уровня,"
 ,Item-wise Purchase Register,Пункт мудрый Покупка Зарегистрироваться
 DocType: Batch,Expiry Date,Срок годности:
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Чтобы установить уровень повторного заказа, деталь должна быть Покупка товара или товара Производство"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Чтобы установить уровень повторного заказа, деталь должна быть Покупка товара или товара Производство"
 ,Supplier Addresses and Contacts,Поставщик Адреса и контакты
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Пожалуйста, выберите категорию первый"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Мастер проекта.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показывать любой символ вроде $ и т.д. рядом с валютами.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Полдня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Полдня)
 DocType: Supplier,Credit Days,Кредитные дней
 DocType: Leave Type,Is Carry Forward,Является ли переносить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Получить элементов из спецификации
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Получить элементов из спецификации
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Время выполнения дни
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Ведомость материалов
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партия Тип и партия необходима для / дебиторская задолженность внимание {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партия Тип и партия необходима для / дебиторская задолженность внимание {1}
 DocType: Dropbox Backup,Send Notifications To,Отправлять уведомления
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ссылка Дата
 DocType: Employee,Reason for Leaving,Причина увольнения
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционированный Количество
 DocType: GL Entry,Is Opening,Открывает
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Аккаунт {0} не существует
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Аккаунт {0} не существует
 DocType: Account,Cash,Наличные
 DocType: Employee,Short biography for website and other publications.,Краткая биография для веб-сайта и других изданий.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Пожалуйста, создайте Зарплата Структура для работника {0}"
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index 1e89b95e4e..a446c53ae1 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Mode Plat
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vyberte měsíční výplatou, pokud chcete sledovat na základě sezónnosti."
 DocType: Employee,Divorced,Rozvedený
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Upozornenie: Rovnaké položky bol zadaný viackrát.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozornenie: Rovnaké položky bol zadaný viackrát.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Položky již synchronizovat
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povoliť položky, ktoré sa pridávajú viackrát v transakcii"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zhutňovanie a spekanie
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Z materiálu Poptávka
+DocType: Purchase Order,Customer Contact,Kontakt so zákazníkmi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Z materiálu Poptávka
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
@@ -35,10 +36,10 @@ DocType: Delivery Note,Return Against Delivery Note,Návrat Proti dodací list
 DocType: Department,Department,Oddělení
 DocType: Purchase Order,% Billed,% Fakturovaných
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate musí byť rovnaká ako {0} {1} ({2})
-DocType: Sales Invoice,Customer Name,Jméno zákazníka
+DocType: Sales Invoice,Customer Name,Meno zákazníka
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Všech oblastech souvisejících vývozní jako měnu, přepočítacího koeficientu, export celkem, export celkovém součtu etc jsou k dispozici v dodací list, POS, citace, prodejní faktury, prodejní objednávky atd"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (nebo skupiny), proti nimž účetní zápisy jsou vyrobeny a stav je veden."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
 DocType: Manufacturing Settings,Default 10 mins,Predvolené 10 min
 DocType: Leave Type,Leave Type Name,Nechte Typ Jméno
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Řada Aktualizováno Úspěšně
@@ -49,34 +50,33 @@ DocType: Item Price,Multiple Item prices.,Více ceny položku.
 DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
 DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Očakávané Dátum ukončenia nemôže byť nižšia, než sa očakávalo dáta začatia"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Opravdu chcete uvolnit výrobní zakázky: 
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Riadok # {0}: Cena musí byť rovnaké, ako {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,New Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Leave Application
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
-apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Zobrazit Varianty
+apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Zobraziť Varianty
 DocType: Sales Invoice Item,Quantity,Množství
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
-sites/assets/js/erpnext.min.js +27,In Stock,Na skladě
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Možno vykonať len platbu proti nevyfakturované zákazky odberateľa
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na skladě
 DocType: Designation,Designation,Označení
 DocType: Production Plan Item,Production Plan Item,Výrobní program Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Vykonajte nové POS profil
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Péče o zdraví
 DocType: Purchase Invoice,Monthly,Měsíčně
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faktura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Oneskorenie s platbou (dni)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktúra
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mailová adresa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Řádek # {0}:
 DocType: Delivery Note,Vehicle No,Vozidle
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Prosím, vyberte Ceník"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Prosím, vyberte Ceník"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Spracovanie dreva
 DocType: Production Order Operation,Work In Progress,Work in Progress
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D tlač
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otevření o zaměstnání.
 DocType: Item Attribute,Increment,Prírastok
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Vyberte Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklama
 DocType: Employee,Married,Ženatý
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 DocType: Payment Reconciliation,Reconcile,Srovnat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Proveďte Bank Vstup
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Proveďte Bank Vstup
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Penzijní fondy
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Odepsat nákladové středisko
 DocType: Warehouse,Warehouse Detail,Sklad Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Daňové Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
 DocType: Item,Item Image (if not slideshow),Item Image (ne-li slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Zákazník existuje se stejným názvem
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodina Rate / 60) * Skutočná Prevádzková doba
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Host
 DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
 DocType: Lead,Interested,Zájemci
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of materiálu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvor
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopírovat z bodu Group
 DocType: Journal Entry,Opening Entry,Otevření Entry
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Dotaz Product
 DocType: Standard Reply,Owner,Majitel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosím, nejprave zadejte společnost"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Prosím, vyberte první firma"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Prosím, vyberte první firma"
 DocType: Employee Education,Under Graduate,Za absolventa
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Spotřební
 DocType: Upload Attendance,Import Log,Záznam importu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Odeslat
+DocType: Sales Invoice Item,Delivered By Supplier,Dodáva sa podľa dodávateľa
 DocType: SMS Center,All Contact,Vše Kontakt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Ročné Plat
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
@@ -167,16 +169,16 @@ DocType: Journal Entry,Contra Entry,Contra Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Záznamy
 DocType: Journal Entry Account,Credit in Company Currency,Úverové spoločnosti v mene
 DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
 DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pre nákup
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Bod {0} musí být Nákup položky
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
  Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bude aktualizováno po odeslání faktury.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
-apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavení pro HR modul
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavenie modulu HR
 DocType: SMS Center,SMS Center,SMS centrum
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rovnacie
 DocType: BOM Replace Tool,New BOM,New BOM
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Zadejte url parametr zprá
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Pravidla pro používání cen a slevy.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Tentoraz sa Prihlásiť konflikty s {0} na {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Zľava na Cenník Rate (%)
-sites/assets/js/form.min.js +279,Start,Start
-DocType: User,First Name,Křestní jméno
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Nastavení je dokončeno. Aktualizuji.
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
+DocType: User,First Name,Meno
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Liatie Full-forma
 DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmienky
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
@@ -230,26 +231,27 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
 DocType: Lead,Address & Contact,Adresa a kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,Pridať nevyužité listy z predchádzajúcich prídelov
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
 DocType: Newsletter List,Total Subscribers,Celkom Odberatelia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Jméno
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Meno
 DocType: Production Plan Item,SO Pending Qty,SO Pending Množství
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double bývanie
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Listy za rok
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Prosím nastavte Pomenovanie Series pre {0} cez Nastavenia> Nastavenia> Naming Séria
 DocType: Time Log,Will be updated when batched.,Bude aktualizována při dávkově.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
 DocType: Bulk Email,Message,Zpráva
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Nechte Blokováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Item,Publish in Hub,Publikovat v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebol nájdený v "suroviny dodanej" tabuľky v objednávke {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Oznámení Control
 DocType: Lead,Suggestions,Návrhy
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Položka Skupina-moudrý rozpočty na tomto území. Můžete také sezónnosti nastavením distribuce.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Prosím, zadejte mateřskou skupinu účtu pro sklad {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemôže byť väčšia ako dlžnej čiastky {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemôže byť väčšia ako dlžnej čiastky {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generování plán
@@ -291,7 +293,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your La
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Zakáže vytváranie časových protokolov proti výrobnej zákazky. Transakcie nesmú byť sledovaná proti výrobnej zákazky
-DocType: Accounts Settings,Settings for Accounts,Nastavení účtů
+DocType: Accounts Settings,Settings for Accounts,Nastavenie Účtovníctva
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Správa obchodník strom.
 DocType: Item,Synced With Hub,Synchronizovány Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Zlé Heslo
@@ -300,14 +302,12 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
 DocType: DocType,Administrator,Správce
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserové vŕtanie
-DocType: Stock UOM Replace Utility,New Stock UOM,Nových akcií UOM
+DocType: Stock UOM Replace Utility,New Stock UOM,Nová skladová MJ
 DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
 DocType: Employee,External Work History,Vnější práce History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kruhové Referenčné Chyba
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,"Opravdu chcete, aby STOP "
 DocType: Communication,Closed,Zavřeno
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Jste si jisti, že chcete zastavit"
 DocType: Lead,Industry,Průmysl
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Newsletter
@@ -317,17 +317,17 @@ DocType: Stock Settings,Notify by Email on creation of automatic Material Reques
 DocType: Journal Entry,Multi Currency,Viac mien
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Položka je aktualizována
 DocType: Async Task,System Manager,Správce systému
-DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
+DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktúry
 DocType: Sales Invoice Item,Delivery Note,Dodací list
 DocType: Dropbox Backup,Allow Dropbox Access,Povolit přístup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Nastavenie Dane
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Zhrnutie pre tento týždeň a prebiehajúcim činnostiam
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vyberte měsíc a rok
 DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Zadejte e-mail id odděleny čárkami, bude faktura bude zaslán automaticky na určité datum"
-DocType: Employee,Company Email,Společnost E-mail
+DocType: Employee,Company Email,E-mail spoločnosti
 DocType: GL Entry,Debit Amount in Account Currency,Debetné Čiastka v mene účtu
 DocType: Shipping Rule,Valid for Countries,"Platí pre krajiny,"
 DocType: Workflow State,Refresh,obnovit
@@ -338,20 +338,20 @@ apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director
 apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je zákazník měny převeden na zákazníka základní měny"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","K dispozici v BOM, dodací list, fakturu, výrobní zakázky, objednávky, doklad o koupi, prodejní faktury odběratele, Stock vstupu, časový rozvrh"
-DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Select Položka
+DocType: Item Tax,Tax Rate,Sadzba dane
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Select Položka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
  Stock usmíření, použijte Reklamní Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí byť rovnaké, ako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Previesť na non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Příjmka musí být odeslána
-DocType: Stock UOM Replace Utility,Current Stock UOM,Current Reklamní UOM
+DocType: Stock UOM Replace Utility,Current Stock UOM,Terajšia skladová MJ
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (lot) položky.
-DocType: C-Form Invoice Detail,Invoice Date,Datum Fakturace
+DocType: C-Form Invoice Detail,Invoice Date,Dátum fakturácie
 DocType: GL Entry,Debit Amount,Debetné Suma
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Tam môže byť len 1 účet na spoločnosti v {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tam môže byť len 1 účet na spoločnosti v {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaše e-mailová adresa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Přijaté
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
 DocType: Maintenance Visit,Maintenance Type,Typ Maintenance
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Položka Kontrola jakosti Parametr
 DocType: Leave Application,Leave Approver Name,Nechte schvalovač Jméno
 ,Schedule Date,Plán Datum
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Nákup Register
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
 DocType: Workstation,Consumable Cost,Spotřební Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
 DocType: Purchase Receipt,Vehicle Date,Dátum Vehicle
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Lékařský
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Důvod ztráty
@@ -390,17 +390,18 @@ DocType: Employee,Single,Jednolůžkový
 DocType: Issue,Attachment,Príloha
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Rozpočet nie je možné nastaviť pre skupinu nákladového strediska
 DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
-DocType: Purchase Invoice,Yearly,Ročně
+DocType: Purchase Invoice,Yearly,Ročne
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
-DocType: Journal Entry Account,Sales Order,Prodejní objednávky
+DocType: Journal Entry Account,Sales Order,Predajné objednávky
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Prodej Rate
 DocType: Purchase Order,Start date of current order's period,Datum období současného objednávky Začátek
 apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Množství nemůže být zlomek na řádku {0}
-DocType: Purchase Invoice Item,Quantity and Rate,Množství a cena
+DocType: Purchase Invoice Item,Quantity and Rate,Množstvo a sadzba
 DocType: Delivery Note,% Installed,% Inštalovaných
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Prosím, zadejte nejprve název společnosti"
 DocType: BOM,Item Desription,Položka Desription
 DocType: Purchase Invoice,Supplier Name,Dodavatel Name
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Prečítajte si ERPNext Manuál
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaticky nastaviť sériových čísel na základe FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Skontrolujte, či dodávateľské faktúry Počet Jedinečnosť"
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales manažer ve
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday master.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell liatie
 DocType: Material Request Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
@@ -445,32 +446,31 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Doba medzi ope
 DocType: Customer,Buyer of Goods and Services.,Kupující zboží a služeb.
 DocType: Journal Entry,Accounts Payable,Účty za úplatu
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Pridať predplatitelia
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" Neexistuje"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Neexistuje"
 DocType: Pricing Rule,Valid Upto,Valid aľ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Přímý příjmů
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Správní ředitel
 DocType: Payment Tool,Received Or Paid,Přijaté nebo placené
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Prosím, vyberte Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Prosím, vyberte Company"
 DocType: Stock Entry,Difference Account,Rozdíl účtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nedá zatvoriť úloha, ako jeho závislý úloha {0} nie je uzavretý."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
 DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Communication,Subject,Předmět
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 ,Serial No Warranty Expiry,Pořadové č záruční lhůty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Opravdu chcete zastavit tento materiál požadavek?
 DocType: Sales Order,To Deliver,Dodať
 DocType: Purchase Invoice Item,Item,Položka
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Správa Subdodávky
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM NESMÍ být typu celé číslo
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Správa Subdodávky
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nová MJ NESMIE byť typu Celé číslo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Nábytek
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou Ceník měna je převedena na společnosti základní měny"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
@@ -487,10 +487,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid e
  E-mailová adresa"""
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Celkem Billing Tento rok:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
-DocType: Purchase Invoice,Supplier Invoice No,Dodavatelské faktury č
+DocType: Purchase Invoice,Supplier Invoice No,Dodávateľská faktúra č
 DocType: Territory,For reference,Pro srovnání
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nemožno odstrániť Poradové číslo {0}, ktorý sa používa na sklade transakciách"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Uzavření (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Uzavření (Cr)
 DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 ,Pending Qty,Čakajúci Množstvo
@@ -523,20 +523,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,
 DocType: Sales Order,Billing and Delivery Status,Fakturácie a Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Předchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Sales Return
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Predchádzajúci
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vyberte prodejní objednávky, ze kterého chcete vytvořit výrobní zakázky."
+DocType: Item,Delivered by Supplier (Drop Ship),Dodáva Dodávateľom (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Mzdové složky.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Databáze zákazníků.
-DocType: Quotation,Quotation To,Nabídka k
+DocType: Quotation,Quotation To,Ponuka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvor (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
 DocType: Event,Wednesday,Středa
 DocType: Sales Invoice,Customer's Vendor,Prodejce zákazníka
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Výrobní zakázka je povinné
@@ -555,7 +556,7 @@ DocType: Employee,Reason for Resignation,Důvod rezignace
 apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Šablona pro hodnocení výkonu.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Zápis do deníku Podrobnosti
 apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' není v fiskálním roce {2}
-DocType: Buying Settings,Settings for Buying Module,Nastavení pro nákup modul
+DocType: Buying Settings,Settings for Buying Module,Nastavenie pre modul Nákupy
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Prosím, zadejte první doklad o zakoupení"
 DocType: Buying Settings,Supplier Naming By,Dodavatel Pojmenování By
 DocType: Activity Type,Default Costing Rate,Predvolené kalkulácie Rate
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založeno Na"" a ""Seskupeno Podle"", nemůže být stejné"
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
-sites/assets/js/form.min.js +271,To,na
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Zadejte e-mailovou adresu
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,na
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Zadejte e-mailovou adresu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Koniec trubice tvoriaci
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
@@ -587,17 +588,17 @@ DocType: Activity Cost,Projects User,Projekty uživatele
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Spotřeba
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
 DocType: Company,Round Off Cost Center,Zaokrúhliť nákladové stredisko
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Material Request,Material Transfer,Přesun materiálu
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Časová značka zadání musí být po {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Nastavení
+apps/frappe/frappe/config/setup.py +59,Settings,Nastavenia
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky
 DocType: Production Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Provozní doba
-sites/assets/js/list.min.js +5,More,Více
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Více
 DocType: Pricing Rule,Sales Manager,Manažer prodeje
-sites/assets/js/desk.min.js +7673,Rename,Přejmenovat
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Přejmenovat
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Ohýbanie
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Umožňuje uživateli
@@ -607,19 +608,19 @@ DocType: Selling Settings,Delivery Note Required,Delivery Note Povinné
 DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company měny)
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,So spätným suroviny na základe
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosím, zadejte podrobnosti položky"
-DocType: Purchase Receipt,Other Details,Další podrobnosti
+DocType: Purchase Receipt,Other Details,Ďalšie podrobnosti
 DocType: Account,Accounts,Účty
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight strihanie
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumentů na základě jejich sériových čísel. To je možné také použít ke sledování detailů produktu záruční.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 DocType: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
 DocType: Hub Settings,Seller City,Prodejce City
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Ponuka Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Reklamní Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Vítejte
 DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Úkol Předmět
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Zboží od dodavatelů.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Zboží od dodavatelů.
 DocType: Communication,Open,Otevřít
 DocType: Lead,Campaign Name,Název kampaně
 ,Reserved,Rezervováno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,"Opravdu chcete, aby uvolnit"
 DocType: Purchase Order,Supply Raw Materials,Dodávok surovín
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Oběžná aktiva
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Employee,Cell Number,Číslo buňky
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Měsíční plat prohlášení.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Odpovědnost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionovaná Čiastka nemôže byť väčšia ako reklamácia Suma v riadku {0}.
 DocType: Company,Default Cost of Goods Sold Account,Východiskové Náklady na predaný tovar účte
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Ceník není zvolen
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Process Payroll,Send Email,Odeslat email
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemáte oprávnění
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budú zobrazené vyššie
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moje Faktúry
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Žádný zaměstnanec nalezeno
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Žádný zaměstnanec nalezeno
 DocType: Purchase Order,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Vyberte BOM na začiatok
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Nahrát n
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Odeslat nyní
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Sklad pro web
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Opravdu chcete zastavit výrobní zakázky: 
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form záznamy
@@ -753,28 +752,29 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Podpo
 DocType: Features Setup,"To enable ""Point of Sale"" features",Ak chcete povoliť "Point of Sale" predstavuje
 DocType: Bin,Moving Average Rate,Klouzavý průměr
 DocType: Production Planning Tool,Select Items,Vyberte položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} proti účtu {1} ze dne {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} proti účtu {1} ze dne {2}
 DocType: Comment,Reference Name,Název reference
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Nechajte cez dodávku alebo príjem aľ tohto percenta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Čistý zisk / ztráta
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Čistý zisk / strata
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
 DocType: Production Order,Item To Manufacture,Bod K výrobě
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Trvalé odlievanie foriem
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Objednávka na platobné
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} je stav {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Objednávka na platobné
 DocType: Sales Order Item,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
 DocType: Newsletter,Newsletter Manager,Newsletter Manažér
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Bod Variant {0} už existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"Otvorenie"
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
 DocType: Expense Claim,Expenses,Výdaje
-DocType: Item Variant Attribute,Item Variant Attribute,Položka Variant Atribút
+DocType: Item Variant Attribute,Item Variant Attribute,Vlastnosť Variantu Položky
 ,Purchase Receipt Trends,Doklad o koupi Trendy
 DocType: Appraisal,Select template from which you want to get the Goals,"Vyberte šablonu, ze kterého chcete získat cílů"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,Požadované Čísla
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Hodnocení výkonu.
 DocType: Sales Invoice Item,Stock Details,Sklad Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Mieste predaja
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Nelze převést {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Mieste predaja
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nelze převést {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
 DocType: Account,Balance must be,Zůstatek musí být
 DocType: Hub Settings,Publish Pricing,Publikovat Ceník
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrazívne tryskanie
-sites/assets/js/desk.min.js +3938,Ms,Paní
+DocType: Employee,Ms,Paní
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizový kurz master.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nemožno nájsť časový úsek v najbližších {0} dní na prevádzku {1}
 DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,Rozsah
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Features Setup,Item Barcode,Položka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Varianty Položky {0} aktualizované
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 DocType: Address,Shop,Obchod
 DocType: Hub Settings,Sync Now,Sync teď
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
 DocType: Employee,Permanent Address Is,Trvalé bydliště je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Značka
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
 DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
 DocType: Item,Is Purchase Item,je Nákupní Položka
 DocType: Journal Entry Account,Purchase Invoice,Přijatá faktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
 DocType: Stock Entry,Total Outgoing Value,Celková hodnota Odchozí
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Dátum začatia a dátumom ukončenia by malo byť v rámci rovnakého fiškálny rok
 DocType: Lead,Request for Information,Žádost o informace
 DocType: Payment Tool,Paid,Placený
 DocType: Salary Slip,Total in words,Celkem slovy
 DocType: Material Request Item,Lead Time Date,Čas a Dátum Obchodnej iniciatívy
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,"je povinné. Možno, Zmenáreň záznam nie je vytvorená pre"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pre "produktom Bundle predmety, sklad, sériové číslo a dávkové No bude považovaná zo" Balenie zoznam 'tabuľky. Ak Warehouse a Batch No sú rovnaké pre všetky balenia položky pre akúkoľvek "Výrobok balík" položky, tieto hodnoty môžu byť zapísané do hlavnej tabuľky položky, budú hodnoty skopírované do "Balenie zoznam" tabuľku."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Zásilky zákazníkům.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Zásilky zákazníkům.
 DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Nepřímé příjmy
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Čiastka platby = dlžnej čiastky
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,Adresní řádek 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Odchylka
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Název společnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobraziť zoznam všetkých nápovedy videí
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
 DocType: Pricing Rule,Max Qty,Max Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemický
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 DocType: Process Payroll,Select Payroll Year and Month,Vyberte Payroll rok a mesiac
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Prejdite na príslušnej skupiny (zvyčajne využitia finančných prostriedkov> obežných aktív> bankových účtov a vytvoriť nový účet (kliknutím na Pridať dieťa) typu "Bank"
 DocType: Workstation,Electricity Cost,Cena elektřiny
@@ -881,12 +884,12 @@ DocType: Opportunity,Walk In,Vejít
 DocType: Item,Inspection Criteria,Inspekční Kritéria
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Strom finanial nákladových středisek.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prevedené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Nahrajte svoju hlavičku a logo pre dokumenty. (Môžete ich upravovať neskôr.)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Biela
 DocType: SMS Center,All Lead (Open),Všetky Iniciatívy (Otvorené)
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Připojit svůj obrázek
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Dělat 
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pripojiť svoj obrázok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Dělat 
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
 DocType: Workflow State,Stop,Stop
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává."
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,Balení Slip Item
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Odstránené položky bez zmeny množstva alebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Atribút tabuľka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nemůže být negativní
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podanie
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"Bude aktualizo
 DocType: Project,Internal,Interní
 DocType: Task,Urgent,Naléhavý
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Zadajte platný riadok ID riadku tabuľky {0} {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Prejdite na plochu a začať používať ERPNext
 DocType: Item,Manufacturer,Výrobce
 DocType: Landed Cost Item,Purchase Receipt Item,Položka příjemky
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Prodejní Částka
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Čas Záznamy
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
 DocType: Serial No,Creation Document No,Tvorba dokument č
 DocType: Issue,Issue,Problém
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
@@ -941,9 +945,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Predajné objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Tvorba prírastkov zásob
-DocType: Packing Slip,Net Weight UOM,Hmotnost UOM
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Tvorba prírastkov zásob
+DocType: Packing Slip,Net Weight UOM,Čistá hmotnosť MJ
 DocType: Item,Default Supplier,Výchozí Dodavatel
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad výrobou Percento príspevkoch
 DocType: Shipping Rule Condition,Shipping Rule Condition,Přepravní Pravidlo Podmínka
@@ -951,14 +956,14 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
 DocType: Sales Person,Select company name first.,Vyberte název společnosti jako první.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponuky od Dodávateľov.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Chcete-li {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,aktualizovať cez čas Záznamy
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
 DocType: Opportunity,Your sales person who will contact the customer in future,"Váš obchodní zástupce, který bude kontaktovat zákazníka v budoucnu"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Seznam několik svých dodavatelů. Ty by mohly být organizace nebo jednotlivci.
-DocType: Company,Default Currency,Výchozí měna
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,"Napíšte niekoľkých svojich dodávateľov. Môžu to byť organizácie, ale aj jednotlivci."
+DocType: Company,Default Currency,Predvolená mena
 DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
 DocType: Contact Us Settings,Address,Adresa
 DocType: Expense Claim,From Employee,Od Zaměstnance
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registrace firmy čísla pro váš odkaz. Daňové čísla atd
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Z rozsahu, musí byť nižšia ako na Range"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vyberte Time protokolů a předložit k vytvoření nové prodejní faktury.
@@ -1010,11 +1015,11 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Modr
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Cenník Krajina
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Další uzly mohou být pouze vytvořena v uzlech typu ""skupiny"""
-DocType: Item,UOMs,UOMs
+DocType: Item,UOMs,Merné Jednotky
 apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} platí pořadová čísla pro položky {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} už vytvorili pre užívateľov: {1} a spoločnosť {2}
-DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
+DocType: Purchase Order Item,UOM Conversion Factor,Faktor konverzie MJ
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Vrstvené objektu výrobnej
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Databáze dodavatelů.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Daňové
 DocType: Lead,Lead,Obchodná iniciatíva
 DocType: Email Digest,Payables,Závazky
 DocType: Account,Warehouse,Sklad
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá miera
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Smířit platbě
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
 DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
-apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitný riadok {0} s rovnakým {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Nastavenie Zamestnanci
-sites/assets/js/erpnext.min.js +5,"Grid ""","Grid """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Nastavenia pre modul Zamestnanci
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosím, vyberte první prefix"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Výzkum
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,Odesláno
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 DocType: Communication,Delivery Status,Delivery Status
 DocType: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendy platené
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Účtovné Ledger
 DocType: Stock Reconciliation,Difference Amount,Rozdiel Suma
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Nerozdelený zisk
 DocType: BOM Item,Item Description,Položka Popis
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Dočasné Otvorenie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaměstnanec Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
 DocType: Address,Address Type,Typ adresy
 DocType: Purchase Receipt,Rejected Warehouse,Zamítnuto Warehouse
 DocType: GL Entry,Against Voucher,Proti poukazu
 DocType: Item,Default Buying Cost Center,Výchozí Center Nákup Cost
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Ak chcete získať to najlepšie z ERPNext, odporúčame vám nejaký čas trvať, a sledovať tieto nápovedy videa."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Položka {0} musí být Sales Item
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,na
 DocType: Item,Lead Time in days,Vek Obchodnej iniciatívy v dňoch
 ,Accounts Payable Summary,Splatné účty Shrnutí
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Místo vydání
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Smlouva
 DocType: Report,Disabled,Vypnuto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Zemědělství
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,Způsob platby
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
-sites/assets/js/form.min.js +190,Name is required,Jméno je vyžadováno
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Meno je požadované
 DocType: Purchase Invoice,Recurring Type,Opakující se Typ
 DocType: Address,City/Town,Město / Město
 DocType: Email Digest,Annual Income,Ročný príjem
 DocType: Serial No,Serial No Details,Serial No Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitálové Vybavení
@@ -1124,17 +1132,17 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing
 DocType: Hub Settings,Seller Website,Prodejce Website
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Stav výrobní zakázka je {0}
-DocType: Appraisal Goal,Goal,Cíl
+DocType: Appraisal Goal,Goal,Cieľ
 DocType: Sales Invoice Item,Edit Description,Upraviť popis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očakávané dátum dodania je menšia ako plánovaný dátum začatia.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Celkem Odchozí
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tam může být pouze jeden Shipping Rule Podmínka s 0 nebo prázdnou hodnotu pro ""na hodnotu"""
 DocType: Authorization Rule,Transaction,Transakce
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Poznámka: Tento Nákladové středisko je Group. Nelze vytvořit účetní zápisy proti skupinám.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Nástroje
+apps/frappe/frappe/config/desk.py +7,Tools,Nástroje
 DocType: Item,Website Item Groups,Webové stránky skupiny položek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Výrobní číslo objednávky je povinná pro legální vstup účelem výroby
 DocType: Purchase Invoice,Total (Company Currency),Total (Company meny)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,Meno pracovnej stanice
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-sites/assets/js/desk.min.js +7652,Comments,Komentáře
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentáře
 DocType: Salary Slip,Bank Account No.,Bankovní účet č.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Ocenění Rate potřebný k bodu {0}
@@ -1157,9 +1165,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,T
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vyberte spoločnosť
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
-DocType: Purchase Invoice,Supplier Invoice Date,Dodavatelské faktury Datum
+DocType: Purchase Invoice,Supplier Invoice Date,Dátum dodávateľskej faktúry
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Musíte povolit Nákupní košík
-sites/assets/js/form.min.js +212,No Data,No Data
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Posouzení Template Goal
 DocType: Salary Slip,Earning,Získávání
 DocType: Payment Tool,Party Account Currency,Party Mena účtu
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,Party Mena účtu
 DocType: Purchase Taxes and Charges,Add or Deduct,Přidat nebo Odečíst
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ak Ročný rozpočet prekročený (pre výdavkového účtu)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Celková hodnota objednávky
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter kontaktom a obchodným iniciatívam
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},"Mena záverečného účtu, musí byť {0}"
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Súčet bodov za všetkých cieľov by malo byť 100. Je {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operace nemůže být prázdné.
 ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status aktualizován na {0}
 DocType: DocField,Description,Popis
 DocType: Authorization Rule,Average Discount,Průměrná sleva
 DocType: Letter Head,Is Default,Je Výchozí
@@ -1193,7 +1201,7 @@ DocType: Activity Cost,Projects,Projekty
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Prosím, vyberte Fiskální rok"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operace Popis
-DocType: Item,Will also apply to variants,Bude se vztahovat i na varianty
+DocType: Item,Will also apply to variants,Bude sa vzťahovať aj na varianty
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
 DocType: Quotation,Shopping Cart,Nákupní vozík
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odchozí
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky
 DocType: Item,Maintain Stock,Udržiavať Zásoby
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pro Společnost
@@ -1217,22 +1225,22 @@ DocType: Sales Invoice,Shipping Address Name,Přepravní Adresa Název
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Diagram účtů
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Závisí na dovolenke bez nároku na mzdu
 DocType: Pricing Rule,"Higher the number, higher the priority","Vyšší číslo, vyšší priorita"
 ,Purchase Invoice Trends,Trendy přijatách faktur
 DocType: Employee,Better Prospects,Lepší vyhlídky
-DocType: Appraisal,Goals,Cíle
+DocType: Appraisal,Goals,Ciele
 DocType: Warranty Claim,Warranty / AMC Status,Záruka / AMC Status
 ,Accounts Browser,Účty Browser
 DocType: GL Entry,GL Entry,Vstup GL
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Do List
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Do List
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Učeň
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativní množství není dovoleno
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Záporné množství nie je dovolené
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detail tabulka staženy z položky pána jako řetězec a uložené v této oblasti.
  Používá se daní a poplatků"
@@ -1245,7 +1253,7 @@ DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, po
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Daňové Pravidlo pre transakcie.
 DocType: Rename Tool,Type of document to rename.,Typ dokumentu přejmenovat.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vykupujeme tuto položku
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Táto položka sa kupuje
 DocType: Address,Billing,Fakturace
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Obrubovanie
 DocType: Bulk Email,Not Sent,Neodesláno
@@ -1261,15 +1269,15 @@ DocType: Supplier,Stock Manager,Reklamný manažér
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Balení Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pronájem kanceláře
-apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavení Nastavení SMS brána
+apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavenie SMS brány
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Žádná adresa přidán dosud.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytik
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
 DocType: Item,Inventory,Inventář
 DocType: Features Setup,"To enable ""Point of Sale"" view",Ak chcete povoliť "Point of Sale" pohľadu
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
 DocType: Item,Sales Details,Prodejní Podrobnosti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pripne
 DocType: Opportunity,With Items,S položkami
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Dátum, kedy bude vygenerovaný budúci faktúry. To je generovaný na odoslať."
 DocType: Item Attribute,Item Attribute,Položka Atribut
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vláda
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Položka Varianty
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Varianty Položky
 DocType: Company,Services,Služby
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Celkem ({0})
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Zahlbovanie
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Material Request Item,Sales Order No,Prodejní objednávky No
 DocType: Item Group,Item Group Name,Položka Název skupiny
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Zaujatý
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Zaujatý
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
 DocType: Pricing Rule,For Price List,Pro Ceník
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá suma
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatočná zľava Suma (Mena Company)
-DocType: Period Closing Voucher,CoA Help,CoA Help
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Chyba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Chyba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory
@@ -1314,8 +1321,9 @@ DocType: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
 DocType: Event,Tuesday,Úterý
 DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
 ,Accounts Receivable Summary,Pohledávky Shrnutí
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Listy typu {0} už pridelené pre zamestnancov {1} na dobu {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
-DocType: UOM,UOM Name,UOM Name
+DocType: UOM,UOM Name,Názov Mernej Jednotky
 DocType: Top Bar Item,Target,Cíl
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Výše příspěvku
 DocType: Sales Invoice,Shipping Address,Shipping Address
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Účtovný záznam pre {0} možno vykonávať iba v mene: {1}
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Vystrihovanie
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Materiál Žiadosť o príkaze k nákupu
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiál Žiadosť o príkaze k nákupu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Riadok # {0}: vrátenej položky {1} neexistuje v {2} {3}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovní účty
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankové účty
 ,Bank Reconciliation Statement,Bank Odsouhlasení prohlášení
 DocType: Address,Lead Name,Meno Obchodnej iniciatívy
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otvorenie Sklad Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Otvorenie Sklad Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} musí být uvedeny pouze jednou
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nie je povolené, aby transfer viac {0} ako {1} proti objednanie {2}"
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Žádné položky k balení
 DocType: Shipping Rule Condition,From Value,Od hodnoty
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Výrobní množství je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Výrobní množství je povinné
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Částky nezohledněny v bance
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Nároky na náklady firmy.
@@ -1359,24 +1367,25 @@ DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 DocType: Production Planning Tool,Select Sales Orders,Vyberte Prodejní objednávky
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označiť ako Dodáva
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Značka Citácia
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Skúste plánovanie operácií pre X dní vopred.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 DocType: SMS Center,Receiver List,Přijímač Seznam
 DocType: Payment Tool Detail,Payment Amount,Částka platby
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Zobraziť
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobraziť
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektívne laserové spekanie
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import byl úspěšný!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Staroba (dni)
-DocType: Quotation Item,Quotation Item,Položka Nabídky
+DocType: Quotation Item,Quotation Item,Položka ponuky
 DocType: Account,Account Name,Název účtu
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% účtovaný
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reserved Množství
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
 DocType: Lead,Upper Income,Horní příjmů
@@ -1435,14 +1444,15 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Povolit Nákupní košík
 DocType: Employee,Permanent Address,Trvalé bydliště
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Položka {0} musí být služba položky.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Vyplatená záloha proti {0} {1} nemôže byť väčšia \ než Grand Celkom {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Prosím, vyberte položku kód"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Snížit Odpočet o dovolenou bez nároku na odměnu (LWP)
 DocType: Territory,Territory Manager,Oblastní manažer
+DocType: Delivery Note Item,To Warehouse (Optional),Warehouse (voliteľné)
 DocType: Sales Invoice,Paid Amount (Company Currency),Zaplatená suma (Company meny)
 DocType: Purchase Invoice,Additional Discount,Ďalšie zľavy
-DocType: Selling Settings,Selling Settings,Prodejní Nastavení
+DocType: Selling Settings,Selling Settings,Nastavenia pre Predaj
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Aukce online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Společnost, měsíc a fiskální rok je povinný"
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Baníctvo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin liatie
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Prosím, vyberte {0} jako první."
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosím, vyberte {0} jako první."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
@@ -1477,7 +1487,7 @@ DocType: Quotation,Order Type,Typ objednávky
 DocType: Purchase Invoice,Notification Email Address,Oznámení e-mailová adresa
 DocType: Payment Tool,Find Invoices to Match,Nájsť faktúry zápas
 ,Item-wise Sales Register,Item-moudrý Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","např ""XYZ Národní Banka"""
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","napríklad ""XYZ Národná Banka"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Celkem Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Nákupný košík je povolené
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,Č. šarže
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povoliť viac Predajné objednávky proti Zákazníka Objednávky
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hlavné
 DocType: DocPerm,Delete,Smazat
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Varianta
-sites/assets/js/desk.min.js +7971,New {0},Nový: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varianta
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nový: {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
 DocType: Employee,Leave Encashed?,Ponechte zpeněžení?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Item,Variants,Varianty
@@ -1512,11 +1522,11 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Země
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresy
 DocType: Communication,Received,Přijato
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Položka nesmie mať výrobné zákazky.
-DocType: DocField,Attach Image,Připojit obrázek
+DocType: DocField,Attach Image,Pripojiť obrázok
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Čistá hmotnost tohoto balíčku. (Automaticky vypočítá jako součet čisté váhy položek)
 DocType: Stock Reconciliation Item,Leave blank if no change,"Ponechte prázdné, pokud žádná změna"
 DocType: Sales Order,To Deliver and Bill,Dodať a Bill
@@ -1532,8 +1542,7 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Mate
 DocType: Employee,Salutation,Oslovení
 DocType: Communication,Rejected,Zamítnuto
 DocType: Pricing Rule,Brand,Značka
-DocType: Item,Will also apply for variants,Bude platit i pro varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Dodaných
+DocType: Item,Will also apply for variants,Bude platiť aj pre varianty
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
 DocType: Sales Order Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Referencie
@@ -1566,26 +1575,25 @@ DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Získat položky z
 DocType: Serial No,Creation Date,Datum vytvoření
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Položka {0} se objeví několikrát v Ceníku {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodej musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
-DocType: Purchase Order Item,Supplier Quotation Item,Dodavatel Nabídka Položka
+DocType: Purchase Order Item,Supplier Quotation Item,Položka dodávateľskej ponuky
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Proveďte platovou strukturu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Strihanie
 DocType: Item,Has Variants,Má varianty
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klikněte na tlačítko "", aby se prodej na faktuře"" vytvořit nový prodejní faktury."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,"Období od a období, na termíny povinných opakujících% s"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Balenie a označovanie
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Uveďte prosím výchozí měnu, ve společnosti Master and Global výchozí"
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Správa projektov
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Správa projektov
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
 DocType: Budget Detail,Fiscal Year,Fiskální rok
 DocType: Cost Center,Budget,Rozpočet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nemožno priradiť proti {0}, pretože to nie je výnos alebo náklad účet"
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Dosažená
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,např. 5
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,napríklad 5
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
 DocType: Item,Is Sales Item,Je Sales Item
@@ -1604,14 +1612,14 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table ca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Řádek {0}: Pro nastavení {1} periodicita, rozdíl mezi z a aktuální \
  musí být větší než nebo rovno {2}"
-DocType: Pricing Rule,Selling,Prodejní
+DocType: Pricing Rule,Selling,Predaj
 DocType: Employee,Salary Information,Vyjednávání o platu
-DocType: Sales Person,Name and Employee ID,Jméno a ID zaměstnance
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+DocType: Sales Person,Name and Employee ID,Meno a ID zamestnanca
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Odvody a daně
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Prosím, zadejte Referenční den"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} platobné položky môžu nie je možné filtrovať {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Odvody a dane
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Prosím, zadejte Referenční den"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platobné položky môžu nie je možné filtrovať {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množstvo
 DocType: Material Request Item,Material Request Item,Materiál Žádost o bod
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Strom skupiny pol
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Červená
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
 DocType: Installation Note,Installation Time,Instalace Time
@@ -1628,7 +1636,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transac
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Změna UOM za položku.
+apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Zmeniť MJ na položke.
 DocType: Quality Inspection Reading,Acceptance Criteria,Kritéria přijetí
 DocType: Item Attribute,Attribute Name,Název atributu
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Položka {0} musí být prodej či servis položku v {1}
@@ -1641,7 +1649,7 @@ apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Ganttův d
 DocType: Appraisal,For Employee Name,Pro jméno zaměstnance
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Značky
-DocType: C-Form Invoice Detail,Invoice No,Faktura č
+DocType: C-Form Invoice Detail,Invoice No,Faktúra č.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Z vydané objednávky
 DocType: Activity Cost,Costing Rate,Kalkulácie Rate
 ,Customer Addresses And Contacts,Adresy zákazníkov a kontakty
@@ -1650,7 +1658,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing R
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Není nastaveno
 DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Drž se, když váš systém je nastavení. To může trvat několik okamžiků."
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Vydržte, kým sa váš systém nastaví. Môže to pár chvíľ trvať."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pár
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
@@ -1660,17 +1668,17 @@ DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
 DocType: Employee,Personal Details,Osobní data
 ,Maintenance Schedules,Plány údržby
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Razba
-,Quotation Trends,Uvozovky Trendy
+,Quotation Trends,Vývoje ponúk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Jako výrobní objednávce lze provést za tuto položku, musí být skladem."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Jako výrobní objednávce lze provést za tuto položku, musí být skladem."
 DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spájanie
 DocType: Authorization Rule,Above Value,Výše uvedená hodnota
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Dodává
-apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Nastavení příchozí server pro úlohy e-mailovou id. (Např jobs@example.com)
+DocType: Purchase Order,Delivered,Dodává
+apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Nastavenie serveru prichádzajúcej pošty s ID emailom pre uchádzačov o prácu. (Napríklad praca@priklad.com)
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
 DocType: Journal Entry,Accounts Receivable,Pohledávky
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuovat poplatků
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka"
 DocType: HR Settings,HR Settings,Nastavení HR
 apps/frappe/frappe/config/setup.py +130,Printing,Tisk
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatočná zľava Suma
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den (y), na které žádáte o dovolené jsou dovolenou. Potřebujete nevztahuje na dovolenou."
-sites/assets/js/desk.min.js +7805,and,a
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,a
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sportovní
@@ -1722,11 +1730,10 @@ DocType: Project,% Tasks Completed,% splněných úkolů
 DocType: Project,Gross Margin,Hrubá marža
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,zakázané uživatelské
-DocType: Opportunity,Quotation,Nabídka
+DocType: Opportunity,Quotation,Ponuka
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 DocType: Quotation,Maintenance User,Údržba uživatele
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Náklady Aktualizované
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,"Jste si jisti, že chcete ODZASTAVIT"
 DocType: Employee,Date of Birth,Datum narození
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
@@ -1735,23 +1742,24 @@ DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní d
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Popis Práca
-DocType: Purchase Order Item,Qty as per Stock UOM,Množství podle Stock nerozpuštěných
+DocType: Purchase Order Item,Qty as per Stock UOM,Množstvo podľa skladovej MJ
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vyberte prosím platný CSV soubor s daty
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Náter
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic. "
 DocType: Expense Claim,Approver,Schvalovatel
 ,SO Qty,SO Množství
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
 DocType: Appraisal,Calculate Total Score,Vypočítat Celková skóre
 DocType: Supplier Quotation,Manufacturing Manager,Výrobní ředitel
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Zásielky
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip liatie
+DocType: Purchase Order,To be delivered to customer,Ak chcete byť doručený zákazníkovi
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Poradové číslo {0} nepatrí do skladu,"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavení
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavenia
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # 
 DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti)
 DocType: Pricing Rule,Supplier,Dodavatel
@@ -1771,13 +1779,13 @@ DocType: Leave Control Panel,Leave blank if considered for all departments,"Pone
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je povinná k položce {1}
 DocType: Currency Exchange,From Currency,Od Měny
-DocType: DocField,Name,Jméno
+DocType: DocField,Name,Meno
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Částky nejsou zohledněny v systému
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Ostatní
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Nastaviť ako Zastavené
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nemožno nájsť zodpovedajúce položku. Vyberte nejakú inú hodnotu pre {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
@@ -1786,27 +1794,28 @@ DocType: Web Form,Select DocType,Zvolte DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Preťahovanie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankovnictví
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nové Nákladové Středisko
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nové Nákladové Středisko
 DocType: Bin,Ordered Quantity,Objednané množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","napríklad ""Nástroje pre stavbárov """
 DocType: Quality Inspection,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} proti Prodejní Objednávce {1}
+DocType: Purchase Order Item,Reference Document Type,Referenčná Typ dokumentu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} proti Prodejní Objednávce {1}
 DocType: Account,Fixed Asset,Základní Jmění
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serialized Zásoby
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Zásoby
 DocType: Activity Type,Default Billing Rate,Predvolené fakturácia Rate
 DocType: Time Log Batch,Total Billing Amount,Celková suma fakturácie
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Pohledávky účtu
 ,Stock Balance,Reklamní Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Predajné objednávky na platby
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Predajné objednávky na platby
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Čas Záznamy vytvořil:
-DocType: Item,Weight UOM,Hmotnostní jedn.
+DocType: Item,Weight UOM,Hmotnostná MJ
 DocType: Employee,Blood Group,Krevní Skupina
 DocType: Purchase Invoice Item,Page Break,Zalomení stránky
 DocType: Production Order Operation,Pending,Až do
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nemôžete zmeniť predvolený UOM variantných. Ak chcete zmeniť predvolený UOM pre Variant zmena východiskovej nerozpustených šablóny
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nemôžete zmeniť predvolenú MJ pre Variant produktu. Ak chcete zmeniť predvolenú MJ pre Variant zmeňte predvolenú MJ šablóny produktu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kancelářské Vybavení
 DocType: Purchase Invoice Item,Qty,Množství
 DocType: Fiscal Year,Companies,Společnosti
@@ -1834,21 +1843,20 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Ceník {0} je zakázána
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ceník {0} je zakázána
 DocType: Manufacturing Settings,Allow Overtime,Povoliť Nadčasy
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Prodejní objednávky {0} je zastaven
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériové čísla požadované pre položky {1}. Poskytli ste {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuálne ocenenie Rate
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
 DocType: Opportunity,Lost Reason,Ztracené Důvod
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Zváranie
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Je zapotřebí nové Reklamní UOM
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Je potrebná nová skladová MJ
 DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Všechny položky již byly fakturovány
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Ďalšie nákladové strediská môžu byť vyrobené v rámci skupiny, ale položky môžu byť vykonané proti non-skupín"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Ďalšie nákladové strediská môžu byť vyrobené v rámci skupiny, ale položky môžu byť vykonané proti non-skupín"
 DocType: Project,External,Externí
 DocType: Features Setup,Item Serial Nos,Položka sériových čísel
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,D
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
 DocType: SMS Log,Sender Name,Jméno odesílatele
 DocType: Page,Title,Titulek
-sites/assets/js/list.min.js +104,Customize,Přizpůsobit
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Přizpůsobit
 DocType: POS Profile,[Select],[Vybrat]
 DocType: SMS Log,Sent To,Odoslaná
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Proveďte prodejní faktuře
@@ -1900,18 +1908,19 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Konec životnosti
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Cestování
 DocType: Leave Block List,Allow Users,Povolit uživatele
+DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žiadne
 DocType: Sales Invoice,Recurring,Opakujúce sa
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledovat samostatné výnosy a náklady pro vertikál produktu nebo divizí.
 DocType: Rename Tool,Rename Tool,Přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Přenos materiálu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
 DocType: Installation Note,Installation Note,Poznámka k instalaci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Přidejte daně
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Pridajte dane
 ,Financial Analytics,Finanční Analýza
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,Zaměstnanec
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importovať e-maily z
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Pozvať ako Užívateľ
 DocType: Features Setup,After Sale Installations,Po prodeji instalací
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} je plně fakturováno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je plně fakturováno
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardní smluvní podmínky pro prodej nebo koupi.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Seskupit podle Poukazu
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,Hromadné emaily
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Súbor premenovať
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zobraziť Platby
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Veľkosť
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
@@ -1954,11 +1964,11 @@ DocType: Buying Settings,Buying Settings,Nákup Nastavení
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass dokončovacie
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Ne pro hotový dobré položce
 DocType: Upload Attendance,Attendance To Date,Účast na data
-apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Nastavení příchozí server pro prodej e-mailovou id. (Např sales@example.com)
+apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Nastavenie serveru prichádzajúcej pošty s ID emailom pre Predaj. (Napríklad obchod@priklad.com)
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Tool,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Uveďte prosím společnost pokračovat
-sites/assets/js/list.min.js +23,Draft,Návrh
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Návrh
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,Accepted,Přijato
 DocType: User,Female,Žena
@@ -1971,17 +1981,18 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Ako tam sú existujúce skladové transakcie pre túto položku, \ nemôžete zmeniť hodnoty "Má sériové číslo", "má Batch Nie", "Je skladom" a "ocenenie Method""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Rýchly vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
 DocType: Stock Entry,For Quantity,Pre Množstvo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} není odesláno
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Žádosti o položky.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} není odesláno
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Žádosti o položky.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kompletní nastavení
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Dokončiť nastavenie
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
@@ -1990,9 +2001,9 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter adres
 DocType: Delivery Note,Transporter Name,Přepravce Název
 DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Celkem Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Měrná jednotka
-DocType: Fiscal Year,Year End Date,Datum Konce Roku
+DocType: Fiscal Year,Year End Date,Dátum konca roka
 DocType: Task Depends On,Task Depends On,Úloha je závislá na
 DocType: Lead,Opportunity,Příležitost
 DocType: Salary Structure Earning,Salary Structure Earning,Plat Struktura Zisk
@@ -2000,23 +2011,23 @@ DocType: Salary Structure Earning,Salary Structure Earning,Plat Struktura Zisk
 DocType: Operation,Default Workstation,Výchozí Workstation
 DocType: Notification Control,Expense Claim Approved Message,Zpráva o schválení úhrady výdajů
 DocType: Email Digest,How frequently?,Jak často?
-DocType: Purchase Receipt,Get Current Stock,Získejte aktuální stav
+DocType: Purchase Receipt,Get Current Stock,Získať aktuálny stav
 apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Strom Bill materiálov
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
 DocType: Production Order,Actual End Date,Skutečné datum ukončení
 DocType: Authorization Rule,Applicable To (Role),Vztahující se na (Role)
 DocType: Stock Entry,Purpose,Účel
-DocType: Item,Will also apply for variants unless overrridden,"Bude platit i pro varianty, pokud nebude přepsáno"
+DocType: Item,Will also apply for variants unless overrridden,"Bude platiť aj pre varianty, pokiaľ nebude prepísané"
 DocType: Purchase Invoice,Advances,Zálohy
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Schválení Uživatel nemůže být stejná jako uživatel pravidlo se vztahuje na
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Základná sadzba (podľa Stock nerozpustených)
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Základná sadzba (podľa skladovej MJ)
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
 DocType: Campaign,Campaign-.####,Kampaň-.####
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Prenikavý
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
 DocType: Customer Group,Has Child Node,Má děti Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} proti Nákupní Objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} proti Nákupní Objednávce {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie je v žiadnom aktívnom fiškálny rok. Pre zistiť viac informácií {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
@@ -2067,13 +2078,11 @@ DocType: Note,Note,Poznámka
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 DocType: Email Account,Email Ids,Email IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Nastaviť ako nezastavanou
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 DocType: Tax Rule,Billing City,Fakturácia City
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,To Leave Aplikace je čeká na schválení. Pouze Leave schvalovač aktualizovat stav.
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
-apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","např. banka, hotovost, kreditní karty"
+apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","napríkklad banka, hotovosť, kreditné karty"
 DocType: Journal Entry,Credit Note,Dobropis
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Dokončenej množstvo nemôže byť viac ako {0} pre prevádzku {1}
 DocType: Features Setup,Quality,Kvalita
@@ -2082,7 +2091,7 @@ DocType: Warranty Claim,Service Address,Servisní adresy
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 řádky pro Stock smíření.
 DocType: Stock Entry,Manufacture,Výroba
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Dodávka Vezměte prosím na vědomí první
-DocType: Purchase Invoice,Currency and Price List,Měna a ceník
+DocType: Purchase Invoice,Currency and Price List,Mana a cenník
 DocType: Opportunity,Customer / Lead Name,Zákazník / Iniciatíva Meno
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Výprodej Datum není uvedeno
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Výroba
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Installation Note Item,Installed Qty,Instalované množství
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Vloženo
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Vloženo
 DocType: Salary Structure,Total Earning,Celkem Zisk
 DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje Adresy
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizace v
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,alebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Náklady
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 Nad
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Nad
 DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
 ,Download Backups,K stiahnutiu Zálohy
 DocType: Notification Control,Sales Order Message,Prodejní objednávky Message
@@ -2110,12 +2119,12 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Vybrať Zamestnanci
 DocType: Bank Reconciliation,To Date,To Date
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
-sites/assets/js/form.min.js +308,Details,Podrobnosti
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Podrobnosti
 DocType: Purchase Invoice,Total Taxes and Charges,Celkem Daně a poplatky
 DocType: Employee,Emergency Contact,Kontakt v nouzi
 DocType: Item,Quality Parameters,Parametry kvality
 DocType: Target Detail,Target  Amount,Cílová částka
-DocType: Shopping Cart Settings,Shopping Cart Settings,Nákupní košík Nastavení
+DocType: Shopping Cart Settings,Shopping Cart Settings,Nastavenie Nákupného košíka
 DocType: Journal Entry,Accounting Entries,Účetní záznamy
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicitní záznam. Zkontrolujte autorizační pravidlo {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Global POS Profile {0} už vytvorili pre firmu {1}
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,Přijaté Množství
 DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
 DocType: Product Bundle,Parent Item,Nadřazená položka
 DocType: Account,Account Type,Typ účtu
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pre riadok {0} v {1}. Ak chcete v rýchlosti položku sú {2}, riadky {3} musí byť tiež zahrnuté"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
@@ -2136,12 +2145,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Sploštenie
 DocType: Account,Income Account,Účet příjmů
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Liatie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuálne Množstvo
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Riadok {0}: UOM Konverzný faktor je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Riadok {0}: Konverzný faktor MJ je povinný
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenty
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Nákladové středisko
@@ -2165,11 +2174,11 @@ DocType: Item Supplier,Item Supplier,Položka Dodavatel
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Všechny adresy.
-DocType: Company,Stock Settings,Stock Nastavení
+DocType: Company,Stock Settings,Nastavenie Skladu
 DocType: User,Bio,Biografie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojenie je možné len vtedy, ak tieto vlastnosti sú rovnaké v oboch záznamoch. Je Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojenie je možné len vtedy, ak tieto vlastnosti sú rovnaké v oboch záznamoch. Je Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Jméno Nového Nákladového Střediska
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Jméno Nového Nákladového Střediska
 DocType: Leave Control Panel,Leave Control Panel,Nechte Ovládací panely
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No default šablony adresy nalezeno. Prosím, vytvořte nový z Nastavení> Tisk a značky> Adresa šablonu."
 DocType: Appraisal,HR User,HR User
@@ -2180,7 +2189,7 @@ DocType: Sales Invoice,Debit To,Debetní K
 DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
-DocType: Supplier,Billing Currency,Fakturácia Mena
+DocType: Supplier,Billing Currency,Mena fakturácie
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Veľké
 ,Profit and Loss Statement,Výkaz zisků a ztrát
 DocType: Bank Reconciliation Detail,Cheque Number,Šek číslo
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Detail platební nástroj
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěrů a půjček (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Veľký
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Žádný zaměstnanec našel!
 DocType: C-Form Invoice Detail,Territory,Území
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
+DocType: Purchase Order,Customer Address Display,Customer Address Display
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Leštenie
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Přidělené
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože \ ste už nejaké transakcie (y) s iným nerozpustených. Ak chcete zmeniť predvolený UOM, \ používanie "UOM Nahraďte Utility" nástroj pod Stock modulu."
+			use 'UOM Replace Utility' tool under Stock module.","Východzia merná jednotka položky {0} nemôže byť zmenená priamo, pretože \ ste už urobili nejaké transakcie s inou MJ. Ak chcete zmeniť predvolenú MJ, \ použite ""Nástroj na náhradu MJ"" v skladovom module."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Nabídka {0} je zrušena
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Ponuka {0} je zrušená
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Celková dlužná částka
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaměstnanec {0} byl na dovolené na {1}. Nelze označit účast.
 DocType: Sales Partner,Targets,Cíle
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosím, nastavit svůj účtový rozvrh, než začnete účetních zápisů"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorovat Ceny pravidlo
-sites/assets/js/list.min.js +24,Cancelled,Zrušeno
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Zrušené
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od dátum vo mzdovú štruktúru nemôže byť menšia ako zamestnancov Spájanie Date.
 DocType: Employee Education,Graduate,Absolvent
 DocType: Leave Block List,Block Days,Blokové dny
 DocType: Journal Entry,Excise Entry,Spotřební Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozornenie: predajné objednávky {0} už existuje proti Zákazníka objednanie {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozornenie: predajné objednávky {0} už existuje proti Zákazníka objednanie {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,Sklad nepřijali Účtovaný
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + nedoplatek Částka + Inkaso Částka - Total Odpočet
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
 DocType: Features Setup,Sales and Purchase,Prodej a nákup
-DocType: Purchase Order Item,Material Request No,Materiál Poptávka No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+DocType: Supplier Quotation Item,Material Request No,Materiál Poptávka No
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Sazba, za kterou zákazník měny je převeden na společnosti základní měny"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} bol úspešne odhlásený z tohto zoznamu.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Čistý Rate (Company meny)
-apps/frappe/frappe/templates/base.html +132,Added,Pridané
+apps/frappe/frappe/templates/base.html +134,Added,Pridané
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Správa Territory strom.
 DocType: Journal Entry Account,Sales Invoice,Prodejní faktury
 DocType: Journal Entry Account,Party Balance,Balance Party
 DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Prosím, vyberte Použiť Zľava na"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Prosím, vyberte Použiť Zľava na"
 DocType: Company,Default Receivable Account,Výchozí pohledávek účtu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Vytvoření bankovní položka pro celkové vyplacené mzdy za výše zvolených kritérií
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Účetní položka na skladě
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Razenie
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 apps/frappe/frappe/desk/query_report.py +136,Total,Celkem
 DocType: Purchase Invoice,Apply Additional Discount On,Použiť dodatočné Zľava na
@@ -2311,20 +2320,22 @@ DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Riadok # {0}: Nemožno vrátiť viac ako {1} pre bodu {2}
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Spiknutí
 DocType: Item Group,Show this slideshow at the top of the page,Zobrazit tuto prezentaci v horní části stránky
-DocType: BOM,Item UOM,Položka UOM
+DocType: BOM,Item UOM,MJ položky
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma dane po zľave Suma (Company meny)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray tvárnenie
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Účet {0} je zmrazen
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL nebo BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimální úroveň zásob
 DocType: Stock Entry,Subcontract,Subdodávka
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Prosím, zadajte {0} ako prvý"
 DocType: Production Planning Tool,Get Items From Sales Orders,Získat položky z Prodejní Objednávky
 DocType: Production Order Operation,Actual End Time,Aktuální End Time
 DocType: Production Planning Tool,Download Materials Required,Ke stažení potřebné materiály:
@@ -2333,7 +2344,7 @@ DocType: Production Order Operation,Estimated Time and Cost,Odhadovná doba a n
 DocType: Bin,Bin,Popelnice
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Zaoblená hrana
 DocType: SMS Log,No of Sent SMS,Počet odeslaných SMS
-DocType: Account,Company,Společnost
+DocType: Account,Company,Spoločnosť
 DocType: Account,Expense Account,Účtet nákladů
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farebné
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,Plánované
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosím, vyberte položku, kde "Je skladom," je "Nie" a "je Sales Item" "Áno" a nie je tam žiadny iný produkt Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Ceníková Měna není zvolena
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ceníková Měna není zvolena
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Bod Row {0}: doklad o koupi, {1} neexistuje v tabulce ""kupní příjmy"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Dokud
 DocType: Rename Tool,Rename Log,Přejmenovat Přihlásit
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
-sites/assets/js/erpnext.min.js +48,Pay,Platiť
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Platiť
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokoly pre udržanie stavu doručenia sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Brúsenie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Zmenšiť balenia
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Nevybavené Aktivity
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Nevybavené Aktivity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrdené
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dodavatel> Dodavatel Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Zadejte zmírnění datum.
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Za
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vyberte Fiskální rok
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Tavenie rudy
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Jste Leave schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Attendance,Attendance Date,Účast Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
@@ -2407,7 +2417,7 @@ DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
-DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktury
+DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktúry
 apps/erpnext/erpnext/hooks.py +70,Orders,Objednávky
 DocType: Leave Control Panel,Employee Type,Type zaměstnanců
 DocType: Employee Leave Approver,Leave Approver,Nechte schvalovač
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Neplatné obdobie
 DocType: Customer,Credit Limit,Úvěrový limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vyberte typ transakce
 DocType: GL Entry,Voucher No,Voucher No
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Šabl
 DocType: Customer,Address and Contact,Adresa a Kontakt
 DocType: Customer,Last Day of the Next Month,Posledný deň nasledujúceho mesiaca
 DocType: Employee,Feedback,Zpětná vazba
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Časový plán
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Časový plán
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Brúsne jet obrábanie
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
 DocType: Website Settings,Website Settings,Nastavení www stránky
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,Vycházející
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root účet nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root účet nemůže být smazán
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Zobrazit Stock Příspěvky
 ,Is Primary Address,Je Hlavný adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Reference # {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Správa adries
 DocType: Pricing Rule,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
@@ -2460,15 +2471,15 @@ DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Uzavření (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Uzavření (Dr)
 DocType: Contact,Passive,Pasivní
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Pořadové číslo {0} není skladem
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Daňové šablona na prodej transakce.
 DocType: Sales Invoice,Write Off Outstanding Amount,Odepsat dlužné částky
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Zkontrolujte, zda potřebujete automatické opakující faktury. Po odeslání jakékoliv prodejní fakturu, opakující se část bude viditelný."
 DocType: Account,Accounts Manager,Accounts Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',"Time Log {0} musí být ""Odesláno"""
-DocType: Stock Settings,Default Stock UOM,Výchozí Skladem UOM
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Time Log {0} musí být ""Odesláno"""
+DocType: Stock Settings,Default Stock UOM,Východzia skladová MJ
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Kalkulácia Hodnotiť založené na typ aktivity (za hodinu)
 DocType: Production Planning Tool,Create Material Requests,Vytvořit Žádosti materiálu
 DocType: Employee Education,School/University,Škola / University
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Získať aktualizácie
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Pridať niekoľko ukážkových záznamov
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Nechajte Správa
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Nechajte Správa
 DocType: Event,Groups,Skupiny
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Seskupit podle účtu
 DocType: Sales Order,Fully Delivered,Plně Dodáno
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Prodejní Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočt na účet {1} proti nákladovému středisku {2} bude vyšší o {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Předáno listy
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátum DO"" musí byť po ""Dátum OD"""
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Hodnota nebo Množství
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Maloobchodník
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Pripísať na účet musí byť účtu Súvaha
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Všechny typy Dodavatele
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Nabídka {0} není typu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Ponuka {0} nie je typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodaných
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kontokorentní úvěr na účtu
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Proveďte výplatní pásce
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Uvolnit
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Prechádzať BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zajištěné úvěry
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
@@ -2523,9 +2532,9 @@ DocType: Appraisal,Appraisal,Ocenění
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-pena liatie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Výkres
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se opakuje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
 DocType: Hub Settings,Seller Email,Prodávající E-mail
-DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové obstarávacie náklady (cez nákupný faktúry)
+DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové obstarávacie náklady (cez nákupné faktúry)
 DocType: Workstation Working Hour,Start Time,Start Time
 DocType: Item Price,Bulk Import Help,Bulk import Help
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Zvolte množství
@@ -2535,14 +2544,14 @@ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent
 DocType: Production Plan Sales Order,SO Date,SO Datum
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Sazba, za kterou Ceník měna je převeden na zákazníka základní měny"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá suma (Company Mena)
-DocType: BOM Operation,Hour Rate,Hour Rate
+DocType: BOM Operation,Hour Rate,Hodinová sadzba
 DocType: Stock Settings,Item Naming By,Položka Pojmenování By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Z nabídky
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Z ponuky
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiál Prenesená pre výrobu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Účet {0} neexistuje
 DocType: Purchase Receipt Item,Purchase Order Item No,Číslo položky vydané objednávky
-DocType: System Settings,System Settings,Nastavení systému
+DocType: System Settings,System Settings,Nastavenie systému
 DocType: Project,Project Type,Typ projektu
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Buď cílové množství nebo cílová částka je povinná.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Náklady na rôznych aktivít
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,Kontrola Povinné
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Pokladní hotovost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Dodávka sklad potrebný pre živočíšnu položku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dodávka sklad potrebný pre živočíšnu položku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
-DocType: Serial No,Is Cancelled,Je Zrušeno
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Moje dodávky
+DocType: Serial No,Is Cancelled,Je zrušené
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje dodávky
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
@@ -2568,46 +2577,45 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Prosím, vyberte bankovní účet"
 DocType: Newsletter,Create and Send Newsletters,Vytvoření a odeslání Zpravodaje
-sites/assets/js/report.min.js +107,From Date must be before To Date,Datum od musí být dříve než datum do
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Datum od musí být dříve než datum do
 DocType: Sales Order,Recurring Order,Opakující se objednávky
 DocType: Company,Default Income Account,Účet Default příjmů
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
 DocType: Item Group,Check this if you want to show in website,"Zaškrtněte, pokud chcete zobrazit v webové stránky"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Vítejte na ERPNext
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Vitajte v ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Počet
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Obchodná iniciatíva na Ponuku
 DocType: Lead,From Customer,Od Zákazníka
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Volá
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulácie Čiastka (cez Time Záznamy)
-DocType: Purchase Order Item Supplied,Stock UOM,Reklamní UOM
+DocType: Purchase Order Item Supplied,Stock UOM,Skladová MJ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
 ,Projected,Plánovaná
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
-DocType: Notification Control,Quotation Message,Zpráva Nabídky
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
+DocType: Notification Control,Quotation Message,Správa k ponuke
 DocType: Issue,Opening Date,Datum otevření
 DocType: Journal Entry,Remark,Poznámka
-DocType: Purchase Receipt Item,Rate and Amount,Tempo a rozsah
+DocType: Purchase Receipt Item,Rate and Amount,Sadzba a množstvo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Nudný
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Z přijaté objednávky
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Z přijaté objednávky
 DocType: Blog Category,Parent Website Route,nadřazená cesta internetové stránky
 DocType: Sales Order,Not Billed,Ne Účtovaný
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Žádné kontakty přidán dosud.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Žádné kontakty přidán dosud.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Neaktivní
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Proti faktury Datum zveřejnění
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
 DocType: Time Log,Batched for Billing,Zarazeno pro fakturaci
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Směnky vznesené dodavately
 DocType: POS Profile,Write Off Account,Odepsat účet
-sites/assets/js/erpnext.min.js +26,Discount Amount,Částka slevy
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupnej faktúry
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,např. DPH
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,napríklad DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
-DocType: Shopping Cart Settings,Quotation Series,Číselná řada nabídek
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
+DocType: Shopping Cart Settings,Quotation Series,Číselná rada ponúk
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Tvárnenie Hot metal plyn
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
 DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
@@ -2633,16 +2641,17 @@ DocType: Page,All,Vše
 DocType: Stock Entry Detail,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
 DocType: Employee,Confirmation Date,Potvrzení Datum
-DocType: C-Form,Total Invoiced Amount,Celkem Fakturovaná částka
+DocType: C-Form,Total Invoiced Amount,Celková fakturovaná čiastka
 DocType: Account,Sales User,Uživatel prodeje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min množství nemůže být větší než Max Množství
 DocType: Stock Entry,Customer or Supplier Details,Zákazníka alebo dodávateľa Podrobnosti
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Nastavit
 DocType: Lead,Lead Owner,Získateľ Obchodnej iniciatívy
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Je potrebná Warehouse
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Je potrebná Warehouse
 DocType: Employee,Marital Status,Rodinný stav
 DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka
 DocType: Time Log,Will be updated when billed.,Bude aktualizována při účtovány.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,K dispozícii dávky Množstvo na Od Warehouse
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuální BOM a New BOM nemůže být stejné
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,Aktualizace skladem
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Načisto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Záznam všetkých oznámení typu e-mail, telefón, chát, návštevy, atď"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Prosím, uveďte zaokrúhliť nákladové stredisko v spoločnosti"
 DocType: Purchase Invoice,Terms,Podmínky
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Vytvořit nový
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Vytvořit nový
 DocType: Buying Settings,Purchase Order Required,Vydaná objednávka je vyžadována
 ,Item-wise Sales History,Item-moudrý Sales History
 DocType: Expense Claim,Total Sanctioned Amount,Celková částka potrestána
@@ -2676,21 +2685,22 @@ DocType: Purchase Taxes and Charges,Reference Row #,Referenční Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
 ,Stock Ledger,Reklamní Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Rýchlosť: {0}
+apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Sadzba: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plat Slip Odpočet
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Poznámky
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vyberte první uzel skupinu.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cíl musí být jedním z {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Vyplňte formulář a uložte jej
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vyplňte formulář a uložte jej
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Stáhněte si zprávu, která obsahuje všechny suroviny s jejich aktuální stav zásob"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Obloženie
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 DocType: Leave Application,Leave Balance Before Application,Nechte zůstatek před aplikací
 DocType: SMS Center,Send SMS,Pošlete SMS
 DocType: Company,Default Letter Head,Výchozí hlavičkový
 DocType: Time Log,Billable,Zúčtovatelná
 DocType: Authorization Rule,This will be used for setting rule in HR module,Tato adresa bude použita pro nastavení pravidlo HR modul
 DocType: Account,Rate at which this tax is applied,"Rychlost, při které se používá tato daň"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Změna pořadí Množství
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Změna pořadí Množství
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
 DocType: Journal Entry,Write Off,Odpísať
 DocType: Time Log,Operation ID,Prevádzka ID
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Sleva Pole bude k dispozici v objednávce, doklad o koupi, nákupní faktury"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Názov nového účtu. Poznámka: Prosím, vytvárať účty pre zákazníkov a dodávateľmi"
 DocType: Report,Report Type,Typ výpisu
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Nahrávám
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Nahrávám
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Nahradit Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Země moudrý výchozí adresa Templates
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Dodávateľ doručí zákazníkovi
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import dát a export
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Pokud se zapojit do výrobní činnosti. Umožňuje Položka ""se vyrábí"""
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktúra Dátum zverejnenia
 DocType: Sales Invoice,Rounded Total,Zaoblený Total
 DocType: Product Bundle,List items that form the package.,"Seznam položek, které tvoří balíček."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
 DocType: Company,Default Cash Account,Výchozí Peněžní účet
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
@@ -2740,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Množství nejsou dostupné iv skladu {1} na {2} {3}.
  Dispozici Množství: {4}, transfer Množství: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
+DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktný e-mail
 DocType: Event,Sunday,Neděle
 DocType: Sales Team,Contribution (%),Příspěvek (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Zodpovednosť
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Šablona
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Pridať užívateľa
@@ -2753,20 +2767,19 @@ DocType: Task,Actual Start Date (via Time Logs),Skutočný dátum Start (cez Tim
 DocType: Stock Reconciliation Item,Before reconciliation,Pred zmierenie
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
 DocType: Item,Default BOM,Výchozí BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prosím re-typ názov spoločnosti na potvrdenie
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Time Log Batch,Total Hours,Celkem hodin
-DocType: Journal Entry,Printing Settings,Tlač Nastavenie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+DocType: Journal Entry,Printing Settings,Nastavenie tlače
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilový
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Listy typu {0} již přidělené pro zaměstnance {1} pro fiskální rok {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Položka je povinná
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Kovové vstrekovanie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Z Dodacího Listu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Z Dodacího Listu
 DocType: Time Log,From Time,Času od
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investiční bankovnictví
@@ -2776,16 +2789,16 @@ DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Morenie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Liatia do piesku
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
-DocType: Purchase Invoice Item,Rate,Rychlost
+DocType: Purchase Invoice Item,Rate,Sadzba
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Internovat
 DocType: Newsletter,A Lead with this email id should exist,Obchodná iniciatíva s touto emailovou adresou by už mala existovať
 DocType: Stock Entry,From BOM,Od BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Základní
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","např Kg, ks, č, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
+apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","napríklad Kg, ks, m"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
 DocType: Salary Structure,Salary Structure,Plat struktura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,9 +2806,9 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  konflikt přiřazením prioritu. Cena Pravidla: {0}"
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
-DocType: Employee,Offer Date,Nabídka Date
+DocType: Employee,Offer Date,Dátum Ponuky
 DocType: Hub Settings,Access Token,Přístupový Token
 DocType: Sales Invoice Item,Serial No,Výrobní číslo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
@@ -2805,7 +2818,7 @@ DocType: Features Setup,"If you have long print formats, this feature can be use
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Odvalovacie
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Všechny území
 DocType: Purchase Invoice,Items,Položky
-DocType: Fiscal Year,Year Name,Jméno roku
+DocType: Fiscal Year,Year Name,Meno roku
 DocType: Process Payroll,Process Payroll,Proces Payroll
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
+DocType: Delivery Note Item,From Warehouse,Zo skladu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Vŕtanie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Vyfukovanie
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
@@ -2837,20 +2851,21 @@ DocType: C-Form,Amended From,Platném znění
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Buď cílové množství nebo cílová částka je povinná
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
-DocType: Leave Allocation,Carry Forward,Převádět
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Dátum začatia by mala byť pred uzávierky
+DocType: Leave Control Panel,Carry Forward,Převádět
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Nákladové středisko se stávajícími transakcemi nelze převést na hlavní účetní knihy
 DocType: Department,Days for which Holidays are blocked for this department.,"Dnů, po které Prázdniny jsou blokovány pro toto oddělení."
 ,Produced,Produkoval
 DocType: Item,Item Code for Suppliers,Položka Kód pre dodávateľa
 DocType: Issue,Raised By (Email),Vznesené (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Obecný
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Připojit Hlavičkový
+apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Všeobecný
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Pripojiť Hlavičku
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Zoznam vaše daňové hlavy (napr DPH, ciel atď, by mali mať jedinečné názvy) a ich štandardné sadzby. Tým sa vytvorí štandardné šablónu, ktorú môžete upraviť a pridať ďalšie neskôr."
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Vypíšte vaše používané dane (napr DPH, Clo atď; mali by mať jedinečné názvy) a ich štandardné sadzby. Týmto sa vytvorí štandardná šablóna, ktorú môžete upraviť a pridať ďalšie neskôr."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, ke kterému se opakující objednávka bude zastaví"
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Celkem Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hodina
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Preneste materiál Dodávateľovi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Preneste materiál Dodávateľovi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Vytvořit Citace
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Vytvoriť Ponuku
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
@@ -2884,7 +2899,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
 DocType: Quality Inspection,Report Date,Datum Reportu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Smerovanie
-DocType: C-Form,Invoices,Faktury
+DocType: C-Form,Invoices,Faktúry
 DocType: Job Opening,Job Title,Název pozice
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} příjemci
 DocType: Features Setup,Item Groups in Details,Položka skupiny v detailech
@@ -2898,9 +2913,9 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,
 DocType: Item,Website Description,Popis webu
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
 ,Sales Register,Sales Register
-DocType: Quotation,Quotation Lost Reason,Důvod ztráty nabídky
+DocType: Quotation,Quotation Lost Reason,Dôvod neúspešnej ponuky
 DocType: Address,Plant,Rostlina
-DocType: DocType,Setup,Nastavení
+DocType: DocType,Setup,Nastavenie
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Zhrnutie pre tento mesiac a prebiehajúcim činnostiam
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Valcovanie za studena
@@ -2912,7 +2927,7 @@ DocType: Item,Attributes,Atribúty
 DocType: Packing Slip,Get Items,Získat položky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Posledná Dátum objednávky
-DocType: DocField,Image,Obrázek
+DocType: DocField,Image,Obrázok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Proveďte Spotřební faktury
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Účet {0} nie je patria spoločnosti {1}
 DocType: Communication,Other,Ostatní
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Prevádzka ID nie je nastavené
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Návšteva
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Návšteva
 DocType: Leave Type,Is Encash,Je inkasovat
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Proveďte položka deníku
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Obchodní
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Obchodní
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmie byť skladom
 DocType: Cost Center,Distribution Id,Distribuce Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Pomer atribút {0} musí byť v rozmedzí od {1} až {2} v krokoch po {3}
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základná čiastka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+DocType: Leave Allocation,Unused leaves,Nepoužité listy
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Rezanie
 DocType: Tax Rule,Billing State,Fakturácia State
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminovanie
 DocType: Item Reorder,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Dátum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,Maloobchodní
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Zákazník {0} neexistuje
 DocType: Attendance,Absent,Nepřítomný
 DocType: Product Bundle,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Riadok {0}: Neplatné referencie {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zdrvujúcu
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kúpte Dane a poplatky šablóny
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,Poznámky
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 DocType: Features Setup,POS View,Zobrazení POS
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Instalace rekord pro sériové číslo
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalace rekord pro sériové číslo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuálne liatie
-sites/assets/js/erpnext.min.js +10,Please specify a,Uveďte prosím
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Uveďte prosím
 DocType: Offer Letter,Awaiting Response,Čaká odpoveď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Vyššie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold veľkosti
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Účet {0} nemůže být skupina
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Kraj
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Vydutý
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Liatie Evaporative-pattern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Výdaje na reprezentaci
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Věk
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Věk
 DocType: Time Log,Billing Amount,Fakturácia Suma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Výdaje na právní služby
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto objednávka bude generován například 05, 28 atd"
 DocType: Sales Invoice,Posting Time,Čas zadání
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},No Položka s Serial č {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Otvorené Oznámenie
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otvorené Oznámenie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Přímé náklady
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Opravdu chcete uvolnit tento materiál požadavek?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Rovnako ako u Date
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honovanie
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
 DocType: Feed,Full Name,Celé jméno/název
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
@@ -3066,7 +3082,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,P
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Udělejte si čas Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Vydané
 DocType: Project,Total Billing Amount (via Time Logs),Celkom Billing Suma (cez Time Záznamy)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Nabízíme k prodeji tuto položku
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Táto položka je na predaj
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dodavatel Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Popis
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Přidat řádky
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Ťažba
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Všechny kontakty.
 DocType: Newsletter,Test Email Id,Testovací Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Zkratka Company
@@ -3097,15 +3113,14 @@ apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandat
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Vozík
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Ďakujeme Vám za Váš záujem o prihlásenie do našich aktualizácií
 ,Qty to Transfer,Množství pro přenos
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Nabídka pro Lead nebo pro Zákazníka
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponuka z Obchodnej Iniciatívy alebo pre Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen Měnový Směnný záznam pro {1} až {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen Měnový Směnný záznam pro {1} až {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Daňová šablóna je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',"{0} {1} status je ""Zastaveno"""
 DocType: Account,Temporary,Dočasný
 DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
@@ -3120,16 +3135,17 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Riadok # {0}: Výrobné číslo je povinné
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detail
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
-DocType: Purchase Order Item,Supplier Quotation,Dodavatel Nabídka
+DocType: Purchase Order Item,Supplier Quotation,Dodávateľská ponuka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Žehlenie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} je zastaven
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zastaven
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Pripravované akcie
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pripravované akcie
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je nutná zákazník
 DocType: Letter Head,Letter Head,Záhlaví
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Rýchly vstup
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je povinné pre návrat
 DocType: Purchase Order,To Receive,Obdržať
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Zmenšiť kovania
@@ -3153,25 +3169,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} na Prodejní Faktuře {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} na Prodejní Faktuře {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
 DocType: Purchase Invoice Item,Project Name,Název projektu
 DocType: Supplier,Mention if non-standard receivable account,Zmienka v prípade neštandardnej pohľadávky účet
 DocType: Workflow State,Edit,Upravit
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
 DocType: Features Setup,Item Batch Nos,Položka Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Ľudské Zdroje
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Ľudské Zdroje
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Daňové Aktiva
 DocType: BOM Item,BOM No,BOM No
 DocType: Contact Us Settings,Pincode,PSČ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Sklad UOM musí být odlišný od běžného akciové nerozpuštěných
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nová skladová MJ musí byť odlišná od existujúcich MJ
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
 DocType: Production Order,Operation Cost,Provozní náklady
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Nahrajte účast ze souboru CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Vynikající Amt
@@ -3179,7 +3195,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nastavi
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Chcete-li přiřadit tento problém vyřešit, použijte tlačítko ""Přiřadit"" v postranním panelu."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zásoby Starší než [dny]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Na základě faktury
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiškálny rok: {0} neexistuje
 DocType: Currency Exchange,To Currency,Chcete-li měny
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Nechte následující uživatelé schválit Žádost o dovolenou.
@@ -3204,11 +3219,11 @@ DocType: Company,Domain,Doména
 DocType: Employee,Held On,Které se konalo dne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Výrobní položka
 ,Employee Information,Informace o zaměstnanci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Sadzba (%)
 DocType: Stock Entry Detail,Additional Cost,Dodatočné náklady
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Finanční rok Datum ukončení
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Vytvořit nabídku dodavatele
 DocType: Quality Inspection,Incoming,Přicházející
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Snížit Zisk na vstup bez nároku na mzdu (LWP)
@@ -3216,14 +3231,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Riadok # {0}: Výrobné číslo {1} nezodpovedá {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Poznámka: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tento týždeň Zhrnutie
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
 DocType: GL Entry,Party,Strana
 DocType: Sales Order,Delivery Date,Dodávka Datum
-DocType: DocField,Currency,Měna
+DocType: DocField,Currency,Mena
 DocType: Opportunity,Opportunity Date,Příležitost Datum
 DocType: Purchase Receipt,Return Against Purchase Receipt,Návrat Proti doklad o kúpe
 DocType: Purchase Order,To Bill,Billa
@@ -3232,7 +3247,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutočná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Spravodajcu
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Spravodajcu
 DocType: Address,Shipping,Lodní
 DocType: Stock Ledger Entry,Stock Ledger Entry,Reklamní Ledger Entry
 DocType: Department,Leave Block List,Nechte Block List
@@ -3243,7 +3258,7 @@ DocType: Customer,Sales Partner and Commission,Predaj Partner a Komisie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Továrna a strojní zařízení
 DocType: Sales Partner,Partner's Website,Partnera Website
 DocType: Opportunity,To Discuss,K projednání
-DocType: SMS Settings,SMS Settings,Nastavení SMS
+DocType: SMS Settings,SMS Settings,Nastavenie SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Dočasné Účty
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Čierna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
@@ -3251,7 +3266,7 @@ DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Datum ukončení doby aktuální objednávky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Vytvorte ponuku Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Spiatočná
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Východzí merná jednotka varianty musia byť rovnaké ako šablónu
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Východzí merná jednotka varianty musia byť rovnaké ako šablónu
 DocType: DocField,Fold,Fold
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
@@ -3261,14 +3276,14 @@ DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via E
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Zákazník Id
 DocType: Page,Page Name,Název stránky
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Ak chcete čas musí byť väčší ako From Time
-DocType: Journal Entry Account,Exchange Rate,Exchange Rate
+DocType: Journal Entry Account,Exchange Rate,Výmenný kurz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Úprava vretena
 DocType: BOM,Last Purchase Rate,Last Cena při platbě
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","např ""MC """
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","napríklad ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
 DocType: System Settings,Time Zone,Časové pásmo
@@ -3283,15 +3298,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Zprávy
 DocType: SMS Settings,Enter url parameter for receiver nos,Zadejte url parametr pro přijímače nos
 DocType: Sales Invoice,Paid Amount,Uhrazené částky
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',"Závěrečný účet {0} musí být typu ""odpovědnosti"""
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Závěrečný účet {0} musí být typu ""odpovědnosti"""
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
-DocType: Item Variant,Item Variant,Položka Variant
+DocType: Item Variant,Item Variant,Variant Položky
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
 DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
 DocType: Payment Tool Detail,Against Voucher No,Proti poukaz č
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
 DocType: Tax Rule,Purchase,Nákup
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Zůstatek Množství
@@ -3311,7 +3326,7 @@ DocType: Tax Rule,Sales Tax Template,Daň z predaja Template
 DocType: Employee,Encashment Date,Inkaso Datum
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Proti poukazu Type musí být jedním z objednávky, faktury nebo Journal Entry"
-DocType: Account,Stock Adjustment,Reklamní Nastavení
+DocType: Account,Stock Adjustment,Úprava skladových zásob
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existuje Náklady Predvolené aktivity pre Typ aktivity - {0}
 DocType: Production Order,Planned Operating Cost,Plánované provozní náklady
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nový {0} Název
@@ -3328,28 +3343,29 @@ Note: BOM = Bill of Materials","Súhrnný skupina ** položiek ** do iného ** P
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Pořadové číslo je povinná k bodu {0}
 DocType: Item Variant Attribute,Attribute,Atribút
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Uveďte z / do rozmedzie
-sites/assets/js/desk.min.js +7652,Created By,Vytvořeno (kým)
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Vytvořeno (kým)
 DocType: Serial No,Under AMC,Podle AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Bod míra ocenění je přepočítána zvažuje přistál nákladů částku poukazu
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
 DocType: BOM Replace Tool,Current BOM,Aktuální BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Přidat Sériové číslo
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Přidat Sériové číslo
 DocType: Production Order,Warehouses,Sklady
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print a Stacionární
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
 DocType: Payment Reconciliation,Minimum Amount,Minimální částka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Dokončení aktualizace zboží
 DocType: Workstation,per hour,za hodinu
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Série {0} jsou již použity v {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Série {0} jsou již použity v {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribuce
-sites/assets/js/erpnext.min.js +50,Amount Paid,Zaplacené částky
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zaplacené částky
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Východiskové Dane a poplatky
 DocType: Account,Receivable,Pohledávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Riadok # {0}: Nie je povolené meniť dodávateľa, objednávky už existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
 DocType: Sales Invoice,Supplier Reference,Dodavatel Označení
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Je-li zaškrtnuto, bude BOM pro sub-montážní položky považují pro získání surovin. V opačném případě budou všechny sub-montážní položky být zacházeno jako surovinu."
@@ -3367,11 +3383,11 @@ DocType: Journal Entry,Write Off Entry,Odepsat Vstup
 DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Společnost chybí ve skladech {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Sklad UOM Nahradit Utility
+DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Nástroj na náhradu MJ
 DocType: POS Profile,Terms and Conditions,Podmínky
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
-DocType: Leave Block List,Applies to Company,Platí pro firmy
+DocType: Leave Block List,Applies to Company,Platí pre firmu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
 DocType: Purchase Invoice,In Words,Slovy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
@@ -3385,9 +3401,9 @@ DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
-apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavení příchozí server pro podporu e-mailovou id. (Např support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Bod variant {0} existuje s rovnaké atribúty
+apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavenie serveru prichádzajúcej pošty pre email podpory. (Napríklad podpora@priklad.com)
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatek Množství
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
 DocType: Salary Slip,Salary Slip,Plat Slip
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Leštenie
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Datum DO"" je povinné"
@@ -3398,8 +3414,9 @@ DocType: BOM,Manage cost of operations,Správa nákladů na provoz
 DocType: Features Setup,Item Advanced,Položka Advanced
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Valcovanie
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globální nastavení
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globálne nastavenia
 DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Účet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
@@ -3418,7 +3435,7 @@ apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries f
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Uložte dokument ako prvý.
 DocType: Account,Chargeable,Vyměřovací
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
-DocType: Company,Change Abbreviation,Změna Zkratky
+DocType: Company,Change Abbreviation,Zmeniť skratku
 DocType: Workflow State,Primary,Primární
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
 DocType: Item,Max Discount (%),Max sleva (%)
@@ -3432,14 +3449,14 @@ DocType: BOM,Manufacturing User,Výroba Uživatel
 DocType: Purchase Order,Raw Materials Supplied,Dodává suroviny
 DocType: Purchase Invoice,Recurring Print Format,Opakujúce Print Format
 DocType: Communication,Series,Série
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,"Očekávané datum dodání, nemůže být před zakoupením pořadí Datum"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Očekávané datum dodání, nemůže být před zakoupením pořadí Datum"
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Položka Klasifikace
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Období
-,General Ledger,Hlavní Účetní Kniha
+,General Ledger,Hlavná Účtovná Kniha
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobraziť Obchodné iniciatívy
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-mail id musí být jedinečný, již existuje {0}"
@@ -3488,17 +3505,18 @@ DocType: HR Settings,Payroll Settings,Nastavení Mzdové
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Objednať
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nemůže mít rodič nákladové středisko
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Select Brand ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Prevádzková doba musí byť väčšia ako 0 pre prevádzku {0}
 DocType: Supplier,Address and Contacts,Adresa a kontakty
-DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konverze Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Keep It webové přátelské 900px (w) o 100px (h)
+DocType: UOM Conversion Detail,UOM Conversion Detail,Detail konverzie MJ
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Snaťte sa o rozmer vhodný na web: 900px šírka a 100px výška
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Výrobná zákazka nemôže byť vznesená proti šablóny položky
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Payment Tool,Get Outstanding Vouchers,Získejte Vynikající poukazy
 DocType: Warranty Claim,Resolved By,Vyřešena
 DocType: Appraisal,Start Date,Datum zahájení
-sites/assets/js/desk.min.js +7629,Value,Hodnota
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Hodnota
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Přidělit listy dobu.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliknite tu pre overenie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
@@ -3514,14 +3532,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Přístup povolen
 DocType: Dropbox Backup,Weekly,Týdenní
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Príjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Príjem
 DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Hotovo
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} bol úspešne pridaný do nášho zoznamu noviniek.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Lúč obrábanie Electron
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
@@ -3534,18 +3552,18 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Přidat / Upravit ceny
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram nákladových středisek
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Moje objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje objednávky
 DocType: Price List,Price List Name,Ceník Jméno
 DocType: Time Log,For Manufacturing,Pre výrobu
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Součty
+apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Súčty
 DocType: BOM,Manufacturing,Výroba
 ,Ordered Items To Be Delivered,"Objednané zboží, které mají být dodány"
 DocType: Account,Income,Příjem
-,Setup Wizard,Průvodce nastavením
+,Setup Wizard,Sprievodca nastavením
 DocType: Industry Type,Industry Type,Typ Průmyslu
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Něco se pokazilo!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die liatie
@@ -3555,14 +3573,13 @@ apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter
 DocType: Budget Detail,Budget Detail,Detail Rozpočtu
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
 DocType: Async Task,Status,Stav
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Sklad UOM aktualizovaný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Skladová MJ pre položku {0} aktualizovaná
 DocType: Company History,Year,Rok
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Time Log {0} už účtoval
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} už účtoval
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Jméno nákladového střediska
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Položka {0} s Serial č {1} je již nainstalován
 DocType: Maintenance Schedule Detail,Scheduled Date,Plánované datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Celkem uhrazeno Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Zprávy větší než 160 znaků bude rozdělena do více zpráv
@@ -3570,12 +3587,12 @@ DocType: Purchase Receipt Item,Received and Accepted,Přijaté a Přijato
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
 DocType: Item,Unit of Measure Conversion,Jednotka miery konverzie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaměstnanec nemůže být změněn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
 DocType: Naming Series,Help HTML,Nápověda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
-DocType: Address,Name of person or organization that this address belongs to.,"Jméno osoby nebo organizace, která tato adresa patří."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši Dodavatelé
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
+DocType: Address,Name of person or organization that this address belongs to.,"Meno osoby alebo organizácie, ktorej patrí táto adresa."
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši Dodávatelia
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Další platovou strukturu {0} je aktivní pro zaměstnance {1}. Prosím, aby jeho stav ""neaktivní"" pokračovat."
 DocType: Purchase Invoice,Contact,Kontakt
@@ -3584,28 +3601,29 @@ DocType: Lead,Converted,Převedené
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} do {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Prosím, skontrolujte viac mien možnosť povoliť účty s inú menu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Prosím, skontrolujte viac mien možnosť povoliť účty s inú menu"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Cost Center,Budgets,Rozpočty
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aktualizováno
 DocType: Employee,Emergency Contact Details,Nouzové kontaktní údaje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Co to dělá?
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Čo to robí?
 DocType: Delivery Note,To Warehouse,Do skladu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Účet {0} byl zadán více než jednou za fiskální rok {1}
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""ano"" pro neskladové zboží"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""ano"" pro neskladové zboží"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Riadok {0}: Exchange Rate je povinné
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Riadok {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od reklamačnímu
@@ -3619,15 +3637,17 @@ DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 DocType: User,Enabled,Zapnuto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},"Opravdu chcete, aby předložila všechny výplatní pásce za měsíc {0} a rok {1}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Opravdu chcete, aby předložila všechny výplatní pásce za měsíc {0} a rok {1}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importovať Odberatelia
 DocType: Target Detail,Target Qty,Target Množství
 DocType: Attendance,Present,Současnost
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
 DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
 DocType: Authorization Rule,Based On,Založeno na
-,Ordered Qty,Objednáno Množství
+DocType: Sales Order Item,Ordered Qty,Objednáno Množství
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Položka {0} je zakázaná
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Obdobie od a obdobia, k dátam povinné pre opakované {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektová činnost / úkol.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generování výplatních páskách
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} není platné id emailu
@@ -3667,19 +3687,19 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Nahrát Návštěvnost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM a výroba množstva sú povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
-DocType: Journal Entry Account,Amount,Částka
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Částka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitovanie
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
 ,Sales Analytics,Prodejní Analytics
-DocType: Manufacturing Settings,Manufacturing Settings,Výrobní nastavení
-apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Nastavenie e-mail
+DocType: Manufacturing Settings,Manufacturing Settings,Nastavenia Výroby
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Nastavenia pre e-mail
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
 DocType: Stock Entry Detail,Stock Entry Detail,Reklamní Entry Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Denná Upomienky
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nový název účtu
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
-DocType: Selling Settings,Settings for Selling Module,Nastavení pro prodej Module
+DocType: Selling Settings,Settings for Selling Module,Nastavenie modulu Predaj
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
@@ -3694,7 +3714,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
 DocType: Contact Us Settings,City,Město
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvukové obrábanie
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Chyba: Nie je platný id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Chyba: Nie je platný id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Bod {0} musí být prodejní položky
 DocType: Naming Series,Update Series Number,Aktualizace Series Number
 DocType: Account,Equity,Hodnota majetku
@@ -3709,7 +3729,7 @@ DocType: Purchase Taxes and Charges,Actual,Aktuální
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
 DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
 DocType: Production Order,Production Order,Výrobní Objednávka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
@@ -3717,14 +3737,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Cena surovin
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
-sites/assets/js/list.min.js +174,Gantt Chart,Pruhový diagram
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Pruhový diagram
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Řada Aktualizováno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
@@ -3734,12 +3754,12 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Tax Rule,Validity,Platnosť
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturovaná částka
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturovaná čiastka
 DocType: Attendance,Attendance,Účast
 DocType: Page,No,Ne
 DocType: BOM,Materials,Materiály
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Datum a čas zadání je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Datum a čas zadání je povinný
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
 ,Item Prices,Ceny Položek
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Ve slovech budou viditelné, jakmile uložíte objednávce."
@@ -3759,42 +3779,42 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
-sites/assets/js/erpnext.min.js +50,Change,Zmena
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Zmena
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Vydaná objednávka {0} je 'Zastavena'
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","např ""My Company LLC """
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","napríklad ""Moja spoločnosť LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Výpovedná Lehota
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
-DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnost UOM
+DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnosť MJ
 DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Lisovanie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Úverový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Ukázat nulové hodnoty
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 DocType: Task,Actual End Date (via Time Logs),Skutočné Dátum ukončenia (cez Time Záznamy)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Rozpočet nemôže byť priradená na skupinový účet {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
 DocType: Delivery Note,Print Without Amount,Tisknout bez Částka
 apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
-DocType: User,Last Name,Příjmení
+DocType: User,Last Name,Priezvisko
 DocType: Web Page,Left,Vlevo
 DocType: Event,All Day,Celý den
 DocType: Issue,Support Team,Tým podpory
 DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
 DocType: Contact Us Settings,State,Stav
 DocType: Batch,Batch,Šarže
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Zůstatek
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Zůstatek
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nárokov)
-DocType: User,Gender,Pohlaví
+DocType: User,Gender,Pohlavie
 DocType: Journal Entry,Debit Note,Debit Note
-DocType: Stock Entry,As per Stock UOM,Podle Stock nerozpuštěných
+DocType: Stock Entry,As per Stock UOM,Podľa skladovej MJ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Neuplynula
 DocType: Journal Entry,Total Debit,Celkem Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Východzí hotových výrobkov Warehouse
@@ -3806,26 +3826,26 @@ DocType: Lead,Blog Subscriber,Blog Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Vytvoření pravidla pro omezení transakce na základě hodnot.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Pokud je zaškrtnuto, Total no. pracovních dnů bude zahrnovat dovolenou, a to sníží hodnotu platu za každý den"
 DocType: Purchase Invoice,Total Advance,Total Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Uvolnit materiálu Poptávka
 DocType: Workflow State,User,Uživatel
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Spracovanie miezd
-DocType: Opportunity Item,Basic Rate,Basic Rate
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Spracovanie miezd
+DocType: Opportunity Item,Basic Rate,Základná sadzba
 DocType: GL Entry,Credit Amount,Výška úveru
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Nastavit jako Lost
 DocType: Customer,Credit Days Based On,Úverové Dni Based On
 DocType: Tax Rule,Tax Rule,Daňové Pravidlo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Udržovat stejná sazba po celou dobu prodejního cyklu
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Naplánujte čas protokoly mimo Workstation pracovných hodín.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} již byla odeslána
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} již byla odeslána
 ,Items To Be Requested,Položky se budou vyžadovat
 DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Účtovaná sadzba založená na typ aktivity (za hodinu)
-DocType: Company,Company Info,Společnost info
+DocType: Company,Company Info,Informácie o spoločnosti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Zošívanie
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 DocType: Production Planning Tool,Filter based on item,Filtr dle položek
-DocType: Fiscal Year,Year Start Date,Datum Zahájení Roku
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debetné účet
+DocType: Fiscal Year,Year Start Date,Dátom začiatku roka
 DocType: Attendance,Employee Name,Jméno zaměstnance
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaoblený Total (Company Měna)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
@@ -3836,14 +3856,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Zaclonení
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Zamestnanecké benefity
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Směnky vznesené zákazníkům.
 DocType: DocField,Default,Výchozí
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} odberatelia z pridanej
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definovať rozpočtu pre tento nákladového strediska. Ak chcete nastaviť rozpočet akcie, pozri "Zoznam firiem""
@@ -3851,7 +3871,7 @@ DocType: Account,Parent Account,Nadřazený účet
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
@@ -3860,23 +3880,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Vzdělání
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Voliteľné. Nastaví východiskovej mene spoločnosti, ak nie je uvedené."
 DocType: Address,Office,Kancelář
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardní výpisy
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riadok {0}: Party / Account nezhoduje s {1} / {2} do {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozícii Množstvo na Od Warehouse
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riadok {0}: Party / Account nezhoduje s {1} / {2} do {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Chcete-li vytvořit daňovém účtu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
 DocType: Employee,Current Address,Aktuální adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Batch Zásoby
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Zásoby
 DocType: Employee,Contract End Date,Smlouva Datum ukončení
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
 DocType: DocShare,Document Type,Typ dokumentu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Z nabídky dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Z ponuky dodávateľa
 DocType: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Půl den
 DocType: Pricing Rule,Min Qty,Min Množství
@@ -3887,20 +3909,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pre Množstvo (Vyrobené ks) je povinné
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riadok {0}: Typ Party Party a je použiteľná len proti pohľadávky / záväzky účtu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riadok {0}: Typ Party Party a je použiteľná len proti pohľadávky / záväzky účtu
 DocType: Notification Control,Purchase Receipt Message,Zpráva příjemky
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Celkom pridelené listy sú viac než obdobie
 DocType: Production Order,Actual Start Date,Skutečné datum zahájení
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materiálů doručeno proti tomuto odběrateli
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Záznam pohybu položka.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Záznam pohybu položka.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter zoznamu účastníkov
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dlabačky
 DocType: Email Account,Service,Služba
 DocType: Hub Settings,Hub Settings,Nastavení Hub
-DocType: Project,Gross Margin %,Hrubá Marže %
+DocType: Project,Gross Margin %,Hrubá Marža %
 DocType: BOM,With Operations,S operacemi
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účtovníctva už boli vykonané v mene, {0} pre firmu {1}. Vyberte pohľadávky a záväzku účet s menou {0}."
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účtovníctva už boli vykonané v mene, {0} pre firmu {1}. Vyberte pohľadávky a záväzku účet s menou {0}."
 ,Monthly Salary Register,Měsíční plat Register
-apps/frappe/frappe/website/template.py +123,Next,Další
+apps/frappe/frappe/website/template.py +140,Next,Ďalej
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
 DocType: BOM Operation,BOM Operation,BOM Operation
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrolytické
@@ -3931,17 +3954,18 @@ DocType: Purchase Invoice,Next Date,Další data
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Prosím, zadejte Daně a poplatky"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Obrábanie
+DocType: Sales Invoice Item,Drop Ship,Drop Loď
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
 DocType: Hub Settings,Seller Name,Prodejce Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Daně a poplatky odečteny (Company měna)
-DocType: Item Group,General Settings,Obecné nastavení
+DocType: Item Group,General Settings,Všeobecné nastavenia
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Z měny a měny nemůže být stejné
 DocType: Stock Entry,Repack,Přebalit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Musíte Uložte formulář před pokračováním
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Připojit Logo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Pripojiť Logo
 DocType: Customer,Commission Rate,Výše provize
-apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Urobiť Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Vytvoriť Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košík je prázdny
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
@@ -3957,29 +3981,29 @@ DocType: Purchase Order,To Receive and Bill,Prijímať a Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatické vytvorenie Materiál žiadosti, pokiaľ množstvo klesne pod túto úroveň"
 ,Item-wise Purchase Register,Item-moudrý Nákup Register
 DocType: Batch,Expiry Date,Datum vypršení platnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Ak chcete nastaviť úroveň objednávacie, položka musí byť Nákup položka alebo výrobné položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Ak chcete nastaviť úroveň objednávacie, položka musí byť Nákup položka alebo výrobné položky"
 ,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project.
-DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Half Day)
+DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Neukazovať žiadny symbol ako $ atď vedľa meny.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Half Day)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Získat předměty z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kusovník
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riadok {0}: Typ Party Party a je nutné pre pohľadávky / záväzky na účte {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riadok {0}: Typ Party Party a je nutné pre pohľadávky / záväzky na účte {1}
 DocType: Dropbox Backup,Send Notifications To,Odeslat upozornění
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Účet {0} neexistuje
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Prosím vytvořte platovou strukturu pro zaměstnance {0}
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index 3d657d2527..c9b3c02402 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Način plače
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Izberite mesečnim izplačilom, če želite spremljati glede na sezono."
 DocType: Employee,Divorced,Ločen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Opozorilo: Same postavka je bila vpisana večkrat.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Opozorilo: Same postavka je bila vpisana večkrat.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Postavke že sinhronizirano
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Dovoli Postavka, ki se doda večkrat v transakciji"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Opusti Material obisk {0} pred preklicem te garancije
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zbijanje plus sintranje
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebna za tečajnico {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bo izračunana v transakciji.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Od Material zahtevo
+DocType: Purchase Order,Customer Contact,Stranka Kontakt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od Material zahtevo
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Predlagatelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ni več zadetkov.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Ime stranke
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Vsa izvozna polja, povezana kot valuto, konverzijo, izvoza skupaj, izvozno skupni vsoti itd so na voljo v dobavnica, POS, predračun, prodajne fakture, Sales Order itd"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Glave (ali skupine), proti katerim vknjižbe so narejeni in stanje se ohranijo."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Izjemna za {0} ne more biti manjša od nič ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Izjemna za {0} ne more biti manjša od nič ({1})
 DocType: Manufacturing Settings,Default 10 mins,Privzeto 10 minut
 DocType: Leave Type,Leave Type Name,Pustite Tip Ime
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija Posodobljeno Uspešno
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Več cene postavko.
 DocType: SMS Center,All Supplier Contact,Vse Dobavitelj Kontakt
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Pričakuje Končni datum ne more biti manjši od pričakovanega začetka Datum
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Ali res želite Odčepiti proizvodne red:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Vrstica # {0}: Stopnja mora biti enaka kot {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,New Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Leave Application
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Osnutek
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Da bi ohranili stranke pametno Koda in da bi jim iskanje, ki temelji na njihovi kode uporabite to možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Način plačilnega računa
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Prikaži Varia
 DocType: Sales Invoice Item,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Posojili (obveznosti)
 DocType: Employee Education,Year of Passing,"Leto, ki poteka"
-sites/assets/js/erpnext.min.js +27,In Stock,Na zalogi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Lahko le plačilo proti neobračunano Sales Order
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na zalogi
 DocType: Designation,Designation,Imenovanje
 DocType: Production Plan Item,Production Plan Item,Proizvodni načrt Postavka
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uporabnik {0} je že dodeljen Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Naredite nov POS Profile
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Skrb za zdravje
 DocType: Purchase Invoice,Monthly,Mesečni
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Račun
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zamuda pri plačilu (dnevi)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Račun
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email naslov
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obramba
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Ocena (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Vrstica # {0}:
 DocType: Delivery Note,Vehicle No,Nobeno vozilo
-sites/assets/js/erpnext.min.js +55,Please select Price List,Izberite Cenik
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Izberite Cenik
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Lesno
 DocType: Production Order Operation,Work In Progress,V razvoju
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D tiskanje
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Odpiranje za službo.
 DocType: Item Attribute,Increment,Prirastek
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Izberite Skladišče ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Oglaševanje
 DocType: Employee,Married,Poročen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
 DocType: Payment Reconciliation,Reconcile,Uskladite
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Trgovina z živili
 DocType: Quality Inspection Reading,Reading 1,Branje 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Naredite Bank Entry
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Naredite Bank Entry
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pokojninski skladi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Skladišče je obvezna, če tip račun skladišče"
 DocType: SMS Center,All Sales Person,Vse Sales oseba
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Napišite Off stroškovni center
 DocType: Warehouse,Warehouse Detail,Skladišče Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prečkal za stranko {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Davčna Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Nimate dovoljenja za dodajanje ali posodobitev vnose pred {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Nimate dovoljenja za dodajanje ali posodobitev vnose pred {0}
 DocType: Item,Item Image (if not slideshow),Postavka Image (če ne slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Obstaja Stranka z istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Urne / 60) * Dejanska Operacija čas
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Gost
 DocType: Quality Inspection,Get Specification Details,Pridobite Specification Podrobnosti
 DocType: Lead,Interested,Zanima
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvoritev
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvoritev
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopiranje iz postavke skupine
 DocType: Journal Entry,Opening Entry,Otvoritev Začetek
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Povpraševanje izdelek
 DocType: Standard Reply,Owner,Lastnik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosimo, da najprej vnesete podjetje"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Prosimo, izberite Company najprej"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Prosimo, izberite Company najprej"
 DocType: Employee Education,Under Graduate,Pod Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Ciljna Na
 DocType: BOM,Total Cost,Skupni stroški
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Predpona
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Potrošni
 DocType: Upload Attendance,Import Log,Uvoz Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Pošlji
+DocType: Sales Invoice Item,Delivered By Supplier,Delivered dobavitelj
 DocType: SMS Center,All Contact,Vse Kontakt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Letne plače
 DocType: Period Closing Voucher,Closing Fiscal Year,Zapiranje poslovno leto
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Contra Začetek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Prikaži Čas Dnevniki
 DocType: Journal Entry Account,Credit in Company Currency,Kredit v podjetju valuti
 DocType: Delivery Note,Installation Status,Namestitev Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Sprejeta + Zavrnjeno Količina mora biti enaka Prejeto količini za postavko {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Sprejeta + Zavrnjeno Količina mora biti enaka Prejeto količini za postavko {0}
 DocType: Item,Supply Raw Materials for Purchase,Dobava surovine za nakup
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Postavka {0} mora biti Nakup postavka
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Prenesite predloge, izpolnite ustrezne podatke in priložite spremenjeno datoteko. Vsi datumi in zaposleni kombinacija v izbranem obdobju, bo prišel v predlogo, z obstoječimi zapisi postrežbo"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Postavka {0} ni aktiven ali je bil dosežen konec življenja
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Postavka {0} ni aktiven ali je bil dosežen konec življenja
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bo treba posodobiti po Sales predložen račun.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavitve za HR modula
 DocType: SMS Center,SMS Center,SMS center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ravnanje
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Vnesite url parameter za s
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Pravila za uporabo cene in popust.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Ta čas Log v nasprotju s {0} za {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenik mora biti primerno za nakup ali prodajo
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Datum namestitve ne more biti pred datumom dostave za postavko {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum namestitve ne more biti pred datumom dostave za postavko {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na ceno iz cenika Stopnja (%)
-sites/assets/js/form.min.js +279,Start,Začetek
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Začetek
 DocType: User,First Name,Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Vaša nastavitev je končana. Osvežujoče.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-plesni litje
 DocType: Offer Letter,Select Terms and Conditions,Izberite Pogoji
 DocType: Production Planning Tool,Sales Orders,Prodajni Naročila
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti Sales računa Postavka
 ,Production Orders in Progress,Proizvodna naročila v teku
 DocType: Lead,Address & Contact,Naslov in kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neuporabljene liste iz prejšnjih dodelitev
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Naslednja Ponavljajoči {0} se bo ustvaril na {1}
 DocType: Newsletter List,Total Subscribers,Skupaj Naročniki
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontaktno ime
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Do Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ustvari plačilni list za zgoraj omenjenih kriterijev.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zaprosi za nakup.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dvojno ohišje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Listi na leto
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Prosim, nastavite Poimenovanje Series za {0} preko Nastavitev> Nastavitve> za poimenovanje Series"
 DocType: Time Log,Will be updated when batched.,"Bo treba posodobiti, če Posodi."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Vrstica {0}: Prosimo, preverite "Je Advance" proti račun {1}, če je to predujem vnos."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Vrstica {0}: Prosimo, preverite "Je Advance" proti račun {1}, če je to predujem vnos."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Skladišče {0} ne pripada podjetju {1}
 DocType: Bulk Email,Message,Sporočilo
 DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Dostop Key
 DocType: Payment Tool,Reference No,Referenčna številka
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Pustite blokiranih
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Letno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka
 DocType: Stock Entry,Sales Invoice No,Prodaja Račun Ne
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Najmanjše naročilo Kol
 DocType: Pricing Rule,Supplier Type,Dobavitelj Type
 DocType: Item,Publish in Hub,Objavite v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Postavka {0} je odpovedan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Material Zahteva
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Material Zahteva
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
 DocType: Item,Purchase Details,Nakup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Postavka {0} ni bilo mogoče najti v "surovin, dobavljenih" mizo v narocilo {1}"
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Nadzor obvestilo
 DocType: Lead,Suggestions,Predlogi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Postavka proračuni Skupina pametno na tem ozemlju. Lahko tudi sezonske z nastavitvijo Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Vnesite matično skupino računa za skladišče {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plačilo pred {0} {1} ne sme biti večja od neporavnanega zneska {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plačilo pred {0} {1} ne sme biti večja od neporavnanega zneska {2}
 DocType: Supplier,Address HTML,Naslov HTML
 DocType: Lead,Mobile No.,Mobilni No.
 DocType: Maintenance Schedule,Generate Schedule,Ustvarjajo Urnik
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Zapiranje računa Head
 DocType: Employee,External Work History,Zunanji Delo Zgodovina
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Krožna Reference Error
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Ali res želite STOP
 DocType: Communication,Closed,Zaprto
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Z besedami (izvoz) bo viden, ko boste shranite dobavnici."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Ali ste prepričani, da želite STOP"
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,Job profila
 DocType: Newsletter,Newsletter,Newsletter
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Poročilo o dostavi
 DocType: Dropbox Backup,Allow Dropbox Access,Dovoli Dropbox dostop
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavitev Davki
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Začetek Plačilo je bil spremenjen, ko je potegnil. Prosimo, še enkrat vleči."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Povzetek za ta teden in ki potekajo dejavnosti
 DocType: Workstation,Rent Cost,Najem Stroški
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Prosimo, izberite mesec in leto"
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Stopnjo, po kateri je naročnik Valuta pretvori v osnovni valuti kupca"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Na voljo v BOM, dobavnica, računu o nakupu, proizvodnje reda, narocilo, Potrdilo o nakupu, prodajni fakturi, Sales Order, Stock vstopu, Timesheet"
 DocType: Item Tax,Tax Rate,Davčna stopnja
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Izberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Izberite Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Postavka: {0} je uspelo šaržno, ni mogoče uskladiti z uporabo \ zaloge sprave, namesto tega uporabite zaloge Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Vrstica # {0}: mora Serija Ne biti enaka kot {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,"Pretvarjanje, da non-Group"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Potrdilo o nakupu je treba predložiti
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Trenutni Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Serija (lot) postavke.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Debetne Znesek
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}"
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}"
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaš email naslov
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Glej prilogo
 DocType: Purchase Order,% Received,% Prejeto
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Navodila
 DocType: Quality Inspection,Inspected By,Pregledajo
 DocType: Maintenance Visit,Maintenance Type,Vzdrževanje Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serijska št {0} ne pripada dobavnica {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serijska št {0} ne pripada dobavnica {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Postavka Inšpekcijski parametrov kakovosti
 DocType: Leave Application,Leave Approver Name,Pustite odobritelju Name
 ,Schedule Date,Urnik Datum
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Nakup Register
 DocType: Landed Cost Item,Applicable Charges,Veljavnih cenah
 DocType: Workstation,Consumable Cost,Potrošni Stroški
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo "Leave odobritelj"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo "Leave odobritelj"
 DocType: Purchase Receipt,Vehicle Date,Datum vozilo
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog za izgubo
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% Nameščeni
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Prosimo, da najprej vpišete ime podjetja"
 DocType: BOM,Item Desription,Postavka Desription
 DocType: Purchase Invoice,Supplier Name,Dobavitelj Name
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Preberite priročnik ERPNext
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Samodejno nastavi Serijska št temelji na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Preverite Dobavitelj Številka računa Edinstvenost
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Prodaja Master Ma
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globalne nastavitve za vseh proizvodnih procesov.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Zamrznjena Stanuje
 DocType: SMS Log,Sent On,Pošlje On
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
 DocType: Sales Order,Not Applicable,Se ne uporablja
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday gospodar.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell modeliranje
 DocType: Material Request Item,Required Date,Zahtevani Datum
 DocType: Delivery Note,Billing Address,Naslov za pošiljanje računa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Vnesite Koda.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vnesite Koda.
 DocType: BOM,Costing,Stanejo
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Če je omogočeno, se bo štela za znesek davka, kot je že vključena v Print Oceni / Print Znesek"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Skupaj Kol
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Čas med dejav
 DocType: Customer,Buyer of Goods and Services.,Kupec blaga in storitev.
 DocType: Journal Entry,Accounts Payable,Računi se plačuje
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj naročnikov
-sites/assets/js/erpnext.min.js +5,""" does not exists","Ne obstaja
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","Ne obstaja
 DocType: Pricing Rule,Valid Upto,Valid Stanuje
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Neposredne dohodkovne
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Filter ne more temeljiti na račun, če je združena s račun"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Upravni uradnik
 DocType: Payment Tool,Received Or Paid,Prejete ali plačane
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Prosimo, izberite Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Prosimo, izberite Company"
 DocType: Stock Entry,Difference Account,Razlika račun
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Ne more blizu naloga, saj je njena odvisna Naloga {0} ni zaprt."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
 DocType: Production Order,Additional Operating Cost,Dodatne operacijski stroškov
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kozmetika
 DocType: DocField,Type,Tip
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
 DocType: Communication,Subject,Predmet
 DocType: Shipping Rule,Net Weight,Neto teža
 DocType: Employee,Emergency Phone,Zasilna Telefon
 ,Serial No Warranty Expiry,Zaporedna številka Garancija preteka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Ali res želite STOP tega materiala Zahtevaj?
 DocType: Sales Order,To Deliver,Dostaviti
 DocType: Purchase Invoice Item,Item,Postavka
 DocType: Journal Entry,Difference (Dr - Cr),Razlika (Dr - Cr)
 DocType: Account,Profit and Loss,Dobiček in izguba
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Upravljanje Podizvajalci
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Upravljanje Podizvajalci
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM ne sme biti tipa celo število
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Pohištvo in koledarjev
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Obrestna mera, po kateri Cenik valuti, se pretvori v osnovni valuti družbe"
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / Uredi davkov in d
 DocType: Purchase Invoice,Supplier Invoice No,Dobavitelj Račun Ne
 DocType: Territory,For reference,Za sklic
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne morem izbrisati Serijska št {0}, saj je uporabljen v transakcijah zalogi"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Zapiranje (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zapiranje (Cr)
 DocType: Serial No,Warranty Period (Days),Garancijski rok (dni)
 DocType: Installation Note Item,Installation Note Item,Namestitev Opomba Postavka
 ,Pending Qty,Pending Kol
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Zaračunavanje in Delivery Stat
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Stranke
 DocType: Leave Control Panel,Allocate,Dodeli
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Prejšnja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Prodaja Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Prodaja Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Izberite prodajnih nalogov, iz katerega želite ustvariti naročila za proizvodnjo."
+DocType: Item,Delivered by Supplier (Drop Ship),Dostavi dobavitelja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Deli plače.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Podatkovna baza potencialnih strank.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza podatkov o strankah.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Gimnastika
 DocType: Purchase Order Item,Billed Amt,Bremenjenega Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logično Warehouse, zoper katerega so narejeni vnosov zalog."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenčna št & Referenčni datum je potrebna za {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenčna št & Referenčni datum je potrebna za {0}
 DocType: Event,Wednesday,Sreda
 DocType: Sales Invoice,Customer's Vendor,Prodajalec stranke
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodnja naročilo je Obvezno
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Sprejemnik Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""Na podlagi" in "skupina, ki jo" ne more biti enaka"
 DocType: Sales Person,Sales Person Targets,Prodaja Osebni cilji
-sites/assets/js/form.min.js +271,To,Če želite
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Vnesite e-poštni naslov
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Če želite
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Vnesite e-poštni naslov
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Konec cevarne
 DocType: Production Order Operation,In minutes,V minutah
 DocType: Issue,Resolution Date,Resolucija Datum
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,Projekti Uporabnik
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Porabljeno
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ni mogoče najti v računa Podrobnosti tabeli
 DocType: Company,Round Off Cost Center,Zaokrožijo stroškovni center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vzdrževanje obisk {0} je treba odpovedati pred preklicem te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vzdrževanje obisk {0} je treba odpovedati pred preklicem te Sales Order
 DocType: Material Request,Material Transfer,Prenos materialov
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Odprtje (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Napotitev žig mora biti po {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Nastavitve
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Iztovorjeni stroškov Davki in prispevki
 DocType: Production Order Operation,Actual Start Time,Actual Start Time
 DocType: BOM Operation,Operation Time,Operacija čas
-sites/assets/js/list.min.js +5,More,Več
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Več
 DocType: Pricing Rule,Sales Manager,Vodja prodaje
-sites/assets/js/desk.min.js +7673,Rename,Preimenovanje
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Preimenovanje
 DocType: Journal Entry,Write Off Amount,Napišite enkratnem znesku
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Upogibanje
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Dovoli Uporabnik
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,T
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Naravnost striženje
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Slediti element pri prodaji in nakupu listin, ki temelji na njihovih serijskih nos. To je mogoče uporabiti tudi za sledenje podrobnosti garancijske izdelka."
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutna zaloga
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Zavrnjeno Skladišče je obvezna proti regected postavki
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Zavrnjeno Skladišče je obvezna proti regected postavki
 DocType: Account,Expenses Included In Valuation,Stroški Vključeno v vrednotenju
 DocType: Employee,Provide email id registered in company,"Zagotovite email id, registrirano v družbi"
 DocType: Hub Settings,Seller City,Prodajalec Mesto
 DocType: Email Digest,Next email will be sent on:,Naslednje sporočilo bo poslano na:
 DocType: Offer Letter Term,Offer Letter Term,Pisna ponudba Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Element ima variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Postavka {0} ni bilo mogoče najti
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Dobrodošli
 DocType: Journal Entry,Credit Card Entry,Začetek Credit Card
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Naloga Predmet
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,"Blago, prejetih od dobaviteljev."
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Blago, prejetih od dobaviteljev."
 DocType: Communication,Open,Odpri
 DocType: Lead,Campaign Name,Ime kampanje
 ,Reserved,Rezervirano
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Ali res želite Odčepiti
 DocType: Purchase Order,Supply Raw Materials,Oskrba z Surovine
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, na katerega se bo ustvarila naslednji račun. To je ustvarila na oddajte."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Kratkoročna sredstva
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Stranke Naročilo Ne
 DocType: Employee,Cell Number,Število celic
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v "Proti listu vstopa" stolpcu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v "Proti listu vstopa" stolpcu"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Priložnost Od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mesečno poročilo o izplačanih plačah.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}.
 DocType: Company,Default Cost of Goods Sold Account,Privzeto Nabavna vrednost prodanega blaga račun
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Cenik ni izbrana
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Cenik ni izbrana
 DocType: Employee,Family Background,Družina Ozadje
 DocType: Process Payroll,Send Email,Pošlji e-pošto
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ne Dovoljenje
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Postavke z višjo weightage bo prikazan višje
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Sprava Detail
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moji računi
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Najdenih ni delavec
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Najdenih ni delavec
 DocType: Purchase Order,Stopped,Ustavljen
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Izberite BOM začeti
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Naloži z
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošlji Zdaj
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Spletna stran Skladišče
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Ali res želite ustaviti proizvodnjo red:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dan v mesecu, v katerem se bo samodejno Račun ustvarjen na primer 05, 28, itd"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultat mora biti manjša od ali enaka 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Zapisi C-Form
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Podpo
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da bi omogočili "prodajno mesto" funkcije
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Izberite Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} proti Bill {1} ​​dne {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} proti Bill {1} ​​dne {2}
 DocType: Comment,Reference Name,Referenca Ime
 DocType: Maintenance Visit,Completion Status,Zaključek Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljna Skladišče
 DocType: Item,Allow over delivery or receipt upto this percent,Dovoli nad dostavo ali prejem upto tem odstotkov
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Pričakuje Dostava datum ne more biti pred Sales Order Datum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Pričakuje Dostava datum ne more biti pred Sales Order Datum
 DocType: Upload Attendance,Import Attendance,Uvoz Udeležba
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Vse Postavka Skupine
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Samodejno sestavite sporočilo o predložitvi transakcij.
 DocType: Production Order,Item To Manufacture,Postavka za izdelavo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Kalup za vlivanje
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Nakup naročila do plačila
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Nakup naročila do plačila
 DocType: Sales Order Item,Projected Qty,Predvidoma Kol
 DocType: Sales Invoice,Payment Due Date,Plačilo Zaradi Datum
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,Zahtevane številke
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Cenitev uspešnosti.
 DocType: Sales Invoice Item,Stock Details,Stock Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Value
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Prodajno mesto
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},"Ne morejo opravljati naprej, {0}"
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Prodajno mesto
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},"Ne morejo opravljati naprej, {0}"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje na računu že v kreditu, ki vam ni dovoljeno, da nastavite "Stanje mora biti" kot "bremenitev""
 DocType: Account,Balance must be,Ravnotežju mora biti
 DocType: Hub Settings,Publish Pricing,Objavite Pricing
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Potrdilo o nakupu
 ,Received Items To Be Billed,Prejete Postavke placevali
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrazivnega sredstva
-sites/assets/js/desk.min.js +3938,Ms,gospa
+DocType: Employee,Ms,gospa
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Menjalnega tečaja valute gospodar.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Ni mogoče najti terminu v naslednjih {0} dni za delovanje {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan material za sklope
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,Razpon
 DocType: Supplier,Default Payable Accounts,Privzete plačuje računov
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
 DocType: Features Setup,Item Barcode,Postavka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Postavka Variante {0} posodobljen
 DocType: Quality Inspection Reading,Reading 6,Branje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Nakup računa Advance
 DocType: Address,Shop,Trgovina
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Vrstica {0}: Credit vnos ni mogoče povezati z {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Vrstica {0}: Credit vnos ni mogoče povezati z {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Privzeto Bank / Cash račun bo samodejno posodobi v POS računa, ko je izbrana ta način."
 DocType: Employee,Permanent Address Is,Stalni naslov je
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Operacija zaključena, za koliko končnih izdelkov?"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Dodatek za prekomerno {0} prečkal za postavko {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Dodatek za prekomerno {0} prečkal za postavko {1}.
 DocType: Employee,Exit Interview Details,Exit Intervju Podrobnosti
 DocType: Item,Is Purchase Item,Je Nakup Postavka
 DocType: Journal Entry Account,Purchase Invoice,Nakup Račun
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detail Ne
 DocType: Stock Entry,Total Outgoing Value,Skupaj Odhodni Vrednost
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Pričetek in rok bi moral biti v istem proračunskem letu
 DocType: Lead,Request for Information,Zahteva za informacije
 DocType: Payment Tool,Paid,Plačan
 DocType: Salary Slip,Total in words,Skupaj z besedami
 DocType: Material Request Item,Lead Time Date,Lead Time Datum
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je obvezna. Mogoče je Menjalni zapis ni ustvarjen za
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Vrstica # {0}: Navedite Zaporedna številka za postavko {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Za "izdelek Bundle 'predmetov, skladišče, serijska številka in serijska se ne šteje od" seznam vsebine "mizo. Če so skladišča in serija ni enaka za vso embalažo postavke za kakršno koli "izdelek Bundle 'postavko, lahko te vrednosti je treba vnesti v glavnem Element tabele, bodo vrednosti, ki se kopira na" seznam vsebine "mizo."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Pošiljke strankam.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Pošiljke strankam.
 DocType: Purchase Invoice Item,Purchase Order Item,Naročilnica item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Posredna Prihodki
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Nastavite Znesek plačila = neporavnanega zneska
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,Naslov Line 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variance
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ime podjetja
 DocType: SMS Center,Total Message(s),Skupaj sporočil (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Oglejte si seznam vseh videoposnetkov pomočjo
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izberite račun vodja banke, kjer je bila deponirana pregled."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Dovoli uporabniku, da uredite Cenik Ocenite v transakcijah"
 DocType: Pricing Rule,Max Qty,Max Kol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Vrstica {0}: morala Plačilo proti prodaja / narocilo vedno označen kot vnaprej
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Vrstica {0}: morala Plačilo proti prodaja / narocilo vedno označen kot vnaprej
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemical
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Vsi predmeti so že prenesli za to Production Order.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Vsi predmeti so že prenesli za to Production Order.
 DocType: Process Payroll,Select Payroll Year and Month,Izberite Payroll leto in mesec
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pojdi na ustrezno skupino (običajno uporabo sredstev> obratnih sredstev> bančnih računov in ustvarite nov račun (s klikom na Dodaj Child) tipa "banka"
 DocType: Workstation,Electricity Cost,Stroški električne energije
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bela
 DocType: SMS Center,All Lead (Open),Vse Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get plačanih predplačil
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Priložite svojo sliko
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Poskrbite
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Poskrbite
 DocType: Journal Entry,Total Amount in Words,Skupni znesek v besedi
 DocType: Workflow State,Stop,Stop
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Prišlo je do napake. Eden verjeten razlog je lahko, da niste shranili obrazec. Obrnite support@erpnext.com če je težava odpravljena."
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,Pakiranje Slip Postavka
 DocType: POS Profile,Cash/Bank Account,Gotovina / bančni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti.
 DocType: Delivery Note,Delivery To,Dostava
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Lastnost miza je obvezna
 DocType: Production Planning Tool,Get Sales Orders,Pridobite prodajnih nalogov
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne more biti negativna
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Vložitev
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"Bo treba posod
 DocType: Project,Internal,Notranja
 DocType: Task,Urgent,Nujna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Navedite veljavno Row ID za vrstico {0} v tabeli {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Pojdite na namizje in začeti uporabljati ERPNext
 DocType: Item,Manufacturer,Proizvajalec
 DocType: Landed Cost Item,Purchase Receipt Item,Potrdilo o nakupu Postavka
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse v Sales Order / dokončanih proizvodov Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Prodajni Znesek
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Čas Dnevniki
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ste Expense odobritelj za ta zapis. Prosimo Posodobite "status" in Shrani
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ste Expense odobritelj za ta zapis. Prosimo Posodobite "status" in Shrani
 DocType: Serial No,Creation Document No,Za ustvarjanje dokumentov ni
 DocType: Issue,Issue,Težava
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za postavko variant. primer velikost, barvo itd"
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Privzeto Center Prodajni Stroški
 DocType: Sales Partner,Implementation Partner,Izvajanje Partner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} je {1}
 DocType: Opportunity,Contact Info,Contact Info
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Izdelava Zaloga Entries
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Izdelava Zaloga Entries
 DocType: Packing Slip,Net Weight UOM,Neto teža UOM
 DocType: Item,Default Supplier,Privzeto Dobavitelj
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjo dodatku Odstotek
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Get Tedenski datumov
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Končni datum ne sme biti manj kot začetni dan
 DocType: Sales Person,Select company name first.,Izberite ime podjetja prvič.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citati, prejetih od dobaviteljev."
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Za {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,posodablja preko Čas Dnevniki
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registracija podjetja številke za vaše reference. Davčne številke itd
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Pravilo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja naročite {0} je treba preklicati pred preklicem te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja naročite {0} je treba preklicati pred preklicem te Sales Order
 ,Ordered Items To Be Billed,Naročeno Postavke placevali
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od mora biti manj Razpon kot gibala
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Izberite Time Dnevniki in predložiti ustvariti nov prodajni fakturi.
@@ -982,7 +987,7 @@ apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or c
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bo dodan Točka Kodeksa variante. Na primer, če je vaša kratica je "SM", in oznaka postavka je "T-shirt", postavka koda varianto bo "T-SHIRT-SM""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (z besedami), bo viden, ko boste shranite plačilnega lista."
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Active
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blue
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Modra
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Cenik Država
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Nadaljnje vozlišča lahko ustvari samo na podlagi tipa vozlišča "skupina"
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Davčna
 DocType: Lead,Lead,Svinec
 DocType: Email Digest,Payables,Obveznosti
 DocType: Account,Warehouse,Skladišče
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
 ,Purchase Order Items To Be Billed,Naročilnica Postavke placevali
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Nakup računa item
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Plači
 DocType: Global Defaults,Current Fiscal Year,Tekočem proračunskem letu
 DocType: Global Defaults,Disable Rounded Total,Onemogoči Zaobljeni Skupaj
 DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"Navedbe" ne more biti prazna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"Navedbe" ne more biti prazna
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dvojnik vrstica {0} z enako {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Postavitev Zaposleni
-sites/assets/js/erpnext.min.js +5,"Grid """,Mreža "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavitev Zaposleni
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Mreža "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosimo, izberite predpono najprej"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Raziskave
 DocType: Maintenance Visit Purpose,Work Done,Delo končano
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,Pošlje
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ogled Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
 DocType: Communication,Delivery Status,Dostava Status
 DocType: Production Order,Manufacture against Sales Order,Izdelava zoper Sales Order
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Ostali svet
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Ostali svet
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postavki {0} ne more imeti Batch
 ,Budget Variance Report,Proračun Varianca Poročilo
 DocType: Salary Slip,Gross Pay,Bruto Pay
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Plačane dividende
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Računovodstvo Ledger
 DocType: Stock Reconciliation,Difference Amount,Razlika Znesek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Preneseni čisti poslovni izid
 DocType: BOM Item,Item Description,Postavka Opis
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,Priložnost Postavka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Začasna Otvoritev
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaposleni Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},"Saldo račun {0}, morajo biti vedno {1}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},"Saldo račun {0}, morajo biti vedno {1}"
 DocType: Address,Address Type,Naslov Type
 DocType: Purchase Receipt,Rejected Warehouse,Zavrnjeno Skladišče
 DocType: GL Entry,Against Voucher,Proti Voucher
 DocType: Item,Default Buying Cost Center,Privzeto Center nakupovanje Stroški
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Da bi dobili najboljše iz ERPNext, vam priporočamo, da si vzamete nekaj časa in gledam te posnetke pomoč."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Postavka {0} mora biti Sales postavka
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,da
 DocType: Item,Lead Time in days,Svinec čas v dnevih
 ,Accounts Payable Summary,Računi plačljivo Povzetek
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Ne smejo urejati zamrznjeni račun {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ne smejo urejati zamrznjeni račun {0}
 DocType: Journal Entry,Get Outstanding Invoices,Pridobite neplačanih računov
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ni veljaven
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Kraj izdaje
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Naročilo
 DocType: Report,Disabled,Onemogočeno
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},"UOM coversion dejavnik, potreben za UOM: {0} v postavki: {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},"UOM coversion dejavnik, potreben za UOM: {0} v postavki: {1}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Posredni stroški
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Vrstica {0}: Kol je obvezna
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Kmetijstvo
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,Način plačila
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"To je skupina, root element in ga ni mogoče urejati."
 DocType: Journal Entry Account,Purchase Order,Naročilnica
 DocType: Warehouse,Warehouse Contact Info,Skladišče Kontakt Info
-sites/assets/js/form.min.js +190,Name is required,Zahtevano je ime
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Zahtevano je ime
 DocType: Purchase Invoice,Recurring Type,Ponavljajoči Type
 DocType: Address,City/Town,Mesto / Kraj
 DocType: Email Digest,Annual Income,Letni dohodek
 DocType: Serial No,Serial No Details,Serijska št Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Postavka Davčna stopnja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalski Oprema
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Pričakuje Dobavni rok je manj od načrtovanega začetni datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Za dobavitelja
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavitev Vrsta računa pomaga pri izbiri ta račun v transakcijah.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (družba Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Skupaj Odhodni
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Obstaja lahko samo en prevoz pravilo Pogoj z 0 ali prazno vrednost za "ceniti"
 DocType: Authorization Rule,Transaction,Posel
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Opomba: Ta Stroški Center je skupina. Ne more vknjižbe proti skupinam.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Orodja
+apps/frappe/frappe/config/desk.py +7,Tools,Orodja
 DocType: Item,Website Item Groups,Spletna stran Element Skupine
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Število proizvodnja naročilo je obvezna za izdelavo vstopne stock namena
 DocType: Purchase Invoice,Total (Company Currency),Skupaj (družba Valuta)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,Workstation Name
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-sites/assets/js/desk.min.js +7652,Comments,Komentarji
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentarji
 DocType: Salary Slip,Bank Account No.,Bančni račun No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je številka zadnjega ustvarjene transakcijo s tem predpono
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Oceni Vrednotenje potreben za postavko {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Prosimo izbe
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Zapusti
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavitelj Datum računa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Morate omogočiti Košarica
-sites/assets/js/form.min.js +212,No Data,Ni podatkov
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ni podatkov
 DocType: Appraisal Template Goal,Appraisal Template Goal,Cenitev Predloga cilj
 DocType: Salary Slip,Earning,Služenje
 DocType: Payment Tool,Party Account Currency,Party Valuta računa
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,Party Valuta računa
 DocType: Purchase Taxes and Charges,Add or Deduct,Dodajte ali odštejemo
 DocType: Company,If Yearly Budget Exceeded (for expense account),Če Letni proračun Presežena (za odhodek račun)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Prekrivajoča pogoji najdemo med:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Proti listu Začetek {0} je že prilagojena proti neki drugi kupon
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Proti listu Začetek {0} je že prilagojena proti neki drugi kupon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Skupna vrednost naročila
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Staranje Območje 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Število obiskov
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Glasila do stikov, vodi."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zaključni račun mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Seštevek točk za vseh ciljev bi morala biti 100. To je {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacije ne sme ostati prazen.
 ,Delivered Items To Be Billed,Dobavljeni artikli placevali
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladišče ni mogoče spremeniti za Serial No.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status posodobljen na {0}
 DocType: DocField,Description,Opis
 DocType: Authorization Rule,Average Discount,Povprečen Popust
 DocType: Letter Head,Is Default,Je Privzeto
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Postavka Znesek davka
 DocType: Item,Maintain Stock,Ohraniti park
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zaloga Vpisi že ustvarjene za proizvodnjo red
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Pustite prazno, če velja za vse označb"
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip "Dejanski" v vrstici {0} ni mogoče vključiti v postavko Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip "Dejanski" v vrstici {0} ni mogoče vključiti v postavko Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za podjetja
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,Dostava Naslov Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontnem
 DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
 DocType: Maintenance Visit,Unscheduled,Nenačrtovana
 DocType: Employee,Owned,Lasti
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Odvisno od dopusta brez plačila
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garancija / AMC Status
 DocType: GL Entry,GL Entry,GL Začetek
 DocType: HR Settings,Employee Settings,Nastavitve zaposlenih
 ,Batch-Wise Balance History,Serija-Wise Balance Zgodovina
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Seznam opravil
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Seznam opravil
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Vajenec
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativno Količina ni dovoljeno
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Urad za najem
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavitve Setup SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz uspelo!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Še ni naslov dodal.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Še ni naslov dodal.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation delovno uro
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analitik
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka JV znesku {2}"
 DocType: Item,Inventory,Popis
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da bi omogočili "prodajno mesto" pogled
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Plačilo ne more biti narejen za prazen voziček
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plačilo ne more biti narejen za prazen voziček
 DocType: Item,Sales Details,Prodajna Podrobnosti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pripenjanje
 DocType: Opportunity,With Items,Z Items
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Datum, na katerega se bo ustvarila naslednji račun. To je ustvarila na oddajte."
 DocType: Item Attribute,Item Attribute,Postavka Lastnost
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vlada
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Artikel Variante
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Artikel Variante
 DocType: Company,Services,Storitve
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Skupaj ({0})
 DocType: Cost Center,Parent Cost Center,Parent Center Stroški
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Proračunsko leto Start Date
 DocType: Employee External Work History,Total Experience,Skupaj Izkušnje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Grezenju
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Tovorni in Forwarding Stroški
 DocType: Material Request Item,Sales Order No,Prodaja Zaporedna številka
 DocType: Item Group,Item Group Name,Item Name Group
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferji Materiali za Izdelava
 DocType: Pricing Rule,For Price List,Za cenik
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,Urniki
 DocType: Purchase Invoice Item,Net Amount,Neto znesek
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Ne
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Znesek (Valuta Company)
-DocType: Period Closing Voucher,CoA Help,CoA Pomoč
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Napaka: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Napaka: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosimo, ustvarite nov račun iz kontnega načrta."
 DocType: Maintenance Visit,Maintenance Visit,Vzdrževanje obisk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Stranka> Skupina Customer> Territory
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Pristali Stroški Pomoč
 DocType: Event,Tuesday,Torek
 DocType: Leave Block List,Block Holidays on important days.,Blokiranje Počitnice na pomembnih dni.
 ,Accounts Receivable Summary,Terjatve Povzetek
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Listi za tip {0} že dodeljene za Employee {1} za obdobje {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Prosim, nastavite ID uporabnika polje v zapisu zaposlenih za določen Vloga zaposlenih"
 DocType: UOM,UOM Name,UOM Name
 DocType: Top Bar Item,Target,Target
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,Prodaja Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Vstop za {0} se lahko izvede samo v valuti: {1}
 DocType: Pricing Rule,Pricing Rule,Cen Pravilo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Prepuščanjem
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Material Zahteva za narocilo
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Material Zahteva za narocilo
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Vrstica # {0}: Vrnjeno Postavka {1} ne obstaja v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bančni računi
 ,Bank Reconciliation Statement,Izjava Bank Sprava
 DocType: Address,Lead Name,Svinec Name
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Odpiranje Stock Balance
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Odpiranje Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} se morajo pojaviti le enkrat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ne sme odtujiti bolj {0} od {1} proti narocilo {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Listi Dodeljena Uspešno za {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Listi Dodeljena Uspešno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ni prispevkov za pakiranje
 DocType: Shipping Rule Condition,From Value,Od vrednosti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Zneski, ki se ne odraža v banki"
 DocType: Quality Inspection Reading,Reading 4,Branje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Terjatve za račun družbe.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 DocType: Production Planning Tool,Select Sales Orders,Izberite prodajnih nalogov
 ,Material Requests for which Supplier Quotations are not created,Material Prošnje za katere so Dobavitelj Citati ni ustvaril
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za sledenje predmetov s pomočjo črtne kode. Morda ne boste mogli vnesti elemente v dobavnice in prodajne fakture s skeniranjem črtne kode elementa.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označi kot Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Naredite predračun
 DocType: Dependent Task,Dependent Task,Odvisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Poskusite načrtovanju operacij za X dni vnaprej.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday opomniki
 DocType: SMS Center,Receiver List,Sprejemnik Seznam
 DocType: Payment Tool Detail,Payment Amount,Plačilo Znesek
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Porabljeni znesek
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Poglej
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogled
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plača Struktura Odbitek
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivno lasersko sintranje
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Uvoz uspešno!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Strošek izdanih postavk
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne sme biti več kot {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,Privzeto plačljivo račun
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavitve za spletni košarici, kot so predpisi v pomorskem prometu, cenik itd"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% zaračunali
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Rezervirano Kol
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun Party
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Človeški viri
 DocType: Lead,Upper Income,Zgornja Prihodki
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Omogoči Košarica
 DocType: Employee,Permanent Address,stalni naslov
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Postavka {0} mora biti Service postavka.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Izplačano predplačilo proti {0} {1} ne more biti večja \ kot Grand Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Prosimo, izberite postavko kodo"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Zmanjšajte Odbitek za dopust brez plačila (md)
 DocType: Territory,Territory Manager,Ozemlje Manager
+DocType: Delivery Note Item,To Warehouse (Optional),Da Warehouse (po želji)
 DocType: Sales Invoice,Paid Amount (Company Currency),Plačan znesek (družba Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Prodaja Nastavitve
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin litje
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Skupina kupcev obstaja z istim imenom, prosimo spremenite ime stranke ali preimenovati skupino odjemalcev"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Prosimo, izberite {0} prvi."
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosimo, izberite {0} prvi."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Besedilo {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Branje 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,Serija Ne
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dovoli več prodajnih nalogov zoper naročnikovo narocilo
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
 DocType: DocPerm,Delete,Izbriši
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variant
-sites/assets/js/desk.min.js +7971,New {0},New {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Ustavil naročila ni mogoče preklicati. Odčepiti preklicati.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Ustavil naročila ni mogoče preklicati. Odčepiti preklicati.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
 DocType: Employee,Leave Encashed?,Dopusta unovčijo?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Priložnost Iz polja je obvezno
 DocType: Item,Variants,Variante
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Država
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Naslovi
 DocType: Communication,Received,Prejetih
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Podvajati Zaporedna številka vpisana v postavko {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Pogoj za Shipping pravilu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Točka ni dovoljeno imeti Production Order.
@@ -1502,15 +1512,14 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submi
 DocType: Authorization Control,Authorization Control,Pooblastilo za nadzor
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Čas Prijava za naloge.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Plačilo
-DocType: Production Order Operation,Actual Time and Cost,Dejanski čas in stroške
+DocType: Production Order Operation,Actual Time and Cost,Dejanski čas in stroški
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Material Zahteva za največ {0} se lahko izvede za postavko {1} proti Sales Order {2}
 DocType: Employee,Salutation,Pozdrav
 DocType: Communication,Rejected,Zavrnjeno
 DocType: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Bo veljalo tudi za variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Delivered
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle predmeti v času prodaje.
-DocType: Sales Order Item,Actual Qty,Dejanska Kol
+DocType: Sales Order Item,Actual Qty,Dejanska Količina
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Branje 10
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaših izdelkov ali storitev, ki jih kupujejo ali prodajajo. Poskrbite, da preverite skupino item, merska enota in ostalih nepremičninah, ko začnete."
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,N
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Striženje
 DocType: Item,Has Variants,Ima Variante
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"S klikom na gumb "Make Sales računu", da ustvarite nov prodajni fakturi."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,"Obdobje Od in obdobje, da datumi obvezne za ponavljajoče% s"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakiranje in označevanje
 DocType: Monthly Distribution,Name of the Monthly Distribution,Ime mesečnim izplačilom
 DocType: Sales Person,Parent Sales Person,Nadrejena Sales oseba
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Prosimo, navedite privzeta valuta v podjetju mojstrom in globalne privzetih"
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Dostop Secret
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajoči Račun
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Upravljanje projektov
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Upravljanje projektov
 DocType: Supplier,Supplier of Goods or Services.,Dobavitelj blaga ali storitev.
 DocType: Budget Detail,Fiscal Year,Poslovno leto
 DocType: Cost Center,Budget,Proračun
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Prodajanje
 DocType: Employee,Salary Information,Plača Informacije
 DocType: Sales Person,Name and Employee ID,Ime in zaposlenih ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
 DocType: Website Item Group,Website Item Group,Spletna stran Element Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Dajatve in davki
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Vnesite Referenčni datum
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} vnosov plačil ni mogoče filtrirati s {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vnesite Referenčni datum
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} vnosov plačil ni mogoče filtrirati s {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela za postavko, ki bo prikazana na spletni strani"
 DocType: Purchase Order Item Supplied,Supplied Qty,Priložena Kol
 DocType: Material Request Item,Material Request Item,Material Zahteva Postavka
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Drevo Artikel sku
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Ne more sklicevati številko vrstice večja ali enaka do trenutne številke vrstice za to vrsto Charge
 ,Item-wise Purchase History,Element-pametno Zgodovina nakupov
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Red
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosimo, kliknite na "ustvarjajo Seznamu" puščati Serijska št dodal za postavko {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosimo, kliknite na "ustvarjajo Seznamu" puščati Serijska št dodal za postavko {0}"
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Odprte Proizvodne Naročila
 DocType: Installation Note,Installation Time,Namestitev čas
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Narekovaj Trendi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},"Element Group, ki niso navedeni v točki mojster za postavko {0}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Kot je Produkcija naročilo lahko izvede za to postavko, mora biti točka parka."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Kot je Produkcija naročilo lahko izvede za to postavko, mora biti točka parka."
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Znesek
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Pridružitev
 DocType: Authorization Rule,Above Value,Nad vrednostjo
 ,Pending Amount,Dokler Znesek
 DocType: Purchase Invoice Item,Conversion Factor,Faktor pretvorbe
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Delivered
+DocType: Purchase Order,Delivered,Delivered
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup dohodni strežnik za delovna mesta email id. (npr jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Število vozil
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, na katerega se bodo ponavljajoče račun stop"
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuirajo pristojbi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Račun {0}, mora biti tipa "osnovno sredstvo", kot {1} je postavka sredstvo Item"
 DocType: HR Settings,HR Settings,Nastavitve HR
 apps/frappe/frappe/config/setup.py +130,Printing,Tiskanje
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Terjatev čaka na odobritev. Samo Expense odobritelj lahko posodobite stanje.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Terjatev čaka na odobritev. Samo Expense odobritelj lahko posodobite stanje.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Količina
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so počitnice. Vam ni treba zaprositi za dopust."
-sites/assets/js/desk.min.js +7805,and,in
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,in
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Šport
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,Kotacija
 DocType: Salary Slip,Total Deduction,Skupaj Odbitek
 DocType: Quotation,Maintenance User,Vzdrževanje Uporabnik
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Stroškovno Posodobljeno
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,"Ali ste prepričani, da želite Odčepiti"
 DocType: Employee,Date of Birth,Datum rojstva
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Postavka {0} je bil že vrnjen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** predstavlja poslovno leto. Vse vknjižbe in druge velike transakcije so gosenicami proti ** poslovnega leta **.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Spremljajte prodajnih akcij. Spremljajte Interesenti, citatov, Sales Order itd iz akcije, da bi ocenili donosnost naložbe."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Vpisi Zaloga obstajajo proti skladišču {0}, zato vam ne more ponovno dodeliti ali spremeniti Skladišče"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Vpisi Zaloga obstajajo proti skladišču {0}, zato vam ne more ponovno dodeliti ali spremeniti Skladišče"
 DocType: Appraisal,Calculate Total Score,Izračunaj skupni rezultat
 DocType: Supplier Quotation,Manufacturing Manager,Proizvodnja Manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijska št {0} je pod garancijo stanuje {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Dostava Opomba v pakete.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Pošiljke
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip modeliranje
+DocType: Purchase Order,To be delivered to customer,Ki jih je treba dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Status čas Prijava je treba predložiti.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijska št {0} ne pripada nobeni Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavitev
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Iz valute
 DocType: DocField,Name,Name
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Sales Order potreben za postavko {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order potreben za postavko {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Zneski, ki se ne odraža v sistemu"
 DocType: Purchase Invoice Item,Rate (Company Currency),Oceni (družba Valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Drugi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Nastavi kot Ustavljen
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Ne morete najti ujemanja artikel. Prosimo, izberite kakšno drugo vrednost za {0}."
 DocType: POS Profile,Taxes and Charges,Davki in dajatve
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Izdelek ali storitev, ki je kupil, prodal ali jih hranijo na zalogi."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ne morete izbrati vrsto naboja kot "On prejšnje vrstice Znesek" ali "Na prejšnje vrstice Total" za prvi vrsti
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,Izberite DOCTYPE
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Posnemanje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bančništvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Prosimo, kliknite na "ustvarjajo Seznamu", da bi dobili razpored"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,New Center Stroški
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,New Center Stroški
 DocType: Bin,Ordered Quantity,Naročeno Količina
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",npr "Build orodja za gradbenike"
 DocType: Quality Inspection,In Process,V postopku
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} proti Sales Order {1}
+DocType: Purchase Order Item,Reference Document Type,Referenčni dokument Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} proti Sales Order {1}
 DocType: Account,Fixed Asset,Osnovno sredstvo
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Zaporednimi Inventory
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Zaporednimi Inventory
 DocType: Activity Type,Default Billing Rate,Privzeto Oceni plačevanja
 DocType: Time Log Batch,Total Billing Amount,Skupni znesek plačevanja
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Terjatev račun
 ,Stock Balance,Stock Balance
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Sales Order do plačila
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order do plačila
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Zahtevek Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Čas Dnevniki ustvaril:
 DocType: Item,Weight UOM,Teža UOM
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Za računu mora biti plačljivo račun
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
 DocType: Production Order Operation,Completed Qty,Dopolnil Kol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, lahko le debetne račune povezati proti drugemu knjiženje"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Seznam Cena {0} je onemogočena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, lahko le debetne račune povezati proti drugemu knjiženje"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Seznam Cena {0} je onemogočena
 DocType: Manufacturing Settings,Allow Overtime,Dovoli Nadurno delo
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Sales Order {0} se ustavi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serijske številke, potrebne za postavko {1}. Ki ste ga navedli {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutni tečaj Vrednotenje
 DocType: Item,Customer Item Codes,Stranka Postavka Kode
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Varjenje
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM je potrebno
 DocType: Quality Inspection,Sample Size,Velikost vzorca
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Vsi predmeti so bili že obračunano
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Vsi predmeti so bili že obračunano
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Prosimo, navedite veljaven "Od zadevi št '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Nadaljnje stroškovna mesta se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Nadaljnje stroškovna mesta se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 DocType: Project,External,Zunanji
 DocType: Features Setup,Item Serial Nos,Postavka Serijska št
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uporabniki in dovoljenja
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,U
 DocType: Sales Partner,Address & Contacts,Naslov & Kontakti
 DocType: SMS Log,Sender Name,Sender Name
 DocType: Page,Title,Naslov
-sites/assets/js/list.min.js +104,Customize,Prilagajanje
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Prilagajanje
 DocType: POS Profile,[Select],[Izberite]
 DocType: SMS Log,Sent To,Poslano
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Naredite prodajni fakturi
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,End of Life
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Potovanja
 DocType: Leave Block List,Allow Users,Dovoli uporabnike
+DocType: Purchase Order,Customer Mobile No,Stranka Mobile No
 DocType: Sales Invoice,Recurring,Ponavljajoči
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledi ločeno prihodki in odhodki za vertikal proizvodov ali delitve.
 DocType: Rename Tool,Rename Tool,Preimenovanje orodje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Posodobitev Stroški
 DocType: Item Reorder,Item Reorder,Postavka Preureditev
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Prenos Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Prenos Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Določite operacij, obratovalne stroške in daje edinstveno Operacija ni na vaše poslovanje."
 DocType: Purchase Invoice,Price List Currency,Cenik Valuta
 DocType: Naming Series,User must always select,Uporabnik mora vedno izbrati
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,Zaposleni
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz Email Od
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Povabi kot uporabnik
 DocType: Features Setup,After Sale Installations,Po prodajo naprav
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} je v celoti zaračunali
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je v celoti zaračunali
 DocType: Workstation Working Hour,End Time,Končni čas
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni pogodbeni pogoji za prodajo ali nakup.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Skupina kupon
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Page,Standard,Standardni
 DocType: Rename Tool,File to Rename,Datoteka Preimenuj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Zaporedna številka potreben za postavko {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Prikaži Plačila
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Določeno BOM {0} ne obstaja za postavko {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vzdrževanje Urnik {0} je treba odpovedati pred preklicem te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vzdrževanje Urnik {0} je treba odpovedati pred preklicem te Sales Order
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Velikost
 DocType: Notification Control,Expense Claim Approved,Expense Zahtevek Odobreno
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,Udeležba na tekočem
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup dohodni strežnik za prodajo email id. (npr sales@example.com)
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Plačilo računa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
-sites/assets/js/list.min.js +23,Draft,Osnutek
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Osnutek
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzacijske Off
 DocType: Quality Inspection Reading,Accepted,Sprejeto
 DocType: User,Female,Ženska
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Surovine ne more biti prazno.
 DocType: Newsletter,Test,Testna
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kot že obstajajo transakcije zalog za to postavko, \ ne morete spremeniti vrednote "Ima Zaporedna številka", "Ima serija ni '," je Stock Postavka "in" metoda vrednotenja ""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hitro Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
 DocType: Employee,Previous Work Experience,Prejšnja Delovne izkušnje
 DocType: Stock Entry,For Quantity,Za Količina
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Vnesite načrtovanih Količina za postavko {0} v vrstici {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} ni predložena
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Prošnje za artikle.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} ni predložena
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Prošnje za artikle.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ločena proizvodnja naročilo bo ustvarjen za vsakega končnega dobro točko.
 DocType: Purchase Invoice,Terms and Conditions1,Pogoji in razmer1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Popolna Setup
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailin
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Contact,Enter department to which this Contact belongs,"Vnesite oddelek, v katerem ta Kontakt pripada"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Skupaj Odsoten
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Postavka ali skladišča za vrstico {0} ne ujema Material dogovoru
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Postavka ali skladišča za vrstico {0} ne ujema Material dogovoru
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Merska enota
 DocType: Fiscal Year,Year End Date,Leto End Date
 DocType: Task Depends On,Task Depends On,Naloga je odvisna od
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Naročilo Končni datum mora biti večja od Datum pridružitve
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributer tretja oseba / trgovec / provizije agent / podružnica / prodajalec, ki prodaja podjetja, izdelke za provizijo."
 DocType: Customer Group,Has Child Node,Ima otrok Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} proti narocilo {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} proti narocilo {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Vnesite statične parametre url tukaj (npr. Pošiljatelj = ERPNext, username = ERPNext, geslo = 1234 itd)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ni v nobeni aktivnem poslovnem letu. Za več podrobnosti preverite {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je primer spletne strani samodejno ustvari iz ERPNext
@@ -2021,11 +2032,9 @@ DocType: Note,Note,Zapisek
 DocType: Purchase Receipt Item,Recd Quantity,Recd Količina
 DocType: Email Account,Email Ids,E-pošta ID-ji
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne more proizvajati več item {0} od prodaje kol {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Nastavi kot Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
-DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
+DocType: Payment Reconciliation,Bank / Cash Account,Banka / Gotovinski račun
 DocType: Tax Rule,Billing City,Zaračunavanje Mesto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,To Leave Application čaka na odobritev. Samo Leave odobritelj lahko posodobite stanje.
 DocType: Global Defaults,Hide Currency Symbol,Skrij valutni simbol
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","npr Bank, gotovini, Kreditna kartica"
 DocType: Journal Entry,Credit Note,Dobropis
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Skupaj (Kol)
 DocType: Installation Note Item,Installed Qty,Nameščen Kol
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Predložen
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Predložen
 DocType: Salary Structure,Total Earning,Skupaj zaslužka
 DocType: Purchase Receipt,Time at which materials were received,"Čas, v katerem so bile prejete materiale"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moji Naslovi
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizacija
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ali
 DocType: Sales Order,Billing Status,Status zaračunavanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Pomožni Stroški
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Nad
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Nad
 DocType: Buying Settings,Default Buying Price List,Privzeto Seznam odkupna cena
 ,Download Backups,Prenesi Varnostne kopije
 DocType: Notification Control,Sales Order Message,Sales Order Sporočilo
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Izberite Zaposleni
 DocType: Bank Reconciliation,To Date,Če želite Datum
 DocType: Opportunity,Potential Sales Deal,Potencialni Sales Deal
-sites/assets/js/form.min.js +308,Details,Podrobnosti
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Podrobnosti
 DocType: Purchase Invoice,Total Taxes and Charges,Skupaj Davki in dajatve
 DocType: Employee,Emergency Contact,Zasilna Kontakt
 DocType: Item,Quality Parameters,Parametrov kakovosti
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,Prejela Kol
 DocType: Stock Entry Detail,Serial No / Batch,Zaporedna številka / Batch
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Vrsta računa
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vzdrževanje Urnik se ne ustvari za vse postavke. Prosimo, kliknite na "ustvarjajo Seznamu""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vzdrževanje Urnik se ne ustvari za vse postavke. Prosimo, kliknite na "ustvarjajo Seznamu""
 ,To Produce,Za izdelavo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za vrstico {0} v {1}. Če želite vključiti {2} v stopnji Element, {3}, mora biti vključena tudi vrstice"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketu za dostavo (za tisk)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Uravnavanjem
 DocType: Account,Income Account,Prihodki račun
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modeliranje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Dostava
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dostava
 DocType: Stock Reconciliation Item,Current Qty,Trenutni Kol
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Glejte "Oceni materialov na osnovi" v stanejo oddelku
 DocType: Appraisal Goal,Key Responsibility Area,Key Odgovornost Area
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Vsi naslovi.
 DocType: Company,Stock Settings,Nastavitve Stock
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Upravljanje skupine kupcev drevo.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,New Stroški Center Ime
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,New Stroški Center Ime
 DocType: Leave Control Panel,Leave Control Panel,Pustite Nadzorna plošča
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Ne privzeto Naslov Predloga našel. Prosimo, da ustvarite novega s Setup> Printing in Branding> Naslov predlogo."
 DocType: Appraisal,HR User,HR Uporabnik
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Plačilo Tool Podrobnosti
 ,Sales Browser,Prodaja Browser
 DocType: Journal Entry,Total Credit,Skupaj Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Posojila in predujmi (sredstva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dolžniki
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Velika
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Noben delavec našel!
 DocType: C-Form Invoice Detail,Territory,Ozemlje
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Navedite ni obiskov zahtevanih
+DocType: Purchase Order,Customer Address Display,Stranka Naslov Display
 DocType: Stock Settings,Default Valuation Method,Način Privzeto Vrednotenje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poliranje
 DocType: Production Order Operation,Planned Start Time,Načrtovano Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Razporejeni
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zapri Bilanca stanja in rezervirajte poslovnem izidu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker \ ste že naredili nekaj transakcije (-e) z drugo UOM. Če želite spremeniti privzeto UOM \ uporaba "UOM Zamenjaj Utility" orodje v okviru borze modula."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Določite Menjalni tečaj za pretvorbo ene valute v drugo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Kotacija {0} je odpovedan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Kotacija {0} je odpovedan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Skupni preostali znesek
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} je bil na dopustu {1}. Ne more označiti prisotnost.
 DocType: Sales Partner,Targets,Cilji
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,To je skupina koren stranke in jih ni mogoče urejati.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosimo nastavitev vaš kontni načrt, preden začnete vknjižbe"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignoriraj Pricing pravilo
-sites/assets/js/list.min.js +24,Cancelled,Preklicana
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Preklicana
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od datuma plače strukture ne more biti manjši od zaposlenih Vstop Datum.
 DocType: Employee Education,Graduate,Maturirati
 DocType: Leave Block List,Block Days,Block dnevi
 DocType: Journal Entry,Excise Entry,Trošarina Začetek
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Opozorilo: Sales Order {0} že obstaja zoper naročnikovo narocilo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Opozorilo: Sales Order {0} že obstaja zoper naročnikovo narocilo {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,Prejete Stock Ampak ne zaračuna
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plače + arrear Znesek + Vnovčevanje Znesek - Skupaj Odbitek
 DocType: Monthly Distribution,Distribution Name,Porazdelitev Name
 DocType: Features Setup,Sales and Purchase,Prodaja in nakup
-DocType: Purchase Order Item,Material Request No,Material Zahteva Ne
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
+DocType: Supplier Quotation Item,Material Request No,Material Zahteva Ne
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Obrestna mera, po kateri kupec je valuti, se pretvori v osnovni valuti družbe"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} je bil uspešno odjavili iz tega seznama.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (družba Valuta)
-apps/frappe/frappe/templates/base.html +132,Added,Dodano
+apps/frappe/frappe/templates/base.html +134,Added,Dodano
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Upravljanje Territory drevo.
 DocType: Journal Entry Account,Sales Invoice,Prodaja Račun
 DocType: Journal Entry Account,Party Balance,Balance Party
 DocType: Sales Invoice Item,Time Log Batch,Čas Log Serija
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na"
 DocType: Company,Default Receivable Account,Privzeto Terjatve račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Ustvarite Bank vnos za celotno plačo za zgoraj izbranih kriterijih
 DocType: Stock Entry,Material Transfer for Manufacture,Prenos materialov za proizvodnjo
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Pridobite ustreznimi vnosi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Kovanje
 DocType: Sales Invoice,Sales Team1,Prodaja TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Element {0} ne obstaja
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Element {0} ne obstaja
 DocType: Sales Invoice,Customer Address,Stranka Naslov
 apps/frappe/frappe/desk/query_report.py +136,Total,Skupaj
 DocType: Purchase Invoice,Apply Additional Discount On,Uporabi dodatni popust na
@@ -2259,15 +2268,17 @@ DocType: Quality Inspection,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray oblikovanje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Račun {0} je zamrznjena
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Račun {0} je zamrznjen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna oseba / Hčerinska družba z ločenim kontnem pripada organizaciji.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Hrana, pijača, tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ali BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Stopnja Komisija ne more biti večja od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalna Inventory Raven
 DocType: Stock Entry,Subcontract,Podizvajalska pogodba
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Vnesite {0} najprej
 DocType: Production Planning Tool,Get Items From Sales Orders,Dobili predmetov iz prodajnih nalogov
-DocType: Production Order Operation,Actual End Time,Dejanska Končni čas
+DocType: Production Order Operation,Actual End Time,Dejanski Končni čas
 DocType: Production Planning Tool,Download Materials Required,"Naložite materialov, potrebnih"
 DocType: Item,Manufacturer Part Number,Številka dela proizvajalca
 DocType: Production Order Operation,Estimated Time and Cost,Predvideni čas in stroški
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,Načrtovano
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosimo, izberite postavko, kjer "Stock postavka je" "Ne" in "Je Sales Postavka" je "Yes" in ni druge Bundle izdelka"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izberite mesečnim izplačilom neenakomerno distribucijo ciljev po mesecih.
 DocType: Purchase Invoice Item,Valuation Rate,Oceni Vrednotenje
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Cenik Valuta ni izbran
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cenik Valuta ni izbran
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Postavka Row {0}: Potrdilo o nakupu {1} ne obstaja v zgornji tabeli "nakup prejemki"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Employee {0} je že zaprosil za {1} med {2} in {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employee {0} je že zaprosil za {1} med {2} in {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Start Date
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijava
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf vozlišča so dovoljene v transakciji
 DocType: Expense Claim,Expense Approver,Expense odobritelj
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Potrdilo o nakupu Postavka Priložena
-sites/assets/js/erpnext.min.js +48,Pay,Plačajte
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Plačajte
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Da datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevniki za ohranjanje statusa dostave sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Brušenje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink zavijanje
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Čakanju Dejavnosti
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Čakanju Dejavnosti
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potrjen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavitelj> dobavitelj Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vnesite lajšanje datum.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Vn
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Izberite Fiscal Year
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Taljenje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Ste Leave odobritelj za ta zapis. Prosimo Posodobite "status" in Shrani
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Preureditev Raven
 DocType: Attendance,Attendance Date,Udeležba Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plača razpadu temelji na zaslužek in odbitka.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v skupini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavitelj (-i)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Neveljavna obdobje
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Izberite vrsto posla
 DocType: GL Entry,Voucher No,Voucher ni
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Predl
 DocType: Customer,Address and Contact,Naslov in Stik
 DocType: Customer,Last Day of the Next Month,Zadnji dan v naslednjem mesecu
 DocType: Employee,Feedback,Povratne informacije
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Vzdrževalec. Urnik
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Vzdrževalec. Urnik
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazivni curek strojna obdelava
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Vnosi
 DocType: Website Settings,Website Settings,Spletna stran Nastavitve
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,Odhodni
 DocType: Material Request,Requested For,Zaprosila za
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledi tej dobavnica proti kateri koli projekt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root račun ni mogoče izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root račun ni mogoče izbrisati
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Prikaži Stock Vnosi
 ,Is Primary Address,Je primarni naslov
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referenčna # {0} dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referenčna # {0} dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje naslovov
 DocType: Pricing Rule,Item Code,Oznaka
 DocType: Production Planning Tool,Create Production Orders,Ustvarjanje naročila za proizvodnjo
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,Uporabnik Pripomba
 DocType: Lead,Market Segment,Tržni segment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposleni Notranji Delo Zgodovina
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Zapiranje (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zapiranje (Dr)
 DocType: Contact,Passive,Pasivna
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijska št {0} ni na zalogi
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Davčna predlogo za prodajo transakcije.
 DocType: Sales Invoice,Write Off Outstanding Amount,Napišite Off neporavnanega zneska
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Preverite, če boste potrebovali samodejne ponavljajoče račune. Po predložitvi prometnega račun, bo Ponavljajoči poglavje vidna."
 DocType: Account,Accounts Manager,Accounts Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Čas Log {0} je treba "Submitted"
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Čas Log {0} je treba "Submitted"
 DocType: Stock Settings,Default Stock UOM,Privzeto Stock UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Stanejo Ocenite temelji na vrsto dejavnosti (na uro)
 DocType: Production Planning Tool,Create Material Requests,Ustvarite Material Zahteve
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Banka Sprava
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dobite posodobitve
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodajte nekaj zapisov vzorčnih
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Pustite upravljanje
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Pustite upravljanje
 DocType: Event,Groups,Skupine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,"Skupina, ki jo račun"
 DocType: Sales Order,Fully Delivered,Popolnoma Delivered
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Prodajna Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} proti centru Cost {2} bo presegel s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Posredovano Leaves
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Od datuma" mora biti po "Da Datum '
 ,Stock Projected Qty,Stock Predvidena Količina
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
 DocType: Sales Order,Customer's Purchase Order,Stranke Naročilo
 DocType: Warranty Claim,From Company,Od družbe
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vrednost ali Kol
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Retailer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit Za računu mora biti bilanca računa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Vse vrste Dobavitelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Oznaka je obvezna, ker se postavka samodejno ni oštevilčen"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Kotacija {0} ni tipa {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Oznaka je obvezna, ker se postavka samodejno ni oštevilčen"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Kotacija {0} ni tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vzdrževanje Urnik Postavka
 DocType: Sales Order,%  Delivered,% Delivered
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bančnem računu računa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Naredite plačilnega lista
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Odčepiti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Prebrskaj BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Secured Posojila
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super izdelki
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,Cenitev
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Izgubljene pena litje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Risanje
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponovi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
 DocType: Hub Settings,Seller Email,Prodajalec Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Skupaj Nakup Cost (via računu o nakupu)
 DocType: Workstation Working Hour,Start Time,Začetni čas
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto znesek (družba Valuta)
 DocType: BOM Operation,Hour Rate,Urni tečaj
 DocType: Stock Settings,Item Naming By,Postavka Poimenovanje S
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Od Kotacija
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Drug zaključnem obdobju Začetek {0} je bil dosežen po {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Od Kotacija
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drug zaključnem obdobju Začetek {0} je bil dosežen po {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Preneseno za Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Račun {0} ne obstaja
 DocType: Purchase Receipt Item,Purchase Order Item No,Naročilnica Art.-Št.
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,Inšpekcijski Zahtevano
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Popolnoma zaračunavajo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Denarna sredstva v blagajni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Dostava skladišče potreben za postavko parka {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dostava skladišče potreben za postavko parka {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto teža paketa. Ponavadi neto teža + embalaža teže. (za tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uporabniki s to vlogo dovoljeno postaviti na zamrznjene račune in ustvariti / spreminjanje vknjižbe zoper zamrznjenih računih
 DocType: Serial No,Is Cancelled,Je Preklicana
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Moje pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje pošiljke
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Tudi če obstaja več cenovnih Pravila z najvišjo prioriteto, se uporabljajo nato naslednji notranje prednostne naloge:"
 DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Izberite bančni račun
 DocType: Newsletter,Create and Send Newsletters,Ustvarjanje in pošiljanje glasila
-sites/assets/js/report.min.js +107,From Date must be before To Date,Od datuma mora biti pred Do Datum
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Od datuma mora biti pred Do Datum
 DocType: Sales Order,Recurring Order,Ponavljajoči naročilo
 DocType: Company,Default Income Account,Privzeto Prihodki račun
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Skupina kupec / stranka
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila
 ,Projected,Predvidoma
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijska št {0} ne pripada Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
 DocType: Notification Control,Quotation Message,Kotacija Sporočilo
 DocType: Issue,Opening Date,Otvoritev Datum
 DocType: Journal Entry,Remark,Pripomba
 DocType: Purchase Receipt Item,Rate and Amount,Stopnja in znesek
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Od Sales Order
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od Sales Order
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Ne zaračunavajo
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba Skladišče mora pripadati isti družbi
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Ni stikov še dodal.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ni stikov še dodal.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ni aktiven
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Proti računa napotitvi Datum
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Pristali Stroški bon Znesek
 DocType: Time Log,Batched for Billing,Posodi za plačevanja
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Računi, ki jih dobavitelji postavljeno."
 DocType: POS Profile,Write Off Account,Napišite Off račun
-sites/assets/js/erpnext.min.js +26,Discount Amount,Popust Količina
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Popust Količina
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vrni proti Račun za nakup
 DocType: Item,Warranty Period (in days),Garancijski rok (v dnevih)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,npr DDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Postavka 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
 DocType: Shopping Cart Settings,Quotation Series,Kotacija Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal plin oblikovanje
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Delivered Kol
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Stranka ali dobavitelj Podrobnosti
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Svinec lastnika
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Je potrebno skladišče
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Je potrebno skladišče
 DocType: Employee,Marital Status,Zakonski stan
 DocType: Stock Settings,Auto Material Request,Auto Material Zahteva
 DocType: Time Log,Will be updated when billed.,"Bo treba posodobiti, če zaračunavajo."
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostopno Serija Količina na IZ SKLADIŠČA
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Trenutni BOM in New BOM ne more biti enaka
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum upokojitve sme biti večja od Datum pridružitve
 DocType: Sales Invoice,Against Income Account,Proti dohodkov
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,Posodobitev Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Drugačna UOM za artikle bo privedlo do napačne (skupno) Neto teža vrednosti. Prepričajte se, da je neto teža vsake postavke v istem UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Prosimo povlecite predmete iz dobavnice
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Prosimo povlecite predmete iz dobavnice
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Revija Vnosi {0} so un-povezani
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Evidenca vseh komunikacij tipa elektronski pošti, telefonu, klepet, obisk, itd"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Navedite zaokrožijo stroškovno mesto v družbi
 DocType: Purchase Invoice,Terms,Pogoji
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Ustvari novo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Ustvari novo
 DocType: Buying Settings,Purchase Order Required,Naročilnica obvezno
 ,Item-wise Sales History,Element-pametno Sales Zgodovina
 DocType: Expense Claim,Total Sanctioned Amount,Skupaj sankcionirano Znesek
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Plača Slip Odbitek
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Opombe
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Izberite skupino vozlišče prvi.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cilj mora biti eden od {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Izpolnite obrazec in ga shranite
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Izpolnite obrazec in ga shranite
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Prenesite poročilo, ki vsebuje vse surovine s svojo najnovejšo stanja zalog"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Soočenje
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Skupnost
 DocType: Leave Application,Leave Balance Before Application,Pustite Stanje pred uporabo
 DocType: SMS Center,Send SMS,Pošlji SMS
 DocType: Company,Default Letter Head,Privzeto glavi pisma
 DocType: Time Log,Billable,Plačljivo
 DocType: Authorization Rule,This will be used for setting rule in HR module,Ta se bo uporabljal za vzpostavitev vladavine v HR modula
 DocType: Account,Rate at which this tax is applied,"Hitrost, s katero se ta davek"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Preureditev Kol
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Preureditev Kol
 DocType: Company,Stock Adjustment Account,Račun Prilagoditev Stock
 DocType: Journal Entry,Write Off,Odpisati
 DocType: Time Log,Operation ID,Operacija ID
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Popust Polja bo na voljo v narocilo, Potrdilo o nakupu, nakup računa"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ime novega računa. Opomba: Prosimo, da ne ustvarjajo računov za kupce in dobavitelje"
 DocType: Report,Report Type,Poročilo Type
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Nalaganje
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Nalaganje
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Zamenjaj orodje
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država pametno privzeti naslov Predloge
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Dobavitelj zagotavlja naročniku
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Prikaži davek break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import Export
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Če se vključujejo v proizvodne dejavnosti. Omogoča Postavka "izdeluje"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Račun Napotitev Datum
 DocType: Sales Invoice,Rounded Total,Zaobljeni Skupaj
 DocType: Product Bundle,List items that form the package.,"Seznam predmetov, ki tvorijo paket."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Odstotek dodelitve mora biti enaka 100%
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo"
 DocType: Company,Default Cash Account,Privzeto Cash račun
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ne stranka ali dobavitelj) gospodar.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Prosimo, vpišite "Pričakovana Dostava Date""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Prosimo, vpišite "Pričakovana Dostava Date""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Plačan znesek + odpis Znesek ne sme biti večja od Grand Skupaj
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ni veljavna številka serije za postavko {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Vrstica {0}: Kol ne avalable v skladišču {1} na {2} {3}. Na voljo Kol: {4}, Prenos Količina: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postavka 3
+DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Event,Sunday,Nedelja
 DocType: Sales Team,Contribution (%),Prispevek (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opomba: Začetek Plačilo se ne bodo ustvarili, saj "gotovinski ali bančni račun" ni bil podan"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Predloga
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predloga
 DocType: Sales Person,Sales Person Name,Prodaja Oseba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vnesite atleast 1 račun v tabeli
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj uporabnike
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),Actual Start Date (via Čas Dnev
 DocType: Stock Reconciliation Item,Before reconciliation,Pred sprave
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Davki in dajatve na dodano vrednost (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
 DocType: Sales Order,Partly Billed,Delno zaračunavajo
 DocType: Item,Default BOM,Privzeto BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Skupaj Izjemna Amt
 DocType: Time Log Batch,Total Hours,Skupaj ure
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Avtomobilizem
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Listi za tip {0} že dodeljene za Employee {1} za poslovno leto {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Je potrebno postavko
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal brizganje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Od dobavnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od dobavnica
 DocType: Time Log,From Time,Od časa
 DocType: Notification Control,Custom Message,Sporočilo po meri
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investicijsko bančništvo
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,Vodilno vlogo pri tem
 DocType: Stock Entry,From BOM,Od BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Zaloga transakcije pred {0} so zamrznjeni
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Prosimo, kliknite na "ustvarjajo Seznamu""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Do datuma mora biti enaka kot Od datuma za pol dneva dopusta
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosimo, kliknite na "ustvarjajo Seznamu""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Do datuma mora biti enaka kot Od datuma za pol dneva dopusta
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","npr Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenčna številka je obvezna, če ste vnesli Referenčni datum"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenčna številka je obvezna, če ste vnesli Referenčni datum"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum Pridružil sme biti večja od Datum rojstva
 DocType: Salary Structure,Salary Structure,Plača Struktura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Cena pravilo obstaja z istimi merili, prosim rešiti \ konflikt z dodeljevanjem prednost. Cena Pravila: {0}"
-DocType: Account,Bank,Bank
+DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Airline
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Vprašanje Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vprašanje Material
 DocType: Material Request Item,For Warehouse,Za Skladišče
 DocType: Employee,Offer Date,Ponudba Datum
 DocType: Hub Settings,Access Token,Dostopni žeton
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,Otvoritev čas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od in Do datumov zahtevanih
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
+DocType: Delivery Note Item,From Warehouse,Iz skladišča
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Vrtanje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Pihanje
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednotenje in Total
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,Spremenjeni Od
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledite preko e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Davčna Znesek Po Popust Znesek
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,"Otrok račun obstaja za ta račun. Ne, ne moreš izbrisati ta račun."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,"Otrok račun obstaja za ta račun. Ne, ne moreš izbrisati ta račun."
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Bodisi ciljna kol ali ciljna vrednost je obvezna
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
-DocType: Leave Allocation,Carry Forward,Carry Forward
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Pričetek mora biti pred Zapiranje Datum
+DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v knjigo terjatev
 DocType: Department,Days for which Holidays are blocked for this department.,"Dni, za katere so Holidays blokirana za ta oddelek."
 ,Produced,Proizvedena
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Skupaj (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Zabava & prosti čas
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, na katerega se bodo ponavljajoče se naročilo ustavi"
 DocType: Quality Inspection,Item Serial No,Postavka Zaporedna številka
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} je treba zmanjšati za {1} ali pa bi se morala povečati strpnost preliva
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} je treba zmanjšati za {1} ali pa bi se morala povečati strpnost preliva
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Skupaj Present
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Ura
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Zaporednimi Postavka {0} ni mogoče posodobiti \ uporabo zaloge sprave
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Prenos Material za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Prenos Material za dobavitelja
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nova serijska številka ne more imeti skladišče. Skladišče mora nastaviti borze vstopu ali Potrdilo o nakupu
 DocType: Lead,Lead Type,Svinec Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Ustvarite predračun
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Vsi ti predmeti so bili že obračunano
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Vsi ti predmeti so bili že obračunano
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mogoče odobriti {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Pravilo Pogoji
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM po zamenjavi
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacija ID ni nastavljen
 DocType: Production Order,Planned Start Date,Načrtovani datum začetka
 DocType: Serial No,Creation Document Type,Creation Document Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Vzdrževalec. Obisk
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Vzdrževalec. Obisk
 DocType: Leave Type,Is Encash,Je vnovči
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Naredite Journal Entry
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nove Listi Dodeljena
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Podatki projekt pametno ni na voljo za ponudbo
 DocType: Project,Expected End Date,Pričakovani datum zaključka
 DocType: Appraisal Template,Appraisal Template Title,Cenitev Predloga Naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Commercial
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Commercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} ne sme biti Stock Postavka
 DocType: Cost Center,Distribution Id,Porazdelitev Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super Storitve
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrednost za Attribute {0} mora biti v razponu od {1} na {2} v korakih po {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni znesek
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
+DocType: Leave Allocation,Unused leaves,Neizkoriščene listi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Privzeto Terjatev računov
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Žaganje
 DocType: Tax Rule,Billing State,Država za zaračunavanje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminiranje
 DocType: Item Reorder,Transfer,Prenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
 DocType: Authorization Rule,Applicable To (Employee),Ki se uporabljajo za (zaposlenih)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum zapadlosti je obvezno
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Stranka {0} ne obstaja
 DocType: Attendance,Absent,Odsoten
 DocType: Product Bundle,Product Bundle,Bundle izdelek
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Vrstica {0}: Neveljavna referenčna {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Drobljenje
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Nakup davki in dajatve Template
 DocType: Upload Attendance,Download Template,Download Predloga
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,Opombe
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Oznaka
 DocType: Journal Entry,Write Off Based On,Odpisuje temelji na
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Namestitev rekord Serial No.
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Namestitev rekord Serial No.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuirano litje
-sites/assets/js/erpnext.min.js +10,Please specify a,"Prosimo, določite"
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Prosimo, določite"
 DocType: Offer Letter,Awaiting Response,Čakanje na odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Nad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Hladno dimenzioniranje
 DocType: Salary Slip,Earning & Deduction,Zaslužek & Odbitek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Upoštevati {0} ne more biti skupina
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regija
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Neobvezno. Ta nastavitev bo uporabljena za filtriranje v različnih poslih.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Neobvezno. Ta nastavitev bo uporabljena za filtriranje v različnih poslih.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno
 DocType: Holiday List,Weekly Off,Tedenski Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za primer leta 2012, 2012-13"
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Izbuljene
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Izhlapevanja-vzorec litje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Stroški
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} je treba preklicati pred ukinitvijo te Sales Order
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Starost
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} je treba preklicati pred ukinitvijo te Sales Order
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Starost
 DocType: Time Log,Billing Amount,Zaračunavanje Znesek
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Neveljavna količina, določena za postavko {0}. Količina mora biti večja od 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Vloge za dopust.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Pravni stroški
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dan v mesecu, v katerem se bo samodejno naročilo ustvarila npr 05, 28, itd"
 DocType: Sales Invoice,Posting Time,Napotitev čas
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Označite to, če želite, da prisili uporabnika, da izberete vrsto pred shranjevanjem. Tam ne bo privzeto, če to preverite."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ne Postavka s serijsko št {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Odprte Obvestila
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Odprte Obvestila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Neposredni stroški
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Ali res želite Odčepiti tega materiala Zahtevaj?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer Prihodki
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Potni stroški
 DocType: Maintenance Visit,Breakdown,Zlomiti se
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kot na datum
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honanje
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Poskusno delo
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Privzeto Skladišče je obvezna za borzo točki.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Privzeto Skladišče je obvezna za borzo točki.
 DocType: Feed,Full Name,Polno ime
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Izplačilo plače za mesec {0} in leto {1}
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Dodajte vrstic
 DocType: Buying Settings,Default Supplier Type,Privzeta Dobavitelj Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Kamnolomi
 DocType: Production Order,Total Operating Cost,Skupni operativni stroški
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Vsi stiki.
 DocType: Newsletter,Test Email Id,Testna Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Kratica podjetje
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citati
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vloga Dovoljeno urediti zamrznjeno zalog
 ,Territory Target Variance Item Group-Wise,Ozemlje Ciljna Varianca Postavka Group-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Vse skupine strank
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezna. Mogoče je Menjalni zapis ni ustvarjen za {1} na {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezna. Mogoče je Menjalni zapis ni ustvarjen za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Davčna Predloga je obvezna.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Račun {0}: Matično račun {1} ne obstaja
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenik Rate (družba Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} status "Ustavljen"
 DocType: Account,Temporary,Začasna
 DocType: Address,Preferred Billing Address,Želeni plačevanja Naslov
 DocType: Monthly Distribution Percentage,Percentage Allocation,Odstotek dodelitve
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postavka Wise Davčna D
 DocType: Purchase Order Item,Supplier Quotation,Dobavitelj za predračun
 DocType: Quotation,In Words will be visible once you save the Quotation.,"V besedi bo viden, ko boste prihranili citata."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Likanje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} je ustavila
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je ustavila
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
 DocType: Lead,Add to calendar on this date,Dodaj v koledar na ta dan
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodajanje stroškov dostave.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Prihajajoči dogodki
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Prihajajoči dogodki
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je potrebno kupca
 DocType: Letter Head,Letter Head,Pismo Head
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Quick Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obvezna za vrnitev
 DocType: Purchase Order,To Receive,Prejeti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink opremljanje
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast eno skladišče je obvezna
 DocType: Serial No,Out of Warranty,Iz garancije
 DocType: BOM Replace Tool,Replace,Zamenjaj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} proti prodajne fakture {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Vnesite privzeto mersko enoto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} proti prodajne fakture {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vnesite privzeto mersko enoto
 DocType: Purchase Invoice Item,Project Name,Ime projekta
 DocType: Supplier,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun
 DocType: Workflow State,Edit,Urejanje
 DocType: Journal Entry Account,If Income or Expense,Če prihodek ali odhodek
 DocType: Features Setup,Item Batch Nos,Postavka Serija Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Razlika
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Človeški viri
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Človeški viri
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Plačilo Sprava Plačilo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Davčni Sredstva
 DocType: BOM Item,BOM No,BOM Ne
 DocType: Contact Us Settings,Pincode,Kodi PIN
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nima računa {1} ali že primerjali z drugimi kupon
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nima računa {1} ali že primerjali z drugimi kupon
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ki bo nadomestila
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM mora biti drugačna od trenutne zaloge UOM
 DocType: Account,Debit,Debetne
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,Listi morajo biti dodeljen v večkratnikih 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Listi morajo biti dodeljen v večkratnikih 0.5
 DocType: Production Order,Operation Cost,Delovanje Stroški
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Naloži udeležbo iz .csv datoteke
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izjemna Amt
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Določi
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Dodeliti to težavo, uporabite gumb "Dodeli" v stranski vrstici."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zaloge Older Than [dni]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Če dva ali več Cenik Pravilnik ugotovila na podlagi zgoraj navedenih pogojev, se uporablja Prioriteta. Prednostno je število med 0 do 20, medtem ko privzeta vrednost nič (prazno). Višja številka pomeni, da bo prednost, če obstaja več cenovnih Pravila z enakimi pogoji."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Proti računa
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Poslovno leto: {0} ne obstaja
 DocType: Currency Exchange,To Currency,Valutnemu
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Pustimo, da se naslednji uporabniki za odobritev dopusta Aplikacije za blok dni."
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stopn
 DocType: Stock Entry Detail,Additional Cost,Dodatne Stroški
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Proračunsko leto End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Filter ne more temeljiti na kupona št, če je združena s Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Naredite Dobavitelj predračun
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Naredite Dobavitelj predračun
 DocType: Quality Inspection,Incoming,Dohodni
 DocType: BOM,Materials Required (Exploded),Potreben materiali (eksplodirala)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmanjšajte Služenje za dopust brez plačila (md)
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Vrstica # {0}: Serijska št {1} ne ujema z {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Zapusti
 DocType: Batch,Batch ID,Serija ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Opomba: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Opomba: {0}
 ,Delivery Note Trends,Dobavnica Trendi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Povzetek Ta teden je
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora biti kupljena ali podizvajalcev Postavka v vrstici {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora biti kupljena ali podizvajalcev Postavka v vrstici {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Račun: {0} se lahko posodobi samo preko delniških poslov
 DocType: GL Entry,Party,Zabava
 DocType: Sales Order,Delivery Date,Datum dostave
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,A
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Odkup tečaj
 DocType: Task,Actual Time (in Hours),Dejanski čas (v urah)
 DocType: Employee,History In Company,Zgodovina V družbi
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Glasila
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Glasila
 DocType: Address,Shipping,Dostava
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,Pustite Block List
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Končni datum obdobja Trenutni vrstni red je
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Naredite Pisna ponudba
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Return
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Privzeto mersko enoto za Variant mora biti enaka kot predlogo
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Privzeto mersko enoto za Variant mora biti enaka kot predlogo
 DocType: DocField,Fold,Zložite
 DocType: Production Order Operation,Production Order Operation,Proizvodnja naročite Delovanje
 DocType: Pricing Rule,Disable,Onemogoči
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Poročila
 DocType: SMS Settings,Enter url parameter for receiver nos,Vnesite url parameter za sprejemnik nos
 DocType: Sales Invoice,Paid Amount,Plačan znesek
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',"Zapiranje račun {0}, mora biti tipa "odgovornosti""
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Zapiranje račun {0}, mora biti tipa "odgovornosti""
 ,Available Stock for Packing Items,Zaloga za Embalaža Items
 DocType: Item Variant,Item Variant,Postavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Nastavitev ta naslov predlogo kot privzeto saj ni druge privzeto
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kakovosti
 DocType: Production Planning Tool,Filter based on customer,"Filter, ki temelji na kupca"
 DocType: Payment Tool Detail,Against Voucher No,Proti kupona št
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Vnesite količino za postavko {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vnesite količino za postavko {0}
 DocType: Employee External Work History,Employee External Work History,Delavec Zunanji Delo Zgodovina
 DocType: Tax Rule,Purchase,Nakup
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Kol
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials","Agregat skupina ** Items ** v drugo ** postavki
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Zaporedna številka je obvezna za postavko {0}
 DocType: Item Variant Attribute,Attribute,Lastnost
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Prosimo, navedite iz / v razponu"
-sites/assets/js/desk.min.js +7652,Created By,Ustvaril
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Ustvaril
 DocType: Serial No,Under AMC,Pod AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Stopnja vrednotenje sredstev se preračuna razmišlja pristali stroškovno vrednost kupona
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Privzete nastavitve za prodajne transakcije.
 DocType: BOM Replace Tool,Current BOM,Trenutni BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Dodaj Serijska št
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Dodaj Serijska št
 DocType: Production Order,Warehouses,Skladišča
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print in Stacionarna
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Skupina Node
 DocType: Payment Reconciliation,Minimum Amount,Minimalni znesek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,"Posodobitev končnih izdelkov,"
 DocType: Workstation,per hour,na uro
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serija {0} že uporabljajo v {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serija {0} že uporabljajo v {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladišče (Perpetual Inventory) bo nastala na podlagi tega računa.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladišče ni mogoče črtati, saj obstaja vnos stock knjiga za to skladišče."
 DocType: Company,Distribution,Porazdelitev
-sites/assets/js/erpnext.min.js +50,Amount Paid,Plačani znesek
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plačani znesek
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max popust dovoljena za postavko: {0} je {1}%
 DocType: Customer,Default Taxes and Charges,Privzete Davki in dajatve
 DocType: Account,Receivable,Terjatev
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Vrstica # {0}: ni dovoljeno spreminjati Dobavitelj kot Naročilo že obstaja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vloga, ki jo je dovoljeno vložiti transakcije, ki presegajo omejitve posojil zastavili."
 DocType: Sales Invoice,Supplier Reference,Dobavitelj Reference
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Če je omogočeno, bo BOM za podsklopov postavk šteti za pridobivanje surovin. V nasprotnem primeru bodo vsi podsklopi postavke se obravnavajo kot surovino."
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,Dodaj / Odstrani prejemnike
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakcija ni dovoljena zoper ustavili proizvodnjo naročite {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Če želite nastaviti to poslovno leto kot privzeto, kliknite na "Set as Default""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup dohodni strežnik za podporo email id. (npr support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Pomanjkanje Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Pomanjkanje Kol
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
 DocType: Salary Slip,Salary Slip,Plača listek
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruniranje
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"Da Datum" je potrebno
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ko kateri koli od pregledanih transakcij "Objavil", e-pop-up samodejno odpre, da pošljete e-pošto s pripadajočim "stik" v tem poslu, s poslom, kot prilogo. Uporabnik lahko ali pa ne pošljete e-pošto."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalni Nastavitve
 DocType: Employee Education,Employee Education,Izobraževanje delavec
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
 DocType: Salary Slip,Net Pay,Neto plača
 DocType: Account,Account,Račun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijska št {0} je že prejela
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,Proizvodnja Uporabnik
 DocType: Purchase Order,Raw Materials Supplied,"Surovin, dobavljenih"
 DocType: Purchase Invoice,Recurring Print Format,Ponavljajoči Print Format
 DocType: Communication,Series,Series
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Pričakuje Dostava datum ne more biti pred narocilo Datum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Pričakuje Dostava datum ne more biti pred narocilo Datum
 DocType: Appraisal,Appraisal Template,Cenitev Predloga
 DocType: Communication,Email,E-naslov
 DocType: Item Group,Item Classification,Postavka Razvrstitev
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,Nastavitve plače
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match nepovezane računov in plačil.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Naročiti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root ne more imeti matična stroškovno mesto v
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Izberi znamko ...
 DocType: Sales Invoice,C-Form Applicable,"C-obliki, ki velja"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
 DocType: Supplier,Address and Contacts,Naslov in kontakti
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Pridobite Neporavnane bonov
 DocType: Warranty Claim,Resolved By,Rešujejo s
 DocType: Appraisal,Start Date,Datum začetka
-sites/assets/js/desk.min.js +7629,Value,Vrednost
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Vrednost
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Dodeli liste za obdobje.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Kliknite tukaj, da se preveri"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Račun {0}: ne moreš sam dodeliti kot matično račun
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox dostop dovoljen
 DocType: Dropbox Backup,Weekly,Tedenski
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Prejeti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Prejeti
 DocType: Maintenance Visit,Fully Completed,V celoti končana
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Izobraževalni Kvalifikacije
 DocType: Workstation,Operating Costs,Obratovalni stroški
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposleni Leave odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je bil uspešno dodan v seznam novice.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Strojna žarek elektronov
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nakup Master Manager
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Dodaj / Uredi Cene
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon stroškovnih mest
 ,Requested Items To Be Ordered,Zahtevane Postavke naloži
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Moja naročila
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moja naročila
 DocType: Price List,Price List Name,Cenik Ime
 DocType: Time Log,For Manufacturing,Za Manufacturing
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Pri zaokrožanju
@@ -3471,7 +3489,7 @@ DocType: Account,Income,Prihodki
 DocType: Industry Type,Industry Type,Industrija Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nekaj ​​je šlo narobe!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Prodaja Račun {0} je že bila predložena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodaja Račun {0} je že bila predložena
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,datum dokončanja
 DocType: Purchase Invoice Item,Amount (Company Currency),Znesek (družba Valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Litja
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Leto
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profila
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Prosimo Posodobite Nastavitve SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Čas Log {0} že zaračunavajo
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Čas Log {0} že zaračunavajo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Nezavarovana posojila
 DocType: Cost Center,Cost Center Name,Stalo Ime Center
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Postavka {0} s serijsko št {1} je že nameščen
 DocType: Maintenance Schedule Detail,Scheduled Date,Načrtovano Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Sporočila večji od 160 znakov, bo razdeljeno v več sporočilih"
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Prejme in potrdi
 ,Serial No Service Contract Expiry,Zaporedna številka Service Contract preteka
 DocType: Item,Unit of Measure Conversion,Merska enota konverzijo
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Delavec se ne more spremeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
 DocType: Naming Series,Help HTML,Pomoč HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Dodatek za prekomerno {0} prečkal za postavko {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Dodatek za prekomerno {0} prečkal za postavko {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Ime osebe ali organizacije, ki ta naslov pripada."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaše Dobavitelji
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order."
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,Pretvorjena
 DocType: Item,Has Serial No,Ima Serijska št
 DocType: Employee,Date of Issue,Datum izdaje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} za {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
 DocType: Issue,Content Type,Vrsta vsebine
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Računalnik
 DocType: Item,List this Item in multiple groups on the website.,Seznam ta postavka v več skupinah na spletni strani.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Postavka: {0} ne obstaja v sistemu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pridobite Unreconciled Entries
@@ -3522,16 +3540,16 @@ apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Posodobl
 DocType: Employee,Emergency Contact Details,Zasilna Kontaktni podatki
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Kaj to naredi?
 DocType: Delivery Note,To Warehouse,Za skladišča
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Račun {0} je bila vpisana več kot enkrat za fiskalno leto {1}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Račun {0} je bila vpisan več kot enkrat za fiskalno leto {1}
 ,Average Commission Rate,Povprečen Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"Ima Serial ne" ne more biti 'Da' za ne-parka postavko
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"Ima Serial ne" ne more biti 'Da' za ne-parka postavko
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume
 DocType: Pricing Rule,Pricing Rule Help,Cen Pravilo Pomoč
 DocType: Purchase Taxes and Charges,Account Head,Račun Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Posodobite dodatnih stroškov za izračun iztovori stroške predmetov
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Električno
 DocType: Stock Entry,Total Value Difference (Out - In),Skupna vrednost Razlika (Out - IN)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID uporabnika ni nastavljena za Employee {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Iz garancijskega zahtevka
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,Poimenovanje serije
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
 DocType: User,Enabled,Omogočeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Zaloga Sredstva
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},"Ali res želite, da predložijo vse plačilnega lista za mesec {0} in leto {1}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Ali res želite, da predložijo vse plačilnega lista za mesec {0} in leto {1}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Uvozna Naročniki
 DocType: Target Detail,Target Qty,Ciljna Kol
 DocType: Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Dobavnica {0} ni treba predložiti
 DocType: Notification Control,Sales Invoice Message,Prodaja Račun Sporočilo
 DocType: Authorization Rule,Based On,Temelji na
-,Ordered Qty,Naročeno Kol
+DocType: Sales Order Item,Ordered Qty,Naročeno Kol
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Postavka {0} je onemogočena
 DocType: Stock Settings,Stock Frozen Upto,Stock Zamrznjena Stanuje
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Obdobje Od in obdobje, da datumi obvezne za ponavljajoče {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektna dejavnost / naloga.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Ustvarjajo plače kombineže
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ni veljaven email id
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Naloži Udeležba
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Količina so obvezna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Staranje Razpon 2
-DocType: Journal Entry Account,Amount,Znesek
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Znesek
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Kovičenje
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nadomesti
 ,Sales Analytics,Prodajna Analytics
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Pričakovani datum ne more biti pred Material Request Datum
 DocType: Contact Us Settings,City,Kraj
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic strojna obdelava
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Napaka: Ni veljaven id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Napaka: Ni veljaven id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Postavka {0} mora biti Sales postavka
 DocType: Naming Series,Update Series Number,Posodobitev Series Število
 DocType: Account,Equity,Kapital
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Proti Expense račun
 DocType: Production Order,Production Order,Proizvodnja naročilo
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0}
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Vsi zaposlenih (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Oglejte si zdaj
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Raw Material Stroški
 DocType: Item,Re-Order Level,Ponovno naročila ravni
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Vnesite predmete in načrtovano kol, za katere želite, da dvig proizvodnih nalogov ali prenos surovin za analizo."
-sites/assets/js/list.min.js +174,Gantt Chart,Gantogram
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantogram
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Krajši delovni čas
 DocType: Employee,Applicable Holiday List,Velja Holiday Seznam
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Posodobljeno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Vrsta poročila je obvezna
 DocType: Item,Serial Number Series,Serijska številka serije
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Skladišče je obvezna za borzo postavki {0} v vrstici {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladišče je obvezna za borzo postavki {0} v vrstici {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Trgovina na drobno in na debelo
 DocType: Issue,First Responded On,Najprej odgovorila
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Uvrstitev točke v več skupinah
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,Udeležba
 DocType: Page,No,Ne
 DocType: BOM,Materials,Materiali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Če ni izbrana, bo seznam je treba dodati, da vsak oddelek, kjer je treba uporabiti."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna"
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Davčna predlogo za nakup transakcij.
 ,Item Prices,Postavka Cene
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"V besedi bo viden, ko boste prihranili naročilnico."
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni stroški
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
-sites/assets/js/erpnext.min.js +50,Change,Spremeni
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Spremeni
 DocType: Purchase Invoice,Contact Email,Kontakt E-pošta
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Naročilnica {0} je "Ustavljen"
 DocType: Appraisal Goal,Score Earned,Rezultat Zaslužili
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",na primer "My Company LLC"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Odpovedni rok
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,Bruto Teža UOM
 DocType: Email Digest,Receivables / Payables,Terjatve / obveznosti
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodajni fakturi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Žigosanje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit račun
 DocType: Landed Cost Item,Landed Cost Item,Pristali Stroški Postavka
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Prikaži ničelnimi vrednostmi
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina postavke pridobljeno po proizvodnji / prepakiranja iz danih količin surovin
 DocType: Payment Reconciliation,Receivable / Payable Account,Terjatve / plačljivo račun
 DocType: Delivery Note Item,Against Sales Order Item,Proti Sales Order Postavka
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
 DocType: Item,Default Warehouse,Privzeto Skladišče
 DocType: Task,Actual End Date (via Time Logs),Dejanski končni datum (via Čas Dnevniki)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Proračun ne more biti dodeljena pred Group račun {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Skupna ocena (od 5)
 DocType: Contact Us Settings,State,Država
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense zahtevek (preko Expense zahtevkov)
 DocType: User,Gender,Spol
 DocType: Journal Entry,Debit Note,Opomin
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,Blog Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,"Ustvarite pravila za omejitev transakcije, ki temeljijo na vrednotah."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Če je označeno, Total no. delovnih dni bo vključeval praznike, in to se bo zmanjšala vrednost plač dan na"
 DocType: Purchase Invoice,Total Advance,Skupaj Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Odčepiti Material Zahteva
 DocType: Workflow State,User,Uporabnik
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Predelava na izplačane plače
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Predelava na izplačane plače
 DocType: Opportunity Item,Basic Rate,Osnovni tečaj
 DocType: GL Entry,Credit Amount,Credit Znesek
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Nastavi kot Lost
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,Kreditne dni na podlagi
 DocType: Tax Rule,Tax Rule,Davčna Pravilo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Ohraniti ista stopnja V celotnem ciklu prodaje
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Načrtujte čas dnevnike zunaj Workstation delovnih ur.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} je že bil predložen
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} je že bil predložen
 ,Items To Be Requested,"Predmeti, ki bodo zahtevana"
 DocType: Purchase Order,Get Last Purchase Rate,Get zadnjega nakupa Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Zaračunavanje Ocena temelji na vrsto dejavnosti (na uro)
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Družba E-pošta ID ni mogoče najti, zato pošta ni poslala"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Uporaba sredstev (sredstva)
 DocType: Production Planning Tool,Filter based on item,"Filter, ki temelji na točki"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debetni račun
 DocType: Fiscal Year,Year Start Date,Leto Start Date
 DocType: Attendance,Employee Name,ime zaposlenega
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaokrožena Skupaj (Company Valuta)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Slepimi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaslužki zaposlencev
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
 DocType: Production Order,Manufactured Qty,Izdelano Kol
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted Količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne obstaja
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Računi zbrana strankam.
 DocType: DocField,Default,Privzeto
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} naročnikov dodane
 DocType: Maintenance Schedule,Schedule,Urnik
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Določite proračun za to stroškovno mesto. Če želite nastaviti proračunske ukrepe, glejte "Seznam Company""
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,Matično račun
 DocType: Quality Inspection Reading,Reading 3,Branje 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bon Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot "levo"
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Izobraževanje
 DocType: Selling Settings,Campaign Naming By,Imenovanje akcija Z
 DocType: Employee,Current Address Is,Trenutni Naslov je
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Neobvezno. Nastavi privzeto valuto družbe, če ni določeno."
 DocType: Address,Office,Pisarna
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardne Poročila
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Vpisi računovodstvo lista.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Vrstica {0}: Party / račun se ne ujema z {1} / {2} v {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Na voljo Količina na IZ SKLADIŠČA
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Vrstica {0}: Party / račun se ne ujema z {1} / {2} v {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Če želite ustvariti davčnem obračunu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Vnesite Expense račun
 DocType: Account,Stock,Stock
 DocType: Employee,Current Address,Trenutni naslov
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Če postavka je varianta drug element, potem opis, slike, cene, davki, itd bo določil iz predloge, razen če je izrecno določeno"
 DocType: Serial No,Purchase / Manufacture Details,Nakup / Izdelava Podrobnosti
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Serija Inventory
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Serija Inventory
 DocType: Employee,Contract End Date,Naročilo End Date
 DocType: Sales Order,Track this Sales Order against any Project,Sledi tej Sales Order proti kateri koli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodajne Pull naročil (v pričakovanju, da poda), na podlagi zgornjih meril"
 DocType: DocShare,Document Type,Vrsta dokumenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Od dobavitelja Kotacija
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od dobavitelja Kotacija
 DocType: Deduction Type,Deduction Type,Odbitek Type
 DocType: Attendance,Half Day,Poldnevni
 DocType: Pricing Rule,Min Qty,Min Kol
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Za Količina (Izdelano Kol) obvezna
 DocType: Stock Entry,Default Target Warehouse,Privzeto Target Skladišče
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (družba Valuta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Vrstica {0}: Vrsta stranka in stranka se uporablja samo zoper terjatve / obveznosti račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Vrstica {0}: Vrsta stranka in stranka se uporablja samo zoper terjatve / obveznosti račun
 DocType: Notification Control,Purchase Receipt Message,Potrdilo o nakupu Sporočilo
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Skupaj dodeljena listi so bolj kot obdobje
 DocType: Production Order,Actual Start Date,Dejanski datum začetka
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materialov podal proti tej Sales Order
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Record gibanje postavka.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Record gibanje postavka.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Seznam Subscriber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dolbenje
 DocType: Email Account,Service,Storitev
 DocType: Hub Settings,Hub Settings,Nastavitve Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Pri poslovanju
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}.
 ,Monthly Salary Register,Mesečni Plača Register
-apps/frappe/frappe/website/template.py +123,Next,Naslednja
+apps/frappe/frappe/website/template.py +140,Next,Naslednja
 DocType: Warranty Claim,If different than customer address,Če je drugačen od naslova kupca
 DocType: BOM Operation,BOM Operation,BOM Delovanje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,Naslednja Datum
 DocType: Employee Education,Major/Optional Subjects,Major / Izbirni predmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vnesite davki in dajatve
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Strojna
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Tukaj lahko vzdržujejo družinske podrobnosti, kot so ime in poklic staršev, zakonca in otrok"
 DocType: Hub Settings,Seller Name,Prodajalec Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Davki in dajatve Odbitek (družba Valuta)
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,Za prejemanje in Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Oblikovalec
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Pogoji Template
 DocType: Serial No,Delivery Details,Dostava Podrobnosti
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
 DocType: Item,Automatically create Material Request if quantity falls below this level,Samodejno ustvari Material Zahtevaj če količina pade pod to raven
 ,Item-wise Purchase Register,Element-pametno Nakup Registriraj se
 DocType: Batch,Expiry Date,Rok uporabnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Če želite nastaviti raven naročanje, mora postavka biti Nakup Postavka ali Manufacturing Postavka"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Če želite nastaviti raven naročanje, mora postavka biti Nakup Postavka ali Manufacturing Postavka"
 ,Supplier Addresses and Contacts,Dobavitelj Naslovi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Prosimo, izberite kategorijo najprej"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master projekt.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne kažejo vsak simbol, kot $ itd zraven valute."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Poldnevni)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Poldnevni)
 DocType: Supplier,Credit Days,Kreditne dnevi
 DocType: Leave Type,Is Carry Forward,Se Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Dobili predmetov iz BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Dobili predmetov iz BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dobavni rok dni
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Vrstica {0}: Vrsta stranka in stranka je potrebna za terjatve / obveznosti račun {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Vrstica {0}: Vrsta stranka in stranka je potrebna za terjatve / obveznosti račun {1}
 DocType: Dropbox Backup,Send Notifications To,Pošiljanje obvestil
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Razlog za odhod
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionirano Znesek
 DocType: GL Entry,Is Opening,Je Odpiranje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Račun {0} ne obstaja
-DocType: Account,Cash,Cash
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Račun {0} ne obstaja
+DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za spletne strani in drugih publikacij.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Prosimo, da ustvarite plač strukturo za zaposlenega {0}"
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 1c27f9f092..a7a983122e 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Mode paga
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Zgjidh Shpërndarja mujore, në qoftë se ju doni për të ndjekur në bazë të sezonalitetit."
 DocType: Employee,Divorced,I divorcuar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Warning: Same artikull është futur shumë herë.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Warning: Same artikull është futur shumë herë.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Gjërat tashmë synced
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Lejoni Pika për të shtuar disa herë në një transaksion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel materiale Vizitoni {0} para se anulimi këtë kërkuar garancinë
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compaction plus sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta është e nevojshme për Lista Çmimi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Do të llogaritet në transaksion.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Nga Kërkesë materiale
+DocType: Purchase Order,Customer Contact,Customer Contact
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Nga Kërkesë materiale
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Aplikuesi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nuk ka rezultate shumë.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Emri i Klientit
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Të gjitha fushat e eksportit që kanë të bëjnë si monedhë, norma e konvertimit, eksportit gjithsej, eksporti i madh etj përgjithshëm janë në dispozicion në notën shpërndarëse, POS, Kuotim, Sales Fatura, Sales Rendit, etj"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kokat (ose grupe) kundër të cilit Hyrjet e kontabilitetit janë bërë dhe bilancet janë të mirëmbajtura.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Shquar për {0} nuk mund të jetë më pak se zero ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Shquar për {0} nuk mund të jetë më pak se zero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Default 10 minuta
 DocType: Leave Type,Leave Type Name,Lini Lloji Emri
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seria Përditësuar sukses
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Çmimet shumta artikull.
 DocType: SMS Center,All Supplier Contact,Të gjitha Furnizuesi Kontakt
 DocType: Quality Inspection Reading,Parameter,Parametër
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Pritet Data e Përfundimit nuk mund të jetë më pak se sa pritej Data e fillimit
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,A me të vërtetë duan të heq tapën rendin prodhimit:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Norma duhet të jetë i njëjtë si {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,New Pushimi Aplikimi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Pushimi Aplikimi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Draft Bank
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Për të ruajtur të konsumatorëve kodin mençur pika dhe për t'i bërë ato të kërkueshme në bazë të përdorimit të tyre të Kodit, ky opsion"
 DocType: Mode of Payment Account,Mode of Payment Account,Mënyra e Llogarisë Pagesave
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Shfaq Variante
 DocType: Sales Invoice Item,Quantity,Sasi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredi (obligimeve)
 DocType: Employee Education,Year of Passing,Viti i kalimit
-sites/assets/js/erpnext.min.js +27,In Stock,Në magazinë
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Vetëm mund të bëni pagesën ndaj Sales pafaturuar Rendit
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Në magazinë
 DocType: Designation,Designation,Përcaktim
 DocType: Production Plan Item,Production Plan Item,Prodhimit Plani i artikullit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Përdoruesi {0} është caktuar tashmë për punonjësit {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Bëni POS re Profilin
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Kujdes shëndetësor
 DocType: Purchase Invoice,Monthly,Mujor
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faturë
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Vonesa në pagesa (ditë)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faturë
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email Adresa
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Mbrojtje
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultati (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nuk përputhet me {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nuk përputhet me {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Automjeteve Nuk ka
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Njoftime
 DocType: Production Order Operation,Work In Progress,Punë në vazhdim
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Shtypjen 3D
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Docname prind Detail
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Hapja për një punë.
 DocType: Item Attribute,Increment,Rritje
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Zgjidh Magazina ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamat
 DocType: Employee,Married,I martuar
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
 DocType: Payment Reconciliation,Reconcile,Pajtojë
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Ushqimore
 DocType: Quality Inspection Reading,Reading 1,Leximi 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Bëni Banka Hyrja
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Bëni Banka Hyrja
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondet pensionale
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Magazina është i detyrueshëm nëse lloji i llogarisë është Magazina
 DocType: SMS Center,All Sales Person,Të gjitha Person Sales
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Shkruani Off Qendra Kosto
 DocType: Warehouse,Warehouse Detail,Magazina Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kufiri i kreditit ka kaluar për konsumator {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Lloji Tatimore
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Ju nuk jeni i autorizuar për të shtuar ose shënimet e para përditësim {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Ju nuk jeni i autorizuar për të shtuar ose shënimet e para përditësim {0}
 DocType: Item,Item Image (if not slideshow),Item Image (nëse nuk Slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Ekziston një klient me të njëjtin emër
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ore Rate / 60) * aktuale Operacioni Koha
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Mysafir
 DocType: Quality Inspection,Get Specification Details,Get Specifikimi Details
 DocType: Lead,Interested,I interesuar
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill e materialit
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Hapje
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Hapje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Nga {0} në {1}
 DocType: Item,Copy From Item Group,Kopje nga grupi Item
 DocType: Journal Entry,Opening Entry,Hyrja Hapja
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Produkt Enquiry
 DocType: Standard Reply,Owner,Pronar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ju lutemi shkruani kompani parë
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Ju lutemi zgjidhni kompania e parë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Ju lutemi zgjidhni kompania e parë
 DocType: Employee Education,Under Graduate,Nën diplomuar
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Në
 DocType: BOM,Total Cost,Kostoja Totale
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Parashtesë
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Harxhuese
 DocType: Upload Attendance,Import Log,Import Identifikohu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Dërgoj
+DocType: Sales Invoice Item,Delivered By Supplier,Dorëzuar nga furnizuesi
 DocType: SMS Center,All Contact,Të gjitha Kontakt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Paga vjetore
 DocType: Period Closing Voucher,Closing Fiscal Year,Mbyllja e Vitit Fiskal
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Contra Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Shfaq Koha Shkrime
 DocType: Journal Entry Account,Credit in Company Currency,Kreditit në kompanisë Valuta
 DocType: Delivery Note,Installation Status,Instalimi Statusi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pranuar + Refuzuar Qty duhet të jetë e barabartë me sasinë e pranuara për Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pranuar + Refuzuar Qty duhet të jetë e barabartë me sasinë e pranuara për Item {0}
 DocType: Item,Supply Raw Materials for Purchase,Furnizimit të lëndëve të para për Blerje
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} duhet të jetë një Item Blerje
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Shkarko template, plotësoni të dhënat e duhura dhe të bashkëngjitni e tanishëm. Të gjitha datat dhe punonjës kombinim në periudhën e zgjedhur do të vijë në template, me të dhënat ekzistuese frekuentimit"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Item {0} nuk është aktiv apo fundi i jetës është arritur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} nuk është aktiv apo fundi i jetës është arritur
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Do të rifreskohet pas Sales Fatura është dorëzuar.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Cilësimet për HR Module
 DocType: SMS Center,SMS Center,SMS Center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Straightening
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Shkruani parametër url pe
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Rregullat për aplikimin e çmimeve dhe zbritje.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Këtë herë konflikte Identifikohu me {0} për {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista çmimi duhet të jetë i zbatueshëm për blerjen ose shitjen e
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Data Instalimi nuk mund të jetë para datës së dorëzimit për pika {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data Instalimi nuk mund të jetë para datës së dorëzimit për pika {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Zbritje në listën e çmimeve Norma (%)
-sites/assets/js/form.min.js +279,Start,Fillim
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Fillim
 DocType: User,First Name,Emri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Setup juaj është e plotë. Freskuese.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Hedh plotë-myk
 DocType: Offer Letter,Select Terms and Conditions,Zgjidhni Termat dhe Kushtet
 DocType: Production Planning Tool,Sales Orders,Sales Urdhërat
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Kundër Item Shitjet Faturë
 ,Production Orders in Progress,Urdhërat e prodhimit në Progres
 DocType: Lead,Address & Contact,Adresa & Kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,Shtoni gjethe të papërdorura nga alokimet e mëparshme
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Tjetër Periodik {0} do të krijohet në {1}
 DocType: Newsletter List,Total Subscribers,Totali i regjistruar
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Emri
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,SO pritje Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Krijon shqip pagave për kriteret e përmendura më sipër.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Kërkesë për blerje.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Strehim të dyfishtë
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Vetëm aprovuesi zgjedhur Pushimi mund ta paraqesë këtë kërkesë lini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Vetëm aprovuesi zgjedhur Pushimi mund ta paraqesë këtë kërkesë lini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lë në vit
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup> Cilësimet> Emërtimi Series
 DocType: Time Log,Will be updated when batched.,Do të përditësohet kur batched.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Ju lutem kontrolloni 'A Advance' kundër llogaria {1} në qoftë se kjo është një hyrje paraprakisht.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Ju lutem kontrolloni 'A Advance' kundër llogaria {1} në qoftë se kjo është një hyrje paraprakisht.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Magazina {0} nuk i përkasin kompanisë {1}
 DocType: Bulk Email,Message,Mesazh
 DocType: Item Website Specification,Item Website Specification,Item Faqja Specifikimi
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Qasja kryesore
 DocType: Payment Tool,Reference No,Referenca Asnjë
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lini Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Vjetor
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pajtimi Item
 DocType: Stock Entry,Sales Invoice No,Shitjet Faturë Asnjë
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Minimale Rendit Qty
 DocType: Pricing Rule,Supplier Type,Furnizuesi Type
 DocType: Item,Publish in Hub,Publikojë në Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Item {0} është anuluar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Kërkesë materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Kërkesë materiale
 DocType: Bank Reconciliation,Update Clearance Date,Update Pastrimi Data
 DocType: Item,Purchase Details,Detajet Blerje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} nuk u gjet në 'e para materiale të furnizuara "tryezë në Rendit Blerje {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Kontrolli Njoftim
 DocType: Lead,Suggestions,Sugjerime
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Item buxhetet Grupi-i mençur në këtë territor. Ju gjithashtu mund të përfshijë sezonalitetin duke vendosur të Shpërndarjes.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Ju lutemi shkruani grup llogari prind për depo {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagesës kundër {0} {1} nuk mund të jetë më i madh se Outstanding Sasia {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagesës kundër {0} {1} nuk mund të jetë më i madh se Outstanding Sasia {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile Nr
 DocType: Maintenance Schedule,Generate Schedule,Generate Orari
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Mbyllja Shef Llogaria
 DocType: Employee,External Work History,Historia e jashtme
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Qarkorja Referenca Gabim
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,A jeni të vërtetë dëshironi të ndaluar
 DocType: Communication,Closed,Mbyllur
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Me fjalë (eksport) do të jetë i dukshëm një herë ju ruani notën shpërndarëse.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Jeni te sigurte qe doni për të ndaluar
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profile Job
 DocType: Newsletter,Newsletter,Newsletter
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Ofrimit Shënim
 DocType: Dropbox Backup,Allow Dropbox Access,Lejo Dropbox Qasja
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ngritja Tatimet
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Pagesa Hyrja është ndryshuar, pasi që ju nxorrën atë. Ju lutemi të tërheqë atë përsëri."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Përmbledhje për këtë javë dhe aktivitete në pritje
 DocType: Workstation,Rent Cost,Qira Kosto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Ju lutem, përzgjidhni muaji dhe viti"
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Shkalla në të cilën Valuta Customer është konvertuar në bazë monedhën klientit
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Në dispozicion në bom, ofrimit Shënim, Blerje Faturës, Rendit Prodhimi, Rendit Blerje, pranimin Blerje, Sales Faturës, Sales Rendit, Stock Hyrja, pasqyrë e mungesave"
 DocType: Item Tax,Tax Rate,Shkalla e tatimit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Zgjidh Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Zgjidh Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} menaxhohet grumbull-i mençur, nuk mund të pajtohen duke përdorur \ Stock pajtimit, në vend që të përdorin Stock Hyrja"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Nuk duhet të jetë i njëjtë si {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convert për të jo-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pranimi blerje duhet të dorëzohet
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuale Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (shumë) e një artikulli.
 DocType: C-Form Invoice Detail,Invoice Date,Data e faturës
 DocType: GL Entry,Debit Amount,Shuma Debi
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Nuk mund të jetë vetëm 1 Llogaria për Kompaninë në {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Nuk mund të jetë vetëm 1 Llogaria për Kompaninë në {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Adresa juaj e-mail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Ju lutem shikoni shtojcën
 DocType: Purchase Order,% Received,% Marra
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Udhëzime
 DocType: Quality Inspection,Inspected By,Inspektohen nga
 DocType: Maintenance Visit,Maintenance Type,Mirëmbajtja Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serial Asnjë {0} nuk i përket dorëzimit Shënim {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serial Asnjë {0} nuk i përket dorëzimit Shënim {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Cilësia Inspektimi Parametri
 DocType: Leave Application,Leave Approver Name,Lini Emri aprovuesi
 ,Schedule Date,Orari Data
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Blerje Regjistrohu
 DocType: Landed Cost Item,Applicable Charges,Akuzat e aplikueshme
 DocType: Workstation,Consumable Cost,Kosto harxhuese
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) duhet të ketë rol 'Leave aprovuesi'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) duhet të ketë rol 'Leave aprovuesi'
 DocType: Purchase Receipt,Vehicle Date,Data e Automjeteve
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Mjekësor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Arsyeja për humbjen
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% Installed
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Ju lutem shkruani emrin e kompanisë e parë
 DocType: BOM,Item Desription,Item Desription
 DocType: Purchase Invoice,Supplier Name,Furnizuesi Emri
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lexoni Manualin ERPNext
 DocType: Account,Is Group,Është grup
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatikisht Set Serial Nos bazuar në FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrolloni Furnizuesi faturës Numri Unike
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Master Mena
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Konfigurimet Global për të gjitha proceset e prodhimit.
 DocType: Accounts Settings,Accounts Frozen Upto,Llogaritë ngrira Upto
 DocType: SMS Log,Sent On,Dërguar në
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
 DocType: Sales Order,Not Applicable,Nuk aplikohet
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mjeshtër pushime.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell derdhur
 DocType: Material Request Item,Required Date,Data e nevojshme
 DocType: Delivery Note,Billing Address,Faturimi Adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
 DocType: BOM,Costing,Kushton
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Nëse kontrolluar, shuma e taksave do të konsiderohen si të përfshirë tashmë në Printo Tarifa / Shuma Shtyp"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gjithsej Qty
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Koha Midis Ope
 DocType: Customer,Buyer of Goods and Services.,Blerësi i mallrave dhe shërbimeve.
 DocType: Journal Entry,Accounts Payable,Llogaritë e pagueshme
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Shto abonentë
-sites/assets/js/erpnext.min.js +5,""" does not exists","Nuk ekziston
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","Nuk ekziston
 DocType: Pricing Rule,Valid Upto,Valid Upto
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Të ardhurat direkte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nuk mund të filtruar në bazë të llogarisë, në qoftë se të grupuara nga Llogaria"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Zyrtar Administrativ
 DocType: Payment Tool,Received Or Paid,Marrë ose e paguar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Ju lutem, përzgjidhni Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Ju lutem, përzgjidhni Company"
 DocType: Stock Entry,Difference Account,Llogaria Diferenca
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Nuk mund detyrë afër sa detyra e saj të varur {0} nuk është e mbyllur.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
 DocType: Production Order,Additional Operating Cost,Shtesë Kosto Operative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kozmetikë
 DocType: DocField,Type,Lloj
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
 DocType: Communication,Subject,Subjekt
 DocType: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Urgjencës Telefon
 ,Serial No Warranty Expiry,Serial No Garanci Expiry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,A jeni të vërtetë doni për të ndaluar këtë Kërkesë materiale?
 DocType: Sales Order,To Deliver,Për të ofruar
 DocType: Purchase Invoice Item,Item,Artikull
 DocType: Journal Entry,Difference (Dr - Cr),Diferenca (Dr - Cr)
 DocType: Account,Profit and Loss,Fitimi dhe Humbja
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Menaxhimi Nënkontraktimi
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Menaxhimi Nënkontraktimi
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM nuk duhet të jetë e tipit Numri Whole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilje dhe instalime
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Shkalla në të cilën listë Çmimi monedhës është konvertuar në monedhën bazë kompanisë
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / Edit taksat dhe tat
 DocType: Purchase Invoice,Supplier Invoice No,Furnizuesi Fatura Asnjë
 DocType: Territory,For reference,Për referencë
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nuk mund të fshini serial {0}, ashtu siç është përdorur në transaksionet e aksioneve"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Mbyllja (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Mbyllja (Cr)
 DocType: Serial No,Warranty Period (Days),Garanci Periudha (ditë)
 DocType: Installation Note Item,Installation Note Item,Instalimi Shënim Item
 ,Pending Qty,Në pritje Qty
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Faturimi dhe dorëzimit Statusi
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Konsumatorët të përsëritur
 DocType: Leave Control Panel,Allocate,Alokimi
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,I mëparshëm
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Shitjet Kthehu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Shitjet Kthehu
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Zgjidh urdhëron shitjet nga të cilat ju doni të krijoni urdhërat e prodhimit.
+DocType: Item,Delivered by Supplier (Drop Ship),Dorëzuar nga Furnizuesi (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponentët e pagave.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza e të dhënave të konsumatorëve potencial.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza e të dhënave të konsumatorëve.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Akrobaci
 DocType: Purchase Order Item,Billed Amt,Faturuar Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Një Magazina logjik kundër të cilit janë bërë të hyra të aksioneve.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referenca Nuk & Referenca Data është e nevojshme për {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenca Nuk & Referenca Data është e nevojshme për {0}
 DocType: Event,Wednesday,E mërkurë
 DocType: Sales Invoice,Customer's Vendor,Vendor konsumatorit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Prodhimi Rendit është i detyrueshëm
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Marresit Parametri
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Bazuar Në 'dhe' Grupit nga 'nuk mund të jetë e njëjtë
 DocType: Sales Person,Sales Person Targets,Synimet Sales Person
-sites/assets/js/form.min.js +271,To,Në
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Ju lutemi shkruani adresën e-mail
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Në
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Ju lutemi shkruani adresën e-mail
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tub në fund formimin
 DocType: Production Order Operation,In minutes,Në minuta
 DocType: Issue,Resolution Date,Rezoluta Data
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,Projektet i përdoruesit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Konsumuar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nuk u gjet në detaje Fatura tryezë
 DocType: Company,Round Off Cost Center,Rrumbullakët Off Qendra Kosto
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Vizitoni {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Vizitoni {0} duhet të anulohet para se anulimi këtë Radhit Sales
 DocType: Material Request,Material Transfer,Transferimi materiale
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Hapja (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Timestamp postimi duhet të jetë pas {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Cilësimet
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taksat zbarkoi Kosto dhe Tarifat
 DocType: Production Order Operation,Actual Start Time,Aktuale Koha e fillimit
 DocType: BOM Operation,Operation Time,Operacioni Koha
-sites/assets/js/list.min.js +5,More,Më shumë
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Më shumë
 DocType: Pricing Rule,Sales Manager,Sales Manager
-sites/assets/js/desk.min.js +7673,Rename,Riemërtoj
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Riemërtoj
 DocType: Journal Entry,Write Off Amount,Shkruani Off Shuma
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Lakimi
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Lejojë përdoruesin
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Krasitje Drejt
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Për të gjetur pika në shitje dhe dokumentet e blerjes bazuar në nr e tyre serik. Kjo është gjithashtu mund të përdoret për të gjetur detajet garanci e produktit.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock tanishme
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Magazina refuzuar është e detyrueshme kundër artikull regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Magazina refuzuar është e detyrueshme kundër artikull regected
 DocType: Account,Expenses Included In Valuation,Shpenzimet e përfshira në Vlerësimit
 DocType: Employee,Provide email id registered in company,Sigurojë id mail regjistruar në kompaninë
 DocType: Hub Settings,Seller City,Shitës qytetit
 DocType: Email Digest,Next email will be sent on:,Email ardhshëm do të dërgohet në:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Letër Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Item ka variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} nuk u gjet
 DocType: Bin,Stock Value,Stock Vlera
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,I mirëpritur
 DocType: Journal Entry,Credit Card Entry,Credit Card Hyrja
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Detyra Subjekt
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Mallrat e marra nga furnizuesit.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mallrat e marra nga furnizuesit.
 DocType: Communication,Open,Hapur
 DocType: Lead,Campaign Name,Emri fushatë
 ,Reserved,I rezervuar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,A jeni të vërtetë duan të heq tapën
 DocType: Purchase Order,Supply Raw Materials,Furnizimit të lëndëve të para
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Data në të cilën fatura e ardhshme do të gjenerohet. Ajo është krijuar për të paraqitur.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Pasuritë e tanishme
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Konsumatorit Blerje Rendit Jo
 DocType: Employee,Cell Number,Numri Cell
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,I humbur
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në "Kundër Journal hyrjes 'kolonë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në "Kundër Journal hyrjes 'kolonë
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energji
 DocType: Opportunity,Opportunity From,Opportunity Nga
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Deklarata mujore e pagave.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Detyrim
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Shuma e sanksionuar nuk mund të jetë më e madhe se shuma e kërkesës në Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Gabim Kostoja e mallrave të shitura Llogaria
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Lista e Çmimeve nuk zgjidhet
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista e Çmimeve nuk zgjidhet
 DocType: Employee,Family Background,Historiku i familjes
 DocType: Process Payroll,Send Email,Dërgo Email
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nuk ka leje
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Gjërat me weightage më të lartë do të tregohet më e lartë
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Banka Pajtimit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Faturat e mia
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Asnjë punonjës gjetur
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Asnjë punonjës gjetur
 DocType: Purchase Order,Stopped,U ndal
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Zgjidh bom për të filluar
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Ngarko ek
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Dërgo Tani
 ,Support Analytics,Analytics Mbështetje
 DocType: Item,Website Warehouse,Website Magazina
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,A jeni të vërtetë doni për të ndaluar rendin prodhimit:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Ditë të muajit në të cilin fatura auto do të gjenerohet p.sh. 05, 28 etj"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultati duhet të jetë më pak se ose e barabartë me 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Të dhënat C-Forma
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Mbës
 DocType: Features Setup,"To enable ""Point of Sale"" features",Për të mundësuar "Pika e Shitjes" karakteristika
 DocType: Bin,Moving Average Rate,Moving norma mesatare
 DocType: Production Planning Tool,Select Items,Zgjidhni Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},"{0} kundër Bill {1} ​​{2}, datë"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},"{0} kundër Bill {1} ​​{2}, datë"
 DocType: Comment,Reference Name,Referenca Emri
 DocType: Maintenance Visit,Completion Status,Përfundimi Statusi
 DocType: Sales Invoice Item,Target Warehouse,Target Magazina
 DocType: Item,Allow over delivery or receipt upto this percent,Lejo mbi ofrimin ose pranimin upto këtë qind
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Pritet Data e dorëzimit nuk mund të jetë e para Sales Rendit Data
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Pritet Data e dorëzimit nuk mund të jetë e para Sales Rendit Data
 DocType: Upload Attendance,Import Attendance,Pjesëmarrja e importit
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Të gjitha Item Grupet
 DocType: Process Payroll,Activity Log,Aktiviteti Identifikohu
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatikisht shkruaj mesazh për dorëzimin e transaksioneve.
 DocType: Production Order,Item To Manufacture,Item Për Prodhimi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Hedh Përhershëm myk
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Blerje Rendit për Pagesa
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statusi është {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Blerje Rendit për Pagesa
 DocType: Sales Order Item,Projected Qty,Projektuar Qty
 DocType: Sales Invoice,Payment Due Date,Afati i pageses
 DocType: Newsletter,Newsletter Manager,Newsletter Menaxher
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,Numrat kërkuara
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Vlerësimit të performancës.
 DocType: Sales Invoice Item,Stock Details,Stock Detajet
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vlera e Projektit
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Nuk mund të bart {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nuk mund të bart {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Bilanci i llogarisë tashmë në kredi, ju nuk jeni i lejuar për të vendosur "Bilanci Must Be 'si' Debitimit '"
 DocType: Account,Balance must be,Bilanci duhet të jetë
 DocType: Hub Settings,Publish Pricing,Publikimi i Çmimeve
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Pranimi Blerje
 ,Received Items To Be Billed,Items marra Për të faturohet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Prish gërryes
-sites/assets/js/desk.min.js +3938,Ms,Ms
+DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Kursi i këmbimit të monedhës mjeshtër.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Në pamundësi për të gjetur vend i caktuar kohë në {0} ditëve të ardhshme për funksionimin {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiali plan për nën-kuvendet
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,Varg
 DocType: Supplier,Default Payable Accounts,Default Llogaritë e pagueshme
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
 DocType: Features Setup,Item Barcode,Item Barkodi
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Item Variantet {0} përditësuar
 DocType: Quality Inspection Reading,Reading 6,Leximi 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Blerje Faturë Advance
 DocType: Address,Shop,Dyqan
 DocType: Hub Settings,Sync Now,Sync Tani
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Row {0}: Hyrja e kredisë nuk mund të jetë i lidhur me një {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: Hyrja e kredisë nuk mund të jetë i lidhur me një {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Parazgjedhur llogari Banka / Cash do të rifreskohet automatikisht në POS Faturës kur kjo mënyrë është zgjedhur.
 DocType: Employee,Permanent Address Is,Adresa e përhershme është
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacioni përfundoi për mënyrën se si shumë mallra të gatshme?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Markë
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Kompensimi për tejkalimin {0} kaloi për Item {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Kompensimi për tejkalimin {0} kaloi për Item {1}.
 DocType: Employee,Exit Interview Details,Detajet Dil Intervista
 DocType: Item,Is Purchase Item,Është Blerje Item
 DocType: Journal Entry Account,Purchase Invoice,Blerje Faturë
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Asnjë
 DocType: Stock Entry,Total Outgoing Value,Vlera Totale largohet
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Hapja Data dhe Data e mbylljes duhet të jetë brenda të njëjtit vit fiskal
 DocType: Lead,Request for Information,Kërkesë për Informacion
 DocType: Payment Tool,Paid,I paguar
 DocType: Salary Slip,Total in words,Gjithsej në fjalë
 DocType: Material Request Item,Lead Time Date,Lead Data Koha
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Ju lutem specifikoni Serial Jo për Item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Për sendet e 'Produkt Bundle', depo, pa serial dhe Serisë Nuk do të konsiderohet nga 'Paketimi listë' tryezë. Nëse Magazina dhe Serisë Nuk janë të njëjta për të gjitha sendet e paketimit për çdo send 'produkt Bundle', këto vlera mund të futen në tabelën kryesore Item, vlerat do të kopjohet në 'Paketimi listë' tryezë."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Dërgesat për klientët.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Dërgesat për klientët.
 DocType: Purchase Invoice Item,Purchase Order Item,Rendit Blerje Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Të ardhurat indirekte
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Shuma e pagesës = shumën e papaguar
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,Adresa Line 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Grindje
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Emri i kompanisë
 DocType: SMS Center,Total Message(s),Përgjithshme mesazh (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Shiko një listë të të gjitha ndihmë videot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Zgjidh llogaria kreu i bankës ku kontrolli ishte depozituar.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Lejo përdoruesit të redaktoni listën e çmimeve Vlerësoni në transaksionet
 DocType: Pricing Rule,Max Qty,Max Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pagesa kundër Sales / Rendit Blerje gjithmonë duhet të shënohet si më parë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pagesa kundër Sales / Rendit Blerje gjithmonë duhet të shënohet si më parë
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimik
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Të gjitha sendet janë tashmë të transferuar për këtë Rendit Production.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Të gjitha sendet janë tashmë të transferuar për këtë Rendit Production.
 DocType: Process Payroll,Select Payroll Year and Month,Zgjidh pagave vit dhe Muaji
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Shko në grupin e duhur (zakonisht Aplikimi i Fondeve> asetet aktuale> llogaritë bankare dhe për të krijuar një llogari të re (duke klikuar mbi Shto fëmijë) të tipit "Banka"
 DocType: Workstation,Electricity Cost,Kosto të energjisë elektrike
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,E ba
 DocType: SMS Center,All Lead (Open),Të gjitha Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get Paid Përparimet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Bashkangjit foton tuaj
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Bëj
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Bëj
 DocType: Journal Entry,Total Amount in Words,Shuma totale në fjalë
 DocType: Workflow State,Stop,Stop
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Pati një gabim. Një arsye e mundshme mund të jetë që ju nuk e keni ruajtur formën. Ju lutemi te kontaktoni support@erpnext.com nëse problemi vazhdon.
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,Paketimi Shqip Item
 DocType: POS Profile,Cash/Bank Account,Cash / Llogarisë Bankare
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Artikuj hequr me asnjë ndryshim në sasi ose në vlerë.
 DocType: Delivery Note,Delivery To,Ofrimit të
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabela atribut është i detyrueshëm
 DocType: Production Planning Tool,Get Sales Orders,Get Sales urdhëron
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nuk mund të jetë negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivimi
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Do të përdit
 DocType: Project,Internal,I brendshëm
 DocType: Task,Urgent,Urgjent
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Ju lutem specifikoni një ID te vlefshme Row për rresht {0} në tryezë {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Shko në Desktop dhe të fillojë përdorimin ERPNext
 DocType: Item,Manufacturer,Prodhues
 DocType: Landed Cost Item,Purchase Receipt Item,Blerje Pranimi i artikullit
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervuar Magazina në Sales Order / Finished mallrave Magazina
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Shuma Shitja
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Koha Shkrime
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ju jeni aprovuesi Shpenzimet për këtë rekord. Ju lutem Update 'Status' dhe për të shpëtuar
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ju jeni aprovuesi Shpenzimet për këtë rekord. Ju lutem Update 'Status' dhe për të shpëtuar
 DocType: Serial No,Creation Document No,Krijimi Dokumenti Asnjë
 DocType: Issue,Issue,Çështje
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributet për Item variante. p.sh. madhësia, ngjyra etj"
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Kundër
 DocType: Item,Default Selling Cost Center,Gabim Qendra Shitja Kosto
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} është {1}
 DocType: Opportunity,Contact Info,Informacionet Kontakt
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Marrja e aksioneve Entries
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Marrja e aksioneve Entries
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
 DocType: Item,Default Supplier,Gabim Furnizuesi
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Mbi prodhimin Allowance Përqindja
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Merr e pushimit javor Datat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,End Date nuk mund të jetë më pak se Data e fillimit
 DocType: Sales Person,Select company name first.,Përzgjidh kompani emri i parë.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Kuotimet e marra nga furnizuesit.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Për {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,updated nëpërmjet Koha Shkrime
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Numrat e regjistrimit kompani për referencë tuaj. Numrat e taksave etj
 DocType: Sales Partner,Distributor,Shpërndarës
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shporta Transporti Rregulla
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Prodhimi Rendit {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Prodhimi Rendit {0} duhet të anulohet para se anulimi këtë Radhit Sales
 ,Ordered Items To Be Billed,Items urdhëruar të faturuar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Nga një distancë duhet të jetë më pak se në rang
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Zgjidh Koha Shkrime dhe Submit për të krijuar një Sales re Faturë.
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Tatimore
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Pagueshme
 DocType: Account,Warehouse,Depo
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
 ,Purchase Order Items To Be Billed,Items Rendit Blerje Për të faturohet
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Blerje Item Faturë
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Detajet e pagesës
 DocType: Global Defaults,Current Fiscal Year,Vitin aktual fiskal
 DocType: Global Defaults,Disable Rounded Total,Disable rrumbullakosura Total
 DocType: Lead,Call,Thirrje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"Hyrjet" nuk mund të jetë bosh
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"Hyrjet" nuk mund të jetë bosh
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rresht {0} me të njëjtën {1}
 ,Trial Balance,Bilanci gjyqi
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Ngritja Punonjësit
-sites/assets/js/erpnext.min.js +5,"Grid """,Grid "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ngritja Punonjësit
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Hulumtim
 DocType: Maintenance Visit Purpose,Work Done,Punën e bërë
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,Dërguar
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Shiko Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
 DocType: Communication,Delivery Status,Ofrimit Statusi
 DocType: Production Order,Manufacture against Sales Order,Prodhimi kundër Sales Rendit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Pjesa tjetër e botës
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Pjesa tjetër e botës
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} nuk mund të ketë Serisë
 ,Budget Variance Report,Buxheti Varianca Raport
 DocType: Salary Slip,Gross Pay,Pay Bruto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividentët e paguar
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Ledger Kontabilitet
 DocType: Stock Reconciliation,Difference Amount,Shuma Diferenca
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Fitime të mbajtura
 DocType: BOM Item,Item Description,Përshkrimi i artikullit
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,Mundësi Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Hapja e përkohshme
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Punonjës Pushimi Bilanci
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Gjendjen e llogarisë {0} duhet të jetë gjithmonë {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Gjendjen e llogarisë {0} duhet të jetë gjithmonë {1}
 DocType: Address,Address Type,Adresa Type
 DocType: Purchase Receipt,Rejected Warehouse,Magazina refuzuar
 DocType: GL Entry,Against Voucher,Kundër Bonon
 DocType: Item,Default Buying Cost Center,Gabim Qendra Blerja Kosto
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Për të marrë më të mirë nga ERPNext, ne ju rekomandojmë që të marrë disa kohë dhe të shikojnë këto video ndihmë."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Item {0} duhet të jetë i artikullit Sales
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,në
 DocType: Item,Lead Time in days,Lead Koha në ditë
 ,Accounts Payable Summary,Llogaritë e pagueshme Përmbledhje
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Nuk është i autorizuar për të redaktuar Llogari ngrirë {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Nuk është i autorizuar për të redaktuar Llogari ngrirë {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get Faturat e papaguara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Vendi i lëshimit
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontratë
 DocType: Report,Disabled,I paaftë
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Faktori UOM Coversion nevojshme për UOM: {0} në Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Faktori UOM Coversion nevojshme për UOM: {0} në Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Shpenzimet indirekte
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Qty është e detyrueshme
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Bujqësi
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,Mënyra e pagesës
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ky është një grup artikull rrënjë dhe nuk mund të redaktohen.
 DocType: Journal Entry Account,Purchase Order,Rendit Blerje
 DocType: Warehouse,Warehouse Contact Info,Magazina Kontaktimit
-sites/assets/js/form.min.js +190,Name is required,Emri i kërkohet
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Emri i kërkohet
 DocType: Purchase Invoice,Recurring Type,Përsëritur Type
 DocType: Address,City/Town,Qyteti / Qyteti
 DocType: Email Digest,Annual Income,Të ardhurat vjetore
 DocType: Serial No,Serial No Details,Serial No Detajet
 DocType: Purchase Invoice Item,Item Tax Rate,Item Tax Rate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Për {0}, vetëm llogaritë e kreditit mund të jetë i lidhur kundër një tjetër hyrje debiti"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Për {0}, vetëm llogaritë e kreditit mund të jetë i lidhur kundër një tjetër hyrje debiti"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} duhet të jetë një nënkontraktohet Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Pajisje kapitale
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Qëllim
 DocType: Sales Invoice Item,Edit Description,Ndrysho Përshkrimi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Pritet Data e dorëzimit është më e vogël se sa ishte planifikuar Data e fillimit.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Për Furnizuesin
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Vendosja Tipi Llogarisë ndihmon në zgjedhjen e kësaj llogarie në transaksionet.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Kompania Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Largohet Total
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Nuk mund të jetë vetëm një Transporti Rregulla Kushti me 0 ose vlerë bosh për "vlerës"
 DocType: Authorization Rule,Transaction,Transaksion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Shënim: Ky Qendra Kosto është një grup. Nuk mund të bëjë shënimet e kontabilitetit kundër grupeve.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Mjete
+apps/frappe/frappe/config/desk.py +7,Tools,Mjete
 DocType: Item,Website Item Groups,Faqja kryesore Item Grupet
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Numri i rendit prodhimit është e detyrueshme për hyrje të aksioneve qëllim prodhimin
 DocType: Purchase Invoice,Total (Company Currency),Total (Kompania Valuta)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,Workstation Emri
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
 DocType: Sales Partner,Target Distribution,Shpërndarja Target
-sites/assets/js/desk.min.js +7652,Comments,Komente
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komente
 DocType: Salary Slip,Bank Account No.,Llogarisë Bankare Nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ky është numri i transaksionit të fundit të krijuar me këtë prefiks
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Rate Vlerësimi nevojshme për Item {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Ju lutem zgj
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilegj Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizuesi Data e faturës
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Ju duhet të mundësojnë Shporta
-sites/assets/js/form.min.js +212,No Data,Nuk ka të dhëna
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nuk ka të dhëna
 DocType: Appraisal Template Goal,Appraisal Template Goal,Vlerësimi Template Qëllimi
 DocType: Salary Slip,Earning,Fituar
 DocType: Payment Tool,Party Account Currency,Llogaria parti Valuta
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,Llogaria parti Valuta
 DocType: Purchase Taxes and Charges,Add or Deduct,Shto ose Zbres
 DocType: Company,If Yearly Budget Exceeded (for expense account),Në qoftë se buxheti vjetor Tejkaluar (për llogari shpenzim)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Kushtet e mbivendosjes gjenden në mes:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Kundër Fletoren Hyrja {0} është përshtatur tashmë kundër një kupon tjetër
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Kundër Fletoren Hyrja {0} është përshtatur tashmë kundër një kupon tjetër
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Vlera Totale Rendit
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Ushqim
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gama plakjen 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Nr i vizitave
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Buletinet të kontakteve, të çon."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Monedhën e llogarisë Mbyllja duhet të jetë {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Shuma e pikëve për të gjitha qëllimet duhet të jetë 100. Kjo është {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacionet nuk mund të lihet bosh.
 ,Delivered Items To Be Billed,Items dorëzohet për t'u faturuar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo nuk mund të ndryshohet për të Serial Nr
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Statusi përditësuar për {0}
 DocType: DocField,Description,Përshkrim
 DocType: Authorization Rule,Average Discount,Discount mesatar
 DocType: Letter Head,Is Default,Është e albumit
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Shuma Tatimore Item
 DocType: Item,Maintain Stock,Ruajtja Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries krijuar tashmë për Rendin Production
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lini bosh nëse konsiderohet për të gjitha përcaktimeve
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit 'aktuale' në rresht {0} nuk mund të përfshihen në Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit 'aktuale' në rresht {0} nuk mund të përfshihen në Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Nga datetime
 DocType: Email Digest,For Company,Për Kompaninë
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,Transporti Adresa Emri
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Lista e Llogarive
 DocType: Material Request,Terms and Conditions Content,Termat dhe Kushtet Përmbajtja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
 DocType: Maintenance Visit,Unscheduled,Paplanifikuar
 DocType: Employee,Owned,Pronësi
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Varet në pushim pa pagesë
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garanci / AMC Statusi
 DocType: GL Entry,GL Entry,GL Hyrja
 DocType: HR Settings,Employee Settings,Cilësimet e punonjësve
 ,Batch-Wise Balance History,Batch-urti Historia Bilanci
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Për të bërë lista
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Për të bërë lista
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Nxënës
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Sasi negativ nuk është e lejuar
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Zyra Qira
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup SMS settings portë
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import dështoi!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Ka adresë shtuar ende.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ka adresë shtuar ende.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation orë pune
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e JV {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Për të mundësuar "Pika e Shitjes" pikëpamje
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Pagesa nuk mund të bëhet për karrocë bosh
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pagesa nuk mund të bëhet për karrocë bosh
 DocType: Item,Sales Details,Shitjet Detajet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Me Items
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",Data në të cilën fatura e ardhshme do të gjenerohet. Ajo është krijuar për të paraqitur.
 DocType: Item Attribute,Item Attribute,Item Attribute
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Qeveri
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Variantet pika
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variantet pika
 DocType: Company,Services,Sherbime
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Qendra prind Kosto
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Viti Financiar Data e Fillimit
 DocType: Employee External Work History,Total Experience,Përvoja Total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat
 DocType: Material Request Item,Sales Order No,Rendit Sales Asnjë
 DocType: Item Group,Item Group Name,Item Emri i Grupit
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Marrë
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Marrë
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materialet Transferimi për prodhimin e
 DocType: Pricing Rule,For Price List,Për listën e çmimeve
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Ekzekutiv Kërko
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,Oraret
 DocType: Purchase Invoice Item,Net Amount,Shuma neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Asnjë
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Shtesë Shuma Discount (Valuta Company)
-DocType: Period Closing Voucher,CoA Help,CoA Ndihmë
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Gabim: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Gabim: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Ju lutem të krijuar një llogari të re nga Chart e Llogarive.
 DocType: Maintenance Visit,Maintenance Visit,Mirëmbajtja Vizitoni
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer> Grupi Customer> Territori
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Zbarkoi Kosto Ndihmë
 DocType: Event,Tuesday,E martë
 DocType: Leave Block List,Block Holidays on important days.,Festat bllok në ditë të rëndësishme.
 ,Accounts Receivable Summary,Llogaritë Arkëtueshme Përmbledhje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lë për llojin {0} ndarë tashmë për punonjësit {1} për periudhën {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Ju lutemi të vendosur User fushë ID në një rekord të Punonjësve të vendosur Roli punonjës
 DocType: UOM,UOM Name,Emri UOM
 DocType: Top Bar Item,Target,Objektiv
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Hyrja Kontabiliteti për {0} mund të bëhen vetëm në monedhën: {1}
 DocType: Pricing Rule,Pricing Rule,Rregulla e Çmimeve
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,E prerë
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Kërkesë materiale për të blerë Radhit
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Kërkesë materiale për të blerë Radhit
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: kthye Item {1} nuk ekziston në {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Llogaritë bankare
 ,Bank Reconciliation Statement,Deklarata Banka Pajtimit
 DocType: Address,Lead Name,Emri Lead
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Hapja Stock Bilanci
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Hapja Stock Bilanci
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} duhet të shfaqen vetëm një herë
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nuk lejohet të tranfer më {0} se {1} kundër Rendit Blerje {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Lë alokuar sukses për {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Lë alokuar sukses për {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Asnjë informacion që të dal
 DocType: Shipping Rule Condition,From Value,Nga Vlera
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Shuma nuk pasqyrohet në bankë
 DocType: Quality Inspection Reading,Reading 4,Leximi 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Kërkesat për shpenzimet e kompanisë.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,Kontaktoni Mobile Asnjë
 DocType: Production Planning Tool,Select Sales Orders,Zgjidh Sales urdhëron
 ,Material Requests for which Supplier Quotations are not created,Kërkesat materiale për të cilat Kuotimet Furnizuesi nuk janë krijuar
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Për të gjetur objekte duke përdorur barcode. Ju do të jenë në gjendje për të hyrë artikuj në Shënimin shitjes dhe ofrimit të Faturës nga skanimi barcode e sendit.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark si Dorëzuar
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Bëni Kuotim
 DocType: Dependent Task,Dependent Task,Detyra e varur
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provoni planifikimin e operacioneve për ditë X paraprakisht.
 DocType: HR Settings,Stop Birthday Reminders,Stop Ditëlindja Harroni
 DocType: SMS Center,Receiver List,Marresit Lista
 DocType: Payment Tool Detail,Payment Amount,Shuma e pagesës
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Shuma konsumuar
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Shiko
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Shiko
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktura e pagave Zbritje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sintering selektive lazer
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importi i suksesshëm!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostoja e Artikujve emetuara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,Gabim Llogaria pagueshme
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Cilësimet për internet shopping cart tilla si rregullat e transportit detar, lista e çmimeve etj"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% faturuar
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Qty rezervuara
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Qty rezervuara
 DocType: Party Account,Party Account,Llogaria Partia
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Burimeve Njerëzore
 DocType: Lead,Upper Income,Të ardhurat e sipërme
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktivizo Shporta
 DocType: Employee,Permanent Address,Adresa e përhershme
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Item {0} duhet të jetë një element i Shërbimit.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance paguar kundër {0} {1} nuk mund të jetë më e madhe \ se Grand Total {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ju lutemi zgjidhni kodin pika
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Ulja e zbritjes për pushim pa pagesë (LWP)
 DocType: Territory,Territory Manager,Territori Menaxher
+DocType: Delivery Note Item,To Warehouse (Optional),Për Magazina (Fakultativ)
 DocType: Sales Invoice,Paid Amount (Company Currency),Paid Shuma (Kompania Valuta)
 DocType: Purchase Invoice,Additional Discount,Discount shtesë
 DocType: Selling Settings,Selling Settings,Shitja Settings
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Miniere
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hedh rrëshirë
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Një grup të konsumatorëve ekziston me të njëjtin emër, ju lutem të ndryshojë emrin Customer ose riemërtoni grup të konsumatorëve"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Ju lutem, përzgjidhni {0} parë."
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Ju lutem, përzgjidhni {0} parë."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Teksti {0}
 DocType: Territory,Parent Territory,Territori prind
 DocType: Quality Inspection Reading,Reading 2,Leximi 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,Batch Asnjë
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Lejo Sales shumta urdhra kundër Rendit Blerje një konsumatorit
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Kryesor
 DocType: DocPerm,Delete,Fshij
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variant
-sites/assets/js/desk.min.js +7971,New {0},New {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Urdhri u ndal nuk mund të anulohet. Heq tapën për të anulluar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Urdhri u ndal nuk mund të anulohet. Heq tapën për të anulluar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
 DocType: Employee,Leave Encashed?,Dërgo arkëtuar?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Nga fushë është e detyrueshme
 DocType: Item,Variants,Variantet
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Vend
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresat
 DocType: Communication,Received,Marrë
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Kundër Fletoren Hyrja {0} nuk ka asnjë pashoq {1} hyrje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Kundër Fletoren Hyrja {0} nuk ka asnjë pashoq {1} hyrje
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Serial Asnjë hyrë për Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Një kusht për Sundimin Shipping
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item nuk i lejohet të ketë Rendit prodhimit.
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,Përshëndetje
 DocType: Communication,Rejected,Refuzuar
 DocType: Pricing Rule,Brand,Markë
 DocType: Item,Will also apply for variants,Gjithashtu do të aplikojë për variantet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Dorëzuar
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Artikuj Bundle në kohën e shitjes.
 DocType: Sales Order Item,Actual Qty,Aktuale Qty
 DocType: Sales Invoice Item,References,Referencat
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,B
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Krasitje
 DocType: Item,Has Variants,Ka Variantet
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klikoni mbi 'të shitjes Faturë "butonin për të krijuar një Sales re Faturë.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Periudha nga dhe Periudha Për datat detyrueshme për përsëritur% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Paketimin dhe etiketimin
 DocType: Monthly Distribution,Name of the Monthly Distribution,Emri i Shpërndarjes Mujore
 DocType: Sales Person,Parent Sales Person,Shitjet prind Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Ju lutem specifikoni albumit Valuta në kompaninë Master dhe Defaults Global
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Qasja Sekret
 DocType: Purchase Invoice,Recurring Invoice,Fatura përsëritur
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Menaxhimi i Projekteve
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Menaxhimi i Projekteve
 DocType: Supplier,Supplier of Goods or Services.,Furnizuesi i mallrave ose shërbimeve.
 DocType: Budget Detail,Fiscal Year,Viti Fiskal
 DocType: Cost Center,Budget,Buxhet
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Shitja
 DocType: Employee,Salary Information,Informacione paga
 DocType: Sales Person,Name and Employee ID,Emri dhe punonjës ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
 DocType: Website Item Group,Website Item Group,Faqja kryesore Item Grupi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Detyrat dhe Taksat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Ju lutem shkruani datën Reference
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} shënimet e pagesës nuk mund të filtrohen nga {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ju lutem shkruani datën Reference
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} shënimet e pagesës nuk mund të filtrohen nga {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela për çështje që do të shfaqet në Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizuar Qty
 DocType: Material Request Item,Material Request Item,Materiali Kërkesë Item
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Pema e sendit gru
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Nuk mund t'i referohet numrit rresht më të madhe se, ose të barabartë me numrin e tanishëm rresht për këtë lloj Ngarkesa"
 ,Item-wise Purchase History,Historia Blerje pika-mençur
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,I kuq
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ju lutem klikoni në "Generate" Listën për të shkoj të marr Serial Asnjë shtuar për Item {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ju lutem klikoni në "Generate" Listën për të shkoj të marr Serial Asnjë shtuar për Item {0}
 DocType: Account,Frozen,I ngrirë
 ,Open Production Orders,Urdhërat e hapur e prodhimit
 DocType: Installation Note,Installation Time,Instalimi Koha
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Kuotimit Trendet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupi pika nuk përmendet në pikën për të zotëruar pikën {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Si mund të bëhet Urdhër prodhimit për këtë artikull, ajo duhet të jetë një çështje e aksioneve."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Si mund të bëhet Urdhër prodhimit për këtë artikull, ajo duhet të jetë një çështje e aksioneve."
 DocType: Shipping Rule Condition,Shipping Amount,Shuma e anijeve
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Bashkim
 DocType: Authorization Rule,Above Value,Mbi Vlerën
 ,Pending Amount,Në pritje Shuma
 DocType: Purchase Invoice Item,Conversion Factor,Konvertimi Faktori
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Dorëzuar
+DocType: Purchase Order,Delivered,Dorëzuar
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup server hyrje për Punë email id. (P.sh. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Numri i Automjeteve
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Data në të cilën përsëritura fatura do të ndalet
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Shpërndarjen Akuzat Ba
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Llogaria {0} duhet të jetë e tipit "aseteve fikse" si i artikullit {1} është një çështje e Aseteve
 DocType: HR Settings,HR Settings,HR Cilësimet
 apps/frappe/frappe/config/setup.py +130,Printing,Shtypje
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Shpenzim Kërkesa është në pritje të miratimit. Vetëm aprovuesi shpenzimeve mund update statusin.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Shpenzim Kërkesa është në pritje të miratimit. Vetëm aprovuesi shpenzimeve mund update statusin.
 DocType: Purchase Invoice,Additional Discount Amount,Shtesë Shuma Discount
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Një ditë (s) në të cilin ju po aplikoni për leje janë pushime. Ju nuk duhet të aplikoni për leje.
-sites/assets/js/desk.min.js +7805,and,dhe
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,dhe
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sportiv
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Zbritje Total
 DocType: Quotation,Maintenance User,Mirëmbajtja User
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kosto Përditësuar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Jeni te sigurte qe doni te pengimin
 DocType: Employee,Date of Birth,Data e lindjes
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} tashmë është kthyer
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Viti Fiskal ** përfaqëson një viti financiar. Të gjitha shënimet e kontabilitetit dhe transaksionet tjera të mëdha janë gjurmuar kundër Vitit Fiskal ** **.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mbani gjurmët e Fushatave Sales. Mbani gjurmët e kryeson, citatet, Sales Rendit etj nga Fushata për të vlerësuar kthimit mbi investimin."
 DocType: Expense Claim,Approver,Aprovuesi
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entries Stock ekzistojnë kundër depo {0}, kështu që ju nuk mund të ri-caktojë ose modifikojë Magazina"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entries Stock ekzistojnë kundër depo {0}, kështu që ju nuk mund të ri-caktojë ose modifikojë Magazina"
 DocType: Appraisal,Calculate Total Score,Llogaritur Gjithsej Vota
 DocType: Supplier Quotation,Manufacturing Manager,Prodhim Menaxher
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Asnjë {0} është nën garanci upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Shënim Split dorëzimit në pako.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Dërgesat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Derdhur Dip
+DocType: Purchase Order,To be delivered to customer,Që do të dërgohen për të klientit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Koha Identifikohu Statusi duhet të dorëzohet.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial Asnjë {0} nuk i përkasin ndonjë Magazina
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Setting Up
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Nga Valuta
 DocType: DocField,Name,Emër
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ju lutem, përzgjidhni Shuma e ndarë, tip fature, si dhe numrin e faturës në atleast një rresht"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Rendit Shitjet e nevojshme për Item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Rendit Shitjet e nevojshme për Item {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Shuma nuk reflektohet në sistemin e
 DocType: Purchase Invoice Item,Rate (Company Currency),Shkalla (Kompania Valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Të tjerët
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Bëje si Stopped
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nuk mund të gjeni një përputhen Item. Ju lutem zgjidhni një vlerë tjetër {0} për.
 DocType: POS Profile,Taxes and Charges,Taksat dhe Tarifat
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Një produkt apo një shërbim që është blerë, shitur apo mbajtur në magazinë."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nuk mund të zgjidhni llojin e ngarkuar si "Për Shuma Previous Row 'ose' Në Previous Row Total" për rreshtin e parë
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,Zgjidh DOCTYPE
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Ju lutem klikoni në "Generate" Listën për të marrë orarin
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Qendra e re e kostos
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Qendra e re e kostos
 DocType: Bin,Ordered Quantity,Sasi të Urdhërohet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",p.sh. "Ndërtimi mjetet për ndërtuesit"
 DocType: Quality Inspection,In Process,Në Procesin
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
+DocType: Purchase Order Item,Reference Document Type,Referenca Document Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
 DocType: Account,Fixed Asset,Aseteve fikse
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Inventar serialized
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventar serialized
 DocType: Activity Type,Default Billing Rate,Default Faturimi Vlerësoni
 DocType: Time Log Batch,Total Billing Amount,Shuma totale Faturimi
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Llogaria e arkëtueshme
 ,Stock Balance,Stock Bilanci
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Rendit Shitjet për Pagesa
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Rendit Shitjet për Pagesa
 DocType: Expense Claim Detail,Expense Claim Detail,Shpenzim Kërkesa Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Koha Shkrime krijuar:
 DocType: Item,Weight UOM,Pesha UOM
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredia për llogari duhet të jetë një llogari e pagueshme
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nuk mund të jetë prindi ose fëmija i {2}
 DocType: Production Order Operation,Completed Qty,Kompletuar Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Për {0}, vetëm llogaritë e debitit mund të jetë i lidhur kundër një tjetër hyrjes krediti"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Për {0}, vetëm llogaritë e debitit mund të jetë i lidhur kundër një tjetër hyrjes krediti"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
 DocType: Manufacturing Settings,Allow Overtime,Lejo jashtë orarit
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Sales Order {0} është ndalur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numrat Serial nevojshme për Item {1}. Ju keni dhënë {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Shkalla aktuale Vlerësimi
 DocType: Item,Customer Item Codes,Kodet Customer Item
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Saldim
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM është e nevojshme
 DocType: Quality Inspection,Sample Size,Shembull Madhësi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ju lutem specifikoni një të vlefshme 'nga rasti Jo'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Qendrat e mëtejshme e kostos mund të bëhet në bazë të Grupeve por hyra mund të bëhet kundër jo-grupeve
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Qendrat e mëtejshme e kostos mund të bëhet në bazë të Grupeve por hyra mund të bëhet kundër jo-grupeve
 DocType: Project,External,I jashtëm
 DocType: Features Setup,Item Serial Nos,Item Serial Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Përdoruesit dhe Lejet
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Adresa dhe Kontaktet
 DocType: SMS Log,Sender Name,Sender Emri
 DocType: Page,Title,Titull
-sites/assets/js/list.min.js +104,Customize,Customize
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Customize
 DocType: POS Profile,[Select],[Zgjidh]
 DocType: SMS Log,Sent To,Dërguar në
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Bëni Sales Faturë
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Fundi i jetës
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Udhëtim
 DocType: Leave Block List,Allow Users,Lejojnë përdoruesit
+DocType: Purchase Order,Customer Mobile No,Customer Mobile Asnjë
 DocType: Sales Invoice,Recurring,Periodik
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Track ardhurat veçantë dhe shpenzimet për verticals produkt apo ndarjet.
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update Kosto
 DocType: Item Reorder,Item Reorder,Item reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Material Transferimi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Material Transferimi
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifikoni operacionet, koston operative dhe të japë një operacion i veçantë nuk ka për operacionet tuaja."
 DocType: Purchase Invoice,Price List Currency,Lista e Çmimeve Valuta
 DocType: Naming Series,User must always select,Përdoruesi duhet të zgjidhni gjithmonë
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,Punonjës
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Nga
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Fto si Përdorues
 DocType: Features Setup,After Sale Installations,Pas Instalimeve Shitje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} është faturuar plotësisht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} është faturuar plotësisht
 DocType: Workstation Working Hour,End Time,Fundi Koha
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Kushtet e kontratës standarde për shitje ose blerje.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupi nga Bonon
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,Mailing Mass
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Paraqesë për Rename
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Numri i purchse Rendit nevojshme për Item {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Trego Pagesat
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Specifikuar BOM {0} nuk ekziston për Item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Orari {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Orari {0} duhet të anulohet para se anulimi këtë Radhit Sales
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Madhësi
 DocType: Notification Control,Expense Claim Approved,Shpenzim Kërkesa Miratuar
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutike
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,Pjesëmarrja në datën
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup server hyrje për shitjet email id. (P.sh. sales@example.com)
 DocType: Warranty Claim,Raised By,Ngritur nga
 DocType: Payment Tool,Payment Account,Llogaria e pagesës
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
-sites/assets/js/list.min.js +23,Draft,Draft
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Draft
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensues Off
 DocType: Quality Inspection Reading,Accepted,Pranuar
 DocType: User,Female,Femër
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Rregulla Transporti Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
 DocType: Newsletter,Test,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Si ka transaksione ekzistuese të aksioneve për këtë artikull, \ ju nuk mund të ndryshojë vlerat e 'ka Serial', 'Has Serisë Jo', 'A Stock Item' dhe 'Metoda Vlerësimi'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Ju nuk mund të ndryshoni normës nëse bom përmendur agianst çdo send
 DocType: Employee,Previous Work Experience,Përvoja e mëparshme e punës
 DocType: Stock Entry,For Quantity,Për Sasia
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Ju lutem shkruani e planifikuar Qty për Item {0} në rresht {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} nuk është dorëzuar
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Kërkesat për sendet.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} nuk është dorëzuar
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Kërkesat për sendet.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Mënyrë e veçantë prodhimi do të krijohen për secilin artikull përfunduar mirë.
 DocType: Purchase Invoice,Terms and Conditions1,Termat dhe Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Setup Complete
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailin
 DocType: Delivery Note,Transporter Name,Transporter Emri
 DocType: Contact,Enter department to which this Contact belongs,Shkruani departamentin për të cilin kjo Kontakt takon
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Gjithsej Mungon
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Item ose Magazina për rresht {0} nuk përputhet Materiale Kërkesë
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item ose Magazina për rresht {0} nuk përputhet Materiale Kërkesë
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Njësia e Masës
 DocType: Fiscal Year,Year End Date,Viti End Date
 DocType: Task Depends On,Task Depends On,Detyra varet
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrata Data e përfundimit duhet të jetë më i madh se data e bashkimit
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Një shpërndarës i palës së tretë / tregtari / komision agjent / degë / reseller që shet produkte kompani për një komision.
 DocType: Customer Group,Has Child Node,Ka Nyja e fëmijëve
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Shkruani parametrave statike url këtu (P.sh.. Dërguesi = ERPNext, emrin = ERPNext, fjalëkalimi = 1234, etj)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} jo në çdo Viti Fiskal aktive. Për më shumë detaje shikoni {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Kjo është një website shembull auto-generated nga ERPNext
@@ -2021,11 +2032,9 @@ DocType: Note,Note,Shënim
 DocType: Purchase Receipt Item,Recd Quantity,Recd Sasia
 DocType: Email Account,Email Ids,Email IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nuk mund të prodhojë më shumë Item {0} se sasia Sales Rendit {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Bëje si Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
 DocType: Payment Reconciliation,Bank / Cash Account,Llogarisë Bankare / Cash
 DocType: Tax Rule,Billing City,Faturimi i qytetit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Kjo Aplikimi Pushimi është në pritje të miratimit. Vetëm Pushimi aprovuesi mund update statusin.
 DocType: Global Defaults,Hide Currency Symbol,Fshih Valuta size
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","psh Banka, Cash, Credit Card"
 DocType: Journal Entry,Credit Note,Credit Shënim
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Gjithsej (Qty)
 DocType: Installation Note Item,Installed Qty,Instaluar Qty
 DocType: Lead,Fax,Faks
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Dërguar
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Dërguar
 DocType: Salary Structure,Total Earning,Fituar Total
 DocType: Purchase Receipt,Time at which materials were received,Koha në të cilën janë pranuar materialet e
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Adresat e mia
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Mjeshtër deg
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ose
 DocType: Sales Order,Billing Status,Faturimi Statusi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Shpenzimet komunale
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Mbi
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Mbi
 DocType: Buying Settings,Default Buying Price List,E albumit Lista Blerja Çmimi
 ,Download Backups,Shkarko Backups
 DocType: Notification Control,Sales Order Message,Sales Rendit Mesazh
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Zgjidhni Punonjësit
 DocType: Bank Reconciliation,To Date,Deri më sot
 DocType: Opportunity,Potential Sales Deal,Shitjet e mundshme marrëveshjen
-sites/assets/js/form.min.js +308,Details,Detalet
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalet
 DocType: Purchase Invoice,Total Taxes and Charges,Totali Taksat dhe Tarifat
 DocType: Employee,Emergency Contact,Urgjencës Kontaktoni
 DocType: Item,Quality Parameters,Parametrave të cilësisë
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,Marrë Qty
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Item prind
 DocType: Account,Account Type,Lloji i Llogarisë
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Mirëmbajtja Orari nuk është krijuar për të gjitha sendet. Ju lutem klikoni në "Generate Listën '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Mirëmbajtja Orari nuk është krijuar për të gjitha sendet. Ju lutem klikoni në "Generate Listën '
 ,To Produce,Për të prodhuar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Për rresht {0} në {1}. Të përfshijnë {2} në shkallën Item, {3} duhet të përfshihen edhe rreshtave"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikimi i paketës për shpërndarjen (për shtyp)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Rrafshim
 DocType: Account,Income Account,Llogaria ardhurat
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,I derdhur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Ofrimit të
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Ofrimit të
 DocType: Stock Reconciliation Item,Current Qty,Qty tanishme
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Shih "Shkalla e materialeve në bazë të" në nenin kushton
 DocType: Appraisal Goal,Key Responsibility Area,Key Zona Përgjegjësia
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Të gjitha adresat.
 DocType: Company,Stock Settings,Stock Cilësimet
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Shkrirja është e mundur vetëm nëse prona e mëposhtme janë të njëjta në të dy regjistrat. Është Grupi, Root Type, Kompania"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Shkrirja është e mundur vetëm nëse prona e mëposhtme janë të njëjta në të dy regjistrat. Është Grupi, Root Type, Kompania"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Manage grup të konsumatorëve Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Qendra Kosto New Emri
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Qendra Kosto New Emri
 DocType: Leave Control Panel,Leave Control Panel,Lini Control Panel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Nuk ka parazgjedhur Adresa Template gjetur. Ju lutem të krijuar një të ri nga Setup> Printime dhe quajtur> Adresa Stampa.
 DocType: Appraisal,HR User,HR User
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Detail Tool Pagesa
 ,Sales Browser,Shitjet Browser
 DocType: Journal Entry,Total Credit,Gjithsej Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Kreditë dhe paradhëniet (aktiveve)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorët
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,I madh
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Asnjë punonjës gjetur!
 DocType: C-Form Invoice Detail,Territory,Territor
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ju lutemi përmendni i vizitave të kërkuara
+DocType: Purchase Order,Customer Address Display,Customer Adresa Display
 DocType: Stock Settings,Default Valuation Method,Gabim Vlerësimi Metoda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Lustrim
 DocType: Production Order Operation,Planned Start Time,Planifikuar Koha e fillimit
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Ndarë
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Mbylle Bilanci dhe Fitimi libër ose humbja.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse \ keni bërë tashmë një transaksioni (et) me një tjetër UOM. Për të ndryshuar parazgjedhje UOM, \ përdorimi 'UOM Replace Utility' mjet nën Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specifikoni Exchange Rate për të kthyer një monedhë në një tjetër
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Citat {0} është anuluar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} është anuluar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Shuma totale Outstanding
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Punonjës {0} ka qenë në pushim në {1}. Nuk mund të shënojë pjesëmarrjen.
 DocType: Sales Partner,Targets,Synimet
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ky është një grup të konsumatorëve rrënjë dhe nuk mund të redaktohen.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Ju lutem Setup kartelën tuaj të llogarive të para se të fillojë regjistrimeve kontabël
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignore Rregulla e Çmimeve
-sites/assets/js/list.min.js +24,Cancelled,Anullohen
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Anullohen
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Nga Data në strukturën e pagave nuk mund të jetë më e vogël se sa punonjës Data bashkuar.
 DocType: Employee Education,Graduate,I diplomuar
 DocType: Leave Block List,Block Days,Ditët Blloku
 DocType: Journal Entry,Excise Entry,Akciza Hyrja
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Kujdes: Sales Order {0} ekziston kundër Rendit Blerje Klientit {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Kujdes: Sales Order {0} ekziston kundër Rendit Blerje Klientit {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,Stock Marrë Por Jo faturuar
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto Pay + arrear Shuma + Arkëtim Shuma - Zbritje Total
 DocType: Monthly Distribution,Distribution Name,Emri shpërndarja
 DocType: Features Setup,Sales and Purchase,Shitjet dhe Blerje
-DocType: Purchase Order Item,Material Request No,Materiali Kërkesë Asnjë
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
+DocType: Supplier Quotation Item,Material Request No,Materiali Kërkesë Asnjë
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Shkalla në të cilën konsumatori e valutës është e konvertuar në monedhën bazë kompanisë
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ka qenë sukses unsubscribed nga kjo listë.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Kompania Valuta)
-apps/frappe/frappe/templates/base.html +132,Added,Shtuar
+apps/frappe/frappe/templates/base.html +134,Added,Shtuar
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Manage Territorit Tree.
 DocType: Journal Entry Account,Sales Invoice,Shitjet Faturë
 DocType: Journal Entry Account,Party Balance,Bilanci i Partisë
 DocType: Sales Invoice Item,Time Log Batch,Koha Identifikohu Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Ju lutem, përzgjidhni Aplikoni zbritje në"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Ju lutem, përzgjidhni Aplikoni zbritje në"
 DocType: Company,Default Receivable Account,Gabim Llogaria Arkëtueshme
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Krijo Banka e hyrjes për pagën totale e paguar për kriteret e përzgjedhura më sipër
 DocType: Stock Entry,Material Transfer for Manufacture,Transferimi materiale për Prodhimin
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Get gjitha relevante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Shitjet Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Item {0} nuk ekziston
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Item {0} nuk ekziston
 DocType: Sales Invoice,Customer Address,Customer Adresa
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplikoni shtesë zbritje në
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,Cilësia Inspektimi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Vogla
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formimin
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Warning: Materiali kërkuar Qty është më pak se minimale Rendit Qty
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Llogaria {0} është ngrirë
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Llogaria {0} është ngrirë
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Personit juridik / subsidiare me një tabelë të veçantë e llogarive i përkasin Organizatës.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Ushqim, Pije & Duhani"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ose BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Vetëm mund të bëni pagesën kundër pafaturuar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Shkalla e Komisionit nuk mund të jetë më e madhe se 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveli minimal Inventari
 DocType: Stock Entry,Subcontract,Nënkontratë
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Ju lutem shkruani {0} parë
 DocType: Production Planning Tool,Get Items From Sales Orders,Të marrë sendet nga Sales urdhëron
 DocType: Production Order Operation,Actual End Time,Aktuale Fundi Koha
 DocType: Production Planning Tool,Download Materials Required,Shkarko materialeve të kërkuara
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,Planifikuar
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Ju lutem zgjidhni Item ku "A Stock Pika" është "Jo" dhe "është pika e shitjes" është "Po", dhe nuk ka asnjë tjetër Bundle Produktit"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Zgjidh Shpërndarja mujore të pabarabartë shpërndarë objektiva të gjithë muajve.
 DocType: Purchase Invoice Item,Valuation Rate,Vlerësimi Rate
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: Pranimi Blerje {1} nuk ekziston në tabelën e mësipërme "Blerje Pranimet '
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Punonjës {0} ka aplikuar tashmë për {1} midis {2} dhe {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Punonjës {0} ka aplikuar tashmë për {1} midis {2} dhe {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti Data e Fillimit
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Deri
 DocType: Rename Tool,Rename Log,Rename Kyçu
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Vetëm nyjet fletë janë të lejuara në transaksion
 DocType: Expense Claim,Expense Approver,Shpenzim aprovuesi
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Fatura Blerje Item furnizuar
-sites/assets/js/erpnext.min.js +48,Pay,Kushtoj
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Kushtoj
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Për datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Shkrime për ruajtjen e statusit të dorëzimit SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Bluarje
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Tkurret mbështjellës
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Aktivitetet në pritje
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivitetet në pritje
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,I konfirmuar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Furnizuesi> Furnizuesi Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Shk
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Gazeta Botuesit
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Zgjidh Viti Fiskal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Bashkëshkrirje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Ju jeni aprovuesi Leave për këtë rekord. Ju lutem Update 'Status' dhe për të shpëtuar
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Niveli
 DocType: Attendance,Attendance Date,Pjesëmarrja Data
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Shpërbërjes paga në bazë të fituar dhe zbritje.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Qendra Kosto me transaksionet ekzistuese nuk mund të konvertohet në grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizim
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizuesi (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Periudha e pavlefshme
 DocType: Customer,Credit Limit,Limit Credit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Përzgjidhni llojin e transaksionit
 DocType: GL Entry,Voucher No,Voucher Asnjë
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Templ
 DocType: Customer,Address and Contact,Adresa dhe Kontakt
 DocType: Customer,Last Day of the Next Month,Dita e fundit e muajit të ardhshëm
 DocType: Employee,Feedback,Reagim
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Orar
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Orar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Përpunimit gërryes jet
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Website Settings,Website Settings,Website Cilësimet
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,Largohet
 DocType: Material Request,Requested For,Kërkuar Për
 DocType: Quotation Item,Against Doctype,Kundër DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Përcjell këtë notën shpërndarëse kundër çdo Projektit
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Llogari rrënjë nuk mund të fshihet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Llogari rrënjë nuk mund të fshihet
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Shfaq Stock Entries
 ,Is Primary Address,Është Adresimi Fillor
 DocType: Production Order,Work-in-Progress Warehouse,Puna në progres Magazina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referenca # {0} datë {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referenca # {0} datë {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Manage Adresat
 DocType: Pricing Rule,Item Code,Kodi i artikullit
 DocType: Production Planning Tool,Create Production Orders,Krijo urdhërat e prodhimit
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,Përdoruesi Vërejtje
 DocType: Lead,Market Segment,Segmenti i Tregut
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Punonjës historia e Brendshme
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Mbyllja (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Mbyllja (Dr)
 DocType: Contact,Passive,Pasiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Asnjë {0} nuk në magazinë
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template taksave për shitjen e transaksioneve.
 DocType: Sales Invoice,Write Off Outstanding Amount,Shkruani Off Outstanding Shuma
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Kontrolloni nëse keni nevojë për faturat automatike të përsëritura. Pas paraqitjes së çdo faturë e shitjes, Recurring seksion do të jetë i dukshëm."
 DocType: Account,Accounts Manager,Llogaritë Menaxher
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Koha Identifikohu {0} duhet të jetë 'Dërguar'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Koha Identifikohu {0} duhet të jetë 'Dërguar'
 DocType: Stock Settings,Default Stock UOM,Gabim Stock UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Kushton Vlerësoni bazuar në aktivitet të llojit (në orë)
 DocType: Production Planning Tool,Create Material Requests,Krijo Kërkesat materiale
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Banka Pajtimit
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get Updates
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Shto një pak të dhënat mostër
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Lini Menaxhimi
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lini Menaxhimi
 DocType: Event,Groups,Grupet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupi nga Llogaria
 DocType: Sales Order,Fully Delivered,Dorëzuar plotësisht
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Shitjet Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} buxheti për llogaria {1} kundër Qendra Kosto {2} do të kalojë nga {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Mbaj Leaves përcolli
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Nga Data "duhet të jetë pas" deri më sot "
 ,Stock Projected Qty,Stock Projektuar Qty
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
 DocType: Sales Order,Customer's Purchase Order,Rendit Blerje konsumatorit
 DocType: Warranty Claim,From Company,Nga kompanisë
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vlera ose Qty
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Shitës me pakicë
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredi në llogarinë duhet të jetë një llogari Bilanci i Gjendjes
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Gjitha llojet Furnizuesi
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Kodi i artikullit është i detyrueshëm për shkak Item nuk është numëruar në mënyrë automatike
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Citat {0} nuk e tipit {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kodi i artikullit është i detyrueshëm për shkak Item nuk është numëruar në mënyrë automatike
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Citat {0} nuk e tipit {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Orari Mirëmbajtja Item
 DocType: Sales Order,%  Delivered,% Dorëzuar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Llogaria Overdraft Banka
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Bëni Kuponi pagave
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Heq tapën
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Shfleto bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Kredi të siguruara
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produkte tmerrshëm
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,Vlerësim
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Hedh humbur-shkumë
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Vizatim
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data përsëritet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Dërgo aprovuesi duhet të jetë një nga {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Dërgo aprovuesi duhet të jetë një nga {0}
 DocType: Hub Settings,Seller Email,Shitës Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Gjithsej Kosto Blerje (nëpërmjet Blerje Faturës)
 DocType: Workstation Working Hour,Start Time,Koha e fillimit
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Shuma neto (Kompania Valuta)
 DocType: BOM Operation,Hour Rate,Ore Rate
 DocType: Stock Settings,Item Naming By,Item Emërtimi By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Nga Kuotim
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Një tjetër Periudha Mbyllja Hyrja {0} është bërë pas {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Nga Kuotim
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Një tjetër Periudha Mbyllja Hyrja {0} është bërë pas {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiali Transferuar për Prodhim
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Llogaria {0} nuk ekziston
 DocType: Purchase Receipt Item,Purchase Order Item No,Rendit Blerje artikull Nuk ka
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,Kerkohet Inspektimi
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Faturuar plotësisht
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Para në dorë
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Depo ofrimit të nevojshme për pikën e aksioneve {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Depo ofrimit të nevojshme për pikën e aksioneve {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Pesha bruto e paketës. Zakonisht pesha neto + paketimin pesha materiale. (Për shtyp)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Përdoruesit me këtë rol janë të lejuara për të ngritur llogaritë ngrirë dhe për të krijuar / modifikuar shënimet e kontabilitetit kundrejt llogarive të ngrira
 DocType: Serial No,Is Cancelled,Është anuluar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Dërgesat e mia
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Dërgesat e mia
 DocType: Journal Entry,Bill Date,Bill Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Edhe në qoftë se ka rregulla të shumta çmimeve me prioritet më të lartë, prioritetet e brendshme atëherë në vijim aplikohen:"
 DocType: Supplier,Supplier Details,Detajet Furnizuesi
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Ju lutem, përzgjidhni llogarinë bankare"
 DocType: Newsletter,Create and Send Newsletters,Krijoni dhe dërgoni Buletinet
-sites/assets/js/report.min.js +107,From Date must be before To Date,Nga Data duhet të jetë përpara se deri më sot
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Nga Data duhet të jetë përpara se deri më sot
 DocType: Sales Order,Recurring Order,Rendit përsëritur
 DocType: Company,Default Income Account,Llogaria e albumit ardhurat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupi Customer / Customer
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Blerje Rendit {0} nuk është dorëzuar
 ,Projected,Projektuar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Asnjë {0} nuk i përkasin Magazina {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
 DocType: Notification Control,Quotation Message,Citat Mesazh
 DocType: Issue,Opening Date,Hapja Data
 DocType: Journal Entry,Remark,Vërejtje
 DocType: Purchase Receipt Item,Rate and Amount,Shkalla dhe Shuma
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,I mërzitshëm
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Nga Sales Rendit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Nga Sales Rendit
 DocType: Blog Category,Parent Website Route,Prind Faqja Route
 DocType: Sales Order,Not Billed,Jo faturuar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Të dyja Magazina duhet t'i përkasë njëjtës kompani
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Nuk ka kontakte të shtuar ende.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nuk ka kontakte të shtuar ende.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Jo aktiv
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Kundër Faturë datën e postimit
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Kosto zbarkoi Voucher Shuma
 DocType: Time Log,Batched for Billing,Batched për faturim
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Faturat e ngritura nga furnizuesit.
 DocType: POS Profile,Write Off Account,Shkruani Off Llogari
-sites/assets/js/erpnext.min.js +26,Discount Amount,Shuma Discount
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Shuma Discount
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kthehu kundër Blerje Faturë
 DocType: Item,Warranty Period (in days),Garanci Periudha (në ditë)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,p.sh. TVSH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pika 4
 DocType: Journal Entry Account,Journal Entry Account,Llogaria Journal Hyrja
 DocType: Shopping Cart Settings,Quotation Series,Citat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Një artikull ekziston me të njëjtin emër ({0}), ju lutemi të ndryshojë emrin e grupit pika ose riemërtoj pika"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Një artikull ekziston me të njëjtin emër ({0}), ju lutemi të ndryshojë emrin e grupit pika ose riemërtoj pika"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Metalike të nxehtë gazit formimin
 DocType: Sales Order Item,Sales Order Date,Sales Order Data
 DocType: Sales Invoice Item,Delivered Qty,Dorëzuar Qty
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Customer ose Furnizuesi Detajet
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Lead Owner
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Magazina është e nevojshme
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Magazina është e nevojshme
 DocType: Employee,Marital Status,Statusi martesor
 DocType: Stock Settings,Auto Material Request,Auto materiale Kërkesë
 DocType: Time Log,Will be updated when billed.,Do të përditësohet kur faturuar.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Në dispozicion Qty Batch në nga depo
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM aktuale dhe të reja bom nuk mund të jetë e njëjtë
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Data e daljes në pension duhet të jetë më i madh se data e bashkimit
 DocType: Sales Invoice,Against Income Account,Kundër llogarisë së të ardhurave
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,Update Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ndryshme për sendet do të çojë në të gabuar (Total) vlerën neto Pesha. Sigurohuni që pesha neto e çdo send është në të njëjtën UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Ju lutemi të tërheqë sendet nga i dorëzimit Shënim
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Ju lutemi të tërheqë sendet nga i dorëzimit Shënim
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journal Entries {0} janë të pa-lidhura
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Rekord të të gjitha komunikimeve të tipit mail, telefon, chat, vizita, etj"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Ju lutemi të përmendim Round Off Qendra kushtojë në Kompaninë
 DocType: Purchase Invoice,Terms,Kushtet
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Krijo ri
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Krijo ri
 DocType: Buying Settings,Purchase Order Required,Blerje urdhër që nevojitet
 ,Item-wise Sales History,Pika-mençur Historia Sales
 DocType: Expense Claim,Total Sanctioned Amount,Shuma totale e sanksionuar
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Paga Shqip Zbritje
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Shënime
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Zgjidh një nyje grupi i parë.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Qëllimi duhet të jetë një nga {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Plotësoni formularin dhe për të shpëtuar atë
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Plotësoni formularin dhe për të shpëtuar atë
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Shkarko një raport që përmban të gjitha lëndëve të para me statusin e tyre të fundit inventar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Duke u përballur me
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forumi Komuniteti
 DocType: Leave Application,Leave Balance Before Application,Dërgo Bilanci para aplikimit
 DocType: SMS Center,Send SMS,Dërgo SMS
 DocType: Company,Default Letter Head,Default Letër Shef
 DocType: Time Log,Billable,Billable
 DocType: Authorization Rule,This will be used for setting rule in HR module,Kjo do të përdoren për vendosjen e sundimit në modulin HR
 DocType: Account,Rate at which this tax is applied,Shkalla në të cilën kjo taksë aplikohet
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Reorder Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reorder Qty
 DocType: Company,Stock Adjustment Account,Llogaria aksioneve Rregullimit
 DocType: Journal Entry,Write Off,Shkruani Off
 DocType: Time Log,Operation ID,Operacioni ID
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Zbritje Fushat do të jenë në dispozicion në Rendit Blerje, pranimin Blerje, Blerje Faturës"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Emri i llogarisë së re. Shënim: Ju lutem mos krijoni llogari për klientët dhe furnizuesit
 DocType: Report,Report Type,Raporti Type
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Ngarkim
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Ngarkim
 DocType: BOM Replace Tool,BOM Replace Tool,Bom Replace Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Shteti parazgjedhur i mençur Adresa Templates
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Për shkak / Referenca Data nuk mund të jetë pas {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Furnizuesi jep Klientit
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Trego taksave break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Për shkak / Referenca Data nuk mund të jetë pas {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importi dhe Eksporti i të dhënave
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Në qoftë se ju të përfshijë në aktivitete prodhuese. Mundëson Item "është prodhuar '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fatura Posting Data
 DocType: Sales Invoice,Rounded Total,Rrumbullakuar Total
 DocType: Product Bundle,List items that form the package.,Artikuj lista që formojnë paketë.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Alokimi përqindje duhet të jetë e barabartë me 100%
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Ju lutem kontaktoni për përdoruesit të cilët kanë Sales Master Menaxher {0} rol
 DocType: Company,Default Cash Account,Gabim Llogaria Cash
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Kompani (jo Customer ose Furnizuesi) mjeshtër.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Ju lutemi shkruani 'datës së pritshme dorëzimit'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Shënime ofrimit {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Ju lutemi shkruani 'datës së pritshme dorëzimit'
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Shënime ofrimit {0} duhet të anulohet para se anulimi këtë Radhit Sales
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Shuma e paguar + anullojë Shuma nuk mund të jetë më i madh se Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nuk është një numër i vlefshëm Batch për Item {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Qty nuk avalable në magazinë {1} në {2} {3}. Në dispozicion Qty: {4}, Transferimi Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pika 3
+DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Event,Sunday,E diel
 DocType: Sales Team,Contribution (%),Kontributi (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Shënim: Pagesa Hyrja nuk do të jetë krijuar që nga 'Cash ose Llogarisë Bankare "nuk ishte specifikuar
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Përgjegjësitë
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Shabllon
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Shabllon
 DocType: Sales Person,Sales Person Name,Sales Person Emri
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ju lutemi shkruani atleast 1 faturën në tryezë
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Shto Përdoruesit
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),Aktuale Data e Fillimit (nëpër
 DocType: Stock Reconciliation Item,Before reconciliation,Para se të pajtimit
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Për {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Taksat dhe Tarifat Shtuar (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
 DocType: Sales Order,Partly Billed,Faturuar Pjesërisht
 DocType: Item,Default BOM,Gabim bom
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Outstanding Amt Total
 DocType: Time Log Batch,Total Hours,Totali Orë
 DocType: Journal Entry,Printing Settings,Printime Cilësimet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Debiti i përgjithshëm duhet të jetë e barabartë me totalin e kredisë. Dallimi është {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Debiti i përgjithshëm duhet të jetë e barabartë me totalin e kredisë. Dallimi është {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilistik
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Lë për llojin {0} ndarë tashmë për punonjësit {1} për Vitin Fiskal {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item është e nevojshme
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Injeksion i derdhur metalike
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Nga dorëzim Shënim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Nga dorëzim Shënim
 DocType: Time Log,From Time,Nga koha
 DocType: Notification Control,Custom Message,Custom Mesazh
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investimeve Bankare
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,Një Lead me këtë i
 DocType: Stock Entry,From BOM,Nga bom
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Themelor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksionet e aksioneve para {0} janë të ngrira
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',Ju lutem klikoni në "Generate Listën '
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Deri më sot duhet të jetë i njëjtë si Nga Data për pushim gjysmë dite
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Ju lutem klikoni në "Generate Listën '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Deri më sot duhet të jetë i njëjtë si Nga Data për pushim gjysmë dite
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","p.sh. Kg, Njësia, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenca Nuk është e detyrueshme, nëse keni hyrë Reference Data"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenca Nuk është e detyrueshme, nëse keni hyrë Reference Data"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data e bashkuar duhet të jetë më i madh se Data e lindjes
 DocType: Salary Structure,Salary Structure,Struktura e pagave
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Rregulla Çmimi ekziston me kritere të njëjta, ju lutemi të zgjidhur \ konfliktin me jepte prioritet. Rregullat Çmimi: {0}"
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Linjë ajrore
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Materiali çështje
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Materiali çështje
 DocType: Material Request Item,For Warehouse,Për Magazina
 DocType: Employee,Offer Date,Oferta Data
 DocType: Hub Settings,Access Token,Qasja Token
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,Koha e hapjes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Nga dhe në datat e kërkuara
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Letrave me Vlerë dhe Shkëmbimeve të Mallrave
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
+DocType: Delivery Note Item,From Warehouse,Nga Magazina
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Shpim
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Goditje derdhur
 DocType: Purchase Taxes and Charges,Valuation and Total,Vlerësimi dhe Total
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,Ndryshuar Nga
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Ndiqni nëpërmjet Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Shuma e taksave Pas Shuma ulje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Llogari fëmijë ekziston për këtë llogari. Ju nuk mund të fshini këtë llogari.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Llogari fëmijë ekziston për këtë llogari. Ju nuk mund të fshini këtë llogari.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ose Qty objektiv ose shuma e synuar është e detyrueshme
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Nuk ekziston parazgjedhur bom për Item {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
-DocType: Leave Allocation,Carry Forward,Bart
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Nuk ekziston parazgjedhur bom për Item {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Hapja Data duhet të jetë para datës së mbylljes
+DocType: Leave Control Panel,Carry Forward,Bart
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Qendra Kosto me transaksionet ekzistuese nuk mund të konvertohet në Ledger
 DocType: Department,Days for which Holidays are blocked for this department.,Ditë për të cilat Festat janë bllokuar për këtë departament.
 ,Produced,Prodhuar
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gjithsej (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Data në të cilën mënyrë periodike do të ndalet
 DocType: Quality Inspection,Item Serial No,Item Nr Serial
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} duhet të reduktohet me {1} ose ju duhet të rritet toleranca del nga shtrati
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} duhet të reduktohet me {1} ose ju duhet të rritet toleranca del nga shtrati
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,I pranishëm Total
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Orë
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Item serialized {0} nuk mund të rifreskohet \ përdorur Stock Pajtimin
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Transferimi materiale të Furnizuesit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferimi materiale të Furnizuesit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Jo i ri Serial nuk mund të ketë depo. Magazina duhet të përcaktohen nga Bursa e hyrjes ose marrjes Blerje
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Krijo Kuotim
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Të gjitha këto objekte janë tashmë faturohen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Të gjitha këto objekte janë tashmë faturohen
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mund të miratohet nga {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping Rregulla Kushte
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ri pas zëvendësimit
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,C-Forma
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacioni ID nuk është caktuar
 DocType: Production Order,Planned Start Date,Planifikuar Data e Fillimit
 DocType: Serial No,Creation Document Type,Krijimi Dokumenti Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Vizitë
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Vizitë
 DocType: Leave Type,Is Encash,Është marr me para në dorë
 DocType: Purchase Invoice,Mobile No,Mobile Asnjë
 DocType: Payment Tool,Make Journal Entry,Bëni Journal Hyrja
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,Gjethet e reja të alokuar
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Të dhënat Project-i mençur nuk është në dispozicion për Kuotim
 DocType: Project,Expected End Date,Pritet Data e Përfundimit
 DocType: Appraisal Template,Appraisal Template Title,Vlerësimi Template Titulli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Komercial
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Komercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Prind Item {0} nuk duhet të jetë një Stock Item
 DocType: Cost Center,Distribution Id,Shpërndarja Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Sherbime tmerrshëm
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vlera për atribut {0} duhet të jetë brenda intervalit {1} të {2} në increments e {3}
 DocType: Tax Rule,Sales,Shitjet
 DocType: Stock Entry Detail,Basic Amount,Shuma bazë
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
+DocType: Leave Allocation,Unused leaves,Gjethet e papërdorura
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default llogarive të arkëtueshme
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Rrethore
 DocType: Tax Rule,Billing State,Shteti Faturimi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,Transferim
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
 DocType: Authorization Rule,Applicable To (Employee),Për të zbatueshme (punonjës)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Për shkak Data është e detyrueshme
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,Me pakicë
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Customer {0} nuk ekziston
 DocType: Attendance,Absent,Që mungon
 DocType: Product Bundle,Product Bundle,Bundle produkt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: referencë Invalid {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Shkatërrimtar
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Blerje taksat dhe tatimet Template
 DocType: Upload Attendance,Download Template,Shkarko Template
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,Vërejtje
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 DocType: Journal Entry,Write Off Based On,Shkruani Off bazuar në
 DocType: Features Setup,POS View,POS Shiko
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Rekord Instalimi për një Nr Serial
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Rekord Instalimi për një Nr Serial
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Derdhjen e vazhdueshme
-sites/assets/js/erpnext.min.js +10,Please specify a,Ju lutem specifikoni një
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ju lutem specifikoni një
 DocType: Offer Letter,Awaiting Response,Në pritje të përgjigjes
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Sipër
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Sizing Ftohtë
 DocType: Salary Slip,Earning & Deduction,Fituar dhe Zbritje
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Llogaria {0} nuk mund të jetë një grup
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Rajon
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Fakultative. Ky rregullim do të përdoret për të filtruar në transaksionet e ndryshme.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Fakultative. Ky rregullim do të përdoret për të filtruar në transaksionet e ndryshme.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativ Rate Vlerësimi nuk është e lejuar
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Për shembull 2012, 2012-13"
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,I fryrë
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Hedhjes avullues-model
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Shpenzimet Argëtim
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Shitjet Faturë {0} duhet të anulohet para anulimit këtë Radhit Sales
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Moshë
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Shitjet Faturë {0} duhet të anulohet para anulimit këtë Radhit Sales
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Moshë
 DocType: Time Log,Billing Amount,Shuma Faturimi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Sasia e pavlefshme specifikuar për pika {0}. Sasia duhet të jetë më i madh se 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Aplikimet për leje.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Llogaria me transaksion ekzistues nuk mund të fshihet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Llogaria me transaksion ekzistues nuk mund të fshihet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Shpenzimet ligjore
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Ditë të muajit në të cilin rendi auto do të gjenerohet p.sh. 05, 28 etj"
 DocType: Sales Invoice,Posting Time,Posting Koha
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kontrolloni këtë në qoftë se ju doni për të detyruar përdoruesit për të zgjedhur një seri përpara se të kryeni. Nuk do të ketë parazgjedhur në qoftë se ju kontrolloni këtë.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Nuk ka artikull me Serial Nr {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Njoftimet Hapur
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Njoftimet Hapur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Shpenzimet direkte
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,A jeni të vërtetë duan të heq tapën këtë Kërkesë materiale?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Të ardhurat New Customer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Shpenzimet e udhëtimit
 DocType: Maintenance Visit,Breakdown,Avari
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Si në Data
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Gabim Magazina është e detyrueshme për aksioneve Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Gabim Magazina është e detyrueshme për aksioneve Item.
 DocType: Feed,Full Name,Emri i plotë
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pagesa e pagës për muajin {0} dhe vitin {1}
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Shto rreshtave
 DocType: Buying Settings,Default Supplier Type,Gabim Furnizuesi Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Gurore
 DocType: Production Order,Total Operating Cost,Gjithsej Kosto Operative
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Shënim: Item {0} hyrë herë të shumta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Shënim: Item {0} hyrë herë të shumta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Të gjitha kontaktet.
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Shkurtesa kompani
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Kuotat
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roli i lejuar për të redaktuar aksioneve të ngrirë
 ,Territory Target Variance Item Group-Wise,Territori i synuar Varianca Item Grupi i urti
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Të gjitha grupet e konsumatorëve
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template tatimi është i detyrueshëm.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Llogaria {0}: llogari Parent {1} nuk ekziston
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista e Çmimeve Rate (Kompania Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} statusi është 'ndal'
 DocType: Account,Temporary,I përkohshëm
 DocType: Address,Preferred Billing Address,Preferuar Faturimi Adresa
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alokimi Përqindja
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Tatimore urti Deta
 DocType: Purchase Order Item,Supplier Quotation,Furnizuesi Citat
 DocType: Quotation,In Words will be visible once you save the Quotation.,Me fjalë do të jetë i dukshëm një herë ju ruani Kuotim.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Hekurosje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} është ndalur
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} është ndalur
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
 DocType: Lead,Add to calendar on this date,Shtoni në kalendarin në këtë datë
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Rregullat për të shtuar shpenzimet e transportit detar.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Ngjarje të ardhshme
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ngjarje të ardhshme
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Konsumatorit është e nevojshme
 DocType: Letter Head,Letter Head,Letër Shef
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hyrja shpejtë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} është e detyrueshme për Kthim
 DocType: Purchase Order,To Receive,Për të marrë
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink përshtatshëm
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast një depo është e detyrueshme
 DocType: Serial No,Out of Warranty,Nga Garanci
 DocType: BOM Replace Tool,Replace,Zëvendësoj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Ju lutem shkruani Njësia e parazgjedhur e Masës
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ju lutem shkruani Njësia e parazgjedhur e Masës
 DocType: Purchase Invoice Item,Project Name,Emri i Projektit
 DocType: Supplier,Mention if non-standard receivable account,Përmend në qoftë se jo-standarde llogari të arkëtueshme
 DocType: Workflow State,Edit,Redaktoj
 DocType: Journal Entry Account,If Income or Expense,Nëse të ardhura ose shpenzime
 DocType: Features Setup,Item Batch Nos,Item Serisë Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Vlera e aksioneve Diferenca
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Burimeve Njerëzore
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Burimeve Njerëzore
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pajtimi Pagesa Pagesa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Pasuritë tatimore
 DocType: BOM Item,BOM No,Bom Asnjë
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Hyrja {0} nuk ka llogari {1} ose tashmë krahasohen me kupon tjetër
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Hyrja {0} nuk ka llogari {1} ose tashmë krahasohen me kupon tjetër
 DocType: Item,Moving Average,Moving Mesatare
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM i cili do të zëvendësohet
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM duhet të jenë të ndryshme nga e aksioneve UOM tanishme
 DocType: Account,Debit,Debi
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,Lë duhet të ndahen në shumëfisha e 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Lë duhet të ndahen në shumëfisha e 0.5
 DocType: Production Order,Operation Cost,Operacioni Kosto
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Ngarko pjesëmarrjen nga një skedar CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt Outstanding
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Caqet e
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Që të caktojë këtë çështje, përdorni "caktojë" button në sidebar."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Stoqet Freeze vjetër se [Ditët]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Nëse dy ose më shumë Rregullat e Çmimeve janë gjetur në bazë të kushteve të mësipërme, Prioritet është aplikuar. Prioritet është një numër mes 0 deri ne 20, ndërsa vlera e parazgjedhur është zero (bosh). Numri më i lartë do të thotë se do të marrë përparësi nëse ka rregulla të shumta çmimeve me kushte të njëjta."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Kundër Faturës
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Viti Fiskal: {0} nuk ekziston
 DocType: Currency Exchange,To Currency,Për të Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lejo përdoruesit e mëposhtme të miratojë Dërgo Aplikacione për ditë bllok.
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Shkal
 DocType: Stock Entry Detail,Additional Cost,Kosto shtesë
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Viti Financiar End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nuk mund të filtruar në bazë të Voucher Jo, qoftë të grupuara nga Bonon"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
 DocType: Quality Inspection,Incoming,Hyrje
 DocType: BOM,Materials Required (Exploded),Materialet e nevojshme (Shpërtheu)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ulja e Fituar për pushim pa pagesë (LWP)
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: serial {1} ​​nuk përputhet me {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Lini Rastesishme
 DocType: Batch,Batch ID,ID Batch
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Shënim: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Shënim: {0}
 ,Delivery Note Trends,Trendet ofrimit Shënim
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Përmbledhja e kësaj jave
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} duhet të jetë një element i blerë ose nën-kontraktuar në rresht {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} duhet të jetë një element i blerë ose nën-kontraktuar në rresht {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Llogaria: {0} mund të përditësuar vetëm përmes aksionare transaksionet
 DocType: GL Entry,Party,Parti
 DocType: Sales Order,Delivery Date,Ofrimit Data
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,P
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Blerja Rate
 DocType: Task,Actual Time (in Hours),Koha aktuale (në orë)
 DocType: Employee,History In Company,Historia Në kompanisë
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Buletinet
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Buletinet
 DocType: Address,Shipping,Transporti
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Hyrja
 DocType: Department,Leave Block List,Lini Blloko Lista
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Data e fundit e periudhës së urdhrit aktual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Të bëjë ofertën Letër
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Kthimi
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Default njësinë e matjes për Varianti duhet të jetë i njëjtë si Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Default njësinë e matjes për Varianti duhet të jetë i njëjtë si Template
 DocType: DocField,Fold,Dele
 DocType: Production Order Operation,Production Order Operation,Prodhimit Rendit Operacioni
 DocType: Pricing Rule,Disable,Disable
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Raportet për
 DocType: SMS Settings,Enter url parameter for receiver nos,Shkruani parametër url për pranuesit nos
 DocType: Sales Invoice,Paid Amount,Paid Shuma
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Llogarisë {0} mbylljes duhet të jenë të tipit "Përgjegjësia"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Llogarisë {0} mbylljes duhet të jenë të tipit "Përgjegjësia"
 ,Available Stock for Packing Items,Stock dispozicion për Items Paketimi
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Vendosja këtë adresë Template si default pasi nuk ka asnjë mungesë tjetër
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Menaxhimit të Cilësisë
 DocType: Production Planning Tool,Filter based on customer,Filter bazuar në klient
 DocType: Payment Tool Detail,Against Voucher No,Kundër Voucher Nr
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Ju lutemi shkruani sasine e artikullit {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Ju lutemi shkruani sasine e artikullit {0}
 DocType: Employee External Work History,Employee External Work History,Punonjës historia e jashtme
 DocType: Tax Rule,Purchase,Blerje
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilanci Qty
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials","Grupi agregat i Artikujve ** ** në një tjetër
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Asnjë Serial është i detyrueshëm për Item {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ju lutemi specifikoni nga / në varg
-sites/assets/js/desk.min.js +7652,Created By,Krijuar nga
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Krijuar nga
 DocType: Serial No,Under AMC,Sipas AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Shkalla e vlerësimit Item rillogaritet duke marrë parasysh ul sasinë kuponave kosto
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Default settings për shitjen e transaksioneve.
 DocType: BOM Replace Tool,Current BOM,Bom aktuale
-sites/assets/js/erpnext.min.js +8,Add Serial No,Shto Jo Serial
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Shto Jo Serial
 DocType: Production Order,Warehouses,Depot
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print dhe stacionare
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nyja grup
 DocType: Payment Reconciliation,Minimum Amount,Shuma minimale
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update Mbaroi Mallrat
 DocType: Workstation,per hour,në orë
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Seria {0} përdorur tashmë në {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Seria {0} përdorur tashmë në {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Llogaria për depo (Inventari pandërprerë) do të krijohet në bazë të kësaj llogarie.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depo nuk mund të fshihet si ekziston hyrja aksioneve librit për këtë depo.
 DocType: Company,Distribution,Shpërndarje
-sites/assets/js/erpnext.min.js +50,Amount Paid,Shuma e paguar
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Shuma e paguar
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Menaxher i Projektit
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dërgim
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max zbritje lejohet për artikull: {0} është {1}%
 DocType: Customer,Default Taxes and Charges,Taksat dhe tarifat Default
 DocType: Account,Receivable,Arkëtueshme
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nuk lejohet të ndryshojë Furnizuesit si Urdhër Blerje tashmë ekziston
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roli që i lejohet të paraqesë transaksionet që tejkalojnë limitet e kreditit përcaktuara.
 DocType: Sales Invoice,Supplier Reference,Furnizuesi Referenca
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Nëse kontrolluar, bom për artikujt nën-kuvendit do të konsiderohen për marrjen e lëndëve të para. Përndryshe, të gjitha sendet nën-kuvendit do të trajtohen si lëndë e parë."
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,Add / Remove Recipients
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaksioni nuk lejohet kundër Prodhimit ndalur Rendit {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Për të vendosur këtë vit fiskal si default, klikoni mbi 'Bëje si Default'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup server hyrje për mbështetjen e email id. (P.sh. support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Mungesa Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mungesa Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
 DocType: Salary Slip,Salary Slip,Shqip paga
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"Deri më sot" është e nevojshme
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kur ndonjë nga transaksionet e kontrolluara janë "Dërguar", një email pop-up u hap automatikisht për të dërguar një email tek të lidhur "Kontakt" në këtë transaksion, me transaksionin si një shtojcë. Ky përdorues mund ose nuk mund të dërgoni email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Cilësimet globale
 DocType: Employee Education,Employee Education,Arsimimi punonjës
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Llogari
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Asnjë {0} tashmë është marrë
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,Prodhim i përdoruesit
 DocType: Purchase Order,Raw Materials Supplied,Lëndëve të para furnizuar
 DocType: Purchase Invoice,Recurring Print Format,Format përsëritur Print
 DocType: Communication,Series,Seri
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Pritet Data e dorëzimit nuk mund të jetë para se të Rendit Blerje Data
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Pritet Data e dorëzimit nuk mund të jetë para se të Rendit Blerje Data
 DocType: Appraisal,Appraisal Template,Vlerësimi Template
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Klasifikimi i artikullit
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,Listën e pagave Cilësimet
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Përputhje për Faturat jo-lidhura dhe pagesat.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Vendi Renditja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Rrënjë nuk mund të ketë një qendër me kosto prind
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Zgjidh Markë ...
 DocType: Sales Invoice,C-Form Applicable,C-Formulari i zbatueshëm
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operacioni Koha duhet të jetë më e madhe se 0 për Operacionin {0}
 DocType: Supplier,Address and Contacts,Adresa dhe Kontakte
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Get Vauçera papaguara
 DocType: Warranty Claim,Resolved By,Zgjidhen nga
 DocType: Appraisal,Start Date,Data e Fillimit
-sites/assets/js/desk.min.js +7629,Value,Vlerë
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Vlerë
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alokimi i lë për një periudhë.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliko këtu për të verifikuar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Llogaria {0}: Ju nuk mund të caktojë veten si llogari prind
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Qasja e lejuar
 DocType: Dropbox Backup,Weekly,Javor
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,P.sh.. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Merre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Merre
 DocType: Maintenance Visit,Fully Completed,Përfunduar Plotësisht
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Kualifikimi arsimor
 DocType: Workstation,Operating Costs,Shpenzimet Operative
 DocType: Employee Leave Approver,Employee Leave Approver,Punonjës Pushimi aprovuesi
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} është shtuar me sukses në listën tonë Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Machining rreze elektron
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Blerje Master Menaxher
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Add / Edit Çmimet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafiku i Qendrave te Kostos
 ,Requested Items To Be Ordered,Items kërkuar të Urdhërohet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Urdhërat e mia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Urdhërat e mia
 DocType: Price List,Price List Name,Lista e Çmimeve Emri
 DocType: Time Log,For Manufacturing,Për Prodhim
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totalet
@@ -3471,7 +3489,7 @@ DocType: Account,Income,Të ardhura
 DocType: Industry Type,Industry Type,Industria Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Diçka shkoi keq!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Warning: Lini aplikimi përmban datat e mëposhtme bllok
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data e përfundimit
 DocType: Purchase Invoice Item,Amount (Company Currency),Shuma (Kompania Valuta)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Hedh vdesin
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Vit
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profilin
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Ju lutem Update SMS Settings
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Koha Identifikohu {0} tashmë faturuar
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Koha Identifikohu {0} tashmë faturuar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Kredi pasiguruar
 DocType: Cost Center,Cost Center Name,Kosto Emri Qendra
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Item {0} me Serial nr {1} tashmë është instaluar
 DocType: Maintenance Schedule Detail,Scheduled Date,Data e planifikuar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Totale e paguar Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesazhet më të mëdha se 160 karaktere do të ndahet në mesazhe të shumta
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Marrë dhe pranuar
 ,Serial No Service Contract Expiry,Serial Asnjë Shërbimit Kontratë Expiry
 DocType: Item,Unit of Measure Conversion,Njësia e masës këmbimit
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Punonjësi nuk mund të ndryshohet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Ju nuk mund të kreditit dhe debitit njëjtën llogari në të njëjtën kohë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ju nuk mund të kreditit dhe debitit njëjtën llogari në të njëjtën kohë
 DocType: Naming Series,Help HTML,Ndihmë HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage Gjithsej caktuar duhet të jetë 100%. Kjo është {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Kompensimi për tejkalimin {0} kaloi për Item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Kompensimi për tejkalimin {0} kaloi për Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Emri i personit ose organizatës që kjo adresë takon.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Furnizuesit tuaj
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nuk mund të vendosur si Humbur si Sales Order është bërë.
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,Konvertuar
 DocType: Item,Has Serial No,Nuk ka Serial
 DocType: Employee,Date of Issue,Data e lëshimit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Nga {0} për {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
 DocType: Issue,Content Type,Përmbajtja Type
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Kompjuter
 DocType: Item,List this Item in multiple groups on the website.,Lista këtë artikull në grupe të shumta në faqen e internetit.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Ju lutem kontrolloni opsionin Multi Valuta për të lejuar llogaritë me valutë tjetër
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Ju lutem kontrolloni opsionin Multi Valuta për të lejuar llogaritë me valutë tjetër
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} nuk ekziston në sistemin
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Ju nuk jeni i autorizuar për të vendosur vlerën e ngrira
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Entries
@@ -3524,14 +3542,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Për Magazina
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Llogaria {0} ka hyrë më shumë se një herë për vitin fiskal {1}
 ,Average Commission Rate,Mesatare Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Nuk ka Serial' nuk mund të jetë 'Po' për jo-aksioneve artikull
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Nuk ka Serial' nuk mund të jetë 'Po' për jo-aksioneve artikull
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Pjesëmarrja nuk mund të shënohet për datat e ardhshme
 DocType: Pricing Rule,Pricing Rule Help,Rregulla e Çmimeve Ndihmë
 DocType: Purchase Taxes and Charges,Account Head,Shef llogari
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Update shpenzimet shtesë për të llogaritur koston ul të artikujve
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 DocType: Stock Entry,Total Value Difference (Out - In),Gjithsej Diferenca Vlera (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate është i detyrueshëm
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Përdoruesi ID nuk është caktuar për punonjësit {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Nga Garanci Kërkesës
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,Emërtimi Series
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
 DocType: User,Enabled,Aktivizuar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Pasuritë e aksioneve
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},A jeni të vërtetë duan të Paraqit të gjitha Kuponi pagave për muajin {0} dhe vitin {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},A jeni të vërtetë duan të Paraqit të gjitha Kuponi pagave për muajin {0} dhe vitin {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Subscribers importit
 DocType: Target Detail,Target Qty,Target Qty
 DocType: Attendance,Present,I pranishëm
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Ofrimit Shënim {0} nuk duhet të dorëzohet
 DocType: Notification Control,Sales Invoice Message,Mesazh Shitjet Faturë
 DocType: Authorization Rule,Based On,Bazuar në
-,Ordered Qty,Urdhërohet Qty
+DocType: Sales Order Item,Ordered Qty,Urdhërohet Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Item {0} është me aftësi të kufizuara
 DocType: Stock Settings,Stock Frozen Upto,Stock ngrira Upto
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periudha nga dhe periudha në datat e detyrueshme për të përsëritura {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Aktiviteti i projekt / detyra.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generate paga rrëshqet
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nuk është një ID e vlefshme email
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Ngarko Pjesëmarrja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dhe Prodhim Sasi janë të nevojshme
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gama plakjen 2
-DocType: Journal Entry Account,Amount,Sasi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Sasi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom zëvendësohet
 ,Sales Analytics,Sales Analytics
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data e pritshme nuk mund të jetë e para materiale Kërkesë Data
 DocType: Contact Us Settings,City,Qytet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Përpunimit tejzanor
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Gabim: Nuk është një ID të vlefshme?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Gabim: Nuk është një ID të vlefshme?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} duhet të jetë një Sales Item
 DocType: Naming Series,Update Series Number,Update Seria Numri
 DocType: Account,Equity,Barazia
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,Aktual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
 DocType: Purchase Invoice,Against Expense Account,Kundër Llogaria shpenzimeve
 DocType: Production Order,Production Order,Rendit prodhimit
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Instalimi Shënim {0} tashmë është dorëzuar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalimi Shënim {0} tashmë është dorëzuar
 DocType: Quotation Item,Against Docname,Kundër Docname
 DocType: SMS Center,All Employee (Active),Të gjitha Punonjës (Aktive)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Shiko Tani
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Raw Material Kosto
 DocType: Item,Re-Order Level,Re-Rendit nivel
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Shkruani artikuj dhe Qty planifikuar për të cilën ju doni të rritur urdhërat e prodhimit ose shkarkoni materiale të papërpunuara për analizë.
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt Chart
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Me kohë të pjesshme
 DocType: Employee,Applicable Holiday List,Zbatueshme Lista Holiday
 DocType: Employee,Cheque,Çek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seria Përditësuar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Raporti Lloji është i detyrueshëm
 DocType: Item,Serial Number Series,Serial Number Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Depoja është e detyrueshme për aksioneve Item {0} në rresht {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Depoja është e detyrueshme për aksioneve Item {0} në rresht {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Shitje me pakicë dhe shumicë
 DocType: Issue,First Responded On,Së pari u përgjigj më
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kryqi Listimi i artikullit në grupe të shumta
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,Pjesëmarrje
 DocType: Page,No,Jo
 DocType: BOM,Materials,Materiale
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Nëse nuk kontrollohet, lista do të duhet të shtohet për çdo Departamentit ku ajo duhet të zbatohet."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Postimi datën dhe postimi kohë është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Postimi datën dhe postimi kohë është i detyrueshëm
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Template taksave për blerjen e transaksioneve.
 ,Item Prices,Çmimet pika
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Me fjalë do të jetë i dukshëm një herë ju ruani qëllim blerjen.
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Shpenzimet administrative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Këshillues
 DocType: Customer Group,Parent Customer Group,Grupi prind Klientit
-sites/assets/js/erpnext.min.js +50,Change,Ndryshim
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ndryshim
 DocType: Purchase Invoice,Contact Email,Kontakti Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Blerje Rendit {0} është 'ndal'
 DocType: Appraisal Goal,Score Earned,Vota fituara
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",p.sh. "My Company LLC"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Periudha Njoftim
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,Bruto Pesha UOM
 DocType: Email Digest,Receivables / Payables,Arketueshme / Te Pagueshme
 DocType: Delivery Note Item,Against Sales Invoice,Kundër Sales Faturës
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Vulosje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Llogaria e Kredisë
 DocType: Landed Cost Item,Landed Cost Item,Kosto zbarkoi Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Trego zero vlerat
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Sasia e sendit të marra pas prodhimit / ripaketimin nga sasi të caktuara të lëndëve të para
 DocType: Payment Reconciliation,Receivable / Payable Account,Arkëtueshme / pagueshme Llogaria
 DocType: Delivery Note Item,Against Sales Order Item,Kundër Sales Rendit Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
 DocType: Item,Default Warehouse,Gabim Magazina
 DocType: Task,Actual End Date (via Time Logs),Aktuale End Date (nëpërmjet Koha Shkrime)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Buxheti nuk mund të caktohet kundër Llogaria Grupit {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,Mbështetje Ekipi
 DocType: Appraisal,Total Score (Out of 5),Rezultati i përgjithshëm (nga 5)
 DocType: Contact Us Settings,State,Shtet
 DocType: Batch,Batch,Grumbull
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Ekuilibër
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Ekuilibër
 DocType: Project,Total Expense Claim (via Expense Claims),Gjithsej Kërkesa shpenzimeve (nëpërmjet kërkesave shpenzime)
 DocType: User,Gender,Gjini
 DocType: Journal Entry,Debit Note,Debiti Shënim
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,Blog Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Krijo rregulla për të kufizuar transaksionet në bazë të vlerave.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Nëse kontrolluar, Gjithsej nr. i ditëve të punës do të përfshijë pushimet, dhe kjo do të zvogëlojë vlerën e pagave Per Day"
 DocType: Purchase Invoice,Total Advance,Advance Total
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Pengimin materiale Kërkesë
 DocType: Workflow State,User,Përdorues
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Përpunimi Pagave
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Përpunimi Pagave
 DocType: Opportunity Item,Basic Rate,Norma bazë
 DocType: GL Entry,Credit Amount,Shuma e kreditit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Bëje si Lost
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,Ditët e kredisë së bazuar në
 DocType: Tax Rule,Tax Rule,Rregulla Tatimore
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Ruajtja njëjtin ritëm Gjatë gjithë Sales Cikli
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifikoni kohë shkrimet jashtë orarit Workstation punës.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} tashmë është dorëzuar
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} tashmë është dorëzuar
 ,Items To Be Requested,Items të kërkohet
 DocType: Purchase Order,Get Last Purchase Rate,Get fundit Blerje Vlerësoni
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Vlerësoni Faturimi bazuar në aktivitet të llojit (në orë)
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Kompania Email ID nuk u gjet, prandaj nuk mail dërguar"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikimi i mjeteve (aktiveve)
 DocType: Production Planning Tool,Filter based on item,Filter bazuar në pikën
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Llogaria Debiti
 DocType: Fiscal Year,Year Start Date,Viti Data e Fillimit
 DocType: Attendance,Employee Name,Emri punonjës
 DocType: Sales Invoice,Rounded Total (Company Currency),Harmonishëm Total (Kompania Valuta)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Boshatisjes
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Përfitimet e Punonjësve
 DocType: Sales Invoice,Is POS,Është POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
 DocType: Production Order,Manufactured Qty,Prodhuar Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Sasi të pranuar
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nuk ekziston
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Faturat e ngritura për të Konsumatorëve.
 DocType: DocField,Default,Mospagim
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonentë shtuar
 DocType: Maintenance Schedule,Schedule,Orar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Define Buxheti për këtë qendër kosto. Për të vendosur veprimin e buxhetit, shih "Lista e Kompanive""
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,Llogaria prind
 DocType: Quality Inspection Reading,Reading 3,Leximi 3
 ,Hub,Qendër
 DocType: GL Entry,Voucher Type,Voucher Type
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
 DocType: Expense Claim,Approved,I miratuar
 DocType: Pricing Rule,Price,Çmim
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si 'majtë'
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Arsim
 DocType: Selling Settings,Campaign Naming By,Emërtimi Fushata By
 DocType: Employee,Current Address Is,Adresa e tanishme është
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Fakultative. Vë monedhë default kompanisë, nëse nuk është specifikuar."
 DocType: Address,Office,Zyrë
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Raportet Standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Rregjistrimet në ditar të kontabilitetit.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partia / Llogaria nuk përputhet me {1} / {2} në {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Qty në dispozicion në nga depo
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partia / Llogaria nuk përputhet me {1} / {2} në {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Për të krijuar një Llogari Tatimore
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
 DocType: Account,Stock,Stock
 DocType: Employee,Current Address,Adresa e tanishme
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Nëse pika është një variant i një tjetër çështje pastaj përshkrimin, imazhi, çmimi, taksat, etj do të vendoset nga template përveç nëse specifikohet shprehimisht"
 DocType: Serial No,Purchase / Manufacture Details,Blerje / Detajet Prodhimi
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Inventar Batch
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inventar Batch
 DocType: Employee,Contract End Date,Kontrata Data e përfundimit
 DocType: Sales Order,Track this Sales Order against any Project,Përcjell këtë Urdhër Sales kundër çdo Projektit
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Shitjes tërheq urdhëron (në pritje për të ofruar), bazuar në kriteret e mësipërme"
 DocType: DocShare,Document Type,Dokumenti Type
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Nga furnizuesi Kuotim
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Nga furnizuesi Kuotim
 DocType: Deduction Type,Deduction Type,Zbritja Type
 DocType: Attendance,Half Day,Gjysma Dita
 DocType: Pricing Rule,Min Qty,Min Qty
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Për sasinë (Prodhuar Qty) është i detyrueshëm
 DocType: Stock Entry,Default Target Warehouse,Gabim Magazina Target
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Kompania Valuta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partia Lloji dhe Partia është i zbatueshëm vetëm kundër arkëtueshme / pagueshme llogari
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partia Lloji dhe Partia është i zbatueshëm vetëm kundër arkëtueshme / pagueshme llogari
 DocType: Notification Control,Purchase Receipt Message,Blerje Pranimi Mesazh
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Gjithsej gjethet e ndara janë më shumë se periudha
 DocType: Production Order,Actual Start Date,Aktuale Data e Fillimit
 DocType: Sales Order,% of materials delivered against this Sales Order,% E materialeve dorëzuar kundër këtij Rendit Shitje
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Lëvizja rekord pika.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Lëvizja rekord pika.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Lista Subscriber
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Shërbim
 DocType: Hub Settings,Hub Settings,Hub Cilësimet
 DocType: Project,Gross Margin %,Marzhi bruto%
 DocType: BOM,With Operations,Me Operacioneve
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Regjistrimet kontabël tashmë janë bërë në monedhën {0} për kompaninë {1}. Ju lutem, përzgjidhni një llogari arkëtueshëm ose të pagueshëm me monedhën {0}."
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Regjistrimet kontabël tashmë janë bërë në monedhën {0} për kompaninë {1}. Ju lutem, përzgjidhni një llogari arkëtueshëm ose të pagueshëm me monedhën {0}."
 ,Monthly Salary Register,Paga mujore Regjistrohu
-apps/frappe/frappe/website/template.py +123,Next,Tjetër
+apps/frappe/frappe/website/template.py +140,Next,Tjetër
 DocType: Warranty Claim,If different than customer address,Nëse është e ndryshme se sa adresën e konsumatorëve
 DocType: BOM Operation,BOM Operation,Bom Operacioni
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,Next Data
 DocType: Employee Education,Major/Optional Subjects,/ Subjektet e mëdha fakultative
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ju lutemi shkruani taksat dhe tatimet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Machining
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Këtu ju mund të mbajë të dhënat e familjes si emrin dhe profesionin e prindërve, bashkëshortit dhe fëmijëve"
 DocType: Hub Settings,Seller Name,Shitës Emri
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Taksat dhe Tarifat zbritet (Kompania Valuta)
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,Për të marrë dhe Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Projektues
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termat dhe Kushtet Template
 DocType: Serial No,Delivery Details,Detajet e ofrimit të
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatikisht të krijojë materiale Kërkesë nëse sasia bie nën këtë nivel
 ,Item-wise Purchase Register,Pika-mençur Blerje Regjistrohu
 DocType: Batch,Expiry Date,Data e Mbarimit
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Për të vendosur nivelin Reorder, pika duhet të jetë një artikull i blerë ose Prodhim Item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Për të vendosur nivelin Reorder, pika duhet të jetë një artikull i blerë ose Prodhim Item"
 ,Supplier Addresses and Contacts,Adresat Furnizues dhe Kontaktet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ju lutemi zgjidhni kategorinë e parë
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Mjeshtër projekt.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,A nuk tregojnë ndonjë simbol si $ etj ardhshëm të valutave.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Gjysme Dite)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Gjysme Dite)
 DocType: Supplier,Credit Days,Ditët e kreditit
 DocType: Leave Type,Is Carry Forward,Është Mbaj Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Të marrë sendet nga bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Të marrë sendet nga bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ditësh
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill e materialeve
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogari {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogari {1}
 DocType: Dropbox Backup,Send Notifications To,Dërgo Lajmërimet Për
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Arsyeja e largimit
 DocType: Expense Claim Detail,Sanctioned Amount,Shuma e sanksionuar
 DocType: GL Entry,Is Opening,Është Hapja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Llogaria {0} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Llogaria {0} nuk ekziston
 DocType: Account,Cash,Para
 DocType: Employee,Short biography for website and other publications.,Biografia e shkurtër për faqen e internetit dhe botime të tjera.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Ju lutem të krijuar strukturën e pagave për punonjës {0}
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index 9546525ab8..b1ea991718 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Плата режим
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Изаберите мјесечни, ако желите да пратите на основу сезонског."
 DocType: Employee,Divorced,Разведен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Упозорење: Исти предмет је ушао више пута.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Упозорење: Исти предмет је ушао више пута.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Ставке које се већ синхронизовано
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Дозволите тачка треба додати више пута у трансакцији
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Одбацити Материјал Посетите {0} пре отказивања ове гаранцији
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Набијања плус синтерирање
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Валута је потребан за ценовнику {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Биће обрачунато у овој трансакцији.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Од материјала захтеву
+DocType: Purchase Order,Customer Contact,Кориснички Контакт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Од материјала захтеву
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дрво
 DocType: Job Applicant,Job Applicant,Посао захтева
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема више резултата.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Име клијента
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Все экспорт смежных областях , как валюты, обменный курс , экспорт Количество , экспорт общего итога и т.д. доступны в накладной , POS, цитаты , счет-фактура , заказ клиента и т.д."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Хеадс (или групе) против које рачуноводствене уноси се праве и биланси се одржавају.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Уобичајено 10 минс
 DocType: Leave Type,Leave Type Name,Оставите Име Вид
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серия Обновлено Успешно
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Више цене аукцији .
 DocType: SMS Center,All Supplier Contact,Све Снабдевач Контакт
 DocType: Quality Inspection Reading,Parameter,Параметар
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Очекивани Датум завршетка не може бити мањи од очекиваног почетка Датум
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Да стварно желите да Одчепити производни ред:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: курс мора да буде исти као {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Нова апликација одсуство
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Нова апликација одсуство
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банка Нацрт
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Да бисте задржали купца мудрог код ставке и да их претраживати на основу њиховог кода користили ову опцију
 DocType: Mode of Payment Account,Mode of Payment Account,Начин плаћања налог
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Схов Ва
 DocType: Sales Invoice Item,Quantity,Количина
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредиты ( обязательства)
 DocType: Employee Education,Year of Passing,Година Пассинг
-sites/assets/js/erpnext.min.js +27,In Stock,На складишту
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Може само извршити уплату против Неприходована Салес Ордер
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,На складишту
 DocType: Designation,Designation,Ознака
 DocType: Production Plan Item,Production Plan Item,Производња план шифра
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Направите нови ПОС Профиле
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,здравство
 DocType: Purchase Invoice,Monthly,Месечно
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Фактура
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Кашњење у плаћању (Дани)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Е-маил адреса
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,одбрана
 DocType: Company,Abbr,Аббр
 DocType: Appraisal Goal,Score (0-5),Оцена (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ров # {0}:
 DocType: Delivery Note,Vehicle No,Нема возила
-sites/assets/js/erpnext.min.js +55,Please select Price List,Изаберите Ценовник
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Изаберите Ценовник
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Обрада дрвета
 DocType: Production Order Operation,Work In Progress,Ворк Ин Прогресс
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3Д штампање
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Родитељ Детаљ доцна
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Отварање за посао.
 DocType: Item Attribute,Increment,Повећање
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Изабери Варехоусе ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,оглашавање
 DocType: Employee,Married,Ожењен
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,помирити
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Маке Банк Ентри
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Маке Банк Ентри
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пензиони фондови
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Магацин је обавезна ако аццоунт типе Магацин
 DocType: SMS Center,All Sales Person,Све продаје Особа
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Отпис Центар трошко
 DocType: Warehouse,Warehouse Detail,Магацин Детаљ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Пређена кредитни лимит за купца {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Пореска Тип
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},"Вы не авторизованы , чтобы добавить или обновить записи до {0}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},"Вы не авторизованы , чтобы добавить или обновить записи до {0}"
 DocType: Item,Item Image (if not slideshow),Артикал слика (ако не слидесхов)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существуетклиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час курс / 60) * Пуна Операција време
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Гост
 DocType: Quality Inspection,Get Specification Details,Гет Детаљи Спецификација
 DocType: Lead,Interested,Заинтересован
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Счет за материалы
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Отварање
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Отварање
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Од {0} {1} да
 DocType: Item,Copy From Item Group,Копирање из ставке групе
 DocType: Journal Entry,Opening Entry,Отварање Ентри
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Производ Енкуири
 DocType: Standard Reply,Owner,власник
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Молимо унесите прва компанија
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Одредите прво Компанија
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Одредите прво Компанија
 DocType: Employee Education,Under Graduate,Под Дипломац
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Циљна На
 DocType: BOM,Total Cost,Укупни трошкови
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,потребляемый
 DocType: Upload Attendance,Import Log,Увоз се
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Послати
+DocType: Sales Invoice Item,Delivered By Supplier,Деливеред добављач
 DocType: SMS Center,All Contact,Све Контакт
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годишња плата
 DocType: Period Closing Voucher,Closing Fiscal Year,Затварање Фискална година
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Цонтра Ступање
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Схов Тиме Протоколи
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валути Компанија
 DocType: Delivery Note,Installation Status,Инсталација статус
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
 DocType: Item,Supply Raw Materials for Purchase,Набавка сировина за куповину
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Пункт {0} должен быть Покупка товара
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Преузмите шаблон, попуните одговарајуће податке и приложите измењену датотеку.
  Све датуми и запослени комбинација у одабраном периоду ће доћи у шаблону, са постојећим евиденцију"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Да ли ће бити ажурирани након продаје Рачун се подноси.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС центар
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Исправљање
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Унесите УРЛ па
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Правила применения цен и скидки .
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Улогујте сукоби са {0} за {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист должен быть применим для покупки или продажи
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Дата установки не может быть до даты доставки для Пункт {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Дата установки не может быть до даты доставки для Пункт {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Попуст на цену Лист стопа (%)
-sites/assets/js/form.min.js +279,Start,старт
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,старт
 DocType: User,First Name,Име
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Ваш сетап је завршен. Освежававање.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Пуно радно калупима
 DocType: Offer Letter,Select Terms and Conditions,Изаберите Услови
 DocType: Production Planning Tool,Sales Orders,Салес Ордерс
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Против продаје Фактура тачком
 ,Production Orders in Progress,Производни Поруџбине у напретку
 DocType: Lead,Address & Contact,Адреса и контакт
+DocType: Leave Allocation,Add unused leaves from previous allocations,Додај неискоришћене листове из претходних алокација
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
 DocType: Newsletter List,Total Subscribers,Укупно Претплатници
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Контакт Име
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,СО чекању КТИ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ствара плата листић за горе наведених критеријума.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Захтев за куповину.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Дупли становање
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Леавес по години
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Молимо поставите Именовање серију за {0} подешавањем> Сеттингс> именовања серије
 DocType: Time Log,Will be updated when batched.,Да ли ће се ажурирати када дозирају.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ров {0}: Проверите 'Да ли је напредно ""против налог {1} ако је ово унапред унос."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ров {0}: Проверите 'Да ли је напредно ""против налог {1} ако је ово унапред унос."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Магацин {0} не припада фирми {1}
 DocType: Bulk Email,Message,Порука
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
 DocType: Dropbox Backup,Dropbox Access Key,Дропбок Приступни тастер
 DocType: Payment Tool,Reference No,Референца број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Оставите Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
 DocType: Stock Entry,Sales Invoice No,Продаја Рачун Нема
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Минимална количина за пор
 DocType: Pricing Rule,Supplier Type,Снабдевач Тип
 DocType: Item,Publish in Hub,Објављивање у Хуб
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Материјал Захтев
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
 DocType: Item,Purchase Details,Куповина Детаљи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Ставка {0} није пронађен у "сировине Испоручује се 'сто у нарудзбенице {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Обавештење Конт
 DocType: Lead,Suggestions,Предлози
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Сет тачка Групе мудрих буџете на овој територији. Такође можете укључити сезонски постављањем дистрибуције.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Молимо вас да унесете родитељску групу рачуна за складиште {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаћање по {0} {1} не може бити већи од преосталог износа {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаћање по {0} {1} не може бити већи од преосталог износа {2}
 DocType: Supplier,Address HTML,Адреса ХТМЛ
 DocType: Lead,Mobile No.,Мобиле Но
 DocType: Maintenance Schedule,Generate Schedule,Генериши Распоред
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Нова берза УОМ
 DocType: Period Closing Voucher,Closing Account Head,Затварање рачуна Хеад
 DocType: Employee,External Work History,Спољни власници
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циркуларне референце Грешка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Да ли заиста желите да СТОП
 DocType: Communication,Closed,Затворено
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,У Вордс (извоз) ће бити видљив када сачувате напомену Деливери.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Да ли сте сигурни да желите да СТОП
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профиль работы
 DocType: Newsletter,Newsletter,Билтен
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Обавештење о пријему
 DocType: Dropbox Backup,Allow Dropbox Access,Дозволи Дропбок Аццесс
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Подешавање Порези
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Преглед за ову недељу и чекају активности
 DocType: Workstation,Rent Cost,Издавање Трошкови
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Изаберите месец и годину
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стопа по којој Купац Валута се претварају у основне валуте купца
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступный в спецификации , накладной , счете-фактуре, производственного заказа , заказа на поставку , покупка получение, счет-фактура , заказ клиента , фондовой въезда, расписания"
 DocType: Item Tax,Tax Rate,Пореска стопа
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Избор артикла
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Избор артикла
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Итем: {0} је успео серија-мудар, не може да се помири користећи \
  Стоцк помирење, уместо коришћење Сток Ентри"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Претвори у не-Гроуп
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Куповина Потврда мора да се поднесе
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Тренутне залих
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Групно (много) од стране јединице.
 DocType: C-Form Invoice Detail,Invoice Date,Фактуре
 DocType: GL Entry,Debit Amount,Износ задужења
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваша имејл адреса
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Молимо погледајте прилог
 DocType: Purchase Order,% Received,% Примљено
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Инструкције
 DocType: Quality Inspection,Inspected By,Контролисано Би
 DocType: Maintenance Visit,Maintenance Type,Одржавање Тип
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Серийный номер {0} не принадлежит накладной {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Серийный номер {0} не принадлежит накладной {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Ставка Провера квалитета Параметар
 DocType: Leave Application,Leave Approver Name,Оставите одобраватељ Име
 ,Schedule Date,Распоред Датум
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Куповина Регистрација
 DocType: Landed Cost Item,Applicable Charges,Накнаде применљиво
 DocType: Workstation,Consumable Cost,Потрошни трошкова
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
 DocType: Purchase Receipt,Vehicle Date,Датум возила
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Разлог за губљење
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,Инсталирано %
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Молимо унесите прво име компаније
 DocType: BOM,Item Desription,Ставка Десриптион
 DocType: Purchase Invoice,Supplier Name,Снабдевач Име
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитајте ЕРПНект Мануал
 DocType: Account,Is Group,Је група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Аутоматски подешава серијски бр на основу ФИФО
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Одлазак добављача Фактура број јединственост
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Продаја М
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобална подешавања за свим производним процесима.
 DocType: Accounts Settings,Accounts Frozen Upto,Рачуни Фрозен Упто
 DocType: SMS Log,Sent On,Послата
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Мастер отдыха .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Схелл лајсне
 DocType: Material Request Item,Required Date,Потребан датум
 DocType: Delivery Note,Billing Address,Адреса за наплату
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Унесите Шифра .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Унесите Шифра .
 DocType: BOM,Costing,Коштање
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако је проверен, порески износ ће се сматрати као што је већ укључена у Принт Рате / Штампа Износ"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Укупно ком
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Време и
 DocType: Customer,Buyer of Goods and Services.,Купац робе и услуга.
 DocType: Journal Entry,Accounts Payable,Обавезе према добављачима
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додај претплатника
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" Не постоји"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Не постоји"
 DocType: Pricing Rule,Valid Upto,Важи до
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Прямая прибыль
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не можете да филтрирате на основу налога , ако груписани по налогу"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Административни службеник
 DocType: Payment Tool,Received Or Paid,Прими или исплати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Молимо изаберите Цомпани
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Молимо изаберите Цомпани
 DocType: Stock Entry,Difference Account,Разлика налог
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Не можете да затворите задатак као њен задатак зависи {0} није затворен.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
 DocType: Production Order,Additional Operating Cost,Додатни Оперативни трошкови
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,козметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
 DocType: Communication,Subject,Предмет
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Хитна Телефон
 ,Serial No Warranty Expiry,Серијски Нема гаранције истека
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Да ли заиста желите да зауставите овај материјал захтев ?
 DocType: Sales Order,To Deliver,Да Испоручи
 DocType: Purchase Invoice Item,Item,ставка
 DocType: Journal Entry,Difference (Dr - Cr),Разлика ( др - Кр )
 DocType: Account,Profit and Loss,Прибыль и убытки
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Управљање Подуговарање
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управљање Подуговарање
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Новый UOM НЕ должен иметь тип целого числа
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Мебель и приспособления
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Стопа по којој се Ценовник валута претвара у основну валуту компаније
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Адд / Едит пор
 DocType: Purchase Invoice,Supplier Invoice No,Снабдевач фактура бр
 DocType: Territory,For reference,За референце
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не могу да избришем серијски број {0}, као што се користи у промету акција"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Затварање (Цр)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Затварање (Цр)
 DocType: Serial No,Warranty Period (Days),Гарантни период (дани)
 DocType: Installation Note Item,Installation Note Item,Инсталација Напомена Ставка
 ,Pending Qty,Кол чекању
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,Обрачун и Статус
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Репеат Купци
 DocType: Leave Control Panel,Allocate,Доделити
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,предыдущий
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Продаја Ретурн
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продаја Ретурн
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Изаберите продајних налога из које желите да креирате налоге производњу.
+DocType: Item,Delivered by Supplier (Drop Ship),Деливеред би добављача (Дроп Схип)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Плата компоненте.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База потенцијалних купаца.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Кориснички базе података.
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Гимнастика
 DocType: Purchase Order Item,Billed Amt,Фактурисане Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логичан Магацин против које уноси хартије су направљени.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Event,Wednesday,Среда
 DocType: Sales Invoice,Customer's Vendor,Купца Продавац
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производња налог обавезујући
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Пријемник Параметар
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основу"" и ""Групиши по"" не могу бити идентични"
 DocType: Sales Person,Sales Person Targets,Продаја Персон Мете
-sites/assets/js/form.min.js +271,To,на
-apps/frappe/frappe/templates/base.html +143,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,на
+apps/frappe/frappe/templates/base.html +145,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Крај цеви формирање
 DocType: Production Order Operation,In minutes,У минута
 DocType: Issue,Resolution Date,Резолуција Датум
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,Пројекти Упутства
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Цонсумед
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} није пронађен у табели Фактура Детаљи
 DocType: Company,Round Off Cost Center,Заокружују трошка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
 DocType: Material Request,Material Transfer,Пренос материјала
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Открытие (д-р )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Средняя отметка должна быть после {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Подешавања
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Истовара порези и таксе
 DocType: Production Order Operation,Actual Start Time,Стварна Почетак Време
 DocType: BOM Operation,Operation Time,Операција време
-sites/assets/js/list.min.js +5,More,Више
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Више
 DocType: Pricing Rule,Sales Manager,Менаџер продаје
-sites/assets/js/desk.min.js +7673,Rename,Преименовање
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Преименовање
 DocType: Journal Entry,Write Off Amount,Отпис Износ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Савијање
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Дозволите кориснику
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Равно сечење
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Да бисте пратили ставку у продаји и куповини докумената на основу њихових серијских бр. Ово се такође може користити за праћење детаље гаранције производа.
 DocType: Purchase Receipt Item Supplied,Current Stock,Тренутне залихе
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Одбијен Магацин је обавезна против регецтед ставке
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Одбијен Магацин је обавезна против регецтед ставке
 DocType: Account,Expenses Included In Valuation,Трошкови укључени у процене
 DocType: Employee,Provide email id registered in company,Обезбедити ид е регистрован у предузећу
 DocType: Hub Settings,Seller City,Продавац Град
 DocType: Email Digest,Next email will be sent on:,Следећа порука ће бити послата на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда Леттер Терм
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Тачка има варијанте.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Вредност акције
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дрво Тип
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,добро пожаловать
 DocType: Journal Entry,Credit Card Entry,Кредитна картица Ступање
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Задатак Предмет
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Роба примљена од добављача.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Роба примљена од добављача.
 DocType: Communication,Open,Отворено
 DocType: Lead,Campaign Name,Назив кампање
 ,Reserved,Резервисано
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Да ли заиста желите да Унстоп
 DocType: Purchase Order,Supply Raw Materials,Суппли Сировине
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Датум који ће бити генерисан следећи рачун. То се генерише на достави.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,оборотные активы
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Наруџбенице купца Нема
 DocType: Employee,Cell Number,Мобилни број
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,изгубљен
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,енергија
 DocType: Opportunity,Opportunity From,Прилика Од
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечна плата изјава.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционисани износ не може бити већи од износ потраживања у низу {0}.
 DocType: Company,Default Cost of Goods Sold Account,Уобичајено Набавна вредност продате робе рачуна
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Прайс-лист не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Породица Позадина
 DocType: Process Payroll,Send Email,Сенд Емаил
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Без дозвола
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Нос
 DocType: Item,Items with higher weightage will be shown higher,Предмети са вишим веигхтаге ће бити приказано више
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирење Детаљ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Моји рачуни
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Не работник не найдено
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не работник не найдено
 DocType: Purchase Order,Stopped,Заустављен
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Изаберите БОМ да почне
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Упло
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Пошаљи сада
 ,Support Analytics,Подршка Аналитика
 DocType: Item,Website Warehouse,Сајт Магацин
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Да ли заиста желите да зауставите производњу ред:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Дан у месецу на којем друмски фактура ће бити генерисан нпр 05, 28 итд"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Коначан мора бити мања или једнака 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Ц - Форма евиденција
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,По
 DocType: Features Setup,"To enable ""Point of Sale"" features",Да бисте омогућили "Поинт оф Сале" Феатурес
 DocType: Bin,Moving Average Rate,Мовинг Авераге рате
 DocType: Production Planning Tool,Select Items,Изаберите ставке
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
 DocType: Comment,Reference Name,Референтни Име
 DocType: Maintenance Visit,Completion Status,Завршетак статус
 DocType: Sales Invoice Item,Target Warehouse,Циљна Магацин
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволите преко испоруку или пријем упто овом одсто
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Все Группы товаров
 DocType: Process Payroll,Activity Log,Активност Пријава
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
 DocType: Production Order,Item To Manufacture,Ставка за производњу
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Стална калупима
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Налог за куповину на исплату
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Налог за куповину на исплату
 DocType: Sales Order Item,Projected Qty,Пројектовани Кол
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
 DocType: Newsletter,Newsletter Manager,Билтен директор
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,Тражени Бројеви
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Учинка.
 DocType: Sales Invoice Item,Stock Details,Сток Детаљи
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Пројекат Вредност
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Место продаје
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Не можете переносить {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Место продаје
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не можете переносить {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Стања на рачуну већ у Кредит, није вам дозвољено да поставите 'биланс треба да се' као 'Дебит """
 DocType: Account,Balance must be,Баланс должен быть
 DocType: Hub Settings,Publish Pricing,Објављивање Цене
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Куповина Пријем
 ,Received Items To Be Billed,Примљени артикала буду наплаћени
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Брусни минирања
-sites/assets/js/desk.min.js +3938,Ms,Мс
+DocType: Employee,Ms,Мс
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Мастер Валютный курс .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за подсклопови
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,Домет
 DocType: Supplier,Default Payable Accounts,Уобичајено се плаћају рачуни
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Features Setup,Item Barcode,Ставка Баркод
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
 DocType: Address,Shop,Продавница
 DocType: Hub Settings,Sync Now,Синц Сада
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Ров {0}: Кредит Унос се не може повезати са {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Ров {0}: Кредит Унос се не може повезати са {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Уобичајено банка / Готовина налог ће аутоматски бити ажуриран у ПОС фактура, када је овај режим изабран."
 DocType: Employee,Permanent Address Is,Стална адреса је
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операција завршена за колико готове робе?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Бренд
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Исправка за преко-{0} прешао за пункт {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Исправка за преко-{0} прешао за пункт {1}.
 DocType: Employee,Exit Interview Details,Екит Детаљи Интервју
 DocType: Item,Is Purchase Item,Да ли је куповина артикла
 DocType: Journal Entry Account,Purchase Invoice,Фактури
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детаљ Бр.
 DocType: Stock Entry,Total Outgoing Value,Укупна вредност Одлазећи
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Датум отварања и затварања Дате треба да буде у истој фискалној години
 DocType: Lead,Request for Information,Захтев за информације
 DocType: Payment Tool,Paid,Плаћен
 DocType: Salary Slip,Total in words,Укупно у речима
 DocType: Material Request Item,Lead Time Date,Олово Датум Време
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,је обавезно. Можда Мењачница запис није створен за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Наведите Сериал но за пункт {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За 'производ' Бундле предмета, Магацин, редни број и серијски бр ће се сматрати из "листе паковања 'табели. Ако Складиште и серијски бр су исти за све ставке паковање за било коју 'производ' Бундле ставке, те вредности се могу уносити у главном табели тачка, вредности ће бити копирана у 'Паковање лист' сто."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Испоруке купцима.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Испоруке купцима.
 DocType: Purchase Invoice Item,Purchase Order Item,Куповина ставке поруџбине
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Косвенная прибыль
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Сет износ уплате преостали износ =
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,Аддресс Лине 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Варијација
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Име компаније
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Погледајте листу сву помоћ видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изаберите главу рачуна банке у којој је депонован чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволите кориснику да измените Рате Ценовник у трансакцијама
 DocType: Pricing Rule,Max Qty,Макс Кол-во
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ров {0}: Плаћање по куповном / продајном Реда треба увек бити означен као унапред
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ров {0}: Плаћање по куповном / продајном Реда треба увек бити означен као унапред
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,хемијски
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
 DocType: Process Payroll,Select Payroll Year and Month,Изабери Паиролл година и месец
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Иди на одговарајуће групе (обично Примена средстава> обртна имовина> банковне рачуне и креирати нови налог (кликом на Додај Цхилд) типа "Банка"
 DocType: Workstation,Electricity Cost,Струја Трошкови
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бе
 DocType: SMS Center,All Lead (Open),Све Олово (Опен)
 DocType: Purchase Invoice,Get Advances Paid,Гет аванси
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепите свою фотографию
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Правити
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Правити
 DocType: Journal Entry,Total Amount in Words,Укупан износ у речи
 DocType: Workflow State,Stop,стани
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји .
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,Паковање Слип Итем
 DocType: POS Profile,Cash/Bank Account,Готовина / банковног рачуна
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бити негативан
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Подношење
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Да ли ће
 DocType: Project,Internal,Интерни
 DocType: Task,Urgent,Хитан
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Наведите важећу Ров ИД за редом {0} у табели {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Иди на Десктоп и почнете да користите ЕРПНект
 DocType: Item,Manufacturer,Произвођач
 DocType: Landed Cost Item,Purchase Receipt Item,Куповина ставке Рецеипт
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Резервисано Магацин у Продаја Наручите / складиште готове робе
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Продаја Износ
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Тиме трупци
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви стеТрошак одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви стеТрошак одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
 DocType: Serial No,Creation Document No,Стварање документ №
 DocType: Issue,Issue,Емисија
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за тачка варијанти. нпр Величина, Боја итд"
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Салес Ордер {0} је {1}
 DocType: Opportunity,Contact Info,Контакт Инфо
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Макинг Стоцк записи
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Макинг Стоцк записи
 DocType: Packing Slip,Net Weight UOM,Тежина УОМ
 DocType: Item,Default Supplier,Уобичајено Снабдевач
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Над производњом Исправка Проценат
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Мисцелленеоус
 DocType: Holiday List,Get Weekly Off Dates,Гет Офф Недељно Датуми
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Дата окончания не может быть меньше , чем Дата начала"
 DocType: Sales Person,Select company name first.,Изаберите прво име компаније.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Др
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Др
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Цитати од добављача.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Да {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,упдатед преко Тиме Логс
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,. Компанија регистарски бројеви за референцу Порески бројеви итд
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа Достава Правило
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
 ,Ordered Items To Be Billed,Ж артикала буду наплаћени
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Од Опсег мора да буде мањи од у распону
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Изаберите Протоколи време и слање да створи нову продајну фактуру.
@@ -1026,7 +1031,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Поре
 DocType: Lead,Lead,Довести
 DocType: Email Digest,Payables,Обавезе
 DocType: Account,Warehouse,Магацин
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
 ,Purchase Order Items To Be Billed,Налог за куповину артикала буду наплаћени
 DocType: Purchase Invoice Item,Net Rate,Нето курс
 DocType: Purchase Invoice Item,Purchase Invoice Item,Фактури Итем
@@ -1041,11 +1046,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Неусаглаш
 DocType: Global Defaults,Current Fiscal Year,Текуће фискалне године
 DocType: Global Defaults,Disable Rounded Total,Онемогући Роундед Укупно
 DocType: Lead,Call,Позив
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробни биланс
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Подешавање Запослени
-sites/assets/js/erpnext.min.js +5,"Grid ""","Мрежа """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Подешавање Запослени
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Мрежа """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Пожалуйста, выберите префикс первым"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,истраживање
 DocType: Maintenance Visit Purpose,Work Done,Рад Доне
@@ -1055,14 +1060,15 @@ DocType: Communication,Sent,Сент
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Погледај Леџер
 DocType: File,Lft,ЛФТ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Communication,Delivery Status,Статус испоруке
 DocType: Production Order,Manufacture against Sales Order,Производња против налога за продају
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставка {0} не може имати Батцх
 ,Budget Variance Report,Буџет Разлика извештај
 DocType: Salary Slip,Gross Pay,Бруто Паи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Исплаћене дивиденде
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Књиговодство Леџер
 DocType: Stock Reconciliation,Difference Amount,Разлика Износ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Нераспоређене добити
 DocType: BOM Item,Item Description,Ставка Опис
@@ -1076,15 +1082,17 @@ DocType: Opportunity Item,Opportunity Item,Прилика шифра
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Привремени Отварање
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Цриороллинг
 ,Employee Leave Balance,Запослени одсуство Биланс
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Address,Address Type,Врста адресе
 DocType: Purchase Receipt,Rejected Warehouse,Одбијен Магацин
 DocType: GL Entry,Against Voucher,Против ваучер
 DocType: Item,Default Buying Cost Center,По умолчанию Покупка МВЗ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Да бисте добили најбоље од ЕРПНект, препоручујемо да узмете мало времена и гледати ове видео снимке помоћ."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Пункт {0} должно быть Продажи товара
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,у
 DocType: Item,Lead Time in days,Олово Време у данима
 ,Accounts Payable Summary,Обавезе према добављачима Преглед
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Гет неплаћене рачуне
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
@@ -1100,7 +1108,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Место издавања
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,уговор
 DocType: Report,Disabled,Онеспособљен
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Кол је обавезно
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,пољопривреда
@@ -1109,13 +1117,13 @@ DocType: Mode of Payment,Mode of Payment,Начин плаћања
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
 DocType: Journal Entry Account,Purchase Order,Налог за куповину
 DocType: Warehouse,Warehouse Contact Info,Магацин Контакт Инфо
-sites/assets/js/form.min.js +190,Name is required,Име је обавезно
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Име је обавезно
 DocType: Purchase Invoice,Recurring Type,Понављајући Тип
 DocType: Address,City/Town,Град / Место
 DocType: Email Digest,Annual Income,Годишњи приход
 DocType: Serial No,Serial No Details,Серијска Нема детаља
 DocType: Purchase Invoice Item,Item Tax Rate,Ставка Пореска стопа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
@@ -1126,14 +1134,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Циљ
 DocType: Sales Invoice Item,Edit Description,Измени опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Очекивани Датум испоруке је мањи од планираног почетка Датум.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,За добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,За добављача
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Подешавање Тип налога помаже у одабиру овог рачуна у трансакцијама.
 DocType: Purchase Invoice,Grand Total (Company Currency),Гранд Укупно (Друштво валута)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Укупно Одлазећи
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Там может быть только один Правило Начальные с 0 или пустое значение для "" To Размер """
 DocType: Authorization Rule,Transaction,Трансакција
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Примечание: Эта МВЗ является Группа . Невозможно сделать бухгалтерские проводки против групп .
-apps/erpnext/erpnext/config/projects.py +43,Tools,Алат
+apps/frappe/frappe/config/desk.py +7,Tools,Алат
 DocType: Item,Website Item Groups,Сајт Итем Групе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Производња би број је обавезна за парк ентри намене производње
 DocType: Purchase Invoice,Total (Company Currency),Укупно (Фирма валута)
@@ -1143,7 +1151,7 @@ DocType: Workstation,Workstation Name,Воркстатион Име
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Емаил Дигест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
 DocType: Sales Partner,Target Distribution,Циљна Дистрибуција
-sites/assets/js/desk.min.js +7652,Comments,Коментари
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Коментари
 DocType: Salary Slip,Bank Account No.,Банковни рачун бр
 DocType: Naming Series,This is the number of the last created transaction with this prefix,То је број последње створеног трансакције са овим префиксом
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Оценка Оцените требуется для Пункт {0}
@@ -1158,7 +1166,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Изабер
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Датум фактуре добављача
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Потребно је да омогућите Корпа
-sites/assets/js/form.min.js +212,No Data,Нема података
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Нема података
 DocType: Appraisal Template Goal,Appraisal Template Goal,Процена Шаблон Гол
 DocType: Salary Slip,Earning,Стицање
 DocType: Payment Tool,Party Account Currency,Странка Рачун Валута
@@ -1166,7 +1174,7 @@ DocType: Payment Tool,Party Account Currency,Странка Рачун Валу
 DocType: Purchase Taxes and Charges,Add or Deduct,Додавање или Одузмите
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ако Годишњи буџет Прекорачено (за расход рачун)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Перекрытие условия найдено между :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Против часопису Ступање {0} је већ прилагођен против неког другог ваучера
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Против часопису Ступање {0} је већ прилагођен против неког другог ваучера
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Укупна вредност поруџбине
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,еда
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старење Опсег 3
@@ -1174,11 +1182,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Број посета
 DocType: File,old_parent,олд_парент
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Билтене контактима, води."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута затварања рачуна мора да буде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир бодова за све циљеве би требало да буде 100. То је {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Операције не може остати празно.
 ,Delivered Items To Be Billed,Испоручени артикала буду наплаћени
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Магацин не може да се промени за серијским бројем
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Статус обновлен до {0}
 DocType: DocField,Description,Опис
 DocType: Authorization Rule,Average Discount,Просечна дисконтна
 DocType: Letter Head,Is Default,Да ли Уобичајено
@@ -1206,7 +1214,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Ставка Износ поре
 DocType: Item,Maintain Stock,Одржавајте Стоцк
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Мак: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Од датетиме
 DocType: Email Digest,For Company,За компаније
@@ -1216,7 +1224,7 @@ DocType: Sales Invoice,Shipping Address Name,Достава Адреса Име
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Контни
 DocType: Material Request,Terms and Conditions Content,Услови коришћења садржаја
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи оставити без Паи
@@ -1229,7 +1237,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Гаранција / АМЦ ста
 DocType: GL Entry,GL Entry,ГЛ Ентри
 DocType: HR Settings,Employee Settings,Подешавања запослених
 ,Batch-Wise Balance History,Групно-Висе Стање Историја
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,То до лист
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,То до лист
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,шегрт
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Негативна Количина није дозвољено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1262,13 +1270,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Подешавање Подешавања СМС Гатеваи
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз није успело !
-sites/assets/js/erpnext.min.js +24,No address added yet.,Адреса додао.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адреса додао.
 DocType: Workstation Working Hour,Workstation Working Hour,Воркстатион радни сат
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,аналитичар
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака количини ЈВ {2}
 DocType: Item,Inventory,Инвентар
 DocType: Features Setup,"To enable ""Point of Sale"" view",Да бисте омогућили "Поинт Оф Сале" поглед
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Плаћање не може се за празан корпу
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плаћање не може се за празан корпу
 DocType: Item,Sales Details,Детаљи продаје
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Пиннинг
 DocType: Opportunity,With Items,Са ставкама
@@ -1278,7 +1286,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",Датум који ће бити генерисан следећи рачун. То се генерише на достави.
 DocType: Item Attribute,Item Attribute,Итем Атрибут
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,правительство
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Ставка Варијанте
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Ставка Варијанте
 DocType: Company,Services,Услуге
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Укупно ({0})
 DocType: Cost Center,Parent Cost Center,Родитељ Трошкови центар
@@ -1288,11 +1296,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Финансовый год Дата начала
 DocType: Employee External Work History,Total Experience,Укупно Искуство
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Упуштања
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Material Request Item,Sales Order No,Продаја Наручите Нема
 DocType: Item Group,Item Group Name,Ставка Назив групе
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Такен
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Такен
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Трансфер материјал за производњу
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Екецутиве Сеарцх
@@ -1301,8 +1309,7 @@ DocType: Maintenance Schedule,Schedules,Распореди
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,БОМ Детаљ Нема
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додатне Износ попуста (Фирма валута)
-DocType: Period Closing Voucher,CoA Help,ЦоА Помоћ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Ошибка: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Ошибка: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Молимо креирајте нови налог из контном оквиру .
 DocType: Maintenance Visit,Maintenance Visit,Одржавање посета
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Кориснички> Кориснички Група> Територија
@@ -1333,19 +1340,19 @@ DocType: Sales Partner,Sales Partner Target,Продаја Партнер Циљ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Књиговодство Ступање на {0} може се вршити само у валути: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Угаоно исецање
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Материјал захтјев за откуп Ордер
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материјал захтјев за откуп Ордер
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: враћено артикла {1} не постоји у {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банковни рачуни
 ,Bank Reconciliation Statement,Банка помирење Изјава
 DocType: Address,Lead Name,Олово Име
 ,POS,ПОС
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Отварање Сток Стање
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Отварање Сток Стање
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} мора појавити само једном
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Није дозвољено да транфер више {0} од {1} против нарудзбенице {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нет объектов для вьючных
 DocType: Shipping Rule Condition,From Value,Од вредности
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Производња Количина је обавезно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Производња Количина је обавезно
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Износи не огледа у банци
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Захтеви за рачун предузећа.
@@ -1358,19 +1365,20 @@ DocType: Opportunity,Contact Mobile No,Контакт Мобиле Нема
 DocType: Production Planning Tool,Select Sales Orders,Избор продајних налога
 ,Material Requests for which Supplier Quotations are not created,Материјални Захтеви за који Супплиер Цитати нису створени
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Да бисте пратили ставки помоћу баркод. Моћи ћете да унесете ставке у испоруци напомени и продаје фактуру за скенирање баркода на ставке.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Означи као Деливеред
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи понуду
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Покушајте планирање операција за Кс дана унапред.
 DocType: HR Settings,Stop Birthday Reminders,Стани Рођендан Подсетници
 DocType: SMS Center,Receiver List,Пријемник Листа
 DocType: Payment Tool Detail,Payment Amount,Плаћање Износ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Цонсумед Износ
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Погледај
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Погледај
 DocType: Salary Structure Deduction,Salary Structure Deduction,Плата Структура Одбитак
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективно ласерски синтерирање
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Увоз Успешна !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Трошкови издатих ставки
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количина не сме бити више од {0}
@@ -1391,7 +1399,7 @@ DocType: Company,Default Payable Account,Уобичајено оплате ра
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Подешавања за онлине куповину као што су испоруке правила, ценовник итд"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Завершение установки
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Приходована
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Резервисано Кол
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Резервисано Кол
 DocType: Party Account,Party Account,Странка налог
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Человеческие ресурсы
 DocType: Lead,Upper Income,Горња прихода
@@ -1434,11 +1442,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Омогући Корпа
 DocType: Employee,Permanent Address,Стална адреса
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Пункт {0} должен быть Service Элемент .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Унапред платио против {0} {1} не може бити већи \ од ГРАНД Укупно {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Пожалуйста, выберите элемент кода"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Смањите одбитка за дозволу без плате (ЛВП)
 DocType: Territory,Territory Manager,Територија Менаџер
+DocType: Delivery Note Item,To Warehouse (Optional),До складишта (опционо)
 DocType: Sales Invoice,Paid Amount (Company Currency),Уплаћеног износа (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Додатни попуст
 DocType: Selling Settings,Selling Settings,Продаја Сеттингс
@@ -1461,7 +1470,7 @@ DocType: Item,Weightage,Веигхтаге
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Рударство
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Смола ливење
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Изаберите {0} прво.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Изаберите {0} прво.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0}
 DocType: Territory,Parent Territory,Родитељ Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
@@ -1489,11 +1498,11 @@ DocType: Sales Invoice Item,Batch No,Групно Нема
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволите више продајних налога против нарудзбенице купац је
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,основной
 DocType: DocPerm,Delete,Избрисати
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Варијанта
-sites/assets/js/desk.min.js +7971,New {0},Нови {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варијанта
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Нови {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Остановился заказ не может быть отменен. Unstop отменить .
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Остановился заказ не может быть отменен. Unstop отменить .
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
 DocType: Employee,Leave Encashed?,Оставите Енцасхед?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Прилика Од пољу је обавезна
 DocType: Item,Variants,Варијанте
@@ -1511,7 +1520,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Земља
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адресе
 DocType: Communication,Received,примљен
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за владавину Схиппинг
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Тачка није дозвољено да имају Продуцтион Ордер.
@@ -1532,7 +1541,6 @@ DocType: Employee,Salutation,Поздрав
 DocType: Communication,Rejected,Одбијен
 DocType: Pricing Rule,Brand,Марка
 DocType: Item,Will also apply for variants,Ће конкурисати и за варијанте
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,Испоручено %
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Бундле ставке у време продаје.
 DocType: Sales Order Item,Actual Qty,Стварна Кол
 DocType: Sales Invoice Item,References,Референце
@@ -1570,14 +1578,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Стрижа
 DocType: Item,Has Variants,Хас Варијанте
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Кликните на 'да продаје Фактура' дугме да бисте креирали нову продајну фактуру.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Период од и период до датума обавезне за понављају% с
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Паковање и етикетирање
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назив мјесечни
 DocType: Sales Person,Parent Sales Person,Продаја Родитељ Особа
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Пожалуйста, сформулируйте Базовая валюта в компании Мастер и общие настройки по умолчанию"
 DocType: Dropbox Backup,Dropbox Access Secret,Дропбок Приступ тајна
 DocType: Purchase Invoice,Recurring Invoice,Понављајући Рачун
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Управљање пројектима
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Управљање пројектима
 DocType: Supplier,Supplier of Goods or Services.,Добављач робе или услуга.
 DocType: Budget Detail,Fiscal Year,Фискална година
 DocType: Cost Center,Budget,Буџет
@@ -1605,11 +1612,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Продаја
 DocType: Employee,Salary Information,Плата Информација
 DocType: Sales Person,Name and Employee ID,Име и број запослених
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сајт тачка Група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Пошлины и налоги
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} уноса плаћања не може да се филтрира од {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} уноса плаћања не може да се филтрира од {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Табела за ставку која ће бити приказана у веб сајта
 DocType: Purchase Order Item Supplied,Supplied Qty,Додатна количина
 DocType: Material Request Item,Material Request Item,Материјал Захтев шифра
@@ -1617,7 +1624,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дерево то
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки , превышающую или равную текущему номеру строки для этого типа зарядки"
 ,Item-wise Purchase History,Тачка-мудар Историја куповине
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Црвен
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,Фрозен
 ,Open Production Orders,Отворена Продуцтион Поруџбине
 DocType: Installation Note,Installation Time,Инсталација време
@@ -1661,13 +1668,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Как Производственный заказ можно сделать по этой статье, он должен быть запас пункт ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Как Производственный заказ можно сделать по этой статье, он должен быть запас пункт ."
 DocType: Shipping Rule Condition,Shipping Amount,Достава Износ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Спајање
 DocType: Authorization Rule,Above Value,Изнад Вредност
 ,Pending Amount,Чека Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Испоручено
+DocType: Purchase Order,Delivered,Испоручено
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Настройка сервера входящей подрабатывать электронный идентификатор . (например jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Број возила
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датум на који се понавља фактура ће бити зауставити
@@ -1684,10 +1691,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуира
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа "" Fixed Asset "", как товара {1} является активом Пункт"
 DocType: HR Settings,HR Settings,ХР Подешавања
 apps/frappe/frappe/config/setup.py +130,Printing,Штампање
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходи Тужба се чека на одобрење . СамоРасходи одобраватељ да ажурирате статус .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходи Тужба се чека на одобрење . СамоРасходи одобраватељ да ажурирате статус .
 DocType: Purchase Invoice,Additional Discount Amount,Додатне Износ попуста
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"День (дни) , на котором вы подаете заявление на отпуск , отпуск . Вам не нужно обратиться за разрешением ."
-sites/assets/js/desk.min.js +7805,and,и
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Аббр не може бити празно или простор
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,спортски
@@ -1724,7 +1731,6 @@ DocType: Opportunity,Quotation,Понуда
 DocType: Salary Slip,Total Deduction,Укупно Одбитак
 DocType: Quotation,Maintenance User,Одржавање Корисник
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Трошкови ажурирано
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Да ли сте сигурни да желите да Унстоп
 DocType: Employee,Date of Birth,Датум рођења
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискална година** представља Финансијску годину. Све рачуноводствене уносе и остале главне трансакције се прате наспрам **Фискалне фодине**.
@@ -1740,13 +1746,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Пратите продајне акције. Пратите води, Куотатионс, продаја Ордер итд из кампање да измери повраћај инвестиције. "
 DocType: Expense Claim,Approver,Одобраватељ
 ,SO Qty,ТАКО Кол
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток уноси постоје против складишта {0}, стога не можете поново доделите или промени Варехоусе"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток уноси постоје против складишта {0}, стога не можете поново доделите или промени Варехоусе"
 DocType: Appraisal,Calculate Total Score,Израчунајте Укупна оцена
 DocType: Supplier Quotation,Manufacturing Manager,Производња директор
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит Напомена Испорука у пакетима.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Пошиљке
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Дип лајсне
+DocType: Purchase Order,To be delivered to customer,Који ће бити достављен купца
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Пријави статус мора да се поднесе.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серијски број {0} не припада ниједној Варехоусе
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Подешавање
@@ -1770,11 +1777,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Од валутног
 DocType: DocField,Name,Име
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Износи не огледа у систему
 DocType: Purchase Invoice Item,Rate (Company Currency),Стопа (Друштво валута)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,другие
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Постави као Стоппед
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Не могу да нађем ставку која се подудара. Молимо Вас да одаберете неку другу вредност за {0}.
 DocType: POS Profile,Taxes and Charges,Порези и накнаде
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Производ или сервис који се купити, продати или држати у складишту."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда , как «О предыдущего ряда Сумма » или « О предыдущего ряда Всего 'для первой строки"
@@ -1783,19 +1790,20 @@ DocType: Web Form,Select DocType,Изаберите ДОЦТИПЕ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Броацхинг
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,банкарство
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы получить график"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Нови Трошкови Центар
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Нови Трошкови Центар
 DocType: Bin,Ordered Quantity,Наручено Количина
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
 DocType: Quality Inspection,In Process,У процесу
 DocType: Authorization Rule,Itemwise Discount,Итемвисе Попуст
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} против Салес Ордер {1}
+DocType: Purchase Order Item,Reference Document Type,Референтна Тип документа
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} против Салес Ордер {1}
 DocType: Account,Fixed Asset,Исправлена ​​активами
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Серијализоване Инвентар
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серијализоване Инвентар
 DocType: Activity Type,Default Billing Rate,Уобичајено обрачуна курс
 DocType: Time Log Batch,Total Billing Amount,Укупно обрачуна Износ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Потраживања рачуна
 ,Stock Balance,Берза Биланс
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Продаја Налог за плаћања
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продаја Налог за плаћања
 DocType: Expense Claim Detail,Expense Claim Detail,Расходи потраживање Детаљ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Време трупци цреатед:
 DocType: Item,Weight UOM,Тежина УОМ
@@ -1831,10 +1839,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
 DocType: Production Order Operation,Completed Qty,Завршен Кол
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитне рачуни могу бити повезани против другог кредитног уласка"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Прайс-лист {0} отключена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитне рачуни могу бити повезани против другог кредитног уласка"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Прайс-лист {0} отключена
 DocType: Manufacturing Settings,Allow Overtime,Дозволи Овертиме
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Заказ на продажу {0} остановлен
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} серијски бројеви који су потребни за тачком {1}. Ви сте под условом {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Тренутни Процена курс
 DocType: Item,Customer Item Codes,Кориснички кодова
@@ -1843,9 +1850,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Заваривање
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Новый фонда Единица измерения требуется
 DocType: Quality Inspection,Sample Size,Величина узорка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Све ставке су већ фактурисано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Све ставке су већ фактурисано
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Наведите тачну 'Од Предмет бр'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
 DocType: Project,External,Спољни
 DocType: Features Setup,Item Serial Nos,Итем Сериал Нос
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволе
@@ -1872,7 +1879,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
 DocType: SMS Log,Sender Name,Сендер Наме
 DocType: Page,Title,Наслов
-sites/assets/js/list.min.js +104,Customize,Прилагодите
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Прилагодите
 DocType: POS Profile,[Select],[ Изаберите ]
 DocType: SMS Log,Sent To,Послат
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Маке Салес фактура
@@ -1897,12 +1904,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Крај живота
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,путешествие
 DocType: Leave Block List,Allow Users,Дозволи корисницима
+DocType: Purchase Order,Customer Mobile No,Кориснички Мобилни број
 DocType: Sales Invoice,Recurring,Који се враћа
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Пратите посебан Приходи и расходи за вертикала производа или подела.
 DocType: Rename Tool,Rename Tool,Преименовање Тоол
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ажурирање Трошкови
 DocType: Item Reorder,Item Reorder,Предмет Реордер
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Пренос материјала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Пренос материјала
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведите операције , оперативне трошкове и дају јединствену операцију без своје пословање ."
 DocType: Purchase Invoice,Price List Currency,Ценовник валута
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
@@ -1925,7 +1933,7 @@ DocType: Appraisal,Employee,Запосленик
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Увоз е-маил Од
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Позови као корисник
 DocType: Features Setup,After Sale Installations,Након инсталације продају
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} је у потпуности наплаћује
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} је у потпуности наплаћује
 DocType: Workstation Working Hour,End Time,Крајње време
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартные условия договора для продажи или покупки.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Группа по ваучером
@@ -1934,8 +1942,9 @@ DocType: Sales Invoice,Mass Mailing,Масовна Маилинг
 DocType: Page,Standard,Стандард
 DocType: Rename Tool,File to Rename,Филе Ренаме да
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Схов Плаћања
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Величина
 DocType: Notification Control,Expense Claim Approved,Расходи потраживање одобрено
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,фармацевтический
@@ -1954,8 +1963,8 @@ DocType: Upload Attendance,Attendance To Date,Присуство Дате
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Настройка сервера входящей для продажи электронный идентификатор . (например sales@example.com )
 DocType: Warranty Claim,Raised By,Подигао
 DocType: Payment Tool,Payment Account,Плаћање рачуна
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Наведите компанија наставити
-sites/assets/js/list.min.js +23,Draft,Нацрт
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Наведите компанија наставити
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Нацрт
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,Accepted,Примљен
 DocType: User,Female,Женски
@@ -1968,14 +1977,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Достава Правило Лабел
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Сировине не може бити празан.
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Као што постоје постојеће трансакције стоцк за ову ставку, \ не можете променити вредности 'има серијски Не', 'Има серијски бр', 'Да ли лагеру предмета' и 'Процена Метод'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Брзо Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
 DocType: Employee,Previous Work Experience,Претходно радно искуство
 DocType: Stock Entry,For Quantity,За Количина
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} не представлено
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Захтеви за ставке.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} не представлено
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Захтеви за ставке.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одвојена производња поруџбина ће бити направљен за сваку готовог добар ставке.
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Цондитионс1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,завершение установки
@@ -1987,7 +1997,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Билтен Ма
 DocType: Delivery Note,Transporter Name,Транспортер Име
 DocType: Contact,Enter department to which this Contact belongs,Унесите одељење које се овај контакт припада
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Укупно Абсент
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Јединица мере
 DocType: Fiscal Year,Year End Date,Датум завршетка године
 DocType: Task Depends On,Task Depends On,Задатак Дубоко У
@@ -2013,7 +2023,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Треће лице дистрибутер / дилер / заступника / сарадник / дистрибутер који продаје компанијама производе за провизију.
 DocType: Customer Group,Has Child Node,Има деце Ноде
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} против нарудзбенице {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} против нарудзбенице {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Унесите статичке параметре овде УРЛ адресу (нпр. пошиљалац = ЕРПНект, усернаме = ЕРПНект, лозинком = 1234 итд)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ни на који активно фискалној години. За више детаља проверите {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
@@ -2064,11 +2074,9 @@ DocType: Note,Note,Приметити
 DocType: Purchase Receipt Item,Recd Quantity,Рецд Количина
 DocType: Email Account,Email Ids,Е-маил Идс
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Постави као Унстоппед
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовински рачун
 DocType: Tax Rule,Billing City,Биллинг Цити
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Ово одсуство Примена чека одобрење. Само одсуство одобраватељ може да ажурира статус.
 DocType: Global Defaults,Hide Currency Symbol,Сакриј симбол валуте
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","нпр банка, Готовина, кредитна картица"
 DocType: Journal Entry,Credit Note,Кредитни Напомена
@@ -2089,7 +2097,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Укупно (ком)
 DocType: Installation Note Item,Installed Qty,Инсталирани Кол
 DocType: Lead,Fax,Фак
 DocType: Purchase Taxes and Charges,Parenttype,Паренттипе
-sites/assets/js/list.min.js +26,Submitted,Поднет
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Поднет
 DocType: Salary Structure,Total Earning,Укупна Зарада
 DocType: Purchase Receipt,Time at which materials were received,Време у коме су примљене материјали
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Моје адресе
@@ -2098,7 +2106,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Органи
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
 DocType: Sales Order,Billing Status,Обрачун статус
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Коммунальные расходы
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Изнад
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Изнад
 DocType: Buying Settings,Default Buying Price List,Уобичајено Куповина Ценовник
 ,Download Backups,Довнлоад Бацкуп
 DocType: Notification Control,Sales Order Message,Продаја Наручите порука
@@ -2107,7 +2115,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Изаберите Запослени
 DocType: Bank Reconciliation,To Date,За датум
 DocType: Opportunity,Potential Sales Deal,Потенцијални Продаја Деал
-sites/assets/js/form.min.js +308,Details,Детаљи
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Детаљи
 DocType: Purchase Invoice,Total Taxes and Charges,Укупно Порези и накнаде
 DocType: Employee,Emergency Contact,Хитна Контакт
 DocType: Item,Quality Parameters,Параметара квалитета
@@ -2122,7 +2130,7 @@ DocType: Purchase Order Item,Received Qty,Примљени Кол
 DocType: Stock Entry Detail,Serial No / Batch,Серијски бр / Серије
 DocType: Product Bundle,Parent Item,Родитељ шифра
 DocType: Account,Account Type,Тип налога
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
 ,To Produce,за производњу
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За редом {0} у {1}. Да бисте укључили {2} У тачки стопе, редови {3} морају бити укључени"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификација пакета за испоруку (за штампу)
@@ -2133,7 +2141,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Равнање
 DocType: Account,Income Account,Приходи рачуна
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Обликовање
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Испорука
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Испорука
 DocType: Stock Reconciliation Item,Current Qty,Тренутни ком
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Погледајте "стопа материјала на бази" у Цостинг одељак
 DocType: Appraisal Goal,Key Responsibility Area,Кључна Одговорност Површина
@@ -2164,9 +2172,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Све адресе.
 DocType: Company,Stock Settings,Стоцк Подешавања
 DocType: User,Bio,Био
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление групповой клиентов дерево .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Нови Трошкови Центар Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Нови Трошкови Центар Име
 DocType: Leave Control Panel,Leave Control Panel,Оставите Цонтрол Панел
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Не стандардна Адреса шаблона пронађен. Молимо креирајте нови из Подешавања> Штампа и брендирања> Адреса шаблон.
 DocType: Appraisal,HR User,ХР Корисник
@@ -2185,24 +2193,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Плаћање Алат Детаљ
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Укупна кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,местный
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,местный
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы ( активы )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Дужници
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Велики
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ниједан запослени фоунд !
 DocType: C-Form Invoice Detail,Territory,Територија
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений , необходимых"
+DocType: Purchase Order,Customer Address Display,Кориснички Адреса Приказ
 DocType: Stock Settings,Default Valuation Method,Уобичајено Процена Метод
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полирање
 DocType: Production Order Operation,Planned Start Time,Планирано Почетак Време
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Додељена
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Затвори Биланс стања и књига добитак или губитак .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Уобичајено јединица мере за тачке {0} не могу директно мењати, јер \ већ сте направили неку трансакцију (с) са другим УЦГ. Да бисте променили подразумевани УЦГ, \ употреба 'УОМ Замените Утилити "функције под Стоцк модула."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведите курс према претворити једну валуту у другу
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Цитата {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитата {0} отменяется
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Преостали дио кредита
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Сотрудник {0} был в отпусках по {1} . Невозможно отметить посещаемость.
 DocType: Sales Partner,Targets,Мете
@@ -2217,12 +2225,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,То јекорен група купац и не може се мењати .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Молимо Поставите свој контни пре него што почнете Рачуноводство уносе
 DocType: Purchase Invoice,Ignore Pricing Rule,Игноре Правилник о ценама
-sites/assets/js/list.min.js +24,Cancelled,Отказан
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Отказан
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"Од датума зараде, структура не може бити мањи од Радника Спајање Датум."
 DocType: Employee Education,Graduate,Пређите
 DocType: Leave Block List,Block Days,Блок Дана
 DocType: Journal Entry,Excise Entry,Акциза Ступање
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Упозорење: Продаја заказа {0} већ постоји против нарудзбенице клијента {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Упозорење: Продаја заказа {0} већ постоји против нарудзбенице клијента {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2279,17 +2287,17 @@ DocType: Account,Stock Received But Not Billed,Залиха примљена А
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Бруто Паи + Заостатак Износ + Енцасхмент Износ - Укупно дедукције
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Features Setup,Sales and Purchase,Продаја и Куповина
-DocType: Purchase Order Item,Material Request No,Материјал Захтев Нема
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
+DocType: Supplier Quotation Item,Material Request No,Материјал Захтев Нема
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Стопа по којој купца валута претвара у основну валуту компаније
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} је успешно претплату на овој листи.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Нето курс (Фирма валута)
-apps/frappe/frappe/templates/base.html +132,Added,Додато
+apps/frappe/frappe/templates/base.html +134,Added,Додато
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управление Территория дерево .
 DocType: Journal Entry Account,Sales Invoice,Продаја Рачун
 DocType: Journal Entry Account,Party Balance,Парти Стање
 DocType: Sales Invoice Item,Time Log Batch,Време Лог Групно
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Молимо одаберите Аппли попуста на
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Молимо одаберите Аппли попуста на
 DocType: Company,Default Receivable Account,Уобичајено потраживања рачуна
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Направи Банк, улаз за укупне плате исплаћене за горе изабране критеријуме"
 DocType: Stock Entry,Material Transfer for Manufacture,Пренос материјала за Производња
@@ -2300,7 +2308,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Гет Релевантне у
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Ковања
 DocType: Sales Invoice,Sales Team1,Продаја Теам1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
 apps/frappe/frappe/desk/query_report.py +136,Total,Укупан
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесите додатни попуст Он
@@ -2314,13 +2322,15 @@ DocType: Quality Inspection,Quality Inspection,Провера квалитета
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Ектра Смалл
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спраи формирање
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Счет {0} заморожен
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Храна , пиће и дуван"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,ПЛ или БС
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентар Ниво
 DocType: Stock Entry,Subcontract,Подуговор
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Молимо Вас да унесете {0} прво
 DocType: Production Planning Tool,Get Items From Sales Orders,Набавите ставке из наруџбина купаца
 DocType: Production Order Operation,Actual End Time,Стварна Крајње време
 DocType: Production Planning Tool,Download Materials Required,Преузимање материјала Потребна
@@ -2337,9 +2347,9 @@ DocType: Maintenance Visit,Scheduled,Планиран
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Молимо одаберите ставку где "је акционарско тачка" је "Не" и "Да ли је продаје Тачка" "Да" и нема другог производа Бундле
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изаберите мјесечни неравномерно дистрибуира широм мете месеци.
 DocType: Purchase Invoice Item,Valuation Rate,Процена Стопа
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Прайс-лист Обмен не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Прайс-лист Обмен не выбран
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Ставка Ред {0}: Куповина Пријем {1} не постоји у табели 'пурцхасе примитака'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Пројекат Датум почетка
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,До
 DocType: Rename Tool,Rename Log,Преименовање Лог
@@ -2366,13 +2376,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листа чворови су дозвољени у трансакцији
 DocType: Expense Claim,Expense Approver,Расходи одобраватељ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Куповина Потврда јединице у комплету
-sites/assets/js/erpnext.min.js +48,Pay,Платити
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Платити
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Да датетиме
 DocType: SMS Settings,SMS Gateway URL,СМС Гатеваи УРЛ адреса
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Протоколи за одржавање смс статус испоруке
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Млевење
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Скупи враппинг
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Пендинг Активности
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Пендинг Активности
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потврђен
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Добављач> Добављач Тип
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
@@ -2383,7 +2393,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"У
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изаберите Фискална година
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Топљење
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Ви стеНапусти одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Реордер Ниво
 DocType: Attendance,Attendance Date,Гледалаца Датум
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распада на основу зараде и дедукције.
@@ -2419,6 +2428,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Супплиер (с)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Неважећи Период
 DocType: Customer,Credit Limit,Кредитни лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изаберите тип трансакције
 DocType: GL Entry,Voucher No,Ваучер Бр.
@@ -2428,8 +2438,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Пр
 DocType: Customer,Address and Contact,Адреса и контакт
 DocType: Customer,Last Day of the Next Month,Последњи дан наредног мјесеца
 DocType: Employee,Feedback,Повратна веза
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Инцл. Распоред
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Инцл. Распоред
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Брусни Јет машинска обрада
 DocType: Stock Settings,Freeze Stock Entries,Фреезе уносе берза
 DocType: Website Settings,Website Settings,Сајт Подешавања
@@ -2443,11 +2453,11 @@ DocType: Quality Inspection,Outgoing,Друштвен
 DocType: Material Request,Requested For,Тражени За
 DocType: Quotation Item,Against Doctype,Против ДОЦТИПЕ
 DocType: Delivery Note,Track this Delivery Note against any Project,Прати ову напомену Испорука против било ког пројекта
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Корневая учетная запись не может быть удалена
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Корневая учетная запись не может быть удалена
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Схов Сток уноси
 ,Is Primary Address,Примарна Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Рад у прогресу Магацин
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управљање адресе
 DocType: Pricing Rule,Item Code,Шифра
 DocType: Production Planning Tool,Create Production Orders,Креирање налога Производне
@@ -2456,14 +2466,14 @@ DocType: Journal Entry,User Remark,Корисник Напомена
 DocType: Lead,Market Segment,Сегмент тржишта
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Запослени Интерна Рад Историја
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Затварање (др)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Затварање (др)
 DocType: Contact,Passive,Пасиван
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серийный номер {0} не в наличии
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Налоговый шаблон для продажи сделок.
 DocType: Sales Invoice,Write Off Outstanding Amount,Отпис неизмирени износ
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Проверите да ли вам је потребна аутоматским понављајућих рачуне. Након подношења било продаје фактуру, понавља одељак ће бити видљив."
 DocType: Account,Accounts Manager,Рачуни менаџер
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Время входа {0} должен быть ' Представленные '
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Время входа {0} должен быть ' Представленные '
 DocType: Stock Settings,Default Stock UOM,Уобичајено берза УОМ
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Кошта Рате на основу Типе активност (по сату)
 DocType: Production Planning Tool,Create Material Requests,Креирате захтеве Материјал
@@ -2474,7 +2484,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Банка помирење
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Гет Упдатес
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Додајте неколико узорака евиденцију
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Оставите Манагемент
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставите Манагемент
 DocType: Event,Groups,Групе
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
 DocType: Sales Order,Fully Delivered,Потпуно Испоручено
@@ -2486,11 +2496,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Продаја Екстра
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} против МВЗ {2} будет превышать {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Царри Форвардед Леавес
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
 ,Stock Projected Qty,Пројектовани Стоцк Кти
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Куповина нарудзбини
 DocType: Warranty Claim,From Company,Из компаније
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Кол
@@ -2503,13 +2512,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Продавац на мало
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сви Типови добављача
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Цитата {0} не типа {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржавање Распоред шифра
 DocType: Sales Order,%  Delivered,Испоручено %
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк Овердрафт счета
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Маке плата Слип
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,отпушити
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Бровсе БОМ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Обеспеченные кредиты
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие Продукты
@@ -2519,7 +2527,7 @@ DocType: Appraisal,Appraisal,Процена
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Лост-пена ливење
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Цртеж
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Датум се понавља
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
 DocType: Hub Settings,Seller Email,Продавац маил
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Укупно набавној вредности (преко фактури)
 DocType: Workstation Working Hour,Start Time,Почетак Време
@@ -2533,8 +2541,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
 DocType: BOM Operation,Hour Rate,Стопа час
 DocType: Stock Settings,Item Naming By,Шифра назив под
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Од понуде
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Од понуде
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
 DocType: Production Order,Material Transferred for Manufacturing,Материјал пребачени на Мануфацтуринг
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Рачун {0} не постоји
 DocType: Purchase Receipt Item,Purchase Order Item No,Налог за куповину артикал број
@@ -2547,11 +2555,11 @@ DocType: Item,Inspection Required,Инспекција Обавезно
 DocType: Purchase Invoice Item,PR Detail,ПР Детаљ
 DocType: Sales Order,Fully Billed,Потпуно Изграђена
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Наличность кассовая
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Испорука складиште потребно за лагеру предмета {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Испорука складиште потребно за лагеру предмета {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина пакета. Обично нето тежина + амбалаже тежина. (За штампу)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисници са овом улогом је дозвољено да подесите замрзнуте рачуне и створити / модификује рачуноводствене уносе против замрзнутим рачунима
 DocType: Serial No,Is Cancelled,Да ли Отказан
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Моје пошиљке
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Моје пошиљке
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Чак и ако постоји више Цене правила са највишим приоритетом, онда следећи интерни приоритети се примењују:"
 DocType: Supplier,Supplier Details,Добављачи Детаљи
@@ -2564,7 +2572,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Вире Трансфер
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Изаберите банковни рачун
 DocType: Newsletter,Create and Send Newsletters,Стварање и слање Билтен
-sites/assets/js/report.min.js +107,From Date must be before To Date,Од датума мора да буде пре датума
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Од датума мора да буде пре датума
 DocType: Sales Order,Recurring Order,Понављало Ордер
 DocType: Company,Default Income Account,Уобичајено прихода Рачун
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Кориснички Група / Кориснички
@@ -2579,31 +2587,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Берза УОМ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 ,Projected,пројектован
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по - доставки и избыточного бронирования по пункту {0} как количестве 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по - доставки и избыточного бронирования по пункту {0} как количестве 0
 DocType: Notification Control,Quotation Message,Цитат Порука
 DocType: Issue,Opening Date,Датум отварања
 DocType: Journal Entry,Remark,Примедба
 DocType: Purchase Receipt Item,Rate and Amount,Стопа и износ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Досадан
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Од продајних налога
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Од продајних налога
 DocType: Blog Category,Parent Website Route,Родитель Сайт Маршрут
 DocType: Sales Order,Not Billed,Није Изграђена
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Оба Магацин мора припадати истој компанији
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Нема контаката додао.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Нема контаката додао.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Није активна
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Против Фактура датум постања
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Слетео Трошкови Ваучер Износ
 DocType: Time Log,Batched for Billing,Дозирана за наплату
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Рачуни подигао Добављачи.
 DocType: POS Profile,Write Off Account,Отпис налог
-sites/assets/js/erpnext.min.js +26,Discount Amount,Сумма скидки
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повратак против фактури
 DocType: Item,Warranty Period (in days),Гарантни период (у данима)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,например НДС
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Тачка 4
 DocType: Journal Entry Account,Journal Entry Account,Јоурнал Ентри рачуна
 DocType: Shopping Cart Settings,Quotation Series,Цитат Серија
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Врелог метала гаса формирање
 DocType: Sales Order Item,Sales Order Date,Продаја Датум поруџбине
 DocType: Sales Invoice Item,Delivered Qty,Испоручено Кол
@@ -2635,10 +2642,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Купца или добављача Детаљи
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,набор
 DocType: Lead,Lead Owner,Олово Власник
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Је потребно Складиште
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Је потребно Складиште
 DocType: Employee,Marital Status,Брачни статус
 DocType: Stock Settings,Auto Material Request,Ауто Материјал Захтев
 DocType: Time Log,Will be updated when billed.,Да ли ће се ажурирати када наплаћени.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Доступно Серија ком на Од Варехоусе
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,"Текущий спецификации и Нью- BOM не может быть таким же,"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 DocType: Sales Invoice,Against Income Account,Против приход
@@ -2655,12 +2663,12 @@ DocType: POS Profile,Update Stock,Упдате Стоцк
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Суперфинисхинг
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто . Убедитесь, что вес нетто каждого элемента находится в том же UOM ."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,БОМ курс
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Јоурнал Ентриес {0} су УН-линкед
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Снимање свих комуникација типа е-маил, телефон, цхат, посете, итд"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Молимо да наведете заокружују трошка у компанији
 DocType: Purchase Invoice,Terms,услови
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Цреате Нев
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Цреате Нев
 DocType: Buying Settings,Purchase Order Required,Наруџбенице Обавезно
 ,Item-wise Sales History,Тачка-мудар Продаја Историја
 DocType: Expense Claim,Total Sanctioned Amount,Укупан износ санкционисан
@@ -2677,16 +2685,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Плата Слип Одб
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Белешке
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Изаберите групу чвор прво.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цель должна быть одна из {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Попуните формулар и да га сачувате
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Попуните формулар и да га сачувате
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Преузмите извештај садржи све сировине са њиховим најновијим инвентара статусу
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Фацинг
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
 DocType: Leave Application,Leave Balance Before Application,Оставите биланс Пре пријаве
 DocType: SMS Center,Send SMS,Пошаљи СМС
 DocType: Company,Default Letter Head,Уобичајено Леттер Хеад
 DocType: Time Log,Billable,Уплатилац
 DocType: Authorization Rule,This will be used for setting rule in HR module,Ово ће се користити за постављање правила у ХР модулу
 DocType: Account,Rate at which this tax is applied,Стопа по којој се примењује овај порез
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Реордер ком
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Реордер ком
 DocType: Company,Stock Adjustment Account,Стоцк Подешавање налога
 DocType: Journal Entry,Write Off,Отписати
 DocType: Time Log,Operation ID,Операција ИД
@@ -2697,12 +2706,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Попуст Поља ће бити доступан у нарудзбенице, Куповина записа, фактури"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име новог налога. Напомена: Молимо вас да не стварају налоге за купцима и добављачима
 DocType: Report,Report Type,Врста извештаја
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Утовар
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Утовар
 DocType: BOM Replace Tool,BOM Replace Tool,БОМ Замена алата
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Земља мудар подразумевана адреса шаблон
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Добављач доставља клијенту
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Покажи пореза распада
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Подаци Увоз и извоз
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Если вы привлечь в производственной деятельности. Включает элемент ' производится '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Фактура датум постања
 DocType: Sales Invoice,Rounded Total,Роундед Укупно
 DocType: Product Bundle,List items that form the package.,Листа ствари које чине пакет.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
@@ -2713,8 +2725,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
 DocType: Company,Default Cash Account,Уобичајено готовински рачун
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компания ( не клиента или поставщика ) хозяин.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не является допустимым номер партии по пункту {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
@@ -2733,11 +2745,12 @@ apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabl
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави као Опен
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Пошаљи аутоматске поруке е-поште у Контакте о достављању трансакцијама.
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Тачка 3
+DocType: Purchase Order,Customer Contact Email,Кориснички Контакт Е-маил
 DocType: Event,Sunday,Недеља
 DocType: Sales Team,Contribution (%),Учешће (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Шаблон
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продаја Особа Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Пожалуйста, введите не менее чем 1 -фактуру в таблице"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Додај корисника
@@ -2746,7 +2759,7 @@ DocType: Task,Actual Start Date (via Time Logs),Стварна Датум поч
 DocType: Stock Reconciliation Item,Before reconciliation,Пре помирења
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Да {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Порези и накнаде додавања (Друштво валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Делимично Изграђена
 DocType: Item,Default BOM,Уобичајено БОМ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Децамберинг
@@ -2754,12 +2767,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Укупно Изванредна Амт
 DocType: Time Log Batch,Total Hours,Укупно време
 DocType: Journal Entry,Printing Settings,Принтинг Подешавања
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,аутомобилски
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Листья для типа {0} уже выделено Требуются {1} для финансового года {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Пункт требуется
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метални бризгање
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Из доставница
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Из доставница
 DocType: Time Log,From Time,Од времена
 DocType: Notification Control,Custom Message,Прилагођена порука
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестиционо банкарство
@@ -2775,10 +2787,10 @@ DocType: Newsletter,A Lead with this email id should exist,Олово са ов
 DocType: Stock Entry,From BOM,Од БОМ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Сток трансакције пре {0} су замрзнути
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку "" Generate Расписание """
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Да Дате треба да буде исти као Од датума за полудневни одсуство
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку "" Generate Расписание """
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Да Дате треба да буде исти као Од датума за полудневни одсуство
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","нпр Кг, Јединица, Нос, м"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
 DocType: Salary Structure,Salary Structure,Плата Структура
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2786,7 +2798,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
 , са приоритетом. Цена Правила: {0}"
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,ваздушна линија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Питање Материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Питање Материјал
 DocType: Material Request Item,For Warehouse,За Варехоусе
 DocType: Employee,Offer Date,Понуда Датум
 DocType: Hub Settings,Access Token,Приступ токен
@@ -2809,6 +2821,7 @@ DocType: Issue,Opening Time,Радно време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты , необходимых"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
+DocType: Delivery Note Item,From Warehouse,Од Варехоусе
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Бушење
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Дување
 DocType: Purchase Taxes and Charges,Valuation and Total,Вредновање и Тотал
@@ -2830,11 +2843,12 @@ DocType: C-Form,Amended From,Измењена од
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,сырье
 DocType: Leave Application,Follow via Email,Пратите преко е-поште
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи . Вы не можете удалить этот аккаунт .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи . Вы не можете удалить этот аккаунт .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Либо целевой Количество или целевое количество является обязательным
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Молимо Вас да изаберете датум постања први
-DocType: Leave Allocation,Carry Forward,Пренети
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Молимо Вас да изаберете датум постања први
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Датум отварања треба да буде пре затварања Дате
+DocType: Leave Control Panel,Carry Forward,Пренети
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,МВЗ с существующими сделок не могут быть преобразованы в книге
 DocType: Department,Days for which Holidays are blocked for this department.,Дани за које Празници су блокирани овом одељењу.
 ,Produced,произведен
@@ -2855,17 +2869,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Укупно (Амт)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
 DocType: Purchase Order,The date on which recurring order will be stop,Датум када се понавља налог ће бити зауставити
 DocType: Quality Inspection,Item Serial No,Ставка Сериал но
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора бити смањена за {1} или би требало да повећа толеранцију преливања
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора бити смањена за {1} или би требало да повећа толеранцију преливања
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Укупно Поклон
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серијализованом артикла {0} не може да се ажурира \
  користећи Сток помирење"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Пребаци Материјал добављачу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Пребаци Материјал добављачу
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад . Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Олово Тип
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Направи понуду
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Все эти предметы уже выставлен счет
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Все эти предметы уже выставлен счет
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Может быть одобрено {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Правило услови испоруке
 DocType: BOM Replace Tool,The new BOM after replacement,Нови БОМ након замене
@@ -2913,7 +2927,7 @@ DocType: C-Form,C-Form,Ц-Форм
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Операција ИД није сет
 DocType: Production Order,Planned Start Date,Планирани датум почетка
 DocType: Serial No,Creation Document Type,Документ регистрације Тип
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Инцл. Посета
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Инцл. Посета
 DocType: Leave Type,Is Encash,Да ли уновчити
 DocType: Purchase Invoice,Mobile No,Мобилни Нема
 DocType: Payment Tool,Make Journal Entry,Маке Јоурнал Ентри
@@ -2921,7 +2935,7 @@ DocType: Leave Allocation,New Leaves Allocated,Нови Леавес Издво
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Очекивани датум завршетка
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,коммерческий
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,коммерческий
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родитељ артикла {0} не сме бити лагеру предмета
 DocType: Cost Center,Distribution Id,Дистрибуција Ид
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
@@ -2937,14 +2951,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредност атрибута за {0} мора бити у распону од {1} {2} да у корацима од {3}
 DocType: Tax Rule,Sales,Продајни
 DocType: Stock Entry Detail,Basic Amount,Основни Износ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Кр
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+DocType: Leave Allocation,Unused leaves,Неискоришћени листови
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Кр
 DocType: Customer,Default Receivable Accounts,Уобичајено Рецеивабле Аццоунтс
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Тестерисање
 DocType: Tax Rule,Billing State,Тецх Стате
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламинација
 DocType: Item Reorder,Transfer,Пренос
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
@@ -2960,6 +2975,7 @@ DocType: Company,Retail,Малопродаја
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Одсутан
 DocType: Product Bundle,Product Bundle,Производ Бундле
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Црусхинг
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купите порези и таксе Темплате
 DocType: Upload Attendance,Download Template,Преузмите шаблон
@@ -2967,16 +2983,16 @@ DocType: GL Entry,Remarks,Примедбе
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Сировина Шифра
 DocType: Journal Entry,Write Off Based On,Отпис Басед Он
 DocType: Features Setup,POS View,ПОС Погледај
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Инсталација рекорд за серијским бр
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Инсталација рекорд за серијским бр
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Континуирано ливење
-sites/assets/js/erpnext.min.js +10,Please specify a,Наведите
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Наведите
 DocType: Offer Letter,Awaiting Response,Очекујем одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Горе
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Хладно димензионисање
 DocType: Salary Slip,Earning & Deduction,Зарада и дедукције
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Счет {0} не может быть группа
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Регија
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
 DocType: Holiday List,Weekly Off,Недељни Искључено
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За нпр 2012, 2012-13"
@@ -3020,12 +3036,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Испупчен
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Евапоративе-образац ливење
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,представительские расходы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Старост
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Старост
 DocType: Time Log,Billing Amount,Обрачун Износ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Неверный количество, указанное для элемента {0} . Количество должно быть больше 0 ."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Пријаве за одмор.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Счет с существующей сделки не могут быть удалены
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Счет с существующей сделки не могут быть удалены
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,судебные издержки
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Дан у месецу на којем би аутоматски ће се генерисати нпр 05, 28 итд"
 DocType: Sales Invoice,Posting Time,Постављање Време
@@ -3034,9 +3050,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Лого
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Проверите ово ако желите да натера кориснику да одабере серију пре чувања. Неће бити подразумевано ако проверите ово.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Нет товара с серийным № {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Отворене Обавештења
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Отворене Обавештења
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,прямые расходы
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Да ли стварно желите да Отпушити овај материјал захтев ?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Нови Кориснички Приход
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Командировочные расходы
 DocType: Maintenance Visit,Breakdown,Слом
@@ -3047,7 +3062,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Као и на датум
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Хонинг
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,пробни рад
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
 DocType: Feed,Full Name,Пуно име
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Цлинцхинг
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
@@ -3070,7 +3085,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Додајте
 DocType: Buying Settings,Default Supplier Type,Уобичајено Снабдевач Тип
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Вађење
 DocType: Production Order,Total Operating Cost,Укупни оперативни трошкови
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Сви контакти.
 DocType: Newsletter,Test Email Id,Тест маил Ид
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Компанија Скраћеница
@@ -3094,11 +3109,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цит
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улога дозвољено да мењате замрзнуте залихе
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Пореска Шаблон је обавезно.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Рачун {0}: {1 Родитељ рачун} не постоји
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник Цена (Друштво валута)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',"{0} {1} статус "" Остановлен """
 DocType: Account,Temporary,Привремен
 DocType: Address,Preferred Billing Address,Жељени Адреса за наплату
 DocType: Monthly Distribution Percentage,Percentage Allocation,Проценат расподеле
@@ -3116,13 +3130,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый
 DocType: Purchase Order Item,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Пеглање
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} је заустављена
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} је заустављена
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
 DocType: Lead,Add to calendar on this date,Додај у календар овог датума
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила для добавления стоимости доставки .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Предстојећи догађаји
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстојећи догађаји
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Требуется клиентов
 DocType: Letter Head,Letter Head,Писмо Глава
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Брзо Ступање
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} је обавезна за повратак
 DocType: Purchase Order,To Receive,Примити
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Скупи Фиттинг
@@ -3146,25 +3161,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
 DocType: Serial No,Out of Warranty,Од гаранције
 DocType: BOM Replace Tool,Replace,Заменити
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
 DocType: Purchase Invoice Item,Project Name,Назив пројекта
 DocType: Supplier,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
 DocType: Workflow State,Edit,Едит
 DocType: Journal Entry Account,If Income or Expense,Ако прихода или расхода
 DocType: Features Setup,Item Batch Nos,Итем Батцх Нос
 DocType: Stock Ledger Entry,Stock Value Difference,Вредност акције Разлика
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Људски Ресурси
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Људски Ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Плаћање Плаћање Помирење
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,налоговые активы
 DocType: BOM Item,BOM No,БОМ Нема
 DocType: Contact Us Settings,Pincode,Пинцоде
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Јоурнал Ентри {0} нема налог {1} или већ упарен против другог ваучера
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Јоурнал Ентри {0} нема налог {1} или већ упарен против другог ваучера
 DocType: Item,Moving Average,Мовинг Авераге
 DocType: BOM Replace Tool,The BOM which will be replaced,БОМ који ће бити замењен
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Новый фонда единица измерения должна отличаться от текущей фондовой UOM
 DocType: Account,Debit,Задужење
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
 DocType: Production Order,Operation Cost,Операција кошта
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Постави присуство из ЦСВ датотеке.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Изузетан Амт
@@ -3172,7 +3187,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Пос
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Да бисте доделили овај проблем, користите "Ассигн" дугме у сидебар."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Морозильники Акции старше, чем [ дней ]"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако два или више Цене Правила су пронадјени на основу горе наведеним условима, Приоритет се примењује. Приоритет је број између 0 до 20, док стандардна вредност нула (празно). Већи број значи да ће имати предност ако постоји више Цене Правила са истим условима."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Против рацун
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Фискална година: {0} не постоји
 DocType: Currency Exchange,To Currency,Валутном
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Дозволи следеће корисницима да одобри Апликације оставити за блок дана.
@@ -3201,7 +3215,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ст
 DocType: Stock Entry Detail,Additional Cost,Додатни трошак
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Финансовый год Дата окончания
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Направи понуду добављача
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Направи понуду добављача
 DocType: Quality Inspection,Incoming,Долазни
 DocType: BOM,Materials Required (Exploded),Материјали Обавезно (Екплодед)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Смањите Зарада за дозволу без плате (ЛВП)
@@ -3209,10 +3223,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Серијски број {1} не одговара {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,Батцх ИД
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Достава Напомена трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Овонедељном Преглед
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} должен быть куплены или субподрядчиком Пункт в строке {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} должен быть куплены или субподрядчиком Пункт в строке {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Рачун: {0} може да се ажурира само преко Стоцк промету
 DocType: GL Entry,Party,Странка
 DocType: Sales Order,Delivery Date,Датум испоруке
@@ -3225,7 +3239,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Про. Куповни
 DocType: Task,Actual Time (in Hours),Тренутно време (у сатима)
 DocType: Employee,History In Company,Историја У друштву
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Билтен
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Билтен
 DocType: Address,Shipping,Шпедиција
 DocType: Stock Ledger Entry,Stock Ledger Entry,Берза Леџер Ентри
 DocType: Department,Leave Block List,Оставите Блоцк Лист
@@ -3244,7 +3258,7 @@ DocType: Account,Auditor,Ревизор
 DocType: Purchase Order,End date of current order's period,Датум завршетка периода постојећи поредак је
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Маке Оффер Леттер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Повратак
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Уобичајено Јединица мере за варијанту морају бити исти као шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Уобичајено Јединица мере за варијанту морају бити исти као шаблон
 DocType: DocField,Fold,Преклопити
 DocType: Production Order Operation,Production Order Operation,Производња Ордер Операција
 DocType: Pricing Rule,Disable,запрещать
@@ -3276,7 +3290,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Извештаји
 DocType: SMS Settings,Enter url parameter for receiver nos,Унесите УРЛ параметар за пријемник бр
 DocType: Sales Invoice,Paid Amount,Плаћени Износ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',"Закрытие счета {0} должен быть типа "" ответственности """
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Закрытие счета {0} должен быть типа "" ответственности """
 ,Available Stock for Packing Items,На располагању лагер за паковање ставке
 DocType: Item Variant,Item Variant,Итем Варијанта
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Постављање Ова адреса шаблон као подразумевани, јер не постоји други подразумевани"
@@ -3284,7 +3298,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управљање квалитетом
 DocType: Production Planning Tool,Filter based on customer,Филтер на бази купца
 DocType: Payment Tool Detail,Against Voucher No,Против ваучера Но
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Запослени Спољни Рад Историја
 DocType: Tax Rule,Purchase,Куповина
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Стање Кол
@@ -3321,28 +3335,29 @@ Note: BOM = Bill of Materials","Агрегат група ** ** ставки у
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Серийный номер является обязательным для п. {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Наведите из / у распону
-sites/assets/js/desk.min.js +7652,Created By,Креирао
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Креирао
 DocType: Serial No,Under AMC,Под АМЦ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Ставка вредновање стопа израчунава обзиром слетео трошкова ваучера износ
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Настройки по умолчанию для продажи сделок .
 DocType: BOM Replace Tool,Current BOM,Тренутни БОМ
-sites/assets/js/erpnext.min.js +8,Add Serial No,Додај сериал но
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Додај сериал но
 DocType: Production Order,Warehouses,Складишта
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Печать и стационарное
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Група Ноде
 DocType: Payment Reconciliation,Minimum Amount,Минимални износ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Ажурирање готове робе
 DocType: Workstation,per hour,на сат
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Серия {0} уже используется в {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Серия {0} уже используется в {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рачун за складишта ( сталне инвентуре ) ће бити направљен у оквиру овог рачуна .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада .
 DocType: Company,Distribution,Дистрибуција
-sites/assets/js/erpnext.min.js +50,Amount Paid,Износ Плаћени
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Износ Плаћени
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Пројецт Манагер
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,депеша
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Максимална дозвољена попуст за ставку: {0} је {1}%
 DocType: Customer,Default Taxes and Charges,Уобичајено таксе и накнаде
 DocType: Account,Receivable,Дебиторская задолженность
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Није дозвољено да промени снабдевача као Пурцхасе Ордер већ постоји
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улога која је дозвољено да поднесе трансакције које превазилазе кредитне лимите.
 DocType: Sales Invoice,Supplier Reference,Снабдевач Референтна
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ако је проверен, бом за под-монтаже ставки ће бити узети у обзир за добијање сировина. Иначе, сви суб-монтажни ставке ће бити третирани као сировина."
@@ -3379,8 +3394,8 @@ DocType: Email Digest,Add/Remove Recipients,Адд / Ремове примала
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да бисте подесили ову фискалну годину , као подразумевајуће , кликните на "" Сет ас Дефаулт '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Настройка сервера входящей для поддержки электронный идентификатор . (например support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Мањак Количина
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Salary Slip,Salary Slip,Плата Слип
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Брунирање
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' To Date ' требуется
@@ -3393,6 +3408,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Када неки од селектираних трансакција "Послао", е поп-уп аутоматски отворила послати емаил на вези "Контакт" у тој трансакцији, са трансакцијом као прилог. Корисник може или не може да пошаље поруку."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Глобальные настройки
 DocType: Employee Education,Employee Education,Запослени Образовање
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
 DocType: Salary Slip,Net Pay,Нето плата
 DocType: Account,Account,рачун
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Серийный номер {0} уже получил
@@ -3425,7 +3441,7 @@ DocType: BOM,Manufacturing User,Производња Корисник
 DocType: Purchase Order,Raw Materials Supplied,Сировине комплету
 DocType: Purchase Invoice,Recurring Print Format,Поновни Принт Формат
 DocType: Communication,Series,серија
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Ожидаемая дата поставки не может быть до заказа на Дата
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Ожидаемая дата поставки не может быть до заказа на Дата
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Communication,Email,Е-маил
 DocType: Item Group,Item Classification,Итем Класификација
@@ -3481,6 +3497,7 @@ DocType: HR Settings,Payroll Settings,Платне Подешавања
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Матцх нису повезане фактурама и уплатама.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Извршите поруџбину
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корен не може имати центар родитеља трошкова
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Изабери Марка ...
 DocType: Sales Invoice,C-Form Applicable,Ц-примењује
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
 DocType: Supplier,Address and Contacts,Адреса и контакти
@@ -3491,7 +3508,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Гет Изванредна ваучери
 DocType: Warranty Claim,Resolved By,Решен
 DocType: Appraisal,Start Date,Датум почетка
-sites/assets/js/desk.min.js +7629,Value,Вредност
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Вредност
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Выделите листья на определенный срок.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Кликните овде да бисте проверили
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Рачун {0}: Не може да се доделити као родитељ налог
@@ -3507,14 +3524,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Дропбок дозвољен приступ
 DocType: Dropbox Backup,Weekly,Недељни
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Нпр. смсгатеваи.цом / апи / сенд_смс.цги
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Пријем
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Пријем
 DocType: Maintenance Visit,Fully Completed,Потпуно Завршено
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Комплетна
 DocType: Employee,Educational Qualification,Образовни Квалификације
 DocType: Workstation,Operating Costs,Оперативни трошкови
 DocType: Employee Leave Approver,Employee Leave Approver,Запослени одсуство одобраватељ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} је успешно додат у нашој листи билтен.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Електронски сноп машинска обрада
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Куповина Мастер менаџер
@@ -3527,7 +3544,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Превдоц ДОЦТИПЕ
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Додај / измени Прицес
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Дијаграм трошкова центара
 ,Requested Items To Be Ordered,Тражени ставке за Ж
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Ми Ордерс
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Ми Ордерс
 DocType: Price List,Price List Name,Ценовник Име
 DocType: Time Log,For Manufacturing,За производњу
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Укупно
@@ -3538,7 +3555,7 @@ DocType: Account,Income,доход
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Нешто није у реду!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Завршетак датум
 DocType: Purchase Invoice Item,Amount (Company Currency),Износ (Друштво валута)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Ливеног
@@ -3552,10 +3569,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Година
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Поинт-оф-Сале Профиле
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Молимо Упдате СМС Сеттингс
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Време се {0} већ наплаћено
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Време се {0} већ наплаћено
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Трошкови Име центар
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Пункт {0} с серийным № уже установлена ​​{1}
 DocType: Maintenance Schedule Detail,Scheduled Date,Планиран датум
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Укупно Плаћени Амт
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Порука већи од 160 карактера ће бити подељен на више Упис
@@ -3563,10 +3579,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Примио и прихв
 ,Serial No Service Contract Expiry,Серијски број услуга Уговор Истек
 DocType: Item,Unit of Measure Conversion,Јединица мере Цонверсион
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Запослени не може да се промени
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
 DocType: Naming Series,Help HTML,Помоћ ХТМЛ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100% . Это {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Исправка за преко-{0} {прешао за тачке 1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Исправка за преко-{0} {прешао за тачке 1}
 DocType: Address,Name of person or organization that this address belongs to.,Име особе или организације која је ова адреса припада.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ваши Добављачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
@@ -3577,10 +3593,11 @@ DocType: Lead,Converted,Претворено
 DocType: Item,Has Serial No,Има Серијски број
 DocType: Employee,Date of Issue,Датум издавања
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Од {0} {1} за
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
 DocType: Issue,Content Type,Тип садржаја
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,рачунар
 DocType: Item,List this Item in multiple groups on the website.,Наведи ову ставку у више група на сајту.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Итем: {0} не постоји у систему
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
 DocType: Payment Reconciliation,Get Unreconciled Entries,Гет неусаглашених уносе
@@ -3591,14 +3608,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Да Варехоусе
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Счет {0} был введен более чем один раз в течение финансового года {1}
 ,Average Commission Rate,Просечан курс Комисија
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Гледалаца не може бити означен за будуће датуме
 DocType: Pricing Rule,Pricing Rule Help,Правилник о ценама Помоћ
 DocType: Purchase Taxes and Charges,Account Head,Рачун шеф
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Упдате додатне трошкове да израчуна слетео трошак ставке
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Укупна вредност Разлика (Оут - Ин)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен Требуются {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Бомбирању
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Од право на гаранцију
@@ -3612,15 +3629,17 @@ DocType: Buying Settings,Naming Series,Именовање Сериес
 DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
 DocType: User,Enabled,Омогућено
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,фондовые активы
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},"Вы действительно хотите , чтобы представить все Зарплата Слип для месяца {0} и год {1}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Вы действительно хотите , чтобы представить все Зарплата Слип для месяца {0} и год {1}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Увоз Претплатници
 DocType: Target Detail,Target Qty,Циљна Кол
 DocType: Attendance,Present,Представљање
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Доставка Примечание {0} не должны быть представлены
 DocType: Notification Control,Sales Invoice Message,Продаја Рачун Порука
 DocType: Authorization Rule,Based On,На Дана
-,Ordered Qty,Ж Кол
+DocType: Sales Order Item,Ordered Qty,Ж Кол
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Пројекат активност / задатак.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Генериши стаје ПЛАТА
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} не является допустимым ID E-mail
@@ -3660,7 +3679,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Уплоад присуствовање
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,БОМ и Производња Количина се тражи
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старење Опсег 2
-DocType: Journal Entry Account,Amount,Износ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Износ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Риветинг
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,БОМ заменио
 ,Sales Analytics,Продаја Аналитика
@@ -3687,7 +3706,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекивани датум не може бити пре Материјал Захтев Датум
 DocType: Contact Us Settings,City,Град
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ултразвучна машинска обрада
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Грешка: Не важи? Ид?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Грешка: Не важи? Ид?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
 DocType: Naming Series,Update Series Number,Упдате Број
 DocType: Account,Equity,капитал
@@ -3702,7 +3721,7 @@ DocType: Purchase Taxes and Charges,Actual,Стваран
 DocType: Authorization Rule,Customerwise Discount,Цустомервисе Попуст
 DocType: Purchase Invoice,Against Expense Account,Против трошковником налог
 DocType: Production Order,Production Order,Продуцтион Ордер
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
 DocType: Quotation Item,Against Docname,Против Доцнаме
 DocType: SMS Center,All Employee (Active),Све Запослени (активна)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Погледај Сада
@@ -3710,14 +3729,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Сировина Трошак
 DocType: Item,Re-Order Level,Поново би Левел
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Унесите ставке и планирани Кол за које желите да подигне наређења производне или преузети сировине за анализу.
-sites/assets/js/list.min.js +174,Gantt Chart,Гантт Цхарт
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Гантт Цхарт
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Скраћено
 DocType: Employee,Applicable Holiday List,Важећи Холидаи Листа
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серијски број серија
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Малопродаја и велепродаја
 DocType: Issue,First Responded On,Прво одговорила
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Оглас крст од предмета на више група
@@ -3732,7 +3751,7 @@ DocType: Attendance,Attendance,Похађање
 DocType: Page,No,Не
 DocType: BOM,Materials,Материјали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако се не проверава, листа ће морати да се дода сваком одељењу где има да се примењује."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Дата публикации и постављање време је обавезна
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Дата публикации и постављање време је обавезна
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Налоговый шаблон для покупки сделок.
 ,Item Prices,Итем Цене
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,У речи ће бити видљив када сачувате поруџбеницу.
@@ -3752,9 +3771,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,административные затраты
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родитељ групу потрошача
-sites/assets/js/erpnext.min.js +50,Change,Промена
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промена
 DocType: Purchase Invoice,Contact Email,Контакт Емаил
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',"Заказ на {0} ' Остановлена ​​"""
 DocType: Appraisal Goal,Score Earned,Оцена Еарнед
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","например "" Моя компания ООО """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Отказни рок
@@ -3764,12 +3782,13 @@ DocType: Packing Slip,Gross Weight UOM,Бруто тежина УОМ
 DocType: Email Digest,Receivables / Payables,Потраживања / Обавезе
 DocType: Delivery Note Item,Against Sales Invoice,Против продаје фактура
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Жигосање
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитни рачун
 DocType: Landed Cost Item,Landed Cost Item,Слетео Цена артикла
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Схов нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количина тачке добија након производњи / препакивање од датих количине сировина
 DocType: Payment Reconciliation,Receivable / Payable Account,Примања / обавезе налог
 DocType: Delivery Note Item,Against Sales Order Item,Против продаје Ордер тачком
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
 DocType: Item,Default Warehouse,Уобичајено Магацин
 DocType: Task,Actual End Date (via Time Logs),Стварна Датум завршетка (преко Тиме Протоколи)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Буџет не може бити додељен против групе рачуна {0}
@@ -3783,7 +3802,7 @@ DocType: Issue,Support Team,Тим за подршку
 DocType: Appraisal,Total Score (Out of 5),Укупна оцена (Оут оф 5)
 DocType: Contact Us Settings,State,Држава
 DocType: Batch,Batch,Серија
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Укупни расходи Цлаим (преко Расходи потраживања)
 DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Задужењу
@@ -3799,9 +3818,8 @@ DocType: Lead,Blog Subscriber,Блог Претплатник
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Создание правил для ограничения операций на основе значений .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Уколико је означено, Укупно нема. радних дана ће се укључити празника, а то ће смањити вредност зараде по дану"
 DocType: Purchase Invoice,Total Advance,Укупно Адванце
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Отпушити Материјал Захтев
 DocType: Workflow State,User,Корисник
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Обрада платног списка
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Обрада платног списка
 DocType: Opportunity Item,Basic Rate,Основна стопа
 DocType: GL Entry,Credit Amount,Износ кредита
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Постави као Лост
@@ -3809,7 +3827,7 @@ DocType: Customer,Credit Days Based On,Кредитни дана по основ
 DocType: Tax Rule,Tax Rule,Пореска Правило
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Одржавајте исту стопу Широм продајног циклуса
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,План време дневнике ван Воркстатион радног времена.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} уже представлен
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} уже представлен
 ,Items To Be Requested,Артикли бити затражено
 DocType: Purchase Order,Get Last Purchase Rate,Гет Ласт Рате Куповина
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Обрачун курс заснован на врсти дјелатности (по сату)
@@ -3818,6 +3836,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Компании e-mail ID не найден, следовательно, Почта не отправляется"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств ( активов )
 DocType: Production Planning Tool,Filter based on item,Филтер на бази ставке
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Текући рачуни
 DocType: Fiscal Year,Year Start Date,Датум почетка године
 DocType: Attendance,Employee Name,Запослени Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Заобљени Укупно (Друштво валута)
@@ -3829,14 +3848,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Слепи
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Примања запослених
 DocType: Sales Invoice,Is POS,Да ли је ПОС
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Произведено Кол
 DocType: Purchase Receipt Item,Accepted Quantity,Прихваћено Количина
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постоји
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Рачуни подигао купцима.
 DocType: DocField,Default,Уобичајено
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Ид пројецт
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} је додао претплатници
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Дефинисати буџет за ову трошкова Центра. Да бисте поставили буџета акцију, погледајте "Компанија Листа""
@@ -3844,7 +3863,7 @@ DocType: Account,Parent Account,Родитељ рачуна
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Средиште
 DocType: GL Entry,Voucher Type,Тип ваучера 
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ценовник није пронађен или онемогућен
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценовник није пронађен или онемогућен
 DocType: Expense Claim,Approved,Одобрено
 DocType: Pricing Rule,Price,цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
@@ -3853,23 +3872,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,образовање
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Тренутна Адреса Је
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Опција. Поставља подразумевану валуту компаније, ако није наведено."
 DocType: Address,Office,Канцеларија
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартные отчеты
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Рачуноводствене ставке дневника.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Партија / налог не подудара са {1} / {2} {3} у {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно на ком Од Варехоусе
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Партија / налог не подудара са {1} / {2} {3} у {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Да бисте креирали пореском билансу
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Унесите налог Екпенсе
 DocType: Account,Stock,Залиха
 DocType: Employee,Current Address,Тренутна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако ставка је варијанта неким другим онда опис, слике, цене, порези итд ће бити постављен из шаблона, осим ако изричито наведено"
 DocType: Serial No,Purchase / Manufacture Details,Куповина / Производња Детаљи
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Серија Инвентар
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Серија Инвентар
 DocType: Employee,Contract End Date,Уговор Датум завршетка
 DocType: Sales Order,Track this Sales Order against any Project,Прати овај продајни налог против било ког пројекта
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Повуците продајне налоге (чека да испоручи) на основу наведених критеријума
 DocType: DocShare,Document Type,Доцумент Типе
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Од понуде добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Од понуде добављача
 DocType: Deduction Type,Deduction Type,Одбитак Тип
 DocType: Attendance,Half Day,Пола дана
 DocType: Pricing Rule,Min Qty,Мин Кол-во
@@ -3880,20 +3901,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,За Количина (Мануфацтуред Кти) је обавезан
 DocType: Stock Entry,Default Target Warehouse,Уобичајено Циљна Магацин
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Укупно (Друштво валута)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Партија Тип и странка се примењује само против примања / обавезе рачуна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Партија Тип и странка се примењује само против примања / обавезе рачуна
 DocType: Notification Control,Purchase Receipt Message,Куповина примање порука
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Укупно издвојена листови су више од периода
 DocType: Production Order,Actual Start Date,Сунце Датум почетка
 DocType: Sales Order,% of materials delivered against this Sales Order,% испоручених материјала на основу овог Налога за продају
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Снимање покрета ставку.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Снимање покрета ставку.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Билтен Листа претплатника
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Дубљење
 DocType: Email Account,Service,служба
 DocType: Hub Settings,Hub Settings,Хуб Подешавања
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Са операције
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Рачуноводствене ставке су већ учињени у валути {0} за компанију {1}. Изаберите обавеза или примања рачун са валутом {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Рачуноводствене ставке су већ учињени у валути {0} за компанију {1}. Изаберите обавеза или примања рачун са валутом {0}.
 ,Monthly Salary Register,Месечна плата Регистрација
-apps/frappe/frappe/website/template.py +123,Next,следующий
+apps/frappe/frappe/website/template.py +140,Next,следующий
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,БОМ Операција
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Електрополирање
@@ -3924,6 +3946,7 @@ DocType: Purchase Invoice,Next Date,Следећи датум
 DocType: Employee Education,Major/Optional Subjects,Мајор / Опциони предмети
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Молимо вас да унесете таксе и трошкове
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обрада
+DocType: Sales Invoice Item,Drop Ship,Дроп Схип
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Овде можете одржавати детаље породице као име и окупације родитеља, брачног друга и деце"
 DocType: Hub Settings,Seller Name,Продавац Име
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Порези и накнаде одузима (Друштво валута)
@@ -3950,29 +3973,29 @@ DocType: Purchase Order,To Receive and Bill,За примање и Бил
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,дизајнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Услови коришћења шаблона
 DocType: Serial No,Delivery Details,Достава Детаљи
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Аутоматско креирање Материал захтев ако количина падне испод тог нивоа
 ,Item-wise Purchase Register,Тачка-мудар Куповина Регистрација
 DocType: Batch,Expiry Date,Датум истека
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да бисте поставили ниво преусмеравање тачка мора бити Куповина јединица или Производња артикла
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да бисте поставили ниво преусмеравање тачка мора бити Куповина јединица или Производња артикла
 ,Supplier Addresses and Contacts,Добављач Адресе и контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Прво изаберите категорију
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Пројекат господар.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показују као симбол $ итд поред валутама.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Пола дана)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
 DocType: Leave Type,Is Carry Forward,Је напред Царри
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Се ставке из БОМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Се ставке из БОМ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Олово Дани Тиме
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Саставница
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Партија Тип и Странка је потребно за примања / обавезе рачуна {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Партија Тип и Странка је потребно за примања / обавезе рачуна {1}
 DocType: Dropbox Backup,Send Notifications To,Слање обавештења
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Реф Датум
 DocType: Employee,Reason for Leaving,Разлог за напуштање
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционисани Износ
 DocType: GL Entry,Is Opening,Да ли Отварање
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Ров {0}: Дебит Унос се не може повезати са {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Счет {0} не существует
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ров {0}: Дебит Унос се не може повезати са {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Счет {0} не существует
 DocType: Account,Cash,Готовина
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за сајт и других публикација.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Пожалуйста, создайте Зарплата Структура для работника {0}"
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index e8ece53623..49dd3a26e5 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Lön Läge
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Välj Månads Distribution, om du vill spåra beroende på årstider."
 DocType: Employee,Divorced,Skild
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Varning: Samma objekt har angetts flera gånger.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Varning: Samma objekt har angetts flera gånger.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Produkter redan synkroniserade
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillåt Punkt som ska läggas till flera gånger i en transaktion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material {0} innan du avbryter denna garantianspråk
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Vibrator plus sintring
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta krävs för prislista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Kommer att beräknas i transaktionen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Från Materialförfrågan
+DocType: Purchase Order,Customer Contact,Kundkontakt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Från Materialförfrågan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Trä
 DocType: Job Applicant,Job Applicant,Arbetssökande
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Inga fler resultat.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Kundnamn
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alla exportrelaterade områden som valuta, växelkurs, export totalt exporttotalsumma osv finns i följesedel, POS, Offert, Försäljning Faktura, kundorder etc."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Huvudtyper (eller grupper) mot vilka bokföringsposter görs och balanser upprätthålls.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Utstående för {0} kan inte vara mindre än noll ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Utstående för {0} kan inte vara mindre än noll ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minuter
 DocType: Leave Type,Leave Type Name,Ledighetstyp namn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie uppdaterats
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Flera produktpriser.
 DocType: SMS Center,All Supplier Contact,Alla Leverantörskontakter
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Förväntad Slutdatum kan inte vara mindre än förväntat startdatum
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Vill du verkligen återuppta produktionsorder:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rad # {0}: Pris måste vara samma som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Ny Ledighets ansökningan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Ny Ledighets ansökningan
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bankväxel
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. För att upprätthålla kunden unika prodkt kod och att göra den sökbar baseras på deras kod, använd detta alternativ"
 DocType: Mode of Payment Account,Mode of Payment Account,Betalningssätt konto
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Visar variante
 DocType: Sales Invoice Item,Quantity,Kvantitet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (skulder)
 DocType: Employee Education,Year of Passing,Passerande År
-sites/assets/js/erpnext.min.js +27,In Stock,I Lager
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Kan bara göra betalning mot ofakturerade kundorder
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,I Lager
 DocType: Designation,Designation,Beteckning
 DocType: Production Plan Item,Production Plan Item,Produktionsplan för artikel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Användare {0} är redan tilldelad anställd {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Skapa ny POS Profil
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sjukvård
 DocType: Purchase Invoice,Monthly,Månadsvis
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Faktura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Försenad betalning (dagar)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-Postadress
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Försvar
 DocType: Company,Abbr,Förkortning
 DocType: Appraisal Goal,Score (0-5),Poäng (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} matchar inte med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} matchar inte med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Rad # {0}:
 DocType: Delivery Note,Vehicle No,Fordons nr
-sites/assets/js/erpnext.min.js +55,Please select Price List,Välj Prislista
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Välj Prislista
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Träbearbetning
 DocType: Production Order Operation,Work In Progress,Pågående Arbete
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-utskrift
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Överordnat Detalj doknamn
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Öppning för ett jobb.
 DocType: Item Attribute,Increment,Inkrement
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Välj Warehouse ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklam
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
 DocType: Payment Reconciliation,Reconcile,Avstämma
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Matvaror
 DocType: Quality Inspection Reading,Reading 1,Avläsning 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Skapa Bank inlägg
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Skapa Bank inlägg
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionsfonder
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Lagret är obligatoriskt om kontotyp är Lager
 DocType: SMS Center,All Sales Person,Alla försäljningspersonal
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Avskrivning kostnadsställe
 DocType: Warehouse,Warehouse Detail,Lagerdetalj
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kreditgräns har överskridits för kund {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Skatte Typ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Du har inte behörighet att lägga till eller uppdatera poster före {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Du har inte behörighet att lägga till eller uppdatera poster före {0}
 DocType: Item,Item Image (if not slideshow),Produktbild (om inte bildspel)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En kund finns med samma namn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timmar / 60) * Faktisk produktionstid
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Gäst
 DocType: Quality Inspection,Get Specification Details,Hämta Specifikation Detaljer
 DocType: Lead,Interested,Intresserad
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Öppning
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Öppning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Från {0} till {1}
 DocType: Item,Copy From Item Group,Kopiera från artikelgrupp
 DocType: Journal Entry,Opening Entry,Öppnings post
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Produkt Förfrågan
 DocType: Standard Reply,Owner,Ägare
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ange företaget först
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Välj Företaget först
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Välj Företaget först
 DocType: Employee Education,Under Graduate,Enligt Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mål på
 DocType: BOM,Total Cost,Total Kostnad
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Förbrukningsartiklar
 DocType: Upload Attendance,Import Log,Import logg
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Skicka
+DocType: Sales Invoice Item,Delivered By Supplier,Levereras av Supplier
 DocType: SMS Center,All Contact,Alla Kontakter
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årslön
 DocType: Period Closing Voucher,Closing Fiscal Year,Stänger Räkenskapsårets
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Konteringsanteckning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Visa Time Loggar
 DocType: Journal Entry Account,Credit in Company Currency,Kredit i bolaget Valuta
 DocType: Delivery Note,Installation Status,Installationsstatus
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Godkända + Avvisad Antal måste vara lika med mottagna kvantiteten för punkt {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Godkända + Avvisad Antal måste vara lika med mottagna kvantiteten för punkt {0}
 DocType: Item,Supply Raw Materials for Purchase,Leverera råvaror för köp
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Produkt {0} måste vara en beställningsprodukt
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Hämta mallen, fyll lämpliga uppgifter och bifoga den modifierade filen. Alla datum och anställdas kombinationer i den valda perioden kommer i mallen, med befintliga närvaroutdrag"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Produkt {0} är inte aktiv eller uttjänta har nåtts
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Produkt {0} är inte aktiv eller uttjänta har nåtts
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Kommer att uppdateras efter fakturan skickas.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Inställningar för HR-modul
 DocType: SMS Center,SMS Center,SMS Center
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Räta
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Ange url parameter för me
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regler för tillämpning av prissättning och rabatt.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Den här gången Log konflikter med {0} för {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prislista måste gälla för att köpa eller sälja
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Installationsdatum kan inte vara före leveransdatum för punkt {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installationsdatum kan inte vara före leveransdatum för punkt {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt på Prislista Andel (%)
-sites/assets/js/form.min.js +279,Start,Start
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
 DocType: User,First Name,Förnamn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Din installationen är klar. 
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-formgjutning
 DocType: Offer Letter,Select Terms and Conditions,Välj Villkor
 DocType: Production Planning Tool,Sales Orders,Kundorder
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot fakturaprodukt
 ,Production Orders in Progress,Aktiva Produktionsordrar
 DocType: Lead,Address & Contact,Adress och kontakt
+DocType: Leave Allocation,Add unused leaves from previous allocations,Lägg oanvända blad från tidigare tilldelningar
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Nästa Återkommande {0} kommer att skapas på {1}
 DocType: Newsletter List,Total Subscribers,Totalt Medlemmar
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontaktnamn
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,SO Väntar Antal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Skapar lönebesked för ovan nämnda kriterier.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Begäran om köp.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dubbel hölje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Endast den valda Ledighets ansvarig kan lämna denna ledighets applikationen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Endast den valda Ledighets ansvarig kan lämna denna ledighets applikationen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Avgångar per år
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ställ in namnserie för {0} via Inställningar> Inställningar> Namnge Serier
 DocType: Time Log,Will be updated when batched.,Kommer att uppdateras när den tillverkas.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rad {0}: Kontrollera ""Är i förskott"" mot konto {1} om det är ett förskotts post."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rad {0}: Kontrollera ""Är i förskott"" mot konto {1} om det är ett förskotts post."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Lager {0} tillhör inte företaget {1}
 DocType: Bulk Email,Message,Meddelande
 DocType: Item Website Specification,Item Website Specification,Produkt hemsidespecifikation
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Åtkomstnyckel
 DocType: Payment Tool,Reference No,Referensnummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lämna Blockerad
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lager Avstämning Punkt
 DocType: Stock Entry,Sales Invoice No,Försäljning Faktura nr
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverantör Typ
 DocType: Item,Publish in Hub,Publicera i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Punkt {0} avbryts
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materialförfrågan
 DocType: Bank Reconciliation,Update Clearance Date,Uppdatera Clearance Datum
 DocType: Item,Purchase Details,Inköpsdetaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Produkt  {0} hittades inte i ""råvaror som levereras""  i beställning {1}"
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Anmälningskontroll
 DocType: Lead,Suggestions,Förslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Ange artikelgrupp visa budgetar på detta område. Du kan även inkludera säsongs genom att ställa in Distribution.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Ange huvudkontogrupp för lager {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betalning mot {0} {1} inte kan vara större än utestående beloppet {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betalning mot {0} {1} inte kan vara större än utestående beloppet {2}
 DocType: Supplier,Address HTML,Adress HTML
 DocType: Lead,Mobile No.,Mobilnummer.
 DocType: Maintenance Schedule,Generate Schedule,Generera Schema
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Ny Lager UOM
 DocType: Period Closing Voucher,Closing Account Head,Stänger Konto Huvud
 DocType: Employee,External Work History,Extern Arbetserfarenhet
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkelreferens fel
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Vill du verkligen STOPPA
 DocType: Communication,Closed,Stängt
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I ord (Export) kommer att vara synlig när du sparar följesedel.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Är du säker på att du vill stoppa
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Jobbprofilen
 DocType: Newsletter,Newsletter,Nyhetsbrev
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Följesedel
 DocType: Dropbox Backup,Allow Dropbox Access,Tillåt Dropbox Tillgång
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ställa in skatter
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Betalningsposten har ändrats efter att du hämtade den. Vänligen hämta igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Sammanfattning för denna vecka och pågående aktiviteter
 DocType: Workstation,Rent Cost,Hyr Kostnad
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Välj månad och år
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,I takt med vilket kundens Valuta omvandlas till kundens basvaluta
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Finns i BOM, följesedel, Inköp Faktura, produktionsorder, inköpsorder, inköpskvitto, Försäljning Faktura, kundorder, införande i lager, Tidrapport"
 DocType: Item Tax,Tax Rate,Skattesats
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Välj Punkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Välj Punkt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Produkt: {0} förvaltade satsvis, kan inte förenas med \ Lagersammansättning, använd istället Lageranteckning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rad # {0}: Batch nr måste vara samma som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konvertera till icke-gruppen
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Inköpskvitto måste lämnas in
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Nuvarande lager UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) i en punkt.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadatum
 DocType: GL Entry,Debit Amount,Debit Belopp
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Det kan bara finnas ett konto per Company i {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Det kan bara finnas ett konto per Company i {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-postadress
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Se bifogad fil
 DocType: Purchase Order,% Received,% Emot
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspekteras av
 DocType: Maintenance Visit,Maintenance Type,Servicetyp
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} tillhör inte följesedel {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} tillhör inte följesedel {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Produktkvalitetskontroll Parameter
 DocType: Leave Application,Leave Approver Name,Ledighetsgodkännare Namn
 ,Schedule Date,Schema Datum
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Inköpsregistret
 DocType: Landed Cost Item,Applicable Charges,Tillämpliga avgifter
 DocType: Workstation,Consumable Cost,Förbrukningsartiklar Kostnad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) måste ha rollen ""Ledighetsgodkännare"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) måste ha rollen ""Ledighetsgodkännare"""
 DocType: Purchase Receipt,Vehicle Date,Fordons Datum
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Anledning till att förlora
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,% Installerad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Ange företagetsnamn först
 DocType: BOM,Item Desription,Produktbeskrivning
 DocType: Purchase Invoice,Supplier Name,Leverantörsnamn
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Läs ERPNext Manual
 DocType: Account,Is Group,Är grupperad
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatiskt Serial Nos baserat på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrollera Leverantörens unika Fakturanummer 
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Försäljnings ma
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globala inställningar för alla tillverkningsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Konton frysta upp till
 DocType: SMS Log,Sent On,Skickas på
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
 DocType: Sales Order,Not Applicable,Inte Tillämpbar
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Semester topp.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Skalformning
 DocType: Material Request Item,Required Date,Obligatorisk Datum
 DocType: Delivery Note,Billing Address,Fakturaadress
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Ange Artikelkod.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ange Artikelkod.
 DocType: BOM,Costing,Kostar
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Om markerad, kommer skattebeloppet anses redan ingå i Skriv värdet / Skriv beloppet"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totalt Antal
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between O
 DocType: Customer,Buyer of Goods and Services.,Köpare av varor och tjänster.
 DocType: Journal Entry,Accounts Payable,Leverantörsreskontra
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Lägg till Abonnenter
-sites/assets/js/erpnext.min.js +5,""" does not exists","Existerar inte
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","Existerar inte
 DocType: Pricing Rule,Valid Upto,Giltig Upp till
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkt inkomst
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan inte filtrera baserat på konto, om grupperad efter konto"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Handläggare
 DocType: Payment Tool,Received Or Paid,Erhålls eller betalas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Välj Företag
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Välj Företag
 DocType: Stock Entry,Difference Account,Differenskonto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Det går inte att stänga uppgiften då dess huvuduppgift {0} inte är stängd.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
 DocType: Production Order,Additional Operating Cost,Ytterligare driftkostnader
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
 DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
 DocType: Communication,Subject,Ämne
 DocType: Shipping Rule,Net Weight,Nettovikt
 DocType: Employee,Emergency Phone,Nödtelefon
 ,Serial No Warranty Expiry,Serial Ingen garanti löper ut
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Vill du verkligen stoppa dennaa Material förfrågan?
 DocType: Sales Order,To Deliver,Att Leverera
 DocType: Purchase Invoice Item,Item,Objekt
 DocType: Journal Entry,Difference (Dr - Cr),Skillnad (Dr - Cr)
 DocType: Account,Profit and Loss,Resultaträkning
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Hantera Underleverantörer
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Hantera Underleverantörer
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Ny UOM får inte vara av typen heltal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Möbler och Armaturer
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,I takt med vilket Prislistans valuta omvandlas till företagets basvaluta
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lägg till / redigera ska
 DocType: Purchase Invoice,Supplier Invoice No,Leverantörsfaktura Nej
 DocType: Territory,For reference,Som referens
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan inte ta bort Löpnummer {0}, eftersom det används i aktietransaktioner"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Closing (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Closing (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperiod (dagar)
 DocType: Installation Note Item,Installation Note Item,Installeringsnotis objekt
 ,Pending Qty,Väntar Antal
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Fakturering och leveransstatus
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Återkommande kunder
 DocType: Leave Control Panel,Allocate,Fördela
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Föregående
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Välj kundorder som du vill skapa produktionsorder.
+DocType: Item,Delivered by Supplier (Drop Ship),Levereras av leverantören (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Lönedelar.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databas för potentiella kunder.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kunddatabas.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Trumling
 DocType: Purchase Order Item,Billed Amt,Fakturerat ant.
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ett aktuell lagerlokal mot vilken lager noteringar görs.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referensnummer och referens Datum krävs för {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referensnummer och referens Datum krävs för {0}
 DocType: Event,Wednesday,Onsdag
 DocType: Sales Invoice,Customer's Vendor,Kundens Säljare
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsorder är Obligatorisk
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Mottagare Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Baserad på"" och ""Gruppera efter"" kan inte vara samma"
 DocType: Sales Person,Sales Person Targets,Försäljnings Person Mål
-sites/assets/js/form.min.js +271,To,Till
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Ange e-postadress
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Till
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Ange e-postadress
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ändröret bildande
 DocType: Production Order Operation,In minutes,På några minuter
 DocType: Issue,Resolution Date,Åtgärds Datum
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,Projekt Användare
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Förbrukat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} hittades inte i Fakturainformationslistan
 DocType: Company,Round Off Cost Center,Avrunda kostnadsställe
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Servicebesök {0} måste avbrytas innan man kan avbryta kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Servicebesök {0} måste avbrytas innan man kan avbryta kundorder
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Öppning (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Bokningstidsstämpel måste vara efter {0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Inställningar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Cost skatter och avgifter
 DocType: Production Order Operation,Actual Start Time,Faktisk starttid
 DocType: BOM Operation,Operation Time,Drifttid
-sites/assets/js/list.min.js +5,More,Mer
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mer
 DocType: Pricing Rule,Sales Manager,FÖRSÄLJNINGSCHEF
-sites/assets/js/desk.min.js +7673,Rename,Byt namn
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Byt namn
 DocType: Journal Entry,Write Off Amount,Avskrivningsbelopp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Böjning
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillåt användaren
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Rak skjuvning
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Om du vill spåra objekt i försäljnings- och inköps dokument som grundar sig på deras serienummer nos. Detta är kan också användas för att spåra garanti detaljerad information om produkten.
 DocType: Purchase Receipt Item Supplied,Current Stock,Nuvarande lager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Avvisade Lager är obligatoriskt mot avvisade artiklar
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Avvisade Lager är obligatoriskt mot avvisade artiklar
 DocType: Account,Expenses Included In Valuation,Kostnader ingår i rapporten
 DocType: Employee,Provide email id registered in company,Ange E-post ID registrerat i bolaget
 DocType: Hub Settings,Seller City,Säljaren stad
 DocType: Email Digest,Next email will be sent on:,Nästa e-post kommer att skickas på:
 DocType: Offer Letter Term,Offer Letter Term,Erbjudande Brev Villkor
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Produkten har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Produkt  {0} hittades inte
 DocType: Bin,Stock Value,Stock Värde
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Typ
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Välkommen
 DocType: Journal Entry,Credit Card Entry,Kreditkorts logg
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Uppgift Ämne
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Varor som erhållits från leverantörer.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varor som erhållits från leverantörer.
 DocType: Communication,Open,Öppen
 DocType: Lead,Campaign Name,Kampanjens namn
 ,Reserved,Reserverat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Vill du verkligen ÅTERUPPTA
 DocType: Purchase Order,Supply Raw Materials,Supply Råvaror
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Det datum då nästa faktura kommer att genereras. Det genereras på skicka.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Nuvarande Tillgångar
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Kundens inköpsorder Nr
 DocType: Employee,Cell Number,Mobilnummer
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Förlorade
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Du kan inte ange aktuell kupong i 'Mot Journalposter' kolumnen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan inte ange aktuell kupong i 'Mot Journalposter' kolumnen
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Möjlighet Från
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månadslön uttalande.
@@ -699,7 +699,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktionerade Belopp kan inte vara större än fordringsbelopp i raden {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standardkostnad Konto Sålda Varor
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Prislista inte valt
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prislista inte valt
 DocType: Employee,Family Background,Familjebakgrund
 DocType: Process Payroll,Send Email,Skicka Epost
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Inget Tillstånd
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Produkter med högre medelvikt kommer att visas högre
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstämning Detalj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mina Fakturor
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Ingen anställd hittades
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen anställd hittades
 DocType: Purchase Order,Stopped,Stoppad
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Välj BOM för att starta
@@ -719,7 +719,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Ladda lag
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Skicka Nu
 ,Support Analytics,Stöd Analytics
 DocType: Item,Website Warehouse,Webbplatslager
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Vill du verkligen stoppa produktionsorder:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dagen i den månad som auto faktura kommer att genereras t.ex. 05, 28 etc"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Betyg måste vara mindre än eller lika med 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form arkiv
@@ -729,12 +728,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Suppo
 DocType: Features Setup,"To enable ""Point of Sale"" features",För att aktivera "Point of Sale" funktioner
 DocType: Bin,Moving Average Rate,Rörligt medelvärdes hastighet
 DocType: Production Planning Tool,Select Items,Välj objekt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} mot räkning {1} ​​daterad {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mot räkning {1} ​​daterad {2}
 DocType: Comment,Reference Name,Referensnamn
 DocType: Maintenance Visit,Completion Status,Slutförande Status
 DocType: Sales Invoice Item,Target Warehouse,Target Lager
 DocType: Item,Allow over delivery or receipt upto this percent,Tillåt överleverans eller mottagande upp till denna procent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Förväntad leveransdatum kan inte vara före säljorders datum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Förväntad leveransdatum kan inte vara före säljorders datum
 DocType: Upload Attendance,Import Attendance,Import Närvaro
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alla artikelgrupper
 DocType: Process Payroll,Activity Log,Aktivitets Logg
@@ -742,7 +741,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Komponera meddelandet automatiskt mot uppvisande av transaktioner.
 DocType: Production Order,Item To Manufacture,Produkt för att tillverka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent formgjutning
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Inköpsorder till betalning
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status är {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Inköpsorder till betalning
 DocType: Sales Order Item,Projected Qty,Projicerad Antal
 DocType: Sales Invoice,Payment Due Date,Förfallodag
 DocType: Newsletter,Newsletter Manager,Nyhetsbrevsansvarig
@@ -766,8 +766,8 @@ DocType: SMS Log,Requested Numbers,Begärda nummer
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Utvecklingssamtal.
 DocType: Sales Invoice Item,Stock Details,Lager Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Värde
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Butiksförsäljnig
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Det går inte att föra fram {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Butiksförsäljnig
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Det går inte att föra fram {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Kontosaldo redan i Kredit,du är inte tillåten att ställa in ""Balans måste vara"" som ""Debet '"
 DocType: Account,Balance must be,Balans måste vara
 DocType: Hub Settings,Publish Pricing,Publicera prissättning
@@ -789,7 +789,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Inköpskvitto
 ,Received Items To Be Billed,Mottagna objekt som ska faktureras
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Blästring
-sites/assets/js/desk.min.js +3938,Ms,Fröken
+DocType: Employee,Ms,Fröken
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakurs mästare.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Det går inte att hitta tidslucka i de närmaste {0} dagar för Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Planera material för underenheter
@@ -811,29 +811,31 @@ DocType: Purchase Receipt,Range,Intervall
 DocType: Supplier,Default Payable Accounts,Standard avgiftskonton
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
 DocType: Features Setup,Item Barcode,Produkt Streckkod
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
 DocType: Quality Inspection Reading,Reading 6,Avläsning 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inköpsfakturan Advancerat
 DocType: Address,Shop,Shop
 DocType: Hub Settings,Sync Now,Synkronisera nu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Rad {0}: kreditering kan inte kopplas till en {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Rad {0}: kreditering kan inte kopplas till en {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / Kontant konto kommer att uppdateras automatiskt i POS faktura när detta läge är valt.
 DocType: Employee,Permanent Address Is,Permanent Adress är
 DocType: Production Order Operation,Operation completed for how many finished goods?,Driften färdig för hur många färdiga varor?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Varumärket
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Ersättning för över {0} korsade till punkt {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Ersättning för över {0} korsade till punkt {1}.
 DocType: Employee,Exit Interview Details,Avsluta intervju Detaljer
 DocType: Item,Is Purchase Item,Är beställningsobjekt
 DocType: Journal Entry Account,Purchase Invoice,Inköpsfaktura
 DocType: Stock Ledger Entry,Voucher Detail No,Rabatt Detalj nr
 DocType: Stock Entry,Total Outgoing Value,Totalt Utgående Värde
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Öppningsdatum och Slutdatum bör ligga inom samma räkenskapsår
 DocType: Lead,Request for Information,Begäran om upplysningar
 DocType: Payment Tool,Paid,Betalats
 DocType: Salary Slip,Total in words,Totalt i ord
 DocType: Material Request Item,Lead Time Date,Ledtid datum
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,är obligatoriskt. Kanske Valutaväxling posten inte skapas för
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Rad # {0}: Ange Löpnummer för punkt {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","För ""Produktgrupper"" poster, Lager, Serienummer och Batch kommer  att övervägas från ""Packlistan"". Om Lager och Batch inte är samma för alla förpacknings objekt för alla ""Produktgrupper"" , kan dessa värden skrivas in i huvud produkten, kommer värden kopieras till ""Packlistan""."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Transporter till kunder.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Transporter till kunder.
 DocType: Purchase Invoice Item,Purchase Order Item,Inköpsorder Artikeln
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekt inkomst
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Ställ Betalningsbelopp = utestående belopp
@@ -841,13 +843,14 @@ DocType: Contact Us Settings,Address Line 1,Adress Linje 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Företagsnamn
 DocType: SMS Center,Total Message(s),Totalt Meddelande (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visa en lista över alla hjälp videos
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Välj konto chefen för banken, där kontrollen avsattes."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillåt användare att redigera prislista i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betalning mot Försäljning / inköpsorder bör alltid märkas i förskott
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betalning mot Försäljning / inköpsorder bör alltid märkas i förskott
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
 DocType: Process Payroll,Select Payroll Year and Month,Välj Lön År och Månad
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Gå till lämplig grupp (vanligtvis Tillämpning av fonder> Omsättningstillgångar> bankkonton och skapa ett nytt konto (genom att klicka på Lägg till typ) av typen ""Bank"""
 DocType: Workstation,Electricity Cost,Elkostnad
@@ -862,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Vit
 DocType: SMS Center,All Lead (Open),Alla Ledare (Öppna)
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalda förskott
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Bifoga din bild
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Göra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Göra
 DocType: Journal Entry,Total Amount in Words,Total mängd i ord
 DocType: Workflow State,Stop,Stoppa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Det var ett problem. En trolig orsak kan vara att du inte har sparat formuläret. Vänligen kontakta support@erpnext.com om problemet kvarstår.
@@ -886,7 +889,7 @@ DocType: Packing Slip Item,Packing Slip Item,Följesedels artikel
 DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Borttagna objekt med någon förändring i kvantitet eller värde.
 DocType: Delivery Note,Delivery To,Leverans till
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attributtabell är obligatoriskt
 DocType: Production Planning Tool,Get Sales Orders,Hämta kundorder
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan inte vara negativ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivering
@@ -897,12 +900,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',"Kommer endast
 DocType: Project,Internal,Intern
 DocType: Task,Urgent,Brådskande
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Vänligen ange en giltig rad ID för rad {0} i tabellen {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå till skrivbordet och börja använda ERPNext
 DocType: Item,Manufacturer,Tillverkare
 DocType: Landed Cost Item,Purchase Receipt Item,Inköpskvitto Artikel
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserverat lager i kundorder / färdigvarulagret
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Försäljningsbelopp
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Tid loggar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Du har ansvar för utgifterna för denna post. Vänligen Uppdatera ""Status"" och spara"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Du har ansvar för utgifterna för denna post. Vänligen Uppdatera ""Status"" och spara"
 DocType: Serial No,Creation Document No,Skapande Dokument nr
 DocType: Issue,Issue,Problem
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Egenskaper för produktvarianter. t.ex. storlek, färg etc."
@@ -917,8 +921,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Mot
 DocType: Item,Default Selling Cost Center,Standard Kostnadsställe Försäljning
 DocType: Sales Partner,Implementation Partner,Genomförande Partner
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Kundorder {0} är {1}
 DocType: Opportunity,Contact Info,Kontaktinformation
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Göra Stock Inlägg
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Göra Stock Inlägg
 DocType: Packing Slip,Net Weight UOM,Nettovikt UOM
 DocType: Item,Default Supplier,Standard Leverantör
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Överproduktion Tillåter Procent
@@ -927,7 +932,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Hämta Veckodagar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdatum kan inte vara mindre än Startdatum
 DocType: Sales Person,Select company name first.,Välj företagsnamn först.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offerter mottaget från leverantörer.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Till {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,uppdateras via Time Loggar
@@ -955,7 +960,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Organisationsnummer som referens. Skattenummer etc.
 DocType: Sales Partner,Distributor,Distributör
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Varukorgen frakt Regel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Produktionsorder {0} måste avbrytas innan du kan avbryta kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Produktionsorder {0} måste avbrytas innan du kan avbryta kundorder
 ,Ordered Items To Be Billed,Beställda varor att faktureras
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Från Range måste vara mindre än ligga
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Välj Time Loggar och skicka för att skapa en ny försäljnings faktura.
@@ -1003,7 +1008,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skatt oc
 DocType: Lead,Lead,Prospekt
 DocType: Email Digest,Payables,Skulder
 DocType: Account,Warehouse,Lager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
 ,Purchase Order Items To Be Billed,Inköpsorder Artiklar att faktureras
 DocType: Purchase Invoice Item,Net Rate,Netto kostnad
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inköpsfaktura Artiklar
@@ -1018,11 +1023,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Sonade Betalningsin
 DocType: Global Defaults,Current Fiscal Year,Innevarande räkenskapsår
 DocType: Global Defaults,Disable Rounded Total,Inaktivera avrundat Totalbelopp
 DocType: Lead,Call,Ring
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'poster' kan inte vara tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'poster' kan inte vara tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate raden {0} med samma {1}
 ,Trial Balance,Trial Balans
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Ställa in Anställda
-sites/assets/js/erpnext.min.js +5,"Grid """,Grid "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ställa in Anställda
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Välj prefix först
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbete Gjort
@@ -1032,14 +1037,15 @@ DocType: Communication,Sent,Skickat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Se journal
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
 DocType: Communication,Delivery Status,Leveransstatus
 DocType: Production Order,Manufacture against Sales Order,Tillverkning mot kundorder
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Resten av världen
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten av världen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan inte ha Batch
 ,Budget Variance Report,Budget Variationsrapport
 DocType: Salary Slip,Gross Pay,Bruttolön
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Lämnad utdelning
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Redovisning Ledger
 DocType: Stock Reconciliation,Difference Amount,Differensbelopp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Balanserade vinstmedel
 DocType: BOM Item,Item Description,Produktbeskrivning
@@ -1053,15 +1059,17 @@ DocType: Opportunity Item,Opportunity Item,Möjlighet Punkt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tillfällig Öppning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Anställd Avgångskostnad
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Saldo konto {0} måste alltid vara {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo konto {0} måste alltid vara {1}
 DocType: Address,Address Type,Adresstyp
 DocType: Purchase Receipt,Rejected Warehouse,Avvisat Lager
 DocType: GL Entry,Against Voucher,Mot Kupong
 DocType: Item,Default Buying Cost Center,Standard Inköpsställe
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","För att få ut det bästa av ERPNext, rekommenderar vi att du tar dig tid och titta på dessa hjälp videor."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Produkt {0} måste vara försäljningsprodukt
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,till
 DocType: Item,Lead Time in days,Ledtid i dagar
 ,Accounts Payable Summary,Leverantörsreskontra Sammanfattning
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Ej tillåtet att redigera fryst konto {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ej tillåtet att redigera fryst konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Hämta utestående fakturor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundorder {0} är inte giltig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
@@ -1077,7 +1085,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Utgivningsplats
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
 DocType: Report,Disabled,Inaktiverad
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},UOM coverfaktor krävs för UOM: {0} i punkt: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coverfaktor krävs för UOM: {0} i punkt: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekta kostnader
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rad {0}: Antal är obligatoriskt
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Jordbruk
@@ -1086,13 +1094,13 @@ DocType: Mode of Payment,Mode of Payment,Betalningssätt
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Detta är en rot varugrupp och kan inte ändras.
 DocType: Journal Entry Account,Purchase Order,Inköpsorder
 DocType: Warehouse,Warehouse Contact Info,Lagrets kontaktinfo
-sites/assets/js/form.min.js +190,Name is required,Namn krävs
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Namn krävs
 DocType: Purchase Invoice,Recurring Type,Återkommande Typ
 DocType: Address,City/Town,Stad / Town
 DocType: Email Digest,Annual Income,Årlig inkomst
 DocType: Serial No,Serial No Details,Serial Inga detaljer
 DocType: Purchase Invoice Item,Item Tax Rate,Produkt Skattesats
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",För {0} kan endast kreditkonton länkas mot en annan debitering
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",För {0} kan endast kreditkonton länkas mot en annan debitering
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Produkt  {0} måste vara ett underleverantörs produkt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapital Utrustning
@@ -1103,14 +1111,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Redigera Beskrivning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Förväntad leveransdatum är mindre än planerat startdatum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,För Leverantör
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,För Leverantör
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ställa Kontotyp hjälper i att välja detta konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Totalsumma (Företagsvaluta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Totalt Utgående
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Det kan bara finnas en frakt Regel skick med 0 eller blank värde för "till värde"
 DocType: Authorization Rule,Transaction,Transaktion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Obs! Detta här kostnadsställe är en grupp. Det går inte att göra bokföringsposter mot grupper.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Verktyg
+apps/frappe/frappe/config/desk.py +7,Tools,Verktyg
 DocType: Item,Website Item Groups,Webbplats artikelgrupper
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produktionsordernummer är obligatoriskt för införande i lager för ändamålet för tillverkning
 DocType: Purchase Invoice,Total (Company Currency),Totalt (Company valuta)
@@ -1120,7 +1128,7 @@ DocType: Workstation,Workstation Name,Arbetsstation Namn
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-postutskick:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
 DocType: Sales Partner,Target Distribution,Target Fördelning
-sites/assets/js/desk.min.js +7652,Comments,Kommentarer
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentarer
 DocType: Salary Slip,Bank Account No.,Bankkonto nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Detta är numret på den senast skapade transaktionen med detta prefix
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Värderings takt som krävs för produkt {0}
@@ -1135,7 +1143,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Välj ett f
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Enskild ledighet
 DocType: Purchase Invoice,Supplier Invoice Date,Leverantörsfakturadatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du måste aktivera Varukorgen
-sites/assets/js/form.min.js +212,No Data,Inga Data
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Inga Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Bedömning Mall Mål
 DocType: Salary Slip,Earning,Tjänar
 DocType: Payment Tool,Party Account Currency,Party konto Valuta
@@ -1143,7 +1151,7 @@ DocType: Payment Tool,Party Account Currency,Party konto Valuta
 DocType: Purchase Taxes and Charges,Add or Deduct,Lägg till eller dra av
 DocType: Company,If Yearly Budget Exceeded (for expense account),Om Årlig budget överskrids (för utgiftskonto)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Överlappande förhållanden som råder mellan:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal anteckning{0} är redan anpassat mot någon annan kupong
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal anteckning{0} är redan anpassat mot någon annan kupong
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Totalt ordervärde
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Åldringsräckvidd 3
@@ -1151,11 +1159,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Antal besök
 DocType: File,old_parent,gammalt_mål
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhetsbrev till kontakter, prospekts."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta avslutnings Hänsyn måste vara {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summan av poäng för alla mål bör vara 100. Det är {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Verksamheten kan inte lämnas tomt.
 ,Delivered Items To Be Billed,Levererade artiklar att faktureras
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kan inte ändras för serienummer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Status uppdaterats till {0}
 DocType: DocField,Description,Beskrivning
 DocType: Authorization Rule,Average Discount,Genomsnittlig rabatt
 DocType: Letter Head,Is Default,Är Standard
@@ -1183,7 +1191,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Produkt skattebeloppet
 DocType: Item,Maintain Stock,Behåll Lager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Aktie Inlägg redan skapats för produktionsorder
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lämna tomt om det anses vara för alla beteckningar
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Från Daterad tid
 DocType: Email Digest,For Company,För Företag
@@ -1193,7 +1201,7 @@ DocType: Sales Invoice,Shipping Address Name,Leveransadress Namn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Villkor Innehåll
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
 DocType: Maintenance Visit,Unscheduled,Ledig
 DocType: Employee,Owned,Ägs
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Beror på avgång utan lön
@@ -1206,7 +1214,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Status
 DocType: GL Entry,GL Entry,GL Entry
 DocType: HR Settings,Employee Settings,Personal Inställningar
 ,Batch-Wise Balance History,Batchvis Balans Historik
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Att Göra Lista
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Att Göra Lista
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lärling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativ Antal är inte tillåtet
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1238,13 +1246,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorshyra
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup SMS-gateway-inställningar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import misslyckades!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Ingen adress inlagd ännu.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adress inlagd ännu.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbetsstation arbetstimme
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med JV mängd {2}
 DocType: Item,Inventory,Inventering
 DocType: Features Setup,"To enable ""Point of Sale"" view",För att aktivera "Point of Sale" view
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Betalning kan inte göras för tomma kundvagnar
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betalning kan inte göras för tomma kundvagnar
 DocType: Item,Sales Details,Försäljnings Detaljer
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Nålning
 DocType: Opportunity,With Items,Med artiklar
@@ -1254,7 +1262,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",Det datum då nästa faktura kommer att genereras. Det genereras på skicka.
 DocType: Item Attribute,Item Attribute,Produkt Attribut
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regeringen
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Produkt Varianter
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Produkt Varianter
 DocType: Company,Services,Tjänster
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Totalt ({0})
 DocType: Cost Center,Parent Cost Center,Överordnat kostnadsställe
@@ -1264,11 +1272,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Budgetåret Startdatum
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Försänkning
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Följesedlar avbryts
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Följesedlar avbryts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,"Frakt, spedition Avgifter"
 DocType: Material Request Item,Sales Order No,Kundorder Ingen
 DocType: Item Group,Item Group Name,Produkt  Gruppnamn
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Överför Material Tillverkning
 DocType: Pricing Rule,For Price List,För prislista
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1277,8 +1285,7 @@ DocType: Maintenance Schedule,Schedules,Scheman
 DocType: Purchase Invoice Item,Net Amount,Nettobelopp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detalj nr
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ytterligare rabattbeloppet (Företagsvaluta)
-DocType: Period Closing Voucher,CoA Help,CoA Hjälp
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Fel: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fel: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Skapa nytt konto från kontoplan.
 DocType: Maintenance Visit,Maintenance Visit,Servicebesök
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kund> Kundgrupp > Område
@@ -1289,6 +1296,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Landad kostnad Hjälp
 DocType: Event,Tuesday,Tisdag
 DocType: Leave Block List,Block Holidays on important days.,Block Semester på viktiga dagar.
 ,Accounts Receivable Summary,Kundfordringar Sammanfattning
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lämnar för typ {0} redan avsatts för anställd {1} för perioden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Ställ in användar-ID fältet i en anställd post för att ställa in anställdes Roll
 DocType: UOM,UOM Name,UOM Namn
 DocType: Top Bar Item,Target,Mål
@@ -1309,19 +1317,19 @@ DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kontering för {0} kan endast göras i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prissättning Regel
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Stansning
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Material begäran om att inköpsorder
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Material begäran om att inköpsorder
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Rad # {0}: Returnerad artikel {1} existerar inte i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonton
 ,Bank Reconciliation Statement,Bank Avstämning Uttalande
 DocType: Address,Lead Name,Prospekt Namn
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Ingående lagersaldo
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Ingående lagersaldo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} måste bara finnas en gång
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ej tillåtet att flytta mer {0} än {1} mot beställning {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Lämnar Avsatt framgångsrikt för {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Lämnar Avsatt framgångsrikt för {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Inga produkter att packa
 DocType: Shipping Rule Condition,From Value,Från Värde
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Belopp som inte återspeglas i bank
 DocType: Quality Inspection Reading,Reading 4,Avläsning 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Anspråk på företagets bekostnad.
@@ -1334,19 +1342,20 @@ DocType: Opportunity,Contact Mobile No,Kontakt Mobil nr
 DocType: Production Planning Tool,Select Sales Orders,Välj kundorder
 ,Material Requests for which Supplier Quotations are not created,Material Begäran för vilka leverantörsofferter är inte skapade
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Om du vill spåra objekt med streckkod. Du kommer att kunna komma in poster i följesedeln och fakturan genom att skanna streckkoder av objekt.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Markera som levereras
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Skapa offert
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Försök att planera verksamheten för X dagar i förväg.
 DocType: HR Settings,Stop Birthday Reminders,Stop födelsedag Påminnelser
 DocType: SMS Center,Receiver List,Mottagare Lista
 DocType: Payment Tool Detail,Payment Amount,Betalningsbelopp
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Förbrukad mängd
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Visa
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Visa
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lönestruktur Avdrag
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv lasersintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import lyckades!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnad för utfärdade artiklar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Antal får inte vara mer än {0}
@@ -1367,7 +1376,7 @@ DocType: Company,Default Payable Account,Standard betalkonto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Inställningar för webbutik som fraktregler, prislista mm"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Installationen är klar
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturerad
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Reserverad Antal
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserverad Antal
 DocType: Party Account,Party Account,Parti-konto
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Personal Resurser
 DocType: Lead,Upper Income,Övre inkomst
@@ -1410,11 +1419,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktivera Varukorgen
 DocType: Employee,Permanent Address,Permanent Adress
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Produkt  {0} måste vara ett serviceobjekt.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Förskott som betalats mot {0} {1} kan inte vara större \ än Totalsumma {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Välj artikelkod
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Minska Avdrag för ledighet utan lön (LWP)
 DocType: Territory,Territory Manager,Territorium manager
+DocType: Delivery Note Item,To Warehouse (Optional),Till Warehouse (tillval)
 DocType: Sales Invoice,Paid Amount (Company Currency),Betald Belopp (Company valuta)
 DocType: Purchase Invoice,Additional Discount,Ytterligare rabatt
 DocType: Selling Settings,Selling Settings,Försälja Inställningar
@@ -1437,7 +1447,7 @@ DocType: Item,Weightage,Vikt
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Gruv
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hartsgjutning
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En kundgrupp finns med samma namn, ändra Kundens namn eller döp om kundgruppen"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Välj {0} först.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Välj {0} först.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Överordnat område
 DocType: Quality Inspection Reading,Reading 2,Avläsning 2
@@ -1465,11 +1475,11 @@ DocType: Sales Invoice Item,Batch No,Batch nr
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillåt flera kundorder mot Kundens beställning
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Huvud
 DocType: DocPerm,Delete,Radera
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variant
-sites/assets/js/desk.min.js +7971,New {0},Ny {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Ny {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Stoppad ordning kan inte avbrytas. Unstop att avbryta.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppad ordning kan inte avbrytas. Unstop att avbryta.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
 DocType: Employee,Leave Encashed?,Lämna inlösen?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Möjlighet Från fältet är obligatoriskt
 DocType: Item,Variants,Varianter
@@ -1487,7 +1497,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
 DocType: Communication,Received,Mottagna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal anteckning {0} inte har någon matchat {1} inlägg
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal anteckning {0} inte har någon matchat {1} inlägg
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicera Löpnummer upp till punkt {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En förutsättning för en frakt Regel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Produkten är inte tillåten att ha produktionsorder.
@@ -1508,7 +1518,6 @@ DocType: Employee,Salutation,Salutation
 DocType: Communication,Rejected,Avvisad
 DocType: Pricing Rule,Brand,Märke
 DocType: Item,Will also apply for variants,Kommer också att ansöka om varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Levereras
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundlade poster vid tidpunkten för försäljning.
 DocType: Sales Order Item,Actual Qty,Faktiska Antal
 DocType: Sales Invoice Item,References,Referenser
@@ -1546,14 +1555,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,S
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Klippning
 DocType: Item,Has Variants,Har Varianter
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klicka på ""Skapa försäljningsfakturan"" knappen för att skapa en ny försäljnings faktura."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Period Från och period till datum är obligatoriska för återkommande% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Förpackning och märkning
 DocType: Monthly Distribution,Name of the Monthly Distribution,Namn på månadens distribution
 DocType: Sales Person,Parent Sales Person,Överordnad Försäljningsperson
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Ange standardvaluta i huvudbolaget och Global inställningar
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Tillträde Secret
 DocType: Purchase Invoice,Recurring Invoice,Återkommande Faktura
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Hantera projekt
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Hantera projekt
 DocType: Supplier,Supplier of Goods or Services.,Leverantör av varor eller tjänster.
 DocType: Budget Detail,Fiscal Year,Räkenskapsår
 DocType: Cost Center,Budget,Budget
@@ -1581,11 +1589,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Försäljnings
 DocType: Employee,Salary Information,Lön Information
 DocType: Sales Person,Name and Employee ID,Namn och Anställnings ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
 DocType: Website Item Group,Website Item Group,Webbplats Produkt Grupp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Tullar och skatter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Ange Referensdatum
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} betalningsposter kan inte filtreras genom {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ange Referensdatum
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalningsposter kan inte filtreras genom {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell för punkt som kommer att visas i Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Medföljande Antal
 DocType: Material Request Item,Material Request Item,Material Begäran Produkt
@@ -1593,7 +1601,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Träd artikelgrup
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Det går inte att hänvisa till radnr större än eller lika med aktuell rad nummer för denna avgiftstyp
 ,Item-wise Purchase History,Produktvis Köphistorik
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Röd
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klicka på ""Skapa schema"" för att hämta Löpnummer inlagt för artikel {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klicka på ""Skapa schema"" för att hämta Löpnummer inlagt för artikel {0}"
 DocType: Account,Frozen,Fryst
 ,Open Production Orders,Öppna produktionsorder
 DocType: Installation Note,Installation Time,Installationstid
@@ -1637,13 +1645,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Offert Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Produktgruppen nämns inte i huvudprodukten för objektet {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Som produktionsorder kan göras för denna post, måste det vara en lagervara."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Som produktionsorder kan göras för denna post, måste det vara en lagervara."
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbelopp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Går med
 DocType: Authorization Rule,Above Value,Ovan Värde
 ,Pending Amount,Väntande antal
 DocType: Purchase Invoice Item,Conversion Factor,Omvandlingsfaktor
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Levereras
+DocType: Purchase Order,Delivered,Levereras
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Inställning inkommande server jobb e-id. (T.ex. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Fordonsnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Den dag då återkommande faktura kommer att stoppa
@@ -1660,10 +1668,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Fördela avgifter som g
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Kontot {0} måste vara av typen ""Fast tillgång"" som punkt {1} är en tillgångspost"
 DocType: HR Settings,HR Settings,HR Inställningar
 apps/frappe/frappe/config/setup.py +130,Printing,Tryckning
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Räkning väntar på godkännande. Endast Utgiftsgodkännare kan uppdatera status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Räkning väntar på godkännande. Endast Utgiftsgodkännare kan uppdatera status.
 DocType: Purchase Invoice,Additional Discount Amount,Ytterligare rabatt Belopp
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dagen (er) som du ansöker om ledighet är semester. Du behöver inte ansöka om tjänstledighet.
-sites/assets/js/desk.min.js +7805,and,och
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,och
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Förkortning kan inte vara tomt
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
@@ -1700,7 +1708,6 @@ DocType: Opportunity,Quotation,Offert
 DocType: Salary Slip,Total Deduction,Totalt Avdrag
 DocType: Quotation,Maintenance User,Serviceanvändare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kostnad Uppdaterad
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Är du säker på att du vill starta
 DocType: Employee,Date of Birth,Födelsedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Punkt {0} redan har returnerat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Räkenskapsårets ** representerar budgetåret. Alla bokföringsposter och andra större transaktioner spåras mot ** räkenskapsår **.
@@ -1716,13 +1723,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Håll koll på säljkampanjer. Håll koll på Prospekter, Offerter, kundorder etc från kampanjer för att mäta avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkännare
 ,SO Qty,SO Antal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkiv poster finns mot lager {0}, därför du kan inte åter tilldela eller ändra Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkiv poster finns mot lager {0}, därför du kan inte åter tilldela eller ändra Warehouse"
 DocType: Appraisal,Calculate Total Score,Beräkna Totalsumma
 DocType: Supplier Quotation,Manufacturing Manager,Tillverkningsansvarig
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Löpnummer {0} är under garanti upp till {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split följesedel i paket.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Transporter
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Doppgjutning
+DocType: Purchase Order,To be delivered to customer,Som skall levereras till kund
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tid Log Status måste lämnas in.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Löpnummer {0} inte tillhör någon Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Konfigurera
@@ -1747,11 +1755,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Från Valuta
 DocType: DocField,Name,Namn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Välj tilldelade beloppet, Faktura Typ och fakturanumret i minst en rad"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Kundorder krävs för punkt {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Kundorder krävs för punkt {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Belopp som inte återspeglas i systemet
 DocType: Purchase Invoice Item,Rate (Company Currency),Andel (Företagsvaluta)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Annat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Ange som Stoppad
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Det går inte att hitta en matchande objekt. Välj något annat värde för {0}.
 DocType: POS Profile,Taxes and Charges,Skatter och avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En produkt eller en tjänst som köps, säljs eller hålls i lager."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Det går inte att välja avgiftstyp som ""På föregående v Belopp"" eller ""På föregående v Total"" för första raden"
@@ -1760,19 +1768,20 @@ DocType: Web Form,Select DocType,Välj DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brotschning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bank
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Klicka på ""Skapa schema"" för att få schemat"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Nytt kostnadsställe
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nytt kostnadsställe
 DocType: Bin,Ordered Quantity,Beställd kvantitet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",t.ex. "Bygg verktyg för byggare"
 DocType: Quality Inspection,In Process,Pågående
 DocType: Authorization Rule,Itemwise Discount,Produktvis rabatt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} mot kundorder {1}
+DocType: Purchase Order Item,Reference Document Type,Referensdokument Typ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mot kundorder {1}
 DocType: Account,Fixed Asset,Fast tillgångar
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serial numrerade Inventory
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serial numrerade Inventory
 DocType: Activity Type,Default Billing Rate,Standardfakturerings betyg
 DocType: Time Log Batch,Total Billing Amount,Totalt Fakturerings Mängd
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Fordran Konto
 ,Stock Balance,Lagersaldo
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Kundorder till betalning
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Kundorder till betalning
 DocType: Expense Claim Detail,Expense Claim Detail,Räkningen Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tid Loggar skapat:
 DocType: Item,Weight UOM,Vikt UOM
@@ -1808,10 +1817,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit till konto måste vara en skuld konto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
 DocType: Production Order Operation,Completed Qty,Avslutat Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",För {0} kan bara debitkonton länkas mot en annan kreditering
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Prislista {0} är inaktiverad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",För {0} kan bara debitkonton länkas mot en annan kreditering
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prislista {0} är inaktiverad
 DocType: Manufacturing Settings,Allow Overtime,Tillåt övertid
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Kundorder {0} stoppas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummer krävs för punkt {1}. Du har gett {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nuvarande värderingensomsättning
 DocType: Item,Customer Item Codes,Kund artikelnummer
@@ -1820,9 +1828,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svetsning
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nytt Lager UOM krävs
 DocType: Quality Inspection,Sample Size,Provstorlek
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Alla objekt har redan fakturerats
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alla objekt har redan fakturerats
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ange ett giltigt Från ärende nr "
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligare kostnadsställen kan göras i grupperna men poster kan göras mot icke-grupper
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligare kostnadsställen kan göras i grupperna men poster kan göras mot icke-grupper
 DocType: Project,External,Extern
 DocType: Features Setup,Item Serial Nos,Produkt serie nr
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Användare och behörigheter
@@ -1849,7 +1857,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,I
 DocType: Sales Partner,Address & Contacts,Adress och kontakter
 DocType: SMS Log,Sender Name,Avsändarnamn
 DocType: Page,Title,Titel
-sites/assets/js/list.min.js +104,Customize,Anpassa
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Anpassa
 DocType: POS Profile,[Select],[Välj]
 DocType: SMS Log,Sent To,Skickat Till
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Skapa fakturan
@@ -1874,12 +1882,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Uttjänta
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Resa
 DocType: Leave Block List,Allow Users,Tillåt användare
+DocType: Purchase Order,Customer Mobile No,Kund Mobil nr
 DocType: Sales Invoice,Recurring,Återkommande
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spåra separat intäkter och kostnader för produkt vertikaler eller divisioner.
 DocType: Rename Tool,Rename Tool,Ändrings Verktyget
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Uppdatera Kostnad
 DocType: Item Reorder,Item Reorder,Produkt Ändra ordning
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transfermaterial
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfermaterial
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Ange verksamhet, driftskostnad och ger en unik drift nej till din verksamhet."
 DocType: Purchase Invoice,Price List Currency,Prislista Valuta
 DocType: Naming Series,User must always select,Användaren måste alltid välja
@@ -1902,7 +1911,7 @@ DocType: Appraisal,Employee,Anställd
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importera e-post från
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Bjud in som Användare
 DocType: Features Setup,After Sale Installations,Eftermarknadsinstallationer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} är fullt fakturerad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} är fullt fakturerad
 DocType: Workstation Working Hour,End Time,Sluttid
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard avtalsvillkor för försäljning eller köp.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupp av Voucher
@@ -1911,8 +1920,9 @@ DocType: Sales Invoice,Mass Mailing,Massutskick
 DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Fil att byta namn på
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Inköp Beställningsnummer krävs för artikel {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Visa Betalningar
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Fastställt BOM {0} finns inte till punkt {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Underhållsschema {0} måste avbrytas innanman kan dra avbryta kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Underhållsschema {0} måste avbrytas innanman kan dra avbryta kundorder
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Storlek
 DocType: Notification Control,Expense Claim Approved,Räkningen Godkänd
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiska
@@ -1931,8 +1941,8 @@ DocType: Upload Attendance,Attendance To Date,Närvaro Till Datum
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Inställning inkommande server för försäljning e-id. (T.ex. sales@example.com)
 DocType: Warranty Claim,Raised By,Höjt av
 DocType: Payment Tool,Payment Account,Betalningskonto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Ange vilket bolag för att fortsätta
-sites/assets/js/list.min.js +23,Draft,Förslag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ange vilket bolag för att fortsätta
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Förslag
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensations Av
 DocType: Quality Inspection Reading,Accepted,Godkända
 DocType: User,Female,Kvinna
@@ -1945,14 +1955,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Frakt Regel Etikett
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Eftersom det redan finns lagertransaktioner för denna artikel, \ kan du inte ändra värdena för ""Har Löpnummer"", ""Har Batch Nej"", ""Är Lagervara"" och ""Värderingsmetod"""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
 DocType: Employee,Previous Work Experience,Tidigare Arbetslivserfarenhet
 DocType: Stock Entry,For Quantity,För Antal
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Ange planerad Antal till punkt {0} vid rad {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} inte lämnad
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Begäran efter artiklar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} inte lämnad
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Begäran efter artiklar
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produktionsorder kommer att skapas för varje färdig bra objekt.
 DocType: Purchase Invoice,Terms and Conditions1,Villkor och Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Avsluta Setup
@@ -1964,7 +1975,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhetsbrev e-post
 DocType: Delivery Note,Transporter Name,Transportör Namn
 DocType: Contact,Enter department to which this Contact belongs,Ange avdelning som denna Kontakt tillhör
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totalt Frånvarande
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Produkt eller Lager för rad {0} matchar inte Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Produkt eller Lager för rad {0} matchar inte Materialförfrågan
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måttenhet
 DocType: Fiscal Year,Year End Date,År Slutdatum
 DocType: Task Depends On,Task Depends On,Uppgift Beror på
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontraktets Slutdatum måste vara större än Datum för inträde
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,En tredje parts distributör / återförsäljare / bonusagent / affiliate / återförsäljare som säljer företagens produkter för en provision.
 DocType: Customer Group,Has Child Node,Har Under Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} mot beställning {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mot beställning {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Ange statiska url parametrar här (T.ex.. Avsändare = ERPNext, användarnamn = ERPNext, lösenord = 1234 mm)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} inte någon aktiv räkenskapsår. För mer information kolla {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Detta är ett exempel webbplats automatiskt genererade från ERPNext
@@ -2021,11 +2032,9 @@ DocType: Note,Note,Notera
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kvantitet
 DocType: Email Account,Email Ids,E-post Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Det går inte att producera mer artiklar {0} än kundorderns mängd {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Ange som stoppad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Konto
 DocType: Tax Rule,Billing City,Fakturerings Ort
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Detta Lämna Ansökan väntar på godkännande. Endast Lämna godkännare kan uppdatera status.
 DocType: Global Defaults,Hide Currency Symbol,Dölj Valutasymbol
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","t.ex. bank, kontanter, kreditkort"
 DocType: Journal Entry,Credit Note,Kreditnota
@@ -2046,7 +2055,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totalt (Antal)
 DocType: Installation Note Item,Installed Qty,Installerat antal
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Avsändare
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Avsändare
 DocType: Salary Structure,Total Earning,Totalt Tjänar
 DocType: Purchase Receipt,Time at which materials were received,Tidpunkt för material mottogs
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mina adresser
@@ -2055,7 +2064,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Kostnader
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Ovan
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Ovan
 DocType: Buying Settings,Default Buying Price List,Standard Inköpslista
 ,Download Backups,Hämta säkerhetskopior
 DocType: Notification Control,Sales Order Message,Kundorder Meddelande
@@ -2064,7 +2073,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Välj Anställda
 DocType: Bank Reconciliation,To Date,Till Datum
 DocType: Opportunity,Potential Sales Deal,Potentiella säljmöjligheter
-sites/assets/js/form.min.js +308,Details,Detaljer
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detaljer
 DocType: Purchase Invoice,Total Taxes and Charges,Totala skatter och avgifter
 DocType: Employee,Emergency Contact,Kontaktinformation I En Nödsituation
 DocType: Item,Quality Parameters,Kvalitetsparametrar
@@ -2079,7 +2088,7 @@ DocType: Purchase Order Item,Received Qty,Mottagna Antal
 DocType: Stock Entry Detail,Serial No / Batch,Löpnummer / Batch
 DocType: Product Bundle,Parent Item,Överordnad produkt
 DocType: Account,Account Type,Användartyp
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Underhållsschema genereras inte för alla objekt. Klicka på ""Generera Schema '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Underhållsschema genereras inte för alla objekt. Klicka på ""Generera Schema '"
 ,To Produce,Att Producera
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","För rad {0} i {1}. Om du vill inkludera {2} i punkt hastighet, rader {3} måste också inkluderas"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifiering av paketet för leverans (för utskrift)
@@ -2090,7 +2099,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Plattning
 DocType: Account,Income Account,Inkomst konto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Formning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Leverans
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Leverans
 DocType: Stock Reconciliation Item,Current Qty,Aktuellt Antal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se "Rate of Materials Based On" i kalkyl avsnitt
 DocType: Appraisal Goal,Key Responsibility Area,Nyckelansvar Områden
@@ -2120,9 +2129,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alla adresser.
 DocType: Company,Stock Settings,Stock Inställningar
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammanslagning är endast möjligt om följande egenskaper är desamma i båda posterna. Är gruppen, Root typ, Företag"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammanslagning är endast möjligt om följande egenskaper är desamma i båda posterna. Är gruppen, Root typ, Företag"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Hantera Kundgruppsträd.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Nytt kostnadsställe Namn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nytt kostnadsställe Namn
 DocType: Leave Control Panel,Leave Control Panel,Lämna Kontrollpanelen
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adress Mall hittades. Skapa en ny från Inställningar> Tryck och Branding> Adress mall.
 DocType: Appraisal,HR User,HR-Konto
@@ -2141,24 +2150,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Betalning Verktygs Detalj
 ,Sales Browser,Försäljnings Webbläsare
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlåning (tillgångar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Gäldenärer
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Stor
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen anställd hittas!
 DocType: C-Form Invoice Detail,Territory,Territorium
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ange antal besökare (krävs)
+DocType: Purchase Order,Customer Address Display,Kund Adress Display
 DocType: Stock Settings,Default Valuation Method,Standardvärderingsmetod
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
 DocType: Production Order Operation,Planned Start Time,Planerad starttid
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Tilldelad
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Stäng balansräkning och bokföringsmässig vinst eller förlust.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Standard mätenhet för punkt {0} kan inte ändras direkt eftersom \ du redan har gjort vissa transaktioner (s) med en annan UOM. Om du vill ändra standard UOM, \ användning "UOM Byt Utility" verktyg i Stock-modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Ange växelkursen för att konvertera en valuta till en annan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Offert {0} avbryts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Offert {0} avbryts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totala utestående beloppet
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Anställd {0} var på permission på {1}. Det går inte att markera närvaro.
 DocType: Sales Partner,Targets,Mål
@@ -2173,12 +2182,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Detta är en rot kundgrupp och kan inte ändras.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Vänligen ställa in dina kontoplaner innan du börjar bokföringsposter
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorera Prisregler
-sites/assets/js/list.min.js +24,Cancelled,Avbruten
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Avbruten
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Från datum i lönestruktur kan inte vara mindre än den anställdes Inträdesdatum.
 DocType: Employee Education,Graduate,Examinera
 DocType: Leave Block List,Block Days,Block Dagar
 DocType: Journal Entry,Excise Entry,Punktnotering
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Varning: Kundorder {0} finns redan mot Kundens beställning {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Varning: Kundorder {0} finns redan mot Kundens beställning {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2223,17 +2232,17 @@ DocType: Account,Stock Received But Not Billed,Stock mottagits men inte fakturer
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttolön + efterskott Belopp + inlösen Belopp - Totalt Avdrag
 DocType: Monthly Distribution,Distribution Name,Distributions Namn
 DocType: Features Setup,Sales and Purchase,Försäljning och Inköp
-DocType: Purchase Order Item,Material Request No,Material Ansökaningsnr
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
+DocType: Supplier Quotation Item,Material Request No,Material Ansökaningsnr
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,I takt med vilket vilken kundens valuta omvandlas till företagets basvaluta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} har avslutat prenumerationen på den här listan.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Netto kostnad (Företagsvaluta)
-apps/frappe/frappe/templates/base.html +132,Added,Inkom
+apps/frappe/frappe/templates/base.html +134,Added,Inkom
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Hantera Områden.
 DocType: Journal Entry Account,Sales Invoice,Försäljning Faktura
 DocType: Journal Entry Account,Party Balance,Parti Balans
 DocType: Sales Invoice Item,Time Log Batch,Tid Log Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Välj Verkställ rabatt på
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Välj Verkställ rabatt på
 DocType: Company,Default Receivable Account,Standard Mottagarkonto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Skapa Bankinlägg för den totala lönen för de ovan valda kriterier
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer för Tillverkning
@@ -2244,7 +2253,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Hämta relevanta uppgifter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Kontering för lager
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Prägling
 DocType: Sales Invoice,Sales Team1,Försäljnings Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Punkt {0} inte existerar
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Punkt {0} inte existerar
 DocType: Sales Invoice,Customer Address,Kundadress
 apps/frappe/frappe/desk/query_report.py +136,Total,Totalt
 DocType: Purchase Invoice,Apply Additional Discount On,Applicera ytterligare rabatt på
@@ -2259,13 +2268,15 @@ DocType: Quality Inspection,Quality Inspection,Kvalitetskontroll
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Liten
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray bildande
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Kontot {0} är fruset
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Kontot {0} är fruset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk person / Dotterbolag med en separat kontoplan som tillhör organisationen.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mat, dryck och tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionshastighet kan inte vara större än 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minsta lagernivå
 DocType: Stock Entry,Subcontract,Subkontrakt
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Ange {0} först
 DocType: Production Planning Tool,Get Items From Sales Orders,Hämta objekt från kundorder
 DocType: Production Order Operation,Actual End Time,Faktiskt Sluttid
 DocType: Production Planning Tool,Download Materials Required,Ladda ner Material som behövs
@@ -2282,9 +2293,9 @@ DocType: Maintenance Visit,Scheduled,Planerad
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Välj punkt där ""Är Lagervara"" är ""Nej"" och ""Är försäljningsprodukt"" är ""Ja"" och det finns ingen annat produktpaket"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Välj Månads Distribution till ojämnt fördela målen mellan månader.
 DocType: Purchase Invoice Item,Valuation Rate,Värderings betyg
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Prislista Valuta inte valt
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Prislista Valuta inte valt
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Produktrad {0}: inköpskvitto {1} finns inte i ovanstående ""kvitton"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Anställd {0} har redan ansökt om {1} mellan {2} och {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Anställd {0} har redan ansökt om {1} mellan {2} och {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Startdatum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Tills
 DocType: Rename Tool,Rename Log,Ändra logg
@@ -2311,13 +2322,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Endast huvudnoder är tillåtna i transaktionen
 DocType: Expense Claim,Expense Approver,Utgiftsgodkännare
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Inköpskvitto Artikel Levereras
-sites/assets/js/erpnext.min.js +48,Pay,Betala
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betala
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Till Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway webbadress
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Loggar för att upprätthålla sms leveransstatus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slipning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Krymp inslag
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Väntande Verksamhet
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Väntande Verksamhet
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekräftat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverantör> Leverantör Typ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ange avlösningsdatum.
@@ -2328,7 +2339,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Ang
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Tidningsutgivarna
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Välj Räkenskapsårets
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smältning
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Du har ansvar för ledigheter för denna post. Vänligen Uppdatera ""Status"" och spara"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ombeställningsnivå
 DocType: Attendance,Attendance Date,Närvaro Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lön upplösning baserat på inkomster och avdrag.
@@ -2364,6 +2374,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostnadsställe med befintliga transaktioner kan inte omvandlas till grupp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Avskrivningar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverantör (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ogiltig period
 DocType: Customer,Credit Limit,Kreditgräns
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Välj typ av transaktion
 DocType: GL Entry,Voucher No,Rabatt nr
@@ -2373,8 +2384,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Mall
 DocType: Customer,Address and Contact,Adress och Kontakt
 DocType: Customer,Last Day of the Next Month,Sista dagen i nästa månad
 DocType: Employee,Feedback,Respons
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Tidtabell
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tidtabell
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Maskinbearbetning Stråle
 DocType: Stock Settings,Freeze Stock Entries,Frys Lager Inlägg
 DocType: Website Settings,Website Settings,Webbplatsinställningar
@@ -2388,11 +2399,11 @@ DocType: Quality Inspection,Outgoing,Utgående
 DocType: Material Request,Requested For,Begärd För
 DocType: Quotation Item,Against Doctype,Mot Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Prenumerera på det här följesedel mot någon Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Root-kontot kan inte tas bort
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-kontot kan inte tas bort
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Visa Stock Inlägg
 ,Is Primary Address,Är Primär adress
 DocType: Production Order,Work-in-Progress Warehouse,Pågående Arbete - Lager
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referens # {0} den {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referens # {0} den {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Hantera Adresser
 DocType: Pricing Rule,Item Code,Produktkod
 DocType: Production Planning Tool,Create Production Orders,Skapa produktionsorder
@@ -2401,14 +2412,14 @@ DocType: Journal Entry,User Remark,Användar Anmärkning
 DocType: Lead,Market Segment,Marknadssegment
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Anställd interna arbetshistoria
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Closing (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Closing (Dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Löpnummer {0} inte i lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skatte mall för att sälja transaktioner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Avskrivning utestående belopp
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Markera om du behöver automatisk återkommande fakturor. Efter att ha lämnat någon fakturan, kommer återkommande avsnitt vara synlig."
 DocType: Account,Accounts Manager,Account Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Tid Logga {0} måste "Avsändare"
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Tid Logga {0} måste "Avsändare"
 DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Kostar Pris baseras på Aktivitetstyp (per timme)
 DocType: Production Planning Tool,Create Material Requests,Skapa Materialförfrågan
@@ -2419,7 +2430,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Bankavstämning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hämta uppdateringar
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Lägg till några exempeldokument
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Lämna ledning
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lämna ledning
 DocType: Event,Groups,Grupper
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupp per konto
 DocType: Sales Order,Fully Delivered,Fullt Levererad
@@ -2431,11 +2442,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Försäljnings Extras
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget för Konto {1} mot kostnadsställe {2} kommer att överstiga med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Skicka vidare ledighet
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Från datum" måste vara efter "Till datum"
 ,Stock Projected Qty,Lager Projicerad Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens beställning
 DocType: Warranty Claim,From Company,Från Företag
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Värde eller Antal
@@ -2448,13 +2458,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Återförsäljare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Tack till kontot måste vara ett balanskonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alla Leverantörs Typer
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Produktkod är obligatoriskt eftersom Varan inte är automatiskt numrerad
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Offert {0} inte av typen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Produktkod är obligatoriskt eftersom Varan inte är automatiskt numrerad
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Offert {0} inte av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Underhållsschema Produkt
 DocType: Sales Order,%  Delivered,% Levereras
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Checkräknings konto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Skapa lönebeskedet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Unstop
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Bläddra BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Säkrade lån
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Grymma Produkter
@@ -2464,7 +2473,7 @@ DocType: Appraisal,Appraisal,Värdering
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum gjutning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Ritning
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum upprepas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Ledighetsgodkännare måste vara en av {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Ledighetsgodkännare måste vara en av {0}
 DocType: Hub Settings,Seller Email,Säljare E-post
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totala inköpskostnaden (via inköpsfaktura)
 DocType: Workstation Working Hour,Start Time,Starttid
@@ -2478,8 +2487,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobelopp (Företagsvaluta)
 DocType: BOM Operation,Hour Rate,Tim värde
 DocType: Stock Settings,Item Naming By,Produktnamn Genom
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Från Offert
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},En annan period Utgående anteckning {0} har gjorts efter {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Från Offert
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En annan period Utgående anteckning {0} har gjorts efter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Överfört för tillverkning
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} existerar inte
 DocType: Purchase Receipt Item,Purchase Order Item No,Inköpsorder Artikelnr
@@ -2492,11 +2501,11 @@ DocType: Item,Inspection Required,Inspektion krävs
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt fakturerad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontant i hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Leverans lager som krävs för Beställningsvara {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Leverans lager som krävs för Beställningsvara {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovikten på paketet. Vanligtvis nettovikt + förpackningsmaterial vikt. (För utskrift)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Användare med den här rollen får ställa frysta konton och skapa / ändra bokföringsposter mot frysta konton
 DocType: Serial No,Is Cancelled,Är Inställd
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Mina Transporter
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mina Transporter
 DocType: Journal Entry,Bill Date,Faktureringsdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Även om det finns flera prissättningsregler med högsta prioritet, kommer följande interna prioriteringar tillämpas:"
 DocType: Supplier,Supplier Details,Leverantör Detaljer
@@ -2509,7 +2518,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronisk Överföring
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Välj bankkonto
 DocType: Newsletter,Create and Send Newsletters,Skapa och skicka nyhetsbrev
-sites/assets/js/report.min.js +107,From Date must be before To Date,Från Datum måste vara före Till Datum
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Från Datum måste vara före Till Datum
 DocType: Sales Order,Recurring Order,Återkommande Order
 DocType: Company,Default Income Account,Standard Inkomstkonto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundgrupp / Kunder
@@ -2524,31 +2533,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Lager UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Inköpsorder {0} inte lämnad
 ,Projected,Projicerad
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} tillhör inte Lager {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
 DocType: Notification Control,Quotation Message,Offert Meddelande
 DocType: Issue,Opening Date,Öppningsdatum
 DocType: Journal Entry,Remark,Anmärkning
 DocType: Purchase Receipt Item,Rate and Amount,Andel och Belopp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Borning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Från kundorder
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Från kundorder
 DocType: Blog Category,Parent Website Route,Överordnad Webbplatsrutt
 DocType: Sales Order,Not Billed,Inte Billed
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Lagren måste tillhöra samma företag
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Inga kontakter inlagda ännu.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Inga kontakter inlagda ännu.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Inte aktiv
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Mot Fakturabokningsdatum
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landad Kostnad rabattmängd
 DocType: Time Log,Batched for Billing,Batchad för fakturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Räkningar som framförts av leverantörer.
 DocType: POS Profile,Write Off Account,Avskrivningskonto
-sites/assets/js/erpnext.min.js +26,Discount Amount,Rabattbelopp
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabattbelopp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Återgå mot inköpsfaktura
 DocType: Item,Warranty Period (in days),Garantitiden (i dagar)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,t.ex. moms
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Produkt  4
 DocType: Journal Entry Account,Journal Entry Account,Journalanteckning konto
 DocType: Shopping Cart Settings,Quotation Series,Offert Serie
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Ett objekt finns med samma namn ({0}), ändra objektets varugrupp eller byt namn på objektet"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Ett objekt finns med samma namn ({0}), ändra objektets varugrupp eller byt namn på objektet"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas bildar
 DocType: Sales Order Item,Sales Order Date,Kundorder Datum
 DocType: Sales Invoice Item,Delivered Qty,Levererat Antal
@@ -2580,10 +2588,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Kund eller leverantör Detaljer
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Prospekt ägaren
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Lager krävs
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Lager krävs
 DocType: Employee,Marital Status,Civilstånd
 DocType: Stock Settings,Auto Material Request,Automaterialförfrågan
 DocType: Time Log,Will be updated when billed.,Kommer att uppdateras när den faktureras.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Finns Batch Antal på From Warehouse
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuell BOM och Nya BOM kan inte vara samma
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum för pensionering måste vara större än Datum för att delta
 DocType: Sales Invoice,Against Income Account,Mot Inkomst konto
@@ -2600,12 +2609,12 @@ DocType: POS Profile,Update Stock,Uppdatera lager
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Olika UOM för produkter kommer att leda till felaktiga (Total) Nettovikts värden. Se till att Nettovikt för varje post är i samma UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM betyg
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Vänligen hämta artikel från följesedel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Vänligen hämta artikel från följesedel
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journalanteckningar {0} är ej länkade
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Register över alla meddelanden av typen e-post, telefon, chatt, besök, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Ange kostnadsställe för avrundning i bolaget
 DocType: Purchase Invoice,Terms,Villkor
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Skapa Ny
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Skapa Ny
 DocType: Buying Settings,Purchase Order Required,Inköpsorder krävs
 ,Item-wise Sales History,Produktvis försäljnings historia
 DocType: Expense Claim,Total Sanctioned Amount,Totalt sanktione Mängd
@@ -2622,16 +2631,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Lön Slip Avdrag
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Anmärkningar
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Välj en grupp nod först.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Syfte måste vara en av {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Fyll i formuläret och spara det
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Fyll i formuläret och spara det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Hämta en rapport som innehåller alla råvaror med deras senaste lagerstatus
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Ledighets balans innan Ansökan
 DocType: SMS Center,Send SMS,Skicka SMS
 DocType: Company,Default Letter Head,Standard Brev
 DocType: Time Log,Billable,Fakturerbar
 DocType: Authorization Rule,This will be used for setting rule in HR module,Detta kommer att användas för att ställa in regeln i HR-modul
 DocType: Account,Rate at which this tax is applied,I takt med vilken denna skatt tillämpas
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Ombeställningskvantitet
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Ombeställningskvantitet
 DocType: Company,Stock Adjustment Account,Lager Justering Konto
 DocType: Journal Entry,Write Off,Avskrivning
 DocType: Time Log,Operation ID,Drift-ID
@@ -2642,12 +2652,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabatt fält kommer att finnas tillgänglig i inköpsorder, inköpskvitto, Inköpsfaktura"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Namn på ett nytt konto. Obs: Vänligen inte skapa konton för kunder och leverantörer
 DocType: Report,Report Type,Rapporttyp
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Laddar
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Laddar
 DocType: BOM Replace Tool,BOM Replace Tool,BOM ersättnings verktyg
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landsvis standard adressmallar
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Leverantören levererar till kunden
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Visa skatte uppbrott
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import och export
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Om du engagerar industrikonjunkturen. Aktiverar Punkt ""tillverkas"""
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fakturabokningsdatum
 DocType: Sales Invoice,Rounded Total,Avrundat Totalt
 DocType: Product Bundle,List items that form the package.,Lista objekt som bildar paketet.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentuell Fördelning bör vara lika med 100%
@@ -2658,8 +2671,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0} 
 DocType: Company,Default Cash Account,Standard Konto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Företag (inte kund eller leverantör) ledare.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Ange "Förväntat leveransdatum"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Följesedelsnoteringar {0} måste avbrytas innan du kan avbryta denna kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Ange "Förväntat leveransdatum"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Följesedelsnoteringar {0} måste avbrytas innan du kan avbryta denna kundorder
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betald belopp + Avskrivningsbelopp kan inte vara större än Totalsumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} är inte en giltig batchnummer för punkt {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Obs: Det finns inte tillräckligt med ledighetdagar för ledighet typ {0}
@@ -2680,11 +2693,12 @@ DocType: Notification Control,Send automatic emails to Contacts on Submitting tr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rad {0}: Antal inte tillgängligt i lager {1} på {2} {3}. Tillgängliga Antal: {4}, Transfer Antal: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Produkt 3
+DocType: Purchase Order,Customer Contact Email,Kundkontakt Email
 DocType: Event,Sunday,Söndag
 DocType: Sales Team,Contribution (%),Bidrag (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Obs: Betalningpost kommer inte skapas eftersom ""Kontanter eller bankkonto"" angavs inte"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområden
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Mall
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mall
 DocType: Sales Person,Sales Person Name,Försäljnings Person Namn
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ange minst 1 faktura i tabellen
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Lägg till användare
@@ -2693,7 +2707,7 @@ DocType: Task,Actual Start Date (via Time Logs),Faktiskt startdatum (via Tidslog
 DocType: Stock Reconciliation Item,Before reconciliation,Innan avstämning
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Till {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter och avgifter Added (Company valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
 DocType: Sales Order,Partly Billed,Delvis Faktuerard
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2701,12 +2715,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totalt Utestående Amt
 DocType: Time Log Batch,Total Hours,Totalt antal timmar
 DocType: Journal Entry,Printing Settings,Utskriftsinställningar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Totalt Betal måste vara lika med de sammanlagda kredit. Skillnaden är {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Totalt Betal måste vara lika med de sammanlagda kredit. Skillnaden är {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Fordon
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Lämnar för typ {0} redan avsatts för anställd {1} för räkenskapsåret {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Produkt krävs
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metall formsprutning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Från Följesedel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Från Följesedel
 DocType: Time Log,From Time,Från Tid
 DocType: Notification Control,Custom Message,Anpassat Meddelande
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
@@ -2722,17 +2735,17 @@ DocType: Newsletter,A Lead with this email id should exist,En start med denna ep
 DocType: Stock Entry,From BOM,Från BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundläggande
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Arkiv transaktioner före {0} är frysta
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Klicka på ""Skapa schema '"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Till Datum bör vara densamma som från Datum för halv dag ledighet
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Klicka på ""Skapa schema '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Till Datum bör vara densamma som från Datum för halv dag ledighet
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","t.ex. Kg, enhet, nr, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referensnummer är obligatoriskt om du har angett referens Datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referensnummer är obligatoriskt om du har angett referens Datum
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum för att delta måste vara större än Födelsedatum
 DocType: Salary Structure,Salary Structure,Lönestruktur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Flera prisregler finns med samma kriterier, vänligen lös \ konflikten genom att prioritera. Pris Regler: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flygbolag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Problem Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Problem Material
 DocType: Material Request Item,For Warehouse,För Lager
 DocType: Employee,Offer Date,Erbjudandet Datum
 DocType: Hub Settings,Access Token,Tillträde token
@@ -2755,6 +2768,7 @@ DocType: Issue,Opening Time,Öppnings Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Från och Till datum krävs
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Värdepapper och råvarubörserna
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
+DocType: Delivery Note Item,From Warehouse,Från Warehouse
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Borrning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Formblåsning
 DocType: Purchase Taxes and Charges,Valuation and Total,Värdering och Total
@@ -2776,11 +2790,12 @@ DocType: C-Form,Amended From,Ändrat Från
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Råmaterial
 DocType: Leave Application,Follow via Email,Följ via e-post
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebelopp efter rabatt Belopp
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Underkonto existerar för det här kontot. Du kan inte ta bort det här kontot.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Underkonto existerar för det här kontot. Du kan inte ta bort det här kontot.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Antingen mål antal eller målbeloppet är obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Välj Publiceringsdatum först
-DocType: Leave Allocation,Carry Forward,Skicka Vidare
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Välj Publiceringsdatum först
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Öppningsdatum ska vara innan Slutdatum
+DocType: Leave Control Panel,Carry Forward,Skicka Vidare
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Kostnadsställe med befintliga transaktioner kan inte omvandlas till liggaren
 DocType: Department,Days for which Holidays are blocked for this department.,Dagar då helgdagar är blockerade för denna avdelning.
 ,Produced,Producerat
@@ -2801,16 +2816,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totalt (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Underhållning & Fritid
 DocType: Purchase Order,The date on which recurring order will be stop,Den dag då återkommande beställning kommer att stoppa
 DocType: Quality Inspection,Item Serial No,Produkt Löpnummer
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} måste minskas med {1} eller om du bör öka överfödstolerans
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} måste minskas med {1} eller om du bör öka överfödstolerans
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Totalt Närvarande
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Timme
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serie Punkt {0} kan inte uppdateras \ använder Stock Avstämning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Överföra material till leverantören
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Överföra material till leverantören
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nya Löpnummer kan inte ha Lager. Lagermåste ställas in av lagerpost eller inköpskvitto
 DocType: Lead,Lead Type,Prospekt Typ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Skapa offert
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Alla dessa punkter har redan fakturerats
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alla dessa punkter har redan fakturerats
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkännas av {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt härskar Villkor
 DocType: BOM Replace Tool,The new BOM after replacement,Den nya BOM efter byte
@@ -2858,7 +2873,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Drift ID inte satt
 DocType: Production Order,Planned Start Date,Planerat startdatum
 DocType: Serial No,Creation Document Type,Skapande Dokumenttyp
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Besök
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Besök
 DocType: Leave Type,Is Encash,Är incheckad
 DocType: Purchase Invoice,Mobile No,Mobilnummer
 DocType: Payment Tool,Make Journal Entry,Skapa journalanteckning
@@ -2866,7 +2881,7 @@ DocType: Leave Allocation,New Leaves Allocated,Nya Ledigheter Avsatta
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projektvis uppgifter finns inte tillgängligt för Offert
 DocType: Project,Expected End Date,Förväntad Slutdatum
 DocType: Appraisal Template,Appraisal Template Title,Bedömning mall Titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Kommersiell
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kommersiell
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Moderbolaget Punkt {0} får inte vara en lagervara
 DocType: Cost Center,Distribution Id,Fördelning Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Grymma Tjänster
@@ -2882,14 +2897,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Värde för Attribut {0} måste vara inom intervallet {1} till {2} i steg om {3}
 DocType: Tax Rule,Sales,Försäljning
 DocType: Stock Entry Detail,Basic Amount,BASBELOPP
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
+DocType: Leave Allocation,Unused leaves,Oanvända blad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard Mottagarkonton
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sågning
 DocType: Tax Rule,Billing State,Faktureringsstaten
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Lamine
 DocType: Item Reorder,Transfer,Överföring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Är tillämpligt för (anställd)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Förfallodatum är obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
@@ -2905,6 +2921,7 @@ DocType: Company,Retail,Detaljhandeln
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kund {0} existerar inte
 DocType: Attendance,Absent,Frånvarande
 DocType: Product Bundle,Product Bundle,Produktpaket
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rad {0}: Ogiltig referens {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Krossning
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Inköp Skatter och avgifter Mall
 DocType: Upload Attendance,Download Template,Hämta mall
@@ -2912,16 +2929,16 @@ DocType: GL Entry,Remarks,Anmärkningar
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Råvaru Artikelkod
 DocType: Journal Entry,Write Off Based On,Avskrivning Baseras på
 DocType: Features Setup,POS View,POS Vy
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Installationsinfo för ett serienummer
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installationsinfo för ett serienummer
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Stränggjutning
-sites/assets/js/erpnext.min.js +10,Please specify a,Ange en
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ange en
 DocType: Offer Letter,Awaiting Response,Väntar på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Ovan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kall limnings
 DocType: Salary Slip,Earning & Deduction,Vinst & Avdrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Kontot {0} kan inte vara en grupp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Tillval. Denna inställning kommer att användas för att filtrera i olika transaktioner.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Tillval. Denna inställning kommer att användas för att filtrera i olika transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativt Värderingsvärde är inte tillåtet
 DocType: Holiday List,Weekly Off,Veckovis Av
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","För t.ex. 2012, 2012-13"
@@ -2965,12 +2982,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Utbuktning
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativ mönster gjutning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Representationskostnader
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fakturan {0} måste ställas in innan avbryta denna kundorder
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Ålder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fakturan {0} måste ställas in innan avbryta denna kundorder
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Ålder
 DocType: Time Log,Billing Amount,Fakturerings Mängd
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ogiltig mängd som anges för produkten {0}. Kvantitet bör vara större än 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansökan om ledighet.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Konto med befintlig transaktioner kan inte tas bort
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto med befintlig transaktioner kan inte tas bort
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Rättsskydds
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dagen i den månad som auto beställning kommer att genereras t.ex. 05, 28 etc"
 DocType: Sales Invoice,Posting Time,Boknings Tid
@@ -2979,9 +2996,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Markera det här om du vill tvinga användaren att välja en serie innan du sparar. Det blir ingen standard om du kontrollera detta.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ingen produkt med Löpnummer {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Öppna Meddelanden
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Öppna Meddelanden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkta kostnader
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Vill du verkligen att återuppta denna Material förfrågan?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nya kund Intäkter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Resekostnader
 DocType: Maintenance Visit,Breakdown,Nedbrytning
@@ -2992,7 +3008,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på Date
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Hening
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Skyddstillsyn
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Standard Lager är obligatoriskt för lagervara.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standard Lager är obligatoriskt för lagervara.
 DocType: Feed,Full Name,Fullständigt Namn
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Utbetalning av lön för månaden {0} och år {1}
@@ -3015,7 +3031,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Lägg rader fö
 DocType: Buying Settings,Default Supplier Type,Standard Leverantörstyp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Brytning
 DocType: Production Order,Total Operating Cost,Totala driftskostnaderna
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Obs: Punkt {0} inlagd flera gånger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Obs: Punkt {0} inlagd flera gånger
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alla kontakter.
 DocType: Newsletter,Test Email Id,Test e-post ID
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Företagetsförkortning
@@ -3039,11 +3055,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Offerte
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roll tillåtet att redigera fryst lager
 ,Territory Target Variance Item Group-Wise,Territory Mål Varians Post Group-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alla kundgrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Skatte Mall är obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Förälder konto {1} existerar inte
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prislista värde (Företagsvaluta)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} status är "Stoppad"
 DocType: Account,Temporary,Tillfällig
 DocType: Address,Preferred Billing Address,Önskad faktureringsadress
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuell Fördelning
@@ -3061,13 +3076,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Produktvis Skatte Detal
 DocType: Purchase Order Item,Supplier Quotation,Leverantör Offert
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord kommer att synas när du sparar offerten.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Stryk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} är stoppad
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} är stoppad
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
 DocType: Lead,Add to calendar on this date,Lägg till i kalender på denna dag
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler för att lägga fraktkostnader.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,uppkommande händelser
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,uppkommande händelser
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden är obligatoriskt
 DocType: Letter Head,Letter Head,Brev
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Snabbinmatning
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} är obligatorisk för Retur
 DocType: Purchase Order,To Receive,Att Motta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Krymppassning
@@ -3090,25 +3106,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Minst ett lager är obligatorisk
 DocType: Serial No,Out of Warranty,Ingen garanti
 DocType: BOM Replace Tool,Replace,Ersätt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} mot faktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Ange standardmåttenhet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mot faktura {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ange standardmåttenhet
 DocType: Purchase Invoice Item,Project Name,Projektnamn
 DocType: Supplier,Mention if non-standard receivable account,Nämn om icke-standardiserade fordran konto
 DocType: Workflow State,Edit,Redigera
 DocType: Journal Entry Account,If Income or Expense,Om intäkter eller kostnader
 DocType: Features Setup,Item Batch Nos,Produkt Sats nr
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Värde Skillnad
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Personal administration
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Personal administration
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betalning Avstämning Betalning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skattefordringar
 DocType: BOM Item,BOM No,BOM nr
 DocType: Contact Us Settings,Pincode,Pinkod
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalanteckning {0} har inte konto {1} eller redan matchad mot andra kuponger
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalanteckning {0} har inte konto {1} eller redan matchad mot andra kuponger
 DocType: Item,Moving Average,Rörligt medelvärde
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som kommer att ersättas
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nytt Lager UOM måste skilja sig från nuvarande Lager UOM
 DocType: Account,Debit,Debit-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Ledigheter ska fördelas i multiplar av 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Ledigheter ska fördelas i multiplar av 0,5"
 DocType: Production Order,Operation Cost,Driftkostnad
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Ladda upp närvaro från en CSV-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Utestående Amt
@@ -3116,7 +3132,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Uppsatt
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",Om du vill tilldela den här problemet genom att använda "Tilldela" i sidofältet.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Lager Äldre än [dagar]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Om två eller flera Prissättningsregler hittas baserat på ovanstående villkor, tillämpas prioritet . Prioritet är ett tal mellan 0 till 20, medan standardvärdet är noll (tom). Högre siffra innebär det kommer att ha företräde om det finns flera prissättningsregler med samma villkor."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Mot Faktura
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Räkenskapsårets: {0} inte existerar
 DocType: Currency Exchange,To Currency,Till Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillåt följande användarna att godkänna ledighetsansökningar för grupp dagar.
@@ -3145,7 +3160,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Andel
 DocType: Stock Entry Detail,Additional Cost,Extra kostnad
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Budgetåret Slutdatum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",Kan inte filtrera baserat på kupong nr om grupperad efter kupong
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Skapa Leverantörsoffert
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Skapa Leverantörsoffert
 DocType: Quality Inspection,Incoming,Inkommande
 DocType: BOM,Materials Required (Exploded),Material som krävs (Expanderad)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Minska tjänat belopp för ledighet utan lön (LWP)
@@ -3153,10 +3168,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rad # {0}: Löpnummer {1} inte stämmer överens med {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Tillfällig ledighet
 DocType: Batch,Batch ID,Batch-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Obs: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Obs: {0}
 ,Delivery Note Trends,Följesedel Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Veckans Sammanfattning
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} måste vara ett Köpt eller underleverantörers föremål i rad {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} måste vara ett Köpt eller underleverantörers föremål i rad {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan endast uppdateras via aktietransaktioner
 DocType: GL Entry,Party,Parti
 DocType: Sales Order,Delivery Date,Leveransdatum
@@ -3169,7 +3184,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,A
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Köpkurs
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timmar)
 DocType: Employee,History In Company,Historia Företaget
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Nyhetsbrev
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Nyhetsbrev
 DocType: Address,Shipping,Frakt
 DocType: Stock Ledger Entry,Stock Ledger Entry,Lager Ledger Entry
 DocType: Department,Leave Block List,Lämna Block List
@@ -3188,7 +3203,7 @@ DocType: Account,Auditor,Redigerare
 DocType: Purchase Order,End date of current order's period,Slutdatum för nuvarande order period
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Skapa ett anbudsbrev
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Återgå
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Standard mätenhet för Variant måste vara densamma som mall
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standard mätenhet för Variant måste vara densamma som mall
 DocType: DocField,Fold,Vika
 DocType: Production Order Operation,Production Order Operation,Produktionsorder Drift
 DocType: Pricing Rule,Disable,Inaktivera
@@ -3220,7 +3235,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Rapporter till
 DocType: SMS Settings,Enter url parameter for receiver nos,Ange url parameter för mottagaren
 DocType: Sales Invoice,Paid Amount,Betalt belopp
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',"Stänger konto {0} måste vara av typen ""Ansvar"""
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Stänger konto {0} måste vara av typen ""Ansvar"""
 ,Available Stock for Packing Items,Tillgängligt lager för förpackningsprodukter
 DocType: Item Variant,Item Variant,Produkt Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Ställa den här adressen mall som standard eftersom det inte finns någon annan standard
@@ -3228,7 +3243,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetshantering
 DocType: Production Planning Tool,Filter based on customer,Filter utifrån kundernas
 DocType: Payment Tool Detail,Against Voucher No,Mot kupongnr
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Vänligen ange antal förpackningar för artikel {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vänligen ange antal förpackningar för artikel {0}
 DocType: Employee External Work History,Employee External Work History,Anställd Extern Arbetserfarenhet
 DocType: Tax Rule,Purchase,Inköp
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balans Antal
@@ -3265,28 +3280,29 @@ Note: BOM = Bill of Materials","Grupp ** artiklar ** till en annan ** Artkel **.
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Löpnummer är obligatoriskt för punkt {0}
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ange från / till intervallet
-sites/assets/js/desk.min.js +7652,Created By,Skapad Av
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Skapad Av
 DocType: Serial No,Under AMC,Enligt AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Produkt värderingsvärdet omräknas pga angett rabattvärde
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardinställningar för att försäljnings transaktioner.
 DocType: BOM Replace Tool,Current BOM,Aktuell BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Lägg till Serienr
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Lägg till Serienr
 DocType: Production Order,Warehouses,Lager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Skriv ut
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grupp Nod
 DocType: Payment Reconciliation,Minimum Amount,Minimibelopp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Uppdatera färdiga varor
 DocType: Workstation,per hour,per timme
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Serie {0} används redan i {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serie {0} används redan i {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto för lagret (Perpetual Inventory) kommer att skapas inom ramen för detta konto.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Lager kan inte tas bort som lagrets huvudbok  existerar för det här lagret.
 DocType: Company,Distribution,Fördelning
-sites/assets/js/erpnext.min.js +50,Amount Paid,Betald Summa
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Betald Summa
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektledare
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Skicka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabatt tillåtet för objektet: {0} är {1}%
 DocType: Customer,Default Taxes and Charges,Standard skatter och avgifter
 DocType: Account,Receivable,Fordran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rad # {0}: Inte tillåtet att byta leverantör som beställning redan existerar
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roll som får godkänna transaktioner som överstiger kreditgränser.
 DocType: Sales Invoice,Supplier Reference,Leverantör Referens
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Om markerad, kommer BOM för underenhet poster övervägas för att få råvaror. Annars kommer alla undermonterings poster behandlas som en råvara."
@@ -3323,8 +3339,8 @@ DocType: Email Digest,Add/Remove Recipients,Lägg till / ta bort mottagare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion inte tillåtet mot stoppad produktionsorder {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","För att ställa denna verksamhetsåret som standard, klicka på "Ange som standard""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Inställning inkommande server stöd e-id. (T.ex. support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Brist Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Brist Antal
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
 DocType: Salary Slip,Salary Slip,Lön Slip
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polerings
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"Till datum" krävs
@@ -3337,6 +3353,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","När någon av de kontrollerade transaktionerna  är""Skickat"", en e-post pop-up öppnas automatiskt för att skicka ett mail till den tillhörande ""Kontakt"" i denna transaktion, med transaktionen som en bifogad fil. Användaren kan eller inte kan skicka e-post."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globala inställningar
 DocType: Employee Education,Employee Education,Anställd Utbildning
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
 DocType: Salary Slip,Net Pay,Nettolön
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serienummer {0} redan har mottagits
@@ -3369,7 +3386,7 @@ DocType: BOM,Manufacturing User,Tillverkningsanvändare
 DocType: Purchase Order,Raw Materials Supplied,Råvaror Levereras
 DocType: Purchase Invoice,Recurring Print Format,Återkommande Utskriftsformat
 DocType: Communication,Series,Serie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Förväntad leveransdatum kan inte vara före beställningsdatum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Förväntad leveransdatum kan inte vara före beställningsdatum
 DocType: Appraisal,Appraisal Template,Bedömning mall
 DocType: Communication,Email,E-post
 DocType: Item Group,Item Classification,Produkt Klassificering
@@ -3414,6 +3431,7 @@ DocType: HR Settings,Payroll Settings,Sociala Inställningar
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Matcha ej bundna fakturor och betalningar.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Beställa
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan inte ha en överordnat kostnadsställe
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Välj märke ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Tillämplig
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operation Time måste vara större än 0 för drift {0}
 DocType: Supplier,Address and Contacts,Adress och kontakter
@@ -3424,7 +3442,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Hämta Utestående Kuponger
 DocType: Warranty Claim,Resolved By,Åtgärdad av
 DocType: Appraisal,Start Date,Start Datum
-sites/assets/js/desk.min.js +7629,Value,Värde
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Värde
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Tilldela avgångar under en period.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klicka här för att kontrollera
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan inte tilldela sig själv som förälder konto
@@ -3440,14 +3458,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Tillträde tillåtet
 DocType: Dropbox Backup,Weekly,Veckovis
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,T.ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Receive
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Receive
 DocType: Maintenance Visit,Fully Completed,Helt Avslutad
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Färdig
 DocType: Employee,Educational Qualification,Utbildnings Kvalificering
 DocType: Workstation,Operating Costs,Operations Kostnader
 DocType: Employee Leave Approver,Employee Leave Approver,Anställd Lämna godkännare
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} har lagts till vårt nyhetsbrev lista.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle bearbetning
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Inköpschef
@@ -3460,7 +3478,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Lägg till / redigera priser
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Kontoplan på Kostnadsställen
 ,Requested Items To Be Ordered,Efterfrågade artiklar Beställningsvara
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Mina beställningar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mina beställningar
 DocType: Price List,Price List Name,Pris Listnamn
 DocType: Time Log,For Manufacturing,För tillverkning
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totals
@@ -3471,7 +3489,7 @@ DocType: Account,Income,Inkomst
 DocType: Industry Type,Industry Type,Industrityp
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Något gick snett!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Varning: Ledighetsansökan innehåller följande block datum
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Slutförande Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Belopp (Företagsvaluta)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Gjutning
@@ -3485,10 +3503,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,År
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Butikförsäljnings profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Uppdatera SMS Inställningar
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Tid Logga {0} redan faktureras
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Tid Logga {0} redan faktureras
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Lån utan säkerhet
 DocType: Cost Center,Cost Center Name,Kostnadcenter Namn
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Produkt  {0} med löpnummer {1} är redan installerat
 DocType: Maintenance Schedule Detail,Scheduled Date,Planerat datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Totalt betalade Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Meddelanden som är större än 160 tecken delas in i flera meddelanden
@@ -3496,10 +3513,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Mottagit och godkänt
 ,Serial No Service Contract Expiry,Löpnummer serviceavtal löper ut
 DocType: Item,Unit of Measure Conversion,Enhet Omvandling
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Anställd kan inte ändras
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
 DocType: Naming Series,Help HTML,Hjälp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Totalt weightage delas ska vara 100%. Det är {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Ersättning för över {0} korsade till punkt {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Ersättning för över {0} korsade till punkt {1}
 DocType: Address,Name of person or organization that this address belongs to.,Namn på den person eller organisation som den här adressen tillhör.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dina Leverantörer
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
@@ -3510,10 +3527,11 @@ DocType: Lead,Converted,Konverterad
 DocType: Item,Has Serial No,Har Löpnummer
 DocType: Employee,Date of Issue,Utgivningsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Från {0} för {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
 DocType: Issue,Content Type,Typ av innehåll
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Dator
 DocType: Item,List this Item in multiple groups on the website.,Lista detta objekt i flera grupper på webbplatsen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Kontrollera flera valutor möjlighet att tillåta konton med annan valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Kontrollera flera valutor möjlighet att tillåta konton med annan valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Produkt: {0} existerar inte i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du har inte behörighet att ställa in Frysta värden
 DocType: Payment Reconciliation,Get Unreconciled Entries,Hämta ej verifierade Anteckningar
@@ -3524,14 +3542,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Till Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Kontot {0} har angetts mer än en gång för räkenskapsåret {1}
 ,Average Commission Rate,Genomsnittligt commisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"Har Löpnummer" kan inte vara "ja" för icke Beställningsvara
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"Har Löpnummer" kan inte vara "ja" för icke Beställningsvara
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Närvaro kan inte markeras för framtida datum
 DocType: Pricing Rule,Pricing Rule Help,Prissättning Regel Hjälp
 DocType: Purchase Taxes and Charges,Account Head,Kontohuvud
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Uppdatera merkostnader för att beräkna landade kostnaden för objekt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Total Value Skillnad (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Rad {0}: Växelkurser är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rad {0}: Växelkurser är obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Användar-ID inte satt för anställd {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Från garantianspråk
@@ -3545,15 +3563,17 @@ DocType: Buying Settings,Naming Series,Namge Serien
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
 DocType: User,Enabled,Aktiverat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Tillgångar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Vill du verkligen skicka in alla lönebesked för månad {0} och år {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vill du verkligen skicka in alla lönebesked för månad {0} och år {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
 DocType: Target Detail,Target Qty,Mål Antal
 DocType: Attendance,Present,Närvarande
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Följesedel {0} får inte lämnas
 DocType: Notification Control,Sales Invoice Message,Fakturan Meddelande
 DocType: Authorization Rule,Based On,Baserat På
-,Ordered Qty,Beställde Antal
+DocType: Sales Order Item,Ordered Qty,Beställde Antal
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Punkt {0} är inaktiverad
 DocType: Stock Settings,Stock Frozen Upto,Lager Fryst Upp
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Period Från och period datum obligatoriska för återkommande {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektverksamhet / uppgift.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generera lönebesked
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} är inte ett giltig epost-id
@@ -3592,7 +3612,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Ladda upp Närvaro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM och tillverkningskvantitet krävs
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Åldringsräckvidd 2
-DocType: Journal Entry Account,Amount,Mängd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Mängd
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitning
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ersatte
 ,Sales Analytics,Försäljnings Analytics
@@ -3619,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Förväntad Datum kan inte vara före Material Begäran Datum
 DocType: Contact Us Settings,City,Stad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultraljuds bearbetning
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Fel: Inte ett giltigt id?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fel: Inte ett giltigt id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Produkt {0} måste vara ett försäljningsprodukt
 DocType: Naming Series,Update Series Number,Uppdatera Serie Nummer
 DocType: Account,Equity,Eget kapital
@@ -3634,7 +3654,7 @@ DocType: Purchase Taxes and Charges,Actual,Faktisk
 DocType: Authorization Rule,Customerwise Discount,Kundrabatt
 DocType: Purchase Invoice,Against Expense Account,Mot utgiftskonto
 DocType: Production Order,Production Order,Produktionsorder
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Installeringsnotis {0} har redan lämnats in
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installeringsnotis {0} har redan lämnats in
 DocType: Quotation Item,Against Docname,Mot doknamn
 DocType: SMS Center,All Employee (Active),Personal (aktiv)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Visa nu
@@ -3642,14 +3662,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Råvarukostnad
 DocType: Item,Re-Order Level,Återuppta nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ange produkter och planerad ant. som du vill höja produktionsorder eller hämta råvaror för analys.
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt-Schema
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt-Schema
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Tillämplig kalender
 DocType: Employee,Cheque,Check
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serie Uppdaterad
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttyp är obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Lager är obligatoriskt för Lagervara {0} i rad {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Lager är obligatoriskt för Lagervara {0} i rad {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Detaljhandel och grossisthandel
 DocType: Issue,First Responded On,Först svarade den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kors Notering av punkt i flera grupper
@@ -3664,7 +3684,7 @@ DocType: Attendance,Attendance,Närvaro
 DocType: Page,No,Nej
 DocType: BOM,Materials,Material
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Om inte markerad, måste listan läggas till varje avdelning där den måste tillämpas."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skatte mall för att köpa transaktioner.
 ,Item Prices,Produktpriser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,I Ord kommer att synas när du sparar beställningen.
@@ -3684,9 +3704,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativa kostnader
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Konsultering
 DocType: Customer Group,Parent Customer Group,Överordnad kundgrupp
-sites/assets/js/erpnext.min.js +50,Change,Byta
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Byta
 DocType: Purchase Invoice,Contact Email,Kontakt E-Post
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Inköpsorder {0} "Stoppad"
 DocType: Appraisal Goal,Score Earned,Betyg förtjänat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","t.ex. ""Mitt Företag LLC"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Uppsägningstid
@@ -3696,12 +3715,13 @@ DocType: Packing Slip,Gross Weight UOM,Bruttovikt UOM
 DocType: Email Digest,Receivables / Payables,Fordringar / skulder
 DocType: Delivery Note Item,Against Sales Invoice,Mot fakturan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Prägling
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,KUNDKONTO
 DocType: Landed Cost Item,Landed Cost Item,Landad kostnadspost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Visa nollvärden
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antal av objekt som erhålls efter tillverkning / ompackning från givna mängder av råvaror
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordran / Betal konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot Försäljningvara
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
 DocType: Item,Default Warehouse,Standard Lager
 DocType: Task,Actual End Date (via Time Logs),Faktiskt Slutdatum (via Tidslogg)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan inte tilldelas mot gruppkonto {0}
@@ -3715,7 +3735,7 @@ DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Totalt Betyg (Out of 5)
 DocType: Contact Us Settings,State,Status
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balans
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balans
 DocType: Project,Total Expense Claim (via Expense Claims),Totalkostnadskrav (via räkningar)
 DocType: User,Gender,Kön
 DocType: Journal Entry,Debit Note,Debetnota
@@ -3731,9 +3751,8 @@ DocType: Lead,Blog Subscriber,Blogg Abonnent
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Skapa regler för att begränsa transaktioner som grundar sig på värderingar.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Om markerad, Totalt antal. arbetsdagar kommer att omfatta helgdagar, och detta kommer att minska värdet av lönen per dag"
 DocType: Purchase Invoice,Total Advance,Totalt Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Unstop Materialförfrågan
 DocType: Workflow State,User,Användare
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Bearbetning Lön
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Bearbetning Lön
 DocType: Opportunity Item,Basic Rate,Baskurs
 DocType: GL Entry,Credit Amount,Kreditbelopp
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Ange som förlorade
@@ -3741,7 +3760,7 @@ DocType: Customer,Credit Days Based On,Kredit dagar baserat på
 DocType: Tax Rule,Tax Rule,Skatte Rule
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Behåll samma takt hela säljcykeln
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planera tidsloggar utanför planerad arbetstid.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} har redan lämnats in
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} har redan lämnats in
 ,Items To Be Requested,Produkter att begäras
 DocType: Purchase Order,Get Last Purchase Rate,Hämta Senaste Beställningsvärdet
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing Pris baseras på Aktivitetstyp (per timme)
@@ -3750,6 +3769,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Företagets epost-ID hittades inte, darför inte epost skickas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Tillämpning av medel (tillgångar)
 DocType: Production Planning Tool,Filter based on item,Filter baserat på objektet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Bankkortkonto
 DocType: Fiscal Year,Year Start Date,År Startdatum
 DocType: Attendance,Employee Name,Anställd Namn
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundat Totalt (Företagsvaluta)
@@ -3761,14 +3781,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blind
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Ersättningar till anställda
 DocType: Sales Invoice,Is POS,Är POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Tillverkas Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Godkänd Kvantitet
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existerar inte
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Fakturor till kunder.
 DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tillagda
 DocType: Maintenance Schedule,Schedule,Tidtabell
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definiera budget för detta kostnadsställe. Om du vill ställa budget action, se "Företag Lista""
@@ -3776,7 +3796,7 @@ DocType: Account,Parent Account,Moderbolaget konto
 DocType: Quality Inspection Reading,Reading 3,Avläsning 3
 ,Hub,Nav
 DocType: GL Entry,Voucher Type,Rabatt Typ
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Prislista hittades inte eller avaktiverad
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prislista hittades inte eller avaktiverad
 DocType: Expense Claim,Approved,Godkänd
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
@@ -3785,23 +3805,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Utbildning
 DocType: Selling Settings,Campaign Naming By,Kampanj namnges av
 DocType: Employee,Current Address Is,Nuvarande adress är
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Tillval. Ställer företagets standardvaluta, om inte annat anges."
 DocType: Address,Office,Kontors
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardrapporter
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Redovisning journalanteckningar.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Välj Anställningsregister först.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / konto stämmer inte med {1} / {2} i {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Tillgång Antal på From Warehouse
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Välj Anställningsregister först.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / konto stämmer inte med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,För att skapa en skattekontot
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ange utgiftskonto
 DocType: Account,Stock,Lager
 DocType: Employee,Current Address,Nuvarande Adress
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Om artikeln är en variant av ett annat objekt kommer beskrivning, bild, prissättning, skatter etc att ställas från mallen om inte annat uttryckligen anges"
 DocType: Serial No,Purchase / Manufacture Details,Inköp / Tillverknings Detaljer
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Sats Inventory
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Sats Inventory
 DocType: Employee,Contract End Date,Kontrakts Slutdatum
 DocType: Sales Order,Track this Sales Order against any Project,Prenumerera på det här kundorder mot varje Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Hämta försäljningsorder (i avvaktan på att leverera) baserat på ovanstående kriterier
 DocType: DocShare,Document Type,Dokumentstyp
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Från leverantör Offert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Från leverantör Offert
 DocType: Deduction Type,Deduction Type,Avdragstyp
 DocType: Attendance,Half Day,Halv Dag
 DocType: Pricing Rule,Min Qty,Min Antal
@@ -3812,20 +3834,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,För Kvantitet (Tillverkad Antal) är obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Valt Lager
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totalt (Företagsvaluta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Parti Typ och Parti gäller endast mot Fordran / Betal konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Parti Typ och Parti gäller endast mot Fordran / Betal konto
 DocType: Notification Control,Purchase Receipt Message,Inköpskvitto Meddelande
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totalt tilldelade bladen är mer än period
 DocType: Production Order,Actual Start Date,Faktiskt startdatum
 DocType: Sales Order,% of materials delivered against this Sales Order,% Av material som levereras mot denna kundorder
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Regsiterobjektets rörelse.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Regsiterobjektets rörelse.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhetsbrev listade Abonnenter
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Tapphåls
 DocType: Email Account,Service,Tjänsten
 DocType: Hub Settings,Hub Settings,Nav Inställningar
 DocType: Project,Gross Margin %,Bruttomarginal%
 DocType: BOM,With Operations,Med verksamhet
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bokföringsposter har redan gjorts i valuta {0} för företag {1}. Välj en fordran eller skuld konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bokföringsposter har redan gjorts i valuta {0} för företag {1}. Välj en fordran eller skuld konto med valuta {0}.
 ,Monthly Salary Register,Månadslön Register
-apps/frappe/frappe/website/template.py +123,Next,Nästa
+apps/frappe/frappe/website/template.py +140,Next,Nästa
 DocType: Warranty Claim,If different than customer address,Om annan än kundens adress
 DocType: BOM Operation,BOM Operation,BOM Drift
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrisk polering
@@ -3856,6 +3879,7 @@ DocType: Purchase Invoice,Next Date,Nästa Datum
 DocType: Employee Education,Major/Optional Subjects,Stora / valfria ämnen
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ange skatter och avgifter
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Bearbetning
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Här kan du behålla familje detaljer som namn och ockupationen av förälder, make och barn"
 DocType: Hub Settings,Seller Name,Säljaren Namn
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter och avgifter Avgår (Company valuta)
@@ -3882,29 +3906,29 @@ DocType: Purchase Order,To Receive and Bill,Ta emot och Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Villkor Mall
 DocType: Serial No,Delivery Details,Leveransdetaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Skapa automatiskt Material Begäran om kvantitet understiger denna nivå
 ,Item-wise Purchase Register,Produktvis Inköpsregister
 DocType: Batch,Expiry Date,Utgångsdatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","För att ställa in beställningsnivå, måste objektet vara en inköpsobjekt eller tillverkning Punkt"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","För att ställa in beställningsnivå, måste objektet vara en inköpsobjekt eller tillverkning Punkt"
 ,Supplier Addresses and Contacts,Leverantör adresser och kontakter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vänligen välj kategori först
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektchef.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Visa inte någon symbol som $ etc bredvid valutor.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditdagar
 DocType: Leave Type,Is Carry Forward,Är Överförd
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Hämta artiklar från BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Hämta artiklar från BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledtid dagar
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Parti Typ och Parti krävs för obetalda / konto {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Parti Typ och Parti krävs för obetalda / konto {1}
 DocType: Dropbox Backup,Send Notifications To,Skicka meddelanden till
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Anledning för att lämna
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktionerade Belopp
 DocType: GL Entry,Is Opening,Är Öppning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Kontot {0} existerar inte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Kontot {0} existerar inte
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi för webbplatsen och andra publikationer.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Skapa lönestruktur för arbetstagare {0}
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 78620c9095..c2356b78aa 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,சம்பளம் முறை
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","நீங்கள் பருவகாலம் அடிப்படையில் கண்காணிக்க வேண்டும் என்றால், மாதாந்திர, விநியோகம் தேர்ந்தெடுக்கவும்."
 DocType: Employee,Divorced,விவாகரத்து
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,எச்சரிக்கை: ஒரே பொருளைப் பலமுறை உள்ளிட்ட வருகிறது.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,எச்சரிக்கை: ஒரே பொருளைப் பலமுறை உள்ளிட்ட வருகிறது.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,பொருட்கள் ஏற்கனவே ஒத்திசைக்கப்படாது
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,பொருள் ஒரு பரிமாற்றத்தில் பல முறை சேர்க்க அனுமதி
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,பொருள் வருகை {0} இந்த உத்தரவாதத்தை கூறுகின்றனர் ரத்து முன் ரத்து
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,சுருக்கம் பிளஸ் வெப்பப்படுத்தலுக்கு
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},நாணய விலை பட்டியல் தேவையான {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* பரிமாற்றத்தில் கணக்கிடப்படுகிறது.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,பொருள் கோரிக்கையை இருந்து
+DocType: Purchase Order,Customer Contact,வாடிக்கையாளர் தொடர்பு
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,பொருள் கோரிக்கையை இருந்து
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} மரம்
 DocType: Job Applicant,Job Applicant,வேலை விண்ணப்பதாரர்
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,மேலும் முடிவுகள் இல்லை.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,வாடிக்கையாளர் பெயர்
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","நாணய , மாற்று விகிதம், ஏற்றுமதி மொத்த ஏற்றுமதி பெரும் மொத்த போன்ற அனைத்து ஏற்றுமதி தொடர்பான துறைகள் டெலிவரி குறிப்பு , பிஓஎஸ் , மேற்கோள் , கவிஞருக்கு , விற்பனை முதலியன உள்ளன"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"தலைவர்கள் (குழுக்களின்) எதிராக, பைனான்ஸ் பதிவுகள் செய்யப்படுகின்றன மற்றும் சமநிலைகள் பராமரிக்கப்படுகிறது."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),சிறந்த {0} பூஜ்யம் விட குறைவாக இருக்க முடியாது ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),சிறந்த {0} பூஜ்யம் விட குறைவாக இருக்க முடியாது ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,10 நிமிடங்கள் Default
 DocType: Leave Type,Leave Type Name,வகை பெயர் விட்டு
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,தொடர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,பல பொருள் வில
 DocType: SMS Center,All Supplier Contact,அனைத்து சப்ளையர் தொடர்பு
 DocType: Quality Inspection Reading,Parameter,அளவுரு
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,எதிர்பார்த்த முடிவு தேதி எதிர்பார்க்கப்படுகிறது தொடக்க தேதி விட குறைவாக இருக்க முடியாது
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,உண்மையில் உத்தரவு தடை இல்லாத வேண்டும்:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ரோ # {0}: விகிதம் அதே இருக்க வேண்டும் {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,வங்கி உண்டியல்
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. வாடிக்கையாளர் வாரியாக உருப்படியை குறியீடு பராமரிக்க மற்றும் அவற்றின் குறியீடு அடிப்படையில் அவர்களை தேடும் செய்ய இந்த விருப்பத்தை பயன்படுத்த
 DocType: Mode of Payment Account,Mode of Payment Account,கொடுப்பனவு கணக்கு முறை
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,காட்
 DocType: Sales Invoice Item,Quantity,அளவு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),கடன்கள் ( கடன்)
 DocType: Employee Education,Year of Passing,தேர்ச்சி பெறுவதற்கான ஆண்டு
-sites/assets/js/erpnext.min.js +27,In Stock,பங்கு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,மட்டுமே unbilled விற்பனை ஆணை எதிராக கட்டணம் செய்யலாம்
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,பங்கு
 DocType: Designation,Designation,பதவி
 DocType: Production Plan Item,Production Plan Item,உற்பத்தி திட்டம் பொருள்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},பயனர் {0} ஏற்கனவே பணியாளர் ஒதுக்கப்படும் {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,புதிய பிஓஎஸ் செய்தது செய்ய
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,உடல்நலம்
 DocType: Purchase Invoice,Monthly,மாதாந்தர
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,விலைப்பட்டியல்
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),கட்டணம் தாமதம் (நாட்கள்)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,விலைப்பட்டியல்
 DocType: Maintenance Schedule Item,Periodicity,வட்டம்
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,மின்னஞ்சல் முகவரி
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,பாதுகாப்பு
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ஸ்கோர் (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},ரோ {0} {1} {2} பொருந்தவில்லை {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ரோ {0} {1} {2} பொருந்தவில்லை {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,ரோ # {0}:
 DocType: Delivery Note,Vehicle No,வாகனம் இல்லை
-sites/assets/js/erpnext.min.js +55,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,மரப்பொருட்கள்
 DocType: Production Order Operation,Work In Progress,முன்னேற்றம் வேலை
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D அச்சிடும்
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,பெற்றோர் விர
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,கிலோ
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,ஒரு வேலை திறப்பு.
 DocType: Item Attribute,Increment,சம்பள உயர்வு
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,கிடங்கு தேர்ந்தெடுக்கவும் ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,விளம்பரம்
 DocType: Employee,Married,திருமணம்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
 DocType: Payment Reconciliation,Reconcile,சமரசம்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,மளிகை
 DocType: Quality Inspection Reading,Reading 1,1 படித்தல்
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,வங்கி நுழைவு செய்ய
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,வங்கி நுழைவு செய்ய
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,கணக்கு வகை கிடங்கு என்றால் கிடங்கு கட்டாய ஆகிறது
 DocType: SMS Center,All Sales Person,அனைத்து விற்பனை நபர்
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,செலவு மையம் இ
 DocType: Warehouse,Warehouse Detail,சேமிப்பு கிடங்கு விரிவாக
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},கடன் எல்லை வாடிக்கையாளர் கடந்து {0} {1} / {2}
 DocType: Tax Rule,Tax Type,வரி வகை
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},நீங்கள் முன் உள்ளீடுகளை சேர்க்க அல்லது மேம்படுத்தல் அங்கீகாரம் இல்லை {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},நீங்கள் முன் உள்ளீடுகளை சேர்க்க அல்லது மேம்படுத்தல் அங்கீகாரம் இல்லை {0}
 DocType: Item,Item Image (if not slideshow),உருப்படி படம் (இருந்தால் ஸ்லைடுஷோ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,"ஒரு வாடிக்கையாளர் , அதே பெயரில்"
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(அவ்வேளை விகிதம் / 60) * உண்மையான நடவடிக்கையை நேரம்
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,விருந்தினர்
 DocType: Quality Inspection,Get Specification Details,குறிப்பு விவரம் கிடைக்கும்
 DocType: Lead,Interested,அக்கறை உள்ள
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,பொருள் பில்
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,திறப்பு
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,திறப்பு
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},இருந்து {0} {1}
 DocType: Item,Copy From Item Group,பொருள் குழு நகல்
 DocType: Journal Entry,Opening Entry,நுழைவு திறந்து
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,தயாரிப்பு விசாரணை
 DocType: Standard Reply,Owner,சொந்தக்காரர்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,முதல் நிறுவனம் உள்ளிடவும்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,முதல் நிறுவனம் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,முதல் நிறுவனம் தேர்ந்தெடுக்கவும்
 DocType: Employee Education,Under Graduate,பட்டதாரி கீழ்
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,இலக்கு
 DocType: BOM,Total Cost,மொத்த செலவு
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,முற்சேர்க்கை
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,நுகர்வோர்
 DocType: Upload Attendance,Import Log,புகுபதிகை இறக்குமதி
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,அனுப்பு
+DocType: Sales Invoice Item,Delivered By Supplier,சப்ளையர் மூலம் வழங்கப்படுகிறது
 DocType: SMS Center,All Contact,அனைத்து தொடர்பு
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,ஆண்டு சம்பளம்
 DocType: Period Closing Voucher,Closing Fiscal Year,நிதியாண்டு மூடுவதற்கு
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,கான்ட்ரா நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,காட்டு நேரத்தில் பதிவுகள்
 DocType: Journal Entry Account,Credit in Company Currency,நிறுவனத்தின் நாணய கடன்
 DocType: Delivery Note,Installation Status,நிறுவல் நிலைமை
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},அக்செப்டட் + நிராகரிக்கப்பட்டது அளவு பொருள் பெறப்பட்டது அளவு சமமாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},அக்செப்டட் + நிராகரிக்கப்பட்டது அளவு பொருள் பெறப்பட்டது அளவு சமமாக இருக்க வேண்டும் {0}
 DocType: Item,Supply Raw Materials for Purchase,வழங்கல் மூலப்பொருட்கள் வாங்க
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,பொருள் {0} ஒரு கொள்முதல் பொருள் இருக்க வேண்டும்
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", டெம்ப்ளேட் பதிவிறக்கம் பொருத்தமான தரவு நிரப்ப செய்தது கோப்பு இணைக்கவும்.
  தேர்வு காலம் இருக்கும் அனைத்து தேதிகளும் ஊழியர் இணைந்து ஏற்கனவே உள்ள வருகைப் பதிவேடுகள் கொண்டு, டெம்ப்ளேட் வரும்"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,பொருள் {0} செயலில் இல்லை அல்லது வாழ்க்கை முடிவுக்கு வந்து விட்டது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,பொருள் {0} செயலில் இல்லை அல்லது வாழ்க்கை முடிவுக்கு வந்து விட்டது
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,விற்பனை விலைப்பட்டியல் சமர்பிக்கப்பட்டதும் புதுப்பிக்கப்படும்.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
 DocType: SMS Center,SMS Center,எஸ்எம்எஸ் மையம்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,நேராக்க
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,செய்தி இண
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,விலை மற்றும் தள்ளுபடி விண்ணப்பம் செய்வதற்கான விதிமுறைகள் .
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},இந்த நேரம் பரிசீலனை மோதல்கள் {0} க்கான {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,விலை பட்டியல் கொள்முதல் அல்லது விற்பனை பொருந்தும் வேண்டும்
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},நிறுவல் தேதி உருப்படி பிரசவ தேதி முன் இருக்க முடியாது {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},நிறுவல் தேதி உருப்படி பிரசவ தேதி முன் இருக்க முடியாது {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),விலை பட்டியல் விகிதம் தள்ளுபடி (%)
-sites/assets/js/form.min.js +279,Start,தொடக்கம்
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,தொடக்கம்
 DocType: User,First Name,முதல் பெயர்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,உங்கள் அமைப்பு முழு ஆகிறது. புத்துணர்ச்சி.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,முழு அச்சு வார்ப்பு
 DocType: Offer Letter,Select Terms and Conditions,தேர்வு விதிமுறைகள் மற்றும் நிபந்தனைகள்
 DocType: Production Planning Tool,Sales Orders,விற்பனை ஆணைகள்
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள் எதிராக
 ,Production Orders in Progress,முன்னேற்றம் உற்பத்தி ஆணைகள்
 DocType: Lead,Address & Contact,முகவரி மற்றும் தொடர்பு கொள்ள
+DocType: Leave Allocation,Add unused leaves from previous allocations,முந்தைய ஒதுக்கீடுகளை இருந்து பயன்படுத்தப்படாத இலைகள் சேர்க்கவும்
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},அடுத்த தொடர் {0} ம் உருவாக்கப்பட்ட {1}
 DocType: Newsletter List,Total Subscribers,மொத்த சந்தாதாரர்கள்
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,பெயர் தொடர்பு
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,எனவே அளவு நில
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,மேலே குறிப்பிட்டுள்ள அடிப்படை சம்பளம் சீட்டு உருவாக்குகிறது.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,வாங்குவதற்கு கோரிக்கை.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,இரட்டை வீடுகள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,தேதி நிவாரணத்தில் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,வருடத்திற்கு இலைகள்
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} அமைப்பு> அமைப்புகள் வழியாக> பெயரிடும் தொடர் தொடர் பெயரிடும் அமைக்க தயவு செய்து
 DocType: Time Log,Will be updated when batched.,Batched போது புதுப்பிக்கப்படும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ரோ {0}: சரிபார்க்கவும் கணக்கு எதிராக 'அட்வான்ஸ்' என்ற {1} இந்த ஒரு முன்கூட்டியே நுழைவு என்றால்.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ரோ {0}: சரிபார்க்கவும் கணக்கு எதிராக 'அட்வான்ஸ்' என்ற {1} இந்த ஒரு முன்கூட்டியே நுழைவு என்றால்.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},கிடங்கு {0} அல்ல நிறுவனம் {1}
 DocType: Bulk Email,Message,செய்தி
 DocType: Item Website Specification,Item Website Specification,உருப்படியை வலைத்தளம் குறிப்புகள்
 DocType: Dropbox Backup,Dropbox Access Key,டிரா பாக்ஸ் அணுகல் விசை
 DocType: Payment Tool,Reference No,குறிப்பு இல்லை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,தடுக்கப்பட்ட விட்டு
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
 DocType: Stock Entry,Sales Invoice No,விற்பனை விலைப்பட்டியல் இல்லை
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,குறைந்தபட்ச ஆணை அ
 DocType: Pricing Rule,Supplier Type,வழங்குபவர் வகை
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,பொருள் {0} ரத்து
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,பொருள் கோரிக்கை
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
 DocType: Item,Purchase Details,கொள்முதல் விவரம்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},கொள்முதல் ஆணை உள்ள 'மூலப்பொருட்கள் சப்ளை' அட்டவணை காணப்படவில்லை பொருள் {0} {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,அறிவிப்பு 
 DocType: Lead,Suggestions,பரிந்துரைகள்
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,இந்த மண்டலம் உருப்படி பிரிவு வாரியான வரவு செலவு திட்டம் அமைக்க. நீங்கள் விநியோகம் அமைக்க பருவகாலம் சேர்க்க முடியும்.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},கிடங்கு பெற்றோர் கணக்கு குழு உள்ளிடவும் {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},எதிராக செலுத்தும் {0} {1} மிகச்சிறந்த காட்டிலும் அதிகமாக இருக்க முடியாது {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},எதிராக செலுத்தும் {0} {1} மிகச்சிறந்த காட்டிலும் அதிகமாக இருக்க முடியாது {2}
 DocType: Supplier,Address HTML,HTML முகவரி
 DocType: Lead,Mobile No.,மொபைல் எண்
 DocType: Maintenance Schedule,Generate Schedule,அட்டவணை உருவாக்க
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,புதிய பங்கு
 DocType: Period Closing Voucher,Closing Account Head,கணக்கு தலைமை மூடுவதற்கு
 DocType: Employee,External Work History,வெளி வேலை வரலாறு
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,வட்ட குறிப்பு பிழை
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,நீங்கள் உண்மையில் நிறுத்த விரும்புகிறீர்களா
 DocType: Communication,Closed,மூடிய
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,நீங்கள் டெலிவரி குறிப்பு சேமிக்க முறை வேர்ட்ஸ் (ஏற்றுமதி) காண முடியும்.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,நீங்கள் நிறுத்த வேண்டும் என்பதில் உறுதியாக இருக்கிறீர்களா
 DocType: Lead,Industry,தொழில்
 DocType: Employee,Job Profile,வேலை விவரம்
 DocType: Newsletter,Newsletter,செய்தி மடல்
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,டெலிவரி குறிப
 DocType: Dropbox Backup,Allow Dropbox Access,டிராப்பாக்ஸ் அணுகல் அனுமதி
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,வரி அமைத்தல்
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,இந்த வாரம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Workstation,Rent Cost,வாடகை செலவு
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,மாதம் மற்றும் ஆண்டு தேர்ந்தெடுக்கவும்
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,விகிதம் இது வாடிக்கையாளர் நாணயத்தின் வாடிக்கையாளர் அடிப்படை நாணய மாற்றப்படும்
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Bom, டெலிவரி குறிப்பு , கொள்முதல் விலைப்பட்டியல் , உத்தரவு , கொள்முதல் ஆணை , கொள்முதல் ரசீது , கவிஞருக்கு , விற்பனை , பங்கு நுழைவு , எங்கோ கிடைக்கும்"
 DocType: Item Tax,Tax Rate,வரி விகிதம்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,உருப்படி தேர்வுசெய்க
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","பொருள்: {0} தொகுதி வாரியாக, அதற்கு பதிலாக பயன்படுத்த பங்கு நுழைவு \
  பங்கு நல்லிணக்க பயன்படுத்தி சமரசப்படுத்த முடியாது நிர்வகிக்கப்படத்தது"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ரோ # {0}: கூறு எண் அதே இருக்க வேண்டும் {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,அல்லாத குழு மாற்றுக
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,வாங்கும் ரசீது சமர்ப்பிக்க வேண்டும்
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,தற்போதைய
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,ஒரு பொருள் ஒரு தொகுதி (நிறைய).
 DocType: C-Form Invoice Detail,Invoice Date,விலைப்பட்டியல் தேதி
 DocType: GL Entry,Debit Amount,பற்று தொகை
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,உங்கள் மின்னஞ்சல் முகவரியை
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,இணைப்பு பார்க்கவும்
 DocType: Purchase Order,% Received,% பெறப்பட்டது
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,அறிவுறுத்தல்கள்
 DocType: Quality Inspection,Inspected By,மூலம் ஆய்வு
 DocType: Maintenance Visit,Maintenance Type,பராமரிப்பு அமைப்பு
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},தொடர் இல {0} டெலிவரி குறிப்பு அல்ல {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},தொடர் இல {0} டெலிவரி குறிப்பு அல்ல {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,உருப்படியை தர ஆய்வு அளவுரு
 DocType: Leave Application,Leave Approver Name,தரப்பில் சாட்சி பெயர் விடவும்
 ,Schedule Date,அட்டவணை தேதி
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,பதிவு வாங்குவதற்கு
 DocType: Landed Cost Item,Applicable Charges,பிரயோகிக்கப்படும் கட்டணங்கள்
 DocType: Workstation,Consumable Cost,நுகர்வோர் விலை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
 DocType: Purchase Receipt,Vehicle Date,வாகன தேதி
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,மருத்துவம்
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,இழந்து காரணம்
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% நிறுவப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,முதல் நிறுவனத்தின் பெயரை உள்ளிடுக
 DocType: BOM,Item Desription,உருப்படியை Desription
 DocType: Purchase Invoice,Supplier Name,வழங்குபவர் பெயர்
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext கையேட்டை வாசிக்க
 DocType: Account,Is Group,குழு
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,தானாகவே மற்றும் FIFO அடிப்படையில் நாம் சீரியல் அமை
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,காசோலை சப்ளையர் விலைப்பட்டியல் எண் தனித்துவம்
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,விற்ப
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,அனைத்து உற்பத்தி செயல்முறைகள் உலக அமைப்புகள்.
 DocType: Accounts Settings,Accounts Frozen Upto,கணக்குகள் வரை உறை
 DocType: SMS Log,Sent On,அன்று அனுப்பப்பட்டது
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
 DocType: Sales Order,Not Applicable,பொருந்தாது
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,விடுமுறை மாஸ்டர் .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ஷெல் வடிவமைத்தல்
 DocType: Material Request Item,Required Date,தேவையான தேதி
 DocType: Delivery Note,Billing Address,பில்லிங் முகவரி
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
 DocType: BOM,Costing,செலவு
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","தேர்ந்தெடுக்கப்பட்டால், ஏற்கனவே அச்சிடுக விகிதம் / அச்சிடுக தொகை சேர்க்கப்பட்டுள்ளது என, வரி தொகை"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,மொத்த அளவு
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),(நிமி
 DocType: Customer,Buyer of Goods and Services.,பொருட்கள் மற்றும் சேவைகள் வாங்குபவர்.
 DocType: Journal Entry,Accounts Payable,கணக்குகள் செலுத்த வேண்டிய
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,சந்தாதாரர்கள் சேர்க்கவும்
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" உள்ளது இல்லை"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" உள்ளது இல்லை"
 DocType: Pricing Rule,Valid Upto,வரை செல்லுபடியாகும்
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,உங்கள் வாடிக்கையாளர்களுக்கு ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,நேரடி வருமானம்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","கணக்கு மூலம் தொகுக்கப்பட்டுள்ளது என்றால் , கணக்கு அடிப்படையில் வடிகட்ட முடியாது"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,நிர்வாக அதிகாரி
 DocType: Payment Tool,Received Or Paid,பெறப்படும் அல்லது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
 DocType: Stock Entry,Difference Account,வித்தியாசம் கணக்கு
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,அதன் சார்ந்து பணி {0} மூடவில்லை நெருக்கமாக பணி அல்ல முடியும்.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
 DocType: Production Order,Additional Operating Cost,கூடுதல் இயக்க செலவு
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,ஒப்பனை
 DocType: DocField,Type,மாதிரி
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
 DocType: Communication,Subject,பொருள்
 DocType: Shipping Rule,Net Weight,நிகர எடை
 DocType: Employee,Emergency Phone,அவசர தொலைபேசி
 ,Serial No Warranty Expiry,தொடர் இல்லை உத்தரவாதத்தை காலாவதியாகும்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,நீங்கள் உண்மையில் இந்த பொருள் கோரிக்கை நிறுத்த விரும்புகிறீர்களா ?
 DocType: Sales Order,To Deliver,வழங்க
 DocType: Purchase Invoice Item,Item,உருப்படி
 DocType: Journal Entry,Difference (Dr - Cr),வேறுபாடு ( டாக்டர் - CR)
 DocType: Account,Profit and Loss,இலாப நட்ட
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,நிர்வாக உப ஒப்பந்தமிடல்
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,நிர்வாக உப ஒப்பந்தமிடல்
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,புதிய மொறட்டுவ பல்கலைகழகம் வகை முழு எண் இருக்க கூடாது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,"மரச்சாமான்கள் , திருவோணம்,"
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,விலை பட்டியல் நாணய நிறுவனத்தின் அடிப்படை நாணய மாற்றப்படும் விகிதத்தை
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,வரிகள் மற
 DocType: Purchase Invoice,Supplier Invoice No,வழங்குபவர் விலைப்பட்டியல் இல்லை
 DocType: Territory,For reference,குறிப்பிற்கு
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","நீக்க முடியாது தொ.எ. {0}, அது பங்கு பரிவர்த்தனைகள் பயன்படுத்தப்படும் விதத்தில்"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),நிறைவு (CR)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),நிறைவு (CR)
 DocType: Serial No,Warranty Period (Days),உத்தரவாதத்தை காலம் (நாட்கள்)
 DocType: Installation Note Item,Installation Note Item,நிறுவல் குறிப்பு பொருள்
 ,Pending Qty,நிலுவையில் அளவு
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,பில்லிங் மற
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,மீண்டும் வாடிக்கையாளர்கள்
 DocType: Leave Control Panel,Allocate,நிர்ணயி
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,முந்தைய
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,விற்பனை Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,விற்பனை Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,நீங்கள் உற்பத்தி ஆணைகள் உருவாக்க வேண்டிய இருந்து விற்பனை ஆணைகள் தேர்ந்தெடுக்கவும்.
+DocType: Item,Delivered by Supplier (Drop Ship),சப்ளையர் மூலம் வழங்கப்படுகிறது (டிராப் கப்பல்)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,சம்பளம் கூறுகள்.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,வாடிக்கையாளர்கள் பற்றிய தகவல்.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,வாடிக்கையாளர் தகவல்.
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,தரைமட்டத்திற்கு
 DocType: Purchase Order Item,Billed Amt,கணக்கில் AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"பங்கு உள்ளீடுகளை செய்யப்படுகின்றன எதிராக, ஒரு தருக்க கிடங்கு."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},குறிப்பு இல்லை & பரிந்துரை தேதி தேவைப்படுகிறது {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},குறிப்பு இல்லை & பரிந்துரை தேதி தேவைப்படுகிறது {0}
 DocType: Event,Wednesday,புதன்கிழமை
 DocType: Sales Invoice,Customer's Vendor,வாடிக்கையாளர் விற்பனையாளர்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,உற்பத்தி ஓட்டப் ஆகிறது
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,ரிசீவர் அளவுரு
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'அடிப்படையாக கொண்டு ' மற்றும் ' குழு மூலம் ' அதே இருக்க முடியாது
 DocType: Sales Person,Sales Person Targets,விற்பனை நபர் இலக்குகள்
-sites/assets/js/form.min.js +271,To,செய்ய
-apps/frappe/frappe/templates/base.html +143,Please enter email address,மின்னஞ்சல் முகவரியை உள்ளிடவும்
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,செய்ய
+apps/frappe/frappe/templates/base.html +145,Please enter email address,மின்னஞ்சல் முகவரியை உள்ளிடவும்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,உருவாக்கும் முடிவு குழாய்
 DocType: Production Order Operation,In minutes,நிமிடங்களில்
 DocType: Issue,Resolution Date,தீர்மானம் தேதி
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,திட்டங்கள் பயனர
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,உட்கொள்ளுகிறது
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0} {1} விலைப்பட்டியல் விவரம் அட்டவணையில் இல்லை
 DocType: Company,Round Off Cost Center,விலை மையம் ஆஃப் சுற்றுக்கு
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு வருகை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு வருகை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 DocType: Material Request,Material Transfer,பொருள் மாற்றம்
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),துவாரம் ( டாக்டர் )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},பதிவுசெய்ய நேர முத்திரை பின்னர் இருக்க வேண்டும் {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,அமைப்புகள்
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed செலவு வரிகள் மற்றும் கட்டணங்கள்
 DocType: Production Order Operation,Actual Start Time,உண்மையான தொடக்க நேரம்
 DocType: BOM Operation,Operation Time,ஆபரேஷன் நேரம்
-sites/assets/js/list.min.js +5,More,அதிக
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,அதிக
 DocType: Pricing Rule,Sales Manager,விற்பனை மேலாளர்
-sites/assets/js/desk.min.js +7673,Rename,மறுபெயரிடு
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,மறுபெயரிடு
 DocType: Journal Entry,Write Off Amount,மொத்த தொகை இனிய எழுத
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,வளைக்கும்
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,பயனர் அனுமதி
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,நேராக வெட்டுதல்
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,அவர்களின் தொடர் இலக்கங்கள் அடிப்படையில் விற்பனை மற்றும் கொள்முதல் ஆவணங்களில் உருப்படியை தடமறிய. இந்த உற்பத்தியில் உத்தரவாதத்தை விவரங்களை கண்டறிய பயன்படுகிறது.
 DocType: Purchase Receipt Item Supplied,Current Stock,தற்போதைய பங்கு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,நிராகரிக்கப்பட்டது கிடங்கு regected உருப்படியை எதிராக கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,நிராகரிக்கப்பட்டது கிடங்கு regected உருப்படியை எதிராக கட்டாய ஆகிறது
 DocType: Account,Expenses Included In Valuation,செலவுகள் மதிப்பீட்டு சேர்க்கப்பட்டுள்ளது
 DocType: Employee,Provide email id registered in company,நிறுவனத்தின் பதிவு மின்னஞ்சல் ஐடி வழங்கும்
 DocType: Hub Settings,Seller City,விற்பனையாளர் நகரத்தை
 DocType: Email Digest,Next email will be sent on:,அடுத்த மின்னஞ்சலில் அனுப்பி வைக்கப்படும்:
 DocType: Offer Letter Term,Offer Letter Term,கடிதம் கால ஆஃபர்
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,பொருள் வகைகள் உண்டு.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,பொருள் {0} இல்லை
 DocType: Bin,Stock Value,பங்கு மதிப்பு
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,மரம் வகை
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,நல்வரவு
 DocType: Journal Entry,Credit Card Entry,கடன் அட்டை நுழைவு
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,பணி தலைப்பு
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,பொருட்கள் விநியோகஸ்தர்கள் இருந்து பெற்றார்.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,பொருட்கள் விநியோகஸ்தர்கள் இருந்து பெற்றார்.
 DocType: Communication,Open,திறந்த
 DocType: Lead,Campaign Name,பிரச்சாரம் பெயர்
 ,Reserved,முன்பதிவு
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,நீங்கள் உண்மையில் தடை இல்லாத விரும்புகிறீர்களா
 DocType: Purchase Order,Supply Raw Materials,வழங்கல் மூலப்பொருட்கள்
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,அடுத்து விலைப்பட்டியல் உருவாக்கப்படும் எந்த தேதி. அதை சமர்ப்பிக்க உருவாக்கப்படும்.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,நடப்பு சொத்துக்கள்
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,வாடிக்கையாளர் கொள்முதல் ஆர்டர் இல்லை
 DocType: Employee,Cell Number,செல் எண்
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,லாஸ்ட்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,"நீங்கள் பத்தியில், 'ஜர்னல் ஆஃப் நுழைவு எதிராக' தற்போதைய ரசீது நுழைய முடியாது"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"நீங்கள் பத்தியில், 'ஜர்னல் ஆஃப் நுழைவு எதிராக' தற்போதைய ரசீது நுழைய முடியாது"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,சக்தி
 DocType: Opportunity,Opportunity From,வாய்ப்பு வரம்பு
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,மாத சம்பளம் அறிக்கை.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,கடமை
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ஒப்புதல் தொகை ரோ கூறுகின்றனர் காட்டிலும் அதிகமாக இருக்க முடியாது {0}.
 DocType: Company,Default Cost of Goods Sold Account,பொருட்களை விற்பனை கணக்கு இயல்பான செலவு
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,விலை பட்டியல் தேர்வு
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,விலை பட்டியல் தேர்வு
 DocType: Employee,Family Background,குடும்ப பின்னணி
 DocType: Process Payroll,Send Email,மின்னஞ்சல் அனுப்ப
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,இல்லை அனுமதி
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,இலக
 DocType: Item,Items with higher weightage will be shown higher,அதிக வெயிட்டேஜ் உருப்படிகள் அதிக காட்டப்படும்
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,வங்கி நல்லிணக்க விரிவாக
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,என் பொருள்
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,எதுவும் ஊழியர்
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,எதுவும் ஊழியர்
 DocType: Purchase Order,Stopped,நிறுத்தி
 DocType: Item,If subcontracted to a vendor,ஒரு விற்பனையாளர் ஒப்பந்தக்காரர்களுக்கு என்றால்
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,"தொடங்க BOM, தேர்ந்தெடுக்கவும்"
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Csv வ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,இப்போது அனுப்பவும்
 ,Support Analytics,ஆதரவு ஆய்வு
 DocType: Item,Website Warehouse,இணைய கிடங்கு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,நீங்கள் உண்மையில் உத்தரவு நிறுத்த வேண்டும்:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","கார் விலைப்பட்டியல் 05, 28 எ.கா. உருவாக்கப்படும் மாதத்தின் நாள்"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ஸ்கோர் குறைவாக அல்லது 5 சமமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,சி படிவம் பதிவுகள்
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,வ
 DocType: Features Setup,"To enable ""Point of Sale"" features","விற்பனை செய்யுமிடம்" அம்சங்களை செயல்படுத்த
 DocType: Bin,Moving Average Rate,சராசரி விகிதம் நகரும்
 DocType: Production Planning Tool,Select Items,தேர்ந்தெடு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
 DocType: Comment,Reference Name,குறிப்பு பெயர்
 DocType: Maintenance Visit,Completion Status,நிறைவு நிலைமை
 DocType: Sales Invoice Item,Target Warehouse,இலக்கு கிடங்கு
 DocType: Item,Allow over delivery or receipt upto this percent,இந்த சதவிகிதம் வரை விநியோக அல்லது ரசீது மீது அனுமதிக்கவும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,எதிர்பார்க்கப்படுகிறது பிரசவ தேதி முன் விற்பனை ஆணை தேதி இருக்க முடியாது
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,எதிர்பார்க்கப்படுகிறது பிரசவ தேதி முன் விற்பனை ஆணை தேதி இருக்க முடியாது
 DocType: Upload Attendance,Import Attendance,இறக்குமதி பங்கேற்கும்
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,அனைத்து பொருள் குழுக்கள்
 DocType: Process Payroll,Activity Log,நடவடிக்கை புகுபதிகை
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,தானாக நடவடிக்கைகள் சமர்ப்பிப்பு செய்தி உருவாக்கும் .
 DocType: Production Order,Item To Manufacture,உற்பத்தி பொருள்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,நிரந்தர அச்சு வார்ப்பு
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,கொடுப்பனவு ஆணை வாங்க
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} நிலையை {2} ஆகிறது
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,கொடுப்பனவு ஆணை வாங்க
 DocType: Sales Order Item,Projected Qty,திட்டமிட்டிருந்தது அளவு
 DocType: Sales Invoice,Payment Due Date,கொடுப்பனவு காரணமாக தேதி
 DocType: Newsletter,Newsletter Manager,செய்திமடல் மேலாளர்
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,கோரப்பட்ட எண்க
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,செயல்திறன் மதிப்பிடுதல்.
 DocType: Sales Invoice Item,Stock Details,பங்கு விபரங்கள்
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,திட்ட மதிப்பு
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,புள்ளி விற்பனை
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},முன்னோக்கி செல்ல முடியாது {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,புள்ளி விற்பனை
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},முன்னோக்கி செல்ல முடியாது {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","கணக்கு நிலுவை ஏற்கனவே கடன், நீங்கள் அமைக்க அனுமதி இல்லை 'டெபிட்' என 'சமநிலை இருக்க வேண்டும்'"
 DocType: Account,Balance must be,இருப்பு இருக்க வேண்டும்
 DocType: Hub Settings,Publish Pricing,விலை வெளியிடு
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,ரசீது வாங்க
 ,Received Items To Be Billed,கட்டணம் பெறப்படும் பொருட்கள்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ஊது சிராய்ப்பு
-sites/assets/js/desk.min.js +3938,Ms,Ms
+DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,நாணய மாற்று வீதம் மாஸ்டர் .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
 DocType: Production Order,Plan material for sub-assemblies,துணை கூட்டங்கள் திட்டம் பொருள்
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,எல்லை
 DocType: Supplier,Default Payable Accounts,இயல்புநிலை செலுத்தத்தக்க கணக்குகள்
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
 DocType: Features Setup,Item Barcode,உருப்படியை பார்கோடு
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,விலைப்பட்டியல் அட்வான்ஸ் வாங்குவதற்கு
 DocType: Address,Shop,ஷாப்பிங்
 DocType: Hub Settings,Sync Now,இப்போது ஒத்திசை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},ரோ {0}: கடன் நுழைவு இணைத்தே ஒரு {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},ரோ {0}: கடன் நுழைவு இணைத்தே ஒரு {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,இந்த முறையில் தேர்ந்தெடுக்கும் போது முன்னிருப்பு வங்கி / பண கணக்கு தானாக பிஓஎஸ் விலைப்பட்டியல் உள்ள புதுப்பிக்கப்படும்.
 DocType: Employee,Permanent Address Is,நிரந்தர முகவரி
 DocType: Production Order Operation,Operation completed for how many finished goods?,ஆபரேஷன் எத்தனை முடிக்கப்பட்ட பொருட்கள் நிறைவு?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,பிராண்ட்
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}.
 DocType: Employee,Exit Interview Details,பேட்டி விவரம் வெளியேற
 DocType: Item,Is Purchase Item,கொள்முதல் உருப்படி உள்ளது
 DocType: Journal Entry Account,Purchase Invoice,விலைப்பட்டியல் கொள்வனவு
 DocType: Stock Ledger Entry,Voucher Detail No,ரசீது விரிவாக இல்லை
 DocType: Stock Entry,Total Outgoing Value,மொத்த வெளிச்செல்லும் மதிப்பு
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,தேதி மற்றும் முடிவுத் திகதி திறந்து அதே நிதியாண்டு க்குள் இருக்க வேண்டும்
 DocType: Lead,Request for Information,தகவல் கோரிக்கை
 DocType: Payment Tool,Paid,Paid
 DocType: Salary Slip,Total in words,வார்த்தைகளில் மொத்த
 DocType: Material Request Item,Lead Time Date,நேரம் தேதி இட்டு
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,கட்டாயமாகும். ஒருவேளை செலாவணி பதிவு செய்தது
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},ரோ # {0}: பொருள் சீரியல் இல்லை குறிப்பிடவும் {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'தயாரிப்பு மூட்டை' பொருட்களை, சேமிப்புக் கிடங்கு, தொ.எ. மற்றும் தொகுதி இல்லை 'பேக்கிங்கை பட்டியலில் மேஜையிலிருந்து கருதப்படுகிறது. கிடங்கு மற்றும் தொகுதி இல்லை எந்த 'தயாரிப்பு மூட்டை' உருப்படியை அனைத்து பொதி பொருட்களை அதே இருந்தால், அந்த மதிப்புகள் முக்கிய பொருள் அட்டவணை உள்ளிட்ட முடியும், மதிப்புகள் மேஜை '' பட்டியல் பொதி 'நகலெடுக்கப்படும்."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,வாடிக்கையாளர்களுக்கு ஏற்றுமதி.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,வாடிக்கையாளர்களுக்கு ஏற்றுமதி.
 DocType: Purchase Invoice Item,Purchase Order Item,ஆர்டர் பொருள் வாங்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,மறைமுக வருமானம்
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,அமை செலுத்தும் தொகை = மிகச்சிறந்த தொகை
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,முகவரி வரி 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,மாறுபாடு
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,நிறுவனத்தின் பெயர்
 DocType: SMS Center,Total Message(s),மொத்த செய்தி (கள்)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,அனைத்து உதவி வீடியோக்களை பட்டியலை காண்க
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,காசோலை டெபாசிட் அங்கு வங்கி கணக்கு தலைவர் தேர்வு.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,பயனர் நடவடிக்கைகளில் விலை பட்டியல் விகிதம் திருத்த அனுமதி
 DocType: Pricing Rule,Max Qty,மேக்ஸ் அளவு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ரோ {0}: விற்பனை / கொள்முதல் ஆணை எதிரான கொடுப்பனவு எப்போதும் முன்கூட்டியே குறித்தது வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ரோ {0}: விற்பனை / கொள்முதல் ஆணை எதிரான கொடுப்பனவு எப்போதும் முன்கூட்டியே குறித்தது வேண்டும்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,இரசாயன
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
 DocType: Process Payroll,Select Payroll Year and Month,சம்பளப்பட்டியல் ஆண்டு மற்றும் மாத தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",அதற்கான குழு (பொதுவாக நிதிகள் விண்ணப்ப> நடப்பு சொத்துக்கள்> வங்கி கணக்குகள் சென்று வகை) குழந்தை சேர் கிளிக் செய்வதன் மூலம் (ஒரு புதிய கணக்கு உருவாக்க "வங்கி"
 DocType: Workstation,Electricity Cost,மின்சார செலவு
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,வ
 DocType: SMS Center,All Lead (Open),அனைத்து முன்னணி (திறந்த)
 DocType: Purchase Invoice,Get Advances Paid,கட்டண முன்னேற்றங்கள் கிடைக்கும்
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,உங்கள் படம் இணைக்கவும்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,செய்ய
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,செய்ய
 DocType: Journal Entry,Total Amount in Words,சொற்கள் மொத்த தொகை
 DocType: Workflow State,Stop,நிறுத்த
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ஒரு பிழை ஏற்பட்டது . ஒரு சாத்தியமான காரணம் நீங்கள் வடிவம் காப்பாற்ற முடியாது என்று இருக்க முடியும் . சிக்கல் தொடர்ந்தால் support@erpnext.com தொடர்பு கொள்ளவும்.
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,ஸ்லிப் பொரு
 DocType: POS Profile,Cash/Bank Account,பண / வங்கி கணக்கு
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
 DocType: Delivery Note,Delivery To,வழங்கும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Planning Tool,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,தாக்கல்
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',நேரம்
 DocType: Project,Internal,உள்ளக
 DocType: Task,Urgent,அவசரமான
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},அட்டவணையில் வரிசை {0} ஒரு செல்லுபடியாகும் வரிசை ஐடி தயவு செய்து குறிப்பிடவும் {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,டெஸ்க்டாப் சென்று ERPNext பயன்படுத்தி தொடங்க
 DocType: Item,Manufacturer,உற்பத்தியாளர்
 DocType: Landed Cost Item,Purchase Receipt Item,ரசீது பொருள் வாங்க
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,விற்பனை ஆணை / இறுதிப்பொருட்களாக்கும் கிடங்கில் ஒதுக்கப்பட்ட கிடங்கு
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,விற்பனை தொகை
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,நேரம் பதிவுகள்
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,இந்த பதிவு செலவு அப்ரூவரான இருக்கிறீர்கள் . 'தகுதி' புதுப்பி இரட்சியும்
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,இந்த பதிவு செலவு அப்ரூவரான இருக்கிறீர்கள் . 'தகுதி' புதுப்பி இரட்சியும்
 DocType: Serial No,Creation Document No,உருவாக்கம் ஆவண இல்லை
 DocType: Issue,Issue,சிக்கல்
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","பொருள் வகைகளையும் காரணிகள். எ.கா. அளவு, நிறம், முதலியன"
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,எதிராக
 DocType: Item,Default Selling Cost Center,இயல்புநிலை விற்பனை செலவு மையம்
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
 DocType: Opportunity,Contact Info,தகவல் தொடர்பு
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
 DocType: Packing Slip,Net Weight UOM,நிகர எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Item,Default Supplier,இயல்புநிலை சப்ளையர்
 DocType: Manufacturing Settings,Over Production Allowance Percentage,உற்பத்தி கொடுப்பனவான சதவீதம் ஓவர்
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,வாராந்திர இனிய தினங்கள் கிடைக்கும்
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,முடிவு தேதி தொடங்கும் நாள் விட குறைவாக இருக்க முடியாது
 DocType: Sales Person,Select company name first.,முதல் நிறுவனத்தின் பெயரை தேர்ந்தெடுக்கவும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,டாக்டர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,டாக்டர்
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,மேற்கோள்கள் சப்ளையர்கள் இருந்து பெற்றார்.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},எப்படி {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,நேரத்தில் பதிவுகள் வழியாக புதுப்பிக்கப்பட்டது
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,உங்கள் குறிப்பு நிறுவனத்தில் பதிவு எண்கள். வரி எண்கள் போன்ற
 DocType: Sales Partner,Distributor,பகிர்கருவி
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,வண்டியில் கப்பல் விதி
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 ,Ordered Items To Be Billed,கணக்கில் வேண்டும் உத்தரவிட்டது உருப்படிகள்
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,ரேஞ்ச் குறைவாக இருக்க வேண்டும் இருந்து விட வரையறைக்கு
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,நேரம் பதிவுகள் தேர்ந்தெடுத்து ஒரு புதிய விற்பனை விலைப்பட்டியல் உருவாக்க சமர்ப்பிக்கவும்.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,வர
 DocType: Lead,Lead,தலைமை
 DocType: Email Digest,Payables,Payables
 DocType: Account,Warehouse,கிடங்கு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,ரோ # {0}: அளவு கொள்முதல் ரிட்டன் உள்ளிட முடியாது நிராகரிக்கப்பட்டது
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,ரோ # {0}: அளவு கொள்முதல் ரிட்டன் உள்ளிட முடியாது நிராகரிக்கப்பட்டது
 ,Purchase Order Items To Be Billed,"பில்லிங் செய்யப்படும் விதமே இருக்கவும் செய்ய வாங்குதல், ஆர்டர் உருப்படிகள்"
 DocType: Purchase Invoice Item,Net Rate,நிகர விகிதம்
 DocType: Purchase Invoice Item,Purchase Invoice Item,விலைப்பட்டியல் பொருள் வாங்க
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,ஒப்புர
 DocType: Global Defaults,Current Fiscal Year,தற்போதைய நிதியாண்டு
 DocType: Global Defaults,Disable Rounded Total,வட்டமான மொத்த முடக்கு
 DocType: Lead,Call,அழைப்பு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},பிரதி வரிசையில் {0} அதே {1}
 ,Trial Balance,விசாரணை இருப்பு
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,ஊழியர் அமைத்தல்
-sites/assets/js/erpnext.min.js +5,"Grid ""","கிரிட் """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ஊழியர் அமைத்தல்
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","கிரிட் """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,முதல் முன்னொட்டு தேர்வு செய்க
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,ஆராய்ச்சி
 DocType: Maintenance Visit Purpose,Work Done,வேலை
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,அனுப்பப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,காட்சி லெட்ஜர்
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,மிகமுந்திய
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
 DocType: Communication,Delivery Status,விநியோக நிலைமை
 DocType: Production Order,Manufacture against Sales Order,விற்பனை அமைப்புக்கு எதிராக உற்பத்தி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,உலகம் முழுவதும்
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,உலகம் முழுவதும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,பொருள் {0} பணி முடியாது
 ,Budget Variance Report,வரவு செலவு வேறுபாடு அறிக்கை
 DocType: Salary Slip,Gross Pay,ஒட்டு மொத்த ஊதியம் / சம்பளம்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,பங்கிலாபங்களைப்
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,பைனான்ஸ் லெட்ஜர்
 DocType: Stock Reconciliation,Difference Amount,வேறுபாடு தொகை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,தக்க வருவாய்
 DocType: BOM Item,Item Description,உருப்படி விளக்கம்
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,வாய்ப்பு தகவல
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,தற்காலிக திறப்பு
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,பணியாளர் விடுப்பு இருப்பு
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},{0} எப்போதும் இருக்க வேண்டும் கணக்கு இருப்பு {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} எப்போதும் இருக்க வேண்டும் கணக்கு இருப்பு {1}
 DocType: Address,Address Type,முகவரி வகை
 DocType: Purchase Receipt,Rejected Warehouse,நிராகரிக்கப்பட்டது கிடங்கு
 DocType: GL Entry,Against Voucher,வவுச்சர் எதிராக
 DocType: Item,Default Buying Cost Center,இயல்புநிலை வாங்குதல் செலவு மையம்
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext சிறந்த வெளியே, நாங்கள் உங்களுக்கு சில நேரம் இந்த உதவி வீடியோக்களை பார்க்க வேண்டும் என்று பரிந்துரைக்கிறோம்."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,பொருள் {0} விற்பனை பொருளாக இருக்க வேண்டும்
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,செய்ய
 DocType: Item,Lead Time in days,நாட்கள் முன்னணி நேரம்
 ,Accounts Payable Summary,செலுத்தத்தக்க கணக்குகள் சுருக்கம்
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},உறைந்த கணக்கு திருத்த அதிகாரம் இல்லை {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},உறைந்த கணக்கு திருத்த அதிகாரம் இல்லை {0}
 DocType: Journal Entry,Get Outstanding Invoices,சிறந்த பற்றுச்சீட்டுகள் கிடைக்கும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,இந்த இடத்தில்
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ஒப்பந்த
 DocType: Report,Disabled,முடக்கப்பட்டது
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},மொறட்டுவ பல்கலைகழகம் தேவையான மொறட்டுவ பல்கலைகழகம் Coversion காரணி: {0} உருப்படியை: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},மொறட்டுவ பல்கலைகழகம் தேவையான மொறட்டுவ பல்கலைகழகம் Coversion காரணி: {0} உருப்படியை: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,மறைமுக செலவுகள்
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ரோ {0}: அளவு கட்டாய ஆகிறது
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,விவசாயம்
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,கட்டணம் செலுத
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,இந்த ஒரு ரூட் உருப்படியை குழு மற்றும் திருத்த முடியாது .
 DocType: Journal Entry Account,Purchase Order,ஆர்டர் வாங்க
 DocType: Warehouse,Warehouse Contact Info,சேமிப்பு கிடங்கு தொடர்பு தகவல்
-sites/assets/js/form.min.js +190,Name is required,பெயர் தேவை
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,பெயர் தேவை
 DocType: Purchase Invoice,Recurring Type,மீண்டும் வகை
 DocType: Address,City/Town,நகரம் / டவுன்
 DocType: Email Digest,Annual Income,ஆண்டு வருமானம்
 DocType: Serial No,Serial No Details,தொடர் எண் விவரம்
 DocType: Purchase Invoice Item,Item Tax Rate,உருப்படியை வரி விகிதம்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,மூலதன கருவிகள்
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,இலக்கு
 DocType: Sales Invoice Item,Edit Description,திருத்த விளக்கம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,எதிர்பார்த்த வழங்குதல் தேதி திட்டமிட்ட தொடக்க தேதி விட குறைந்த உள்ளது.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,சப்ளையர்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,சப்ளையர்
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,அமைத்தல் கணக்கு வகை பரிமாற்றங்கள் இந்த கணக்கு தேர்வு உதவுகிறது.
 DocType: Purchase Invoice,Grand Total (Company Currency),கிராண்ட் மொத்த (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,மொத்த வெளிச்செல்லும்
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","மட்டுமே "" மதிப்பு "" 0 அல்லது வெற்று மதிப்பு ஒரு கப்பல் விதி நிலை இருக்க முடியாது"
 DocType: Authorization Rule,Transaction,பரிவர்த்தனை
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,குறிப்பு: இந்த விலை மையம் ஒரு குழு உள்ளது. குழுக்களுக்கு எதிராக கணக்கியல் உள்ளீடுகள் செய்ய முடியாது .
-apps/erpnext/erpnext/config/projects.py +43,Tools,கருவிகள்
+apps/frappe/frappe/config/desk.py +7,Tools,கருவிகள்
 DocType: Item,Website Item Groups,இணைய தகவல்கள் குழுக்கள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,உற்பத்தி ஆர்டர் எண் பங்கு நுழைவு நோக்கத்திற்காக உற்பத்தி அத்தியாவசியமானதாகும்
 DocType: Purchase Invoice,Total (Company Currency),மொத்த (நிறுவனத்தின் நாணயம்)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,பணிநிலைய பெயர்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,மின்னஞ்சல் தொகுப்பு:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
 DocType: Sales Partner,Target Distribution,இலக்கு விநியோகம்
-sites/assets/js/desk.min.js +7652,Comments,கருத்துரைகள்
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,கருத்துரைகள்
 DocType: Salary Slip,Bank Account No.,வங்கி கணக்கு எண்
 DocType: Naming Series,This is the number of the last created transaction with this prefix,இந்த முன்னொட்டு கடந்த உருவாக்கப்பட்ட பரிவர்த்தனை எண்ணிக்கை
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},பொருள் தேவை மதிப்பீட்டு விகிதம் {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ஒரு 
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,தனிச்சலுகை விடுப்பு
 DocType: Purchase Invoice,Supplier Invoice Date,வழங்குபவர் விலைப்பட்டியல் தேதி
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,வண்டியில் செயல்படுத்த வேண்டும்
-sites/assets/js/form.min.js +212,No Data,தரவு இல்லை
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,தரவு இல்லை
 DocType: Appraisal Template Goal,Appraisal Template Goal,மதிப்பீட்டு வார்ப்புரு கோல்
 DocType: Salary Slip,Earning,சம்பாதித்து
 DocType: Payment Tool,Party Account Currency,கட்சி கணக்கு நாணய
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,கட்சி கணக்கு
 DocType: Purchase Taxes and Charges,Add or Deduct,சேர்க்க அல்லது கழித்து
 DocType: Company,If Yearly Budget Exceeded (for expense account),வருடாந்திரம் பட்ஜெட் (செலவு கணக்கு க்கான) மீறிவிட்டது
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,இடையே காணப்படும் ஒன்றுடன் ஒன்று நிலைமைகள் :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,ஜர்னல் எதிராக நுழைவு {0} ஏற்கனவே வேறு சில ரசீது எதிரான சரிசெய்யப்பட்டது
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,ஜர்னல் எதிராக நுழைவு {0} ஏற்கனவே வேறு சில ரசீது எதிரான சரிசெய்யப்பட்டது
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,மொத்த ஒழுங்கு மதிப்பு
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,உணவு
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,வயதான ரேஞ்ச் 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,வருகைகள் எண்ணிக்கை
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","தொடர்புகள் செய்திமடல்கள், வழிவகுக்கிறது."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},கணக்கை மூடுவதற்கான நாணயம் இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},அனைத்து இலக்குகளை புள்ளிகள் தொகை இது 100 இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,செயல்பாடுகள் காலியாக இருக்கக் கூடாது.
 ,Delivered Items To Be Billed,கட்டணம் வழங்கப்படும் பொருட்கள்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,கிடங்கு சீரியல் எண் மாற்றப்பட கூடாது
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},நிலைமை மேம்படுத்தப்பட்டது {0}
 DocType: DocField,Description,விளக்கம்
 DocType: Authorization Rule,Average Discount,சராசரி தள்ளுபடி
 DocType: Letter Head,Is Default,இது இயல்பு
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,உருப்படியை 
 DocType: Item,Maintain Stock,பங்கு பராமரிக்கவும்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ஏற்கனவே உற்பத்தி ஆணை உருவாக்கப்பட்ட பங்கு பதிவுகள்
 DocType: Leave Control Panel,Leave blank if considered for all designations,அனைத்து வடிவ கருத்தில் இருந்தால் வெறுமையாக
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},அதிகபட்சம்: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,நாள்நேரம் இருந்து
 DocType: Email Digest,For Company,நிறுவனத்தின்
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,ஷிப்பிங் முக
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,கணக்கு விளக்கப்படம்
 DocType: Material Request,Terms and Conditions Content,நிபந்தனைகள் உள்ளடக்கம்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,உத்தரவாதத்த
 DocType: GL Entry,GL Entry,ஜீ நுழைவு
 DocType: HR Settings,Employee Settings,பணியாளர் அமைப்புகள்
 ,Batch-Wise Balance History,தொகுதி-வைஸ் இருப்பு வரலாறு
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,பட்டியல் செய்ய வேண்டும்
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,பட்டியல் செய்ய வேண்டும்
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,வேலை கற்க நியமி
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,எதிர்மறை அளவு அனுமதி இல்லை
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,அலுவலகத்திற்கு வாடகைக்கு
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,அமைப்பு எஸ்எம்எஸ் வாயில் அமைப்புகள்
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,இறக்குமதி தோல்வி!
-sites/assets/js/erpnext.min.js +24,No address added yet.,இல்லை முகவரி இன்னும் கூறினார்.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,இல்லை முகவரி இன்னும் கூறினார்.
 DocType: Workstation Working Hour,Workstation Working Hour,பணிநிலையம் வேலை செய்யும் நேரம்
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ஆய்வாளர்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது கூட்டுத் தொழில் தொகை சமம் வேண்டும் {2}
 DocType: Item,Inventory,சரக்கு
 DocType: Features Setup,"To enable ""Point of Sale"" view",பார்வை "விற்பனை செய்யுமிடம்" செயல்படுத்த
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,கொடுப்பனவு காலியாக வண்டி முடியாது
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,கொடுப்பனவு காலியாக வண்டி முடியாது
 DocType: Item,Sales Details,விற்பனை விவரம்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,பின்செய்யப்படுகிறது
 DocType: Opportunity,With Items,பொருட்களை கொண்டு
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",அடுத்து விலைப்பட்டியல் உருவாக்கப்படும் எந்த தேதி. அதை சமர்ப்பிக்க உருவாக்கப்படும்.
 DocType: Item Attribute,Item Attribute,பொருள் கற்பிதம்
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,அரசாங்கம்
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,பொருள் மாறிகள்
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,பொருள் மாறிகள்
 DocType: Company,Services,சேவைகள்
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),மொத்த ({0})
 DocType: Cost Center,Parent Cost Center,பெற்றோர் செலவு மையம்
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,நிதி ஆண்டு தொடக்கம் தேதி
 DocType: Employee External Work History,Total Experience,மொத்த அனுபவம்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,மெலிதமரிடல்
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம்
 DocType: Material Request Item,Sales Order No,விற்பனை ஆணை இல்லை
 DocType: Item Group,Item Group Name,உருப்படியை குழு பெயர்
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,எடுக்கப்பட்ட
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,எடுக்கப்பட்ட
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,உற்பத்தி இடமாற்றத் பொருட்கள்
 DocType: Pricing Rule,For Price List,விலை பட்டியல்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,நிறைவேற்று தேடல்
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,கால அட்டவணைகள்
 DocType: Purchase Invoice Item,Net Amount,நிகர
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM விரிவாக இல்லை
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),கூடுதல் தள்ளுபடி தொகை (நிறுவனத்தின் நாணயம்)
-DocType: Period Closing Voucher,CoA Help,CoA உதவி
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},பிழை: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},பிழை: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,கணக்கு பட்டியலில் இருந்து புதிய கணக்கை உருவாக்கு .
 DocType: Maintenance Visit,Maintenance Visit,பராமரிப்பு வருகை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,வாடிக்கையாளர்> வாடிக்கையாளர் குழு> மண்டலம்
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Landed செலவு உதவ
 DocType: Event,Tuesday,செவ்வாய்க்கிழமை
 DocType: Leave Block List,Block Holidays on important days.,முக்கிய நாட்களில் பிளாக் விடுமுறை.
 ,Accounts Receivable Summary,கணக்குகள் சுருக்கம்
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ஏற்கனவே காலம் பணியாளர் {1} ஒதுக்கப்பட்ட வகை {0} திரும்புதல் {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,பணியாளர் பங்கு அமைக்க ஒரு பணியாளர் சாதனை பயனர் ஐடி துறையில் அமைக்கவும்
 DocType: UOM,UOM Name,மொறட்டுவ பல்கலைகழகம் பெயர்
 DocType: Top Bar Item,Target,இலக்கு
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,விற்பனை வரன்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} பைனான்ஸ் உள்நுழைய மட்டும் நாணய முடியும்: {1}
 DocType: Pricing Rule,Pricing Rule,விலை விதி
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,"போதினும்,"
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ரோ # {0}: திரும்பினார் பொருள் {1} இல்லை நிலவும் {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,வங்கி கணக்குகள்
 ,Bank Reconciliation Statement,வங்கி நல்லிணக்க அறிக்கை
 DocType: Address,Lead Name,பெயர் இட்டு
 ,POS,பிஓஎஸ்
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ஆரம்ப இருப்பு இருப்பு
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,ஆரம்ப இருப்பு இருப்பு
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ஒரு முறை மட்டுமே தோன்றும் வேண்டும்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},மேலும் tranfer அனுமதி இல்லை {0} விட {1} கொள்முதல் ஆணை எதிராக {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},இலைகள் வெற்றிகரமாக ஒதுக்கப்பட்ட {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},இலைகள் வெற்றிகரமாக ஒதுக்கப்பட்ட {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,மூட்டை உருப்படிகள் எதுவும் இல்லை
 DocType: Shipping Rule Condition,From Value,மதிப்பு இருந்து
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,வங்கி பிரதிபலித்தது
 DocType: Quality Inspection Reading,Reading 4,4 படித்தல்
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,நிறுவனத்தின் செலவினம் கூற்றுக்கள்.
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,இல்லை மொபைல் த
 DocType: Production Planning Tool,Select Sales Orders,விற்பனை ஆணைகள் தேர்வு
 ,Material Requests for which Supplier Quotations are not created,வழங்குபவர் மேற்கோள்கள் உருவாக்கப்பட்ட எந்த பொருள் கோரிக்கைகள்
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,பார்கோடு பயன்படுத்தி பொருட்களை கண்காணிக்க வேண்டும். நீங்கள் உருப்படியின் பார்கோடு ஸ்கேனிங் மூலம் வினியோகம் குறிப்பு மற்றும் விற்பனை விலைப்பட்டியல் உள்ள பொருட்களை நுழைய முடியும்.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,மார்க் வழங்கப்படுகிறது என
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,விலைப்பட்டியல் செய்ய
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,முன்கூட்டியே எக்ஸ் நாட்கள் நடவடிக்கைகளுக்குத் திட்டமிட்டுள்ளது முயற்சி.
 DocType: HR Settings,Stop Birthday Reminders,நிறுத்து நினைவூட்டல்கள்
 DocType: SMS Center,Receiver List,ரிசீவர் பட்டியல்
 DocType: Payment Tool Detail,Payment Amount,கட்டணம் அளவு
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,உட்கொள்ளுகிறது தொகை
-sites/assets/js/erpnext.min.js +51,{0} View,{0} காண்க
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} காண்க
 DocType: Salary Structure Deduction,Salary Structure Deduction,சம்பளம் அமைப்பு பொருத்தியறிதல்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,தேர்ந்தெடுக்கப்பட்ட லேசர் வெப்பப்படுத்தல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,வெற்றிகரமான இறக்குமதி!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,வெளியிடப்படுகிறது பொருட்களை செலவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,இயல்புநிலை செ
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","அத்தகைய கப்பல் விதிகள், விலை பட்டியல் முதலியன போன்ற ஆன்லைன் வணிக வண்டி அமைப்புகள்"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,அமைப்பு முழு
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% கூறப்பட்டு
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,பாதுகாக்கப்பட்டவை அளவு
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,பாதுகாக்கப்பட்டவை அளவு
 DocType: Party Account,Party Account,கட்சி கணக்கு
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,மனித வளங்கள்
 DocType: Lead,Upper Income,உயர் வருமானம்
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,வண்டியில் இயக்கு
 DocType: Employee,Permanent Address,நிரந்தர முகவரி
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,பொருள் {0} ஒரு சேவை பொருளாக இருக்க வேண்டும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",மொத்தம் விட \ {0} {1} அதிகமாக இருக்க முடியும் எதிராக பணம் முன்கூட்டியே {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,உருப்படியை குறியீடு தேர்வு செய்க
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),சம்பளமில்லா விடுப்பு க்கான பொருத்தியறிதல் குறைக்க (LWP)
 DocType: Territory,Territory Manager,மண்டலம் மேலாளர்
+DocType: Delivery Note Item,To Warehouse (Optional),கிடங்கில் (கட்டாயமில்லை)
 DocType: Sales Invoice,Paid Amount (Company Currency),செலுத்தப்பட்ட தொகை எவ்வளவு (நிறுவனத்தின் நாணய)
 DocType: Purchase Invoice,Additional Discount,கூடுதல் தள்ளுபடி
 DocType: Selling Settings,Selling Settings,அமைப்புகள் விற்பனை
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,சுரங்க
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ரெசின் நடிப்பதற்கு
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,முதல் {0} தேர்ந்தெடுக்கவும்.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,முதல் {0} தேர்ந்தெடுக்கவும்.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},உரை {0}
 DocType: Territory,Parent Territory,பெற்றோர் மண்டலம்
 DocType: Quality Inspection Reading,Reading 2,2 படித்தல்
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,தொகுதி இல்லை
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ஒரு வாடிக்கையாளர் கொள்முதல் ஆணை எதிராக பல விற்பனை ஆணைகள் அனுமதி
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,முதன்மை
 DocType: DocPerm,Delete,நீக்கு
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,மாற்று
-sites/assets/js/desk.min.js +7971,New {0},புதிய {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,மாற்று
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},புதிய {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,நிறுத்தி பொருட்டு ரத்து செய்ய முடியாது . ரத்து செய்ய தடை இல்லாத .
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,நிறுத்தி பொருட்டு ரத்து செய்ய முடியாது . ரத்து செய்ய தடை இல்லாத .
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
 DocType: Employee,Leave Encashed?,காசாக்கப்பட்டால் விட்டு?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,துறையில் இருந்து வாய்ப்பு கட்டாய ஆகிறது
 DocType: Item,Variants,மாறிகள்
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,நாடு
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,முகவரிகள்
 DocType: Communication,Received,பெற்றார்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},நகல் சீரியல் இல்லை உருப்படி உள்ளிட்ட {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ஒரு கப்பல் ஆட்சிக்கு ஒரு நிலையில்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,பொருள் உத்தரவு அனுமதி இல்லை.
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,வணக்கம் தெரிவித்த
 DocType: Communication,Rejected,நிராகரிக்கப்பட்டது
 DocType: Pricing Rule,Brand,பிராண்ட்
 DocType: Item,Will also apply for variants,கூட வகைகளில் விண்ணப்பிக்க
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% வழங்க
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,விற்பனை நேரத்தில் பொருட்களை மூட்டை.
 DocType: Sales Order Item,Actual Qty,உண்மையான அளவு
 DocType: Sales Invoice Item,References,குறிப்புகள்
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,வெட்டுதல்
 DocType: Item,Has Variants,இல்லை வகைகள் உள்ளன
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,ஒரு புதிய விற்பனை விலைப்பட்டியல் உருவாக்க பொத்தானை 'விற்பனை விலைப்பட்டியல் கொள்ளுங்கள்' கிளிக்.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,இருந்து காலம்% கள் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,பேக்கேஜிங் மற்றும் பெயரிடல்
 DocType: Monthly Distribution,Name of the Monthly Distribution,மாதாந்திர விநியோகம் பெயர்
 DocType: Sales Person,Parent Sales Person,பெற்றோர் விற்பனை நபர்
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,நிறுவனத்தின் மாஸ்டர் மற்றும் உலகளாவிய செலுத்தமுடியாத இயல்புநிலை நாணய குறிப்பிடவும்
 DocType: Dropbox Backup,Dropbox Access Secret,டிரா பாக்ஸ் அணுகல் ரகசியம்
 DocType: Purchase Invoice,Recurring Invoice,மீண்டும் விலைப்பட்டியல்
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,திட்டங்கள் நிர்வாக
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,திட்டங்கள் நிர்வாக
 DocType: Supplier,Supplier of Goods or Services.,பொருட்கள் அல்லது சேவைகள் சப்ளையர்.
 DocType: Budget Detail,Fiscal Year,நிதியாண்டு
 DocType: Cost Center,Budget,வரவு செலவு திட்டம்
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,விற்பனை
 DocType: Employee,Salary Information,சம்பளம் தகவல்
 DocType: Sales Person,Name and Employee ID,பெயர் மற்றும் பணியாளர் ஐடி
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
 DocType: Website Item Group,Website Item Group,இணைய தகவல்கள் குழு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,கடமைகள் மற்றும் வரி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} கட்டணம் உள்ளீடுகளை வடிகட்டி {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} கட்டணம் உள்ளீடுகளை வடிகட்டி {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,வலை தளத்தில் காட்டப்படும் என்று பொருள் அட்டவணை
 DocType: Purchase Order Item Supplied,Supplied Qty,வழங்கப்பட்ட அளவு
 DocType: Material Request Item,Material Request Item,பொருள் கோரிக்கை பொருள்
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,பொருள
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,இந்த குற்றச்சாட்டை வகை விட அல்லது தற்போதைய வரிசையில் எண்ணிக்கை சமமாக வரிசை எண் பார்க்கவும் முடியாது
 ,Item-wise Purchase History,உருப்படியை வாரியான கொள்முதல் வரலாறு
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,ரெட்
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"சீரியல் இல்லை பொருள் சேர்க்க எடுக்க ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து, {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"சீரியல் இல்லை பொருள் சேர்க்க எடுக்க ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து, {0}"
 DocType: Account,Frozen,நிலையாக்கப்பட்டன
 ,Open Production Orders,திறந்த உற்பத்தி ஆணைகள்
 DocType: Installation Note,Installation Time,நிறுவல் நேரம்
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,மேற்கோள் போக்குகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},உருப்படி உருப்படியை மாஸ்டர் குறிப்பிடப்பட்டுள்ளது பொருள் பிரிவு {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","உத்தரவு இந்த உருப்படிக்கு செய்து கொள்ள முடியும் என , அது ஒரு பங்கு பொருளாக இருக்க வேண்டும் ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","உத்தரவு இந்த உருப்படிக்கு செய்து கொள்ள முடியும் என , அது ஒரு பங்கு பொருளாக இருக்க வேண்டும் ."
 DocType: Shipping Rule Condition,Shipping Amount,கப்பல் தொகை
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,சேர்வது
 DocType: Authorization Rule,Above Value,மதிப்பு மேலே
 ,Pending Amount,நிலுவையில் தொகை
 DocType: Purchase Invoice Item,Conversion Factor,மாற்ற காரணி
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,வழங்கினார்
+DocType: Purchase Order,Delivered,வழங்கினார்
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),வேலைகள் மின்னஞ்சல் ஐடி அமைப்பு உள்வரும் சர்வர் . (எ. கா: jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,வாகன எண்
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,மீண்டும் விலைப்பட்டியல் நிறுத்த வேண்டும் எந்த தேதி
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,விநியோ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,பொருள் {1} சொத்து பொருள் என கணக்கு {0} வகை ' நிலையான சொத்து ' இருக்க வேண்டும்
 DocType: HR Settings,HR Settings,அலுவலக அமைப்புகள்
 apps/frappe/frappe/config/setup.py +130,Printing,அச்சிடுதல்
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,செலவு கோரும் அனுமதிக்காக நிலுவையில் உள்ளது . மட்டுமே செலவு அப்ரூவரான நிலையை மேம்படுத்த முடியும் .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,செலவு கோரும் அனுமதிக்காக நிலுவையில் உள்ளது . மட்டுமே செலவு அப்ரூவரான நிலையை மேம்படுத்த முடியும் .
 DocType: Purchase Invoice,Additional Discount Amount,கூடுதல் தள்ளுபடி தொகை
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை இருக்கிறது . நீங்கள் விடுப்பு விண்ணப்பிக்க தேவையில்லை .
-sites/assets/js/desk.min.js +7805,and,மற்றும்
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,மற்றும்
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr வெற்று இடைவெளி அல்லது இருக்க முடியாது
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,விளையாட்டு
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,மேற்கோள்
 DocType: Salary Slip,Total Deduction,மொத்த பொருத்தியறிதல்
 DocType: Quotation,Maintenance User,பராமரிப்பு பயனர்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,நீங்கள் தடை இல்லாத வேண்டும் என்பதில் உறுதியாக இருக்கிறீர்களா
 DocType: Employee,Date of Birth,பிறந்த நாள்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,பொருள் {0} ஏற்கனவே திரும்பினார்
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** நிதியாண்டு ** ஒரு நிதி ஆண்டு பிரதிபலிக்கிறது. அனைத்து உள்ளீடுகளை மற்றும் பிற முக்கிய பரிமாற்றங்கள் ** ** நிதியாண்டு எதிரான கண்காணிக்கப்படும்.
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","விற்பனை பிரச்சாரங்கள் கண்காணிக்க. லீட்ஸ், மேற்கோள்கள் கண்காணிக்கவும், விற்பனை போன்றவை பிரச்சாரங்கள் இருந்து முதலீட்டு மீது மீண்டும் அளவிடுவதற்கு. "
 DocType: Expense Claim,Approver,சர்க்கார் தரப்பில் சாட்சி சொல்லும் குற்றவாளி
 ,SO Qty,எனவே அளவு
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","பங்கு உள்ளீடுகளை கிடங்கில் எதிரான உள்ளன {0}, எனவே நீங்கள் மீண்டும் ஒதுக்க அல்லது கிடங்கு மாற்ற முடியாது"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","பங்கு உள்ளீடுகளை கிடங்கில் எதிரான உள்ளன {0}, எனவே நீங்கள் மீண்டும் ஒதுக்க அல்லது கிடங்கு மாற்ற முடியாது"
 DocType: Appraisal,Calculate Total Score,மொத்த மதிப்பெண் கணக்கிட
 DocType: Supplier Quotation,Manufacturing Manager,தயாரிப்பு மேலாளர்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},தொடர் இல {0} வரை உத்தரவாதத்தை கீழ் உள்ளது {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,தொகுப்புகளை கொண்டு டெலிவரி குறிப்பு பிரிந்தது.
 apps/erpnext/erpnext/hooks.py +84,Shipments,படுவதற்கு
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,சாய்வு வடிவமைத்தல்
+DocType: Purchase Order,To be delivered to customer,வாடிக்கையாளர் வழங்க வேண்டும்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,நேரம் பதிவு நிலைமை சமர்ப்பிக்க வேண்டும்.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,தொ.எ. {0} எந்த கிடங்கு சொந்தம் இல்லை
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,அமைக்கிறது
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,நாணய இருந்து
 DocType: DocField,Name,பெயர்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},பொருள் தேவை விற்பனை ஆணை {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},பொருள் தேவை விற்பனை ஆணை {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,அமைப்பு பிரதிபலித்தது
 DocType: Purchase Invoice Item,Rate (Company Currency),விகிதம் (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,மற்றவை
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,நிறுத்தப்பட்டது அமை
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,ஒரு பொருத்தமான பொருள் கண்டுபிடிக்க முடியவில்லை. ஐந்து {0} வேறு சில மதிப்பு தேர்ந்தெடுக்கவும்.
 DocType: POS Profile,Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள்
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","ஒரு தயாரிப்பு அல்லது, வாங்கி விற்று, அல்லது பங்குச் வைக்கப்படும் என்று ஒரு சேவை."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,முதல் வரிசையில் ' முந்தைய வரிசை மொத்த ' முந்தைய வரிசையில் தொகை 'அல்லது குற்றச்சாட்டுக்கள் வகை தேர்ந்தெடுக்க முடியாது
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,DOCTYPE தேர்வு
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,கொந்துதல்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,வங்கி
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"அட்டவணை பெற ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,புதிய செலவு மையம்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,புதிய செலவு மையம்
 DocType: Bin,Ordered Quantity,உத்தரவிட்டார் அளவு
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","உதாரணமாக, "" கட்டுமான கருவிகள் கட்ட """
 DocType: Quality Inspection,In Process,செயல்முறை உள்ள
 DocType: Authorization Rule,Itemwise Discount,இனவாரியாக தள்ளுபடி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} விற்பனை ஆணை எதிரான {1}
+DocType: Purchase Order Item,Reference Document Type,குறிப்பு ஆவண வகை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} விற்பனை ஆணை எதிரான {1}
 DocType: Account,Fixed Asset,நிலையான சொத்து
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,தொடர் சரக்கு
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,தொடர் சரக்கு
 DocType: Activity Type,Default Billing Rate,இயல்புநிலை பில்லிங் மதிப்பீடு
 DocType: Time Log Batch,Total Billing Amount,மொத்த பில்லிங் அளவு
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,பெறத்தக்க கணக்கு
 ,Stock Balance,பங்கு இருப்பு
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,செலுத்துதல் விற்பனை ஆணை
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,செலுத்துதல் விற்பனை ஆணை
 DocType: Expense Claim Detail,Expense Claim Detail,இழப்பில் உரிமைகோரல் விவரம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,நேரம் பதிவுகள் உருவாக்கப்பட்ட:
 DocType: Item,Weight UOM,எடை மொறட்டுவ பல்கலைகழகம்
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,கணக்கில் வரவு ஒரு செலுத்த வேண்டிய கணக்கு இருக்க வேண்டும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
 DocType: Production Order Operation,Completed Qty,நிறைவு அளவு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",{0} மட்டுமே டெபிட் கணக்குகள் மற்றொரு கடன் நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,விலை பட்டியல் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0} மட்டுமே டெபிட் கணக்குகள் மற்றொரு கடன் நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,விலை பட்டியல் {0} முடக்கப்பட்டுள்ளது
 DocType: Manufacturing Settings,Allow Overtime,மேலதிக அனுமதிக்கவும்
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,விற்பனை ஆணை {0} நிறுத்தி
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} பொருள் தேவையான சீரியல் எண்கள் {1}. நீங்கள் வழங்கிய {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,தற்போதைய மதிப்பீட்டு விகிதம்
 DocType: Item,Customer Item Codes,வாடிக்கையாளர் பொருள் குறியீடுகள்
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,வெல்டிங்
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,புதிய பங்கு மொறட்டுவ பல்கலைகழகம் தேவை
 DocType: Quality Inspection,Sample Size,மாதிரி அளவு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.','வழக்கு எண் வரம்பு' சரியான குறிப்பிடவும்
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்
 DocType: Project,External,வெளி
 DocType: Features Setup,Item Serial Nos,உருப்படியை தொடர் இலக்கங்கள்
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,பயனர்கள் மற்றும் அனுமதிகள்
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,முகவரி மற்றும் தொடர்புகள்
 DocType: SMS Log,Sender Name,அனுப்புநர் பெயர்
 DocType: Page,Title,தலைப்பு
-sites/assets/js/list.min.js +104,Customize,தனிப்பயனாக்கு
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,தனிப்பயனாக்கு
 DocType: POS Profile,[Select],[ தேர்ந்தெடு ]
 DocType: SMS Log,Sent To,அனுப்பப்படும்
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,கவிஞருக்கு செய்ய
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,வாழ்க்கை முடிவுக்கு
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,சுற்றுலா
 DocType: Leave Block List,Allow Users,பயனர்கள் அனுமதி
+DocType: Purchase Order,Customer Mobile No,வாடிக்கையாளர் கைப்பேசி
 DocType: Sales Invoice,Recurring,ரெக்கியூரிங்
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,தனி வருமான கண்காணிக்க மற்றும் தயாரிப்பு மேம்பாடுகளையும் அல்லது பிளவுகள் செலவுக்.
 DocType: Rename Tool,Rename Tool,கருவி மறுபெயரிடு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,மேம்படுத்தல்
 DocType: Item Reorder,Item Reorder,உருப்படியை மறுவரிசைப்படுத்துக
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,மாற்றம் பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,மாற்றம் பொருள்
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","நடவடிக்கைகள் , இயக்க செலவு குறிப்பிட உங்கள் நடவடிக்கைகள் ஒரு தனிப்பட்ட நடவடிக்கை இல்லை கொடுக்க ."
 DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,ஊழியர்
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,இருந்து இறக்குமதி மின்னஞ்சல்
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,பயனர் அழை
 DocType: Features Setup,After Sale Installations,விற்பனை நிறுவல்கள் பிறகு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} முழுமையாக வசூலிக்கப்படும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} முழுமையாக வசூலிக்கப்படும்
 DocType: Workstation Working Hour,End Time,முடிவு நேரம்
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,விற்பனை அல்லது கொள்முதல் தரநிலை ஒப்பந்த அடிப்படையில் .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,வவுச்சர் மூலம் குழு
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,வெகுஜன அஞ்சல்
 DocType: Page,Standard,நிலையான
 DocType: Rename Tool,File to Rename,மறுபெயர் கோப்புகள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse ஆணை எண் பொருள் தேவை {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,காட்டு கொடுப்பனவு
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},பொருள் இருப்பு இல்லை BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு அட்டவணை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு அட்டவணை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,அளவு
 DocType: Notification Control,Expense Claim Approved,இழப்பில் கோரிக்கை ஏற்கப்பட்டது
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,மருந்து
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,தேதி வருகை
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),விற்பனை மின்னஞ்சல் ஐடி அமைப்பு உள்வரும் சர்வர் . (எ. கா: sales@example.com )
 DocType: Warranty Claim,Raised By,எழுப்பப்பட்ட
 DocType: Payment Tool,Payment Account,கொடுப்பனவு கணக்கு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
-sites/assets/js/list.min.js +23,Draft,காற்று வீச்சு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,காற்று வீச்சு
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,இழப்பீட்டு இனிய
 DocType: Quality Inspection Reading,Accepted,ஏற்று
 DocType: User,Female,பெண்
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,கப்பல் விதி லேபிள்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
 DocType: Newsletter,Test,சோதனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","இருக்கும் பங்கு பரிவர்த்தனைகள் நீங்கள் மதிப்புகள் மாற்ற முடியாது \ இந்த உருப்படி, உள்ளன 'என்பதைப் தொ.எ. உள்ளது', 'தொகுதி எவ்வித', 'பங்கு உருப்படியை' மற்றும் 'மதிப்பீட்டு முறை'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
 DocType: Employee,Previous Work Experience,முந்தைய பணி அனுபவம்
 DocType: Stock Entry,For Quantity,அளவு
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},பொருள் திட்டமிடப்பட்டுள்ளது அளவு உள்ளிடவும் {0} வரிசையில் {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} சமர்ப்பிக்க
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,பொருட்கள் கோரிக்கைகள்.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} சமர்ப்பிக்க
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,பொருட்கள் கோரிக்கைகள்.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,தனி உற்பத்தி வரிசையில் ஒவ்வொரு முடிக்கப்பட்ட நல்ல உருப்படியை செய்தது.
 DocType: Purchase Invoice,Terms and Conditions1,விதிமுறைகள் மற்றும் Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,அமைவு
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,செய்த
 DocType: Delivery Note,Transporter Name,இடமாற்றி பெயர்
 DocType: Contact,Enter department to which this Contact belongs,இந்த தொடர்பு சார்ந்த துறை உள்ளிடவும்
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,மொத்த இருக்காது
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,வரிசையில் பொருள் அல்லது கிடங்கு {0} பொருள் கோரிக்கை பொருந்தவில்லை
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,வரிசையில் பொருள் அல்லது கிடங்கு {0} பொருள் கோரிக்கை பொருந்தவில்லை
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,அளவிடத்தக்க அலகு
 DocType: Fiscal Year,Year End Date,ஆண்டு முடிவு தேதி
 DocType: Task Depends On,Task Depends On,பணி பொறுத்தது
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,இந்த ஒப்பந்தம் முடிவுக்கு தேதி சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,கமிஷன் நிறுவனங்கள் பொருட்கள் விற்கும் ஒரு மூன்றாம் தரப்பு விநியோகஸ்தராக / வியாபாரி / கமிஷன் முகவர் / இணைப்பு / விற்பனையாளரை.
 DocType: Customer Group,Has Child Node,குழந்தை கணு உள்ளது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} கொள்முதல் ஆணை எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} கொள்முதல் ஆணை எதிரான {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","இங்கே நிலையான URL அளவுருக்கள் (எ.கா. அனுப்புநர் = ERPNext, பயனர்பெயர் = ERPNext, கடவுச்சொல்லை = 1234 முதலியன) உள்ளிடவும்"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} எந்த செயலில் நிதி ஆண்டில். மேலும் விவரங்களுக்கு பார்க்கவும் {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,இந்த ERPNext இருந்து தானாக உருவாக்கப்பட்ட ஒரு உதாரணம் இணையதளம் உள்ளது
@@ -2067,11 +2078,9 @@ DocType: Note,Note,குறிப்பு
 DocType: Purchase Receipt Item,Recd Quantity,Recd அளவு
 DocType: Email Account,Email Ids,மின்னஞ்சல் ஐடிகள்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Unstopped அமை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
 DocType: Payment Reconciliation,Bank / Cash Account,வங்கி / பண கணக்கு
 DocType: Tax Rule,Billing City,பில்லிங் நகரம்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,இந்த விட்டு விண்ணப்ப அனுமதிக்காக நிலுவையில் உள்ளது. தான் இருக்கிறது தரப்பில் சாட்சி நிலையை மேம்படுத்த முடியும்.
 DocType: Global Defaults,Hide Currency Symbol,நாணய சின்னம் மறைக்க
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","உதாரணமாக வங்கி, பண, கடன் அட்டை"
 DocType: Journal Entry,Credit Note,வரவுக்குறிப்பு
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),மொத்தம
 DocType: Installation Note Item,Installed Qty,நிறுவப்பட்ட அளவு
 DocType: Lead,Fax,தொலைநகல்
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,சமர்ப்பிக்கப்பட்டது
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,சமர்ப்பிக்கப்பட்டது
 DocType: Salary Structure,Total Earning,மொத்த வருமானம்
 DocType: Purchase Receipt,Time at which materials were received,பொருட்கள் பெற்றனர் எந்த நேரத்தில்
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,என்னுடைய ஒரு முகவரிக்கு
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,அமைப
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,அல்லது
 DocType: Sales Order,Billing Status,பில்லிங் நிலைமை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,பயன்பாட்டு செலவுகள்
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 மேலே
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 மேலே
 DocType: Buying Settings,Default Buying Price List,இயல்புநிலை கொள்முதல் விலை பட்டியல்
 ,Download Backups,பதிவிறக்க காப்பு
 DocType: Notification Control,Sales Order Message,விற்பனை ஆர்டர் செய்தி
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,தேர்வு ஊழியர்
 DocType: Bank Reconciliation,To Date,தேதி
 DocType: Opportunity,Potential Sales Deal,சாத்தியமான விற்பனை ஒப்பந்தம்
-sites/assets/js/form.min.js +308,Details,விவரம்
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,விவரம்
 DocType: Purchase Invoice,Total Taxes and Charges,மொத்த வரி மற்றும் கட்டணங்கள்
 DocType: Employee,Emergency Contact,அவசர தொடர்பு
 DocType: Item,Quality Parameters,தர அளவுகள்
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,பெற்றார் அளவு
 DocType: Stock Entry Detail,Serial No / Batch,சீரியல் இல்லை / தொகுப்பு
 DocType: Product Bundle,Parent Item,பெற்றோர் பொருள்
 DocType: Account,Account Type,கணக்கு வகை
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 ,To Produce,தயாரிப்பாளர்கள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","வரிசையில் {0} உள்ள {1}. பொருள் விகிதம் {2} சேர்க்க, வரிசைகள் {3} சேர்த்துக்கொள்ள வேண்டும்"
 DocType: Packing Slip,Identification of the package for the delivery (for print),பிரசவத்திற்கு தொகுப்பின் அடையாள (அச்சுக்கு)
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,சமதளமாக
 DocType: Account,Income Account,வருமான கணக்கு
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,மோல்டிங்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,டெலிவரி
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,டெலிவரி
 DocType: Stock Reconciliation Item,Current Qty,தற்போதைய அளவு
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",பகுதி செயற் கைக்கோள் நிலாவிலிருந்து உள்ள "அடிப்படையில் பொருட்களின் விகிதம்" பார்க்க
 DocType: Appraisal Goal,Key Responsibility Area,முக்கிய பொறுப்பு பகுதி
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,அனைத்து முகவரிகள்.
 DocType: Company,Stock Settings,பங்கு அமைப்புகள்
 DocType: User,Bio,உயிரி
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,வாடிக்கையாளர் குழு மரம் நிர்வகி .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,புதிய செலவு மையம் பெயர்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,புதிய செலவு மையம் பெயர்
 DocType: Leave Control Panel,Leave Control Panel,கண்ட்ரோல் பேனல் விட்டு
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,இயல்புநிலை முகவரி டெம்ப்ளேட் காணப்படுகிறது. அமைப்பு> அச்சிடுதல் மற்றும் பிராண்டிங் இருந்து ஒரு புதிய ஒரு> முகவரி டெம்ப்ளேட் உருவாக்க தயவுசெய்து.
 DocType: Appraisal,HR User,அலுவலக பயனர்
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,கொடுப்பனவு கருவி விபரம்
 ,Sales Browser,விற்னையாளர் உலாவி
 DocType: Journal Entry,Total Credit,மொத்த கடன்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,உள்ளூர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,உள்ளூர்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),கடன்கள் ( சொத்துக்கள் )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,"இருப்பினும், கடனாளிகள்"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,பெரிய
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,இல்லை ஊழியர் இல்லை!
 DocType: C-Form Invoice Detail,Territory,மண்டலம்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,குறிப்பிட தயவுசெய்து தேவையான வருகைகள் எந்த
+DocType: Purchase Order,Customer Address Display,வாடிக்கையாளர் முகவரி காட்சி
 DocType: Stock Settings,Default Valuation Method,முன்னிருப்பு மதிப்பீட்டு முறை
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,பாலிஷ்
 DocType: Production Order Operation,Planned Start Time,திட்டமிட்ட தொடக்க நேரம்
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Allocated
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Close இருப்புநிலை மற்றும் புத்தகம் லாபம் அல்லது நஷ்டம் .
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் \ ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. இயல்புநிலை UOM மாற்ற, \ பயன்படுத்த பங்கு தொகுதி கீழ் கருவி 'UOM பயனீட்டு மாற்றவும்."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,நாணயமாற்று வீத மற்றொரு வகையில் ஒரு நாணயத்தை மாற்ற குறிப்பிடவும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,மேற்கோள் {0} ரத்து
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,மேற்கோள் {0} ரத்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,மொத்த நிலுவை தொகை
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,பணியாளர் {0} {1} ம் விடுப்பு இருந்தது. வருகை குறிக்க முடியாது.
 DocType: Sales Partner,Targets,இலக்குகள்
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,இந்த ஒரு ரூட் வாடிக்கையாளர் குழு மற்றும் திருத்த முடியாது .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,நீங்கள் கணக்கியல் உள்ளீடுகள் தொடங்கும் முன் அமைப்பு உங்கள் மீது கணக்குகளின் அட்டவணை ப்ளீஸ்
 DocType: Purchase Invoice,Ignore Pricing Rule,விலை சொல்கிறேன்
-sites/assets/js/list.min.js +24,Cancelled,ரத்து
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,ரத்து
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,சம்பளம் அமைப்பு தேதி பணியாளர் சேர்ந்த தேதி விட குறைந்த இருக்க முடியாது.
 DocType: Employee Education,Graduate,பல்கலை கழக பட்டம் பெற்றவர்
 DocType: Leave Block List,Block Days,தொகுதி நாட்கள்
 DocType: Journal Entry,Excise Entry,கலால் நுழைவு
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},எச்சரிக்கை: விற்பனை ஆணை {0} ஏற்கனவே வாடிக்கையாளர் கொள்முதல் ஆணை எதிராக உள்ளது {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},எச்சரிக்கை: விற்பனை ஆணை {0} ஏற்கனவே வாடிக்கையாளர் கொள்முதல் ஆணை எதிராக உள்ளது {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,"பங்கு பெற்ற
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,மொத்த சம்பளம் + நிலுவை தொகை + பணமாக்கல் தொகை - மொத்தம் பொருத்தியறிதல்
 DocType: Monthly Distribution,Distribution Name,விநியோக பெயர்
 DocType: Features Setup,Sales and Purchase,விற்பனை மற்றும் கொள்முதல்
-DocType: Purchase Order Item,Material Request No,பொருள் வேண்டுகோள் இல்லை
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
+DocType: Supplier Quotation Item,Material Request No,பொருள் வேண்டுகோள் இல்லை
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,விகிதம் இது வாடிக்கையாளர் நாணய நிறுவனத்தின் அடிப்படை நாணய மாற்றப்படும்
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} இந்த பட்டியலில் இருந்து வெற்றிகரமாக குழுவிலக்கப்பட்டது.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),நிகர விகிதம் (நிறுவனத்தின் நாணயம்)
-apps/frappe/frappe/templates/base.html +132,Added,சேர்க்கப்பட்டது
+apps/frappe/frappe/templates/base.html +134,Added,சேர்க்கப்பட்டது
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,மண்டலம் மரம் நிர்வகி .
 DocType: Journal Entry Account,Sales Invoice,விற்பனை விலை விவரம்
 DocType: Journal Entry Account,Party Balance,கட்சி இருப்பு
 DocType: Sales Invoice Item,Time Log Batch,நேரம் புகுபதிகை தொகுப்பு
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,தள்ளுபடி விண்ணப்பிக்க தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,தள்ளுபடி விண்ணப்பிக்க தேர்ந்தெடுக்கவும்
 DocType: Company,Default Receivable Account,இயல்புநிலை பெறத்தக்க கணக்கு
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,மேலே தேர்ந்தெடுக்கப்பட்ட தகுதி சம்பளம் மொத்த சம்பளம் வங்கி நுழைவு உருவாக்கவும்
 DocType: Stock Entry,Material Transfer for Manufacture,உற்பத்தி பொருள் மாற்றம்
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,தொடர்புடை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,கோர்ர்க்கும்
 DocType: Sales Invoice,Sales Team1,விற்பனை Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,பொருள் {0} இல்லை
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,பொருள் {0} இல்லை
 DocType: Sales Invoice,Customer Address,வாடிக்கையாளர் முகவரி
 apps/frappe/frappe/desk/query_report.py +136,Total,மொத்தம்
 DocType: Purchase Invoice,Apply Additional Discount On,கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும்
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,தரமான ஆய்வு
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,கூடுதல் சிறிய
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,உருவாக்கும் தெளிக்கவும்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,நிறுவனத்திற்கு சொந்தமான கணக்குகள் ஒரு தனி விளக்கப்படம் சட்ட நிறுவனம் / துணைநிறுவனத்திற்கு.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","உணவு , குளிர்பானங்கள் & புகையிலை"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL அல்லது BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,கமிஷன் விகிதம் அதிகமாக 100 இருக்க முடியாது
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,குறைந்தபட்ச சரக்கு நிலை
 DocType: Stock Entry,Subcontract,உள் ஒப்பந்தம்
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,முதல் {0} உள்ளிடவும்
 DocType: Production Planning Tool,Get Items From Sales Orders,விற்பனை ஆணைகள் உருப்படிகளை கிடைக்கும்
 DocType: Production Order Operation,Actual End Time,உண்மையான இறுதியில் நேரம்
 DocType: Production Planning Tool,Download Materials Required,தேவையான பொருட்கள் பதிவிறக்க
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,திட்டமிடப்பட்ட
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",""இல்லை" மற்றும் "விற்பனை பொருள் இது", "பங்கு உருப்படியை" எங்கே "ஆம்" என்று பொருள் தேர்ந்தெடுக்க மற்றும் வேறு எந்த தயாரிப்பு மூட்டை உள்ளது செய்க"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ஒரே சீராக பரவி மாதங்கள் முழுவதும் இலக்குகளை விநியோகிக்க மாதாந்திர விநியோகம் தேர்ந்தெடுக்கவும்.
 DocType: Purchase Invoice Item,Valuation Rate,மதிப்பீட்டு விகிதம்
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,விலை பட்டியல் நாணய தேர்வு
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,விலை பட்டியல் நாணய தேர்வு
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,பொருள் வரிசை {0}: {1} மேலே 'வாங்குதல் ரசீதுகள்' அட்டவணை இல்லை வாங்கும் ரசீது
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},பணியாளர் {0} ஏற்கனவே இடையே {1} விண்ணப்பித்துள்ளனர் {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},பணியாளர் {0} ஏற்கனவே இடையே {1} விண்ணப்பித்துள்ளனர் {2} {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,திட்ட தொடக்க தேதி
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,வரை
 DocType: Rename Tool,Rename Log,பதிவு மறுபெயர்
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ஒரே இலை முனைகள் பரிமாற்றத்தில் அனுமதிக்கப்படுகிறது
 DocType: Expense Claim,Expense Approver,செலவின தரப்பில் சாட்சி
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,கொள்முதல் ரசீது பொருள் வழங்கியது
-sites/assets/js/erpnext.min.js +48,Pay,செலுத்த
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,செலுத்த
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,நாள்நேரம் செய்ய
 DocType: SMS Settings,SMS Gateway URL,எஸ்எம்எஸ் வாயில் URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,எஸ்எம்எஸ் விநியோகம் அந்தஸ்து தக்கவைப்பதற்கு பதிவுகள்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,அரைக்கும்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,போர்த்தி சுருக்கு
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,நிலுவையில் நடவடிக்கைகள்
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,நிலுவையில் நடவடிக்கைகள்
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,உறுதிப்படுத்தப்பட்டுள்ளதாகவும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,வழங்குபவர்> வழங்குபவர் வகை
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,வ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,பத்திரிகை வெளியீட்டாளர்கள்
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,நிதியாண்டு வாய்ப்புகள்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,உருக்கு
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"நீங்கள் இந்த சாதனையை விட்டு வீடு, இருக்கிறீர்கள் . 'தகுதி' புதுப்பி இரட்சியும்"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,மறுவரிசைப்படுத்துக நிலை
 DocType: Attendance,Attendance Date,வருகை தேதி
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,சம்பளம் கலைத்தல் வருமானம் மற்றும் துப்பறியும் அடிப்படையாக கொண்டது.
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் குழு மாற்றப்பட முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,மதிப்பிறக்கம் தேய்மானம்
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),வழங்குபவர் (கள்)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,தவறான காலம்
 DocType: Customer,Credit Limit,கடன் எல்லை
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,பரிவர்த்தனை தேர்ந்தெடுக்கவும்
 DocType: GL Entry,Voucher No,ரசீது இல்லை
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,ச
 DocType: Customer,Address and Contact,முகவரி மற்றும் தொடர்பு
 DocType: Customer,Last Day of the Next Month,அடுத்த மாதத்தின் கடைசி நாளில்
 DocType: Employee,Feedback,கருத்து
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. அட்டவணை
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. அட்டவணை
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,சிராய்ப்பு ஜெட் எந்திர
 DocType: Stock Settings,Freeze Stock Entries,பங்கு பதிவுகள் நிறுத்தப்படலாம்
 DocType: Website Settings,Website Settings,இணைய அமைப்புகள்
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,வெளிச்செல்லும்
 DocType: Material Request,Requested For,கோரப்பட்ட
 DocType: Quotation Item,Against Doctype,Doctype எதிராக
 DocType: Delivery Note,Track this Delivery Note against any Project,எந்த திட்டம் எதிரான இந்த டெலிவரி குறிப்பு கண்காணிக்க
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,ரூட் கணக்கை நீக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,ரூட் கணக்கை நீக்க முடியாது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,காட்டு பங்கு பதிவுகள்
 ,Is Primary Address,முதன்மை முகவரி
 DocType: Production Order,Work-in-Progress Warehouse,"வேலை, செயலில் கிடங்கு"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,முகவரிகள் நிர்வகிக்கவும்
 DocType: Pricing Rule,Item Code,உருப்படியை கோட்
 DocType: Production Planning Tool,Create Production Orders,உற்பத்தி ஆணைகள் உருவாக்க
@@ -2460,14 +2471,14 @@ DocType: Journal Entry,User Remark,பயனர் குறிப்பு
 DocType: Lead,Market Segment,சந்தை பிரிவு
 DocType: Communication,Phone,தொலைபேசி
 DocType: Employee Internal Work History,Employee Internal Work History,ஊழியர் உள்நாட்டு வேலை வரலாறு
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),நிறைவு (டாக்டர்)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),நிறைவு (டாக்டர்)
 DocType: Contact,Passive,மந்தமான
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,தொடர் இல {0} இல்லை பங்கு
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,பரிவர்த்தனைகள் விற்பனை வரி வார்ப்புரு .
 DocType: Sales Invoice,Write Off Outstanding Amount,சிறந்த தொகை இனிய எழுத
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","தானாக வரும் பொருள் தேவை என்பதை அறியவும். எந்த விற்பனை விலைப்பட்டியல் சமர்ப்பித்த பிறகு, தொடர் பகுதியில் காண முடியும்."
 DocType: Account,Accounts Manager,கணக்குகள் மேலாளர்
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',நேரம் பதிவு {0} ' Submitted'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',நேரம் பதிவு {0} ' Submitted'
 DocType: Stock Settings,Default Stock UOM,முன்னிருப்பு பங்கு மொறட்டுவ பல்கலைகழகம்
 DocType: Time Log,Costing Rate based on Activity Type (per hour),நடவடிக்கை வகை அடிப்படையில் மதிப்பீடு செலவு (ஒரு நாளைக்கு)
 DocType: Production Planning Tool,Create Material Requests,பொருள் கோரிக்கைகள் உருவாக்க
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,வங்கி நல்லி
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,மேம்படுத்தல்கள் கிடைக்கும்
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,பொருள் கோரிக்கை {0} ரத்து அல்லது நிறுத்தி
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,ஒரு சில மாதிரி பதிவுகளை சேர்க்கவும்
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,மேலாண்மை விடவும்
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,மேலாண்மை விடவும்
 DocType: Event,Groups,குழுக்கள்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,கணக்கு குழு
 DocType: Sales Order,Fully Delivered,முழுமையாக வழங்கப்படுகிறது
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,விற்பனை உபரி
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} கணக்கு வரவு செலவு {1} செலவு மையம் எதிரான {2} {3} அதிகமாக இருக்கும்
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,முன்னனுப்பியது இலைகள் எடுத்து
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' வரம்பு தேதி ' தேதி ' பிறகு இருக்க வேண்டும்
 ,Stock Projected Qty,பங்கு அளவு திட்டமிடப்பட்ட
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
 DocType: Sales Order,Customer's Purchase Order,வாடிக்கையாளர் கொள்முதல் ஆணை
 DocType: Warranty Claim,From Company,நிறுவனத்தின் இருந்து
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,மதிப்பு அல்லது அளவு
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,சில்லறை
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,அனைத்து வழங்குபவர் வகைகள்
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,பொருள் தானாக எண் ஏனெனில் பொருள் கோட் கட்டாய ஆகிறது
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,பொருள் தானாக எண் ஏனெனில் பொருள் கோட் கட்டாய ஆகிறது
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,பராமரிப்பு அட்டவணை உருப்படி
 DocType: Sales Order,%  Delivered,அனுப்பப்பட்டது%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,வங்கி மிகைஎடுப்பு கணக்கு
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,சம்பள செய்ய
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,தடை இல்லாத
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,"உலவ BOM,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,பிணை கடன்கள்
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,அழகிய பொருட்களை
@@ -2523,7 +2532,7 @@ DocType: Appraisal,Appraisal,மதிப்பிடுதல்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,லாஸ்ட்-நுரை நடிப்பதற்கு
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,வரைதல்
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,தேதி மீண்டும்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},"விட்டு வீடு, ஒன்றாக இருக்க வேண்டும் {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},"விட்டு வீடு, ஒன்றாக இருக்க வேண்டும் {0}"
 DocType: Hub Settings,Seller Email,விற்பனையாளர் மின்னஞ்சல்
 DocType: Project,Total Purchase Cost (via Purchase Invoice),மொத்த கொள்முதல் விலை (கொள்முதல் விலைப்பட்டியல் வழியாக)
 DocType: Workstation Working Hour,Start Time,தொடக்க நேரம்
@@ -2537,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),நிகர (நிறுவனத்தின் நாணயம்)
 DocType: BOM Operation,Hour Rate,மணி விகிதம்
 DocType: Stock Settings,Item Naming By,மூலம் பெயரிடுதல் உருப்படியை
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,கூறியவை
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},மற்றொரு காலம் நிறைவு நுழைவு {0} பின்னர் செய்யப்பட்ட {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,கூறியவை
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},மற்றொரு காலம் நிறைவு நுழைவு {0} பின்னர் செய்யப்பட்ட {1}
 DocType: Production Order,Material Transferred for Manufacturing,பொருள் தயாரிப்பு இடமாற்றம்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,கணக்கு {0} இல்லை உள்ளது
 DocType: Purchase Receipt Item,Purchase Order Item No,ஆர்டர் பொருள் இல்லை வாங்க
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,ஆய்வு தேவை
 DocType: Purchase Invoice Item,PR Detail,PR விரிவாக
 DocType: Sales Order,Fully Billed,முழுமையாக வசூலிக்கப்படும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,கைப்பணம்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},டெலிவரி கிடங்கு பங்கு உருப்படியை தேவையான {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},டெலிவரி கிடங்கு பங்கு உருப்படியை தேவையான {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),தொகுப்பின் மொத்த எடை. பொதுவாக நிகர எடை + பேக்கேஜிங் பொருட்கள் எடை. (அச்சுக்கு)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,இந்த பங்களிப்பை செய்த உறைந்த கணக்குகள் எதிராக கணக்கியல் உள்ளீடுகள் மாற்ற / உறைந்த கணக்குகள் அமைக்க உருவாக்க அனுமதி
 DocType: Serial No,Is Cancelled,ரத்து
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,என் படுவதற்கு
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,என் படுவதற்கு
 DocType: Journal Entry,Bill Date,பில் தேதி
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","அதிகபட்ச முன்னுரிமை கொண்ட பல விலை விதிகள் உள்ளன என்றால், பின் பின்வரும் உள் முன்னுரிமைகள் பயன்படுத்தப்படும்:"
 DocType: Supplier,Supplier Details,வழங்குபவர் விவரம்
@@ -2568,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,வயர் மாற்றம்
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,வங்கி கணக்கு தேர்ந்தெடுக்கவும்
 DocType: Newsletter,Create and Send Newsletters,உருவாக்க மற்றும் அனுப்பவும் செய்தி
-sites/assets/js/report.min.js +107,From Date must be before To Date,தேதி முதல் தேதி முன் இருக்க வேண்டும்
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,தேதி முதல் தேதி முன் இருக்க வேண்டும்
 DocType: Sales Order,Recurring Order,வழக்கமாகத் தோன்றும் ஆணை
 DocType: Company,Default Income Account,முன்னிருப்பு வருமானம் கணக்கு
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,வாடிக்கையாளர் குழு / வாடிக்கையாளர்
@@ -2583,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,பங்கு மொறட
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
 ,Projected,திட்டமிடப்பட்ட
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},தொடர் இல {0} கிடங்கு அல்ல {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"குறிப்பு: இந்த அமைப்பு பொருள் விநியோகம் , மேல் முன்பதிவு பார்க்க மாட்டேன் {0} அளவு அல்லது அளவு 0 ஆகிறது"
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"குறிப்பு: இந்த அமைப்பு பொருள் விநியோகம் , மேல் முன்பதிவு பார்க்க மாட்டேன் {0} அளவு அல்லது அளவு 0 ஆகிறது"
 DocType: Notification Control,Quotation Message,மேற்கோள் செய்தி
 DocType: Issue,Opening Date,தேதி திறப்பு
 DocType: Journal Entry,Remark,குறிப்பு
 DocType: Purchase Receipt Item,Rate and Amount,விகிதம் மற்றும் தொகை
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,போரிங்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,விற்பனை ஆர்டர் இருந்து
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,விற்பனை ஆர்டர் இருந்து
 DocType: Blog Category,Parent Website Route,பெற்றோர் இணையத்தளம் வழி
 DocType: Sales Order,Not Billed,கட்டணம்
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,இரண்டு கிடங்கு அதே நிறுவனத்திற்கு சொந்தமானது வேண்டும்
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,தொடர்புகள் இல்லை இன்னும் சேர்க்கப்படவில்லை.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,தொடர்புகள் இல்லை இன்னும் சேர்க்கப்படவில்லை.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,செயலில்
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,விலைப்பட்டியல் இடுகைத் திகதி எதிராக
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed செலவு ரசீது தொகை
 DocType: Time Log,Batched for Billing,பில்லிங் Batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,பில்கள் விநியோகஸ்தர்கள் எழுப்பும்.
 DocType: POS Profile,Write Off Account,கணக்கு இனிய எழுத
-sites/assets/js/erpnext.min.js +26,Discount Amount,தள்ளுபடி தொகை
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,தள்ளுபடி தொகை
 DocType: Purchase Invoice,Return Against Purchase Invoice,எதிராக கொள்முதல் விலைப்பட்டியல் திரும்ப
 DocType: Item,Warranty Period (in days),உத்தரவாதத்தை காலம் (நாட்கள்)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"உதாரணமாக, வரி"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,பொருள் 4
 DocType: Journal Entry Account,Journal Entry Account,பத்திரிகை நுழைவு கணக்கு
 DocType: Shopping Cart Settings,Quotation Series,மேற்கோள் தொடர்
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","ஒரு பொருளை ( {0} ) , உருப்படி குழு பெயர் மாற்ற அல்லது மறுபெயரிட தயவு செய்து அதே பெயரில்"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","ஒரு பொருளை ( {0} ) , உருப்படி குழு பெயர் மாற்ற அல்லது மறுபெயரிட தயவு செய்து அதே பெயரில்"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,உருவாக்கும் ஹாட் மெட்டல் எரிவாயு
 DocType: Sales Order Item,Sales Order Date,விற்பனை ஆர்டர் தேதி
 DocType: Sales Invoice Item,Delivered Qty,வழங்கப்படும் அளவு
@@ -2639,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,வாடிக்கையாளருக்கு அல்லது விபரங்கள்
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,அமை
 DocType: Lead,Lead Owner,உரிமையாளர் இட்டு
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,கிடங்கு தேவைப்படுகிறது
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,கிடங்கு தேவைப்படுகிறது
 DocType: Employee,Marital Status,திருமண தகுதி
 DocType: Stock Settings,Auto Material Request,கார் பொருள் கோரிக்கை
 DocType: Time Log,Will be updated when billed.,கணக்கில் போது புதுப்பிக்கப்படும்.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் தொகுதி அளவு
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,தற்போதைய BOM மற்றும் நியூ BOM அதே இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,ஓய்வு நாள் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Sales Invoice,Against Income Account,வருமான கணக்கு எதிராக
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,பங்கு புதுப்பிக்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,பொருட்களை பல்வேறு மொறட்டுவ பல்கலைகழகம் தவறான ( மொத்த ) நிகர எடை மதிப்பு வழிவகுக்கும். ஒவ்வொரு பொருளின் நிகர எடை அதே மொறட்டுவ பல்கலைகழகம் உள்ளது என்று உறுதி.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM விகிதம்
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"டெலிவரி குறிப்பு இருந்து உருப்படிகள் இழுக்க , தயவு செய்து"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"டெலிவரி குறிப்பு இருந்து உருப்படிகள் இழுக்க , தயவு செய்து"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,ஜர்னல் பதிவுகள் {0} ஐ.நா. இணைக்கப்பட்ட
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","வகை மின்னஞ்சல், தொலைபேசி, அரட்டை, வருகை, முதலியன அனைத்து தகவல் பதிவு"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,நிறுவனத்தின் வட்ட இனிய விலை மையம் குறிப்பிடவும்
 DocType: Purchase Invoice,Terms,விதிமுறைகள்
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,புதிய உருவாக்கவும்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,புதிய உருவாக்கவும்
 DocType: Buying Settings,Purchase Order Required,தேவையான கொள்முதல் ஆணை
 ,Item-wise Sales History,உருப்படியை வாரியான விற்பனை வரலாறு
 DocType: Expense Claim,Total Sanctioned Amount,மொத்த ஒப்புதல் தொகை
@@ -2681,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,சம்பளம் ஸ
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,குறிப்புகள்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,முதல் ஒரு குழு முனை தேர்ந்தெடுக்கவும்.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},நோக்கம் ஒன்றாக இருக்க வேண்டும் {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,"படிவத்தை பூர்த்தி செய்து, அதை காப்பாற்ற"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,"படிவத்தை பூர்த்தி செய்து, அதை காப்பாற்ற"
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,அவர்களின் சமீபத்திய சரக்கு நிலை அனைத்து மூலப்பொருட்கள் கொண்ட ஒரு அறிக்கையை பதிவிறக்கு
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,எதிர்கொள்ளும்
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,கருத்துக்களம்
 DocType: Leave Application,Leave Balance Before Application,விண்ணப்ப முன் இருப்பு விட்டு
 DocType: SMS Center,Send SMS,எஸ்எம்எஸ் அனுப்ப
 DocType: Company,Default Letter Head,கடிதத் தலைப்பில் இயல்புநிலை
 DocType: Time Log,Billable,பில்
 DocType: Authorization Rule,This will be used for setting rule in HR module,இந்த அலுவலக தொகுதி உள்ள அமைப்பு விதி பயன்படுத்தப்படும்
 DocType: Account,Rate at which this tax is applied,இந்த வரி செலுத்தப்படுகிறது விகிதத்தில்
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,மறுவரிசைப்படுத்துக அளவு
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,மறுவரிசைப்படுத்துக அளவு
 DocType: Company,Stock Adjustment Account,பங்கு சரிசெய்தல் கணக்கு
 DocType: Journal Entry,Write Off,இனிய எழுதவும்
 DocType: Time Log,Operation ID,ஆபரேஷன் ஐடி
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","தள்ளுபடி புலங்கள் கொள்முதல் ஆணை, கொள்முதல் ரசீது, கொள்முதல் விலை விவரம் கிடைக்கும்"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,புதிய கணக்கு பெயர். குறிப்பு: வாடிக்கையாளர்களும் விநியோகத்தர்களும் கணக்குகள் உருவாக்க வேண்டாம்
 DocType: Report,Report Type,வகை புகார்
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,சுமையேற்றம்
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,சுமையேற்றம்
 DocType: BOM Replace Tool,BOM Replace Tool,BOM பதிலாக கருவி
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,நாடு வாரியாக இயல்புநிலை முகவரி டெம்ப்ளேட்கள்
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
+DocType: Sales Order Item,Supplier delivers to Customer,சப்ளையர் வாடிக்கையாளர் வழங்குகிறது
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,தரவு இறக்குமதி மற்றும் ஏற்றுமதி
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',நீங்கள் உற்பத்தி துறையில் உள்ளடக்கியது என்றால் . பொருள் இயக்கும் ' உற்பத்தி செய்யப்படுகிறது '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,விலைப்பட்டியல் பதிவுசெய்ய தேதி
 DocType: Sales Invoice,Rounded Total,வட்டமான மொத்த
 DocType: Product Bundle,List items that form the package.,தொகுப்பு அமைக்க என்று பட்டியல் உருப்படிகள்.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,சதவீதம் ஒதுக்கீடு 100% சமமாக இருக்க வேண்டும்
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
 DocType: Company,Default Cash Account,இயல்புநிலை பண கணக்கு
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,நிறுவனத்தின் ( இல்லை வாடிக்கையாளருக்கு அல்லது வழங்குநருக்கு ) மாஸ்டர் .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',' எதிர்பார்த்த டெலிவரி தேதி ' உள்ளிடவும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',' எதிர்பார்த்த டெலிவரி தேதி ' உள்ளிடவும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,பணம் அளவு + அளவு தள்ளுபடி கிராண்ட் மொத்த விட முடியாது
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} உருப்படி ஒரு செல்லுபடியாகும் தொகுதி எண் அல்ல {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},குறிப்பு: விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
@@ -2740,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","ரோ {0}: அளவு கிடங்கில் avalable இல்லை {1} ம் {2} {3}.
  கிடைக்கும் அளவு: {4}, அளவு மாற்றம்: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,பொருள் 3
+DocType: Purchase Order,Customer Contact Email,வாடிக்கையாளர் தொடர்பு மின்னஞ்சல்
 DocType: Event,Sunday,ஞாயிற்றுக்கிழமை
 DocType: Sales Team,Contribution (%),பங்களிப்பு (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,பொறுப்புகள்
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,டெம்ப்ளேட்
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,டெம்ப்ளேட்
 DocType: Sales Person,Sales Person Name,விற்பனை நபர் பெயர்
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,அட்டவணையில் குறைந்தது 1 விலைப்பட்டியல் உள்ளிடவும்
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,பயனர்கள் சேர்க்கவும்
@@ -2753,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),உண்மையான தெ
 DocType: Stock Reconciliation Item,Before reconciliation,சமரசம் முன்
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},எப்படி {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி ரோ {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி ரோ {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
 DocType: Sales Order,Partly Billed,இதற்கு கட்டணம்
 DocType: Item,Default BOM,முன்னிருப்பு BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2761,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,மொத்த மிகச்சிறந்த விவரங்கள்
 DocType: Time Log Batch,Total Hours,மொத்த நேரம்
 DocType: Journal Entry,Printing Settings,அச்சிடுதல் அமைப்புகள்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},மொத்த பற்று மொத்த கடன் சமமாக இருக்க வேண்டும் .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},மொத்த பற்று மொத்த கடன் சமமாக இருக்க வேண்டும் .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,வாகன
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},இலைகள் வகை {0} ஏற்கனவே பணியாளர் ஒதுக்கீடு {1} நிதியாண்டில் {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,பொருள் தேவைப்படுகிறது
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,மெட்டல் ஊசி மருந்து வடிவமைத்தல்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,டெலிவரி குறிப்பு இருந்து
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,டெலிவரி குறிப்பு இருந்து
 DocType: Time Log,From Time,நேரம் இருந்து
 DocType: Notification Control,Custom Message,தனிப்பயன் செய்தி
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,முதலீட்டு வங்கி
@@ -2782,10 +2795,10 @@ DocType: Newsletter,A Lead with this email id should exist,இந்த மி
 DocType: Stock Entry,From BOM,"BOM, இருந்து"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,அடிப்படையான
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} முன் பங்கு பரிவர்த்தனைகள் உறைந்திருக்கும்
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,தேதி அரை நாள் விடுப்பு வரம்பு தேதி அதே இருக்க வேண்டும்
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,தேதி அரை நாள் விடுப்பு வரம்பு தேதி அதே இருக்க வேண்டும்
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","உதாரணமாக கிலோ, அலகு, இலக்கங்கள், மீ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,நீங்கள் பரிந்துரை தேதி உள்ளிட்ட குறிப்பு இல்லை கட்டாயமாகும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,நீங்கள் பரிந்துரை தேதி உள்ளிட்ட குறிப்பு இல்லை கட்டாயமாகும்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,சேர தேதி பிறந்த தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Salary Structure,Salary Structure,சம்பளம் அமைப்பு
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,7 +2806,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  மோதல் தீர்க்க செய்யவும். விலை விதிகள்: {0}"
 DocType: Account,Bank,வங்கி
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,விமானத்துறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,பிரச்சினை பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,பிரச்சினை பொருள்
 DocType: Material Request Item,For Warehouse,சேமிப்பு
 DocType: Employee,Offer Date,ஆஃபர் தேதி
 DocType: Hub Settings,Access Token,அணுகல் டோக்கன்
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,நேரம் திறந்து
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,தேவையான தேதிகள் மற்றும் இதயம்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,செக்யூரிட்டிஸ் & பண்ட பரிமாற்ற
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
+DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,துளையிடும்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ஊதி வடிவமைத்தல்
 DocType: Purchase Taxes and Charges,Valuation and Total,மதிப்பீடு மற்றும் மொத்த
@@ -2837,11 +2851,12 @@ DocType: C-Form,Amended From,முதல் திருத்தப்பட
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,மூலப்பொருட்களின்
 DocType: Leave Application,Follow via Email,மின்னஞ்சல் வழியாக பின்பற்றவும்
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,தள்ளுபடி தொகை பிறகு வரி தொகை
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,குழந்தை கணக்கு இந்த கணக்கு உள்ளது . நீங்கள் இந்த கணக்கை நீக்க முடியாது .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,குழந்தை கணக்கு இந்த கணக்கு உள்ளது . நீங்கள் இந்த கணக்கை நீக்க முடியாது .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,இலக்கு அளவு அல்லது இலக்கு அளவு அல்லது கட்டாய
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},இயல்புநிலை BOM உள்ளது உருப்படி {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
-DocType: Leave Allocation,Carry Forward,முன்னெடுத்து செல்
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},இயல்புநிலை BOM உள்ளது உருப்படி {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,தேதி திறந்து தேதி மூடுவதற்கு முன் இருக்க வேண்டும்
+DocType: Leave Control Panel,Carry Forward,முன்னெடுத்து செல்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் லெட்ஜரிடம் மாற்ற முடியாது
 DocType: Department,Days for which Holidays are blocked for this department.,இது விடுமுறை நாட்கள் இந்த துறை தடுக்கப்பட்டது.
 ,Produced,உற்பத்தி
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),மொத்தம
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,பொழுதுபோக்கு & ஓய்வு
 DocType: Purchase Order,The date on which recurring order will be stop,மீண்டும் மீண்டும் வரும் பொருட்டு நிறுத்த வேண்டும் எந்த தேதி
 DocType: Quality Inspection,Item Serial No,உருப்படி இல்லை தொடர்
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} குறைக்கப்பட வேண்டும் அல்லது நீங்கள் வழிதல் சகிப்புத்தன்மை அதிகரிக்க வேண்டும்
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} குறைக்கப்பட வேண்டும் அல்லது நீங்கள் வழிதல் சகிப்புத்தன்மை அதிகரிக்க வேண்டும்
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,மொத்த தற்போதைய
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,மணி
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","தொடராக பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி \
  மேம்படுத்தப்பட்டது"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,சப்ளையர் பொருள் மாற்றுவது
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,சப்ளையர் பொருள் மாற்றுவது
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,புதிய சீரியல் இல்லை கிடங்கு முடியாது . கிடங்கு பங்கு நுழைவு அல்லது கொள்முதல் ரசீது மூலம் அமைக்க வேண்டும்
 DocType: Lead,Lead Type,வகை இட்டு
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,மேற்கோள் உருவாக்கவும்
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,இந்த பொருட்கள் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,இந்த பொருட்கள் ஏற்கனவே விலை விவரம்
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ஒப்புதல்
 DocType: Shipping Rule,Shipping Rule Conditions,கப்பல் விதி நிபந்தனைகள்
 DocType: BOM Replace Tool,The new BOM after replacement,மாற்று பின்னர் புதிய BOM
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,சி படிவம்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ஆபரேஷன் ஐடி அமைக்க
 DocType: Production Order,Planned Start Date,திட்டமிட்ட தொடக்க தேதி
 DocType: Serial No,Creation Document Type,உருவாக்கம் ஆவண வகை
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. வருகை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. வருகை
 DocType: Leave Type,Is Encash,ரொக்கமான மாற்று இல்லை
 DocType: Purchase Invoice,Mobile No,இல்லை மொபைல்
 DocType: Payment Tool,Make Journal Entry,பத்திரிகை பதிவு செய்ய
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,புதிய ஒதுக்
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,திட்ட வாரியான தரவு மேற்கோள் கிடைக்கவில்லை
 DocType: Project,Expected End Date,எதிர்பார்க்கப்படுகிறது முடிவு தேதி
 DocType: Appraisal Template,Appraisal Template Title,மதிப்பீட்டு வார்ப்புரு தலைப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,வர்த்தகம்
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,வர்த்தகம்
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,பெற்றோர் பொருள் {0} ஒரு பங்கு பொருள் இருக்க கூடாது
 DocType: Cost Center,Distribution Id,விநியோக அடையாளம்
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,வியப்பா சேவைகள்
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} கற்பிதம் மதிப்பு எல்லைக்குள் இருக்க வேண்டும் {1} க்கு {2} அதிகரிப்பில் {3}
 DocType: Tax Rule,Sales,விற்பனை
 DocType: Stock Entry Detail,Basic Amount,அடிப்படை தொகை
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
+DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,கணக்குகள் இயல்புநிலை
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,அறுக்கும்
 DocType: Tax Rule,Billing State,பில்லிங் மாநிலம்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,லேமினேட்டிங்
 DocType: Item Reorder,Transfer,பரிமாற்றம்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
 DocType: Authorization Rule,Applicable To (Employee),பொருந்தும் (பணியாளர்)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,சில்லறை
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,வாடிக்கையாளர் {0} இல்லை
 DocType: Attendance,Absent,வராதிரு
 DocType: Product Bundle,Product Bundle,தயாரிப்பு மூட்டை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ரோ {0}: தவறான குறிப்பு {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,நசுக்கிய
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,வரி மற்றும் கட்டணங்கள் வார்ப்புரு வாங்க
 DocType: Upload Attendance,Download Template,வார்ப்புரு பதிவிறக்க
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,கருத்துக்கள்
 DocType: Purchase Order Item Supplied,Raw Material Item Code,மூலப்பொருட்களின் பொருள் குறியீடு
 DocType: Journal Entry,Write Off Based On,ஆனால் அடிப்படையில் இனிய எழுத
 DocType: Features Setup,POS View,பிஓஎஸ் பார்வையிடு
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,ஒரு சீரியல் எண் நிறுவல் பதிவு
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,ஒரு சீரியல் எண் நிறுவல் பதிவு
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,தொடர்வார்ப்பு
-sites/assets/js/erpnext.min.js +10,Please specify a,குறிப்பிடவும் ஒரு
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,குறிப்பிடவும் ஒரு
 DocType: Offer Letter,Awaiting Response,பதிலை எதிர்பார்த்திருப்பதாகவும்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,மேலே
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,குளிர் அளவு
 DocType: Salary Slip,Earning & Deduction,சம்பளம் மற்றும் பொருத்தியறிதல்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,கணக்கு {0} ஒரு குழு இருக்க முடியாது
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,பகுதி
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
 DocType: Holiday List,Weekly Off,இனிய வாராந்திர
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","உதாரணமாக 2012, 2012-13 க்கான"
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,வீக்கம்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ஆவியாக்கல் மாதிரி நடிப்பதற்கு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,பொழுதுபோக்கு செலவினங்கள்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,கவிஞருக்கு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,வயது
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,கவிஞருக்கு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,வயது
 DocType: Time Log,Billing Amount,பில்லிங் அளவு
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,உருப்படி குறிப்பிடப்பட்டது அளவு {0} . அளவு 0 அதிகமாக இருக்க வேண்டும் .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,விடுமுறை விண்ணப்பங்கள்.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,ஏற்கனவே பரிவர்த்தனை கணக்கு நீக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,ஏற்கனவே பரிவர்த்தனை கணக்கு நீக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,சட்ட செலவுகள்
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","கார் பொருட்டு 05, 28 எ.கா. உருவாக்கப்படும் மாதத்தின் நாள்"
 DocType: Sales Invoice,Posting Time,நேரம் தகவல்களுக்கு
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,லோகோ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,நீங்கள் பயனர் சேமிப்பு முன்பு ஒரு தொடர் தேர்ந்தெடுக்க கட்டாயப்படுத்தும் விரும்பினால் இந்த சோதனை. இந்த சோதனை என்றால் இல்லை இயல்பாக இருக்கும்.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},சீரியல் இல்லை இல்லை பொருள் {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,திறந்த அறிவிப்புகள்
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,திறந்த அறிவிப்புகள்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,நேரடி செலவுகள்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,நீங்கள் உண்மையில் இந்த பொருள் கோரிக்கை தடை இல்லாத விரும்புகிறீர்களா?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,புதிய வாடிக்கையாளர் வருவாய்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,போக்குவரத்து செலவுகள்
 DocType: Maintenance Visit,Breakdown,முறிவு
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,தேதி வரை
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,"இதனையடுத்து,"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,சோதனை காலம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,இயல்புநிலை கிடங்கு பங்கு பொருள் கட்டாயமாகும்.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,இயல்புநிலை கிடங்கு பங்கு பொருள் கட்டாயமாகும்.
 DocType: Feed,Full Name,முழு பெயர்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,பெற்றுக்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},மாதம் சம்பளம் கொடுப்பனவு {0} மற்றும் ஆண்டு {1}
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,கணக்க
 DocType: Buying Settings,Default Supplier Type,முன்னிருப்பு சப்ளையர் வகை
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,குவாரி
 DocType: Production Order,Total Operating Cost,மொத்த இயக்க செலவு
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,குறிப்பு: பொருள் {0} பல முறை உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,குறிப்பு: பொருள் {0} பல முறை உள்ளிட்ட
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,அனைத்து தொடர்புகள்.
 DocType: Newsletter,Test Email Id,டெஸ்ட் மின்னஞ்சல் விலாசம்
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,நிறுவனத்தின் சுருக்கமான
@@ -3101,11 +3117,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,தா
 DocType: Stock Settings,Role Allowed to edit frozen stock,உறைந்த பங்கு திருத்த அனுமதி பங்கு
 ,Territory Target Variance Item Group-Wise,மண்டலம் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,வரி டெம்ப்ளேட் கட்டாயமாகும்.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,கணக்கு {0}: பெற்றோர் கணக்கு {1} இல்லை
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),விலை பட்டியல் விகிதம் (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} நிலையை ' பணிநிறுத்தம்'
 DocType: Account,Temporary,தற்காலிக
 DocType: Address,Preferred Billing Address,விருப்பமான பில்லிங் முகவரி
 DocType: Monthly Distribution Percentage,Percentage Allocation,சதவீத ஒதுக்கீடு
@@ -3123,13 +3138,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,பொருள் வ
 DocType: Purchase Order Item,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
 DocType: Quotation,In Words will be visible once you save the Quotation.,நீங்கள் மேற்கோள் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,சலவை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} நிறுத்தி உள்ளது
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} நிறுத்தி உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
 DocType: Lead,Add to calendar on this date,இந்த தேதி நாள்காட்டியில் சேர்க்கவும்
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,கப்பல் செலவுகள் சேர்த்து விதிகள் .
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,எதிர்வரும் நிகழ்வுகள்
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,எதிர்வரும் நிகழ்வுகள்
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,வாடிக்கையாளர் தேவை
 DocType: Letter Head,Letter Head,முகவரியடங்கல்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,விரைவு நுழைவு
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} திரும்ப அத்தியாவசியமானதாகும்
 DocType: Purchase Order,To Receive,பெற
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,பொருத்தி சுருக்கு
@@ -3153,25 +3169,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,குறைந்தது ஒரு கிடங்கில் அவசியமானதாகும்
 DocType: Serial No,Out of Warranty,உத்தரவாதத்தை வெளியே
 DocType: BOM Replace Tool,Replace,பதிலாக
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,நடவடிக்கை இயல்புநிலை அலகு உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,நடவடிக்கை இயல்புநிலை அலகு உள்ளிடவும்
 DocType: Purchase Invoice Item,Project Name,திட்டம் பெயர்
 DocType: Supplier,Mention if non-standard receivable account,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு என்றால்
 DocType: Workflow State,Edit,திருத்த
 DocType: Journal Entry Account,If Income or Expense,என்றால் வருமானம் அல்லது செலவு
 DocType: Features Setup,Item Batch Nos,உருப்படியை தொகுப்பு இலக்கங்கள்
 DocType: Stock Ledger Entry,Stock Value Difference,பங்கு மதிப்பு வேறுபாடு
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,மனித வள
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,மனித வள
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,கொடுப்பனவு நல்லிணக்க கொடுப்பனவு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,வரி சொத்துகள்
 DocType: BOM Item,BOM No,BOM இல்லை
 DocType: Contact Us Settings,Pincode,ப ன்ேகா
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,பத்திரிகை நுழைவு {0} {1} அல்லது ஏற்கனவே மற்ற ரசீது எதிராக பொருந்தியது கணக்கு இல்லை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,பத்திரிகை நுழைவு {0} {1} அல்லது ஏற்கனவே மற்ற ரசீது எதிராக பொருந்தியது கணக்கு இல்லை
 DocType: Item,Moving Average,சராசரி நகரும்
 DocType: BOM Replace Tool,The BOM which will be replaced,பதிலீடு செய்யப்படும் BOM
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,புதிய பங்கு மொறட்டுவ பல்கலைகழகம் தற்போதைய பங்கு மொறட்டுவ பல்கலைகழகம் வித்தியாசமாக இருக்க வேண்டும்
 DocType: Account,Debit,பற்று
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,இலைகள் 0.5 மடங்குகள் ஒதுக்கீடு
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,இலைகள் 0.5 மடங்குகள் ஒதுக்கீடு
 DocType: Production Order,Operation Cost,அறுவை சிகிச்சை செலவு
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,ஒரு. Csv கோப்பு இருந்து வருகை பதிவேற்று
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,மிகச்சிறந்த விவரங்கள்
@@ -3179,7 +3195,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,தெ
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","இந்த சிக்கலை ஒதுக்க, பக்கப்பட்டியில் "ஒதுக்க" பொத்தானை பயன்படுத்தவும்."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],உறைதல் பங்குகள் பழைய [days]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","இரண்டு அல்லது அதற்கு மேற்பட்ட விலை விதிகள் மேலே நிபந்தனைகளை அடிப்படையாகக் காணப்படுகின்றன என்றால், முன்னுரிமை பயன்படுத்தப்படுகிறது. இயல்புநிலை மதிப்பு பூஜ்யம் (வெற்று) இருக்கும் போது முன்னுரிமை 20 0 இடையில் ஒரு எண். உயர் எண்ணிக்கை அதே நிலையில் பல விலை விதிகள் உள்ளன என்றால் அதை முன்னுரிமை எடுக்கும்."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,விலைப்பட்டியல் எதிராக
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,நிதியாண்டு {0} இல்லை உள்ளது
 DocType: Currency Exchange,To Currency,நாணய செய்ய
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,பின்வரும் பயனர்கள் தொகுதி நாட்கள் விடுப்பு விண்ணப்பங்கள் ஏற்று கொள்ள அனுமதிக்கும்.
@@ -3208,7 +3223,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),வ
 DocType: Stock Entry Detail,Additional Cost,கூடுதல் செலவு
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,நிதி ஆண்டு முடிவு தேதி
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","வவுச்சர் அடிப்படையில் வடிகட்ட முடியாது இல்லை , ரசீது மூலம் தொகுக்கப்பட்டுள்ளது என்றால்"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
 DocType: Quality Inspection,Incoming,அடுத்து வருகிற
 DocType: BOM,Materials Required (Exploded),பொருட்கள் தேவை (விரிவான)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),சம்பளம் (LWP) இல்லாமல் விடுமுறை ஆதாயம் குறைக்க
@@ -3216,10 +3231,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ரோ # {0}: தொ.எ. {1} பொருந்தவில்லை {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,தற்செயல் விடுப்பு
 DocType: Batch,Batch ID,தொகுதி அடையாள
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},குறிப்பு: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},குறிப்பு: {0}
 ,Delivery Note Trends,பந்து குறிப்பு போக்குகள்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,இந்த வார சுருக்கம்
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} வரிசையில் ஒரு வாங்கப்பட்டது அல்லது துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} வரிசையில் ஒரு வாங்கப்பட்டது அல்லது துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும் {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,கணக்கு: {0} மட்டுமே பங்கு பரிவர்த்தனைகள் வழியாக புதுப்பிக்க முடியும்
 DocType: GL Entry,Party,கட்சி
 DocType: Sales Order,Delivery Date,டெலிவரி தேதி
@@ -3232,7 +3247,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
 DocType: Task,Actual Time (in Hours),(மணிகளில்) உண்மையான நேரம்
 DocType: Employee,History In Company,நிறுவனத்தின் ஆண்டு வரலாறு
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,செய்தி
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,செய்தி
 DocType: Address,Shipping,கப்பல் வாணிபம்
 DocType: Stock Ledger Entry,Stock Ledger Entry,பங்கு லெட்ஜர் நுழைவு
 DocType: Department,Leave Block List,பிளாக் பட்டியல் விட்டு
@@ -3251,7 +3266,7 @@ DocType: Account,Auditor,ஆடிட்டர்
 DocType: Purchase Order,End date of current order's period,தற்போதைய ஆர்டரை கால இறுதியில் தேதி
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ஆஃபர் கடிதம் செய்ய
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,திரும்ப
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,மாற்று அளவீடு இயல்புநிலை யூனிட் டெம்ப்ளேட் அதே இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,மாற்று அளவீடு இயல்புநிலை யூனிட் டெம்ப்ளேட் அதே இருக்க வேண்டும்
 DocType: DocField,Fold,மடி
 DocType: Production Order Operation,Production Order Operation,உத்தரவு ஆபரேஷன்
 DocType: Pricing Rule,Disable,முடக்கு
@@ -3283,7 +3298,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,அறிக்கைகள்
 DocType: SMS Settings,Enter url parameter for receiver nos,ரிசீவர் இலக்கங்கள் URL ஐ அளவுரு உள்ளிடவும்
 DocType: Sales Invoice,Paid Amount,பணம் தொகை
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',கணக்கு {0} நிறைவு வகை ' பொறுப்பு ' இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',கணக்கு {0} நிறைவு வகை ' பொறுப்பு ' இருக்க வேண்டும்
 ,Available Stock for Packing Items,பொருட்கள் பொதி கிடைக்கும் பங்கு
 DocType: Item Variant,Item Variant,பொருள் மாற்று
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,வேறு எந்த இயல்புநிலை உள்ளது என இயல்புநிலை முகவரி டெம்ப்ளேட் அமைக்க
@@ -3291,7 +3306,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,தர மேலாண்மை
 DocType: Production Planning Tool,Filter based on customer,வாடிக்கையாளர் அடிப்படையில் வடிகட்ட
 DocType: Payment Tool Detail,Against Voucher No,ரசீது இல்லை எதிராக
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},பொருள் எண்ணிக்கையை உள்ளிடவும் {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},பொருள் எண்ணிக்கையை உள்ளிடவும் {0}
 DocType: Employee External Work History,Employee External Work History,ஊழியர் புற வேலை வரலாறு
 DocType: Tax Rule,Purchase,கொள்முதல்
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,இருப்பு அளவு
@@ -3328,28 +3343,29 @@ Note: BOM = Bill of Materials","மற்றொரு ** பொருள
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},சீரியல் இல்லை பொருள் கட்டாய {0}
 DocType: Item Variant Attribute,Attribute,கற்பிதம்
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,வரை / இருந்து குறிப்பிடவும்
-sites/assets/js/desk.min.js +7652,Created By,மூலம் உருவாக்கப்பட்டது
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,மூலம் உருவாக்கப்பட்டது
 DocType: Serial No,Under AMC,AMC கீழ்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,பொருள் மதிப்பீட்டு விகிதம் தரையிறங்கியது செலவு ரசீது அளவு கருத்தில் கணக்கீடு செய்யப்பட்டது
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,பரிவர்த்தனைகள் விற்பனை இயல்புநிலை அமைப்புகளை.
 DocType: BOM Replace Tool,Current BOM,தற்போதைய BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,சீரியல் இல்லை சேர்
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,சீரியல் இல்லை சேர்
 DocType: Production Order,Warehouses,கிடங்குகள்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,அச்சு மற்றும் நிலையான
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,குழு முனை
 DocType: Payment Reconciliation,Minimum Amount,குறைந்தபட்ச தொகை
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,புதுப்பி முடிந்தது பொருட்கள்
 DocType: Workstation,per hour,ஒரு மணி நேரத்திற்கு
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},தொடர் {0} ஏற்கனவே பயன்படுத்தப்படுகிறது {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},தொடர் {0} ஏற்கனவே பயன்படுத்தப்படுகிறது {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,கிடங்கு ( நிரந்தர இருப்பு ) கணக்கு இந்த கணக்கு கீழ் உருவாக்கப்பட்டது.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,பங்கு லெட்ஜர் நுழைவு கிடங்கு உள்ளது என கிடங்கு நீக்க முடியாது .
 DocType: Company,Distribution,பகிர்ந்தளித்தல்
-sites/assets/js/erpnext.min.js +50,Amount Paid,கட்டண தொகை
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,கட்டண தொகை
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,திட்ட மேலாளர்
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,கொல்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,மேக்ஸ் தள்ளுபடி உருப்படியை அனுமதி: {0} {1}% ஆகும்
 DocType: Customer,Default Taxes and Charges,இயல்புநிலை வரி மற்றும் கட்டணங்கள்
 DocType: Account,Receivable,பெறத்தக்க
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ரோ # {0}: கொள்முதல் ஆணை ஏற்கனவே உள்ளது என சப்ளையர் மாற்ற அனுமதி
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,அமைக்க கடன் எல்லை மீறிய நடவடிக்கைகளை சமர்ப்பிக்க அனுமதி என்று பாத்திரம்.
 DocType: Sales Invoice,Supplier Reference,வழங்குபவர் குறிப்பு
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","தேர்வுசெய்யப்பட்டால், துணை சட்டசபை பொருட்கள் BOM மூலப்பொருட்கள் பெற கருதப்படுகிறது. மற்றபடி, அனைத்து துணை சட்டசபை பொருட்களை மூலப்பொருளாக கருதப்படுகிறது."
@@ -3386,8 +3402,8 @@ DocType: Email Digest,Add/Remove Recipients,சேர்க்க / பெற்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},பரிவர்த்தனை நிறுத்தி உத்தரவு எதிரான அனுமதி இல்லை {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","இயல்புநிலை என இந்த நிதியாண்டில் அமைக்க, ' இயல்புநிலை அமை ' கிளிக்"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),ஆதரவு மின்னஞ்சல் ஐடி அமைப்பு உள்வரும் சர்வர் . (எ. கா: support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,பற்றாக்குறைவே அளவு
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
 DocType: Salary Slip,Salary Slip,சம்பளம் ஸ்லிப்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,துலக்குதல்
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' தேதி ' தேவைப்படுகிறது
@@ -3400,6 +3416,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","சரி நடவடிக்கைகள் எந்த "Submitted" போது, ஒரு மின்னஞ்சல் பாப் அப் தானாகவே ஒரு இணைப்பாக பரிவர்த்தனை மூலம், அந்த பரிமாற்றத்தில் தொடர்புடைய "தொடர்பு" ஒரு மின்னஞ்சல் அனுப்ப திறக்கப்பட்டது. பயனர் அல்லது மின்னஞ்சல் அனுப்ப முடியாது."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,உலகளாவிய அமைப்புகள்
 DocType: Employee Education,Employee Education,ஊழியர் கல்வி
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
 DocType: Salary Slip,Net Pay,நிகர சம்பளம்
 DocType: Account,Account,கணக்கு
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,தொடர் இல {0} ஏற்கனவே பெற்றுள்ளது
@@ -3432,7 +3449,7 @@ DocType: BOM,Manufacturing User,உற்பத்தி பயனர்
 DocType: Purchase Order,Raw Materials Supplied,மூலப்பொருட்கள் வழங்கியது
 DocType: Purchase Invoice,Recurring Print Format,பெரும்பாலும் உடன் அச்சு வடிவம்
 DocType: Communication,Series,தொடர்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி கொள்முதல் ஆணை தேதி முன் இருக்க முடியாது
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி கொள்முதல் ஆணை தேதி முன் இருக்க முடியாது
 DocType: Appraisal,Appraisal Template,மதிப்பீட்டு வார்ப்புரு
 DocType: Communication,Email,மின்னஞ்சல்
 DocType: Item Group,Item Classification,பொருள் பிரிவுகள்
@@ -3488,6 +3505,7 @@ DocType: HR Settings,Payroll Settings,சம்பளப்பட்டியல
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,அல்லாத தொடர்புடைய பற்றுச்சீட்டுகள் மற்றும் கட்டணங்கள் போட்டி.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,ஸ்நாக்ஸ்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ரூட் ஒரு பெற்றோர் செலவு சென்டர் முடியாது
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,தேர்வு பிராண்ட் ...
 DocType: Sales Invoice,C-Form Applicable,பொருந்தாது சி படிவம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
 DocType: Supplier,Address and Contacts,முகவரி மற்றும் தொடர்புகள்
@@ -3498,7 +3516,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,மிகச்சிறந்த உறுதி சீட்டு கிடைக்கும்
 DocType: Warranty Claim,Resolved By,மூலம் தீர்க்கப்பட
 DocType: Appraisal,Start Date,தொடக்க தேதி
-sites/assets/js/desk.min.js +7629,Value,மதிப்பு
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,மதிப்பு
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,ஒரு காலத்தில் இலைகள் ஒதுக்க.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,சரிபார்க்க இங்கே கிளிக் செய்யவும்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,கணக்கு {0}: நீங்கள் பெற்றோர் கணக்கு தன்னை ஒதுக்க முடியாது
@@ -3514,14 +3532,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,டிரா பாக்ஸ் அனுமதி
 DocType: Dropbox Backup,Weekly,வாரந்தோறும்
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,உதாரணம். smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,பெறவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,பெறவும்
 DocType: Maintenance Visit,Fully Completed,முழுமையாக பூர்த்தி
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% முழுமையான
 DocType: Employee,Educational Qualification,கல்வி தகுதி
 DocType: Workstation,Operating Costs,செலவுகள்
 DocType: Employee Leave Approver,Employee Leave Approver,பணியாளர் விடுப்பு சர்க்கார் தரப்பில் சாட்சி
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} வெற்றிகரமாக எங்கள் செய்திமடல் பட்டியலில் சேர்க்க.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,எலக்ட்ரான் கற்றை எந்திர
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,கொள்முதல் மாஸ்டர் மேலாளர்
@@ -3534,7 +3552,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc டாக்டைப்
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,/ திருத்த விலை சேர்க்கவும்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,செலவு மையங்கள் விளக்கப்படம்
 ,Requested Items To Be Ordered,கேட்டு கேட்டு விடயங்கள்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,என்னுடைய கட்டளைகள்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,என்னுடைய கட்டளைகள்
 DocType: Price List,Price List Name,விலை பட்டியல் பெயர்
 DocType: Time Log,For Manufacturing,உற்பத்தி
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,மொத்த
@@ -3545,7 +3563,7 @@ DocType: Account,Income,வருமானம்
 DocType: Industry Type,Industry Type,தொழில் அமைப்பு
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,ஏதோ தவறு நடந்து!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,கவிஞருக்கு {0} ஏற்கனவே சமர்ப்பித்த
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,கவிஞருக்கு {0} ஏற்கனவே சமர்ப்பித்த
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,நிறைவு நாள்
 DocType: Purchase Invoice Item,Amount (Company Currency),அளவு (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,அச்சு வார்ப்பு
@@ -3559,10 +3577,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,ஆண்டு
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,புள்ளி விற்பனை செய்தது
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS அமைப்புகள் மேம்படுத்த
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,ஏற்கனவே படியாக நேரம் பரிசீலனை {0}
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,ஏற்கனவே படியாக நேரம் பரிசீலனை {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,பிணையற்ற கடன்கள்
 DocType: Cost Center,Cost Center Name,மையம் பெயர் செலவு
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,பொருள் {0} சீரியல் இல்லை உடன் {1} ஏற்கனவே நிறுவப்பட்டிருந்தால்
 DocType: Maintenance Schedule Detail,Scheduled Date,திட்டமிடப்பட்ட தேதி
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,மொத்த பணம் விவரங்கள்
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 தன்மையை விட செய்தியை பல mesage கொண்டு split
@@ -3570,10 +3587,10 @@ DocType: Purchase Receipt Item,Received and Accepted,பெற்று ஏற
 ,Serial No Service Contract Expiry,தொடர் எண் சேவை ஒப்பந்தம் காலாவதியாகும்
 DocType: Item,Unit of Measure Conversion,நடவடிக்கையாக மாற்றும் அலகு
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,பணியாளர் மாற்ற முடியாது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
 DocType: Naming Series,Help HTML,HTML உதவி
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},ஒதுக்கப்படும் மொத்த தாக்கத்தில் 100 % இருக்க வேண்டும். இது {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}
 DocType: Address,Name of person or organization that this address belongs to.,நபர் அல்லது இந்த முகவரியை சொந்தமானது என்று நிறுவனத்தின் பெயர்.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,உங்கள் சப்ளையர்கள்
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
@@ -3584,10 +3601,11 @@ DocType: Lead,Converted,மாற்றப்படுகிறது
 DocType: Item,Has Serial No,இல்லை வரிசை உள்ளது
 DocType: Employee,Date of Issue,இந்த தேதி
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0} இருந்து: {0} ஐந்து {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
 DocType: Issue,Content Type,உள்ளடக்க வகை
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,கம்ப்யூட்டர்
 DocType: Item,List this Item in multiple groups on the website.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,பொருள்: {0} அமைப்பின் இல்லை
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
 DocType: Payment Reconciliation,Get Unreconciled Entries,ஒப்புரவாகவேயில்லை பதிவுகள் பெற
@@ -3598,14 +3616,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,சேமிப்பு கிடங்கு வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},கணக்கு {0} மேலும் நிதியாண்டில் முறை உள்ளிட்ட{1}
 ,Average Commission Rate,சராசரி கமிஷன் விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,வருகை எதிர்கால நாட்களுக்கு குறித்தது முடியாது
 DocType: Pricing Rule,Pricing Rule Help,விலை விதி உதவி
 DocType: Purchase Taxes and Charges,Account Head,கணக்கு ஒதுக்கும் தலைப்பு - பிரிவு
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,பொருட்களை தரையிறங்கியது செலவு கணக்கிட கூடுதல் செலவுகள் புதுப்பிக்கவும்
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,மின்
 DocType: Stock Entry,Total Value Difference (Out - In),மொத்த மதிப்பு வேறுபாடு (அவுட் - ல்)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},பயனர் ஐடி பணியாளர் அமைக்க{0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,உத்தரவாதத்தை கூறுகின்றனர் இருந்து
@@ -3619,15 +3637,17 @@ DocType: Buying Settings,Naming Series,தொடர் பெயரிடு
 DocType: Leave Block List,Leave Block List Name,பிளாக் பட்டியல் பெயர் விட்டு
 DocType: User,Enabled,இயலுமைப்படுத்த
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,பங்கு சொத்துக்கள்
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},நீங்கள் உண்மையில் {0} மற்றும் ஆண்டு {1} மாதத்தில் சம்பள சமர்ப்பிக்க விரும்புகிறீர்களா
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},நீங்கள் உண்மையில் {0} மற்றும் ஆண்டு {1} மாதத்தில் சம்பள சமர்ப்பிக்க விரும்புகிறீர்களா
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,இறக்குமதி சந்தாதாரர்கள்
 DocType: Target Detail,Target Qty,இலக்கு அளவு
 DocType: Attendance,Present,தற்போது
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க கூடாது
 DocType: Notification Control,Sales Invoice Message,விற்பனை விலைப்பட்டியல் செய்தி
 DocType: Authorization Rule,Based On,அடிப்படையில்
-,Ordered Qty,அளவு உத்தரவிட்டார்
+DocType: Sales Order Item,Ordered Qty,அளவு உத்தரவிட்டார்
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},வரம்பு மற்றும் காலம் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம் {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,திட்ட செயல்பாடு / பணி.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,சம்பளம் தவறிவிடும் உருவாக்க
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} சரியான மின்னஞ்சல் ஐடி அல்ல
@@ -3667,7 +3687,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,பங்கேற்கும் பதிவேற்ற
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,"BOM, மற்றும் தயாரிப்பு தேவையான அளவு"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,வயதான ரேஞ்ச் 2
-DocType: Journal Entry Account,Amount,அளவு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,அளவு
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,குடையாணி
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM பதிலாக
 ,Sales Analytics,விற்பனை அனலிட்டிக்ஸ்
@@ -3694,7 +3714,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,எதிர்பார்க்கப்படுகிறது தேதி பொருள் கோரிக்கை தேதி முன் இருக்க முடியாது
 DocType: Contact Us Settings,City,நகரம்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,மீயொலி எந்திர
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,பிழை: ஒரு செல்லுபடியாகும் அடையாள?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,பிழை: ஒரு செல்லுபடியாகும் அடையாள?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,பொருள் {0} ஒரு விற்பனை பொருளாக இருக்க வேண்டும்
 DocType: Naming Series,Update Series Number,மேம்படுத்தல் தொடர் எண்
 DocType: Account,Equity,ஈக்விட்டி
@@ -3709,7 +3729,7 @@ DocType: Purchase Taxes and Charges,Actual,உண்மையான
 DocType: Authorization Rule,Customerwise Discount,Customerwise தள்ளுபடி
 DocType: Purchase Invoice,Against Expense Account,செலவு கணக்கு எதிராக
 DocType: Production Order,Production Order,உற்பத்தி ஆணை
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,நிறுவல் குறிப்பு {0} ஏற்கனவே சமர்ப்பித்த
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,நிறுவல் குறிப்பு {0} ஏற்கனவே சமர்ப்பித்த
 DocType: Quotation Item,Against Docname,Docname எதிராக
 DocType: SMS Center,All Employee (Active),அனைத்து பணியாளர் (செயலில்)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,இப்போது காண்க
@@ -3717,14 +3737,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,மூலப்பொருட்களின் செலவு
 DocType: Item,Re-Order Level,மீண்டும் ஒழுங்கு நிலை
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,நீங்கள் உற்பத்தி ஆர்டர்கள் உயர்த்த அல்லது ஆய்வில் மூலப்பொருட்கள் பதிவிறக்க வேண்டிய உருப்படிகளை மற்றும் திட்டமிட்ட அளவு உள்ளிடவும்.
-sites/assets/js/list.min.js +174,Gantt Chart,காண்ட் விளக்கப்படம்
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,காண்ட் விளக்கப்படம்
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,பகுதி நேர
 DocType: Employee,Applicable Holiday List,பொருந்தும் விடுமுறை பட்டியல்
 DocType: Employee,Cheque,காசோலை
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,தொடர் இற்றை
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,புகார் வகை கட்டாய ஆகிறது
 DocType: Item,Serial Number Series,வரிசை எண் தொடர்
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},கிடங்கு பங்கு பொருள் கட்டாய {0} வரிசையில் {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},கிடங்கு பங்கு பொருள் கட்டாய {0} வரிசையில் {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,சில்லறை & விற்பனை
 DocType: Issue,First Responded On,முதல் தேதி இணையம்
 DocType: Website Item Group,Cross Listing of Item in multiple groups,பல குழுக்கள் பொருள் கிராஸ் பட்டியல்
@@ -3739,7 +3759,7 @@ DocType: Attendance,Attendance,கவனம்
 DocType: Page,No,இல்லை
 DocType: BOM,Materials,மூலப்பொருள்கள்
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","சரி இல்லை என்றால், பட்டியலில் அதை பயன்படுத்த வேண்டும் ஒவ்வொரு துறை சேர்க்க வேண்டும்."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,தகவல்களுக்கு தேதி மற்றும் தகவல்களுக்கு நேரம் கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,தகவல்களுக்கு தேதி மற்றும் தகவல்களுக்கு நேரம் கட்டாய ஆகிறது
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,பரிவர்த்தனைகள் வாங்கும் வரி வார்ப்புரு .
 ,Item Prices,உருப்படியை விலைகள்
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,நீங்கள் கொள்முதல் ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
@@ -3759,9 +3779,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,நிர்வாக செலவுகள்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ஆலோசனை
 DocType: Customer Group,Parent Customer Group,பெற்றோர் வாடிக்கையாளர் பிரிவு
-sites/assets/js/erpnext.min.js +50,Change,மாற்றம்
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,மாற்றம்
 DocType: Purchase Invoice,Contact Email,மின்னஞ்சல் தொடர்பு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',{0} ' பணிநிறுத்தம்' பொருட்டு வாங்க
 DocType: Appraisal Goal,Score Earned,ஜூலை ஈட்டிய
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","உதாரணமாக, ""என் கம்பெனி எல்எல்சி"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,அறிவிப்பு காலம்
@@ -3771,12 +3790,13 @@ DocType: Packing Slip,Gross Weight UOM,மொத்த எடை மொற
 DocType: Email Digest,Receivables / Payables,வரவுகள் / Payables
 DocType: Delivery Note Item,Against Sales Invoice,விற்பனை விலைப்பட்டியல் எதிராக
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,ஸ்டாம்பிங்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,கடன் கணக்கு
 DocType: Landed Cost Item,Landed Cost Item,இறங்கினார் செலவு உருப்படி
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,பூஜ்ய மதிப்புகள் காட்டு
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,உருப்படி அளவு மூலப்பொருட்களை கொடுக்கப்பட்ட அளவு இருந்து உற்பத்தி / repacking பின்னர் பெறப்படும்
 DocType: Payment Reconciliation,Receivable / Payable Account,பெறத்தக்க / செலுத்த வேண்டிய கணக்கு
 DocType: Delivery Note Item,Against Sales Order Item,விற்பனை ஆணை பொருள் எதிராக
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
 DocType: Item,Default Warehouse,இயல்புநிலை சேமிப்பு கிடங்கு
 DocType: Task,Actual End Date (via Time Logs),உண்மையான தேதி (நேரத்தில் பதிவுகள் வழியாக)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},பட்ஜெட் குழு கணக்கை எதிராக ஒதுக்கப்படும் முடியாது {0}
@@ -3790,7 +3810,7 @@ DocType: Issue,Support Team,ஆதரவு குழு
 DocType: Appraisal,Total Score (Out of 5),மொத்த மதிப்பெண் (5 அவுட்)
 DocType: Contact Us Settings,State,நிலை
 DocType: Batch,Batch,கூட்டம்
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,இருப்பு
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,இருப்பு
 DocType: Project,Total Expense Claim (via Expense Claims),மொத்த செலவு கூறுகின்றனர் (செலவு பற்றிய கூற்றுக்கள் வழியாக)
 DocType: User,Gender,பாலினம்
 DocType: Journal Entry,Debit Note,பற்றுக்குறிப்பு
@@ -3806,9 +3826,8 @@ DocType: Lead,Blog Subscriber,வலைப்பதிவு சந்தாத
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,மதிப்புகள் அடிப்படையில் நடவடிக்கைகளை கட்டுப்படுத்த விதிகளை உருவாக்க .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","சரி என்றால், மொத்த இல்லை. வேலை நாட்கள் விடுமுறை அடங்கும், இந்த நாள் ஒன்றுக்கு சம்பளம் மதிப்பு குறையும்"
 DocType: Purchase Invoice,Total Advance,மொத்த முன்பணம்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,தடை இல்லாத பொருள் கோரிக்கை
 DocType: Workflow State,User,பயனர்
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,பதப்படுத்துதல் சம்பளப்பட்டியல்
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,பதப்படுத்துதல் சம்பளப்பட்டியல்
 DocType: Opportunity Item,Basic Rate,அடிப்படை விகிதம்
 DocType: GL Entry,Credit Amount,கடன் தொகை
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,லாஸ்ட் அமை
@@ -3816,7 +3835,7 @@ DocType: Customer,Credit Days Based On,கடன் நாட்கள் அட
 DocType: Tax Rule,Tax Rule,வரி விதி
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,விற்பனை சைக்கிள் முழுவதும் அதே விகிதத்தில் பராமரிக்க
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,வர்க்ஸ்டேஷன் பணிநேரம் தவிர்த்து நேரத்தில் பதிவுகள் திட்டமிட்டுள்ளோம்.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} ஏற்கனவே சமர்ப்பித்த
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ஏற்கனவே சமர்ப்பித்த
 ,Items To Be Requested,கோரிய பொருட்களை
 DocType: Purchase Order,Get Last Purchase Rate,கடைசியாக கொள்முதல் விலை கிடைக்கும்
 DocType: Time Log,Billing Rate based on Activity Type (per hour),நடவடிக்கை வகை அடிப்படையில் பில்லிங் விகிதம் (ஒரு நாளைக்கு)
@@ -3825,6 +3844,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","நிறுவனத்தின் மின்னஞ்சல் ஐடி இல்லை , எனவே அனுப்பிய மின்னஞ்சல்"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),நிதி பயன்பாடு ( சொத்துக்கள் )
 DocType: Production Planning Tool,Filter based on item,உருப்படியை அடிப்படையில் வடிகட்ட
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,பற்று கணக்கு
 DocType: Fiscal Year,Year Start Date,ஆண்டு தொடக்க தேதி
 DocType: Attendance,Employee Name,பணியாளர் பெயர்
 DocType: Sales Invoice,Rounded Total (Company Currency),வட்டமான மொத்த (நிறுவனத்தின் கரன்சி)
@@ -3836,14 +3856,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,வெற்று
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,பணியாளர் நன்மைகள்
 DocType: Sales Invoice,Is POS,பிஓஎஸ் உள்ளது
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
 DocType: Production Order,Manufactured Qty,உற்பத்தி அளவு
 DocType: Purchase Receipt Item,Accepted Quantity,ஏற்று அளவு
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} இல்லை உள்ளது
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,பில்கள் வாடிக்கையாளர்கள் உயர்த்தப்பட்டுள்ளது.
 DocType: DocField,Default,தவறுதல்
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,திட்ட ஐடி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} சந்தாதாரர்கள் சேர்ந்தன
 DocType: Maintenance Schedule,Schedule,அனுபந்தம்
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","இந்த செலவு மையம் பட்ஜெட் வரையறை. பட்ஜெட் அமைக்க, பார்க்க "நிறுவனத்தின் பட்டியல்""
@@ -3851,7 +3871,7 @@ DocType: Account,Parent Account,பெற்றோர் கணக்கு
 DocType: Quality Inspection Reading,Reading 3,3 படித்தல்
 ,Hub,மையம்
 DocType: GL Entry,Voucher Type,ரசீது வகை
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
 DocType: Expense Claim,Approved,ஏற்பளிக்கப்பட்ட
 DocType: Pricing Rule,Price,விலை
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
@@ -3860,23 +3880,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,கல்வி
 DocType: Selling Settings,Campaign Naming By,பிரச்சாரம் பெயரிடும் மூலம்
 DocType: Employee,Current Address Is,தற்போதைய முகவரி
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","விருப்ப. குறிப்பிடப்படவில்லை என்றால், நிறுவனத்தின் இயல்புநிலை நாணய அமைக்கிறது."
 DocType: Address,Office,அலுவலகம்
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,ஸ்டாண்டர்ட் அறிக்கைகள்
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,பைனான்ஸ் ஜர்னல் பதிவுகள்.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ரோ {0}: கட்சி / கணக்கு பொருந்தவில்லை {1} / {2} உள்ள {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் அளவு
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ரோ {0}: கட்சி / கணக்கு பொருந்தவில்லை {1} / {2} உள்ள {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,ஒரு வரி கணக்கு உருவாக்க
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
 DocType: Account,Stock,பங்கு
 DocType: Employee,Current Address,தற்போதைய முகவரி
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","வெளிப்படையாக குறிப்பிட்ட வரை பின்னர் உருப்படியை விளக்கம், படம், விலை, வரி டெம்ப்ளேட் இருந்து அமைக்க வேண்டும் போன்றவை மற்றொரு உருப்படியை ஒரு மாறுபாடு இருக்கிறது என்றால்"
 DocType: Serial No,Purchase / Manufacture Details,கொள்முதல் / உற்பத்தி விவரம்
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,தொகுதி சரக்கு
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,தொகுதி சரக்கு
 DocType: Employee,Contract End Date,ஒப்பந்தம் முடிவு தேதி
 DocType: Sales Order,Track this Sales Order against any Project,எந்த திட்டம் எதிரான இந்த விற்பனை ஆணை கண்காணிக்க
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,மேலே அடிப்படை அடிப்படையில் விற்பனை ஆணைகள் (வழங்க நிலுவையில்) இழுக்க
 DocType: DocShare,Document Type,ஆவண வகை
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,வழங்குபவர் கூறியவை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,வழங்குபவர் கூறியவை
 DocType: Deduction Type,Deduction Type,துப்பறியும் வகை
 DocType: Attendance,Half Day,அரை நாள்
 DocType: Pricing Rule,Min Qty,min அளவு
@@ -3887,20 +3909,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,அளவு (அளவு உற்பத்தி) என்பது கட்டாயம்
 DocType: Stock Entry,Default Target Warehouse,முன்னிருப்பு அடைவு கிடங்கு
 DocType: Purchase Invoice,Net Total (Company Currency),நிகர மொத்தம் (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கை எதிராக மட்டுமே பொருந்தும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கை எதிராக மட்டுமே பொருந்தும்
 DocType: Notification Control,Purchase Receipt Message,ரசீது செய்தி வாங்க
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,மொத்த ஒதுக்கீடு இலைகள் காலம் விட
 DocType: Production Order,Actual Start Date,உண்மையான தொடக்க தேதி
 DocType: Sales Order,% of materials delivered against this Sales Order,இந்த விற்பனை அமைப்புக்கு எதிராக அளிக்கப்பட்ட பொருட்களை%
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,உருப்படியை இயக்கம் பதிவு.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,உருப்படியை இயக்கம் பதிவு.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,செய்திமடல் பட்டியல் சந்தாதாரர்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,சேவை
 DocType: Hub Settings,Hub Settings,ஹப் அமைப்புகள்
 DocType: Project,Gross Margin %,மொத்த அளவு%
 DocType: BOM,With Operations,செயல்பாடுகள் மூலம்
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,கணக்கு உள்ளீடுகளை ஏற்கனவே நாணய செய்யப்பட்டுள்ளது {0} நிறுவனம் {1}. நாணயத்துடன் ஒரு பெறத்தக்க செலுத்தவேண்டிய கணக்கைத் தேர்ந்தெடுக்கவும் {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,கணக்கு உள்ளீடுகளை ஏற்கனவே நாணய செய்யப்பட்டுள்ளது {0} நிறுவனம் {1}. நாணயத்துடன் ஒரு பெறத்தக்க செலுத்தவேண்டிய கணக்கைத் தேர்ந்தெடுக்கவும் {0}.
 ,Monthly Salary Register,மாத சம்பளம் பதிவு
-apps/frappe/frappe/website/template.py +123,Next,அடுத்து
+apps/frappe/frappe/website/template.py +140,Next,அடுத்து
 DocType: Warranty Claim,If different than customer address,என்றால் வாடிக்கையாளர் தான் முகவரி விட வேறு
 DocType: BOM Operation,BOM Operation,BOM ஆபரேஷன்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
@@ -3931,6 +3954,7 @@ DocType: Purchase Invoice,Next Date,அடுத்த நாள்
 DocType: Employee Education,Major/Optional Subjects,முக்கிய / விருப்ப பாடங்கள்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள் உள்ளிடவும்
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,எந்திர
+DocType: Sales Invoice Item,Drop Ship,டிராப் கப்பல்
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","இங்கே நீங்கள் பெற்றோர், மனைவி மற்றும் குழந்தைகள் பெயர் மற்றும் ஆக்கிரமிப்பு போன்ற குடும்ப விவரங்கள் பராமரிக்க முடியும்"
 DocType: Hub Settings,Seller Name,விற்பனையாளர் பெயர்
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),வரிகள் மற்றும் கட்டணங்கள் கழிக்கப்படும் (நிறுவனத்தின் கரன்சி)
@@ -3957,29 +3981,29 @@ DocType: Purchase Order,To Receive and Bill,பெறுதல் மற்ற
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,வடிவமைப்புகள்
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,நிபந்தனைகள் வார்ப்புரு
 DocType: Serial No,Delivery Details,விநியோக விவரம்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,அளவு இந்த அளவு கீழே விழும் என்றால் தானாக பொருள் வேண்டுதல் உருவாக்க
 ,Item-wise Purchase Register,உருப்படியை வாரியான வாங்குதல் பதிவு
 DocType: Batch,Expiry Date,காலாவதியாகும் தேதி
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","மீள் கட்டளை நிலை அமைக்க, உருப்படி ஒரு கொள்முதல் பொருள் அல்லது தயாரிப்பு பொருள் இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","மீள் கட்டளை நிலை அமைக்க, உருப்படி ஒரு கொள்முதல் பொருள் அல்லது தயாரிப்பு பொருள் இருக்க வேண்டும்"
 ,Supplier Addresses and Contacts,வழங்குபவர் முகவரிகள் மற்றும் தொடர்புகள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,முதல் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/projects.py +18,Project master.,திட்டம் மாஸ்டர்.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,நாணயங்கள் அடுத்த $ ஹிப்ரு போன்றவை எந்த சின்னம் காட்டாதே.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(அரை நாள்)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(அரை நாள்)
 DocType: Supplier,Credit Days,கடன் நாட்கள்
 DocType: Leave Type,Is Carry Forward,அடுத்த Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM இருந்து பொருட்களை பெற
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,நேரம் நாட்கள் இட்டு
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,பொருட்களின் பில்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கிற்கு தேவையான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கிற்கு தேவையான {1}
 DocType: Dropbox Backup,Send Notifications To,அறிவிப்புகளை அனுப்பவும்
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref தேதி
 DocType: Employee,Reason for Leaving,விட்டு காரணம்
 DocType: Expense Claim Detail,Sanctioned Amount,ஒப்புதல் தொகை
 DocType: GL Entry,Is Opening,திறக்கிறது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},ரோ {0}: ஒப்புதல் நுழைவு இணைத்தே ஒரு {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,கணக்கு {0} இல்லை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},ரோ {0}: ஒப்புதல் நுழைவு இணைத்தே ஒரு {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,கணக்கு {0} இல்லை
 DocType: Account,Cash,பணம்
 DocType: Employee,Short biography for website and other publications.,இணையதளம் மற்றும் பிற வெளியீடுகள் குறுகிய வாழ்க்கை.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},ஊழியர் சம்பள கட்டமைப்பை உருவாக்க தயவுசெய்து {0}
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index a87730330d..9de493d161 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,โหมดเงินเดือน
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",เลือกการกระจายรายเดือนถ้าคุณต้องการที่จะติดตามการขึ้นอยู่กับฤดูกาล
 DocType: Employee,Divorced,หย่าร้าง
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,คำเตือน: รายการเดียวกันได้รับการป้อนหลายครั้ง
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,คำเตือน: รายการเดียวกันได้รับการป้อนหลายครั้ง
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,รายการซิงค์แล้ว
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,อนุญาตให้รายการที่จะเพิ่มหลายครั้งในการทำธุรกรรม
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ยกเลิกวัสดุเยี่ยมชม {0} ก่อนที่จะยกเลิกการรับประกันเรียกร้องนี้
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,รถบดรวมทั้งการเผา
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},สกุลเงินเป็นสิ่งจำเป็นสำหรับราคา {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* จะได้รับการคำนวณในการทำธุรกรรม
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,ขอ จาก วัสดุ
+DocType: Purchase Order,Customer Contact,ติดต่อลูกค้า
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ขอ จาก วัสดุ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ต้นไม้
 DocType: Job Applicant,Job Applicant,ผู้สมัครงาน
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ไม่มีผลมากขึ้น
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,ชื่อลูกค้า
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","เขตข้อมูล ทั้งหมดที่เกี่ยวข้องกับ การส่งออก เช่นเดียวกับ สกุลเงิน อัตราการแปลง รวม การส่งออก ส่งออก อื่น ๆ รวมใหญ่ ที่มีอยู่ใน หมายเหตุ การจัดส่ง POS , ใบเสนอราคา , ขายใบแจ้งหนี้ การขายสินค้า อื่น ๆ"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,หัว (หรือกลุ่ม) กับบัญชีรายการที่จะทำและจะรักษายอด
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),ที่โดดเด่นสำหรับ {0} ไม่ สามารถน้อยกว่า ศูนย์ ( {1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),ที่โดดเด่นสำหรับ {0} ไม่ สามารถน้อยกว่า ศูนย์ ( {1})
 DocType: Manufacturing Settings,Default 10 mins,เริ่มต้น 10 นาที
 DocType: Leave Type,Leave Type Name,ฝากชื่อประเภท
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,ชุด ล่าสุด ที่ประสบความสำเร็จ
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,ราคา หลายรายก
 DocType: SMS Center,All Supplier Contact,ติดต่อผู้ผลิตทั้งหมด
 DocType: Quality Inspection Reading,Parameter,พารามิเตอร์
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,คาดว่าวันที่สิ้นสุดไม่สามารถจะน้อยกว่าที่คาดว่าจะเริ่มวันที่
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,จริงๆไม่ต้องการที่จะเปิดจุกเพื่อการผลิต:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,แถว # {0}: ให้คะแนนจะต้องเป็นเช่นเดียวกับ {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,แอพลิเคชันออกใหม่
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,แอพลิเคชันออกใหม่
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ตั๋วแลกเงิน
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 เพื่อรักษารหัสรายการลูกค้าที่ฉลาดและจะทำให้พวกเขาค้นหาตามรหัสของพวกเขาใช้ตัวเลือกนี้
 DocType: Mode of Payment Account,Mode of Payment Account,โหมดของการบัญชีการชำระเงิน
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,แสดง
 DocType: Sales Invoice Item,Quantity,ปริมาณ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน )
 DocType: Employee Education,Year of Passing,ปีที่ผ่าน
-sites/assets/js/erpnext.min.js +27,In Stock,ในสต็อก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,สามารถชำระเงินกับการสั่งซื้อยังไม่เรียกเก็บขาย
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ในสต็อก
 DocType: Designation,Designation,การแต่งตั้ง
 DocType: Production Plan Item,Production Plan Item,สินค้าแผนการผลิต
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ผู้ใช้ {0} จะถูก กำหนดให้กับ พนักงาน {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,ให้รายละเอียด POS ใหม่
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,การดูแลสุขภาพ
 DocType: Purchase Invoice,Monthly,รายเดือน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,ใบกำกับสินค้า
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ความล่าช้าในการชำระเงิน (วัน)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,ใบกำกับสินค้า
 DocType: Maintenance Schedule Item,Periodicity,การเป็นช่วง ๆ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ที่อยู่อีเมล
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ฝ่ายจำเลย
 DocType: Company,Abbr,ตัวอักษรย่อ
 DocType: Appraisal Goal,Score (0-5),คะแนน (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},แถว {0}: {1} {2} ไม่ตรงกับ {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},แถว {0}: {1} {2} ไม่ตรงกับ {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,แถว # {0}:
 DocType: Delivery Note,Vehicle No,รถไม่มี
-sites/assets/js/erpnext.min.js +55,Please select Price List,เลือกรายชื่อราคา
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,เลือกรายชื่อราคา
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,งานไม้
 DocType: Production Order Operation,Work In Progress,ทำงานในความคืบหน้า
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,การพิมพ์ 3 มิติ
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,docname รายละเอีย
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,กิโลกรัม
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,เปิดงาน
 DocType: Item Attribute,Increment,การเพิ่มขึ้น
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,เลือกคลังสินค้า ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,การโฆษณา
 DocType: Employee,Married,แต่งงาน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
 DocType: Payment Reconciliation,Reconcile,คืนดี
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,ร้านขายของชำ
 DocType: Quality Inspection Reading,Reading 1,Reading 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,ให้ธนาคารเข้า
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ให้ธนาคารเข้า
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,คลังสินค้ามีผลบังคับใช้ถ้าเป็นประเภทบัญชีคลังสินค้า
 DocType: SMS Center,All Sales Person,คนขายทั้งหมด
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,เขียนปิดศูนย
 DocType: Warehouse,Warehouse Detail,รายละเอียดคลังสินค้า
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},วงเงินสินเชื่อที่ได้รับการข้ามสำหรับลูกค้า {0} {1} / {2}
 DocType: Tax Rule,Tax Type,ประเภทภาษี
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},คุณยังไม่ได้ รับอนุญาตให้ เพิ่มหรือปรับปรุง รายการ ก่อนที่ {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},คุณยังไม่ได้ รับอนุญาตให้ เพิ่มหรือปรับปรุง รายการ ก่อนที่ {0}
 DocType: Item,Item Image (if not slideshow),รูปภาพสินค้า (ถ้าไม่สไลด์โชว์)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ชั่วโมงอัตราค่าโทร / 60) * เวลาการดำเนินงานที่เกิดขึ้นจริง
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,แขก
 DocType: Quality Inspection,Get Specification Details,ดูรายละเอียดสเปค
 DocType: Lead,Interested,สนใจ
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,รายการวัสดุ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,การเปิด
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,การเปิด
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},จาก {0} เป็น {1}
 DocType: Item,Copy From Item Group,คัดลอกจากกลุ่มสินค้า
 DocType: Journal Entry,Opening Entry,เปิดรายการ
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,สอบถามสินค้า
 DocType: Standard Reply,Owner,เจ้าของ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,กรุณากรอก บริษัท แรก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,กรุณาเลือก บริษัท แรก
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,กรุณาเลือก บริษัท แรก
 DocType: Employee Education,Under Graduate,ภายใต้บัณฑิต
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,เป้าหมาย ที่
 DocType: BOM,Total Cost,ค่าใช้จ่ายรวม
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,อุปสรรค
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,วัสดุสิ้นเปลือง
 DocType: Upload Attendance,Import Log,นำเข้าสู่ระบบ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ส่ง
+DocType: Sales Invoice Item,Delivered By Supplier,จัดส่งโดยผู้ผลิต
 DocType: SMS Center,All Contact,ติดต่อทั้งหมด
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,เงินเดือนประจำปี
 DocType: Period Closing Voucher,Closing Fiscal Year,ปิดปีงบประมาณ
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,ในทางตรงกันข้า
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,แสดงบันทึกเวลา
 DocType: Journal Entry Account,Credit in Company Currency,เครดิตสกุลเงินใน บริษัท
 DocType: Delivery Note,Installation Status,สถานะการติดตั้ง
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},จำนวนสินค้าที่ผ่านการตรวจรับ + จำนวนสินค้าที่ไม่ผ่านการตรวจรับ จะต้องมีปริมาณเท่ากับ  จำนวน สืนค้าที่ได้รับ สำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},จำนวนสินค้าที่ผ่านการตรวจรับ + จำนวนสินค้าที่ไม่ผ่านการตรวจรับ จะต้องมีปริมาณเท่ากับ  จำนวน สืนค้าที่ได้รับ สำหรับ รายการ {0}
 DocType: Item,Supply Raw Materials for Purchase,วัตถุดิบสำหรับการซื้อวัสดุสิ้นเปลือง
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,รายการ {0} จะต้องมี การสั่งซื้อ สินค้า
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ดาวน์โหลดแม่แบบกรอกข้อมูลที่เหมาะสมและแนบไฟล์ที่ถูกแก้ไข
  ทุกวันและการรวมกันของพนักงานในระยะเวลาที่เลือกจะมาในแม่แบบที่มีการบันทึกการเข้าร่วมที่มีอยู่"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,รายการที่ {0} ไม่ได้ใช้งาน หรือจุดสิ้นสุดของ ชีวิต ได้ถึง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,รายการที่ {0} ไม่ได้ใช้งาน หรือจุดสิ้นสุดของ ชีวิต ได้ถึง
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,จะมีการปรับปรุงหลังจากที่ใบแจ้งหนี้การขายมีการส่ง
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
 DocType: SMS Center,SMS Center,ศูนย์ SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ยืด
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,ป้อนพารา
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,กฎระเบียบ สำหรับการใช้ การกำหนดราคาและ ส่วนลด
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},เวลานี้ความขัดแย้งเข้าสู่ระบบด้วย {0} สำหรับ {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,รายการราคา จะต้องใช้ได้กับ การซื้อ หรือการขาย
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},วันที่ การติดตั้ง ไม่สามารถ ก่อนวันที่ จัดส่ง สินค้า {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},วันที่ การติดตั้ง ไม่สามารถ ก่อนวันที่ จัดส่ง สินค้า {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ส่วนลดราคา Rate (%)
-sites/assets/js/form.min.js +279,Start,เริ่มต้น
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,เริ่มต้น
 DocType: User,First Name,ชื่อแรก
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,การตั้งค่าของคุณเสร็จสมบูรณ์ กำลังปรับปรุง
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,หล่อเต็มแม่พิมพ์
 DocType: Offer Letter,Select Terms and Conditions,เลือกข้อตกลงและเงื่อนไข
 DocType: Production Planning Tool,Sales Orders,ใบสั่งขาย
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,กับใบแจ้งหนี้การขายสินค้า
 ,Production Orders in Progress,สั่งซื้อ การผลิตใน ความคืบหน้า
 DocType: Lead,Address & Contact,ที่อยู่และติดต่อ
+DocType: Leave Allocation,Add unused leaves from previous allocations,เพิ่มใบไม่ได้ใช้จากการจัดสรรก่อนหน้า
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},ที่เกิดขึ้นต่อไป {0} จะถูกสร้างขึ้นบน {1}
 DocType: Newsletter List,Total Subscribers,สมาชิกทั้งหมด
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ชื่อผู้ติดต่อ
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,ดังนั้นรอจำ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,สร้างสลิปเงินเดือนสำหรับเกณฑ์ดังกล่าวข้างต้น
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ขอซื้อ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ที่อยู่อาศัยที่มีเตียงคู่
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,บรรเทา วันที่ ต้องมากกว่า วันที่ เข้าร่วม
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,ใบต่อปี
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,กรุณาตั้งค่าการตั้งชื่อซีรีส์สำหรับ {0} ผ่านการตั้งค่า> การตั้งค่า> การตั้งชื่อซีรีส์
 DocType: Time Log,Will be updated when batched.,จะมีการปรับปรุงเมื่อ batched
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,แถว {0}: โปรดตรวจสอบ 'เป็นล่วงหน้า' กับบัญชี {1} ถ้านี้เป็นรายการล่วงหน้า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,แถว {0}: โปรดตรวจสอบ 'เป็นล่วงหน้า' กับบัญชี {1} ถ้านี้เป็นรายการล่วงหน้า
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},คลังสินค้า {0} ไม่ได้เป็นของ บริษัท {1}
 DocType: Bulk Email,Message,ข่าวสาร
 DocType: Item Website Specification,Item Website Specification,สเปกเว็บไซต์รายการ
 DocType: Dropbox Backup,Dropbox Access Key,ที่สำคัญในการเข้าถึง Dropbox
 DocType: Payment Tool,Reference No,อ้างอิง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ฝากที่ถูกบล็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
 DocType: Stock Entry,Sales Invoice No,ขายใบแจ้งหนี้ไม่มี
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,จำนวนสั่งซื้อขั้
 DocType: Pricing Rule,Supplier Type,ประเภทผู้ผลิต
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,ขอวัสดุ
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
 DocType: Item,Purchase Details,รายละเอียดการซื้อ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},รายการ {0} ไม่พบใน 'วัตถุดิบมา' ตารางในการสั่งซื้อ {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,ควบคุมการ
 DocType: Lead,Suggestions,ข้อเสนอแนะ
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,กำหนดงบประมาณกลุ่มฉลาดรายการในมณฑลนี้ คุณยังสามารถรวมฤดูกาลโดยการตั้งค่าการกระจาย
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},กรุณากรอกตัวอักษรกลุ่มบัญชีผู้ปกครองสำหรับคลังสินค้า {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},การชำระเงินกับ {0} {1} ไม่สามารถจะสูงกว่าจำนวนเงินที่โดดเด่น {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},การชำระเงินกับ {0} {1} ไม่สามารถจะสูงกว่าจำนวนเงินที่โดดเด่น {2}
 DocType: Supplier,Address HTML,ที่อยู่ HTML
 DocType: Lead,Mobile No.,เบอร์มือถือ
 DocType: Maintenance Schedule,Generate Schedule,สร้างตาราง
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,ใหม่ UOM สต็อ
 DocType: Period Closing Voucher,Closing Account Head,ปิดหัวบัญชี
 DocType: Employee,External Work History,ประวัติการทำงานภายนอก
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,คุณต้องการที่จะหยุด
 DocType: Communication,Closed,ปิด
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ในคำพูดของ (ส่งออก) จะปรากฏเมื่อคุณบันทึกหมายเหตุจัดส่งสินค้า
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,คุณแน่ใจหรือว่าต้องการที่จะหยุด
 DocType: Lead,Industry,อุตสาหกรรม
 DocType: Employee,Job Profile,รายละเอียด งาน
 DocType: Newsletter,Newsletter,จดหมายข่าว
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,หมายเหตุจัดส
 DocType: Dropbox Backup,Allow Dropbox Access,ที่อนุญาตให้เข้าถึง Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,การตั้งค่าภาษี
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} เข้ามา เป็นครั้งที่สอง ใน รายการ ภาษี
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} เข้ามา เป็นครั้งที่สอง ใน รายการ ภาษี
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,สรุปในสัปดาห์นี้และกิจกรรมที่ค้างอยู่
 DocType: Workstation,Rent Cost,ต้นทุนการ ให้เช่า
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,กรุณาเลือกเดือนและปี
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,อัตราที่สกุลเงินลูกค้าจะแปลงเป็นสกุลเงินหลักของลูกค้า
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","ที่มีจำหน่ายใน BOM , หมายเหตุ การจัดส่ง ใบแจ้งหนี้ การซื้อ , การผลิต สั่งซื้อ สั่ง ซื้อ รับซื้อ , ขายใบแจ้งหนี้ การขายสินค้า สต็อก เข้า Timesheet"
 DocType: Item Tax,Tax Rate,อัตราภาษี
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,เลือกรายการ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,เลือกรายการ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","รายการ: {0} การจัดการชุดฉลาดไม่สามารถคืนดีใช้ \
  สมานฉันท์หุ้นแทนที่จะใช้เข้าสต็อก"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},แถว # {0}: รุ่นที่ไม่มีจะต้องเป็นเช่นเดียวกับ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,แปลงที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ใบเสร็จรับเงินจะต้องส่ง
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,UOM ต็อกสิน
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,แบทช์ (มาก) ของรายการ
 DocType: C-Form Invoice Detail,Invoice Date,วันที่ออกใบแจ้งหนี้
 DocType: GL Entry,Debit Amount,จำนวนเงินเดบิต
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,ที่อยู่ อีเมลของคุณ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,โปรดดูสิ่งที่แนบมา
 DocType: Purchase Order,% Received,% ที่ได้รับแล้ว
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,คำแนะนำ
 DocType: Quality Inspection,Inspected By,การตรวจสอบโดย
 DocType: Maintenance Visit,Maintenance Type,ประเภทการบำรุงรักษา
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน การจัดส่งสินค้า หมายเหตุ {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน การจัดส่งสินค้า หมายเหตุ {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,รายการพารามิเตอร์การตรวจสอบคุณภาพ
 DocType: Leave Application,Leave Approver Name,ปล่อยให้อนุมัติชื่อ
 ,Schedule Date,กำหนดการ วันที่
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,สั่งซื้อสมัครสมาชิก
 DocType: Landed Cost Item,Applicable Charges,ค่าใช้จ่าย
 DocType: Workstation,Consumable Cost,ค่าใช้จ่ายที่ สิ้นเปลือง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
 DocType: Purchase Receipt,Vehicle Date,วันที่ยานพาหนะ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ทางการแพทย์
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,เหตุผล สำหรับการสูญเสีย
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,% ที่ติดตั้งแล้ว
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,กรุณาใส่ ชื่อของ บริษัท เป็นครั้งแรก
 DocType: BOM,Item Desription,Desription รายการ
 DocType: Purchase Invoice,Supplier Name,ชื่อผู้จัดจำหน่าย
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,อ่านคู่มือ ERPNext
 DocType: Account,Is Group,มีกลุ่ม
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,ตั้งโดยอัตโนมัติอนุกรมเลขที่อยู่บนพื้นฐานของ FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ผู้ตรวจสอบใบแจ้งหนี้จำนวนเอกลักษณ์
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,ผู้จั
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,การตั้งค่าโดยรวม สำหรับกระบวนการผลิตทั้งหมด
 DocType: Accounts Settings,Accounts Frozen Upto,บัญชีถูกแช่แข็งจนถึง
 DocType: SMS Log,Sent On,ส่ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
 DocType: Sales Order,Not Applicable,ไม่สามารถใช้งาน
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,นาย ฮอลิเดย์
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ปั้นเชลล์
 DocType: Material Request Item,Required Date,วันที่ที่ต้องการ
 DocType: Delivery Note,Billing Address,ที่อยู่การเรียกเก็บเงิน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,กรุณากรอก รหัสสินค้า
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,กรุณากรอก รหัสสินค้า
 DocType: BOM,Costing,ต้นทุน
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",หากการตรวจสอบจำนวนเงินภาษีจะถือว่าเป็นรวมอยู่ในอัตราพิมพ์ / จำนวนพิมพ์
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,จำนวนรวม
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),เวลา
 DocType: Customer,Buyer of Goods and Services.,ผู้ซื้อสินค้าและบริการ
 DocType: Journal Entry,Accounts Payable,บัญชีเจ้าหนี้
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,เพิ่มสมาชิก
-sites/assets/js/erpnext.min.js +5,""" does not exists",“ ไม่พบข้อมูล
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“ ไม่พบข้อมูล
 DocType: Pricing Rule,Valid Upto,ที่ถูกต้องไม่เกิน
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,รายการ บางส่วนของ ลูกค้าของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,รายได้ โดยตรง
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",ไม่สามารถกรอง ตาม บัญชี ถ้า จัดกลุ่มตาม บัญชี
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,พนักงานธุรการ
 DocType: Payment Tool,Received Or Paid,ที่ได้รับหรือชำระ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,กรุณาเลือก บริษัท
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,กรุณาเลือก บริษัท
 DocType: Stock Entry,Difference Account,บัญชี ที่แตกต่างกัน
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,ไม่สามารถปิดงานเป็นงานขึ้นอยู่กับ {0} ไม่ได้ปิด
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
 DocType: Production Order,Additional Operating Cost,เพิ่มเติมต้นทุนการดำเนินงาน
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,เครื่องสำอาง
 DocType: DocField,Type,ชนิด
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
 DocType: Communication,Subject,เรื่อง
 DocType: Shipping Rule,Net Weight,ปริมาณสุทธิ
 DocType: Employee,Emergency Phone,โทรศัพท์ ฉุกเฉิน
 ,Serial No Warranty Expiry,อนุกรมหมดอายุไม่มีการรับประกัน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,คุณ ต้องการที่จะ หยุด การร้องขอ วัสดุ นี้
 DocType: Sales Order,To Deliver,ที่จะส่งมอบ
 DocType: Purchase Invoice Item,Item,สินค้า
 DocType: Journal Entry,Difference (Dr - Cr),แตกต่าง ( ดร. - Cr )
 DocType: Account,Profit and Loss,กำไรและ ขาดทุน
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,รับเหมาช่วงการจัดการ
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,รับเหมาช่วงการจัดการ
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,ใหม่ UOM ไม่ ต้องเป็นชนิด ทั้ง จำนวน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,เฟอร์นิเจอร์และ ตารางการแข่งขัน
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,อัตราที่สกุลเงินรายการราคาจะถูกแปลงเป็นสกุลเงินหลักของ บริษัท
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,เพิ่ม / แก
 DocType: Purchase Invoice,Supplier Invoice No,ใบแจ้งหนี้ที่ผู้ผลิตไม่มี
 DocType: Territory,For reference,สำหรับการอ้างอิง
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",ไม่สามารถลบไม่มี Serial {0} เป็นมันถูกนำมาใช้ในการทำธุรกรรมหุ้น
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),ปิด (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),ปิด (Cr)
 DocType: Serial No,Warranty Period (Days),ระยะเวลารับประกัน (วัน)
 DocType: Installation Note Item,Installation Note Item,รายการหมายเหตุการติดตั้ง
 ,Pending Qty,รอดำเนินการจำนวน
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,เรียกเก็บเ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ทำซ้ำลูกค้า
 DocType: Leave Control Panel,Allocate,จัดสรร
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,ก่อน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,ขายกลับ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,ขายกลับ
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,เลือกขายที่คุณต้องการที่จะสร้างคำสั่งการผลิตสั่งซื้อ
+DocType: Item,Delivered by Supplier (Drop Ship),จัดส่งโดยผู้ผลิต (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,ส่วนประกอบเงินเดือน
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ฐานข้อมูลของลูกค้าที่มีศักยภาพ
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,ฐานข้อมูลลูกค้า
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,ไม้ลอย
 DocType: Purchase Order Item,Billed Amt,จำนวนจำนวนมากที่สุด
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,โกดังตรรกะกับที่รายการหุ้นที่ทำ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},ไม่มี การอ้างอิง และการอ้างอิง วันที่ เป็นสิ่งจำเป็นสำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},ไม่มี การอ้างอิง และการอ้างอิง วันที่ เป็นสิ่งจำเป็นสำหรับ {0}
 DocType: Event,Wednesday,วันพุธ
 DocType: Sales Invoice,Customer's Vendor,ผู้ขายของลูกค้า
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,การสั่งซื้อการผลิตบังคับ
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,พารามิเตอร์รับ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' อยู่ ใน ' และ ' จัดกลุ่มตาม ' ต้องไม่เหมือนกัน
 DocType: Sales Person,Sales Person Targets,ขายเป้าหมายคน
-sites/assets/js/form.min.js +271,To,ไปยัง
-apps/frappe/frappe/templates/base.html +143,Please enter email address,กรุณากรอกอีเมล์
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ไปยัง
+apps/frappe/frappe/templates/base.html +145,Please enter email address,กรุณากรอกอีเมล์
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,หลอดสิ้นสุดการขึ้นรูป
 DocType: Production Order Operation,In minutes,ในไม่กี่นาที
 DocType: Issue,Resolution Date,วันที่ความละเอียด
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,ผู้ใช้โครงการ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,ถูกใช้
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ไม่พบในตารางรายละเอียดใบแจ้งหนี้
 DocType: Company,Round Off Cost Center,ออกรอบศูนย์ต้นทุน
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,การบำรุงรักษา ไปที่ {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,การบำรุงรักษา ไปที่ {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 DocType: Material Request,Material Transfer,โอนวัสดุ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),เปิด ( Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},การโพสต์ จะต้องมี การประทับเวลา หลังจาก {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,การตั้งค่า
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ที่ดินภาษีต้นทุนและค่าใช้จ่าย
 DocType: Production Order Operation,Actual Start Time,เวลาเริ่มต้นที่เกิดขึ้นจริง
 DocType: BOM Operation,Operation Time,เปิดบริการเวลา
-sites/assets/js/list.min.js +5,More,ขึ้น
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,ขึ้น
 DocType: Pricing Rule,Sales Manager,ผู้จัดการฝ่ายขาย
-sites/assets/js/desk.min.js +7673,Rename,ตั้งชื่อใหม่
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,ตั้งชื่อใหม่
 DocType: Journal Entry,Write Off Amount,เขียนทันทีจำนวน
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,การดัด
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,อนุญาตให้ผู้ใช้
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ตัดตรง
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,เพื่อติดตามรายการในเอกสารการขายและการซื้อจาก Nos อนุกรมของพวกเขา นี้สามารถใช้ในการติดตามรายละเอียดการรับประกันของผลิตภัณฑ์
 DocType: Purchase Receipt Item Supplied,Current Stock,สต็อกปัจจุบัน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,คลังสินค้า ปฏิเสธ มีผลบังคับใช้ กับ รายการ regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,คลังสินค้า ปฏิเสธ มีผลบังคับใช้ กับ รายการ regected
 DocType: Account,Expenses Included In Valuation,ค่าใช้จ่ายรวมอยู่ในการประเมินมูลค่า
 DocType: Employee,Provide email id registered in company,ให้ ID อีเมลที่ลงทะเบียนใน บริษัท
 DocType: Hub Settings,Seller City,ผู้ขายเมือง
 DocType: Email Digest,Next email will be sent on:,อีเมล์ถัดไปจะถูกส่งเมื่อ:
 DocType: Offer Letter Term,Offer Letter Term,เสนอระยะจดหมาย
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,รายการที่มีสายพันธุ์
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,รายการที่ {0} ไม่พบ
 DocType: Bin,Stock Value,มูลค่าหุ้น
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ประเภท ต้นไม้
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ยินดีต้อนรับ
 DocType: Journal Entry,Credit Card Entry,เข้าบัตรเครดิต
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,ชื่องาน
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,สินค้าที่ได้รับจากผู้จำหน่าย
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,สินค้าที่ได้รับจากผู้จำหน่าย
 DocType: Communication,Open,เปิด
 DocType: Lead,Campaign Name,ชื่อแคมเปญ
 ,Reserved,ที่สงวนไว้
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,คุณต้องการที่จะเปิดจุก
 DocType: Purchase Order,Supply Raw Materials,ซัพพลายวัตถุดิบ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,วันที่ใบแจ้งหนี้ต่อไปจะถูกสร้างขึ้น มันถูกสร้างขึ้นบนส่ง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,สินทรัพย์หมุนเวียน
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,ใบสั่งซื้อของลูกค้าไม่มี
 DocType: Employee,Cell Number,จำนวนเซลล์
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,สูญหาย
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถใส่บัตรกำนัลในปัจจุบัน 'กับอนุทิน' คอลัมน์
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถใส่บัตรกำนัลในปัจจุบัน 'กับอนุทิน' คอลัมน์
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,พลังงาน
 DocType: Opportunity,Opportunity From,โอกาสจาก
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,งบเงินเดือน
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,ความรับผิดชอบ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ตามทำนองคลองธรรมจำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่เรียกร้องในแถว {0}
 DocType: Company,Default Cost of Goods Sold Account,เริ่มต้นค่าใช้จ่ายของบัญชีที่ขายสินค้า
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,ราคา ไม่ได้เลือก
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,ราคา ไม่ได้เลือก
 DocType: Employee,Family Background,ภูมิหลังของครอบครัว
 DocType: Process Payroll,Send Email,ส่งอีเมล์
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,ไม่ได้รับอนุญาต
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,รายการที่มี weightage ที่สูงขึ้นจะแสดงที่สูงขึ้น
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,รายละเอียดการกระทบยอดธนาคาร
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,ใบแจ้งหนี้ของฉัน
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,พบว่า พนักงานที่ ไม่มี
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,พบว่า พนักงานที่ ไม่มี
 DocType: Purchase Order,Stopped,หยุด
 DocType: Item,If subcontracted to a vendor,ถ้าเหมาไปยังผู้ขาย
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,เลือกรายการวัสดุที่จะเริ่มต้น
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,อัพ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ส่งเดี๋ยวนี้
 ,Support Analytics,Analytics สนับสนุน
 DocType: Item,Website Warehouse,คลังสินค้าเว็บไซต์
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,คุณต้องการที่จะหยุดการสั่งซื้อการผลิต:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","วันของเดือนที่ใบแจ้งหนี้อัตโนมัติจะถูกสร้างขึ้นเช่น 05, 28 ฯลฯ"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,คะแนน ต้องน้อยกว่า หรือ เท่ากับ 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C- บันทึก แบบฟอร์ม
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,ค
 DocType: Features Setup,"To enable ""Point of Sale"" features",ต้องการเปิดใช้งาน "จุดขาย" คุณสมบัติ
 DocType: Bin,Moving Average Rate,ย้ายอัตราเฉลี่ย
 DocType: Production Planning Tool,Select Items,เลือกรายการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
 DocType: Comment,Reference Name,ชื่ออ้างอิง
 DocType: Maintenance Visit,Completion Status,สถานะเสร็จ
 DocType: Sales Invoice Item,Target Warehouse,คลังสินค้าเป้าหมาย
 DocType: Item,Allow over delivery or receipt upto this percent,อนุญาตให้ส่งมอบหรือใบเสร็จรับเงินได้ไม่เกินร้อยละนี้
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ ขายสินค้า
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ ขายสินค้า
 DocType: Upload Attendance,Import Attendance,การเข้าร่วมประชุมและนำเข้า
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,ทั้งหมด รายการ กลุ่ม
 DocType: Process Payroll,Activity Log,บันทึกกิจกรรม
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,เขียนข้อความ โดยอัตโนมัติใน การส่ง ของ การทำธุรกรรม
 DocType: Production Order,Item To Manufacture,รายการที่จะผลิต
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,แม่พิมพ์ถาวร
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,การสั่งซื้อที่จะชำระเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} สถานะเป็น {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,การสั่งซื้อที่จะชำระเงิน
 DocType: Sales Order Item,Projected Qty,จำนวนที่คาดการณ์ไว้
 DocType: Sales Invoice,Payment Due Date,วันที่ครบกำหนด ชำระเงิน
 DocType: Newsletter,Newsletter Manager,ผู้จัดการจดหมายข่าว
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,ตัวเลขการขอ
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,ประเมินผลการปฏิบัติ
 DocType: Sales Invoice Item,Stock Details,หุ้นรายละเอียด
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,มูลค่าโครงการ
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,จุดขาย
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},ไม่สามารถดำเนินการ ไปข้างหน้า {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,จุดขาย
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},ไม่สามารถดำเนินการ ไปข้างหน้า {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",ยอดเงินในบัญชีแล้วในเครดิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เดบิต'
 DocType: Account,Balance must be,จะต้องมี ความสมดุล
 DocType: Hub Settings,Publish Pricing,เผยแพร่ราคา
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
 ,Received Items To Be Billed,รายการที่ได้รับจะถูกเรียกเก็บเงิน
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,พ่นขัด
-sites/assets/js/desk.min.js +3938,Ms,ms
+DocType: Employee,Ms,ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,นาย อัตรา แลกเปลี่ยนเงินตราต่างประเทศ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
 DocType: Production Order,Plan material for sub-assemblies,วัสดุแผนประกอบย่อย
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,เทือกเขา
 DocType: Supplier,Default Payable Accounts,บัญชีเจ้าหนี้เริ่มต้น
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
 DocType: Features Setup,Item Barcode,บาร์โค้ดสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ใบแจ้งหนี้การซื้อล่วงหน้า
 DocType: Address,Shop,ร้านค้า
 DocType: Hub Settings,Sync Now,ซิงค์เดี๋ยวนี้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},แถว {0}: รายการเครดิตไม่สามารถเชื่อมโยงกับ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},แถว {0}: รายการเครดิตไม่สามารถเชื่อมโยงกับ {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,เริ่มต้นบัญชีธนาคาร / เงินสดจะถูกปรับปรุงโดยอัตโนมัติในใบแจ้งหนี้ POS เมื่อโหมดนี้ถูกเลือก
 DocType: Employee,Permanent Address Is,ที่อยู่ ถาวร เป็น
 DocType: Production Order Operation,Operation completed for how many finished goods?,การดำเนินการเสร็จสมบูรณ์สำหรับวิธีการหลายสินค้าสำเร็จรูป?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ยี่ห้อ
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
 DocType: Employee,Exit Interview Details,ออกจากรายละเอียดการสัมภาษณ์
 DocType: Item,Is Purchase Item,รายการซื้อเป็น
 DocType: Journal Entry Account,Purchase Invoice,ซื้อใบแจ้งหนี้
 DocType: Stock Ledger Entry,Voucher Detail No,รายละเอียดบัตรกำนัลไม่มี
 DocType: Stock Entry,Total Outgoing Value,มูลค่าที่ส่งออกทั้งหมด
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,เปิดวันที่และวันปิดควรจะอยู่ในปีงบประมาณเดียวกัน
 DocType: Lead,Request for Information,การร้องขอข้อมูล
 DocType: Payment Tool,Paid,ชำระ
 DocType: Salary Slip,Total in words,รวมอยู่ในคำพูด
 DocType: Material Request Item,Lead Time Date,นำวันเวลา
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,มีผลบังคับใช้ บางทีบันทึกแลกเปลี่ยนเงินตราต่างประเทศที่ไม่ได้สร้างขึ้นสำหรับ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},แถว # {0}: โปรดระบุหมายเลขเครื่องกับรายการ {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","สำหรับรายการ 'Bundle สินค้า, คลังสินค้า, ไม่มี Serial และรุ่นที่จะไม่ได้รับการพิจารณาจาก' บรรจุรายชื่อ 'ตาราง ถ้าคลังสินค้าและรุ่นที่ไม่มีเหมือนกันสำหรับรายการที่บรรจุทั้งหมดรายการใด ๆ 'Bundle สินค้า' ค่าเหล่านั้นสามารถป้อนในตารางรายการหลักค่าจะถูกคัดลอกไปบรรจุรายชื่อ 'ตาราง"
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,จัดส่งให้กับลูกค้า
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,จัดส่งให้กับลูกค้า
 DocType: Purchase Invoice Item,Purchase Order Item,สั่งซื้อสินค้าสั่งซื้อ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,รายได้ ทางอ้อม
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,ระบุจำนวนเงินที่ชำระ = จำนวนเงินที่โดดเด่น
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,ที่อยู่บรรทั
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,ความแปรปรวน
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ชื่อ บริษัท
 DocType: SMS Center,Total Message(s),ข้อความ รวม (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ดูรายการทั้งหมดวิดีโอความช่วยเหลือที่
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,เลือกหัวที่บัญชีของธนาคารที่ตรวจสอบถูกวาง
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ช่วยให้ผู้ใช้ในการแก้ไขอัตราราคาปกติในการทำธุรกรรม
 DocType: Pricing Rule,Max Qty,แม็กซ์ จำนวน
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,แถว {0}: การชำระเงินกับการขาย / การสั่งซื้อควรจะทำเครื่องหมายเป็นล่วงหน้า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,แถว {0}: การชำระเงินกับการขาย / การสั่งซื้อควรจะทำเครื่องหมายเป็นล่วงหน้า
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,สารเคมี
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
 DocType: Process Payroll,Select Payroll Year and Month,เลือกเงินเดือนปีและเดือน
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",ไปที่กลุ่มที่เหมาะสม (โดยปกติแอพลิเคชันของกองทุน> สินทรัพย์หมุนเวียน> บัญชีธนาคารและสร้างบัญชีใหม่ (โดยการคลิกที่เพิ่มเด็ก) ประเภท "ธนาคาร"
 DocType: Workstation,Electricity Cost,ค่าใช้จ่าย ไฟฟ้า
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ข
 DocType: SMS Center,All Lead (Open),ช่องทางทั้งหมด (เปิด)
 DocType: Purchase Invoice,Get Advances Paid,รับเงินทดรองจ่าย
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,แนบ รูปของคุณ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,ทำ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ทำ
 DocType: Journal Entry,Total Amount in Words,จำนวนเงินทั้งหมดในคำ
 DocType: Workflow State,Stop,หยุด
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,เกิดข้อผิดพลาด น่าจะเป็น เหตุผลหนึ่งที่ อาจ เป็นไปได้ว่า คุณ ยังไม่ได้บันทึก ในรูปแบบ โปรดติดต่อ support@erpnext.com ถ้า ปัญหายังคงอยู่
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,บรรจุรายการ
 DocType: POS Profile,Cash/Bank Account,เงินสด / บัญชีธนาคาร
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
 DocType: Delivery Note,Delivery To,เพื่อจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
 DocType: Production Planning Tool,Get Sales Orders,รับการสั่งซื้อการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ไม่สามารถเป็นจำนวนลบได้
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ยื่น
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',จะมีก
 DocType: Project,Internal,ภายใน
 DocType: Task,Urgent,ด่วน
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},โปรดระบุ ID แถวที่ถูกต้องสำหรับแถว {0} ในตาราง {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ไปที่สก์ท็อปและเริ่มต้นใช้ ERPNext
 DocType: Item,Manufacturer,ผู้ผลิต
 DocType: Landed Cost Item,Purchase Receipt Item,ซื้อสินค้าใบเสร็จรับเงิน
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,คลังสินค้าสำรองในการขายการสั่งซื้อ / โกดังสินค้าสำเร็จรูป
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,ปริมาณการขาย
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,บันทึกเวลา
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,คุณเป็น ผู้อนุมัติ ค่าใช้จ่าย สำหรับการ บันทึก นี้ กรุณา อัปเดต 'สถานะ ' และ ประหยัด
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,คุณเป็น ผู้อนุมัติ ค่าใช้จ่าย สำหรับการ บันทึก นี้ กรุณา อัปเดต 'สถานะ ' และ ประหยัด
 DocType: Serial No,Creation Document No,การสร้าง เอกสาร ไม่มี
 DocType: Issue,Issue,ปัญหา
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","คุณสมบัติสำหรับความหลากหลายของสินค้า เช่นขนาด, สี ฯลฯ"
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,กับ
 DocType: Item,Default Selling Cost Center,ขาย เริ่มต้นที่ ศูนย์ต้นทุน
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
 DocType: Opportunity,Contact Info,ข้อมูลการติดต่อ
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,ทำรายการสต็อก
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,ทำรายการสต็อก
 DocType: Packing Slip,Net Weight UOM,UOM น้ำหนักสุทธิ
 DocType: Item,Default Supplier,ผู้ผลิตเริ่มต้น
 DocType: Manufacturing Settings,Over Production Allowance Percentage,การผลิตกว่าร้อยละค่าเผื่อ
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,เบ็ดเตล็ด
 DocType: Holiday List,Get Weekly Off Dates,รับวันปิดสัปดาห์
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,วันที่สิ้นสุด ไม่สามารถ จะน้อยกว่า วันเริ่มต้น
 DocType: Sales Person,Select company name first.,เลือกชื่อ บริษัท แรก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,ดร
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,ดร
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ใบเสนอราคาที่ได้รับจากผู้จัดจำหน่าย
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},เพื่อ {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,อัปเดตผ่านทางบันทึกเวลา
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,เลขทะเบียน บริษัท สำหรับการอ้างอิงของคุณ ตัวเลขภาษี ฯลฯ
 DocType: Sales Partner,Distributor,ผู้จัดจำหน่าย
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,รถเข็นกฎการจัดส่งสินค้า
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 ,Ordered Items To Be Billed,รายการที่สั่งซื้อจะเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,จากช่วงจะต้องมีน้อยกว่าในช่วง
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,เลือกบันทึกเวลา และส่งมาเพื่อสร้างเป็นใบแจ้งหนี้การขายใหม่
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ภา
 DocType: Lead,Lead,ช่องทาง
 DocType: Email Digest,Payables,เจ้าหนี้
 DocType: Account,Warehouse,คลังสินค้า
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,แถว # {0}: ปฏิเสธจำนวนไม่สามารถเข้าไปอยู่ในการซื้อกลับ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,แถว # {0}: ปฏิเสธจำนวนไม่สามารถเข้าไปอยู่ในการซื้อกลับ
 ,Purchase Order Items To Be Billed,รายการใบสั่งซื้อที่จะได้รับจำนวนมากที่สุด
 DocType: Purchase Invoice Item,Net Rate,อัตราการสุทธิ
 DocType: Purchase Invoice Item,Purchase Invoice Item,สั่งซื้อสินค้าใบแจ้งหนี้
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,รายละเ
 DocType: Global Defaults,Current Fiscal Year,ปีงบประมาณปัจจุบัน
 DocType: Global Defaults,Disable Rounded Total,ปิดการใช้งานรวมโค้ง
 DocType: Lead,Call,โทรศัพท์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},แถว ที่ซ้ำกัน {0} ด้วย เหมือนกัน {1}
 ,Trial Balance,งบทดลอง
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,การตั้งค่าพนักงาน
-sites/assets/js/erpnext.min.js +5,"Grid ""","ตาราง """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,การตั้งค่าพนักงาน
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","ตาราง """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,กรุณาเลือก คำนำหน้า เป็นครั้งแรก
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,การวิจัย
 DocType: Maintenance Visit Purpose,Work Done,งานที่ทำ
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,ส่ง
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,ดู บัญชีแยกประเภท
 DocType: File,Lft,ซ้าย
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
 DocType: Communication,Delivery Status,สถานะการจัดส่งสินค้า
 DocType: Production Order,Manufacture against Sales Order,การผลิตกับการสั่งซื้อการขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,ส่วนที่เหลือ ของโลก
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,ส่วนที่เหลือ ของโลก
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,รายการ {0} ไม่สามารถมีแบทช์
 ,Budget Variance Report,รายงานความแปรปรวนของงบประมาณ
 DocType: Salary Slip,Gross Pay,จ่ายขั้นต้น
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,การจ่ายเงินปันผล
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,บัญชีแยกประเภท
 DocType: Stock Reconciliation,Difference Amount,ความแตกต่างจำนวน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,กำไรสะสม
 DocType: BOM Item,Item Description,รายละเอียดสินค้า
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,รายการโอกาส
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,เปิดชั่วคราว
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,ยอดคงเหลือพนักงานออก
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},ยอดคงเหลือ บัญชี {0} จะต้อง {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},ยอดคงเหลือ บัญชี {0} จะต้อง {1}
 DocType: Address,Address Type,ประเภทของที่อยู่
 DocType: Purchase Receipt,Rejected Warehouse,คลังสินค้าปฏิเสธ
 DocType: GL Entry,Against Voucher,กับบัตรกำนัล
 DocType: Item,Default Buying Cost Center,ศูนย์รายจ่ายการซื้อเริ่มต้น
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",เพื่อให้ได้สิ่งที่ดีที่สุดของ ERPNext เราขอแนะนำให้คุณใช้เวลาในการดูวิดีโอเหล่านี้ช่วย
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,รายการ {0} จะต้องมี รายการ ขาย
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,ไปยัง
 DocType: Item,Lead Time in days,ระยะเวลาในวันที่
 ,Accounts Payable Summary,สรุปบัญชีเจ้าหนี้
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},ได้รับอนุญาตให้ แก้ไข บัญชี แช่แข็ง {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},ได้รับอนุญาตให้ แก้ไข บัญชี แช่แข็ง {0}
 DocType: Journal Entry,Get Outstanding Invoices,รับใบแจ้งหนี้ค้าง
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,สถานที่ได้รับการรับรอง
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,สัญญา
 DocType: Report,Disabled,พิการ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},ปัจจัย Coversion UOM จำเป็นสำหรับ UOM: {0} ในรายการ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},ปัจจัย Coversion UOM จำเป็นสำหรับ UOM: {0} ในรายการ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ค่าใช้จ่าย ทางอ้อม
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,แถว {0}: จำนวนมีผลบังคับใช้
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,การเกษตร
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,โหมดของการชำร
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,กลุ่มนี้เป็นกลุ่ม รายการที่ ราก และ ไม่สามารถแก้ไขได้
 DocType: Journal Entry Account,Purchase Order,ใบสั่งซื้อ
 DocType: Warehouse,Warehouse Contact Info,ข้อมูลการติดต่อคลังสินค้า
-sites/assets/js/form.min.js +190,Name is required,ชื่อจะต้อง
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,ชื่อจะต้อง
 DocType: Purchase Invoice,Recurring Type,ประเภทที่เกิดขึ้น
 DocType: Address,City/Town,เมือง / จังหวัด
 DocType: Email Digest,Annual Income,รายได้ต่อปี
 DocType: Serial No,Serial No Details,รายละเอียดหมายเลขเครื่อง
 DocType: Purchase Invoice Item,Item Tax Rate,อัตราภาษีสินค้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,อุปกรณ์ ทุน
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,เป้าหมาย
 DocType: Sales Invoice Item,Edit Description,แก้ไขรายละเอียด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,วันที่จัดส่งสินค้าที่คาดว่าจะน้อยกว่าวันเริ่มต้นการวางแผน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,สำหรับ ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,สำหรับ ผู้ผลิต
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ประเภทบัญชีการตั้งค่าช่วยในการเลือกบัญชีนี้ในการทำธุรกรรม
 DocType: Purchase Invoice,Grand Total (Company Currency),แกรนด์รวม (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ขาออกทั้งหมด
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","มีเพียงสามารถเป็น สภาพ กฎ การจัดส่งสินค้า ที่มี 0 หรือ ค่าว่าง สำหรับ "" ค่า """
 DocType: Authorization Rule,Transaction,การซื้อขาย
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,หมายเหตุ : ศูนย์ต้นทุน นี้เป็น กลุ่ม ไม่สามารถสร้าง รายการบัญชี กับ กลุ่ม
-apps/erpnext/erpnext/config/projects.py +43,Tools,เครื่องมือ
+apps/frappe/frappe/config/desk.py +7,Tools,เครื่องมือ
 DocType: Item,Website Item Groups,กลุ่มรายการเว็บไซต์
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,จำนวนการสั่งซื้อการผลิตมีผลบังคับใช้สำหรับวัตถุประสงค์หุ้นรายการผลิต
 DocType: Purchase Invoice,Total (Company Currency),รวม (บริษัท สกุลเงิน)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,ชื่อเวิร์กสเตช
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ส่งอีเมล์หัวข้อสำคัญ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
 DocType: Sales Partner,Target Distribution,การกระจายเป้าหมาย
-sites/assets/js/desk.min.js +7652,Comments,ความเห็น
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,ความเห็น
 DocType: Salary Slip,Bank Account No.,เลขที่บัญชีธนาคาร
 DocType: Naming Series,This is the number of the last created transaction with this prefix,นี่คือหมายเลขของรายการที่สร้างขึ้นล่าสุดกับคำนำหน้านี้
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},อัตรา การประเมิน ที่จำเป็นสำหรับ รายการ {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,กรุณ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,สิทธิ ออก
 DocType: Purchase Invoice,Supplier Invoice Date,วันที่ใบแจ้งหนี้ผู้จัดจำหน่าย
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,คุณจำเป็นต้องเปิดการใช้งานรถเข็น
-sites/assets/js/form.min.js +212,No Data,ไม่มีข้อมูล
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,ไม่มีข้อมูล
 DocType: Appraisal Template Goal,Appraisal Template Goal,เป้าหมายเทมเพลทประเมิน
 DocType: Salary Slip,Earning,รายได้
 DocType: Payment Tool,Party Account Currency,พรรคบัญชีเงินฝากเงินตรา
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,พรรคบัญชีเง
 DocType: Purchase Taxes and Charges,Add or Deduct,เพิ่มหรือหัก
 DocType: Company,If Yearly Budget Exceeded (for expense account),ถ้างบประมาณประจำปีเกิน (สำหรับบัญชีค่าใช้จ่าย)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,เงื่อนไข ที่ทับซ้อนกัน ระหว่าง พบ :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,กับอนุทิน {0} จะถูกปรับแล้วกับบางบัตรกำนัลอื่น ๆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,กับอนุทิน {0} จะถูกปรับแล้วกับบางบัตรกำนัลอื่น ๆ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,มูลค่าการสั่งซื้อทั้งหมด
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,อาหาร
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ช่วงสูงอายุ 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,ไม่มีการเข้าชม
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",จดหมายข่าวไปยังรายชื่อนำไปสู่
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},สกุลเงินของบัญชีจะต้องปิด {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ผลรวมของคะแนนสำหรับเป้าหมายทั้งหมดควรจะเป็น 100 มันเป็น {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,การดำเนินงานที่ไม่สามารถปล่อยให้ว่างไว้
 ,Delivered Items To Be Billed,รายการที่ส่งไปถูกเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,คลังสินค้า ไม่สามารถ เปลี่ยนเป็น เลข อนุกรม
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},สถานะ การปรับปรุงเพื่อ {0}
 DocType: DocField,Description,ลักษณะ
 DocType: Authorization Rule,Average Discount,ส่วนลดโดยเฉลี่ย
 DocType: Letter Head,Is Default,เป็นค่าเริ่มต้น
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,จำนวนภาษีรา
 DocType: Item,Maintain Stock,รักษาสต็อก
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,รายการสต็อกที่สร้างไว้แล้วสำหรับการสั่งซื้อการผลิต
 DocType: Leave Control Panel,Leave blank if considered for all designations,เว้นไว้หากพิจารณากำหนดทั้งหมด
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},แม็กซ์: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,จาก Datetime
 DocType: Email Digest,For Company,สำหรับ บริษัท
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,การจัดส่งสิ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ผังบัญชี
 DocType: Material Request,Terms and Conditions Content,ข้อตกลงและเงื่อนไขเนื้อหา
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ไม่สามารถจะมากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,สถานะการรับ
 DocType: GL Entry,GL Entry,รายการ GL
 DocType: HR Settings,Employee Settings,การตั้งค่า การทำงานของพนักงาน
 ,Batch-Wise Balance History,ชุดฉลาดประวัติยอดคงเหลือ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,รายการสิ่งที่ต้องทำ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,รายการสิ่งที่ต้องทำ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,เด็กฝึกงาน
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,จำนวน เชิงลบ ไม่ได้รับอนุญาต
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,สำนักงาน ให้เช่า
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,การตั้งค่าการติดตั้งเกตเวย์ SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,นำเข้า ล้มเหลว
-sites/assets/js/erpnext.min.js +24,No address added yet.,ที่อยู่ไม่เพิ่มเลย
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ที่อยู่ไม่เพิ่มเลย
 DocType: Workstation Working Hour,Workstation Working Hour,เวิร์คสเตชั่ชั่วโมงการทำงาน
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,นักวิเคราะห์
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับจำนวนเงินที่ JV {2}
 DocType: Item,Inventory,รายการสินค้า
 DocType: Features Setup,"To enable ""Point of Sale"" view",ต้องการเปิดใช้งาน "จุดขาย" มุมมอง
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,การชำระเงินไม่สามารถทำรถว่างเปล่า
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,การชำระเงินไม่สามารถทำรถว่างเปล่า
 DocType: Item,Sales Details,รายละเอียดการขาย
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ปักหมุด
 DocType: Opportunity,With Items,กับรายการ
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",วันที่ใบแจ้งหนี้ต่อไปจะถูกสร้างขึ้น มันถูกสร้างขึ้นบนส่ง
 DocType: Item Attribute,Item Attribute,รายการแอตทริบิวต์
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,รัฐบาล
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,รายการที่แตกต่าง
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,รายการที่แตกต่าง
 DocType: Company,Services,การบริการ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),รวม ({0})
 DocType: Cost Center,Parent Cost Center,ศูนย์ต้นทุนผู้ปกครอง
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,วันเริ่มต้น ปี การเงิน
 DocType: Employee External Work History,Total Experience,ประสบการณ์รวม
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย
 DocType: Material Request Item,Sales Order No,สั่งซื้อยอดขาย
 DocType: Item Group,Item Group Name,ชื่อกลุ่มสินค้า
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,ยึด
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ยึด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,วัสดุการโอนเงินสำหรับการผลิต
 DocType: Pricing Rule,For Price List,สำหรับราคาตามรายการ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,การค้นหา ผู้บริหาร
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,ตารางเวลา
 DocType: Purchase Invoice Item,Net Amount,ปริมาณสุทธิ
 DocType: Purchase Order Item Supplied,BOM Detail No,รายละเอียด BOM ไม่มี
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),จำนวนส่วนลดเพิ่มเติม (สกุลเงิน บริษัท )
-DocType: Period Closing Voucher,CoA Help,ช่วยเหลือ CoA
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},ข้อผิดพลาด: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},ข้อผิดพลาด: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,กรุณาสร้างบัญชีใหม่ จากผังบัญชี
 DocType: Maintenance Visit,Maintenance Visit,ชมการบำรุงรักษา
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ลูกค้า> กลุ่มลูกค้า> มณฑล
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Landed ช่วยเหลือ
 DocType: Event,Tuesday,วันอังคาร
 DocType: Leave Block List,Block Holidays on important days.,วันหยุดที่ถูกบล็อกในวันสำคัญ
 ,Accounts Receivable Summary,สรุปบัญชีลูกหนี้
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ใบสำหรับประเภท {0} จัดสรรแล้วสำหรับพนักงาน {1} สำหรับรอบระยะเวลา {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,กรุณาตั้งค่าข้อมูลรหัสผู้ใช้ในการบันทึกพนักงานที่จะตั้งบทบาทของพนักงาน
 DocType: UOM,UOM Name,ชื่อ UOM
 DocType: Top Bar Item,Target,เป้า
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,เป้าหมายยอดข
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},รายการบัญชีสำหรับ {0} สามารถทำได้ในสกุลเงิน: {1}
 DocType: Pricing Rule,Pricing Rule,กฎ การกำหนดราคา
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,วัสดุขอใบสั่งซื้อ
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,วัสดุขอใบสั่งซื้อ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},แถว # {0}: กลับรายการ {1} ไม่อยู่ใน {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,บัญชีธนาคาร
 ,Bank Reconciliation Statement,งบกระทบยอดธนาคาร
 DocType: Address,Lead Name,ชื่อช่องทาง
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,เปิดหุ้นคงเหลือ
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,เปิดหุ้นคงเหลือ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ต้องปรากฏเพียงครั้งเดียว
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ไม่อนุญาตให้โอนมากขึ้น {0} กว่า {1} กับใบสั่งซื้อ {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},ใบ จัดสรร ประสบความสำเร็จ ในการ {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},ใบ จัดสรร ประสบความสำเร็จ ในการ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ไม่มี รายการ ที่จะแพ็ค
 DocType: Shipping Rule Condition,From Value,จากมูลค่า
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,จำนวนเงินไม่ได้สะท้อนให้เห็นในธนาคาร
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,การเรียกร้องค่าใช้จ่ายของ บริษัท
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,เบอร์มือถือไม
 DocType: Production Planning Tool,Select Sales Orders,เลือกคำสั่งซื้อขาย
 ,Material Requests for which Supplier Quotations are not created,ขอ วัสดุ ที่ ใบเสนอราคา ของผู้ผลิต ไม่ได้สร้างขึ้น
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,เพื่อติดตามรายการโดยใช้บาร์โค้ด คุณจะสามารถป้อนรายการในหมายเหตุจัดส่งสินค้าและขายใบแจ้งหนี้โดยการสแกนบาร์โค้ดของรายการ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,มาร์คส่ง
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ทำให้ใบเสนอราคา
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ลองวางแผน X วันล่วงหน้า
 DocType: HR Settings,Stop Birthday Reminders,หยุด วันเกิด การแจ้งเตือน
 DocType: SMS Center,Receiver List,รายชื่อผู้รับ
 DocType: Payment Tool Detail,Payment Amount,จำนวนเงินที่ชำระ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,บริโภคจํานวนเงิน
-sites/assets/js/erpnext.min.js +51,{0} View,{0} ดู
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ดู
 DocType: Salary Structure Deduction,Salary Structure Deduction,หักโครงสร้างเงินเดือน
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,เผาเลเซอร์เลือก
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,นำ ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ค่าใช้จ่ายของรายการที่ออก
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,เริ่มต้นเจ้าห
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",การตั้งค่าสำหรับตะกร้าช้อปปิ้งออนไลน์เช่นกฎการจัดส่งรายการราคา ฯลฯ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,การติดตั้ง เสร็จสมบูรณ์
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% เรียกเก็บเงิน
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,สงวนไว้ จำนวน
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,สงวนไว้ จำนวน
 DocType: Party Account,Party Account,บัญชีพรรค
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,ทรัพยากรบุคคล
 DocType: Lead,Upper Income,รายได้บน
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,เปิดการใช้งานรถเข็น
 DocType: Employee,Permanent Address,ที่อยู่ถาวร
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,รายการ {0} จะต้องมี รายการ บริการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",จ่ายเงินล่วงหน้ากับ {0} {1} ไม่สามารถมากขึ้น \ กว่าแกรนด์รวม {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,กรุณา เลือกรหัส สินค้า
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),ลดการหักออกโดยไม่จ่าย (LWP)
 DocType: Territory,Territory Manager,ผู้จัดการดินแดน
+DocType: Delivery Note Item,To Warehouse (Optional),คลังสินค้า (อุปกรณ์เสริม)
 DocType: Sales Invoice,Paid Amount (Company Currency),จำนวนเงินที่จ่าย (บริษัท สกุล)
 DocType: Purchase Invoice,Additional Discount,ส่วนลดเพิ่มเติม
 DocType: Selling Settings,Selling Settings,ตั้งค่าระบบการขาย
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,การทำเหมืองแร่
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,การหล่อเรซิ่น
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,กรุณาเลือก {0} ครั้งแรก
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,กรุณาเลือก {0} ครั้งแรก
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},ข้อความ {0}
 DocType: Territory,Parent Territory,ดินแดนปกครอง
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,หมายเลขชุด
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,อนุญาตให้หลายคำสั่งขายกับการสั่งซื้อของลูกค้า
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,หลัก
 DocType: DocPerm,Delete,ลบ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,ตัวแปร
-sites/assets/js/desk.min.js +7971,New {0},ใหม่ {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,ตัวแปร
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},ใหม่ {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,เพื่อ หยุด ไม่สามารถยกเลิกได้ เปิดจุก ที่จะยกเลิก
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี​​้หรือแม่แบบของมัน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,เพื่อ หยุด ไม่สามารถยกเลิกได้ เปิดจุก ที่จะยกเลิก
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี​​้หรือแม่แบบของมัน
 DocType: Employee,Leave Encashed?,ฝาก Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,โอกาสจากข้อมูลมีผลบังคับใช้
 DocType: Item,Variants,สายพันธุ์
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,ประเทศ
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,ที่อยู่
 DocType: Communication,Received,ที่ได้รับ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ซ้ำ หมายเลขเครื่อง ป้อนสำหรับ รายการ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,เงื่อนไขสำหรับกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,รายการสินค้าที่ไม่ได้รับอนุญาตให้มีการสั่งซื้อการผลิต
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,ประณม
 DocType: Communication,Rejected,ปฏิเสธ
 DocType: Pricing Rule,Brand,ยี่ห้อ
 DocType: Item,Will also apply for variants,นอกจากนี้ยังจะใช้สำหรับสายพันธุ์
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% ที่จัดส่งแล้ว
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,กำรายการในเวลาของการขาย
 DocType: Sales Order Item,Actual Qty,จำนวนที่เกิดขึ้นจริง
 DocType: Sales Invoice Item,References,อ้างอิง
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,การตัด
 DocType: Item,Has Variants,มีหลากหลายรูปแบบ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,คลิกที่ 'ให้ขายใบแจ้งหนี้' เพื่อสร้างใบแจ้งหนี้การขายใหม่
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,ระยะเวลาและระยะเวลาจากวันที่การบังคับใช้สำหรับ% s ที่เกิดขึ้น
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,บรรจุภัณฑ์และการติดฉลาก
 DocType: Monthly Distribution,Name of the Monthly Distribution,ชื่อของการกระจายรายเดือน
 DocType: Sales Person,Parent Sales Person,ผู้ปกครองคนขาย
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,โปรดระบุ สกุลเงิน เริ่มต้นใน บริษัท โท และ เริ่มต้น ทั่วโลก
 DocType: Dropbox Backup,Dropbox Access Secret,ความลับในการเข้าถึง Dropbox
 DocType: Purchase Invoice,Recurring Invoice,ใบแจ้งหนี้ที่เกิดขึ้นประจำ
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,การจัดการโครงการ
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,การจัดการโครงการ
 DocType: Supplier,Supplier of Goods or Services.,ผู้ผลิตสินค้าหรือบริการ
 DocType: Budget Detail,Fiscal Year,ปีงบประมาณ
 DocType: Cost Center,Budget,งบ
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,การขาย
 DocType: Employee,Salary Information,ข้อมูลเงินเดือน
 DocType: Sales Person,Name and Employee ID,ชื่อและลูกจ้าง ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
 DocType: Website Item Group,Website Item Group,กลุ่มสินค้าเว็บไซต์
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,หน้าที่ และภาษี
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} รายการชำระเงินไม่สามารถกรองโดย {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} รายการชำระเงินไม่สามารถกรองโดย {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ตารางสำหรับรายการที่จะแสดงในเว็บไซต์
 DocType: Purchase Order Item Supplied,Supplied Qty,จำหน่ายจำนวน
 DocType: Material Request Item,Material Request Item,รายการวัสดุขอ
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,ต้นไม
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,ไม่ สามารถดู จำนวน แถว มากกว่าหรือ เท่ากับจำนวน แถวปัจจุบัน ค่าใช้จ่าย สำหรับประเภท นี้
 ,Item-wise Purchase History,ประวัติการซื้อสินค้าที่ชาญฉลาด
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,สีแดง
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},กรุณา คลิกที่ 'สร้าง ตาราง ' เพื่อ เรียก หมายเลขเครื่อง เพิ่มสำหรับ รายการ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},กรุณา คลิกที่ 'สร้าง ตาราง ' เพื่อ เรียก หมายเลขเครื่อง เพิ่มสำหรับ รายการ {0}
 DocType: Account,Frozen,แช่แข็ง
 ,Open Production Orders,สั่ง เปิด การผลิต
 DocType: Installation Note,Installation Time,เวลาติดตั้ง
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญ​​ชีลูกหนี้
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",ในขณะที่ การผลิต สามารถสั่ง ทำ สำหรับรายการ นี้จะต้อง เป็นรายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",ในขณะที่ การผลิต สามารถสั่ง ทำ สำหรับรายการ นี้จะต้อง เป็นรายการ สต็อก
 DocType: Shipping Rule Condition,Shipping Amount,จำนวนการจัดส่งสินค้า
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,การร่วม
 DocType: Authorization Rule,Above Value,สูงกว่าค่า
 ,Pending Amount,จำนวนเงินที่ รอดำเนินการ
 DocType: Purchase Invoice Item,Conversion Factor,ปัจจัยการเปลี่ยนแปลง
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,ส่ง
+DocType: Purchase Order,Delivered,ส่ง
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),การตั้งค่า เซิร์ฟเวอร์ขาเข้า สำหรับงาน อีเมล์ ของคุณ (เช่น jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,จำนวนยานพาหนะ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,วันที่ใบแจ้งหนี้ที่เกิดขึ้นจะถูกหยุด
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,กระจายค
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,บัญชี {0} ต้องเป็นชนิด ' สินทรัพย์ถาวร ' เป็น รายการ {1} เป็น รายการสินทรัพย์
 DocType: HR Settings,HR Settings,การตั้งค่าทรัพยากรบุคคล
 apps/frappe/frappe/config/setup.py +130,Printing,การพิมพ์
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,ค่าใช้จ่ายที่ เรียกร้อง คือการ รอการอนุมัติ เพียง แต่ผู้อนุมัติ ค่าใช้จ่าย สามารถอัปเดต สถานะ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ค่าใช้จ่ายที่ เรียกร้อง คือการ รอการอนุมัติ เพียง แต่ผู้อนุมัติ ค่าใช้จ่าย สามารถอัปเดต สถานะ
 DocType: Purchase Invoice,Additional Discount Amount,จำนวนส่วนลดเพิ่มเติม
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,วัน(s) ที่ คุณจะใช้สำหรับ การลา เป็น วันหยุด คุณไม่จำเป็นต้อง ใช้สำหรับการ ออก
-sites/assets/js/desk.min.js +7805,and,และ
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,และ
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,กีฬา
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,ใบเสนอราคา
 DocType: Salary Slip,Total Deduction,หักรวม
 DocType: Quotation,Maintenance User,ผู้ใช้งานบำรุงรักษา
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,คุณแน่ใจหรือว่าต้องการที่จะเปิดจุก
 DocType: Employee,Date of Birth,วันเกิด
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,รายการ {0} ได้รับ กลับมา แล้ว
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ปีงบประมาณ ** หมายถึงปีทางการเงิน ทุกรายการบัญชีและการทำธุรกรรมอื่น ๆ ที่สำคัญมีการติดตามต่อปี ** ** การคลัง
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ติดตามงานส่งเสริมการขาย ติดตามช่องทาง ใบเสนอราคา ใบสั่งขายต่างๆ ฯลฯ จากงานส่งเสริมการตลาดเพื่อวัดอัตราผลตอบแทนจากการลงทุน
 DocType: Expense Claim,Approver,อนุมัติ
 ,SO Qty,ดังนั้น จำนวน
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",รายการสต็อกที่มีอยู่กับคลังสินค้า {0} ด้วยเหตุนี้คุณจะไม่สามารถกำหนดหรือปรับเปลี่ยนคลังสินค้า
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",รายการสต็อกที่มีอยู่กับคลังสินค้า {0} ด้วยเหตุนี้คุณจะไม่สามารถกำหนดหรือปรับเปลี่ยนคลังสินค้า
 DocType: Appraisal,Calculate Total Score,คำนวณคะแนนรวม
 DocType: Supplier Quotation,Manufacturing Manager,ผู้จัดการฝ่ายผลิต
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้การ รับประกัน ไม่เกิน {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,แยกหมายเหตุจัดส่งสินค้าเข้าไปในแพคเกจ
 apps/erpnext/erpnext/hooks.py +84,Shipments,การจัดส่ง
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,จุ่มปั้น
+DocType: Purchase Order,To be delivered to customer,ที่จะส่งมอบให้กับลูกค้า
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ต้องส่งสถานะของบันทึกเวลา
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ไม่มี Serial {0} ไม่ได้อยู่ในโกดังสินค้าใด ๆ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,การตั้งค่า
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,จากสกุลเงิน
 DocType: DocField,Name,ชื่อ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},การสั่งซื้อสินค้า ที่จำเป็นสำหรับการ ขาย สินค้า {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},การสั่งซื้อสินค้า ที่จำเป็นสำหรับการ ขาย สินค้า {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,จำนวนเงินไม่ได้สะท้อนให้เห็นในระบบ
 DocType: Purchase Invoice Item,Rate (Company Currency),อัตรา (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,คนอื่น ๆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,ตั้งเป็นหยุด
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,ไม่พบรายการที่ตรงกัน กรุณาเลือกบางค่าอื่น ๆ สำหรับ {0}
 DocType: POS Profile,Taxes and Charges,ภาษีและค่าบริการ
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",สินค้าหรือบริการที่มีการซื้อขายหรือเก็บไว้ในสต็อก
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ไม่สามารถเลือก ประเภท ค่าใช้จ่าย เป็น ' ใน แถว หน้า จำนวน ' หรือ ' ใน แถว หน้า รวม สำหรับ แถวแรก
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,เลือก DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,เจาะ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,การธนาคาร
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,กรุณา คลิกที่ 'สร้าง ตาราง ' ที่จะได้รับ ตารางเวลา
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,ศูนย์ต้นทุน ใหม่
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,ศูนย์ต้นทุน ใหม่
 DocType: Bin,Ordered Quantity,จำนวนสั่ง
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","เช่นผู้ ""สร้าง เครื่องมือสำหรับการ สร้าง """
 DocType: Quality Inspection,In Process,ในกระบวนการ
 DocType: Authorization Rule,Itemwise Discount,ส่วนลด Itemwise
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} กับคำสั่งขาย {1}
+DocType: Purchase Order Item,Reference Document Type,เอกสารประเภท
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} กับคำสั่งขาย {1}
 DocType: Account,Fixed Asset,สินทรัพย์ คงที่
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,เนื่องสินค้าคงคลัง
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,เนื่องสินค้าคงคลัง
 DocType: Activity Type,Default Billing Rate,เริ่มต้นอัตราการเรียกเก็บเงิน
 DocType: Time Log Batch,Total Billing Amount,การเรียกเก็บเงินจำนวนเงินรวม
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,ลูกหนี้การค้า
 ,Stock Balance,ยอดคงเหลือสต็อก
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,ใบสั่งขายถึงการชำระเงิน
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ใบสั่งขายถึงการชำระเงิน
 DocType: Expense Claim Detail,Expense Claim Detail,รายละเอียดค่าใช้จ่ายสินไหม
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,สร้างบันทึกเวลาเมื่อ:
 DocType: Item,Weight UOM,UOM น้ำหนัก
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญ​​ชีเจ้าหนี้
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
 DocType: Production Order Operation,Completed Qty,จำนวนเสร็จ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",มีบัญชีประเภทเดบิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเครดิต สำหรับ {0}
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,ราคา {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",มีบัญชีประเภทเดบิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเครดิต สำหรับ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,ราคา {0} ถูกปิดใช้งาน
 DocType: Manufacturing Settings,Allow Overtime,อนุญาตให้ทำงานล่วงเวลา
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,การขายสินค้า {0} จะหยุด
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} หมายเลข Serial จำเป็นสำหรับรายการ {1} คุณได้ให้ {2}
 DocType: Stock Reconciliation Item,Current Valuation Rate,อัตราการประเมินมูลค่าปัจจุบัน
 DocType: Item,Customer Item Codes,ลูกค้ารหัสสินค้า
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,การเชื่อมโลหะ
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,มาใหม่พร้อมส่ง UOM จะต้อง
 DocType: Quality Inspection,Sample Size,ขนาดของกลุ่มตัวอย่าง
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',โปรดระบุที่ถูกต้อง 'จากคดีหมายเลข'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 DocType: Project,External,ภายนอก
 DocType: Features Setup,Item Serial Nos,Nos อนุกรมรายการ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ผู้ใช้และสิทธิ์
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,ที่อยู่ติดต่อ &
 DocType: SMS Log,Sender Name,ชื่อผู้ส่ง
 DocType: Page,Title,ชื่อเรื่อง
-sites/assets/js/list.min.js +104,Customize,ปรับแต่ง
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,ปรับแต่ง
 DocType: POS Profile,[Select],[เลือก ]
 DocType: SMS Log,Sent To,ส่งไปยัง
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,ทำให้การ ขายใบแจ้งหนี้
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,ในตอนท้ายของชีวิต
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,การเดินทาง
 DocType: Leave Block List,Allow Users,อนุญาตให้ผู้ใช้งาน
+DocType: Purchase Order,Customer Mobile No,มือถือของลูกค้าไม่มี
 DocType: Sales Invoice,Recurring,การคืน
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ติดตามรายได้และค่าใช้จ่ายแยกต่างหากสำหรับแนวดิ่งผลิตภัณฑ์หรือหน่วยงาน
 DocType: Rename Tool,Rename Tool,เปลี่ยนชื่อเครื่องมือ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,ปรับปรุง ค่าใช้จ่าย
 DocType: Item Reorder,Item Reorder,รายการ Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,โอน วัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,โอน วัสดุ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",ระบุการดำเนินการ ค่าใช้จ่าย ในการดำเนินงาน และให้การดำเนินการ ที่ไม่ซ้ำกัน ในการ ดำเนินงานของคุณ
 DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,ลูกจ้าง
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,นำเข้าจากอีเมล์
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,เชิญผู้ใช้
 DocType: Features Setup,After Sale Installations,หลังจากการติดตั้งขาย
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} เรียกเก็บเงินเต็มจำนวน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} เรียกเก็บเงินเต็มจำนวน
 DocType: Workstation Working Hour,End Time,เวลาสิ้นสุด
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,ข้อสัญญา มาตรฐานสำหรับ การขายหรือการ ซื้อ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,กลุ่ม โดย คูปอง
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,จดหมายมวล
 DocType: Page,Standard,มาตรฐาน
 DocType: Rename Tool,File to Rename,การเปลี่ยนชื่อไฟล์
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},จำนวน การสั่งซื้อ Purchse จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,แสดงการชำระเงิน
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},ระบุ BOM {0} ไม่อยู่สำหรับรายการ {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ตาราง การบำรุงรักษา {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ตาราง การบำรุงรักษา {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,ขนาด
 DocType: Notification Control,Expense Claim Approved,เรียกร้องค่าใช้จ่ายที่ได้รับอนุมัติ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,เภสัชกรรม
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,วันที่เข้าร
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),การตั้งค่า เซิร์ฟเวอร์ขาเข้า สำหรับอีเมล ขาย รหัส ของคุณ (เช่น sales@example.com )
 DocType: Warranty Claim,Raised By,โดยยก
 DocType: Payment Tool,Payment Account,บัญชีการชำระเงิน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
-sites/assets/js/list.min.js +23,Draft,ร่าง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,ร่าง
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ชดเชย ปิด
 DocType: Quality Inspection Reading,Accepted,ได้รับการยอมรับ
 DocType: User,Female,หญิง
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,ป้ายกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
 DocType: Newsletter,Test,ทดสอบ
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","เนื่องจากมีการทำธุรกรรมที่มีอยู่สต็อกสำหรับรายการนี​​้ \ คุณไม่สามารถเปลี่ยนค่าของ 'มีไม่มี Serial', 'มีรุ่นที่ไม่มี', 'เป็นรายการสต็อก "และ" วิธีการประเมิน'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,วารสารรายการด่วน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
 DocType: Employee,Previous Work Experience,ประสบการณ์การทำงานก่อนหน้า
 DocType: Stock Entry,For Quantity,สำหรับจำนวน
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},กรุณากรอก จำนวน การ วางแผน รายการ {0} ที่ แถว {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} ยังไม่ได้ส่ง
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,ขอรายการ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} ยังไม่ได้ส่ง
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,ขอรายการ
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,เพื่อผลิตแยกจะถูกสร้างขึ้นสำหรับรายการที่ดีในแต่ละสำเร็จรูป
 DocType: Purchase Invoice,Terms and Conditions1,ข้อตกลงและ Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,การติดตั้ง เสร็จสมบูรณ์
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,จดหมา
 DocType: Delivery Note,Transporter Name,ชื่อ Transporter
 DocType: Contact,Enter department to which this Contact belongs,ใส่แผนกที่ติดต่อนี้เป็นของ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,ขาดทั้งหมด
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,สินค้าหรือ โกดัง แถว {0} ไม่ตรงกับที่ ขอ วัสดุ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,สินค้าหรือ โกดัง แถว {0} ไม่ตรงกับที่ ขอ วัสดุ
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,หน่วยของการวัด
 DocType: Fiscal Year,Year End Date,ปีที่จบ วันที่
 DocType: Task Depends On,Task Depends On,ขึ้นอยู่กับงาน
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,วันที่สิ้นสุด สัญญา จะต้องมากกว่า วันที่ เข้าร่วม
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,จำหน่ายบุคคลที่สาม / ตัวแทนจำหน่าย / ตัวแทนคณะกรรมการ / พันธมิตร / ผู้ค้าปลีกที่ขายสินค้า บริษัท สำหรับคณะกรรมการ
 DocType: Customer Group,Has Child Node,มีโหนดลูก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} กับใบสั่งซื้อ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} กับใบสั่งซื้อ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",ป้อนพารามิเตอร์คงที่ URL ที่นี่ (เช่นผู้ส่ง = ERPNext ชื่อผู้ใช้ = ERPNext รหัสผ่าน = 1234 ฯลฯ )
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ไม่ได้อยู่ในปีงบประมาณที่ใช้งานใด ๆ สำหรับรายละเอียดเพิ่มเติมตรวจ {2}
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,เว็บไซต์ นี้เป็น ตัวอย่างที่สร้างขึ้นโดยอัตโนมัติ จาก ERPNext
@@ -2067,11 +2078,9 @@ DocType: Note,Note,หมายเหตุ
 DocType: Purchase Receipt Item,Recd Quantity,จำนวน Recd
 DocType: Email Account,Email Ids,อีเมล์หมายเลข
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,ตั้งเป็นเบิก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
 DocType: Payment Reconciliation,Bank / Cash Account,บัญชีธนาคาร / เงินสด
 DocType: Tax Rule,Billing City,เมืองการเรียกเก็บเงิน
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,แอพลิเคชันออกจากนี้รอการอนุมัติ เพียงออกอนุมัติจะสามารถอัพเดตสถานะ
 DocType: Global Defaults,Hide Currency Symbol,ซ่อนสัญลักษณ์สกุลเงิน
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","เช่นธนาคาร, เงินสด, บัตรเครดิต"
 DocType: Journal Entry,Credit Note,หมายเหตุเครดิต
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),รวม (จำน
 DocType: Installation Note Item,Installed Qty,จำนวนการติดตั้ง
 DocType: Lead,Fax,แฟกซ์
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Submitted
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Submitted
 DocType: Salary Structure,Total Earning,กำไรรวม
 DocType: Purchase Receipt,Time at which materials were received,เวลาที่ได้รับวัสดุ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,ที่อยู่ของฉัน
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,ปริญ
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,หรือ
 DocType: Sales Order,Billing Status,สถานะการเรียกเก็บเงิน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ค่าใช้จ่ายใน ยูทิลิตี้
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-ขึ้นไป
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-ขึ้นไป
 DocType: Buying Settings,Default Buying Price List,รายการราคาซื้อเริ่มต้น
 ,Download Backups,ดาวน์โหลดสำรอง
 DocType: Notification Control,Sales Order Message,ข้อความสั่งซื้อขาย
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,เลือกพนักงาน
 DocType: Bank Reconciliation,To Date,นัด
 DocType: Opportunity,Potential Sales Deal,ที่อาจเกิดขึ้น Deal ขาย
-sites/assets/js/form.min.js +308,Details,รายละเอียด
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,รายละเอียด
 DocType: Purchase Invoice,Total Taxes and Charges,ภาษีและค่าบริการรวม
 DocType: Employee,Emergency Contact,ติดต่อฉุกเฉิน
 DocType: Item,Quality Parameters,ดัชนีคุณภาพ
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,จำนวนที่ได้ร
 DocType: Stock Entry Detail,Serial No / Batch,หมายเลขเครื่อง / ชุด
 DocType: Product Bundle,Parent Item,รายการหลัก
 DocType: Account,Account Type,ประเภทบัญชี
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
 ,To Produce,ในการ ผลิต
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",แถว {0} ใน {1} ที่จะรวม {2} ในอัตรารายการแถว {3} จะต้องรวม
 DocType: Packing Slip,Identification of the package for the delivery (for print),บัตรประจำตัวของแพคเกจสำหรับการส่งมอบ (สำหรับพิมพ์)
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,ความแฟบ
 DocType: Account,Income Account,บัญชีรายได้
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,การปั้น
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,การจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,การจัดส่งสินค้า
 DocType: Stock Reconciliation Item,Current Qty,จำนวนปัจจุบัน
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",โปรดดูที่ "ค่าของวัสดุบนพื้นฐานของ" ต้นทุนในมาตรา
 DocType: Appraisal Goal,Key Responsibility Area,พื้นที่ความรับผิดชอบหลัก
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,ที่อยู่ทั้งหมด
 DocType: Company,Stock Settings,การตั้งค่าหุ้น
 DocType: User,Bio,ไบโอ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,จัดการ กลุ่ม ลูกค้า ต้นไม้
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,ใหม่ ชื่อ ศูนย์ต้นทุน
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,ใหม่ ชื่อ ศูนย์ต้นทุน
 DocType: Leave Control Panel,Leave Control Panel,ฝากแผงควบคุม
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,ไม่มีแม่แบบที่อยู่เริ่มต้นพบ กรุณาสร้างขึ้นมาใหม่จากการตั้งค่า> การพิมพ์และการสร้างแบรนด์> แม่แบบที่อยู่
 DocType: Appraisal,HR User,ผู้ใช้งานทรัพยากรบุคคล
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,รายละเอียดการชำระเงินเครื่องมือ
 ,Sales Browser,ขาย เบราว์เซอร์
 DocType: Journal Entry,Total Credit,เครดิตรวม
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,ในประเทศ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ในประเทศ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),เงินให้กู้ยืม และ เงินทดรอง ( สินทรัพย์ )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ลูกหนี้
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,ใหญ่
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,พนักงาน ไม่พบ !
 DocType: C-Form Invoice Detail,Territory,อาณาเขต
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,กรุณาระบุ ไม่ จำเป็นต้องมี การเข้าชม
+DocType: Purchase Order,Customer Address Display,ที่อยู่ของลูกค้าแสดง
 DocType: Stock Settings,Default Valuation Method,วิธีการประเมินค่าเริ่มต้น
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,ขัด
 DocType: Production Order Operation,Planned Start Time,เวลาเริ่มต้นการวางแผน
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,จัดสรร
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,ปิด งบดุล และงบกำไร ขาดทุน หรือ หนังสือ
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะ \ คุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น การเปลี่ยนค่าเริ่มต้น UOM \ ใช้ 'UOM แทนที่ยูทิลิตี้' เครื่องมือภายใต้โมดูลสต็อก
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ระบุอัตราแลกเปลี่ยนการแปลงสกุลเงินหนึ่งไปยังอีก
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,ใบเสนอราคา {0} จะถูกยกเลิก
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,ใบเสนอราคา {0} จะถูกยกเลิก
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ยอดคงค้างทั้งหมด
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,พนักงาน {0} ได้ลา ใน {1} ไม่ สามารถทำเครื่องหมาย การเข้าร่วม
 DocType: Sales Partner,Targets,เป้าหมาย
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,นี่คือกลุ่ม ลูกค้าราก และ ไม่สามารถแก้ไขได้
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,กรุณาตั้งค่า ผังบัญชี ก่อนที่จะเริ่ม รายการบัญชี
 DocType: Purchase Invoice,Ignore Pricing Rule,ละเว้นกฎการกำหนดราคา
-sites/assets/js/list.min.js +24,Cancelled,ยกเลิก
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,ยกเลิก
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,จากวันที่ในโครงสร้างเงินเดือนที่ต้องการไม่สามารถจะน้อยกว่าพนักงานเข้าร่วมวันที่
 DocType: Employee Education,Graduate,จบการศึกษา
 DocType: Leave Block List,Block Days,วันที่ถูกบล็อก
 DocType: Journal Entry,Excise Entry,เข้าสรรพสามิต
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},คำเตือน: การขายการสั่งซื้อ {0} อยู่แล้วกับการสั่งซื้อของลูกค้า {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},คำเตือน: การขายการสั่งซื้อ {0} อยู่แล้วกับการสั่งซื้อของลูกค้า {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,สินค้าที่ได
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,จ่ายขั้นต้น + จำนวน Arrear + จำนวนการได้เป็นเงินสด - หักรวม
 DocType: Monthly Distribution,Distribution Name,ชื่อการแจกจ่าย
 DocType: Features Setup,Sales and Purchase,การขายและการซื้อ
-DocType: Purchase Order Item,Material Request No,ขอวัสดุไม่มี
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
+DocType: Supplier Quotation Item,Material Request No,ขอวัสดุไม่มี
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,อัตราที่สกุลเงินของลูกค้าจะถูกแปลงเป็นสกุลเงินหลักของ บริษัท
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ได้รับการยกเลิกการสมัครที่ประสบความสำเร็จจากรายการนี​​้
 DocType: Purchase Invoice Item,Net Rate (Company Currency),อัตราการสุทธิ (บริษัท สกุลเงิน)
-apps/frappe/frappe/templates/base.html +132,Added,ที่เพิ่ม
+apps/frappe/frappe/templates/base.html +134,Added,ที่เพิ่ม
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,จัดการ ต้นไม้ มณฑล
 DocType: Journal Entry Account,Sales Invoice,ขายใบแจ้งหนี้
 DocType: Journal Entry Account,Party Balance,ยอดคงเหลือพรรค
 DocType: Sales Invoice Item,Time Log Batch,ชุดบันทึกเวลา
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,กรุณาเลือกใช้ส่วนลด
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,กรุณาเลือกใช้ส่วนลด
 DocType: Company,Default Receivable Account,บัญชีเริ่มต้นลูกหนี้
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,สร้างธนาคารรับสมัครสำหรับเงินเดือนทั้งหมดที่จ่ายสำหรับเกณฑ์ที่เลือกข้างต้น
 DocType: Stock Entry,Material Transfer for Manufacture,โอนวัสดุสำหรับการผลิต
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,ได้รับ คอม
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,การสร้าง
 DocType: Sales Invoice,Sales Team1,ขาย Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,รายการที่ {0} ไม่อยู่
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,รายการที่ {0} ไม่อยู่
 DocType: Sales Invoice,Customer Address,ที่อยู่ของลูกค้า
 apps/frappe/frappe/desk/query_report.py +136,Total,ทั้งหมด
 DocType: Purchase Invoice,Apply Additional Discount On,สมัครสมาชิกเพิ่มเติมส่วนลด
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,การตรวจสอบค
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,ขนาดเล็กเป็นพิเศษ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,สเปรย์สร้าง
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,นิติบุคคล / สาขา ที่มีผังบัญชีแยกกัน ภายใต้องค์กร
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","อาหาร, เครื่องดื่ม และ ยาสูบ"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL หรือ BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,อัตราค่านายหน้า ไม่สามารถ จะมากกว่า 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,ระดับสินค้าคงคลังต่ำสุด
 DocType: Stock Entry,Subcontract,สัญญารับช่วง
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,กรุณากรอก {0} แรก
 DocType: Production Planning Tool,Get Items From Sales Orders,รับรายการจากคำสั่งซื้อขาย
 DocType: Production Order Operation,Actual End Time,เวลาสิ้นสุดที่เกิดขึ้นจริง
 DocType: Production Planning Tool,Download Materials Required,ดาวน์โหลดวัสดุที่จำเป็น
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,กำหนด
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",กรุณาเลือกรายการที่ "เป็นสต็อกสินค้า" เป็น "ไม่" และ "ขายเป็นรายการ" คือ "ใช่" และไม่มีการ Bundle สินค้าอื่น ๆ
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,เลือกการกระจายรายเดือนที่จะไม่สม่ำเสมอกระจายเป้าหมายข้ามเดือน
 DocType: Purchase Invoice Item,Valuation Rate,อัตราการประเมิน
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,สกุลเงิน ราคา ไม่ได้เลือก
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,สกุลเงิน ราคา ไม่ได้เลือก
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,รายการแถว {0}: ใบเสร็จรับเงินซื้อ {1} ไม่อยู่ในด้านบนของตาราง 'ซื้อใบเสร็จรับเงิน'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},พนักงาน {0} ได้ใช้ แล้วสำหรับ {1} ระหว่าง {2} และ {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},พนักงาน {0} ได้ใช้ แล้วสำหรับ {1} ระหว่าง {2} และ {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,วันที่เริ่มต้นโครงการ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,จนกระทั่ง
 DocType: Rename Tool,Rename Log,เปลี่ยนชื่อเข้าสู่ระบบ
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,โหนดใบเท่านั้นที่จะเข้าในการทำธุรกรรม
 DocType: Expense Claim,Expense Approver,ค่าใช้จ่ายที่อนุมัติ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,รายการรับซื้อจำหน่าย
-sites/assets/js/erpnext.min.js +48,Pay,จ่ายเงิน
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,จ่ายเงิน
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,เพื่อ Datetime
 DocType: SMS Settings,SMS Gateway URL,URL เกตเวย์ SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,บันทึกการรักษาสถานะการจัดส่งทาง SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ที่บด
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,หดห่อ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,ที่รอดำเนินการกิจกรรม
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ที่รอดำเนินการกิจกรรม
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,ได้รับการยืนยัน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ผู้ผลิต> ประเภทผู้ผลิต
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ป
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,หนังสือพิมพ์ สำนักพิมพ์
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,เลือกปีงบประมาณ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ถลุง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,คุณเป็น ผู้อนุมัติ ออกจาก บันทึก นี้ กรุณา อัปเดต 'สถานะ ' และ ประหยัด
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,สั่งซื้อใหม่ระดับ
 DocType: Attendance,Attendance Date,วันที่เข้าร่วม
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,การล่มสลายเงินเดือนขึ้นอยู่กับกำไรและหัก
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ค่าเสื่อมราคา
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ผู้ผลิต (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,ระยะเวลาที่ไม่ถูกต้อง
 DocType: Customer,Credit Limit,วงเงินสินเชื่อ
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,เลือกประเภทของการทำธุรกรรม
 DocType: GL Entry,Voucher No,บัตรกำนัลไม่มี
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,แ
 DocType: Customer,Address and Contact,ที่อยู่และการติดต่อ
 DocType: Customer,Last Day of the Next Month,วันสุดท้ายของเดือนถัดไป
 DocType: Employee,Feedback,ข้อเสนอแนะ
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint ตารางการแข่งขัน
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint ตารางการแข่งขัน
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,เครื่องจักรกลเจ็ทที่มีฤทธิ์กัดกร่อน
 DocType: Stock Settings,Freeze Stock Entries,ตรึงคอมเมนต์สินค้า
 DocType: Website Settings,Website Settings,การตั้งค่าเว็บไซต์
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,ขาออก
 DocType: Material Request,Requested For,สำหรับ การร้องขอ
 DocType: Quotation Item,Against Doctype,กับ ประเภทเอกสาร
 DocType: Delivery Note,Track this Delivery Note against any Project,ติดตามการจัดส่งสินค้าหมายเหตุนี้กับโครงการใด ๆ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,บัญชี ราก ไม่สามารถลบได้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,บัญชี ราก ไม่สามารถลบได้
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,แสดงรายการสต็อก
 ,Is Primary Address,เป็นที่อยู่หลัก
 DocType: Production Order,Work-in-Progress Warehouse,คลังสินค้าทำงานในความคืบหน้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,การจัดการที่อยู่
 DocType: Pricing Rule,Item Code,รหัสสินค้า
 DocType: Production Planning Tool,Create Production Orders,สร้างคำสั่งซื้อการผลิต
@@ -2460,14 +2471,14 @@ DocType: Journal Entry,User Remark,หมายเหตุผู้ใช้
 DocType: Lead,Market Segment,ส่วนตลาด
 DocType: Communication,Phone,โทรศัพท์
 DocType: Employee Internal Work History,Employee Internal Work History,ประวัติการทำงานของพนักงานภายใน
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),ปิด (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),ปิด (Dr)
 DocType: Contact,Passive,ไม่โต้ตอบ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,อนุกรม ไม่มี {0} ไม่ได้อยู่ใน สต็อก
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,แม่แบบ ภาษี สำหรับการขาย ในการทำธุรกรรม
 DocType: Sales Invoice,Write Off Outstanding Amount,เขียนปิดยอดคงค้าง
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",ตรวจสอบว่าใบแจ้งหนี้ที่คุณต้องเกิดขึ้นโดยอัตโนมัติ หลังจากส่งใบแจ้งหนี้ใด ๆ ขายส่วนกิจวัตรจะสามารถมองเห็น
 DocType: Account,Accounts Manager,ผู้จัดการบัญชี
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',บันทึกเวลา {0} ต้องถูก 'ส่ง'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',บันทึกเวลา {0} ต้องถูก 'ส่ง'
 DocType: Stock Settings,Default Stock UOM,เริ่มต้น UOM สต็อก
 DocType: Time Log,Costing Rate based on Activity Type (per hour),อัตราค่าใช้จ่ายขึ้นอยู่กับประเภทกิจกรรม (ต่อชั่วโมง)
 DocType: Production Planning Tool,Create Material Requests,ขอสร้างวัสดุ
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,กระทบยอดธน
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ได้รับการปรับปรุง
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,ขอ วัสดุ {0} จะถูกยกเลิก หรือ หยุด
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,เพิ่มบันทึกไม่กี่ตัวอย่าง
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,ออกจากการบริหารจัดการ
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,ออกจากการบริหารจัดการ
 DocType: Event,Groups,กลุ่ม
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,โดย กลุ่ม บัญชี
 DocType: Sales Order,Fully Delivered,จัดส่งอย่างเต็มที่
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,พิเศษขาย
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} งบประมาณสำหรับ บัญชี {1} กับ ศูนย์ต้นทุน {2} จะเกิน โดย {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry ใบ Forwarded
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','จาก วันที่ ' ต้อง เป็นหลังจากที่ ' นัด '
 ,Stock Projected Qty,หุ้น ที่คาดการณ์ จำนวน
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
 DocType: Sales Order,Customer's Purchase Order,การสั่งซื้อของลูกค้า
 DocType: Warranty Claim,From Company,จาก บริษัท
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ค่าหรือ จำนวน
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,พ่อค้าปลีก
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญ​​ชีงบดุล
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ทุก ประเภท ของผู้ผลิต
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,รหัสสินค้า ที่จำเป็น เพราะ สินค้า ไม่ เลขโดยอัตโนมัติ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,รหัสสินค้า ที่จำเป็น เพราะ สินค้า ไม่ เลขโดยอัตโนมัติ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,รายการกำหนดการซ่อมบำรุง
 DocType: Sales Order,%  Delivered,% จัดส่งแล้ว
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,บัญชี เงินเบิกเกินบัญชี ธนาคาร
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,ให้ เงินเดือน สลิป
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,เปิดจุก
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ดู BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,เงินให้กู้ยืม ที่มีหลักประกัน
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ผลิตภัณฑ์ที่ดีเลิศ
@@ -2523,7 +2532,7 @@ DocType: Appraisal,Appraisal,การตีราคา
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost หล่อโฟม
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,การวาดภาพ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,วันที่ซ้ำแล้วซ้ำอีก
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},ออกจาก ผู้อนุมัติ ต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},ออกจาก ผู้อนุมัติ ต้องเป็นหนึ่งใน {0}
 DocType: Hub Settings,Seller Email,อีเมล์ผู้ขาย
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ค่าใช้จ่ายในการจัดซื้อรวม (ผ่านการซื้อใบแจ้งหนี้)
 DocType: Workstation Working Hour,Start Time,เวลา
@@ -2537,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ปริมาณสุทธิ (บริษัท สกุลเงิน)
 DocType: BOM Operation,Hour Rate,อัตราชั่วโมง
 DocType: Stock Settings,Item Naming By,รายการการตั้งชื่อตาม
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,จาก ใบเสนอราคา
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},อีก รายการ ระยะเวลา ปิด {0} ได้รับการทำ หลังจาก {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,จาก ใบเสนอราคา
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},อีก รายการ ระยะเวลา ปิด {0} ได้รับการทำ หลังจาก {1}
 DocType: Production Order,Material Transferred for Manufacturing,วัสดุสำหรับการผลิตโอน
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,บัญชี {0} ไม่อยู่
 DocType: Purchase Receipt Item,Purchase Order Item No,สั่งซื้อสินค้าสั่งซื้อไม่มี
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,การตรวจสอบที่จำ
 DocType: Purchase Invoice Item,PR Detail,รายละเอียดประชาสัมพันธ์
 DocType: Sales Order,Fully Billed,ในจำนวนอย่างเต็มที่
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,เงินสด ใน มือ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},คลังสินค้าจัดส่งสินค้าที่จำเป็นสำหรับรายการหุ้น {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},คลังสินค้าจัดส่งสินค้าที่จำเป็นสำหรับรายการหุ้น {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),น้ำหนักรวมของแพคเกจ น้ำหนักสุทธิปกติ + น้ำหนักวัสดุบรรจุภัณฑ์ (สำหรับพิมพ์)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ผู้ใช้ที่มี บทบาทนี้ ได้รับอนุญาตให้ตั้ง บัญชีแช่แข็งและ สร้าง / แก้ไข รายการบัญชี ในบัญชีแช่แข็ง
 DocType: Serial No,Is Cancelled,เป็นยกเลิก
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,การจัดส่งของฉัน
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,การจัดส่งของฉัน
 DocType: Journal Entry,Bill Date,วันที่บิล
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",แม้ว่าจะมีกฎการกำหนดราคาหลายกับความสำคัญสูงสุดแล้วจัดลำดับความสำคัญดังต่อไปนี้ภายในจะใช้:
 DocType: Supplier,Supplier Details,รายละเอียดผู้จัดจำหน่าย
@@ -2568,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,โอนเงิน
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,เลือกบัญชีธนาคาร
 DocType: Newsletter,Create and Send Newsletters,สร้างและส่งจดหมายข่าว
-sites/assets/js/report.min.js +107,From Date must be before To Date,นับ แต่วันที่ต้องอยู่ก่อนวันที่ต้องการ
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,นับ แต่วันที่ต้องอยู่ก่อนวันที่ต้องการ
 DocType: Sales Order,Recurring Order,การสั่งซื้อที่เกิดขึ้น
 DocType: Company,Default Income Account,บัญชีรายได้เริ่มต้น
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,กลุ่ม ลูกค้า / ลูกค้า
@@ -2583,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,UOM สต็อก
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
 ,Projected,ที่คาดการณ์ไว้
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน โกดัง {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,หมายเหตุ : ระบบ จะไม่ตรวจสอบ มากกว่าการ ส่งมอบและ มากกว่าการ จอง รายการ {0} เป็น ปริมาณ หรือจำนวน เป็น 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,หมายเหตุ : ระบบ จะไม่ตรวจสอบ มากกว่าการ ส่งมอบและ มากกว่าการ จอง รายการ {0} เป็น ปริมาณ หรือจำนวน เป็น 0
 DocType: Notification Control,Quotation Message,ข้อความใบเสนอราคา
 DocType: Issue,Opening Date,เปิดวันที่
 DocType: Journal Entry,Remark,คำพูด
 DocType: Purchase Receipt Item,Rate and Amount,อัตราและปริมาณ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,น่าเบื่อ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,จากการสั่งซื้อการขาย
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,จากการสั่งซื้อการขาย
 DocType: Blog Category,Parent Website Route,ผู้ปกครอง เว็บไซต์ เส้นทาง
 DocType: Sales Order,Not Billed,ไม่ได้เรียกเก็บ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,ทั้ง คลังสินค้า ต้องอยู่ใน บริษัท เดียวกัน
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,ไม่มีที่ติดต่อเข้ามาเลย
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,ไม่มีที่ติดต่อเข้ามาเลย
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,ที่ใช้งานไม่ได้
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,กับใบแจ้งหนี้วันที่โพสต์กระทู้
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ที่ดินจํานวนเงินค่าใช้จ่ายคูปอง
 DocType: Time Log,Batched for Billing,batched สำหรับการเรียกเก็บเงิน
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,ตั๋วเงินยกโดยซัพพลายเออร์
 DocType: POS Profile,Write Off Account,เขียนทันทีบัญชี
-sites/assets/js/erpnext.min.js +26,Discount Amount,จำนวน ส่วนลด
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,จำนวน ส่วนลด
 DocType: Purchase Invoice,Return Against Purchase Invoice,กลับไปกับการซื้อใบแจ้งหนี้
 DocType: Item,Warranty Period (in days),ระยะเวลารับประกัน (วัน)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,เช่นผู้ ภาษีมูลค่าเพิ่ม
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,วาระที่ 4
 DocType: Journal Entry Account,Journal Entry Account,วารสารบัญชีเข้า
 DocType: Shopping Cart Settings,Quotation Series,ชุดใบเสนอราคา
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",รายการที่มีอยู่ ที่มีชื่อเดียวกัน ({0}) กรุณาเปลี่ยนชื่อกลุ่ม รายการ หรือเปลี่ยนชื่อ รายการ
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",รายการที่มีอยู่ ที่มีชื่อเดียวกัน ({0}) กรุณาเปลี่ยนชื่อกลุ่ม รายการ หรือเปลี่ยนชื่อ รายการ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,ก๊าซร้อนขึ้นรูปโลหะ
 DocType: Sales Order Item,Sales Order Date,วันที่สั่งซื้อขาย
 DocType: Sales Invoice Item,Delivered Qty,จำนวนส่ง
@@ -2639,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,ลูกค้าหรือผู้ผลิตรายละเอียด
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,ชุด
 DocType: Lead,Lead Owner,เจ้าของช่องทาง
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,โกดังสินค้าที่จำเป็น
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,โกดังสินค้าที่จำเป็น
 DocType: Employee,Marital Status,สถานภาพการสมรส
 DocType: Stock Settings,Auto Material Request,ขอวัสดุอัตโนมัติ
 DocType: Time Log,Will be updated when billed.,จะมีการปรับปรุงเมื่อเรียกเก็บเงิน
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,จำนวนรุ่นที่มีจำหน่ายที่จากคลังสินค้า
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM ปัจจุบันและ ใหม่ BOM ไม่สามารถ จะเหมือนกัน
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,วันที่ ของ การเกษียณอายุ ต้องมากกว่า วันที่ เข้าร่วม
 DocType: Sales Invoice,Against Income Account,กับบัญชีรายได้
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,อัพเดทสต็อก
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ที่แตกต่างกัน สำหรับรายการที่ จะ นำไปสู่การ ที่ไม่ถูกต้อง ( รวม ) ค่า น้ำหนักสุทธิ ให้แน่ใจว่า น้ำหนักสุทธิ ของแต่ละรายการ ที่อยู่ในUOM เดียวกัน
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,อัตรา BOM
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,กรุณา ดึง รายการจาก การจัดส่งสินค้า หมายเหตุ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,กรุณา ดึง รายการจาก การจัดส่งสินค้า หมายเหตุ
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,รายการบันทึก {0} จะยกเลิกการเชื่อมโยง
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",บันทึกการสื่อสารทั้งหมดของอีเมลประเภทโทรศัพท์แชทเข้าชม ฯลฯ
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,กรุณาระบุรอบปิดศูนย์ต้นทุนของ บริษัท
 DocType: Purchase Invoice,Terms,ข้อตกลงและเงื่อนไข
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,สร้างใหม่
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,สร้างใหม่
 DocType: Buying Settings,Purchase Order Required,ใบสั่งซื้อที่ต้องการ
 ,Item-wise Sales History,รายการที่ชาญฉลาดขายประวัติการ
 DocType: Expense Claim,Total Sanctioned Amount,จำนวนรวมตามทำนองคลองธรรม
@@ -2681,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,หักเงินเด
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,บันทึก
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,เลือกโหนดกลุ่มแรก
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},จุดประสงค์ ต้องเป็นหนึ่งใน {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,กรอกแบบฟอร์ม และบันทึกไว้
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,กรอกแบบฟอร์ม และบันทึกไว้
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ดาวน์โหลดรายงานที่มีวัตถุดิบทั้งหมดที่มีสถานะสินค้าคงคลังของพวกเขาล่าสุด
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,หันหน้าไปทาง
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ฟอรั่มชุมชน
 DocType: Leave Application,Leave Balance Before Application,ฝากคงเหลือก่อนที่โปรแกรมประยุกต์
 DocType: SMS Center,Send SMS,ส่ง SMS
 DocType: Company,Default Letter Head,หัวหน้าเริ่มต้นจดหมาย
 DocType: Time Log,Billable,ที่เรียกเก็บเงิน
 DocType: Authorization Rule,This will be used for setting rule in HR module,นี้จะถูกใช้สำหรับกฎการตั้งค่าในโมดูลทรัพยากรบุคคล
 DocType: Account,Rate at which this tax is applied,อัตราที่ภาษีนี้จะถูกใช้
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,สั่งซื้อใหม่จำนวน
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,สั่งซื้อใหม่จำนวน
 DocType: Company,Stock Adjustment Account,การปรับบัญชีสินค้า
 DocType: Journal Entry,Write Off,เขียนปิด
 DocType: Time Log,Operation ID,รหัสการดำเนินงาน
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","ทุ่งส่วนลดจะสามารถใช้ได้ในใบสั่งซื้อรับซื้อ, ใบกำกับซื้อ"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ชื่อของบัญชีใหม่ หมายเหตุ: กรุณาอย่าสร้างบัญชีสำหรับลูกค้าและผู้จำหน่าย
 DocType: Report,Report Type,ประเภทรายงาน
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,โหลด
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,โหลด
 DocType: BOM Replace Tool,BOM Replace Tool,เครื่องมือแทนที่ BOM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,แม่แบบของประเทศที่อยู่เริ่มต้นอย่างชาญฉลาด
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
+DocType: Sales Order Item,Supplier delivers to Customer,ผู้ผลิตมอบให้กับลูกค้า
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,แสดงภาษีผิดขึ้น
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ข้อมูลนำเข้าและส่งออก
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',หากคุณ มีส่วนร่วมใน กิจกรรมการผลิต ให้เปิดใช้ตัวเลือก 'เป็นผลิตภัณฑ์ที่ถูกผลิต '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,ใบแจ้งหนี้วันที่โพสต์
 DocType: Sales Invoice,Rounded Total,รวมกลม
 DocType: Product Bundle,List items that form the package.,รายการที่สร้างแพคเกจ
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ร้อยละ จัดสรร ควรจะเท่ากับ 100%
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
 DocType: Company,Default Cash Account,บัญชีเงินสดเริ่มต้น
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,บริษัท (ไม่ใช่ ลูกค้า หรือ ซัพพลายเออร์ ) เจ้านาย
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"โปรดป้อน "" วันที่ส่ง ที่คาดหวัง '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"โปรดป้อน "" วันที่ส่ง ที่คาดหวัง '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,ชำระ เงิน + เขียน ปิด จำนวน ไม่สามารถ จะสูงกว่า แกรนด์ รวม
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ไม่ได้เป็น จำนวน ชุดที่ถูกต้องสำหรับ รายการ {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},หมายเหตุ : มี ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
@@ -2740,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","แถว {0}: จำนวนไม่ Avalable ในคลังสินค้า {1} ใน {2} {3}
  จำนวนที่ยังอยู่: {4} โอนจำนวน: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,วาระที่ 3
+DocType: Purchase Order,Customer Contact Email,อีเมล์ที่ใช้ติดต่อลูกค้า
 DocType: Event,Sunday,วันอาทิตย์
 DocType: Sales Team,Contribution (%),สมทบ (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,ความรับผิดชอบ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,แบบ
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,แบบ
 DocType: Sales Person,Sales Person Name,ชื่อคนขาย
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,กรุณากรอก atleast 1 ใบแจ้งหนี้ ในตาราง
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,เพิ่มผู้ใช้
@@ -2753,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),เริ่มต้นวั
 DocType: Stock Reconciliation Item,Before reconciliation,ก่อนที่จะกลับไปคืนดี
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ไปที่ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ภาษีและค่าใช้จ่ายเพิ่ม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
 DocType: Sales Order,Partly Billed,จำนวนมากที่สุดเป็นส่วนใหญ่
 DocType: Item,Default BOM,BOM เริ่มต้น
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2761,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,รวมที่โดดเด่น Amt
 DocType: Time Log Batch,Total Hours,รวมชั่วโมง
 DocType: Journal Entry,Printing Settings,การตั้งค่าการพิมพ์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},เดบิต รวม ต้องเท่ากับ เครดิต รวม
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},เดบิต รวม ต้องเท่ากับ เครดิต รวม
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,ยานยนต์
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},ใบ สำหรับประเภท {0} การจัดสรร แล้วสำหรับ พนักงาน {1} ปีงบประมาณ {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,รายการที่ จะต้อง
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,การฉีดขึ้นรูปโลหะ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,จากหมายเหตุการจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,จากหมายเหตุการจัดส่งสินค้า
 DocType: Time Log,From Time,ตั้งแต่เวลา
 DocType: Notification Control,Custom Message,ข้อความที่กำหนดเอง
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,วาณิชธนกิจ
@@ -2782,10 +2795,10 @@ DocType: Newsletter,A Lead with this email id should exist,ควรมีช่
 DocType: Stock Entry,From BOM,จาก BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,ขั้นพื้นฐาน
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ก่อนที่จะทำธุรกรรมหุ้น {0} ถูกแช่แข็ง
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',กรุณา คลิกที่ 'สร้าง ตาราง '
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,วันที่ ควรจะเป็น เช่นเดียวกับการ จาก วันที่ ลา ครึ่งวัน
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',กรุณา คลิกที่ 'สร้าง ตาราง '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,วันที่ ควรจะเป็น เช่นเดียวกับการ จาก วันที่ ลา ครึ่งวัน
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","กิโลกรัมเช่นหน่วย Nos, ม."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,ไม่มี การอ้างอิง มีผลบังคับใช้ ถ้า คุณป้อน วันที่ อ้างอิง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,ไม่มี การอ้างอิง มีผลบังคับใช้ ถ้า คุณป้อน วันที่ อ้างอิง
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,วันที่ เข้าร่วม จะต้องมากกว่า วันเกิด
 DocType: Salary Structure,Salary Structure,โครงสร้างเงินเดือน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,7 +2806,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  โดยการกำหนดลำดับความสำคัญ ราคากฎ: {0}"
 DocType: Account,Bank,ธนาคาร
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,สายการบิน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,ฉบับวัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ฉบับวัสดุ
 DocType: Material Request Item,For Warehouse,สำหรับโกดัง
 DocType: Employee,Offer Date,ข้อเสนอ วันที่
 DocType: Hub Settings,Access Token,เข้าสู่ Token
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,เปิดเวลา
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,จากและถึง วันที่คุณต้องการ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,หลักทรัพย์และ การแลกเปลี่ยน สินค้าโภคภัณฑ์
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
+DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,เจาะ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,เป่า
 DocType: Purchase Taxes and Charges,Valuation and Total,การประเมินและรวม
@@ -2837,11 +2851,12 @@ DocType: C-Form,Amended From,แก้ไขเพิ่มเติมจาก
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,วัตถุดิบ
 DocType: Leave Application,Follow via Email,ผ่านทางอีเมล์ตาม
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,จำนวน ภาษี หลังจากที่ จำนวน ส่วนลด
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,บัญชีของเด็ก ที่มีอยู่ สำหรับบัญชีนี้ คุณไม่สามารถลบ บัญชีนี้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,บัญชีของเด็ก ที่มีอยู่ สำหรับบัญชีนี้ คุณไม่สามารถลบ บัญชีนี้
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ทั้ง จำนวน เป้าหมาย หรือจำนวน เป้าหมายที่ มีผลบังคับใช้
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
-DocType: Leave Allocation,Carry Forward,Carry Forward
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,เปิดวันที่ควรเป็นก่อนที่จะปิดวันที่
+DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
 DocType: Department,Days for which Holidays are blocked for this department.,วันที่วันหยุดจะถูกบล็อกสำหรับแผนกนี้
 ,Produced,ผลิต
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),รวม (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,บันเทิงและ การพักผ่อน
 DocType: Purchase Order,The date on which recurring order will be stop,วันที่เกิดขึ้นเป็นประจำเพื่อที่จะหยุด
 DocType: Quality Inspection,Item Serial No,รายการ Serial No.
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} จะต้องลดลงโดย {1} หรือคุณควรจะเพิ่มความอดทนล้น
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} จะต้องลดลงโดย {1} หรือคุณควรจะเพิ่มความอดทนล้น
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,ปัจจุบันทั้งหมด
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ชั่วโมง
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","เนื่องรายการ {0} ไม่สามารถปรับปรุง \
  ใช้การกระทบยอดสต็อก"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,โอนวัสดุที่จะผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,โอนวัสดุที่จะผลิต
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ใหม่ หมายเลขเครื่อง ไม่สามารถมี คลังสินค้า คลังสินค้า จะต้องตั้งค่า โดย สต็อก รายการ หรือ รับซื้อ
 DocType: Lead,Lead Type,ชนิดช่องทาง
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,สร้าง ใบเสนอราคา
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,รายการทั้งหมด เหล่านี้ได้รับ ใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,รายการทั้งหมด เหล่านี้ได้รับ ใบแจ้งหนี้ แล้ว
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},สามารถ ได้รับการอนุมัติ โดย {0}
 DocType: Shipping Rule,Shipping Rule Conditions,เงื่อนไขกฎการจัดส่งสินค้า
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ใหม่หลังจากเปลี่ยน
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,รหัสการดำเนินงานไม่ได้ตั้งค่า
 DocType: Production Order,Planned Start Date,เริ่มต้นการวางแผนวันที่สมัคร
 DocType: Serial No,Creation Document Type,ประเภท การสร้าง เอกสาร
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint เยี่ยมชม
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint เยี่ยมชม
 DocType: Leave Type,Is Encash,เป็นได้เป็นเงินสด
 DocType: Purchase Invoice,Mobile No,มือถือไม่มี
 DocType: Payment Tool,Make Journal Entry,ทำให้อนุทิน
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,ใหม่ใบจัดสร
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ข้อมูล โครงการ ฉลาด ไม่สามารถใช้ได้กับ ใบเสนอราคา
 DocType: Project,Expected End Date,คาดว่าวันที่สิ้นสุด
 DocType: Appraisal Template,Appraisal Template Title,หัวข้อแม่แบบประเมิน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,เชิงพาณิชย์
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,เชิงพาณิชย์
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,ผู้ปกครองรายการ {0} ต้องไม่เป็นรายการสต็อก
 DocType: Cost Center,Distribution Id,รหัสกระจาย
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,บริการ ที่น่ากลัว
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ราคาแอตทริบิวต์ {0} 'จะต้องอยู่ในช่วงของ {1} เป็น {2} ในการเพิ่มขึ้นของ {3}
 DocType: Tax Rule,Sales,ขาย
 DocType: Stock Entry Detail,Basic Amount,จํานวนเงินขั้นพื้นฐาน
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
+DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,บัญชีลูกหนี้เริ่มต้น
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,เลื่อย
 DocType: Tax Rule,Billing State,รัฐเรียกเก็บเงิน
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ลามิเนต
 DocType: Item Reorder,Transfer,โอน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
 DocType: Authorization Rule,Applicable To (Employee),ที่ใช้บังคับกับ (พนักงาน)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,ค้าปลีก
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ลูกค้า {0} ไม่อยู่
 DocType: Attendance,Absent,ขาด
 DocType: Product Bundle,Product Bundle,Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},แถว {0}: การอ้างอิงที่ไม่ถูกต้อง {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ย่อยยับ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ซื้อภาษีและค่าใช้จ่ายแม่แบบ
 DocType: Upload Attendance,Download Template,ดาวน์โหลดแม่แบบ
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,ข้อคิดเห็น
 DocType: Purchase Order Item Supplied,Raw Material Item Code,วัสดุดิบรหัสสินค้า
 DocType: Journal Entry,Write Off Based On,เขียนปิดขึ้นอยู่กับ
 DocType: Features Setup,POS View,ดู POS
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,บันทึกการติดตั้งสำหรับหมายเลขเครื่อง
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,บันทึกการติดตั้งสำหรับหมายเลขเครื่อง
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,หล่ออย่างต่อเนื่อง
-sites/assets/js/erpnext.min.js +10,Please specify a,โปรดระบุ
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,โปรดระบุ
 DocType: Offer Letter,Awaiting Response,รอการตอบสนอง
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ดังกล่าวข้างต้น
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,ขนาดเย็น
 DocType: Salary Slip,Earning & Deduction,รายได้และการหัก
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,บัญชี {0} ไม่สามารถเป็น กลุ่ม
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,ภูมิภาค
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
 DocType: Holiday List,Weekly Off,สัปดาห์ปิด
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","สำหรับเช่น 2012, 2012-13"
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,ปูด
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,หล่อระเหยรูปแบบ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ค่าใช้จ่ายใน ความบันเทิง
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ใบแจ้งหนี้ การขาย {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,อายุ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ใบแจ้งหนี้ การขาย {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,อายุ
 DocType: Time Log,Billing Amount,จำนวนเงินที่เรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,ปริมาณ ที่ไม่ถูกต้อง ที่ระบุไว้ สำหรับรายการที่ {0} ปริมาณ ที่ควรจะเป็น มากกว่า 0
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,โปรแกรมประยุกต์สำหรับการลา
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,บัญชี ที่มีอยู่ กับการทำธุรกรรม ไม่สามารถลบได้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,บัญชี ที่มีอยู่ กับการทำธุรกรรม ไม่สามารถลบได้
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ค่าใช้จ่าย ทางกฎหมาย
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","วันของเดือนที่สั่งซื้อรถยนต์จะถูกสร้างขึ้นเช่น 05, 28 ฯลฯ"
 DocType: Sales Invoice,Posting Time,โพสต์เวลา
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,เครื่องหมาย
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ตรวจสอบเรื่องนี้ถ้าคุณต้องการบังคับให้ผู้ใช้เลือกชุดก่อนที่จะบันทึก จะมีค่าเริ่มต้นไม่ถ้าคุณตรวจสอบนี้
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},ไม่มีรายการ ที่มี หมายเลขเครื่อง {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,เปิดการแจ้งเตือน
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,เปิดการแจ้งเตือน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,ค่าใช้จ่าย โดยตรง
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,คุณต้องการ จริงๆที่จะ เปิดจุก ขอ วัสดุ นี้
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,รายได้ลูกค้าใหม่
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ค่าใช้จ่ายใน การเดินทาง
 DocType: Maintenance Visit,Breakdown,การเสีย
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ขณะที่ในวันที่
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,สร้างเสริม
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,การทดลอง
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,โกดัง เริ่มต้น มีผลบังคับใช้ กับ รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,โกดัง เริ่มต้น มีผลบังคับใช้ กับ รายการ สต็อก
 DocType: Feed,Full Name,ชื่อเต็ม
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,นัง
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},การชำระเงิน ของเงินเดือน สำหรับเดือน{0} และปี {1}
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,เพิ่ม
 DocType: Buying Settings,Default Supplier Type,ซัพพลายเออร์ชนิดเริ่มต้น
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,การระเบิดหิน
 DocType: Production Order,Total Operating Cost,ค่าใช้จ่ายการดำเนินงานรวม
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,หมายเหตุ : รายการ {0} เข้ามา หลายครั้ง
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,หมายเหตุ : รายการ {0} เข้ามา หลายครั้ง
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ติดต่อทั้งหมด
 DocType: Newsletter,Test Email Id,Email รหัสการทดสอบ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,ชื่อย่อ บริษัท
@@ -3101,11 +3117,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ใบ
 DocType: Stock Settings,Role Allowed to edit frozen stock,บทบาทอนุญาตให้แก้ไขหุ้นแช่แข็ง
 ,Territory Target Variance Item Group-Wise,มณฑล เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,ทุกกลุ่ม ลูกค้า
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีผลบังคับใช้ อาจจะบันทึกแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีผลบังคับใช้ อาจจะบันทึกแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,แม่แบบภาษีมีผลบังคับใช้
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่อยู่
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),อัตราราคาปกติ (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} สถานะ คือ ' หยุด '
 DocType: Account,Temporary,ชั่วคราว
 DocType: Address,Preferred Billing Address,ที่อยู่การเรียกเก็บเงินที่ต้องการ
 DocType: Monthly Distribution Percentage,Percentage Allocation,การจัดสรรร้อยละ
@@ -3123,13 +3138,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,รายการ ฉ
 DocType: Purchase Order Item,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
 DocType: Quotation,In Words will be visible once you save the Quotation.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบเสนอราคา
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,รีดผ้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} หยุดทำงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},บาร์โค้ด {0} ใช้แล้ว ใน รายการ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} หยุดทำงาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},บาร์โค้ด {0} ใช้แล้ว ใน รายการ {1}
 DocType: Lead,Add to calendar on this date,เพิ่มไปยังปฏิทินของวันนี้
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,กฎระเบียบ สำหรับการเพิ่ม ค่าใช้จ่ายใน การจัดส่งสินค้า
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,เหตุการณ์ที่จะเกิดขึ้น
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,เหตุการณ์ที่จะเกิดขึ้น
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ลูกค้า จะต้อง
 DocType: Letter Head,Letter Head,หัวจดหมาย
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,รายการด่วน
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} เป็นข้อบังคับสำหรับการกลับมา
 DocType: Purchase Order,To Receive,ที่จะได้รับ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,หดตัวที่เหมาะสม
@@ -3152,25 +3168,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,อย่างน้อยหนึ่งคลังสินค้ามีผลบังคับใช้
 DocType: Serial No,Out of Warranty,ออกจากการรับประกัน
 DocType: BOM Replace Tool,Replace,แทนที่
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,กรุณาใส่ หน่วย เริ่มต้น ของการวัด
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,กรุณาใส่ หน่วย เริ่มต้น ของการวัด
 DocType: Purchase Invoice Item,Project Name,ชื่อโครงการ
 DocType: Supplier,Mention if non-standard receivable account,ถ้าพูดถึงไม่ได้มาตรฐานบัญชีลูกหนี้
 DocType: Workflow State,Edit,แก้ไข
 DocType: Journal Entry Account,If Income or Expense,ถ้ารายได้หรือค่าใช้จ่าย
 DocType: Features Setup,Item Batch Nos,Nos Batch รายการ
 DocType: Stock Ledger Entry,Stock Value Difference,ความแตกต่างมูลค่าหุ้น
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,ทรัพยากรมนุษย์
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,ทรัพยากรมนุษย์
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,กระทบยอดการชำระเงิน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,สินทรัพย์ ภาษี
 DocType: BOM Item,BOM No,BOM ไม่มี
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,อนุทิน {0} ไม่มีบัญชี {1} หรือการจับคู่แล้วกับบัตรกำนัลอื่น ๆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,อนุทิน {0} ไม่มีบัญชี {1} หรือการจับคู่แล้วกับบัตรกำนัลอื่น ๆ
 DocType: Item,Moving Average,ค่าเฉลี่ยเคลื่อนที่
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ซึ่งจะถูกแทนที่
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,มาใหม่พร้อมส่ง UOM ต้องแตกต่างจาก UOM ปัจจุบัน
 DocType: Account,Debit,หักบัญชี
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,ใบ จะต้องมีการ จัดสรร หลายรายการ 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,ใบ จะต้องมีการ จัดสรร หลายรายการ 0.5
 DocType: Production Order,Operation Cost,ค่าใช้จ่ายในการดำเนินงาน
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,อัพโหลดการดูแลรักษาจาก. csv ที่
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt ดีเด่น
@@ -3178,7 +3194,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ตั
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",เพื่อกำหนดปัญหานี้ให้ใช้ปุ่ม "กำหนด" ในแถบด้านข้าง
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ตรึง หุ้น เก่า กว่า [ วัน ]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",ถ้าสองคนหรือมากกว่ากฎการกำหนดราคาจะพบตามเงื่อนไขข้างต้นลำดับความสำคัญถูกนำไปใช้ ลำดับความสำคัญเป็นจำนวนระหว่าง 0-20 ในขณะที่ค่าเริ่มต้นเป็นศูนย์ (ว่าง) จำนวนที่สูงขึ้นหมายความว่ามันจะมีความสำคัญถ้ามีกฎกำหนดราคาหลายเงื่อนไขเดียวกัน
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,กับใบแจ้งหนี้
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ปีงบประมาณ: {0} ไม่อยู่
 DocType: Currency Exchange,To Currency,กับสกุลเงิน
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,อนุญาตให้ผู้ใช้ต่อไปเพื่อขออนุมัติการใช้งานออกวันบล็อก
@@ -3207,7 +3222,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),อ
 DocType: Stock Entry Detail,Additional Cost,ค่าใช้จ่ายเพิ่มเติม
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,ปี การเงิน สิ้นสุด วันที่
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",ไม่สามารถกรอง ตาม คูปอง ไม่ ถ้า จัดกลุ่มตาม คูปอง
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
 DocType: Quality Inspection,Incoming,ขาเข้า
 DocType: BOM,Materials Required (Exploded),วัสดุบังคับ (ระเบิด)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ลดรายได้สำหรับการออกโดยไม่จ่าย (LWP)
@@ -3215,10 +3230,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},แถว # {0}: ไม่มี Serial {1}​​ ไม่ตรงกับ {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,สบาย ๆ ออก
 DocType: Batch,Batch ID,ID ชุด
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},หมายเหตุ : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},หมายเหตุ : {0}
 ,Delivery Note Trends,แนวโน้มหมายเหตุการจัดส่งสินค้า
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ข้อมูลอย่างนี้สัปดาห์
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} จะต้องเป็น รายการ ที่จัดซื้อ หรือ ย่อย สัญญา ในแถว {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} จะต้องเป็น รายการ ที่จัดซื้อ หรือ ย่อย สัญญา ในแถว {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,บัญชี: {0} เท่านั้นที่สามารถได้รับการปรับปรุงผ่านการทำธุรกรรมสต็อก
 DocType: GL Entry,Party,งานเลี้ยง
 DocType: Sales Order,Delivery Date,วันที่ส่ง
@@ -3231,7 +3246,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ราคาซื้อเฉลี่ย
 DocType: Task,Actual Time (in Hours),เวลาที่เกิดขึ้นจริง (ในชั่วโมง)
 DocType: Employee,History In Company,ประวัติใน บริษัท
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,จดหมายข่าว
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,จดหมายข่าว
 DocType: Address,Shipping,การส่งสินค้า
 DocType: Stock Ledger Entry,Stock Ledger Entry,รายการสินค้าบัญชีแยกประเภท
 DocType: Department,Leave Block List,ฝากรายการบล็อก
@@ -3250,7 +3265,7 @@ DocType: Account,Auditor,ผู้สอบบัญชี
 DocType: Purchase Order,End date of current order's period,วันที่สิ้นสุดระยะเวลาการสั่งซื้อของ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ทำให้หนังสือเสนอ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,กลับ
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,เริ่มต้นหน่วยวัดสำหรับตัวแปรจะต้องเป็นแม่แบบเดียวกับ
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,เริ่มต้นหน่วยวัดสำหรับตัวแปรจะต้องเป็นแม่แบบเดียวกับ
 DocType: DocField,Fold,พับ
 DocType: Production Order Operation,Production Order Operation,การดำเนินงานการผลิตการสั่งซื้อ
 DocType: Pricing Rule,Disable,ปิดการใช้งาน
@@ -3282,7 +3297,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,รายงานไปยัง
 DocType: SMS Settings,Enter url parameter for receiver nos,ป้อนพารามิเตอร์ URL สำหรับ Nos รับ
 DocType: Sales Invoice,Paid Amount,จำนวนเงินที่ชำระ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',ปิด บัญชี {0} ต้องเป็นชนิด ' รับผิด '
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',ปิด บัญชี {0} ต้องเป็นชนิด ' รับผิด '
 ,Available Stock for Packing Items,สต็อกสำหรับการบรรจุรายการ
 DocType: Item Variant,Item Variant,รายการตัวแปร
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,การตั้งค่าแม่แบบที่อยู่นี้เป็นค่าเริ่มต้นที่ไม่มีค่าเริ่มต้นอื่น ๆ
@@ -3290,7 +3305,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,การบริหารจัดการ ที่มีคุณภาพ
 DocType: Production Planning Tool,Filter based on customer,กรองขึ้นอยู่กับลูกค้า
 DocType: Payment Tool Detail,Against Voucher No,กับคูปองไม่มี
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},กรุณากรอก ปริมาณ รายการ {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},กรุณากรอก ปริมาณ รายการ {0}
 DocType: Employee External Work History,Employee External Work History,ประวัติการทำงานของพนักงานภายนอก
 DocType: Tax Rule,Purchase,ซื้อ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,คงเหลือ จำนวน
@@ -3327,28 +3342,29 @@ Note: BOM = Bill of Materials",กลุ่มรวมของรายกา
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},อนุกรม ไม่มี ผลบังคับใช้สำหรับ รายการ {0}
 DocType: Item Variant Attribute,Attribute,คุณลักษณะ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,โปรดระบุจาก / ไปยังช่วง
-sites/assets/js/desk.min.js +7652,Created By,สร้างโดย
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,สร้างโดย
 DocType: Serial No,Under AMC,ภายใต้ AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,รายการอัตราการประเมินราคาจะคำนวณพิจารณาจำนวนเงินค่าใช้จ่ายบัตรกำนัลที่ดิน
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,ตั้งค่าเริ่มต้น สำหรับการขาย ในการทำธุรกรรม
 DocType: BOM Replace Tool,Current BOM,BOM ปัจจุบัน
-sites/assets/js/erpnext.min.js +8,Add Serial No,เพิ่ม หมายเลขซีเรียล
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,เพิ่ม หมายเลขซีเรียล
 DocType: Production Order,Warehouses,โกดัง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,การพิมพ์และ เครื่องเขียน
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,กลุ่มโหนด
 DocType: Payment Reconciliation,Minimum Amount,จำนวนขั้นต่ำ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,ปรับปรุง สินค้า สำเร็จรูป
 DocType: Workstation,per hour,ต่อชั่วโมง
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},ชุด {0} ใช้แล้ว ใน {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},ชุด {0} ใช้แล้ว ใน {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,บัญชีสำหรับ คลังสินค้า( Inventory ตลอด ) จะถูก สร้างขึ้นภายใต้ บัญชี นี้
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,คลังสินค้า ไม่สามารถลบได้ เป็นรายการ บัญชีแยกประเภท หุ้น ที่มีอยู่สำหรับ คลังสินค้า นี้
 DocType: Company,Distribution,การกระจาย
-sites/assets/js/erpnext.min.js +50,Amount Paid,จำนวนเงินที่ชำระ
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,จำนวนเงินที่ชำระ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ผู้จัดการโครงการ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,ส่งไป
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ส่วนลดสูงสุดที่ได้รับอนุญาตสำหรับรายการ: {0} เป็น {1}%
 DocType: Customer,Default Taxes and Charges,ภาษีและค่าใช้จ่ายเริ่มต้น
 DocType: Account,Receivable,ลูกหนี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,แถว # {0}: ไม่อนุญาตให้ผู้ผลิตที่จะเปลี่ยนเป็นใบสั่งซื้ออยู่แล้ว
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,บทบาทที่ได้รับอนุญาตให้ส่งการทำธุรกรรมที่เกินวงเงินที่กำหนด
 DocType: Sales Invoice,Supplier Reference,อ้างอิงจำหน่าย
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",หากการตรวจสอบรายการวัสดุสำหรับรายการย่อยประกอบจะได้รับการพิจารณาสำหรับการใช้วัตถุดิบ มิฉะนั้นทุกรายการย่อยประกอบจะได้รับการปฏิบัติเป็นวัตถุดิบ
@@ -3385,8 +3401,8 @@ DocType: Email Digest,Add/Remove Recipients,เพิ่ม / ลบ ชื่
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},การทำธุรกรรมที่ ไม่ได้รับอนุญาต กับ หยุด การผลิต สั่งซื้อ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",การตั้งค่า นี้ ปีงบประมาณ เป็นค่าเริ่มต้น ให้คลิกที่ 'ตั้ง เป็นค่าเริ่มต้น '
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),การตั้งค่า เซิร์ฟเวอร์ขาเข้า สำหรับการสนับสนุน อีเมล์ ของคุณ (เช่น support@example.com )
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ปัญหาการขาดแคลนจำนวน
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
 DocType: Salary Slip,Salary Slip,สลิปเงินเดือน
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,ปั่นเงา
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"โปรดระบุ “วันที่สิ้นสุด"""
@@ -3399,6 +3415,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",เมื่อใดของการทำธุรกรรมการตรวจสอบเป็น "Submitted" อีเมล์แบบ pop-up เปิดโดยอัตโนมัติในการส่งอีเมลไปยัง "ติดต่อ" ที่เกี่ยวข้องในการทำธุรกรรมที่มีการทำธุรกรรมเป็นสิ่งที่แนบ ผู้ใช้อาจจะหรือไม่อาจจะส่งอีเมล
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,การตั้งค่าสากล
 DocType: Employee Education,Employee Education,การศึกษาการทำงานของพนักงาน
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
 DocType: Salary Slip,Net Pay,จ่ายสุทธิ
 DocType: Account,Account,บัญชี
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,อนุกรม ไม่มี {0} ได้รับ อยู่แล้ว
@@ -3431,7 +3448,7 @@ DocType: BOM,Manufacturing User,ผู้ใช้การผลิต
 DocType: Purchase Order,Raw Materials Supplied,วัตถุดิบ
 DocType: Purchase Invoice,Recurring Print Format,รูปแบบที่เกิดขึ้นประจำพิมพ์
 DocType: Communication,Series,ชุด
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ สั่งซื้อ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ สั่งซื้อ
 DocType: Appraisal,Appraisal Template,แม่แบบการประเมิน
 DocType: Communication,Email,อีเมล์
 DocType: Item Group,Item Classification,การจัดประเภทรายการ
@@ -3487,6 +3504,7 @@ DocType: HR Settings,Payroll Settings,การตั้งค่า บัญ
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,ตรงกับใบแจ้งหนี้ไม่ได้เชื่อมโยงและการชำระเงิน
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,สถานที่การสั่งซื้อ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,รากไม่สามารถมีศูนย์ต้นทุนผู้ปกครอง
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,เลือกยี่ห้อ ...
 DocType: Sales Invoice,C-Form Applicable,C-Form สามารถนำไปใช้ได้
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
 DocType: Supplier,Address and Contacts,ที่อยู่และที่ติดต่อ
@@ -3497,7 +3515,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,รับบัตรกำนัลที่โดดเด่น
 DocType: Warranty Claim,Resolved By,แก้ไขได้โดยการ
 DocType: Appraisal,Start Date,วันที่เริ่มต้น
-sites/assets/js/desk.min.js +7629,Value,มูลค่า
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,มูลค่า
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,จัดสรร ใบ เป็นระยะเวลา
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,คลิกที่นี่เพื่อตรวจสอบ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,บัญชี {0}: คุณไม่สามารถกำหนดตัวเองเป็นบัญชีผู้ปกครอง
@@ -3513,14 +3531,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox เข็น
 DocType: Dropbox Backup,Weekly,รายสัปดาห์
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,เช่น smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,รับ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,รับ
 DocType: Maintenance Visit,Fully Completed,เสร็จสมบูรณ์
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% แล้วเสร็จ
 DocType: Employee,Educational Qualification,วุฒิการศึกษา
 DocType: Workstation,Operating Costs,ค่าใช้จ่ายในการดำเนินงาน
 DocType: Employee Leave Approver,Employee Leave Approver,อนุมัติพนักงานออก
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ได้รับการเพิ่มประสบความสำเร็จในรายการจดหมายข่าวของเรา
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,เครื่องจักรกลลำแสงอิเล็กตรอน
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ซื้อผู้จัดการโท
@@ -3533,7 +3551,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,DocType Prevdoc
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,เพิ่ม / แก้ไขราคา
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,แผนภูมิของศูนย์ต้นทุน
 ,Requested Items To Be Ordered,รายการที่ได้รับการร้องขอที่จะสั่งซื้อ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,คำสั่งซื้อของฉัน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,คำสั่งซื้อของฉัน
 DocType: Price List,Price List Name,ชื่อรายการราคา
 DocType: Time Log,For Manufacturing,สำหรับการผลิต
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,ผลรวม
@@ -3544,7 +3562,7 @@ DocType: Account,Income,เงินได้
 DocType: Industry Type,Industry Type,ประเภทอุตสาหกรรม
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,สิ่งที่ผิดพลาด!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,ใบแจ้งหนี้ การขาย {0} ได้ ถูกส่งมา อยู่แล้ว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,ใบแจ้งหนี้ การขาย {0} ได้ ถูกส่งมา อยู่แล้ว
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,วันที่เสร็จสมบูรณ์
 DocType: Purchase Invoice Item,Amount (Company Currency),จำนวนเงิน (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,หล่อตาย
@@ -3558,10 +3576,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,ปี
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,จุดขายข้อมูลส่วนตัว
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,กรุณาอัปเดตการตั้งค่า SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,เวลาเข้าสู่ระบบ {0} เรียกเก็บเงินแล้ว
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,เวลาเข้าสู่ระบบ {0} เรียกเก็บเงินแล้ว
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,เงินให้กู้ยืม ที่ไม่มีหลักประกัน
 DocType: Cost Center,Cost Center Name,ค่าใช้จ่ายชื่อศูนย์
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,รายการ {0} ด้วย หมายเลขเครื่อง {1} มีการติดตั้ง อยู่แล้ว
 DocType: Maintenance Schedule Detail,Scheduled Date,วันที่กำหนด
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,ทั้งหมดที่จ่าย Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,ข้อความที่ยาวกว่า 160 ตัวอักษร จะถูกแบ่งออกเป็นหลายข้อความ
@@ -3569,10 +3586,10 @@ DocType: Purchase Receipt Item,Received and Accepted,และได้รับ
 ,Serial No Service Contract Expiry,อนุกรมไม่มีหมดอายุสัญญาบริการ
 DocType: Item,Unit of Measure Conversion,หน่วยวัดแปลง
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,พนักงานไม่สามารถเปลี่ยนแปลงได้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
 DocType: Naming Series,Help HTML,วิธีใช้ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},weightage รวม ที่ได้รับมอบหมาย ควรจะ 100% มันเป็น {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
 DocType: Address,Name of person or organization that this address belongs to.,ชื่อบุคคลหรือองค์กรที่อยู่นี้เป็นของ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,ซัพพลายเออร์ ของคุณ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
@@ -3583,10 +3600,11 @@ DocType: Lead,Converted,แปลง
 DocType: Item,Has Serial No,มีซีเรียลไม่มี
 DocType: Employee,Date of Issue,วันที่ออก
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: จาก {0} สำหรับ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
 DocType: Issue,Content Type,ประเภทเนื้อหา
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,คอมพิวเตอร์
 DocType: Item,List this Item in multiple groups on the website.,รายการนี​​้ในหลายกลุ่มในเว็บไซต์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,รายการ: {0} ไม่อยู่ในระบบ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
 DocType: Payment Reconciliation,Get Unreconciled Entries,คอมเมนต์ได้รับ Unreconciled
@@ -3597,14 +3615,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,ไปที่โกดัง
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},บัญชี {0} ได้รับการป้อน มากกว่าหนึ่งครั้ง ในรอบปี {1}
 ,Average Commission Rate,อัตราเฉลี่ยของค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'มี ซีเรียล ไม่' ไม่สามารถ 'ใช่' สำหรับรายการ ที่ไม่มี สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'มี ซีเรียล ไม่' ไม่สามารถ 'ใช่' สำหรับรายการ ที่ไม่มี สต็อก
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ผู้เข้าร่วมไม่สามารถทำเครื่องหมายสำหรับวันที่ในอนาคต
 DocType: Pricing Rule,Pricing Rule Help,กฎการกำหนดราคาช่วยเหลือ
 DocType: Purchase Taxes and Charges,Account Head,หัวบัญชี
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ปรับปรุงค่าใช้จ่ายเพิ่มเติมในการคำนวณค่าใช้จ่ายในที่ดินของรายการ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,ไฟฟ้า
 DocType: Stock Entry,Total Value Difference (Out - In),ความแตกต่างมูลค่ารวม (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,แถว {0}: อัตราแลกเปลี่ยนที่มีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,แถว {0}: อัตราแลกเปลี่ยนที่มีผลบังคับใช้
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},รหัสผู้ใช้ ไม่ได้ ตั้งไว้สำหรับ พนักงาน {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,จากการรับประกันเรียกร้อง
@@ -3618,15 +3636,17 @@ DocType: Buying Settings,Naming Series,การตั้งชื่อซี
 DocType: Leave Block List,Leave Block List Name,ฝากชื่อรายการที่ถูกบล็อก
 DocType: User,Enabled,เปิดการใช้งาน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,สินทรัพย์ หุ้น
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},คุณ ต้องการที่จะ ส่ง สลิป เงินเดือน ทุก เดือน {0} และปี {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},คุณ ต้องการที่จะ ส่ง สลิป เงินเดือน ทุก เดือน {0} และปี {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,นำเข้าสมาชิก
 DocType: Target Detail,Target Qty,จำนวนเป้าหมาย
 DocType: Attendance,Present,นำเสนอ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,หมายเหตุ การจัดส่ง {0} จะต้องไม่ถูก ส่งมา
 DocType: Notification Control,Sales Invoice Message,ข้อความขายใบแจ้งหนี้
 DocType: Authorization Rule,Based On,ขึ้นอยู่กับ
-,Ordered Qty,สั่งซื้อ จำนวน
+DocType: Sales Order Item,Ordered Qty,สั่งซื้อ จำนวน
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},ระยะเวลาเริ่มต้นและระยะเวลาในการบังคับใช้สำหรับวันที่เกิดขึ้น {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,กิจกรรมของโครงการ / งาน
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,สร้าง Slips เงินเดือน
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ไม่ได้เป็น id ของ อีเมลที่ถูกต้อง
@@ -3666,7 +3686,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,อัพโหลดผู้เข้าร่วม
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,รายการวัสดุและปริมาณการผลิตจะต้อง
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ช่วงสูงอายุ 2
-DocType: Journal Entry Account,Amount,จำนวน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,จำนวน
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,โลดโผน
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM แทนที่
 ,Sales Analytics,Analytics ขาย
@@ -3693,7 +3713,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,วันที่ คาดว่าจะ ไม่สามารถเป็น วัสดุ ก่อนที่จะ ขอ วันที่
 DocType: Contact Us Settings,City,เมือง
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,เครื่องจักรกลอัลตราโซนิก
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,ข้อผิดพลาด: ไม่ได้รหัสที่ถูกต้อง?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,ข้อผิดพลาด: ไม่ได้รหัสที่ถูกต้อง?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,รายการ {0} จะต้องเป็น รายการ ขาย
 DocType: Naming Series,Update Series Number,จำนวน Series ปรับปรุง
 DocType: Account,Equity,ความเสมอภาค
@@ -3708,7 +3728,7 @@ DocType: Purchase Taxes and Charges,Actual,ตามความเป็นจ
 DocType: Authorization Rule,Customerwise Discount,ส่วนลด Customerwise
 DocType: Purchase Invoice,Against Expense Account,กับบัญชีค่าใช้จ่าย
 DocType: Production Order,Production Order,สั่งซื้อการผลิต
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,หมายเหตุ การติดตั้ง {0} ได้ ถูกส่งมา อยู่แล้ว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,หมายเหตุ การติดตั้ง {0} ได้ ถูกส่งมา อยู่แล้ว
 DocType: Quotation Item,Against Docname,กับ ชื่อเอกสาร
 DocType: SMS Center,All Employee (Active),พนักงาน (Active) ทั้งหมด
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ดู ตอนนี้
@@ -3716,14 +3736,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,วัตถุดิบต้นทุน
 DocType: Item,Re-Order Level,ระดับ Re-Order
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ป้อนรายการและจำนวนที่วางแผนไว้สำหรับที่คุณต้องการที่จะยกระดับการสั่งผลิตหรือดาวน์โหลดวัตถุดิบสำหรับการวิเคราะห์
-sites/assets/js/list.min.js +174,Gantt Chart,แผนภูมิแกนต์
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,แผนภูมิแกนต์
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,รายการวันหยุดที่ใช้บังคับ
 DocType: Employee,Cheque,เช็ค
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ชุด ล่าสุด
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,ประเภทรายงาน มีผลบังคับใช้
 DocType: Item,Serial Number Series,ชุด หมายเลข
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},คลังสินค้า จำเป็นสำหรับ รายการ หุ้น {0} ในแถว {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},คลังสินค้า จำเป็นสำหรับ รายการ หุ้น {0} ในแถว {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,ค้าปลีกและ ขายส่ง
 DocType: Issue,First Responded On,ครั้งแรกเมื่อวันที่ง่วง
 DocType: Website Item Group,Cross Listing of Item in multiple groups,รายชื่อครอสของรายการในหลายกลุ่ม
@@ -3738,7 +3758,7 @@ DocType: Attendance,Attendance,การดูแลรักษา
 DocType: Page,No,ไม่
 DocType: BOM,Materials,วัสดุ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ถ้าไม่ได้ตรวจสอบรายชื่อจะต้องมีการเพิ่มแต่ละแผนกที่มันจะต้องมีการใช้
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,วันที่โพสต์และโพสต์เวลามีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,วันที่โพสต์และโพสต์เวลามีผลบังคับใช้
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,แม่แบบภาษี สำหรับการทำธุรกรรมการซื้อ
 ,Item Prices,รายการราคาสินค้า
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบสั่งซื้อ
@@ -3758,9 +3778,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ค่าใช้จ่ายใน การดูแลระบบ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,การให้คำปรึกษา
 DocType: Customer Group,Parent Customer Group,กลุ่มลูกค้าผู้ปกครอง
-sites/assets/js/erpnext.min.js +50,Change,เปลี่ยนแปลง
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,เปลี่ยนแปลง
 DocType: Purchase Invoice,Contact Email,ติดต่ออีเมล์
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',สั่งซื้อ {0} คือ ' หยุด '
 DocType: Appraisal Goal,Score Earned,คะแนนที่ได้รับ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","เช่นผู้ ""บริษัท LLC ของฉัน"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,ระยะเวลาการแจ้งให้ทราบล่วงหน้า
@@ -3770,12 +3789,13 @@ DocType: Packing Slip,Gross Weight UOM,UOM น้ำหนักรวม
 DocType: Email Digest,Receivables / Payables,ลูกหนี้ / เจ้าหนี้
 DocType: Delivery Note Item,Against Sales Invoice,กับขายใบแจ้งหนี้
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,การกระแทก
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,บัญชีเครดิต
 DocType: Landed Cost Item,Landed Cost Item,รายการค่าใช้จ่ายลง
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,แสดงค่าศูนย์
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,จำนวนสินค้าที่ได้หลังการผลิต / บรรจุใหม่จากจำนวนวัตถุดิบที่มี
 DocType: Payment Reconciliation,Receivable / Payable Account,ลูกหนี้ / เจ้าหนี้การค้า
 DocType: Delivery Note Item,Against Sales Order Item,กับการขายรายการสั่งซื้อ
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
 DocType: Item,Default Warehouse,คลังสินค้าเริ่มต้น
 DocType: Task,Actual End Date (via Time Logs),วันที่สิ้นสุดที่เกิดขึ้นจริง (ผ่านบันทึกเวลา)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},งบประมาณไม่สามารถกำหนดกลุ่มกับบัญชี {0}
@@ -3789,7 +3809,7 @@ DocType: Issue,Support Team,ทีมสนับสนุน
 DocType: Appraisal,Total Score (Out of 5),คะแนนรวม (out of 5)
 DocType: Contact Us Settings,State,รัฐ
 DocType: Batch,Batch,ชุด
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,สมดุล
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,สมดุล
 DocType: Project,Total Expense Claim (via Expense Claims),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย)
 DocType: User,Gender,เพศ
 DocType: Journal Entry,Debit Note,หมายเหตุเดบิต
@@ -3805,9 +3825,8 @@ DocType: Lead,Blog Subscriber,สมาชิกบล็อก
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,สร้างกฎ เพื่อ จำกัด การ ทำธุรกรรม ตามค่า
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",ถ้าการตรวจสอบรวม​​กัน ของวันทําการจะรวมถึงวันหยุดและนี้จะช่วยลดค่าของเงินเดือนที่ต้องการต่อวัน
 DocType: Purchase Invoice,Total Advance,ล่วงหน้ารวม
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,ขอ เปิดจุก วัสดุ
 DocType: Workflow State,User,ผู้ใช้งาน
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,การประมวลผลเงินเดือน
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,การประมวลผลเงินเดือน
 DocType: Opportunity Item,Basic Rate,อัตราขั้นพื้นฐาน
 DocType: GL Entry,Credit Amount,จำนวนเครดิต
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,ตั้งเป็น ที่หายไป
@@ -3815,7 +3834,7 @@ DocType: Customer,Credit Days Based On,วันขึ้นอยู่กั
 DocType: Tax Rule,Tax Rule,กฎภาษี
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,รักษาอัตราเดียวตลอดวงจรการขาย
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,บันทึกเวลานอกแผนเวิร์คสเตชั่ชั่วโมงทำงาน
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} ถูกส่งมา อยู่แล้ว
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ถูกส่งมา อยู่แล้ว
 ,Items To Be Requested,รายการที่จะ ได้รับการร้องขอ
 DocType: Purchase Order,Get Last Purchase Rate,รับซื้อให้ล่าสุด
 DocType: Time Log,Billing Rate based on Activity Type (per hour),อัตราการเรียกเก็บเงินขึ้นอยู่กับประเภทกิจกรรม (ต่อชั่วโมง)
@@ -3824,6 +3843,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",บริษัท ID อีเมล์ ไม่พบ จึง ส่ง ไม่ได้ส่ง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),การใช้ประโยชน์กองทุน (สินทรัพย์)
 DocType: Production Planning Tool,Filter based on item,กรองขึ้นอยู่กับสินค้า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,บัญชีเดบิต
 DocType: Fiscal Year,Year Start Date,วันที่เริ่มต้นปี
 DocType: Attendance,Employee Name,ชื่อของพนักงาน
 DocType: Sales Invoice,Rounded Total (Company Currency),รวมกลม (สกุลเงิน บริษัท )
@@ -3835,14 +3855,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,blanking
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,ผลประโยชน์ของพนักงาน
 DocType: Sales Invoice,Is POS,POS เป็น
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
 DocType: Production Order,Manufactured Qty,จำนวนการผลิต
 DocType: Purchase Receipt Item,Accepted Quantity,จำนวนที่ยอมรับ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ไม่อยู่
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ตั๋วเงินยกให้กับลูกค้า
 DocType: DocField,Default,ผิดนัด
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id โครงการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} สมาชิกเพิ่ม
 DocType: Maintenance Schedule,Schedule,กำหนดการ
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",กำหนดงบประมาณสำหรับศูนย์ต้นทุนนี้ การดำเนินการในการตั้งงบประมาณให้ดูรายการ "บริษัท ฯ "
@@ -3850,7 +3870,7 @@ DocType: Account,Parent Account,บัญชีผู้ปกครอง
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,ดุม
 DocType: GL Entry,Voucher Type,ประเภทบัตรกำนัล
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
 DocType: Expense Claim,Approved,ได้รับการอนุมัติ
 DocType: Pricing Rule,Price,ราคา
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
@@ -3859,23 +3879,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,การศึกษา
 DocType: Selling Settings,Campaign Naming By,ตั้งชื่อ ตาม แคมเปญ
 DocType: Employee,Current Address Is,ที่อยู่ ปัจจุบัน เป็น
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",ตัวเลือก ตั้งสกุลเงินเริ่มต้นของ บริษัท ฯ หากไม่ได้ระบุไว้
 DocType: Address,Office,สำนักงาน
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,รายงาน มาตรฐาน
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,รายการบัญชีวารสาร
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},แถว {0}: ปาร์ตี้ / บัญชีไม่ตรงกับ {1} / {2} ใน {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,จำนวนที่จำหน่ายจากคลังสินค้า
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},แถว {0}: ปาร์ตี้ / บัญชีไม่ตรงกับ {1} / {2} ใน {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,เพื่อสร้างบัญชีภาษี
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
 DocType: Account,Stock,คลังสินค้า
 DocType: Employee,Current Address,ที่อยู่ปัจจุบัน
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","หากรายการเป็นตัวแปรของรายการอื่นแล้วคำอธิบายภาพ, การกำหนดราคาภาษี ฯลฯ จะถูกตั้งค่าจากแม่นอกจากที่ระบุไว้อย่างชัดเจน"
 DocType: Serial No,Purchase / Manufacture Details,รายละเอียด การซื้อ / การผลิต
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,รุ่นที่สินค้าคงคลัง
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,รุ่นที่สินค้าคงคลัง
 DocType: Employee,Contract End Date,วันที่สิ้นสุดสัญญา
 DocType: Sales Order,Track this Sales Order against any Project,ติดตามนี้สั่งซื้อขายกับโครงการใด ๆ
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ดึงยอดขาย (รอการส่งมอบ) คำสั่งตามเกณฑ์ดังกล่าวข้างต้น
 DocType: DocShare,Document Type,ประเภทเอกสาร
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,ใบเสนอราคา จาก ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ใบเสนอราคา จาก ผู้ผลิต
 DocType: Deduction Type,Deduction Type,ประเภทหัก
 DocType: Attendance,Half Day,ครึ่งวัน
 DocType: Pricing Rule,Min Qty,นาที จำนวน
@@ -3886,20 +3908,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,สำหรับปริมาณ (ผลิตจำนวน) มีผลบังคับใช้
 DocType: Stock Entry,Default Target Warehouse,คลังสินค้าเป้าหมายเริ่มต้น
 DocType: Purchase Invoice,Net Total (Company Currency),รวมสุทธิ (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,แถว {0}: ประเภทพรรคและพรรคจะใช้ได้เฉพาะกับลูกหนี้ / เจ้าหนี้การค้า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,แถว {0}: ประเภทพรรคและพรรคจะใช้ได้เฉพาะกับลูกหนี้ / เจ้าหนี้การค้า
 DocType: Notification Control,Purchase Receipt Message,ซื้อใบเสร็จรับเงินข้อความ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,ใบที่จัดสรรทั้งหมดมีมากขึ้นกว่าช่วงเวลา
 DocType: Production Order,Actual Start Date,วันที่เริ่มต้นจริง
 DocType: Sales Order,% of materials delivered against this Sales Order,% ของวัสดุที่ส่งต่อนี้สั่งซื้อขาย
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,การเคลื่อนไหวระเบียนรายการ
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,การเคลื่อนไหวระเบียนรายการ
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,จดหมายข่าวรายชื่อสมาชิก
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,ให้บริการ
 DocType: Hub Settings,Hub Settings,การตั้งค่า Hub
 DocType: Project,Gross Margin %,อัตรากำไรขั้นต้น%
 DocType: BOM,With Operations,กับการดำเนินงาน
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,รายการบัญชีที่ได้รับการทำในสกุลเงิน {0} สำหรับ บริษัท {1} กรุณาเลือกบัญชีลูกหนี้หรือเจ้าหนี้กับสกุลเงิน {0}
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,รายการบัญชีที่ได้รับการทำในสกุลเงิน {0} สำหรับ บริษัท {1} กรุณาเลือกบัญชีลูกหนี้หรือเจ้าหนี้กับสกุลเงิน {0}
 ,Monthly Salary Register,สมัครสมาชิกเงินเดือน
-apps/frappe/frappe/website/template.py +123,Next,ต่อไป
+apps/frappe/frappe/website/template.py +140,Next,ต่อไป
 DocType: Warranty Claim,If different than customer address,หาก แตกต่างจาก ที่อยู่ของลูกค้า
 DocType: BOM Operation,BOM Operation,การดำเนินงาน BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,ไฟฟ้า
@@ -3930,6 +3953,7 @@ DocType: Purchase Invoice,Next Date,วันที่ถัดไป
 DocType: Employee Education,Major/Optional Subjects,วิชาเอก / เสริม
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,กรุณากรอกตัวอักษรภาษีและค่าใช้จ่าย
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,เครื่องจักรกล
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",ที่นี่คุณสามารถรักษารายละเอียดเช่นชื่อครอบครัวและอาชีพของผู้ปกครองคู่สมรสและเด็ก
 DocType: Hub Settings,Seller Name,ชื่อผู้ขาย
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ภาษีและค่าใช้จ่ายหัก (สกุลเงิน บริษัท )
@@ -3956,29 +3980,29 @@ DocType: Purchase Order,To Receive and Bill,การรับและบิล
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,นักออกแบบ
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ข้อตกลงและเงื่อนไขของแม่แบบ
 DocType: Serial No,Delivery Details,รายละเอียดการจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,โดยอัตโนมัติสร้างวัสดุขอถ้าปริมาณต่ำกว่าระดับนี้
 ,Item-wise Purchase Register,สมัครสมาชิกสั่งซื้อสินค้าที่ชาญฉลาด
 DocType: Batch,Expiry Date,วันหมดอายุ
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",การตั้งค่าระดับสั่งซื้อสินค้าจะต้องเป็นรายการการซื้อหรือการผลิตรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",การตั้งค่าระดับสั่งซื้อสินค้าจะต้องเป็นรายการการซื้อหรือการผลิตรายการ
 ,Supplier Addresses and Contacts,ที่อยู่ ของผู้ผลิต และผู้ติดต่อ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,กรุณาเลือก หมวดหมู่ แรก
 apps/erpnext/erpnext/config/projects.py +18,Project master.,ต้นแบบโครงการ
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ไม่แสดงสัญลักษณ์ใด ๆ เช่น ฯลฯ $ ต่อไปกับเงินสกุล
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(ครึ่งวัน)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(ครึ่งวัน)
 DocType: Supplier,Credit Days,วันเครดิต
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,รับสินค้า จาก BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,รับสินค้า จาก BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,นำวันเวลา
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},แถว {0}: ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้บัญชี {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},แถว {0}: ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้บัญชี {1}
 DocType: Dropbox Backup,Send Notifications To,แจ้งเตือนไปให้
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref วันที่สมัคร
 DocType: Employee,Reason for Leaving,เหตุผลที่ลาออก
 DocType: Expense Claim Detail,Sanctioned Amount,จำนวนตามทำนองคลองธรรม
 DocType: GL Entry,Is Opening,คือการเปิด
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,บัญชี {0} ไม่อยู่
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,บัญชี {0} ไม่อยู่
 DocType: Account,Cash,เงินสด
 DocType: Employee,Short biography for website and other publications.,ชีวประวัติสั้นสำหรับเว็บไซต์และสิ่งพิมพ์อื่น ๆ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},กรุณาสร้าง โครงสร้าง เงินเดือน สำหรับพนักงาน {0}
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index ae3692b5cd..d87bba4357 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -2,7 +2,7 @@ DocType: Employee,Salary Mode,Maaş Modu
 DocType: Employee,Salary Mode,Maaş Modu
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Eğer mevsimsellik dayalı izlemek istiyorsanız, Aylık Dağıtım seçin."
 DocType: Employee,Divorced,Ayrılmış
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Uyarı: Aynı madde birden çok kez girildi.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Uyarı: Aynı madde birden çok kez girildi.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Öğeler zaten senkronize
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Öğe bir işlemde birden çok kez eklenecek izin ver
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Malzeme ziyaret {0} Bu Garanti Talep iptal etmeden önce iptal
@@ -29,7 +29,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Sıkıştırma artı sinterleme
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Döviz Fiyat Listesi için gereklidir {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* İşlemde hesaplanacaktır.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Malzeme talebinden
+DocType: Purchase Order,Customer Contact,Müşteri İletişim
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Malzeme talebinden
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Ağaç
 DocType: Job Applicant,Job Applicant,İş Başvuru Sahiibi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Daha fazla sonuç.
@@ -48,7 +49,7 @@ DocType: Sales Invoice,Customer Name,Müşteri Adı
 DocType: Sales Invoice,Customer Name,Müşteri Adı
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Para birimi, kur oranı,ihracat toplamı, bütün ihracat toplamı vb. İrsaliye'de, POS'da Fiyat Teklifinde, Satış Faturasında, Satış Emrinde vb. mevcuttur."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kafaları (veya gruplar) kendisine karşı Muhasebe Girişler yapılır ve dengeler korunur.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),{0} için bekleyen sıfırdan az olamaz ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),{0} için bekleyen sıfırdan az olamaz ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 dakika Standart
 DocType: Leave Type,Leave Type Name,İzin Tipi Adı
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seri Başarıyla güncellendi
@@ -61,9 +62,8 @@ DocType: SMS Center,All Supplier Contact,Bütün Tedarikçi Kişiler
 DocType: Quality Inspection Reading,Parameter,Parametre
 DocType: Quality Inspection Reading,Parameter,Parametre
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Beklenen Bitiş Tarihi Beklenen Başlangıç ​​Tarihinden daha az olamaz
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,"Gerçekten, üretim siparişi unstop istiyor musunuz:"
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Satır # {0}: Puan aynı olmalıdır {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Yeni İzin Uygulaması
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Yeni İzin Uygulaması
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1.Müşteriye bilgilendirme sağlamak için Malzeme kodu ve bu seçenek kullanılarak onları kodları ile araştırılabilir yapmak
@@ -74,8 +74,7 @@ DocType: Sales Invoice Item,Quantity,Miktar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Krediler (Yükümlülükler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Krediler (Yükümlülükler)
 DocType: Employee Education,Year of Passing,Geçiş Yılı
-sites/assets/js/erpnext.min.js +27,In Stock,Stokta Var
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Sadece faturasız Satış Siparişi karşı ödeme yapabilirsiniz
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Stokta Var
 DocType: Designation,Designation,Atama
 DocType: Designation,Designation,Atama
 DocType: Production Plan Item,Production Plan Item,Üretim Planı nesnesi
@@ -85,7 +84,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Healt
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sağlık hizmeti
 DocType: Purchase Invoice,Monthly,Aylık
 DocType: Purchase Invoice,Monthly,Aylık
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Fatura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Ödeme Gecikme (Gün)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E
@@ -95,10 +95,10 @@ DocType: Company,Abbr,Kısaltma
 DocType: Company,Abbr,Kısaltma
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Satır {0}: {1} {2} ile eşleşmiyor {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Satır {0}: {1} {2} ile eşleşmiyor {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Satır # {0}:
 DocType: Delivery Note,Vehicle No,Araç No
-sites/assets/js/erpnext.min.js +55,Please select Price List,Fiyat Listesi seçiniz
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Fiyat Listesi seçiniz
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Ağaç
 DocType: Production Order Operation,Work In Progress,Devam eden iş
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D baskı
@@ -129,6 +129,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogram
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogram
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,İş Açılışı.
 DocType: Item Attribute,Increment,Artım
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Warehouse Seçiniz ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamcılık
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamcılık
 DocType: Employee,Married,Evli
@@ -139,7 +140,7 @@ DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Bakkal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Bakkal
 DocType: Quality Inspection Reading,Reading 1,1 Okuma
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Banka Girişi Yap
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Banka Girişi Yap
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Emeklilik Fonları
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Emeklilik Fonları
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Hesap türü Depo ise Depo zorunludur
@@ -153,7 +154,7 @@ DocType: POS Profile,Write Off Cost Center,Borç Silme Maliyet Merkezi
 DocType: Warehouse,Warehouse Detail,Depo Detayı
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Kredi limiti müşteri için aşıldı {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Vergi Türü
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},{0} dan önceki girdileri ekleme veya güncelleme yetkiniz yok
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},{0} dan önceki girdileri ekleme veya güncelleme yetkiniz yok
 DocType: Item,Item Image (if not slideshow),Ürün Görüntü (yoksa slayt)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Aynı isimle bulunan bir müşteri
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Saat Hızı / 60) * Gerçek Çalışma Süresi
@@ -163,7 +164,7 @@ DocType: Blog Post,Guest,Konuk
 DocType: Quality Inspection,Get Specification Details,Şartname Detaylarını alın
 DocType: Lead,Interested,İlgili
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Ürün Ağacı
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Açılış
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Açılış
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Gönderen {0} için {1}
 DocType: Item,Copy From Item Group,Ürün Grubundan kopyalayın
 DocType: Journal Entry,Opening Entry,Giriş Girdisi
@@ -176,7 +177,7 @@ DocType: Lead,Product Enquiry,Ürün Sorgulama
 DocType: Standard Reply,Owner,Sahibi
 DocType: Standard Reply,Owner,Sahibi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Lütfen ilk önce şirketi girin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,İlk Şirket seçiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,İlk Şirket seçiniz
 DocType: Employee Education,Under Graduate,Lisans
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Hedefi
 DocType: BOM,Total Cost,Toplam Maliyet
@@ -202,6 +203,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Tü
 DocType: Upload Attendance,Import Log,İthalat Günlüğü
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Gönder
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Gönder
+DocType: Sales Invoice Item,Delivered By Supplier,Tedarikçi Tarafından Teslim
 DocType: SMS Center,All Contact,Tüm İrtibatlar
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Yıllık Gelir
 DocType: Period Closing Voucher,Closing Fiscal Year,Mali Yılı Kapanış
@@ -212,15 +214,15 @@ DocType: Journal Entry,Contra Entry,Contra Giriş
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Kayıtlar
 DocType: Journal Entry Account,Credit in Company Currency,Şirket Para Kredi
 DocType: Delivery Note,Installation Status,Kurulum Durumu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Onaylanan ve reddedilen miktarların toplamı alınan ürün miktarına eşit olmak zorundadır. {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Onaylanan ve reddedilen miktarların toplamı alınan ürün miktarına eşit olmak zorundadır. {0}
 DocType: Item,Supply Raw Materials for Purchase,Tedarik Hammadde Satın Alma için
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Ürün {0} Satın alma ürünü olmalıdır
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", Şablon İndir uygun verileri doldurmak ve değiştirilmiş dosya ekleyin.
  Seçilen dönemde tüm tarihler ve çalışan kombinasyonu mevcut katılım kayıtları ile, şablonda gelecek"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Ürün {0} aktif değil veya kullanım ömrünün sonuna gelindi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Ürün {0} aktif değil veya kullanım ömrünün sonuna gelindi
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Satış Faturası verildikten sonra güncellenecektir.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,İK Modülü Ayarları
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,İK Modülü Ayarları
 DocType: SMS Center,SMS Center,SMS Merkezi
@@ -252,14 +254,13 @@ apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and disco
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Fiyatlandırma ve indirim uygulanması için kurallar.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Ile This Time Log çatışmalar {0} için {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Fiyat Listesi Alış veya Satış için geçerli olmalıdır
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Kurulum tarih Ürün için teslim tarihinden önce olamaz {0}
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Kurulum tarih Ürün için teslim tarihinden önce olamaz {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Kurulum tarih Ürün için teslim tarihinden önce olamaz {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Kurulum tarih Ürün için teslim tarihinden önce olamaz {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Fiyat Listesi Puan İndirim (%)
-sites/assets/js/form.min.js +279,Start,Başlangıç
-sites/assets/js/form.min.js +279,Start,Başlangıç
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Başlangıç
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Başlangıç
 DocType: User,First Name,Ad
 DocType: User,First Name,Ad
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Kurulum tamamlandı. Yenileniyor.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Tam kalıba döküm
 DocType: Offer Letter,Select Terms and Conditions,Şartlar ve Koşulları Seç
 DocType: Production Planning Tool,Sales Orders,Satış Siparişleri
@@ -291,6 +292,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Satış Fatura Ürün Karşı
 ,Production Orders in Progress,Devam eden Üretim Siparişleri
 DocType: Lead,Address & Contact,Adres ve İrtibat
+DocType: Leave Allocation,Add unused leaves from previous allocations,Önceki tahsisleri kullanılmayan yaprakları ekleyin
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Sonraki Dönüşümlü {0} üzerinde oluşturulur {1}
 DocType: Newsletter List,Total Subscribers,Toplam Aboneler
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,İletişim İsmi
@@ -298,12 +300,12 @@ DocType: Production Plan Item,SO Pending Qty,SO Bekleyen Miktar
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Yukarıda belirtilen kriterler için maaş makbuzu oluştur.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Satın alma isteği.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Çift konut
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Yalnızca seçilen izin onaylayıcı bu İzin uygulamasını verebilir
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Yalnızca seçilen izin onaylayıcı bu İzin uygulamasını verebilir
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Yıl başına bırakır
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} Ayarlar> Ayarlar yoluyla> Adlandırma Serisi Serisi adlandırma set Lütfen
 DocType: Time Log,Will be updated when batched.,Serilendiğinde güncellenecektir.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Satır {0}: kontrol edin Hesabı karşı 'Advance mı' {1} Bu bir avans giriş ise.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Satır {0}: kontrol edin Hesabı karşı 'Advance mı' {1} Bu bir avans giriş ise.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Depo {0} Şirket {1}e ait değildir
 DocType: Bulk Email,Message,Mesaj
 DocType: Bulk Email,Message,Mesaj
@@ -312,8 +314,8 @@ DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Erişim Anahtarı
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Erişim Anahtarı
 DocType: Payment Tool,Reference No,Referans No
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,İzin engellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Yıllık
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Yıllık
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stok Uzlaşma Öğe
@@ -328,9 +330,9 @@ DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
 DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
 DocType: Item,Publish in Hub,Hub Yayınla
 ,Terretory,Bölge
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Ürün {0} iptal edildi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Malzeme Talebi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Malzeme Talebi
 DocType: Bank Reconciliation,Update Clearance Date,Güncelleme Alma Tarihi
 DocType: Item,Purchase Details,Satın alma Detayları
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Satın Alma Emri 'Hammadde Tedarik' tablosunda bulunamadı Item {0} {1}
@@ -349,7 +351,7 @@ DocType: Lead,Suggestions,Öneriler
 DocType: Lead,Suggestions,Öneriler
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Bu bölgede Ürün grubu bütçeleri ayarlayın. Dağıtımı ayarlayarak dönemsellik de ekleyebilirsiniz.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Depo ana hesap grubu giriniz {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Karşı Ödeme {0} {1} Üstün Tutar daha büyük olamaz {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Karşı Ödeme {0} {1} Üstün Tutar daha büyük olamaz {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Cep No
 DocType: Lead,Mobile No.,Cep No
@@ -378,11 +380,9 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Yeni Stok UOM
 DocType: Period Closing Voucher,Closing Account Head,Kapanış Hesap Başkanı
 DocType: Employee,External Work History,Dış Çalışma Geçmişi
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Dairesel Referans Hatası
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Eğer gerçekten DURDURMAK istiyor musunuz
 DocType: Communication,Closed,Kapalı
 DocType: Communication,Closed,Kapalı
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Sözlü (İhracat) İrsaliyeyi kaydettiğinizde görünür olacaktır.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Eğer STOP istediğinizden emin misiniz
 DocType: Lead,Industry,Sanayi
 DocType: Employee,Job Profile,İş Profili
 DocType: Employee,Job Profile,İş Profili
@@ -401,7 +401,7 @@ DocType: Sales Invoice Item,Delivery Note,İrsaliye
 DocType: Dropbox Backup,Allow Dropbox Access,Dropbox erişim izni
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Vergiler kurma
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Bunu çekti sonra Ödeme Giriş modifiye edilmiştir. Tekrar çekin lütfen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Bu hafta ve bekleyen aktiviteler için Özet
 DocType: Workstation,Rent Cost,Kira Bedeli
 DocType: Workstation,Rent Cost,Kira Bedeli
@@ -420,11 +420,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Müşteri Para Biriminin Müşterinin temel birimine dönüştürülme oranı
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM,İrsaliye, Satın Alma Faturası, Satın Alma Makbuzu, Satış Faturası, Satış Emri, Stok Girdisi, Zaman Çizelgesinde Mevcut"
 DocType: Item Tax,Tax Rate,Vergi Oranı
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Öğe Seç
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Öğe Seç
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Ürün: {0} toplu-bilge, bunun yerine kullanmak Stok Girişi \
  Stok Uzlaşma kullanılarak uzlaşma olamaz yönetilen"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Satır # {0}: Toplu Hayır aynı olmalıdır {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Olmayan gruba dönüştürme
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Satınalma Makbuzu teslim edilmelidir
@@ -434,7 +434,7 @@ apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Bir Öğe toplu
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
 DocType: GL Entry,Debit Amount,Borç Tutarı
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Sadece Şirket'in başına 1 Hesap olabilir {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Sadece Şirket'in başına 1 Hesap olabilir {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,E-posta adresiniz
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,E-posta adresiniz
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Eke bakın
@@ -449,7 +449,7 @@ DocType: Delivery Note,Instructions,Talimatlar
 DocType: Quality Inspection,Inspected By,Tarafından denetlenir
 DocType: Maintenance Visit,Maintenance Type,Bakım Türü
 DocType: Maintenance Visit,Maintenance Type,Bakım Türü
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Seri No {0} İrsaliye  {1} e ait değil
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Seri No {0} İrsaliye  {1} e ait değil
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Ürün Kalite Kontrol Parametreleri
 DocType: Leave Application,Leave Approver Name,Onaylayan Adı bırakın
 ,Schedule Date,Program Tarihi
@@ -472,7 +472,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 DocType: Landed Cost Item,Applicable Charges,Uygulanabilir Ücretler
 DocType: Workstation,Consumable Cost,Sarf Maliyeti
 DocType: Workstation,Consumable Cost,Sarf Maliyeti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) rolü olmalıdır 'bırak Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) rolü olmalıdır 'bırak Approver'
 DocType: Purchase Receipt,Vehicle Date,Araç Tarihi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
@@ -500,6 +500,7 @@ apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please ente
 DocType: BOM,Item Desription,Ürün Tanımı
 DocType: Purchase Invoice,Supplier Name,Tedarikçi Adı
 DocType: Purchase Invoice,Supplier Name,Tedarikçi Adı
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext kitapçığını okuyun
 DocType: Account,Is Group,Is Grubu
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Otomatik olarak FIFO göre Nos Seri Set
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrol Tedarikçi Fatura Numarası Teklik
@@ -516,7 +517,7 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Satış Master M
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Tüm üretim süreçleri için genel ayarlar.
 DocType: Accounts Settings,Accounts Frozen Upto,Dondurulmuş hesaplar
 DocType: SMS Log,Sent On,Gönderim Zamanı
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
 DocType: Sales Order,Not Applicable,Uygulanamaz
 DocType: Sales Order,Not Applicable,Uygulanamaz
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ana tatil. 
@@ -524,8 +525,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell mo
 DocType: Material Request Item,Required Date,Gerekli Tarih
 DocType: Material Request Item,Required Date,Gerekli Tarih
 DocType: Delivery Note,Billing Address,Faturalama  Adresi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Ürün Kodu girin.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ürün Kodu girin.
 DocType: BOM,Costing,Maliyetlendirme
 DocType: BOM,Costing,Maliyetlendirme
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","İşaretli ise, vergi miktarının hali hazırda Basım Oranında/Basım Miktarında dahil olduğu düşünülecektir"
@@ -552,7 +553,7 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),(Dakika içind
 DocType: Customer,Buyer of Goods and Services.,Mal ve Hizmet Alıcı.
 DocType: Journal Entry,Accounts Payable,Vadesi gelmiş hesaplar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Abone Ekle
-sites/assets/js/erpnext.min.js +5,""" does not exists",""" mevcut değildir"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" mevcut değildir"
 DocType: Pricing Rule,Valid Upto,Tarihine kadar geçerli
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Doğrudan Gelir
@@ -561,7 +562,7 @@ apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can n
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
 DocType: Payment Tool,Received Or Paid,Alınan Veya Ücretli
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Firma seçiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Firma seçiniz
 DocType: Stock Entry,Difference Account,Fark Hesabı
 DocType: Stock Entry,Difference Account,Fark Hesabı
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Bağımlı görevi {0} kapalı değil yakın bir iş değildir Can.
@@ -570,14 +571,13 @@ DocType: Production Order,Additional Operating Cost,Ek İşletme Maliyeti
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Bakım ürünleri
 DocType: DocField,Type,Türü
 DocType: DocField,Type,Türü
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
 DocType: Communication,Subject,Konu
 DocType: Communication,Subject,Konu
 DocType: Shipping Rule,Net Weight,Net Ağırlık 
 DocType: Employee,Emergency Phone,Acil Telefon
 DocType: Employee,Emergency Phone,Acil Telefon
 ,Serial No Warranty Expiry,Seri No Garanti Bitiş tarihi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Malzeme isteğini gerçekten durdurmak istiyor musunuz
 DocType: Sales Order,To Deliver,Sunacak
 DocType: Purchase Invoice Item,Item,Ürün
 DocType: Purchase Invoice Item,Item,Ürün
@@ -585,7 +585,7 @@ DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
 DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
 DocType: Account,Profit and Loss,Kar ve Zarar
 DocType: Account,Profit and Loss,Kar ve Zarar
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Yönetme Taşeronluk
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Yönetme Taşeronluk
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Yeni UOM tam sayı tipi olmamalıdır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilya ve Fikstürü
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilya ve Fikstürü
@@ -609,8 +609,8 @@ DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Territory,For reference,Referans için
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Silinemiyor Seri No {0}, hisse senedi işlemlerinde kullanıldığı gibi"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Kapanış (Cr)
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Kapanış (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Kapanış (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Kapanış (Cr)
 DocType: Serial No,Warranty Period (Days),Garanti Süresi (Gün)
 DocType: Serial No,Warranty Period (Days),Garanti Süresi (Gün)
 DocType: Installation Note Item,Installation Note Item,Kurulum Notu Maddesi
@@ -654,8 +654,9 @@ apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_ac
 DocType: Leave Control Panel,Allocate,Tahsis
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Önceki
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Önceki
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Satış İade
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Satış İade
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Üretim Emri oluşturmak istediğiniz Satış Siparişlerini seçiniz.
+DocType: Item,Delivered by Supplier (Drop Ship),Yüklenici tarafından teslim (Bırak Gemi)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Maaş bileşenleri.
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Maaş bileşenleri.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Potansiyel müşterilerin Veritabanı.
@@ -670,7 +671,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Faturalı Tutarı
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Stok girişleri mantıksal Depoya karşı yapıldı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referans No ve Referans Tarihi gereklidir {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referans No ve Referans Tarihi gereklidir {0}
 DocType: Event,Wednesday,Çarşamba
 DocType: Event,Wednesday,Çarşamba
 DocType: Sales Invoice,Customer's Vendor,Müşterinin Satıcısı
@@ -713,8 +714,8 @@ DocType: SMS Settings,Receiver Parameter,Alıcı Parametre
 DocType: SMS Settings,Receiver Parameter,Alıcı Parametre
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Dayalıdır' ve 'Grubundadır' aynı olamaz
 DocType: Sales Person,Sales Person Targets,Satış Personeli Hedefleri
-sites/assets/js/form.min.js +271,To,Şu kişiye
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Lütfen E-posta adresinizi girin
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Şu kişiye
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Lütfen E-posta adresinizi girin
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Oluşturan boru ucu
 DocType: Production Order Operation,In minutes,Dakika içinde
 DocType: Issue,Resolution Date,Karar Tarihi
@@ -735,7 +736,7 @@ apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_re
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
 DocType: Company,Round Off Cost Center,Maliyet Merkezi Kapalı Yuvarlak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bakım Ziyareti {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bakım Ziyareti {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
 DocType: Material Request,Material Transfer,Materyal Transfer
 DocType: Material Request,Material Transfer,Materyal Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Açılış (Dr)
@@ -746,9 +747,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Ayarlar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Indi Maliyet Vergiler ve Ücretler
 DocType: Production Order Operation,Actual Start Time,Gerçek Başlangıç ​​Zamanı
 DocType: BOM Operation,Operation Time,Çalışma Süresi
-sites/assets/js/list.min.js +5,More,Daha fazla
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Daha fazla
 DocType: Pricing Rule,Sales Manager,Satış Müdürü
-sites/assets/js/desk.min.js +7673,Rename,Yeniden adlandır
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Yeniden adlandır
 DocType: Journal Entry,Write Off Amount,Borç Silme Miktarı
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bükme
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Kullanıcı izni
@@ -770,13 +771,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Ürünleri seri numaralarına bağlı olarak alım ve satış belgelerinde izlemek için. Bu aynı zamanda ürünün garanti ayarları için de kullanılabilir.
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Reddedilen Depo reddedilen Ürün karşılığı zorunludur
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Reddedilen Depo reddedilen Ürün karşılığı zorunludur
 DocType: Account,Expenses Included In Valuation,Değerlemeye dahil giderler
 DocType: Employee,Provide email id registered in company,Şirkette kayıtlı e-posta adresini veriniz
 DocType: Hub Settings,Seller City,Satıcı Şehri
 DocType: Email Digest,Next email will be sent on:,Sonraki e-posta gönderilecek:
 DocType: Offer Letter Term,Offer Letter Term,Mektubu Dönem Teklif
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Öğe varyantları vardır.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Ürün {0} bulunamadı
 DocType: Bin,Stock Value,Stok Değeri
 DocType: Bin,Stock Value,Stok Değeri
@@ -796,12 +797,11 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Hoşgel
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Hoşgeldiniz
 DocType: Journal Entry,Credit Card Entry,Kredi Kartı Girişi
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Görev Konusu
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Tedarikçilerden alınan mallar.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Tedarikçilerden alınan mallar.
 DocType: Communication,Open,Aç
 DocType: Lead,Campaign Name,Kampanya Adı
 DocType: Lead,Campaign Name,Kampanya Adı
 ,Reserved,Ayrılmış
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Eğer gerçekten unstop istiyor musunuz
 DocType: Purchase Order,Supply Raw Materials,Tedarik Hammaddeler
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Bir sonraki fatura oluşturulur tarih. Bu teslim oluşturulur.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Mevcut Varlıklar
@@ -822,7 +822,7 @@ DocType: Delivery Note,Customer's Purchase Order No,Müşterinin Sipariş numara
 DocType: Employee,Cell Number,Hücre sayısı
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal girişine karşı' geçerli fiş giremezsiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal girişine karşı' geçerli fiş giremezsiniz
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Enerji
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Enerji
 DocType: Opportunity,Opportunity From,Fırsattan itibaren
@@ -901,7 +901,7 @@ DocType: Account,Liability,Borç
 DocType: Account,Liability,Borç
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Yaptırıma Tutar Satır talep miktarı daha büyük olamaz {0}.
 DocType: Company,Default Cost of Goods Sold Account,Ürünler Satılan Hesabı Varsayılan Maliyeti
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Fiyat Listesi seçilmemiş
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Fiyat Listesi seçilmemiş
 DocType: Employee,Family Background,Aile Geçmişi
 DocType: Process Payroll,Send Email,E-posta Gönder
 DocType: Process Payroll,Send Email,E-posta Gönder
@@ -915,7 +915,7 @@ DocType: Item,Items with higher weightage will be shown higher,Yüksek weightage
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Benim Faturalar
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Çalışan bulunmadı
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Çalışan bulunmadı
 DocType: Purchase Order,Stopped,Durduruldu
 DocType: Purchase Order,Stopped,Durduruldu
 DocType: Item,If subcontracted to a vendor,Bir satıcıya taşeron durumunda
@@ -926,7 +926,6 @@ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Şi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Şimdi Gönder
 ,Support Analytics,Destek Analizi
 DocType: Item,Website Warehouse,Web Sitesi Depo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Eğer gerçekten üretim siparişi durdurmak istiyor musunuz:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Otomatik fatura 05, 28 vb gibi oluşturulur hangi ayın günü"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor 5'ten az veya eşit olmalıdır
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form kayıtları
@@ -937,14 +936,14 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Müş
 DocType: Features Setup,"To enable ""Point of Sale"" features","Point of Sale" özellikleri etkinleştirmek için
 DocType: Bin,Moving Average Rate,Hareketli Ortalama Kuru
 DocType: Production Planning Tool,Select Items,Ürünleri Seçin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
 DocType: Comment,Reference Name,Referans Adı
 DocType: Comment,Reference Name,Referans Adı
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Sales Invoice Item,Target Warehouse,Hedef Depo
 DocType: Item,Allow over delivery or receipt upto this percent,Bu kadar yüzde teslimatı veya makbuz üzerinde izin ver
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Beklenen Teslim Tarihi satış siparişi tarihinden önce olamaz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Beklenen Teslim Tarihi satış siparişi tarihinden önce olamaz
 DocType: Upload Attendance,Import Attendance,İthalat Katılımı 
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Bütün Ürün Grupları
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
@@ -953,7 +952,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,İşlemlerin sunulmasında otomatik olarak mesaj oluştur.
 DocType: Production Order,Item To Manufacture,Üretilecek Ürün
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Kalıcı kalıba döküm
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Ödeme Satınalma Siparişi
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} durum {2} olduğu
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ödeme Satınalma Siparişi
 DocType: Sales Order Item,Projected Qty,Öngörülen Tutar
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
@@ -984,8 +984,8 @@ apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Performans değerle
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Performans değerlendirme.
 DocType: Sales Invoice Item,Stock Details,Stok Detayları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Proje Bedeli
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Satış Noktası
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Ileriye taşıyamaz {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Satış Noktası
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Ileriye taşıyamaz {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",Bakiye alacaklı durumdaysa borçlu duruma çevrilemez.
 DocType: Account,Balance must be,Bakiye şu olmalıdır
 DocType: Hub Settings,Publish Pricing,Fiyatlandırma Yayınla
@@ -1010,8 +1010,8 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Satın Alma makbuzu
 ,Received Items To Be Billed,Faturalanacak  Alınan Malzemeler
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Raspa
-sites/assets/js/desk.min.js +3938,Ms,Bayan
-sites/assets/js/desk.min.js +3938,Ms,Bayan
+DocType: Employee,Ms,Bayan
+DocType: Employee,Ms,Bayan
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Ana Döviz Kuru.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Çalışma için bir sonraki {0} günlerde Zaman Slot bulamayan {1}
 DocType: Production Order,Plan material for sub-assemblies,Alt-montajlar Plan malzeme
@@ -1037,33 +1037,35 @@ DocType: Supplier,Default Payable Accounts,Standart Borç Hesapları
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
 DocType: Features Setup,Item Barcode,Ürün Barkodu
 DocType: Features Setup,Item Barcode,Ürün Barkodu
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
 DocType: Quality Inspection Reading,Reading 6,6 Okuma
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fatura peşin alım
 DocType: Address,Shop,Mağaza
 DocType: Address,Shop,Mağaza
 DocType: Hub Settings,Sync Now,Sync Şimdi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Satır {0}: Kredi giriş ile bağlantılı edilemez bir {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Satır {0}: Kredi giriş ile bağlantılı edilemez bir {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Bu mod seçildiğinde Varsayılan Banka / Kasa hesabı otomatik olarak POS Faturada güncellenecektir.
 DocType: Employee,Permanent Address Is,Kalıcı Adres
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasyon kaç mamul tamamlandı?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Marka
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,{1} den fazla Ürün için {0} üzerinde ödenek
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{1} den fazla Ürün için {0} üzerinde ödenek
 DocType: Employee,Exit Interview Details,Çıkış Görüşmesi Detayları
 DocType: Item,Is Purchase Item,Satın Alma Maddesi 
 DocType: Journal Entry Account,Purchase Invoice,Satınalma Faturası
 DocType: Journal Entry Account,Purchase Invoice,Satınalma Faturası
 DocType: Stock Ledger Entry,Voucher Detail No,Föy Detay no
 DocType: Stock Entry,Total Outgoing Value,Toplam Giden Değeri
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Tarih ve Kapanış Tarihi Açılış aynı Mali Yılı içinde olmalıdır
 DocType: Lead,Request for Information,Bilgi İsteği
 DocType: Lead,Request for Information,Bilgi İsteği
 DocType: Payment Tool,Paid,Ücretli
 DocType: Salary Slip,Total in words,Sözlü Toplam
 DocType: Material Request Item,Lead Time Date,Talep Yaratma Zaman Tarihi
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,zorunludur. Belki Döviz rekor için oluşturulmadı
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Satır # {0}: Ürün{1} için seri no belirtiniz 
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'Ürün Bundle' öğeler, Depo, Seri No ve Toplu No 'Ambalaj Listesi' tablodan kabul edilecektir. Depo ve Toplu Hayır herhangi bir 'Ürün Bundle' öğe için tüm ambalaj öğeler için aynı ise, bu değerler ana Öğe tabloda girilebilir, değerler tablosu 'Listesi Ambalaj' kopyalanacaktır."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
 DocType: Purchase Invoice Item,Purchase Order Item,Satınalma Siparişi Ürünleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Dolaylı Gelir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Dolaylı Gelir
@@ -1075,14 +1077,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,F
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firma Adı
 DocType: SMS Center,Total Message(s),Toplam Mesaj (lar)
 DocType: SMS Center,Total Message(s),Toplam Mesaj (lar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Tüm yardım videoların bir listesini görüntüleyin
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Çekin yatırıldığı bankadaki hesap başlığını seçiniz
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Kullanıcıya işlemlerdeki Fiyat Listesi Oranını düzenlemek için izin ver
 DocType: Pricing Rule,Max Qty,En fazla miktar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Satır {0}: Satış / Satınalma Siparişi karşı Ödeme hep avans olarak işaretlenmiş olmalıdır
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Satır {0}: Satış / Satınalma Siparişi karşı Ödeme hep avans olarak işaretlenmiş olmalıdır
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimyasal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimyasal
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
 DocType: Process Payroll,Select Payroll Year and Month,Bordro Yılı ve Ay Seçiniz
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Uygun bir grup (genellikle Fonların Uygulama> Dönen Varlıklar> Banka Hesapları gidin ve Çeşidi) Çocuk ekle üzerine tıklayarak (yeni Hesabı oluşturmak "Banka"
 DocType: Workstation,Electricity Cost,Elektrik Maliyeti
@@ -1098,7 +1101,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Beya
 DocType: SMS Center,All Lead (Open),Bütün Başlıklar (Açık)
 DocType: Purchase Invoice,Get Advances Paid,Avansları Öde
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Resminizi Ekleyin
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Yapmak
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Yapmak
 DocType: Journal Entry,Total Amount in Words,Sözlü Toplam Tutar
 DocType: Workflow State,Stop,dur
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Hata oluştu. Bunun sebebi formu kaydetmemeniz olabilir. Sorun devam ederse support@erpnext.com adresi ile iltişime geçiniz
@@ -1125,7 +1128,7 @@ DocType: POS Profile,Cash/Bank Account,Kasa / Banka Hesabı
 DocType: POS Profile,Cash/Bank Account,Kasa / Banka Hesabı
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Miktar veya değer hiçbir değişiklik ile kaldırıldı öğeler.
 DocType: Delivery Note,Delivery To,Teslim
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Özellik tablosu zorunludur
 DocType: Production Planning Tool,Get Sales Orders,Satış Şiparişlerini alın
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} negatif olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} negatif olamaz
@@ -1138,12 +1141,13 @@ DocType: Project,Internal,Dahili
 DocType: Task,Urgent,Acil
 DocType: Task,Urgent,Acil
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Tablodaki satır {0} için geçerli Satır kimliği belirtiniz {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Masaüstüne gidin ve ERPNext kullanmaya başlayabilirsiniz
 DocType: Item,Manufacturer,Üretici
 DocType: Landed Cost Item,Purchase Receipt Item,Satın Alma makbuzu Ürünleri
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Satış Sipariş / Satış Emrinde ayrılan Depo/ Mamül Deposu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Satış Tutarı
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Zaman Günlükleri
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bu Kayıt için Gider Onaylayıcısınız. Lütfen 'durumu' güncelleyip kaydedin.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bu Kayıt için Gider Onaylayıcısınız. Lütfen 'durumu' güncelleyip kaydedin.
 DocType: Serial No,Creation Document No,Oluşturulan Belge Tarihi
 DocType: Issue,Issue,Sayı
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Öğe Variantların için bağlıyor. Örneğin Boyut, Renk vb"
@@ -1163,8 +1167,9 @@ DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Satış Sipariş {0} {1}
 DocType: Opportunity,Contact Info,İletişim Bilgileri
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Stok Girişleri Yapımı
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Stok Girişleri Yapımı
 DocType: Packing Slip,Net Weight UOM,Net Ağırlık UOM
 DocType: Item,Default Supplier,Standart Tedarikçi
 DocType: Item,Default Supplier,Standart Tedarikçi
@@ -1174,7 +1179,7 @@ DocType: Features Setup,Miscelleneous,Muhtelif
 DocType: Holiday List,Get Weekly Off Dates,Haftalık Hesap Kesim tarihlerini alın
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Bitiş Tarihi, Başlangıç Tarihinden daha az olamaz"
 DocType: Sales Person,Select company name first.,Önce şirket adı seçiniz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tedarikçilerden alınan teklifler.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Şu kişi(lere) {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,Zaman Kayıtlar üzerinden güncellenir
@@ -1205,7 +1210,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Referans için şirket kayıt numaraları. Vergi numaraları vb
 DocType: Sales Partner,Distributor,Dağıtımcı
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Alışveriş Sepeti Nakliye Kural
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Üretim Siparişi {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Üretim Siparişi {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
 ,Ordered Items To Be Billed,Faturalanacak Sipariş Edilen Ürünler
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Menzil az olmak zorundadır Kimden daha Range için
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Günlükleri seçin ve yeni Satış Faturası oluşturmak için teslim edin.
@@ -1263,7 +1268,7 @@ DocType: Email Digest,Payables,Borçlar
 DocType: Email Digest,Payables,Borçlar
 DocType: Account,Warehouse,Depo
 DocType: Account,Warehouse,Depo
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
 ,Purchase Order Items To Be Billed,Faturalanacak Satınalma Siparişi Kalemleri
 DocType: Purchase Invoice Item,Net Rate,Net Hızı
 DocType: Purchase Invoice Item,Purchase Invoice Item,Satın alma Faturası Ürünleri
@@ -1283,13 +1288,13 @@ DocType: Global Defaults,Current Fiscal Year,Cari Mali Yılı
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Lead,Call,Çağrı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Girdiler' boş olamaz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Girdiler' boş olamaz
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Satır {0} ı  {1} ile aynı biçimde kopyala
 ,Trial Balance,Mizan
 ,Trial Balance,Mizan
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Çalışanlar kurma
-sites/assets/js/erpnext.min.js +5,"Grid ""","Izgara """
-sites/assets/js/erpnext.min.js +5,"Grid ""","Izgara """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Çalışanlar kurma
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Izgara """
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Izgara """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Önce Ön ek seçiniz
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Araştırma
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Araştırma
@@ -1302,14 +1307,15 @@ DocType: File,Lft,lft
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
 DocType: Communication,Delivery Status,Teslim Durumu
 DocType: Production Order,Manufacture against Sales Order,Satış Emrine Karşı Üretim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Dünyanın geri kalanı
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Dünyanın geri kalanı
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Öğe {0} Toplu olamaz
 ,Budget Variance Report,Bütçe Fark Raporu
 DocType: Salary Slip,Gross Pay,Brüt Ödeme
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Temettü Ücretli
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Muhasebe Defteri
 DocType: Stock Reconciliation,Difference Amount,Fark Tutarı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Dağıtılmamış Karlar
 DocType: BOM Item,Item Description,Ürün Tanımı
@@ -1323,17 +1329,19 @@ DocType: Opportunity Item,Opportunity Item,Fırsat Ürünü
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Geçici Açma
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Çalışanın Kalan İzni
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Hesap {0} her zaman dengede olmalı {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Hesap {0} her zaman dengede olmalı {1}
 DocType: Address,Address Type,Adres Tipi
 DocType: Purchase Receipt,Rejected Warehouse,Reddedilen Depo
 DocType: Purchase Receipt,Rejected Warehouse,Reddedilen Depo
 DocType: GL Entry,Against Voucher,Dekont Karşılığı
 DocType: Item,Default Buying Cost Center,Standart Alış Maliyet Merkezi
 DocType: Item,Default Buying Cost Center,Standart Alış Maliyet Merkezi
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","ERPNext en iyi sonucu almak için, biraz zaman ayırın ve bu yardım videoları izlemek öneririz."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Ürün {0} Satış ürünü olmalıdır
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,için
 DocType: Item,Lead Time in days,Gün Kurşun Zaman
 ,Accounts Payable Summary,Ödeme Hesabı Özeti
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Dondurulmuş Hesabı {0} düzenleme yetkisi yok
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Dondurulmuş Hesabı {0} düzenleme yetkisi yok
 DocType: Journal Entry,Get Outstanding Invoices,Bekleyen Faturaları alın
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
@@ -1350,7 +1358,7 @@ DocType: Employee,Place of Issue,Verildiği yer
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
 DocType: Report,Disabled,Devredışı
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Ürün {1} de UOM: {0} için UOM dönüştürme katsayısı gereklidir.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Ürün {1} de UOM: {0} için UOM dönüştürme katsayısı gereklidir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
@@ -1364,7 +1372,7 @@ apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root i
 DocType: Journal Entry Account,Purchase Order,Satın alma emri
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
-sites/assets/js/form.min.js +190,Name is required,Adı gerekli
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Adı gerekli
 DocType: Purchase Invoice,Recurring Type,Tekrarlanma Türü
 DocType: Address,City/Town,İl / İlçe
 DocType: Email Digest,Annual Income,Yıllık gelir
@@ -1372,7 +1380,7 @@ DocType: Serial No,Serial No Details,Seri No Detayları
 DocType: Serial No,Serial No Details,Seri No Detayları
 DocType: Purchase Invoice Item,Item Tax Rate,Ürün Vergi Oranı
 DocType: Purchase Invoice Item,Item Tax Rate,Ürün Vergi Oranı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","{0}, sadece kredi hesapları başka bir ödeme girişine karşı bağlantılı olabilir için"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, sadece kredi hesapları başka bir ödeme girişine karşı bağlantılı olabilir için"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Ürün {0} bir taşeron ürünü olmalıdır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Sermaye Ekipmanları
@@ -1387,7 +1395,7 @@ DocType: Appraisal Goal,Goal,Hedef
 DocType: Appraisal Goal,Goal,Hedef
 DocType: Sales Invoice Item,Edit Description,Edit Açıklama
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Beklenen Teslim Tarihi Planlanan Başlama Tarihi daha az olduğunu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Tedarikçi İçin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Tedarikçi İçin
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Hesap Türünü ayarlamak işlemlerde bu hesabı seçeren yardımcı olur
 DocType: Purchase Invoice,Grand Total (Company Currency),Genel Toplam (ޞirket para birimi)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Toplam Giden
@@ -1395,8 +1403,8 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sadece ""değerini"" için 0 veya boş değere sahip bir Nakliye Kural Durumu olabilir"
 DocType: Authorization Rule,Transaction,İşlem
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Not: Bu Maliyet Merkezi bir Grup. Gruplara karşı muhasebe kayıtları yapamazsınız.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Araçlar
-apps/erpnext/erpnext/config/projects.py +43,Tools,Araçlar
+apps/frappe/frappe/config/desk.py +7,Tools,Araçlar
+apps/frappe/frappe/config/desk.py +7,Tools,Araçlar
 DocType: Item,Website Item Groups,Web Sitesi Ürün Grupları
 DocType: Item,Website Item Groups,Web Sitesi Ürün Grupları
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Üretim sipariş numarası stok girişi amaçlı üretimi için zorunludur
@@ -1408,8 +1416,8 @@ DocType: Workstation,Workstation Name,İş İstasyonu Adı
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Digest e-posta:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
 DocType: Sales Partner,Target Distribution,Hedef Dağıtımı
-sites/assets/js/desk.min.js +7652,Comments,Yorumlar
-sites/assets/js/desk.min.js +7652,Comments,Yorumlar
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Yorumlar
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Yorumlar
 DocType: Salary Slip,Bank Account No.,Banka Hesap No
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Bu ön ekle son oluşturulmuş işlemlerin sayısıdır
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Ürün {0} için gerekli Değereme Oranı
@@ -1429,7 +1437,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege L
 DocType: Purchase Invoice,Supplier Invoice Date,Tedarikçi Fatura Tarihi
 DocType: Purchase Invoice,Supplier Invoice Date,Tedarikçi Fatura Tarihi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sen Alışveriş Sepeti etkinleştirmeniz gerekir
-sites/assets/js/form.min.js +212,No Data,Hiçbir veri
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Hiçbir veri
 DocType: Appraisal Template Goal,Appraisal Template Goal,Değerlendirme Şablonu Hedefi
 DocType: Salary Slip,Earning,Kazanma
 DocType: Payment Tool,Party Account Currency,Parti Hesap Döviz
@@ -1437,7 +1445,7 @@ DocType: Payment Tool,Party Account Currency,Parti Hesap Döviz
 DocType: Purchase Taxes and Charges,Add or Deduct,Ekle ya da Çıkar
 DocType: Company,If Yearly Budget Exceeded (for expense account),Yıllık Bütçe (gider hesabı için) aşıldı ise
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Şunların arasında çakışan koşullar bulundu:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Journal Karşı giriş {0} zaten başka çeki karşı ayarlanır
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Journal Karşı giriş {0} zaten başka çeki karşı ayarlanır
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Toplam Sipariş Miktarı
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Yiyecek Grupları
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Yiyecek Grupları
@@ -1447,12 +1455,12 @@ DocType: Maintenance Schedule Item,No of Visits,Ziyaret sayısı
 DocType: File,old_parent,old_parent
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","İrtibatlara, müşterilere bülten"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Kapanış Hesap Para olmalıdır {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Tüm hedefler için puan toplamı It is 100. olmalıdır {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operasyon boş bırakılamaz.
 ,Delivered Items To Be Billed,Faturalanacak Teslim edilen Ürünler
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo Seri No için değiştirilemez
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo Seri No için değiştirilemez
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Durum {0} olarak güncellendi
 DocType: DocField,Description,Açıklama
 DocType: Authorization Rule,Average Discount,Ortalama İndirim
 DocType: Authorization Rule,Average Discount,Ortalama İndirim
@@ -1490,7 +1498,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Ürün Vergi Tutarı
 DocType: Item,Maintain Stock,Stok koruyun
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zaten Üretim Siparişi için oluşturulan Stok Girişler
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tüm tanımları için kabul ise boş bırakın
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,DateTime Gönderen
 DocType: Email Digest,For Company,Şirket için
@@ -1502,7 +1510,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,H
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Hesap Tablosu
 DocType: Material Request,Terms and Conditions Content,Şartlar ve Koşullar İçeriği
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
 DocType: Maintenance Visit,Unscheduled,Plânlanmamış
 DocType: Employee,Owned,Hisseli
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Pay olmadan İzni bağlıdır
@@ -1518,8 +1526,8 @@ DocType: GL Entry,GL Entry,GL Girdisi
 DocType: HR Settings,Employee Settings,Çalışan Ayarları
 DocType: HR Settings,Employee Settings,Çalışan Ayarları
 ,Batch-Wise Balance History,Parti-Bilgi Bakiye Geçmişi
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Yapılacaklar Listesi
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Yapılacaklar Listesi
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Yapılacaklar Listesi
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Yapılacaklar Listesi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Çırak
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Çırak
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatif Miktara izin verilmez
@@ -1560,14 +1568,14 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,İthalat Başarısız oldu
-sites/assets/js/erpnext.min.js +24,No address added yet.,Hiçbir adres Henüz eklenmiş.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Hiçbir adres Henüz eklenmiş.
 DocType: Workstation Working Hour,Workstation Working Hour,İş İstasyonu Çalışma Saati
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Satır {0}: Tahsis miktar {1} daha az olması veya JV miktarı eşittir gerekir {2}
 DocType: Item,Inventory,Stok
 DocType: Features Setup,"To enable ""Point of Sale"" view",Bakış "Sale Noktası" etkinleştirmek için
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Boş sepet için ödeme yapılamaz
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Boş sepet için ödeme yapılamaz
 DocType: Item,Sales Details,Satış Ayrıntılar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Iğneleme
 DocType: Opportunity,With Items,Öğeler ile
@@ -1578,7 +1586,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 DocType: Item Attribute,Item Attribute,Ürün Özellik
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Devlet
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Devlet
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Öğe Türevleri
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Öğe Türevleri
 DocType: Company,Services,Servisler
 DocType: Company,Services,Servisler
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Toplam ({0})
@@ -1593,13 +1601,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Havşa
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri
 DocType: Material Request Item,Sales Order No,Satış Sipariş No
 DocType: Material Request Item,Sales Order No,Satış Sipariş No
 DocType: Item Group,Item Group Name,Ürün Grup Adı
 DocType: Item Group,Item Group Name,Ürün Grup Adı
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Alınmış
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Alınmış
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Üretim için Aktarım Malzemeleri
 DocType: Pricing Rule,For Price List,Fiyat Listesi İçin
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Yürütücü Arama
@@ -1608,10 +1616,8 @@ DocType: Maintenance Schedule,Schedules,Programlar
 DocType: Purchase Invoice Item,Net Amount,Net Miktar
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detay yok
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ek İndirim Tutarı (Şirket Para)
-DocType: Period Closing Voucher,CoA Help,CoA Yardım
-DocType: Period Closing Voucher,CoA Help,CoA Yardım
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Hata: {0}> {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Hata: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Hata: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Hata: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Lütfen hesap tablosundan yeni hesap oluşturunuz
 DocType: Maintenance Visit,Maintenance Visit,Bakım Ziyareti
 DocType: Maintenance Visit,Maintenance Visit,Bakım Ziyareti
@@ -1625,6 +1631,7 @@ DocType: Event,Tuesday,Salı
 DocType: Event,Tuesday,Salı
 DocType: Leave Block List,Block Holidays on important days.,Önemli günlerde Blok Tatil.
 ,Accounts Receivable Summary,Alacak Hesapları Özeti
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Zaten bir süre için Çalışanı {1} için ayrılan tip {0} için bırakır {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Çalışan Rolü ayarlamak için Çalışan kaydındaki Kullanıcı Kimliği alanını Lütfen
 DocType: UOM,UOM Name,UOM Adı
 DocType: Top Bar Item,Target,Hedef
@@ -1649,7 +1656,7 @@ DocType: Sales Partner,Sales Partner Target,Satış Ortağı Hedefi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},"{0} için muhasebe kayıt, sadece para yapılabilir: {1}"
 DocType: Pricing Rule,Pricing Rule,Fiyatlandırma Kuralı
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Satınalma Siparişi Malzeme Talebi
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Satınalma Siparişi Malzeme Talebi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Satır # {0}: İade Item {1} değil var yok {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Banka Hesapları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Banka Hesapları
@@ -1657,14 +1664,14 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 ,Bank Reconciliation Statement,Banka Uzlaşma Bildirimi
 DocType: Address,Lead Name,Talep Yaratma Adı
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Açılış Stok Dengesi
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Açılış Stok Dengesi
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} sadece bir kez yer almalıdır
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Daha fazla tranfer izin yok {0} daha {1} Satınalma Siparişi karşı {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},İzinler {0} için başarıyla tahsis edildi
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},İzinler {0} için başarıyla tahsis edildi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ambalajlanacak Ürün Yok
 DocType: Shipping Rule Condition,From Value,Değerden
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Bankaya yansıyan değil tutarlar
 DocType: Quality Inspection Reading,Reading 4,4 Okuma
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Şirket Gideri Talepleri.
@@ -1678,21 +1685,22 @@ DocType: Opportunity,Contact Mobile No,İrtibat Mobil No
 DocType: Production Planning Tool,Select Sales Orders,Satış Siparişleri Seçiniz
 ,Material Requests for which Supplier Quotations are not created,Kendisi için tedarikçi fiyat teklifi oluşturulmamış Malzeme Talepleri
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Ürünleri barkod kullanarak aramak için. Ürünlerin barkodunu taratarak Ürünleri İrsaliye ev Satış Faturasına girebilirsiniz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark Teslim olarak
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Teklifi Yap
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Peşin X gün için operasyonlar planlama deneyin.
 DocType: HR Settings,Stop Birthday Reminders,Doğum günü hatırlatıcılarını durdur
 DocType: SMS Center,Receiver List,Alıcı Listesi
 DocType: SMS Center,Receiver List,Alıcı Listesi
 DocType: Payment Tool Detail,Payment Amount,Ödeme Tutarı
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Tüketilen Tutar
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Görüntüle
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Görüntüle
 DocType: Salary Structure Deduction,Salary Structure Deduction,Maaş Yapısı Kesintisi
 DocType: Salary Structure Deduction,Salary Structure Deduction,Maaş Yapısı Kesintisi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektif Lazer sinterleme
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Başarılı İthalat!
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Başarılı İthalat!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,İhraç Öğeler Maliyeti
@@ -1718,7 +1726,7 @@ apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart su
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Kurulum Tamamlandı
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Kurulum Tamamlandı
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Faturalandırıldı
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Ayrılmış Miktar
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Ayrılmış Miktar
 DocType: Party Account,Party Account,Taraf Hesabı
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
@@ -1769,13 +1777,14 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Alışveriş Sepeti etkinleştirin
 DocType: Employee,Permanent Address,Daimi Adres
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Ürün {0} Hizmet ürünü olmalıdır.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Genel Toplam den \ {0} {1} büyük olamaz karşı ödenen Peşin {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ürün kodu seçiniz
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ürün kodu seçiniz
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Ücretsiz İzin (Üİ) için Kesintiyi azalt
 DocType: Territory,Territory Manager,Bölge Müdürü
 DocType: Territory,Territory Manager,Bölge Müdürü
+DocType: Delivery Note Item,To Warehouse (Optional),Depo (İsteğe bağlı)
 DocType: Sales Invoice,Paid Amount (Company Currency),Ücretli Tutar (Şirket Para)
 DocType: Purchase Invoice,Additional Discount,Ek İndirim
 DocType: Selling Settings,Selling Settings,Satış Ayarları 
@@ -1803,7 +1812,7 @@ DocType: Item,Weightage,Ağırlık
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Madencilik
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Reçine döküm
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Aynı adda bir Müşteri Grubu bulunmaktadır. Lütfen Müşteri Grubu ismini değiştirin.
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Önce {0} seçiniz
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Önce {0} seçiniz
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Metin {0}
 DocType: Territory,Parent Territory,Ana Bölge
 DocType: Quality Inspection Reading,Reading 2,2 Okuma
@@ -1837,11 +1846,11 @@ DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purch
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Ana
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Ana
 DocType: DocPerm,Delete,Sil
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Varyant
-sites/assets/js/desk.min.js +7971,New {0},Yeni {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varyant
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Yeni {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Durdurulan Sipariş iptal edilemez. İptali kaldırın
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Durdurulan Sipariş iptal edilemez. İptali kaldırın
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
 DocType: Employee,Leave Encashed?,İzin Tahsil Edilmiş mi?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Kimden alanında Fırsat zorunludur
 DocType: Item,Variants,Varyantlar
@@ -1863,7 +1872,7 @@ DocType: Country,Country,Ülke
 DocType: Country,Country,Ülke
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresleri
 DocType: Communication,Received,Alınan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Journal Karşı giriş {0} herhangi eşsiz {1} girişi yok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Journal Karşı giriş {0} herhangi eşsiz {1} girişi yok
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nakliye Kuralı için koşul
@@ -1889,7 +1898,6 @@ DocType: Communication,Rejected,Reddedildi
 DocType: Pricing Rule,Brand,Marka
 DocType: Pricing Rule,Brand,Marka
 DocType: Item,Will also apply for variants,Ayrıca varyantları için geçerli olacaktır
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,% Teslim Edilen
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Satış zamanı toplam Ürünler.
 DocType: Sales Order Item,Actual Qty,Gerçek Adet
 DocType: Sales Invoice Item,References,Kaynaklar
@@ -1932,14 +1940,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Makaslama
 DocType: Item,Has Variants,Varyasyoları var
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Yeni Satış Faturası oluşturmak için 'Satış Fatura Yap' butonuna tıklayın.
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Kimden ve Dönemi% s yinelenen zorunlu tarihleri ​​için Dönemi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Paketleme ve etiketleme
 DocType: Monthly Distribution,Name of the Monthly Distribution,Aylık Dağıtım Adı
 DocType: Sales Person,Parent Sales Person,Ana Satış Elemanı
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Şirket Alanı ve Küresel Standartlardaki Para Birimini belirtiniz
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Erişimi Gizli
 DocType: Purchase Invoice,Recurring Invoice,Mükerrer Fatura
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Projeleri yönetme
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Projeleri yönetme
 DocType: Supplier,Supplier of Goods or Services.,Mal veya Hizmet alanı.
 DocType: Budget Detail,Fiscal Year,Mali yıl
 DocType: Cost Center,Budget,Bütçe
@@ -1976,12 +1983,12 @@ DocType: Pricing Rule,Selling,Satış
 DocType: Pricing Rule,Selling,Satış
 DocType: Employee,Salary Information,Maaş Bilgisi
 DocType: Sales Person,Name and Employee ID,İsim ve Çalışan Kimliği
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Harç ve Vergiler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Referrans tarihi girin
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} ödeme girişleri şu tarafından filtrelenemez {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Referrans tarihi girin
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ödeme girişleri şu tarafından filtrelenemez {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Web Sitesi gösterilir Öğe için Tablo
 DocType: Purchase Order Item Supplied,Supplied Qty,Verilen Adet
 DocType: Material Request Item,Material Request Item,Malzeme Talebi Kalemi
@@ -1989,7 +1996,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Ürün Grupları
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type, Kolon numarası bu Ücret tipi için kolon numarasından büyük veya eşit olamaz
 ,Item-wise Purchase History,Ürün bilgisi Satın Alma Geçmişi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Kırmızı
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ürün {0} seri numarası eklemek için 'Program Ekle' ye tıklayınız
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ürün {0} seri numarası eklemek için 'Program Ekle' ye tıklayınız
 DocType: Account,Frozen,Dondurulmuş
 ,Open Production Orders,Üretim Siparişlerini Aç
 DocType: Installation Note,Installation Time,Kurulum Zaman
@@ -2044,7 +2051,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Teklif Trendleri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Ürün {0} içim Ürün alanında Ürün grubu belirtilmemiş
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Bu Ürün içim Üretim Emri verilebilmesi için, Ürün stok Ürünü olmalıdır."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Bu Ürün içim Üretim Emri verilebilmesi için, Ürün stok Ürünü olmalıdır."
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Birleştirme
@@ -2052,7 +2059,7 @@ DocType: Authorization Rule,Above Value,Değerin üstünde
 ,Pending Amount,Bekleyen Tutar
 ,Pending Amount,Bekleyen Tutar
 DocType: Purchase Invoice Item,Conversion Factor,Katsayı
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Teslim Edildi
+DocType: Purchase Order,Delivered,Teslim Edildi
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),İş e-mail kimliği için gelen sunucu kurulumu (örneğin: jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Araç Sayısı
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Yinelenen faturanın durdurulacağı tarih
@@ -2072,11 +2079,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Accoun
 DocType: HR Settings,HR Settings,İK Ayarları
 DocType: HR Settings,HR Settings,İK Ayarları
 apps/frappe/frappe/config/setup.py +130,Printing,Baskı
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Gider Talebi onay bekliyor. Yalnızca Gider yetkilisi durumu güncelleyebilir.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Gider Talebi onay bekliyor. Yalnızca Gider yetkilisi durumu güncelleyebilir.
 DocType: Purchase Invoice,Additional Discount Amount,Ek İndirim Tutarı
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Listedeki ilk izin onaylayıcı varsayılan izin onaylayıcı olarak atanacaktır.
-sites/assets/js/desk.min.js +7805,and,ve
-sites/assets/js/desk.min.js +7805,and,ve
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ve
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ve
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Spor
@@ -2121,7 +2128,6 @@ DocType: Salary Slip,Total Deduction,Toplam Kesinti
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
 DocType: Quotation,Maintenance User,Bakım Kullanıcı
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Maliyet Güncelleme
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Eğer unstop etmek istediğinizden emin misiniz
 DocType: Employee,Date of Birth,Doğum tarihi
 DocType: Employee,Date of Birth,Doğum tarihi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
@@ -2140,7 +2146,7 @@ DocType: Expense Claim,Approver,Onaylayan
 DocType: Expense Claim,Approver,Onaylayan
 ,SO Qty,SO Adet
 ,SO Qty,SO Adet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stok girişleri ambarında mevcut {0}, dolayısıyla yeniden atamak ya da Depo değiştiremezsiniz"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stok girişleri ambarında mevcut {0}, dolayısıyla yeniden atamak ya da Depo değiştiremezsiniz"
 DocType: Appraisal,Calculate Total Score,Toplam Puan Hesapla
 DocType: Appraisal,Calculate Total Score,Toplam Puan Hesapla
 DocType: Supplier Quotation,Manufacturing Manager,Üretim Müdürü
@@ -2148,6 +2154,7 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,İrsaliyeyi ambalajlara böl.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Gönderiler
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip kalıplama
+DocType: Purchase Order,To be delivered to customer,Müşteriye teslim edilmek üzere
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Günlük durumu Teslim Edildi olmalıdır.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seri Hayır {0} herhangi Warehouse ait değil
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Kurma
@@ -2177,13 +2184,13 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Para biriminden
 DocType: DocField,Name,İsim
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","En az bir satırda Tahsis Tutar, Fatura Türü ve Fatura Numarası seçiniz"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Ürün {0}için Satış Sipariş  gerekli 
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ürün {0}için Satış Sipariş  gerekli 
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Sistemde yer almamaktadır tutarlar
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Diğer
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Diğer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Durduruldu olarak ayarla
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Eşleşen bir öğe bulunamıyor. Için {0} diğer bazı değer seçiniz.
 DocType: POS Profile,Taxes and Charges,Vergi ve Harçlar
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Bir Ürün veya satın alınan, satılan veya stokta tutulan bir hizmet."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,İlk satır için ücret tipi 'Önceki satır tutarında' veya 'Önceki satır toplamında' olarak seçilemez
@@ -2194,21 +2201,22 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broachi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankacılık
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankacılık
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Programı almak için 'Program Oluştura' tıklayınız
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Yeni Maliyet Merkezi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Yeni Maliyet Merkezi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Yeni Maliyet Merkezi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Yeni Maliyet Merkezi
 DocType: Bin,Ordered Quantity,Sipariş Edilen Miktar
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları"
 DocType: Quality Inspection,In Process,Süreci
 DocType: Authorization Rule,Itemwise Discount,Ürün İndirimi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
+DocType: Purchase Order Item,Reference Document Type,Referans Belge Türü
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
 DocType: Account,Fixed Asset,Sabit Varlık
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Serileştirilmiş Envanteri
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serileştirilmiş Envanteri
 DocType: Activity Type,Default Billing Rate,Varsayılan Fatura Oranı
 DocType: Time Log Batch,Total Billing Amount,Toplam Fatura Tutarı
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Alacak Hesabı
 ,Stock Balance,Stok Bakiye
 ,Stock Balance,Stok Bakiye
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Ödeme Satış Sipariş
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Ödeme Satış Sipariş
 DocType: Expense Claim Detail,Expense Claim Detail,Gideri Talebi Detayı
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Zaman Günlükleri oluşturuldu:
 DocType: Item,Weight UOM,Ağırlık UOM
@@ -2250,11 +2258,10 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
 DocType: Production Order Operation,Completed Qty,Tamamlanan Adet
 DocType: Production Order Operation,Completed Qty,Tamamlanan Adet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","{0}, sadece banka hesapları başka bir kredi girişine karşı bağlantılı olabilir için"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, sadece banka hesapları başka bir kredi girişine karşı bağlantılı olabilir için"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
 DocType: Manufacturing Settings,Allow Overtime,Mesai izin ver
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Satış Siparişi {0} durduruldu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Öğe için gerekli Seri Numaraları {1}. Sağladığınız {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Güncel Değerleme Oranı
 DocType: Item,Customer Item Codes,Müşteri Ürün Kodları
@@ -2265,9 +2272,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Yeni Stok UoM gereklidir
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Yeni Stok UoM gereklidir
 DocType: Quality Inspection,Sample Size,Numune Boyu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Lütfen geçerlli bir 'durum nodan başlayarak' belirtiniz
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daha fazla masraf Gruplar altında yapılabilir, ancak girişleri olmayan Gruplar karşı yapılabilir"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daha fazla masraf Gruplar altında yapılabilir, ancak girişleri olmayan Gruplar karşı yapılabilir"
 DocType: Project,External,Harici
 DocType: Features Setup,Item Serial Nos,Ürün Seri Numaralar
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Kullanıcılar ve İzinler
@@ -2301,8 +2308,8 @@ DocType: SMS Log,Sender Name,Gönderenin Adı
 DocType: SMS Log,Sender Name,Gönderenin Adı
 DocType: Page,Title,Başlık
 DocType: Page,Title,Başlık
-sites/assets/js/list.min.js +104,Customize,Özelleştirme
-sites/assets/js/list.min.js +104,Customize,Özelleştirme
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Özelleştirme
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Özelleştirme
 DocType: POS Profile,[Select],[Seç]
 DocType: POS Profile,[Select],[Seç]
 DocType: SMS Log,Sent To,Gönderildiği Kişi
@@ -2334,13 +2341,14 @@ DocType: Item,End of Life,Kullanım süresi Sonu
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Gezi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Gezi
 DocType: Leave Block List,Allow Users,Kullanıcılara İzin Ver
+DocType: Purchase Order,Customer Mobile No,Müşteri Mobil Hayır
 DocType: Sales Invoice,Recurring,Yinelenen
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Ayrı Gelir izlemek ve ürün dikey veya bölümler için Gider.
 DocType: Rename Tool,Rename Tool,yeniden adlandırma aracı
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Güncelleme Maliyeti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Güncelleme Maliyeti
 DocType: Item Reorder,Item Reorder,Ürün Yeniden Sipariş
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Transfer Malzemesi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Malzemesi
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","İşlemleri, işlem maliyetlerini belirtiniz ve işlemlerinize kendilerine özgü işlem numaraları veriniz."
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
@@ -2370,7 +2378,7 @@ DocType: Appraisal,Employee,Çalışan
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Gönderen İthalat E-
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Kullanıcı olarak davet
 DocType: Features Setup,After Sale Installations,Satış Sonrası Montaj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} tam fatura edilir
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} tam fatura edilir
 DocType: Workstation Working Hour,End Time,Bitiş Zamanı
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Satış veya Satın Alma için standart sözleşme şartları.
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Satış veya Satın Alma için standart sözleşme şartları.
@@ -2381,8 +2389,9 @@ DocType: Page,Standard,Standart
 DocType: Page,Standard,Standart
 DocType: Rename Tool,File to Rename,Rename Dosya
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Ürün {0} için Sipariş numarası gerekli
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Göster Ödemeleri
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Ürün için yok Belirtilen BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Bakım Programı {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Bakım Programı {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Boyut
 DocType: Notification Control,Expense Claim Approved,Gideri Talebi Onaylandı
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Ecza
@@ -2404,10 +2413,10 @@ DocType: Upload Attendance,Attendance To Date,Tarihine kadar katılım
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),İş e-mail kimliği için gelen sunucu kurulumu (örneğin: sales@example.com)
 DocType: Warranty Claim,Raised By,Talep edilen
 DocType: Payment Tool,Payment Account,Ödeme Hesabı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Devam etmek için Firma belirtin
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Devam etmek için Firma belirtin
-sites/assets/js/list.min.js +23,Draft,Taslak
-sites/assets/js/list.min.js +23,Draft,Taslak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Taslak
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Taslak
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Telafi İzni
 DocType: Quality Inspection Reading,Accepted,Onaylanmış
 DocType: User,Female,Kadın
@@ -2423,15 +2432,16 @@ DocType: Shipping Rule,Shipping Rule Label,Kargo Kural Etiketi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
 DocType: Newsletter,Test,Test
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Mevcut stok işlemleri size değerlerini değiştiremezsiniz \ Bu öğe, orada olduğundan 'Seri No Has', 'Toplu Has Hayır', 'Stok Öğe mı' ve 'Değerleme Metodu'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hızlı Dergisi Girişi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
 DocType: Stock Entry,For Quantity,Miktar
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Satır {1} deki {0} Ürünler için planlanan miktarı giriniz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} teslim edilmedi
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Ürün istekleri.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} teslim edilmedi
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Ürün istekleri.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Her mamül madde için ayrı üretim emri oluşturulacaktır.
 DocType: Purchase Invoice,Terms and Conditions1,Şartlar ve Koşullar 1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kurulum Tamamlandı
@@ -2444,7 +2454,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bülten Posta Lis
 DocType: Delivery Note,Transporter Name,Taşıyıcı Adı
 DocType: Contact,Enter department to which this Contact belongs,Bu irtibatın ait olduğu departmanı girin
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Toplam Yok
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Satır {0} daki Ürün veya Depo Ürün isteğini karşılamıyor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Satır {0} daki Ürün veya Depo Ürün isteğini karşılamıyor
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Ölçü Birimi
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Ölçü Birimi
 DocType: Fiscal Year,Year End Date,Yıl Bitiş Tarihi
@@ -2478,7 +2488,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Sözleşme Bitiş tarihi Katılma tarihinden büyük olmalıdır
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Bir komisyon için şirketlerin ürünlerini satan bir üçüncü taraf dağıtıcı / bayi / komisyon ajan / ortaklık / bayi.
 DocType: Customer Group,Has Child Node,Çocuk Kısmı Var
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Buraya statik url parametreleri girin (Örn. gönderen = ERPNext, kullanıcı adı = ERPNext, Şifre = 1234 vb)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} değil herhangi bir aktif Mali Yılı içinde. Daha fazla bilgi kontrol ediniz {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Bu ERPNextten otomatik olarak üretilmiş bir örnek web sitedir.
@@ -2530,12 +2540,10 @@ DocType: Note,Note,Not
 DocType: Purchase Receipt Item,Recd Quantity,Alınan Miktar
 DocType: Email Account,Email Ids,E-posta Noları
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Satış Sipariş Miktarı {1} den fazla Ürün {0} üretilemez
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Altınçağ'da olarak ayarla
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Tax Rule,Billing City,Fatura Şehir
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Bu izin isteği onay bekliyor. Sadece ilgili izin onaylayıcısı durumu güncelleyebilir.
 DocType: Global Defaults,Hide Currency Symbol,Para birimi simgesini gizle
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","Örneğin: Banka, Nakit, Kredi Kartı"
 DocType: Journal Entry,Credit Note,Kredi mektubu
@@ -2563,8 +2571,8 @@ DocType: Installation Note Item,Installed Qty,Kurulan Miktar
 DocType: Lead,Fax,Faks
 DocType: Lead,Fax,Faks
 DocType: Purchase Taxes and Charges,Parenttype,Ana Tip
-sites/assets/js/list.min.js +26,Submitted,Tanzim Edildi
-sites/assets/js/list.min.js +26,Submitted,Tanzim Edildi
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Tanzim Edildi
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Tanzim Edildi
 DocType: Salary Structure,Total Earning,Toplam Kazanç
 DocType: Salary Structure,Total Earning,Toplam Kazanç
 DocType: Purchase Receipt,Time at which materials were received,Malzemelerin alındığı zaman
@@ -2576,7 +2584,7 @@ DocType: Sales Order,Billing Status,Fatura Durumu
 DocType: Sales Order,Billing Status,Fatura Durumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Yardımcı Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Yardımcı Giderleri
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90 üzerinde
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 üzerinde
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
 ,Download Backups,İndir Yedekler
@@ -2587,8 +2595,8 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Seçin Çalışanlar
 DocType: Bank Reconciliation,To Date,Tarihine kadar
 DocType: Opportunity,Potential Sales Deal,Potansiyel Satış Fırsat
-sites/assets/js/form.min.js +308,Details,Ayrıntılar
-sites/assets/js/form.min.js +308,Details,Ayrıntılar
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Ayrıntılar
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Ayrıntılar
 DocType: Purchase Invoice,Total Taxes and Charges,Toplam Vergi ve Harçlar
 DocType: Employee,Emergency Contact,Acil Durum İrtibat Kişisi
 DocType: Item,Quality Parameters,Kalite Parametreleri
@@ -2605,7 +2613,7 @@ DocType: Purchase Order Item,Received Qty,Alınan Miktar
 DocType: Stock Entry Detail,Serial No / Batch,Seri No / Parti
 DocType: Product Bundle,Parent Item,Ana Ürün
 DocType: Account,Account Type,Hesap Tipi
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Bakım Programı bütün Ürünler için oluşturulmamıştır. Lütfen 'Program Oluştura' tıklayın
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Bakım Programı bütün Ürünler için oluşturulmamıştır. Lütfen 'Program Oluştura' tıklayın
 ,To Produce,Üretilecek
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Satırdaki {0} içinde {1}. Ürün fiyatına {2} eklemek için, satır {3} de dahil edilmelidir"
 DocType: Packing Slip,Identification of the package for the delivery (for print),(Baskı için) teslimat için ambalajın tanımlanması
@@ -2617,7 +2625,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flatteni
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Account,Income Account,Gelir Hesabı
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Döküm
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Teslimat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Teslimat
 DocType: Stock Reconciliation Item,Current Qty,Güncel Adet
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Maliyetlendirme Bölümünde ""Dayalı Ürünler Br.Fiyatına"" bakınız"
 DocType: Appraisal Goal,Key Responsibility Area,Kilit Sorumluluk Alanı
@@ -2656,10 +2664,10 @@ apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Tüm adresler.
 DocType: Company,Stock Settings,Stok Ayarları
 DocType: Company,Stock Settings,Stok Ayarları
 DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Aşağıdaki özelliklerin her ikisi, kayıtlarında aynı ise birleştirme mümkündür. Grup, Kök tipi, Şirket"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Aşağıdaki özelliklerin her ikisi, kayıtlarında aynı ise birleştirme mümkündür. Grup, Kök tipi, Şirket"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Müşteri Grupbu Ağacını Yönetin.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Yeni Maliyet Merkezi Adı
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Yeni Maliyet Merkezi Adı
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Yeni Maliyet Merkezi Adı
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Yeni Maliyet Merkezi Adı
 DocType: Leave Control Panel,Leave Control Panel,İzin Kontrol Paneli
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Varsayılan adres şablonu bulunamadı. Lütfen Ayarlar> Basım ve Markalaştırma> Adres Şablonunu kullanarak şablon oluşturun.
 DocType: Appraisal,HR User,İK Kullanıcı
@@ -2680,9 +2688,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Ödeme Aracı Detayı
 ,Sales Browser,Satış Tarayıcı
 DocType: Journal Entry,Total Credit,Toplam Kredi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Yerel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Yerel
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Yerel
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Yerel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Borçlular
@@ -2691,17 +2699,17 @@ apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
 DocType: C-Form Invoice Detail,Territory,Bölge
 DocType: C-Form Invoice Detail,Territory,Bölge
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Lütfen gerekli ziyaretlerin sayısını belirtin
+DocType: Purchase Order,Customer Address Display,Müşteri Adresi Ekran
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Parlatma
 DocType: Production Order Operation,Planned Start Time,Planlanan Başlangıç ​​Zamanı
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Ayrılan
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bilançoyu Kapat ve Kar veya Zararı ayır.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Zaten başka UOM bazı işlem (ler) yaptık \ çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Varsayılan UOM değiştirmek için, \ kullanımı Stok modülü altında araç 'UOM Programı Değiştir'."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Döviz Kuru içine başka bir para birimi dönüştürme belirtin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Teklif {0} iptal edildi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Teklif {0} iptal edildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Toplam Üstün Tutar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Çalışan {0} {1} tarihinde izinli oldu. Katılım işaretlenemez.
 DocType: Sales Partner,Targets,Hedefler
@@ -2718,12 +2726,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Bu bir kök müşteri grubudur ve düzenlenemez.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Muhasebe girdilerine başlamadan önce hesap şemanızı kurunuz
 DocType: Purchase Invoice,Ignore Pricing Rule,Fiyatlandırma Kuralı Yoksay
-sites/assets/js/list.min.js +24,Cancelled,İptal Edilmiş
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,İptal Edilmiş
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Maaş Yapısı Tarihten itibaren Çalışan Katılma Tarihi daha az olamaz.
 DocType: Employee Education,Graduate,Mezun
 DocType: Leave Block List,Block Days,Blok Gün
 DocType: Journal Entry,Excise Entry,Tüketim Girişi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Uyarı: Satış Sipariş {0} zaten Müşterinin Satın Alma Emri karşı var {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Uyarı: Satış Sipariş {0} zaten Müşterinin Satın Alma Emri karşı var {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2784,18 +2792,18 @@ DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
 DocType: Features Setup,Sales and Purchase,Satış ve Satın Alma
 DocType: Features Setup,Sales and Purchase,Satış ve Satın Alma
-DocType: Purchase Order Item,Material Request No,Malzeme Talebi No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
+DocType: Supplier Quotation Item,Material Request No,Malzeme Talebi No
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Müşterinin para biriminin şirketin temel para birimine dönüştürülme oranı
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} isimli kişi başarı ile listeden çıkarıldı.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Oranı (Şirket Para)
-apps/frappe/frappe/templates/base.html +132,Added,Eklendi
+apps/frappe/frappe/templates/base.html +134,Added,Eklendi
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Bölge Ağacını Yönetin.
 DocType: Journal Entry Account,Sales Invoice,Satış Faturası
 DocType: Journal Entry Account,Sales Invoice,Satış Faturası
 DocType: Journal Entry Account,Party Balance,Parti Dengesi
 DocType: Sales Invoice Item,Time Log Batch,Günlük Seri
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,İndirim Açık Uygula seçiniz
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,İndirim Açık Uygula seçiniz
 DocType: Company,Default Receivable Account,Standart Alacak Hesabı
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Yukarıda seçilen kriterler için ödenen toplam maaş için banka girdisi oluşturun
 DocType: Stock Entry,Material Transfer for Manufacture,Üretim için Materyal Transfer
@@ -2807,7 +2815,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting En
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Para basma
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Ürün {0} yoktur
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Ürün {0} yoktur
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 apps/frappe/frappe/desk/query_report.py +136,Total,Toplam
@@ -2827,17 +2835,19 @@ DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Şekillendirme Sprey
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Uyarı: İstenen Ürün Miktarı Minimum Sipariş Miktarından az 
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Hesap {0} dondurulmuş
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Hesap {0} donduruldu
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Hesap {0} dondurulmuş
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Hesap {0} donduruldu
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Örgüte ait Hesap ayrı Planı Tüzel Kişilik / Yardımcı.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL veya BS
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL veya BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Komisyon oranı 100'den fazla olamaz
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Asgari Stok Seviyesi
 DocType: Stock Entry,Subcontract,Alt sözleşme
 DocType: Stock Entry,Subcontract,Alt sözleşme
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,İlk {0} giriniz
 DocType: Production Planning Tool,Get Items From Sales Orders,Satış Emirlerinden Ürünleri alın
 DocType: Production Order Operation,Actual End Time,Gerçek Bitiş Zamanı
 DocType: Production Planning Tool,Download Materials Required,Gerekli Malzemeleri indirin
@@ -2858,9 +2868,9 @@ apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Pleas
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Dengesiz ay boyunca hedefleri dağıtmak için Aylık Dağıtım seçin.
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Öğe Satır {0}: {1} Yukarıdaki 'satın alma makbuzlarını' tablosunda yok Satınalma Makbuzu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Çalışan {0} hali hazırda  {2} ve {3} arasında {1} için başvurmuştur
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Çalışan {0} hali hazırda  {2} ve {3} arasında {1} için başvurmuştur
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Proje Başlangıç ​​Tarihi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Kadar
 DocType: Rename Tool,Rename Log,Girişi yeniden adlandır
@@ -2894,14 +2904,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,İşlemde yalnızca yaprak düğümlere izin verilir
 DocType: Expense Claim,Expense Approver,Gider Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Tedarik edilen satın alma makbuzu ürünü
-sites/assets/js/erpnext.min.js +48,Pay,Ödeme
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Ödeme
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,DateTime için
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Sms teslim durumunu korumak için Günlükleri
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Öğütme
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Bekleyen Etkinlikleri
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Bekleyen Etkinlikleri
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Onaylı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Tedarikçi> Tedarikçi Türü
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Tedarikçi> Tedarikçi Türü
@@ -2913,7 +2923,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sor
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Gazete Yayıncıları
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Mali Yıl Seçin
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Döküm
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Bu Kayıt için İzin Onaylayıcısınız. Lütfen durumu güncelleyip kaydedin.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Yeniden Sipariş Seviyesi
 DocType: Attendance,Attendance Date,Katılım Tarihi
 DocType: Attendance,Attendance Date,Katılım Tarihi
@@ -2962,6 +2971,7 @@ apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortisman
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortisman
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Tedarikçi (ler)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Geçersiz dönemi
 DocType: Customer,Credit Limit,Kredi Limiti
 DocType: Customer,Credit Limit,Kredi Limiti
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Işlemin türünü seçin
@@ -2972,8 +2982,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Şart
 DocType: Customer,Address and Contact,Adresler ve Kontaklar
 DocType: Customer,Last Day of the Next Month,Sonraki Ay Son Gün
 DocType: Employee,Feedback,Geri bildirim
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Bakım. Program
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Bakım. Program
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Zımpara jet işleme
 DocType: Stock Settings,Freeze Stock Entries,Donmuş Stok Girdileri
 DocType: Website Settings,Website Settings,Web Sitesi Ayarları
@@ -2991,12 +3001,12 @@ DocType: Material Request,Requested For,Için talep
 DocType: Material Request,Requested For,Için talep
 DocType: Quotation Item,Against Doctype,Belge Tipi Karşılığı
 DocType: Delivery Note,Track this Delivery Note against any Project,Bu irsaliyeyi bütün Projelere karşı takip et
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Kök hesabı silinemez
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Kök hesabı silinemez
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Göster Stok Girişler
 ,Is Primary Address,Birincil Adres mı
 DocType: Production Order,Work-in-Progress Warehouse,Devam eden depo işi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referans # {0} tarihli {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Referans # {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referans # {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referans # {0} tarihli {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Adresleri yönetin
 DocType: Pricing Rule,Item Code,Ürün Kodu
 DocType: Pricing Rule,Item Code,Ürün Kodu
@@ -3008,8 +3018,8 @@ DocType: Lead,Market Segment,Pazar Segmenti
 DocType: Communication,Phone,Telefon
 DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Çalışan Dahili İş Geçmişi
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Kapanış (Dr)
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Kapanış (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Kapanış (Dr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Kapanış (Dr)
 DocType: Contact,Passive,Pasif
 DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Seri No {0} stokta değil
@@ -3017,7 +3027,7 @@ apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transaction
 DocType: Sales Invoice,Write Off Outstanding Amount,Bekleyen Miktarı Sil
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Otomatik mükerrer faturaya ihtiyacınız olup olmadığını kontrol edin, herhangi bir satış faturası ibraz edildikten sonra tekrar bölümü görünür olacaktır."
 DocType: Account,Accounts Manager,Hesap Yöneticisi
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Günlük {0} 'Teslim edilmelidir'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Günlük {0} 'Teslim edilmelidir'
 DocType: Stock Settings,Default Stock UOM,Varsayılan Stok UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Etkinlik Türü dayalı Oranı Maliyetlendirme (saatte)
 DocType: Production Planning Tool,Create Material Requests,Malzeme İstekleri Oluştur
@@ -3029,7 +3039,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Güncellemeler Alın
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Birkaç örnek kayıtları ekle
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Yönetim bırakın
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Yönetim bırakın
 DocType: Event,Groups,Gruplar
 DocType: Event,Groups,Gruplar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Hesap Grubu
@@ -3045,11 +3055,10 @@ DocType: Features Setup,Sales Extras,Satış Ekstralar
 DocType: Features Setup,Sales Extras,Satış Ekstralar
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Maliyet Merkezi {2}'ye karşı {1} hesabı için {0} bütçesi {3} ile aşılmıştır.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Bu Stok Uzlaşma bir Açılış Giriş olduğundan fark Hesabı, bir Aktif / Pasif tipi hesabı olmalıdır"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
-DocType: Leave Allocation,Carry Forwarded Leaves,Yönlendirilen Yapraklar Carry
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tarihten itibaren ' Tarihine Kadar' dan sonra olmalıdır
 ,Stock Projected Qty,Öngörülen Stok Miktarı
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
 DocType: Sales Order,Customer's Purchase Order,Müşterinin Sipariş
 DocType: Warranty Claim,From Company,Şirketten
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Değer veya Miktar
@@ -3064,14 +3073,13 @@ DocType: Sales Partner,Retailer,Perakendeci
 DocType: Sales Partner,Retailer,Perakendeci
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Hesabın için Kredi bir bilanço hesabı olmalıdır
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Bütün Tedarikçi Tipleri
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Ürün Kodu zorunludur çünkü Ürün otomatik olarak numaralandırmaz
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Teklif {0} {1} türünde
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Ürün Kodu zorunludur çünkü Ürün otomatik olarak numaralandırmaz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Teklif {0} {1} türünde
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Bakım Programı Ürünü
 DocType: Sales Order,%  Delivered,% Teslim Edildi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Maaş Makbuzu Oluştur
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Durdurmayı iptal etmek
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Araştır BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Teminatlı Krediler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Teminatlı Krediler
@@ -3082,8 +3090,8 @@ DocType: Appraisal,Appraisal,Appraisal:Değerlendirme
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Kayıp köpük döküm
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Çizim
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tarih tekrarlanır
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
 DocType: Hub Settings,Seller Email,Satıcı E-
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Toplam Satınalma Maliyeti (Satın Alma Fatura üzerinden)
 DocType: Workstation Working Hour,Start Time,Başlangıç ​​Zamanı
@@ -3099,8 +3107,8 @@ DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Tutar (Şirket
 DocType: BOM Operation,Hour Rate,Saat Hızı
 DocType: BOM Operation,Hour Rate,Saat Hızı
 DocType: Stock Settings,Item Naming By,Ürün adlandırma
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Fiyat Teklifinden
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},{1} den sonra başka bir dönem kapatma girdisi {0} yapılmıştır
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fiyat Teklifinden
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{1} den sonra başka bir dönem kapatma girdisi {0} yapılmıştır
 DocType: Production Order,Material Transferred for Manufacturing,Malzeme İmalat transfer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Hesap {0} yok
 DocType: Purchase Receipt Item,Purchase Order Item No,Satınalma Siparişi Ürün No
@@ -3115,11 +3123,11 @@ DocType: Item,Inspection Required,Muayene Gerekli
 DocType: Purchase Invoice Item,PR Detail,PR Detayı
 DocType: Sales Order,Fully Billed,Tam Faturalı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Eldeki Nakit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Teslim depo stok kalemi için gerekli {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Teslim depo stok kalemi için gerekli {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Paketin brüt ağırlığı. Genellikle net ağırlığı + ambalaj Ürünü ağırlığı. (Baskı için)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Bu role sahip kullanıcıların dondurulmuş hesapları ayarlama ve dondurulmuş hesaplara karşı muhasebe girdileri oluşturma/düzenleme yetkileri vardır
 DocType: Serial No,Is Cancelled,İptal edilmiş
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Benim Gönderiler
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Benim Gönderiler
 DocType: Journal Entry,Bill Date,Fatura tarihi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Eğer yüksek öncelikli birden çok Fiyatlandırma Kuralı varsa, şu iç öncelikler geçerli olacaktır."
 DocType: Supplier,Supplier Details,Tedarikçi Ayrıntıları
@@ -3136,7 +3144,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Trans
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Banka Hesabı seçiniz
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Banka Hesabı seçiniz
 DocType: Newsletter,Create and Send Newsletters,Oluşturun ve gönderin Haber
-sites/assets/js/report.min.js +107,From Date must be before To Date,Tarihten itibaren tarihe kadardan önce olmalıdır
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Tarihten itibaren tarihe kadardan önce olmalıdır
 DocType: Sales Order,Recurring Order,Tekrarlayan Sipariş
 DocType: Company,Default Income Account,Standart Gelir Hesabı
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Müşteri Grup / Müşteri
@@ -3154,33 +3162,32 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,
 ,Projected,Öngörülen
 ,Projected,Öngörülen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seri No {0} Depo  {1} e ait değil
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Not: Miktar 0 olduğundan ötürü sistem Ürün {0} için teslimat ve ayırma kontrolü yapmayacaktır
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Not: Miktar 0 olduğundan ötürü sistem Ürün {0} için teslimat ve ayırma kontrolü yapmayacaktır
 DocType: Notification Control,Quotation Message,Teklif Mesajı
 DocType: Issue,Opening Date,Açılış Tarihi
 DocType: Issue,Opening Date,Açılış Tarihi
 DocType: Journal Entry,Remark,Dikkat
 DocType: Purchase Receipt Item,Rate and Amount,Br.Fiyat ve Miktar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Sıkıcı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Satış Emrinden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Satış Emrinden
 DocType: Blog Category,Parent Website Route,Ana Site Rotası
 DocType: Sales Order,Not Billed,Faturalanmamış
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Her iki depo da aynı şirkete ait olmalıdır
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Hiç kişiler Henüz eklenmiş.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Hiç kişiler Henüz eklenmiş.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Aktif Değil
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Fatura Gönderme Tarihi Karşı
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Indi Maliyet Çeki Miktarı
 DocType: Time Log,Batched for Billing,Faturalanmak için partiler haline getirilmiş
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Tedarikçiler tarafından artırılan faturalar
 DocType: POS Profile,Write Off Account,Hesabı Kapat
-sites/assets/js/erpnext.min.js +26,Discount Amount,İndirim Tutarı
-sites/assets/js/erpnext.min.js +26,Discount Amount,İndirim Tutarı
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,İndirim Tutarı
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,İndirim Tutarı
 DocType: Purchase Invoice,Return Against Purchase Invoice,Karşı Satınalma Fatura Dönüş
 DocType: Item,Warranty Period (in days),(Gün) Garanti Süresi
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,Örneğin KDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Madde 4
 DocType: Journal Entry Account,Journal Entry Account,Dergi Girişi Hesabı
 DocType: Shopping Cart Settings,Quotation Series,Teklif Serisi
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Bir Ürün aynı isimle bulunuyorsa ({0}), lütfen madde grubunun veya maddenin adını değiştirin"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Bir Ürün aynı isimle bulunuyorsa ({0}), lütfen madde grubunun veya maddenin adını değiştirin"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Oluşturan sıcak metal gaz
 DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
 DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
@@ -3219,11 +3226,12 @@ DocType: Stock Entry,Customer or Supplier Details,Müşteri ya da Tedarikçi Det
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Ayarla
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Ayarla
 DocType: Lead,Lead Owner,Talep Yaratma Sahibi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Depo gereklidir
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Depo gereklidir
 DocType: Employee,Marital Status,Medeni durum
 DocType: Stock Settings,Auto Material Request,Otomatik Malzeme Talebi
 DocType: Stock Settings,Auto Material Request,Otomatik Malzeme Talebi
 DocType: Time Log,Will be updated when billed.,Faturalandığında güncellenecektir.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Depo itibaren Available at Toplu Adet
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Cari BOM ve Yeni BOM aynı olamaz
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Cari BOM ve Yeni BOM aynı olamaz
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Emeklilik Tarihi katılım tarihinden büyük olmalıdır
@@ -3242,13 +3250,13 @@ DocType: POS Profile,Update Stock,Stok güncelle
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Süperfiniş
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ürünler için farklı UOM yanlış (Toplam) net ağırlıklı değere yol açacaktır. Net ağırlıklı değerin aynı olduğundan emin olun.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Oranı
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,İrsaliyeden Ürünleri çekin
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,İrsaliyeden Ürünleri çekin
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Dergi Girişler {0}-un bağlı olduğu
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Tip e-posta, telefon, chat, ziyaretin, vb her iletişimin Kayıt"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Şirket Yuvarlak Off Maliyet Merkezi'ni belirtiniz
 DocType: Purchase Invoice,Terms,Şartlar
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Yeni Oluştur
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Yeni Oluştur
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Yeni Oluştur
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Yeni Oluştur
 DocType: Buying Settings,Purchase Order Required,gerekli Satın alma Siparişi
 ,Item-wise Sales History,Ürün bilgisi Satış Geçmişi
 DocType: Expense Claim,Total Sanctioned Amount,Toplam Tasdiklenmiş Tutar
@@ -3267,9 +3275,10 @@ apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notlar
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notlar
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,İlk grup düğümünü seçin.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Amaç şunlardan biri olmalıdır: {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Formu doldurun ve kaydedin
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Formu doldurun ve kaydedin
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,En son stok durumu ile bütün ham maddeleri içeren bir rapor indir
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Kaplama
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
 DocType: Leave Application,Leave Balance Before Application,Uygulamadan Önce Kalan İzin
 DocType: SMS Center,Send SMS,SMS Gönder
 DocType: Company,Default Letter Head,Mektubu Başkanı Standart
@@ -3277,7 +3286,7 @@ DocType: Time Log,Billable,Faturalandırılabilir
 DocType: Time Log,Billable,Faturalandırılabilir
 DocType: Authorization Rule,This will be used for setting rule in HR module,Bu İK modunda ayarlama kuralı için kullanılacaktır
 DocType: Account,Rate at which this tax is applied,Vergi uygulanma oranı
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Yeniden Sipariş Adet
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Yeniden Sipariş Adet
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
 DocType: Journal Entry,Write Off,Silmek
@@ -3290,12 +3299,15 @@ DocType: Features Setup,"Discount Fields will be available in Purchase Order, Pu
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Yeni Hesap Adı. Not: Müşteriler ve Tedarikçiler için hesapları oluşturmak etmeyin
 DocType: Report,Report Type,Rapor Türü
 DocType: Report,Report Type,Rapor Türü
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Yükleme
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Yükleme
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Aracı değiştirin
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Ülke bilgisi varsayılan adres şablonları
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Tedarikçi Müşteriye teslim
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Göster vergi break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,İçeri/Dışarı Aktar
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Üretim faaliyetlerinde bulunuyorsanız Ürünlerin 'Üretilmiş' olmasını sağlar
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fatura Gönderme Tarihi
 DocType: Sales Invoice,Rounded Total,Yuvarlanmış Toplam
 DocType: Product Bundle,List items that form the package.,Ambalajı oluşturan Ürünleri listeleyin
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Yüzde Tahsisi % 100'e eşit olmalıdır
@@ -3307,9 +3319,9 @@ apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to
 DocType: Company,Default Cash Account,Standart Kasa Hesabı
 DocType: Company,Default Cash Account,Standart Kasa Hesabı
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Şirket (değil Müşteri veya alanı) usta.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Satış Emri iptal edilmeden önce İrsaliyeler {0} iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Satış Emri iptal edilmeden önce İrsaliyeler {0} iptal edilmelidir
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Ödenen miktar + Borç İptali  Toplamdan fazla olamaz
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Ürün {1} için geçerli bir parti numarası değildir
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
@@ -3334,14 +3346,15 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Satır {0}: Adet depo avalable değil {1} ​​üzerinde {2} {3}.
  Mevcut Adet: {4}, Miktar Transferi: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Madde 3
+DocType: Purchase Order,Customer Contact Email,Müşteri İletişim E-mail
 DocType: Event,Sunday,Pazar
 DocType: Event,Sunday,Pazar
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"'Nakit veya Banka Hesabı' belirtilmediğinden ötürü, Ödeme Girdisi oluşturulmayacaktır"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Sorumluluklar
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Şablon
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Şablon
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Şablon
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Şablon
 DocType: Sales Person,Sales Person Name,Satış Personeli Adı
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Tabloya en az 1 fatura girin
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Kullanıcı Ekle
@@ -3351,7 +3364,7 @@ DocType: Task,Actual Start Date (via Time Logs),Fiili Başlangıç ​​Tarihi
 DocType: Stock Reconciliation Item,Before reconciliation,Uzlaşma önce
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Şu kişiye {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Eklenen Vergi ve Harçlar (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
 DocType: Sales Order,Partly Billed,Kısmen Faturalandı
 DocType: Item,Default BOM,Standart BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -3360,14 +3373,13 @@ apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.htm
 DocType: Time Log Batch,Total Hours,Toplam Saat
 DocType: Time Log Batch,Total Hours,Toplam Saat
 DocType: Journal Entry,Printing Settings,Baskı Ayarları
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},"Toplam Borç Toplam Krediye eşit olmalıdırr. Aradaki fark, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Toplam Borç Toplam Krediye eşit olmalıdırr. Aradaki fark, {0}"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Otomotiv
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Otomotiv
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Tip {0} izinler Çalışan {1} e {0} Mali yılı için hali hazırda tahsis edildi
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Ürün gereklidir
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Ürün gereklidir
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal enjeksiyon kalıplama
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,İrsaliyeden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,İrsaliyeden
 DocType: Time Log,From Time,Zamandan
 DocType: Notification Control,Custom Message,Özel Mesaj
 DocType: Notification Control,Custom Message,Özel Mesaj
@@ -3387,10 +3399,10 @@ DocType: Stock Entry,From BOM,BOM Gönderen
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Temel
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Temel
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} dan önceki stok işlemleri dondurulmuştur
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule','Takvim Oluştura' tıklayınız
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Tarihine Kadar ile Tarihinden itibaren aynı olmalıdır
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','Takvim Oluştura' tıklayınız
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Tarihine Kadar ile Tarihinden itibaren aynı olmalıdır
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","Örneğin Kg, Birimi, No, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referans Tarihi girdiyseniz Referans No zorunludur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referans Tarihi girdiyseniz Referans No zorunludur
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Katılım Tarihi Doğum Tarihinden büyük olmalıdır
 DocType: Salary Structure,Salary Structure,Maaş Yapısı
 DocType: Salary Structure,Salary Structure,Maaş Yapısı
@@ -3401,7 +3413,7 @@ DocType: Account,Bank,Banka
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Havayolu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Havayolu
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Sayı Malzeme
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Sayı Malzeme
 DocType: Material Request Item,For Warehouse,Depo için
 DocType: Material Request Item,For Warehouse,Depo için
 DocType: Employee,Offer Date,Teklif Tarihi
@@ -3431,6 +3443,7 @@ DocType: Issue,Opening Time,Açılış Zamanı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Tarih aralığı gerekli
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Teminatlar ve Emtia Borsaları
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
+DocType: Delivery Note Item,From Warehouse,Atölyesi'nden
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Delme
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Şişirme
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
@@ -3456,12 +3469,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,H
 DocType: Leave Application,Follow via Email,E-posta ile takip
 DocType: Leave Application,Follow via Email,E-posta ile takip
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,İndirim Tutarından sonraki vergi miktarı
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Bu hesap için çocuk hesabı var. Bu hesabı silemezsiniz.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Bu hesap için çocuk hesabı var. Bu hesabı silemezsiniz.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Hedef miktarı veya hedef tutarı zorunludur
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Ürün {0} için Varsayılan BOM mevcut değildir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
-DocType: Leave Allocation,Carry Forward,Nakletmek
-DocType: Leave Allocation,Carry Forward,Nakletmek
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ürün {0} için Varsayılan BOM mevcut değildir
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tarih Açılış Tarihi Kapanış önce olmalıdır
+DocType: Leave Control Panel,Carry Forward,Nakletmek
+DocType: Leave Control Panel,Carry Forward,Nakletmek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Maliyet Merkezi mevcut işlemlere ana deftere dönüştürülemez
 DocType: Department,Days for which Holidays are blocked for this department.,Bu departman için tatillerin kaldırıldığı günler.
 ,Produced,Üretilmiş
@@ -3487,18 +3501,18 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Enter
 DocType: Purchase Order,The date on which recurring order will be stop,yinelenen sipariş durdurmak hangi tarih
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} değeri {1} oranında azaltılmalıdır veya tolerans durumu artırılmalıdır 
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} değeri {1} oranında azaltılmalıdır veya tolerans durumu artırılmalıdır 
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Toplam Mevcut
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Saat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Saat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serileştirilmiş Öğe {0} Stok Uzlaşma kullanarak \
  güncellenmiş olamaz"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Tedarikçi Malzeme Transferi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Tedarikçi Malzeme Transferi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Yeni Seri No Warehouse olamaz. Depo Stok girişiyle veya alım makbuzuyla ayarlanmalıdır
 DocType: Lead,Lead Type,Talep Yaratma Tipi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Teklif oluşturma
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} tarafından onaylanmış
 DocType: Shipping Rule,Shipping Rule Conditions,Kargo Kural Koşulları
 DocType: BOM Replace Tool,The new BOM after replacement,Değiştirilmesinden sonra yeni BOM
@@ -3557,7 +3571,7 @@ DocType: C-Form,C-Form,C-Formu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Çalışma kimliği ayarlanmamış
 DocType: Production Order,Planned Start Date,Planlanan Başlangıç ​​Tarihi
 DocType: Serial No,Creation Document Type,Oluşturulan Belge Türü
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Bakım. Ziyaret
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Bakım. Ziyaret
 DocType: Leave Type,Is Encash,Bozdurulmuş
 DocType: Purchase Invoice,Mobile No,Mobil No
 DocType: Payment Tool,Make Journal Entry,Dergi Girişi Yap
@@ -3566,8 +3580,8 @@ apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not availab
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Appraisal Template,Appraisal Template Title,Değerlendirme Şablonu Başlığı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Ticari
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Ticari
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Ticari
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Ticari
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Veli Öğe {0} Stok Öğe olmamalıdır
 DocType: Cost Center,Distribution Id,Dağıtım Kimliği
 DocType: Cost Center,Distribution Id,Dağıtım Kimliği
@@ -3588,15 +3602,16 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} Attribute değer aralığında olmalıdır {1} {2} artışlarla {3}
 DocType: Tax Rule,Sales,Satışlar
 DocType: Stock Entry Detail,Basic Amount,Temel Tutar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
+DocType: Leave Allocation,Unused leaves,Kullanılmayan yapraklar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Alacak Hesapları Standart
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Testere
 DocType: Tax Rule,Billing State,Fatura Devlet
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminasyon
 DocType: Item Reorder,Transfer,Transfer
 DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
 DocType: Authorization Rule,Applicable To (Employee),(Çalışana) uygulanabilir
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date zorunludur
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
@@ -3615,6 +3630,7 @@ DocType: Company,Retail,Perakende
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Müşteri {0} yok
 DocType: Attendance,Absent,Eksik
 DocType: Product Bundle,Product Bundle,Ürün Paketi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Satır {0}: Geçersiz başvuru {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Ezme
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vergiler ve Harçlar Şablon Satınalma
 DocType: Upload Attendance,Download Template,Şablonu İndir
@@ -3624,17 +3640,17 @@ DocType: Purchase Order Item Supplied,Raw Material Item Code,Hammadde Malzeme Ko
 DocType: Journal Entry,Write Off Based On,Dayalı Borç Silme
 DocType: Features Setup,POS View,POS görüntüle
 DocType: Features Setup,POS View,POS görüntüle
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Bir Seri No için kurulum kaydı.
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Bir Seri No için kurulum kaydı.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Sürekli döküm
-sites/assets/js/erpnext.min.js +10,Please specify a,Lütfen belirtiniz
-sites/assets/js/erpnext.min.js +10,Please specify a,Lütfen belirtiniz
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Lütfen belirtiniz
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Lütfen belirtiniz
 DocType: Offer Letter,Awaiting Response,Tepki bekliyor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Yukarıdaki
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Soğuk boyutlandırma
 DocType: Salary Slip,Earning & Deduction,Kazanma & Kesintisi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Hesap {0} Grup olamaz
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Bölge
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,İsteğe bağlı. Bu ayar çeşitli işlemlerde filtreleme yapmak için kullanılacaktır
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,İsteğe bağlı. Bu ayar çeşitli işlemlerde filtreleme yapmak için kullanılacaktır
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatif Değerleme Br.Fiyatına izin verilmez
 DocType: Holiday List,Weekly Off,Haftalık İzin
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Örneğin 2012 için, 2012-13"
@@ -3687,12 +3703,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporatif-model döküm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Eğlence Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Eğlence Giderleri
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Satış Faturası {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Yaş
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Satış Faturası {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Yaş
 DocType: Time Log,Billing Amount,Fatura Tutarı
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ürün {0} için geçersiz miktar belirtildi. Miktar 0 dan fazla olmalıdır
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,İzin başvuruları.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,İşlem görmüş hesaplar silinemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,İşlem görmüş hesaplar silinemez.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Yasal Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Yasal Giderler
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Otomatik sipariş 05, 28 vb gibi oluşturulur hangi ayın günü"
@@ -3705,10 +3721,9 @@ DocType: Sales Partner,Logo,Logo
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kullanıcıya kaydetmeden önce seri seçtirmek istiyorsanız işaretleyin. Eğer işaretlerseniz atanmış seri olmayacaktır.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Seri Numaralı Ürün Yok {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Açık Bildirimler
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Açık Bildirimler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Doğrudan Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Doğrudan Giderler
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Bu Malzeme isteğini durdurmaktan gerçekten vazgeçmek istiyor musunuz?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Yeni Müşteri Gelir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Seyahat Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Seyahat Giderleri
@@ -3722,7 +3737,7 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honlama
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Standart Depo stok Ürünleri için zorunludur.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standart Depo stok Ürünleri için zorunludur.
 DocType: Feed,Full Name,Tam Adı
 DocType: Feed,Full Name,Tam Adı
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
@@ -3748,8 +3763,8 @@ DocType: Buying Settings,Default Supplier Type,Standart Tedarikçii Türü
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Taşocakçılığı
 DocType: Production Order,Total Operating Cost,Toplam İşletme Maliyeti
 DocType: Production Order,Total Operating Cost,Toplam İşletme Maliyeti
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tüm Kişiler.
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tüm Kişiler.
 DocType: Newsletter,Test Email Id,Test E-posta Kimliği
@@ -3775,12 +3790,11 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Müşte
 DocType: Stock Settings,Role Allowed to edit frozen stock,dondurulmuş stok düzenlemeye İzinli rol
 ,Territory Target Variance Item Group-Wise,Bölge Hedef Varyans Ürün Grubu
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Bütün Müşteri Grupları
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Vergi Şablon zorunludur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Hesap {0}: Ana hesap {1} yok
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Fiyat Listesi Oranı (Şirket para birimi)
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Fiyat Listesi Oranı (Şirket para birimi)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} durumu Durduruldu
 DocType: Account,Temporary,Geçici
 DocType: Address,Preferred Billing Address,Tercih edilen Fatura Adresi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Yüzde Tahsisi
@@ -3800,14 +3814,15 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail, Ürün Vergi Detaylar
 DocType: Purchase Order Item,Supplier Quotation,Tedarikçi Teklifi
 DocType: Quotation,In Words will be visible once you save the Quotation.,fiyat teklifini kaydettiğinizde görünür olacaktır
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Ütü
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} durduruldu
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} durduruldu
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
 DocType: Lead,Add to calendar on this date,Bu tarihe Takvime ekle
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Nakliye maliyetleri ekleme  Kuralları.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Yaklaşan Etkinlikler
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Yaklaşan Etkinlikler
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Müşteri gereklidir
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Müşteri gereklidir
 DocType: Letter Head,Letter Head,Antetli Kağıt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hızlı Girişi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} Dönüş için zorunludur
 DocType: Purchase Order,To Receive,Almak
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Uydurma Shrink
@@ -3838,8 +3853,8 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one w
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: BOM Replace Tool,Replace,Değiştir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Lütfen Varsayılan Ölçü birimini girin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Lütfen Varsayılan Ölçü birimini girin
 DocType: Purchase Invoice Item,Project Name,Proje Adı
 DocType: Purchase Invoice Item,Project Name,Proje Adı
 DocType: Supplier,Mention if non-standard receivable account,Mansiyon standart dışı alacak hesabı varsa
@@ -3849,19 +3864,19 @@ DocType: Journal Entry Account,If Income or Expense,Gelir veya Gider ise
 DocType: Features Setup,Item Batch Nos,Ürün Parti Numaraları
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,İnsan Kaynakları
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,İnsan Kaynakları
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Ödeme Mutabakat Ödemesi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Vergi Varlıkları
 DocType: BOM Item,BOM No,BOM numarası
 DocType: Contact Us Settings,Pincode,Pinkodu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Günlük girdisi {0} {1} ya da zaten başka bir çeki karşı eşleşen hesabınız yok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Günlük girdisi {0} {1} ya da zaten başka bir çeki karşı eşleşen hesabınız yok
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: BOM Replace Tool,The BOM which will be replaced,Değiştirilecek BOM
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Yeni Stok UOM mevcut stok UOM dan farklı olmalıdır
 DocType: Account,Debit,Borç
 DocType: Account,Debit,Borç
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,İzinler 0.5 katlanarak tahsis edilmelidir
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,İzinler 0.5 katlanarak tahsis edilmelidir
 DocType: Production Order,Operation Cost,Operasyon Maliyeti
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Bir. Csv dosyasından devamlılığı yükle
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Üstün Amt
@@ -3869,7 +3884,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Bu Sat
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Bu konuyu atamak için, yan taraftaki ""Ata"" butonunu kullanın"
 DocType: Stock Settings,Freeze Stocks Older Than [Days], [Days] daha eski donmuş stoklar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","İki ya da daha fazla Fiyatlandırma Kuralları yukarıdaki koşullara dayalı bulundu ise, Öncelik uygulanır. Varsayılan değer sıfır (boş) ise Öncelik 0 ile 20 arasında bir sayıdır. Yüksek numarası aynı koşullarda birden Fiyatlandırma Kuralları varsa o öncelik alacak demektir."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Fatura Karşı
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Mali Yılı: {0} does not var
 DocType: Currency Exchange,To Currency,Para Birimi
 DocType: Currency Exchange,To Currency,Para Birimi
@@ -3910,7 +3924,7 @@ DocType: Stock Entry Detail,Additional Cost,Ek maliyet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Mali Yıl Bitiş Tarihi
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Mali Yıl Bitiş Tarihi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Dekont, olarak gruplandırıldı ise Makbuz numarasına dayalı filtreleme yapamaz"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
 DocType: Quality Inspection,Incoming,Alınan
 DocType: BOM,Materials Required (Exploded),Gerekli Malzemeler (patlamış)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ücretsiz İzin (Üİ) için Kazancı azalt
@@ -3918,11 +3932,11 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Satır # {0}: Seri No {1} ile eşleşmiyor {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Mazeret İzni
 DocType: Batch,Batch ID,Seri Kimliği
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Not: {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Not: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Not: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Not: {0}
 ,Delivery Note Trends,İrsaliye Eğilimleri;
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Bu Haftanın Özeti
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} satır {1} de Alınan veya Taşerona verilen bir Ürün olmalıdır.
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} satır {1} de Alınan veya Taşerona verilen bir Ürün olmalıdır.
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Hesap: {0} sadece Stok İşlemleri üzerinden güncellenebilir
 DocType: GL Entry,Party,Taraf
 DocType: Sales Order,Delivery Date,Teslimat Tarihi
@@ -3937,7 +3951,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,P
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ort. Alış Oranı
 DocType: Task,Actual Time (in Hours),(Saati) Gerçek Zaman
 DocType: Employee,History In Company,Şirketteki Geçmişi
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Haber Bültenleri
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Haber Bültenleri
 DocType: Address,Shipping,Nakliye
 DocType: Address,Shipping,Nakliye
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stok Defter Girdisi
@@ -3959,7 +3973,7 @@ DocType: Account,Auditor,Denetçi
 DocType: Purchase Order,End date of current order's period,Cari Siparişin dönemi bitiş tarihi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Teklif Mektubu Yap
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Dönüş
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Variant için Ölçü Varsayılan Birim Şablon aynı olmalıdır
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Variant için Ölçü Varsayılan Birim Şablon aynı olmalıdır
 DocType: DocField,Fold,Kat
 DocType: Production Order Operation,Production Order Operation,Üretim Sipariş Operasyonu
 DocType: Pricing Rule,Disable,Devre Dışı Bırak
@@ -3998,7 +4012,7 @@ DocType: Employee,Reports to,Raporlar
 DocType: SMS Settings,Enter url parameter for receiver nos,Alıcı numaraları için url parametresi girin
 DocType: Sales Invoice,Paid Amount,Ödenen Tutar
 DocType: Sales Invoice,Paid Amount,Ödenen Tutar
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Kapanan Hesap {0} 'Yükümlülük' tipi olmalıdır
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Kapanan Hesap {0} 'Yükümlülük' tipi olmalıdır
 ,Available Stock for Packing Items,Ambalajlama Ürünleri için mevcut stok
 DocType: Item Variant,Item Variant,Öğe Varyant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Bu adres şablonunu varsayılan olarak kaydedin, başka varsayılan bulunmamaktadır"
@@ -4007,7 +4021,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Man
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
 DocType: Production Planning Tool,Filter based on customer,Müşteriye dayalı filtre
 DocType: Payment Tool Detail,Against Voucher No,Çeki No Karşı
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Lütfen Ürün {0} için miktar giriniz
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Lütfen Ürün {0} için miktar giriniz
 DocType: Employee External Work History,Employee External Work History,Çalışan Harici İş Geçmişi
 DocType: Tax Rule,Purchase,Satın Alım
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Denge Adet
@@ -4050,15 +4064,15 @@ Note: BOM = Bill of Materials","Başka ** Ürün içine ** Öğeler ** Toplulaş
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Ürün {0} için Seri no zorunludur
 DocType: Item Variant Attribute,Attribute,Nitelik
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Menzil / dan belirtiniz
-sites/assets/js/desk.min.js +7652,Created By,Tarafından oluşturulan
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Tarafından oluşturulan
 DocType: Serial No,Under AMC,AMC altında
 DocType: Serial No,Under AMC,AMC altında
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Ürün değerleme oranı indi maliyet çeki miktarı dikkate hesaplanır
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Satış İşlemleri için  Varsayılan ayarlar.
 DocType: BOM Replace Tool,Current BOM,Güncel BOM
 DocType: BOM Replace Tool,Current BOM,Güncel BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,Seri No Ekle
-sites/assets/js/erpnext.min.js +8,Add Serial No,Seri No Ekle
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Seri No Ekle
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Seri No Ekle
 DocType: Production Order,Warehouses,Depolar
 DocType: Production Order,Warehouses,Depolar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Baskı ve Kırtasiye
@@ -4068,12 +4082,12 @@ DocType: Payment Reconciliation,Minimum Amount,Minimum Tutar
 DocType: Payment Reconciliation,Minimum Amount,Minimum Tutar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Mamülleri Güncelle
 DocType: Workstation,per hour,saat başına
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Seriler {0} {1} de zaten kullanılmıştır
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Seriler {0} {1} de zaten kullanılmıştır
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Depo hesabı (Devamlı Envanter) bu hesap altında oluşturulacaktır.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Bu depo için defter girdisi mevcutken depo silinemez.
 DocType: Company,Distribution,Dağıtım
 DocType: Company,Distribution,Dağıtım
-sites/assets/js/erpnext.min.js +50,Amount Paid,Ödenen Tutar;
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Ödenen Tutar;
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Sevk
@@ -4082,6 +4096,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max disco
 DocType: Customer,Default Taxes and Charges,Standart Vergi ve Harçlar
 DocType: Account,Receivable,Alacak
 DocType: Account,Receivable,Alacak
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Satır # {0}: Sipariş zaten var olduğu Tedarikçi değiştirmek için izin verilmez
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Kredi limiti ayarlarını geçen işlemleri teslim etmeye izinli rol
 DocType: Sales Invoice,Supplier Reference,Tedarikçi Referansı
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Eğer işaretli ise, alt-montaj kalemleri için BOM hammadde almak için kabul edilecektir. Aksi takdirde, tüm alt-montaj ögeleri bir hammadde olarak kabul edilecektir."
@@ -4128,8 +4143,8 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction n
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Destek e-mail kimliği için gelen sunucu kurulumu (örneğin:support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Yetersizlik adeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Yetersizlik adeti
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
 DocType: Salary Slip,Salary Slip,Bordro
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Cilalama
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Tarihine Kadar' gereklidir
@@ -4143,6 +4158,7 @@ DocType: Notification Control,"When any of the checked transactions are ""Submit
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Genel Ayarlar
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Genel Ayarlar
 DocType: Employee Education,Employee Education,Çalışan Eğitimi
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
 DocType: Salary Slip,Net Pay,Net Ödeme
 DocType: Account,Account,Hesap
 DocType: Account,Account,Hesap
@@ -4182,7 +4198,7 @@ DocType: Purchase Order,Raw Materials Supplied,Tedarik edilen Hammaddeler
 DocType: Purchase Invoice,Recurring Print Format,Tekrarlayan Baskı Biçimi
 DocType: Communication,Series,Seriler
 DocType: Communication,Series,Seriler
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Beklenen Teslim Tarihi Siparii Tarihinden önce olamaz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Beklenen Teslim Tarihi Siparii Tarihinden önce olamaz
 DocType: Appraisal,Appraisal Template,Değerlendirme Şablonu
 DocType: Communication,Email,E-posta;
 DocType: Item Group,Item Classification,Ürün Sınıflandırması
@@ -4247,6 +4263,7 @@ DocType: HR Settings,Payroll Settings,Bordro Ayarları
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Bağlantısız Faturaları ve Ödemeleri eşleştirin.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Sipariş
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Kökün ana maliyet merkezi olamaz
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Marka Seçiniz ...
 DocType: Sales Invoice,C-Form Applicable,Uygulanabilir C-Formu
 DocType: Sales Invoice,C-Form Applicable,Uygulanabilir C-Formu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Çalışma Süresi Çalışma için 0'dan büyük olmalıdır {0}
@@ -4259,8 +4276,8 @@ DocType: Payment Tool,Get Outstanding Vouchers,Üstün Fişler alın
 DocType: Warranty Claim,Resolved By,Tarafından Çözülmüştür
 DocType: Appraisal,Start Date,Başlangıç Tarihi
 DocType: Appraisal,Start Date,Başlangıç Tarihi
-sites/assets/js/desk.min.js +7629,Value,Değer
-sites/assets/js/desk.min.js +7629,Value,Değer
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Değer
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Değer
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Bir dönemlik tahsis izni.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Doğrulamak için buraya tıklayın
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Hesap {0}: Kendisini bir ana hesap olarak atayamazsınız
@@ -4280,14 +4297,14 @@ DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Erişimine İzin verildi
 DocType: Dropbox Backup,Weekly,Haftalık
 DocType: Dropbox Backup,Weekly,Haftalık
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Örn. msgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Alma
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Alma
 DocType: Maintenance Visit,Fully Completed,Tamamen Tamamlanmış
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Tamamlandı
 DocType: Employee,Educational Qualification,Eğitim Yeterliliği
 DocType: Workstation,Operating Costs,İşletim Maliyetleri
 DocType: Employee Leave Approver,Employee Leave Approver,Çalışan izin Onayı
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} başarıyla Haber listesine eklendi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektron ışın işleme
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Satınalma Usta Müdürü
@@ -4302,7 +4319,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Fiyatları Ekle / Düzenle
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Maliyet Merkezlerinin Grafikleri
 ,Requested Items To Be Ordered,Sipariş edilmesi istenen Ürünler
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Siparişlerim
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Siparişlerim
 DocType: Price List,Price List Name,Fiyat Listesi Adı
 DocType: Price List,Price List Name,Fiyat Listesi Adı
 DocType: Time Log,For Manufacturing,Üretim için
@@ -4318,8 +4335,8 @@ DocType: Account,Income,Gelir
 DocType: Industry Type,Industry Type,Sanayi Tipi
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Bir şeyler yanlış gitti!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Uyarı: İzin uygulamasında aşağıdaki engel tarihleri bulunmaktadır
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Bitiş Tarihi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Bitiş Tarihi
 DocType: Purchase Invoice Item,Amount (Company Currency),Tutar (Şirket Para Birimi)
@@ -4337,12 +4354,11 @@ DocType: Company History,Year,Yıl
 DocType: Company History,Year,Yıl
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Satış Noktası Profili
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Lütfen SMS ayarlarını güncelleyiniz
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Zaten fatura Zaman Günlüğü {0}
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Zaten fatura Zaman Günlüğü {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Teminatsız Krediler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Teminatsız Krediler
 DocType: Cost Center,Cost Center Name,Maliyet Merkezi Adı
 DocType: Cost Center,Cost Center Name,Maliyet Merkezi Adı
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Ürün {0} Seri No  {1} ile  zaten yerleştirilmiş
 DocType: Maintenance Schedule Detail,Scheduled Date,Program Tarihi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Toplam Ücretli Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 karakterden daha büyük mesajlar birden fazla mesaja bölünecektir
@@ -4350,10 +4366,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Alındı ve Kabul edildi
 ,Serial No Service Contract Expiry,Seri No Hizmet Sözleşmesi Vadesi
 DocType: Item,Unit of Measure Conversion,Ölçü Dönüşüm Birimi
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Çalışan değiştirilemez
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
 DocType: Naming Series,Help HTML,Yardım HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Atanan toplam ağırlık % 100 olmalıdır. Bu {0} dır
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},{1} den fazla Ürün için {0} üzerinde ödenek
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{1} den fazla Ürün için {0} üzerinde ödenek
 DocType: Address,Name of person or organization that this address belongs to.,Bu adresin ait olduğu kişi veya kurumun adı.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Tedarikçileriniz
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Tedarikçileriniz
@@ -4367,12 +4383,13 @@ DocType: Item,Has Serial No,Seri no Var
 DocType: Employee,Date of Issue,Veriliş tarihi
 DocType: Employee,Date of Issue,Veriliş tarihi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Tarafından {0} {1} için
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
 DocType: Issue,Content Type,İçerik Türü
 DocType: Issue,Content Type,İçerik Türü
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Bilgisayar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Bilgisayar
 DocType: Item,List this Item in multiple groups on the website.,Bu Ürünü web sitesinde gruplar halinde listeleyin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Diğer para ile hesap izin Çoklu Para Birimi seçeneğini kontrol edin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Diğer para ile hesap izin Çoklu Para Birimi seçeneğini kontrol edin
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Ürün: {0} sistemde mevcut değil
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Donmuş değer ayarlama yetkiniz yok
 DocType: Payment Reconciliation,Get Unreconciled Entries,Mutabık olmayan girdileri alın
@@ -4386,7 +4403,7 @@ DocType: Delivery Note,To Warehouse,Depoya
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Hesap {0} bir mali yıl içerisinde birden fazla girildi {1}
 ,Average Commission Rate,Ortalama Komisyon Oranı
 ,Average Commission Rate,Ortalama Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,İlerideki tarihler için katılım işaretlenemez
 DocType: Pricing Rule,Pricing Rule Help,Fiyatlandırma Kuralı Yardım
 DocType: Purchase Taxes and Charges,Account Head,Hesap Başlığı
@@ -4395,7 +4412,7 @@ apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate la
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 DocType: Stock Entry,Total Value Difference (Out - In),Toplam Değer Farkı (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Satır {0}: Döviz Kuru zorunludur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Satır {0}: Döviz Kuru zorunludur
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Çalışan {0} için kullanıcı kimliği ayarlanmamış
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Garanti İstem itibaren
@@ -4413,7 +4430,7 @@ DocType: User,Enabled,Etkin
 DocType: User,Enabled,Etkin
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Gerçekten ay {0} ve yıl {1} için Maaş Makbuzu vermek istiyor musunuz
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Gerçekten ay {0} ve yıl {1} için Maaş Makbuzu vermek istiyor musunuz
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,İthalat Aboneler
 DocType: Target Detail,Target Qty,Hedef Miktarı
 DocType: Attendance,Present,Mevcut
@@ -4422,9 +4439,11 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Not
 DocType: Notification Control,Sales Invoice Message,Satış Faturası Mesajı
 DocType: Authorization Rule,Based On,Göre
 DocType: Authorization Rule,Based On,Göre
-,Ordered Qty,Sipariş Miktarı
-,Ordered Qty,Sipariş Miktarı
+DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
+DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Öğe {0} devre dışı
 DocType: Stock Settings,Stock Frozen Upto,Stok Dondurulmuş
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Kimden ve Dönemi yinelenen için zorunlu tarihler için Dönem {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Proje faaliyeti / görev.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Maaş Makbuzu Oluşturun
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} geçerli bir e-posta adresi değildir
@@ -4471,7 +4490,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Devamlılığı Güncelle
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ve İmalat Miktarı gereklidir
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Yaşlanma Aralığı 2
-DocType: Journal Entry Account,Amount,Tutar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Tutar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Perçinleme
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM yerine
 ,Sales Analytics,Satış Analizleri
@@ -4502,7 +4521,7 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expe
 DocType: Contact Us Settings,City,İl
 DocType: Contact Us Settings,City,İl
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonik işleme
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Hata: Geçerli bir kimliği?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Hata: Geçerli bir kimliği?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Ürün {0} Satış ürünü olmalı
 DocType: Naming Series,Update Series Number,Seri Numarasını Güncelle
 DocType: Account,Equity,Özkaynak
@@ -4524,8 +4543,8 @@ DocType: Authorization Rule,Customerwise Discount,Müşteri İndirimi
 DocType: Purchase Invoice,Against Expense Account,Gider Hesabı Karşılığı
 DocType: Production Order,Production Order,Üretim Siparişi
 DocType: Production Order,Production Order,Üretim Siparişi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
 DocType: Quotation Item,Against Docname,Belge adı karşılığı
 DocType: SMS Center,All Employee (Active),Tüm Çalışanlar (Aktif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Şimdi görüntüle
@@ -4535,8 +4554,8 @@ DocType: BOM,Raw Material Cost,Hammadde Maliyeti
 DocType: Item,Re-Order Level,Yeniden sipariş seviyesi
 DocType: Item,Re-Order Level,Yeniden Sipariş Seviyesi
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Kendisi için üretim emri vermek istediğiniz Malzemeleri girin veya analiz için ham maddeleri indirin.
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt Şeması
-sites/assets/js/list.min.js +174,Gantt Chart,Gantt Şeması
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Şeması
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Şeması
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Yarı Zamanlı
 DocType: Employee,Applicable Holiday List,Uygulanabilir Tatil Listesi
 DocType: Employee,Applicable Holiday List,Uygulanabilir Tatil Listesi
@@ -4547,7 +4566,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is man
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapor Tipi zorunludur
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 DocType: Item,Serial Number Series,Seri Numarası Serisi
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Satır {1} de stok Ürünü {0} için depo zorunludur
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Satır {1} de stok Ürünü {0} için depo zorunludur
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
 DocType: Issue,First Responded On,İlk cevap verilen
@@ -4566,7 +4585,7 @@ DocType: Page,No,Hayır
 DocType: Page,No,Hayır
 DocType: BOM,Materials,Materyaller
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","İşaretli değilse, liste uygulanması gereken her Departmana eklenmelidir"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Gönderme tarihi ve gönderme zamanı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Gönderme tarihi ve gönderme zamanı zorunludur
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Alım işlemleri için vergi şablonu.
 ,Item Prices,Ürün Fiyatları
 ,Item Prices,Ürün Fiyatları
@@ -4590,9 +4609,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Danışmanlık
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Danışmanlık
 DocType: Customer Group,Parent Customer Group,Ana Müşteri Grubu
-sites/assets/js/erpnext.min.js +50,Change,Değişiklik
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Değişiklik
 DocType: Purchase Invoice,Contact Email,İletişim E-Posta
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Satınalma Siparişi {0} 'Durduruldu'
 DocType: Appraisal Goal,Score Earned,Kazanılan Puan
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","Örneğin ""Benim Şirketim LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,İhbar Süresi
@@ -4603,12 +4621,13 @@ DocType: Email Digest,Receivables / Payables,Alacaklar / Borçlar
 DocType: Email Digest,Receivables / Payables,Alacaklar / Borçlar
 DocType: Delivery Note Item,Against Sales Invoice,Satış Faturası Karşılığı
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Presleme
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kredi hesabı
 DocType: Landed Cost Item,Landed Cost Item,İnen Maliyet Kalemi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Sıfır değerleri göster
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Üretimden sonra elde edilen Ürün miktarı/ ham maddelerin belli miktarlarında yeniden ambalajlama
 DocType: Payment Reconciliation,Receivable / Payable Account,Alacak / Borç Hesap
 DocType: Delivery Note Item,Against Sales Order Item,Satış Sipariş Ürün Karşı
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Task,Actual End Date (via Time Logs),Gerçek Bitiş Tarihi (Saat Kayıtlar üzerinden)
@@ -4624,7 +4643,7 @@ DocType: Appraisal,Total Score (Out of 5),Toplam Puan (5 üzerinden)
 DocType: Contact Us Settings,State,Devlet
 DocType: Contact Us Settings,State,Devlet
 DocType: Batch,Batch,Yığın
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Bakiye
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Bakiye
 DocType: Project,Total Expense Claim (via Expense Claims),Toplam Gider İddiası (Gider Talepleri yoluyla)
 DocType: User,Gender,Cinsiyet
 DocType: User,Gender,Cinsiyet
@@ -4645,10 +4664,9 @@ DocType: Lead,Blog Subscriber,Blog Abone
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Değerlere dayalı işlemleri kısıtlamak için kurallar oluşturun.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Seçili ise,toplam çalışma günleri sayısı tatilleri içerecektir ve bu da Günlük ücreti düşürecektir"
 DocType: Purchase Invoice,Total Advance,Toplam Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Malzeme Talebini Durdurmayı iptal et
 DocType: Workflow State,User,Kullanıcı
 DocType: Workflow State,User,Kullanıcı
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,İşleme Bordro
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,İşleme Bordro
 DocType: Opportunity Item,Basic Rate,Temel Oran
 DocType: Opportunity Item,Basic Rate,Temel Oran
 DocType: GL Entry,Credit Amount,Kredi miktarı
@@ -4658,7 +4676,7 @@ DocType: Customer,Credit Days Based On,Kredi Günleri Dayalı
 DocType: Tax Rule,Tax Rule,Vergi Kuralı
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Satış döngüsü boyunca aynı oranı koruyun
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Workstation Çalışma Saatleri dışında zaman günlükleri planlayın.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} zaten Gönderildi
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} zaten Gönderildi
 ,Items To Be Requested,İstenecek Ürünler
 DocType: Purchase Order,Get Last Purchase Rate,Son Alım Br.Fİyatını alın
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Etkinlik Türü dayalı Fatura Oranı (saatte)
@@ -4668,6 +4686,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Şirket e-posta kimliği bulunamadı, mail gönderilemedi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fon (varlık) başvurusu
 DocType: Production Planning Tool,Filter based on item,Ürüne dayalı filtre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Borç Hesabı
 DocType: Fiscal Year,Year Start Date,Yıl Başlangıç ​​Tarihi
 DocType: Fiscal Year,Year Start Date,Yıl Başlangıç ​​Tarihi
 DocType: Attendance,Employee Name,Çalışan Adı
@@ -4681,7 +4700,7 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Karartma
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Çalışanlara Sağlanan Faydalar
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},{1} Paketli miktar satır {1} deki Ürün {0} a eşit olmalıdır
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{1} Paketli miktar satır {1} deki Ürün {0} a eşit olmalıdır
 DocType: Production Order,Manufactured Qty,Üretilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
@@ -4690,7 +4709,7 @@ apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Müşteri
 DocType: DocField,Default,Varsayılan
 DocType: DocField,Default,Varsayılan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proje Kimliği
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} aboneler eklendi
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Bu Maliyet Merkezi için Bütçe tanımlayın. Bütçe eylemi ayarlamak için, bkz: "Şirket Listesi""
@@ -4699,7 +4718,7 @@ DocType: Quality Inspection Reading,Reading 3,Reading 3
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Föy Türü
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
 DocType: Expense Claim,Approved,Onaylandı
 DocType: Pricing Rule,Price,Fiyat
 DocType: Pricing Rule,Price,Fiyat
@@ -4710,13 +4729,15 @@ DocType: Employee,Education,Eğitim
 DocType: Employee,Education,Eğitim
 DocType: Selling Settings,Campaign Naming By,Tarafından Kampanya İsimlendirmesi
 DocType: Employee,Current Address Is,Güncel Adresi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","İsteğe bağlı. Eğer belirtilmemişse, şirketin varsayılan para birimini belirler."
 DocType: Address,Office,Ofis
 DocType: Address,Office,Ofis
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standart Raporlar
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standart Raporlar
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Muhasebe günlük girişleri.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Satır {0}: Parti / Hesap ile eşleşmiyor {1} / {2} içinde {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Depo itibaren Boş Adet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Satır {0}: Parti / Hesap ile eşleşmiyor {1} / {2} içinde {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Vergi Hesabı oluşturmak için
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Vergi Hesabı oluşturmak için
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Gider Hesabı girin
@@ -4726,14 +4747,14 @@ DocType: Account,Stock,Stok
 DocType: Employee,Current Address,Mevcut Adresi
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Açıkça belirtilmediği sürece madde daha sonra açıklama, resim, fiyatlandırma, vergiler şablondan kurulacak vb başka bir öğe bir varyantı ise"
 DocType: Serial No,Purchase / Manufacture Details,Satın alma / Üretim Detayları
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Toplu Envanteri
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Toplu Envanteri
 DocType: Employee,Contract End Date,Sözleşme Bitiş Tarihi
 DocType: Employee,Contract End Date,Sözleşme Bitiş Tarihi
 DocType: Sales Order,Track this Sales Order against any Project,Bu satış emrini bütün Projelere karşı takip et
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Yukarıdaki kriterlere dayalı olarak (teslimat bekleyen) satış emirlerini çek
 DocType: DocShare,Document Type,Belge Türü
 DocType: DocShare,Document Type,Belge Türü
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Tedarikçi fiyat teklifinden
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Tedarikçi fiyat teklifinden
 DocType: Deduction Type,Deduction Type,Kesinti Türü
 DocType: Deduction Type,Deduction Type,Kesinti Türü
 DocType: Attendance,Half Day,Yarım Gün
@@ -4748,13 +4769,14 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Miktar (Adet Üretilen) zorunludur
 DocType: Stock Entry,Default Target Warehouse,Standart Hedef Depo
 DocType: Purchase Invoice,Net Total (Company Currency),Net Toplam (ޞirket para birimi)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabına karşı geçerlidir
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabına karşı geçerlidir
 DocType: Notification Control,Purchase Receipt Message,Satın alma makbuzu mesajı
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Toplam ayrılan yapraklar dönem daha vardır
 DocType: Production Order,Actual Start Date,Fiili Başlangıç ​​Tarihi
 DocType: Production Order,Actual Start Date,Fiili Başlangıç ​​Tarihi
 DocType: Sales Order,% of materials delivered against this Sales Order,% malzeme bu satış emri karşılığında teslim edildi
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Tutanak madde hareketi.
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Tutanak madde hareketi.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Tutanak madde hareketi.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Tutanak madde hareketi.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Bülten Listesi Abone
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Servis
@@ -4764,10 +4786,10 @@ DocType: Project,Gross Margin %,Brüt Kar Marjı%
 DocType: Project,Gross Margin %,Brüt Kar Marjı%
 DocType: BOM,With Operations,Operasyon ile
 DocType: BOM,With Operations,Operasyon ile
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Muhasebe kayıtları zaten para yapılmış {0} şirket için {1}. Para ile bir alacak ya da borç hesabı seçin {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Muhasebe kayıtları zaten para yapılmış {0} şirket için {1}. Para ile bir alacak ya da borç hesabı seçin {0}.
 ,Monthly Salary Register,Aylık Maaş Kaydı
-apps/frappe/frappe/website/template.py +123,Next,Sonraki
-apps/frappe/frappe/website/template.py +123,Next,Sonraki
+apps/frappe/frappe/website/template.py +140,Next,Sonraki
+apps/frappe/frappe/website/template.py +140,Next,Sonraki
 DocType: Warranty Claim,If different than customer address,Müşteri adresinden farklı ise
 DocType: BOM Operation,BOM Operation,BOM Operasyonu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektro
@@ -4800,6 +4822,7 @@ DocType: Purchase Invoice,Next Date,Sonraki Tarihi
 DocType: Employee Education,Major/Optional Subjects,Ana / Opsiyonel Konular
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vergi ve Ücretleri giriniz
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,İşleme
+DocType: Sales Invoice Item,Drop Ship,Bırak Gemi
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Burada ebeveyn, eş ve çocukların isim ve meslek gibi aile ayrıntıları  muhafaza edebilirsiniz"
 DocType: Hub Settings,Seller Name,Satıcı Adı
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Mahsup Vergi ve Harçlar (Şirket Para Birimi)
@@ -4829,32 +4852,32 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Ta
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 DocType: Serial No,Delivery Details,Teslim Bilgileri
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Miktar, bu seviyenin altına düşerse otomatik olarak Malzeme İsteği oluşturmak"
 ,Item-wise Purchase Register,Ürün bilgisi Alım Kaydı
 DocType: Batch,Expiry Date,Son kullanma tarihi
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Yeniden sipariş düzeyini ayarlamak için, öğenin bir Satınalma Ürün ve Üretim Öğe olmalı"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Yeniden sipariş düzeyini ayarlamak için, öğenin bir Satınalma Ürün ve Üretim Öğe olmalı"
 ,Supplier Addresses and Contacts,Tedarikçi Adresler ve İletişim
 ,Supplier Addresses and Contacts,Tedarikçi Adresler ve İletişim
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,İlk Kategori seçiniz
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,İlk Kategori seçiniz
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Proje alanı.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Para birimlerinin yanında $ vb semboller kullanmayın.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Yarım Gün)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Yarım Gün)
 DocType: Supplier,Credit Days,Kredi Günleri
 DocType: Leave Type,Is Carry Forward,İleri taşınmış
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,BOM dan Ürünleri alın
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM dan Ürünleri alın
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Talep Yaratma Gün Saati
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Malzeme Listesi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabı için gerekli olan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabı için gerekli olan {1}
 DocType: Dropbox Backup,Send Notifications To,Bildirimlerin Gönderileceği Kişi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Tarihi
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: Expense Claim Detail,Sanctioned Amount,tasdik edilmiş tutar
 DocType: GL Entry,Is Opening,Açılır
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Satır {0}: Banka giriş ile bağlantılı edilemez bir {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Hesap {0} yok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Satır {0}: Banka giriş ile bağlantılı edilemez bir {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Hesap {0} yok
 DocType: Account,Cash,Nakit
 DocType: Account,Cash,Nakit
 DocType: Employee,Short biography for website and other publications.,Web sitesi ve diğer yayınlar için kısa biyografi.
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index cc86d2bebb..fdfbdfc6b1 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Режим Зарплата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Виберіть щомісячний розподіл, якщо ви хочете, щоб відстежувати на основі сезонності."
 DocType: Employee,Divorced,У розлученні
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Увага: Такий же деталь був введений кілька разів.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Увага: Такий же деталь був введений кілька разів.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Товари вже синхронізовані
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Дозволити пункт буде додано кілька разів в угоді
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Скасувати Матеріал Відвідати {0} до скасування Дана гарантія претензії
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Ущільнення плюс спікання
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Валюта необхідна для Прейскурантом {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Буде розраховується в угоді.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,З матеріалів Запит
+DocType: Purchase Order,Customer Contact,Контакти з клієнтами
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,З матеріалів Запит
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дерево
 DocType: Job Applicant,Job Applicant,Робота Заявник
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Немає більше результатів.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Ім'я клієнта
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Всі експортні суміжних областях, як валюти, коефіцієнт конверсії, експорт, експорт загальної ВСЬОГО т.д. доступні в накладній, POS, цитати, накладна, замовлення тощо з продажу"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Керівники (або групи), проти якого Бухгалтерські записи виробляються і залишки зберігаються."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Видатний {0} не може бути менше нуля ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Видатний {0} не може бути менше нуля ({1})
 DocType: Manufacturing Settings,Default 10 mins,За замовчуванням 10 хвилин
 DocType: Leave Type,Leave Type Name,Залиште Тип Назва
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серія Оновлене Успішно
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Кілька ціни товару.
 DocType: SMS Center,All Supplier Contact,Всі постачальником Зв'язатися
 DocType: Quality Inspection Reading,Parameter,Параметр
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Очікувана Дата закінчення не може бути менше, ніж очікувалося Дата початку"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Є дійсно хочете відкорковувати виробничий замовлення:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: ціна повинна бути такою ж, як {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Новий Залишити заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Новий Залишити заявку
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банківський чек
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Для підтримки клієнтської мудрий код пункт і зробити їх пошуку на основі їх використання коду цю опцію
 DocType: Mode of Payment Account,Mode of Payment Account,Режим розрахунковий рахунок
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Показат
 DocType: Sales Invoice Item,Quantity,Кількість
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредити (зобов'язання)
 DocType: Employee Education,Year of Passing,Рік Passing
-sites/assets/js/erpnext.min.js +27,In Stock,В наявності
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Можу тільки здійснити платіж проти незакінченого фактурного ордена продажів
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В наявності
 DocType: Designation,Designation,Позначення
 DocType: Production Plan Item,Production Plan Item,Виробничий план товару
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Користувач {0} вже присвоєний працівникові {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Створіть новий POS профілю
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Охорона здоров'я
 DocType: Purchase Invoice,Monthly,Щомісяця
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Рахунок-фактура
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Затримка в оплаті (дні)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Рахунок-фактура
 DocType: Maintenance Schedule Item,Periodicity,Періодичність
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Адреса електронної пошти
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Захист
 DocType: Company,Abbr,Абревіатура
 DocType: Appraisal Goal,Score (0-5),Рахунок (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не відповідає {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не відповідає {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ряд # {0}:
 DocType: Delivery Note,Vehicle No,Автомобіль Немає
-sites/assets/js/erpnext.min.js +55,Please select Price List,"Будь ласка, виберіть Прайс-лист"
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Будь ласка, виберіть Прайс-лист"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Деревообробний
 DocType: Production Order Operation,Work In Progress,В роботі
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-друк
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Батько Подробиці DOCNA
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Відкриття на роботу.
 DocType: Item Attribute,Increment,Приріст
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Виберіть Склад ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Реклама
 DocType: Employee,Married,Одружений
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фото не можуть бути оновлені проти накладної {0}
 DocType: Payment Reconciliation,Reconcile,Узгодити
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Продуктовий
 DocType: Quality Inspection Reading,Reading 1,Читання 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Зробити запис банку
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Зробити запис банку
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пенсійні фонди
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Склад є обов'язковим, якщо тип рахунку Склад"
 DocType: SMS Center,All Sales Person,Всі Продажі Особа
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Списання витрат по М
 DocType: Warehouse,Warehouse Detail,Склад Подробиці
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Кредитний ліміт було перейдено для клієнта {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Податки Тип
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},"Ви не авторизовані, щоб додати або оновити записи до {0}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},"Ви не авторизовані, щоб додати або оновити записи до {0}"
 DocType: Item,Item Image (if not slideshow),Пункт зображення (якщо не слайд-шоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Уразливість існує клієнтів з тим же ім'ям
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Година Оцінити / 60) * Фактична Час роботи
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Гість
 DocType: Quality Inspection,Get Specification Details,Отримати специфікація подробиці
 DocType: Lead,Interested,Зацікавлений
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Рахунок за матеріали
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Відкриття
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Відкриття
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},З {0} до {1}
 DocType: Item,Copy From Item Group,Копіювати з групи товарів
 DocType: Journal Entry,Opening Entry,Відкриття запис
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Запит про продукт
 DocType: Standard Reply,Owner,Власник
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Будь ласка, введіть компанія вперше"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,"Будь ласка, виберіть компанія вперше"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Будь ласка, виберіть компанія вперше"
 DocType: Employee Education,Under Graduate,Під Випускник
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Цільова На
 DocType: BOM,Total Cost,Загальна вартість
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Префікс
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Споживаний
 DocType: Upload Attendance,Import Log,Імпорт Ввійти
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Послати
+DocType: Sales Invoice Item,Delivered By Supplier,Поставляється Постачальником
 DocType: SMS Center,All Contact,Всі контактні
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Річна заробітна плата
 DocType: Period Closing Voucher,Closing Fiscal Year,Закриття фінансового року
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,Виправна запис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Показати журнали Час
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валюті компанії
 DocType: Delivery Note,Installation Status,Стан установки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прийнято Відхилено + Кількість має дорівнювати кількості Надійшло у пункті {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прийнято Відхилено + Кількість має дорівнювати кількості Надійшло у пункті {0}
 DocType: Item,Supply Raw Materials for Purchase,Постачання сировини для покупки
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Пункт {0} повинен бути Купівля товару
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Завантажити шаблон, заповнити відповідні дані і прикласти змінений файл. Всі дати і співробітник поєднання в обраний період прийде в шаблоні, з існуючими відвідуваності"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Пункт {0} не є активним або кінець життя був досягнутий
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Пункт {0} не є активним або кінець життя був досягнутий
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Буде оновлюватися після Рахунок продажів представлений.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Налаштування модуля HR для
 DocType: SMS Center,SMS Center,SMS-центр
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Випрямлення
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,Введіть URL пар
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Правила застосування цін і знижки.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},На цей раз зареєструйтеся конфлікти з {0} для {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ціни повинні бути застосовні для купівлі або продажу
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Дата установки не може бути до дати доставки по пункту {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Дата установки не може бути до дати доставки по пункту {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Знижка на Прайс-лист ставка (%)
-sites/assets/js/form.min.js +279,Start,Початок
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Початок
 DocType: User,First Name,Ім'я
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Установка завершена. Освіжаючий.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Лиття Повний цвілі
 DocType: Offer Letter,Select Terms and Conditions,Виберіть Терміни та умови
 DocType: Production Planning Tool,Sales Orders,Замовлення
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,На накладна Пункт
 ,Production Orders in Progress,Виробничі замовлення у Прогрес
 DocType: Lead,Address & Contact,Адреса & Контактна
+DocType: Leave Allocation,Add unused leaves from previous allocations,Додати невикористовувані листя від попередніх асигнувань
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Наступна Періодичні {0} буде створений на {1}
 DocType: Newsletter List,Total Subscribers,Всього Передплатники
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Контактна особа
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,ТАК В очікуванні Кі
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Створює зарплати ковзання для згаданих вище критеріїв.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Запит на покупку.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двомісний житла
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний Залишити затверджує може представити цей Залишити заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний Залишити затверджує може представити цей Залишити заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,"Звільнення Дата повинна бути більше, ніж дата вступу"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Листя на рік
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Будь ласка, встановіть іменування серія для {0} через Setup> Установки> іменування серії"
 DocType: Time Log,Will be updated when batched.,Буде оновлюватися при пакетному.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Будь ласка, перевірте 'Як Предварительная "проти рахунки {1}, якщо це заздалегідь запис."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Будь ласка, перевірте 'Як Предварительная "проти рахунки {1}, якщо це заздалегідь запис."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Склад {0} не належить компанії {1}
 DocType: Bulk Email,Message,повідомлення
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Специфікація
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox ключ доступу
 DocType: Payment Tool,Reference No,Посилання Немає
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Залишити Заблоковані
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Річний
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирення товару
 DocType: Stock Entry,Sales Invoice No,Видаткова накладна Немає
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,Мінімальне замовлення Кіл
 DocType: Pricing Rule,Supplier Type,Постачальник Тип
 DocType: Item,Publish in Hub,Опублікувати в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Пункт {0} скасовується
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Матеріал Запит
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Матеріал Запит
 DocType: Bank Reconciliation,Update Clearance Date,Оновлення оформлення Дата
 DocType: Item,Purchase Details,Купівля Деталі
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} знайдений в "давальницька сировина" таблиці в Замовленні {1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,Управління Пові
 DocType: Lead,Suggestions,Пропозиції
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Set Group мудрий бюджети товару на цій території. Ви також можете включити сезонність, встановивши розподіл."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Будь ласка, введіть батьківську групу рахунки для складу {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата з {0} {1} не може бути більше, ніж суми заборгованості {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата з {0} {1} не може бути більше, ніж суми заборгованості {2}"
 DocType: Supplier,Address HTML,Адреса HTML
 DocType: Lead,Mobile No.,Номер мобільного.
 DocType: Maintenance Schedule,Generate Schedule,Створити розклад
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Новий зі UOM
 DocType: Period Closing Voucher,Closing Account Head,Закриття рахунку Керівник
 DocType: Employee,External Work History,Зовнішній роботи Історія
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циклічна посилання Помилка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,"Ви дійсно хочете, щоб зупинити"
 DocType: Communication,Closed,Закрито
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"За словами (експорт) будуть видні, як тільки ви збережете накладну."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,"Ви впевнені, що хочете, щоб зупинити"
 DocType: Lead,Industry,Промисловість
 DocType: Employee,Job Profile,Профіль роботи
 DocType: Newsletter,Newsletter,Інформаційний бюлетень
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,Накладна
 DocType: Dropbox Backup,Allow Dropbox Access,Дозволити доступ Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Налаштування Податки
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запис була змінена після витягнув його. Ласка, витягнути його знову."
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} введений двічі на п податку
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} введений двічі на п податку
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме на цьому тижні і в очікуванні діяльності
 DocType: Workstation,Rent Cost,Вартість оренди
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Ласка, виберіть місяць та рік"
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Швидкість, з якою Клієнт валюта конвертується в базову валюту замовника"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступний в специфікації, накладної, рахунку-фактурі, замовлення продукції, покупки замовлення, покупка отриманні, накладна, замовлення клієнта, Фото в'їзду, розкладі"
 DocType: Item Tax,Tax Rate,Ставка податку
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Вибрати пункт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Вибрати пункт
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Стан: {0} вдалося порційно, не можуть бути узгоджені з допомогою \ зі примирення, а не використовувати зі запис"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Купівля Рахунок {0} вже представили
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Купівля Рахунок {0} вже представили
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетне Немає повинно бути таким же, як {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Перетворити в негрупповой
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Купівля Надходження повинні бути представлені
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Наявність на с
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Пакетний (багато) з п.
 DocType: C-Form Invoice Detail,Invoice Date,Дата рахунку-фактури
 DocType: GL Entry,Debit Amount,Дебет Сума
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваша електронна адреса
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Будь ласка, див вкладення"
 DocType: Purchase Order,% Received,Отримане%
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Інструкції
 DocType: Quality Inspection,Inspected By,Перевірено
 DocType: Maintenance Visit,Maintenance Type,Тип Обслуговування
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Серійний номер {0} не належить накладної {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Серійний номер {0} не належить накладної {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Пункт Параметр Контроль якості
 DocType: Leave Application,Leave Approver Name,Залиште Ім'я стверджує
 ,Schedule Date,Розклад Дата
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Купівля Реєстрація
 DocType: Landed Cost Item,Applicable Charges,Застосовувані Збори
 DocType: Workstation,Consumable Cost,Вартість витратних
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) повинен мати роль "Залишити затверджує"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) повинен мати роль "Залишити затверджує"
 DocType: Purchase Receipt,Vehicle Date,Дата
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медична
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина втрати
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,Встановлена%
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Будь ласка, введіть назву компанії в першу чергу"
 DocType: BOM,Item Desription,Пункт Desription
 DocType: Purchase Invoice,Supplier Name,Ім'я постачальника
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитайте керівництво ERPNext
 DocType: Account,Is Group,Є Група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматично вказаний серійний пп на основі FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Перевірте Постачальник Номер рахунку Унікальність
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Майстер М
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобальні налаштування для всіх виробничих процесів.
 DocType: Accounts Settings,Accounts Frozen Upto,Рахунки заморожені Upto
 DocType: SMS Log,Sent On,Відправлено На
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
 DocType: Sales Order,Not Applicable,Не застосовується
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Майстер відпочинку.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell лиття
 DocType: Material Request Item,Required Date,Потрібно Дата
 DocType: Delivery Note,Billing Address,Платіжний адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,"Будь ласка, введіть код предмета."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Будь ласка, введіть код предмета."
 DocType: BOM,Costing,Калькуляція
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Якщо встановлено, то сума податку буде вважатися вже включені у пресі / швидкість друку Сума"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Всього Кількість
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Час між
 DocType: Customer,Buyer of Goods and Services.,Покупець товарів і послуг.
 DocType: Journal Entry,Accounts Payable,Рахунки кредиторів
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додати Передплатники
-sites/assets/js/erpnext.min.js +5,""" does not exists","Існує не
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","Існує не
 DocType: Pricing Rule,Valid Upto,Дійсно Upto
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Перерахуйте деякі з ваших клієнтів. Вони можуть бути організації або окремі особи.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Пряма прибуток
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не можете фільтрувати на основі рахунку, якщо рахунок згруповані по"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Адміністративний співробітник
 DocType: Payment Tool,Received Or Paid,Отримані або сплачені
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,"Будь ласка, виберіть компанію"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Будь ласка, виберіть компанію"
 DocType: Stock Entry,Difference Account,Рахунок різниці
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Неможливо закрити завдання, як її залежить завдання {0} не закрите."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для яких Матеріал Запит буде піднято"
 DocType: Production Order,Additional Operating Cost,Додаткова Експлуатаційні витрати
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Косметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Щоб об'єднати, наступні властивості повинні бути однаковими для обох пунктів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Щоб об'єднати, наступні властивості повинні бути однаковими для обох пунктів"
 DocType: Communication,Subject,Предмет
 DocType: Shipping Rule,Net Weight,Вага нетто
 DocType: Employee,Emergency Phone,Аварійний телефон
 ,Serial No Warranty Expiry,Серійний Немає Гарантія Термін
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,"Ви дійсно хочете, щоб зупинити цей матеріал Запит?"
 DocType: Sales Order,To Deliver,Доставити
 DocType: Purchase Invoice Item,Item,Пункт
 DocType: Journal Entry,Difference (Dr - Cr),Різниця (Д - Cr)
 DocType: Account,Profit and Loss,Про прибутки та збитки
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Управління субпідряду
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управління субпідряду
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Новий Одиниця виміру не повинна бути типу ціле число
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Меблі й пристосування
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Швидкість, з якою Прайс-лист валюта конвертується в базову валюту компанії"
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додати / редаг
 DocType: Purchase Invoice,Supplier Invoice No,Постачальник Рахунок Немає
 DocType: Territory,For reference,Для довідки
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не вдається видалити Серійний номер {0}, так як він використовується в угодах з акціями"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Закриття (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Закриття (Cr)
 DocType: Serial No,Warranty Period (Days),Гарантійний термін (днів)
 DocType: Installation Note Item,Installation Note Item,Установка Примітка Пункт
 ,Pending Qty,В очікуванні Кількість
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,Біллінг і достав
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постійних клієнтів
 DocType: Leave Control Panel,Allocate,Виділяти
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Попередній
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Продажі Повернутися
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажі Повернутися
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Виберіть замовлень клієнта, з якого ви хочете створити виробничі замовлення."
+DocType: Item,Delivered by Supplier (Drop Ship),Поставляється Постачальником (Drop кораблів)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Зарплата компоненти.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База даних потенційних клієнтів.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Бази даних клієнтів.
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Акробатика
 DocType: Purchase Order Item,Billed Amt,Оголошений Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логічний склад, на якому акції записів зроблені."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Посилання № & Посилання Дата потрібно для {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Посилання № & Посилання Дата потрібно для {0}
 DocType: Event,Wednesday,Середа
 DocType: Sales Invoice,Customer's Vendor,Виробник Клієнтам
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Виробничий замовлення є обов'язковим
@@ -563,8 +564,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Приймач Параметр
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Ґрунтуючись на 'і' Group By" не може бути таким же
 DocType: Sales Person,Sales Person Targets,Продавець Цілі
-sites/assets/js/form.min.js +271,To,Для
-apps/frappe/frappe/templates/base.html +143,Please enter email address,"Будь ласка, введіть адресу електронної пошти"
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Для
+apps/frappe/frappe/templates/base.html +145,Please enter email address,"Будь ласка, введіть адресу електронної пошти"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Кінець трубки формування
 DocType: Production Order Operation,In minutes,У хвилини
 DocType: Issue,Resolution Date,Дозвіл Дата
@@ -581,7 +582,7 @@ DocType: Activity Cost,Projects User,Проекти Користувач
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Споживана
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} не найден в рахунку-фактурі таблиці
 DocType: Company,Round Off Cost Center,Округлення Вартість центр
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Обслуговування Відвідати {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Обслуговування Відвідати {0} має бути скасований до скасування цього замовлення клієнта
 DocType: Material Request,Material Transfer,Матеріал Передача
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Відкриття (д-р)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Проводка повинна бути відмітка після {0}
@@ -589,9 +590,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Налаштування
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Вартість приземлився Податки і збори
 DocType: Production Order Operation,Actual Start Time,Фактичний початок Час
 DocType: BOM Operation,Operation Time,Час роботи
-sites/assets/js/list.min.js +5,More,Більш
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Більш
 DocType: Pricing Rule,Sales Manager,Менеджер з продажу
-sites/assets/js/desk.min.js +7673,Rename,Перейменувати
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Перейменувати
 DocType: Journal Entry,Write Off Amount,Списання Сума
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Вигин
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Дозволити користувачеві
@@ -607,13 +608,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Прямо ножиці
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Щоб відстежувати пункт продажів і покупки документів на основі їх заводським номером. Це також може використовуватися для відстеження гарантійні деталі продукту.
 DocType: Purchase Receipt Item Supplied,Current Stock,Наявність на складі
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Відхилено Склад є обов'язковим проти відкинуті пункту
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Відхилено Склад є обов'язковим проти відкинуті пункту
 DocType: Account,Expenses Included In Valuation,"Витрат, що включаються в оцінці"
 DocType: Employee,Provide email id registered in company,Забезпечити електронний ідентифікатор зареєстрованого в компанії
 DocType: Hub Settings,Seller City,Продавець Місто
 DocType: Email Digest,Next email will be sent on:,Наступна буде відправлено листа на:
 DocType: Offer Letter Term,Offer Letter Term,Пропозиція Лист термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Пункт має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Пункт має варіанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} знайдений
 DocType: Bin,Stock Value,Вартість акцій
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
@@ -628,11 +629,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Ласкаво просимо
 DocType: Journal Entry,Credit Card Entry,Вступ Кредитна карта
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Тема Завдання
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,"Товари, отримані від постачальників."
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Товари, отримані від постачальників."
 DocType: Communication,Open,Відкритим
 DocType: Lead,Campaign Name,Назва кампанії
 ,Reserved,Зарезервований
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,"Ви дійсно хочете, щоб відкорковувати"
 DocType: Purchase Order,Supply Raw Materials,Постачання сировини
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Дата, на яку буде генеруватися наступний рахунок-фактура. Він створюється на форму."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Оборотні активи
@@ -648,7 +648,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Клієнтам Замовлення Немає
 DocType: Employee,Cell Number,Кількість стільникових
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Втрачений
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести поточний ваучер в «Проти Запис у журналі 'колонці
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести поточний ваучер в «Проти Запис у журналі 'колонці
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Енергія
 DocType: Opportunity,Opportunity From,Можливість Від
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Щомісячна виписка зарплата.
@@ -698,7 +698,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Відповідальність
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкціонований сума не може бути більше, ніж претензії Сума в рядку {0}."
 DocType: Company,Default Cost of Goods Sold Account,За замовчуванням Собівартість проданих товарів рахунок
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Ціни не обраний
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ціни не обраний
 DocType: Employee,Family Background,Сімейні обставини
 DocType: Process Payroll,Send Email,Відправити лист
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Немає доступу
@@ -709,7 +709,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Пп
 DocType: Item,Items with higher weightage will be shown higher,"Елементи з більш високою weightage буде показано вище,"
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банк примирення Подробиці
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Мої Рахунки
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Жоден працівник не знайдено
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Жоден працівник не знайдено
 DocType: Purchase Order,Stopped,Зупинився
 DocType: Item,If subcontracted to a vendor,Якщо по субпідряду постачальника
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,"Виберіть специфікацію, щоб почати"
@@ -718,7 +718,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Зава
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Відправити зараз
 ,Support Analytics,Підтримка аналітика
 DocType: Item,Website Warehouse,Сайт Склад
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,"Ви дійсно хочете, щоб зупинити виробничий замовлення:"
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День місяця, в який автоматично рахунок-фактура буде створений, наприклад, 05, 28 і т.д."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Оцінка повинна бути менше або дорівнює 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,С-Form записи
@@ -728,12 +727,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Пі
 DocType: Features Setup,"To enable ""Point of Sale"" features",Щоб включити "Точки продажу" Особливості
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Оберіть товари
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} проти Білла {1} від {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} проти Білла {1} від {2}
 DocType: Comment,Reference Name,Ім'я посилання
 DocType: Maintenance Visit,Completion Status,Статус завершення
 DocType: Sales Invoice Item,Target Warehouse,Цільова Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволити доставку по квитанції або Шифрування до цього відсотка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,"Очікувана дата поставки не може бути, перш ніж Sales Order Дата"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Очікувана дата поставки не може бути, перш ніж Sales Order Дата"
 DocType: Upload Attendance,Import Attendance,Імпорт Відвідуваність
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Всі Групи товарів
 DocType: Process Payroll,Activity Log,Журнал активності
@@ -741,7 +740,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматично написати повідомлення за поданням угод.
 DocType: Production Order,Item To Manufacture,Елемент Виробництво
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постійна ливарна форма
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Замовлення на Оплата
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Замовлення на Оплата
 DocType: Sales Order Item,Projected Qty,Прогнозований Кількість
 DocType: Sales Invoice,Payment Due Date,Дата платежу
 DocType: Newsletter,Newsletter Manager,Розсилка менеджер
@@ -765,8 +765,8 @@ DocType: SMS Log,Requested Numbers,Необхідні Номери
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Продуктивність оцінка.
 DocType: Sales Invoice Item,Stock Details,Фото Деталі
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Вартість проекту
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Касовий термінал
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Не можете переносити {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Касовий термінал
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не можете переносити {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс рахунку вже в кредит, ви не можете встановити "баланс повинен бути", як "дебет""
 DocType: Account,Balance must be,Баланс повинен бути
 DocType: Hub Settings,Publish Pricing,Опублікувати Ціни
@@ -788,7 +788,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Купівля Надходження
 ,Received Items To Be Billed,"Надійшли пунктів, які будуть Оголошений"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Абразивний вибухових
-sites/assets/js/desk.min.js +3938,Ms,Міссісіпі
+DocType: Employee,Ms,Міссісіпі
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валютний курс майстер.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
 DocType: Production Order,Plan material for sub-assemblies,План матеріал для суб-вузлів
@@ -810,29 +810,31 @@ DocType: Purchase Receipt,Range,Діапазон
 DocType: Supplier,Default Payable Accounts,За замовчуванням заборгованість Кредиторська
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Співробітник {0} не є активним або не існує
 DocType: Features Setup,Item Barcode,Пункт Штрих
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
 DocType: Quality Inspection Reading,Reading 6,Читання 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Рахунок покупки Advance
 DocType: Address,Shop,Магазин
 DocType: Hub Settings,Sync Now,Синхронізувати зараз
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитна запис не може бути пов'язаний з {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитна запис не може бути пов'язаний з {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Обліковий запис за замовчуванням банк / Ксерокопіювання буде автоматично оновлюватися в POS фактурі коли обрано цей режим.
 DocType: Employee,Permanent Address Is,Постійна адреса Є
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Операція виконана для багатьох, як готової продукції?"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Бренд
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Посібник для пере- {0} схрещеними Пункт {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Посібник для пере- {0} схрещеними Пункт {1}.
 DocType: Employee,Exit Interview Details,Вихід Інтерв'ю Подробиці
 DocType: Item,Is Purchase Item,Хіба Купівля товару
 DocType: Journal Entry Account,Purchase Invoice,Купівля Рахунок
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Подробиці Немає
 DocType: Stock Entry,Total Outgoing Value,Всього Вихідні Значення
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Відкриття Дата і Дата закриття повинна бути в межах тієї ж фінансовий рік
 DocType: Lead,Request for Information,Запит інформації
 DocType: Payment Tool,Paid,Платний
 DocType: Salary Slip,Total in words,Всього в словах
 DocType: Material Request Item,Lead Time Date,Час Дата
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,"є обов'язковим. Може бути, Обмін валюти запис не створена для"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Будь ласка, сформулюйте Серійний номер, вказаний в п {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Для елементів "продукту" Bundle, склад, серійний номер і серія № буде розглядатися з "пакувальний лист 'таблиці. Якщо Склад і пакетна Немає є однаковими для всіх пакувальних компонентів для будь "продукту" Bundle пункту, ці значення можуть бути введені в основній таблиці Item значення будуть скопійовані в "список упаковки" таблицю."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Поставки клієнтам.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Поставки клієнтам.
 DocType: Purchase Invoice Item,Purchase Order Item,Замовлення на пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Непряме прибуток
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Встановіть Сума платежу = сума Видатний
@@ -840,13 +842,14 @@ DocType: Contact Us Settings,Address Line 1,Адресний рядок 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Дисперсія
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Назва компанії
 DocType: SMS Center,Total Message(s),Всього повідомлень (їй)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Вибрати пункт трансферу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Вибрати пункт трансферу
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Переглянути перелік усіх довідкових відео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Вибір рахунка керівник банку, в якому перевірка була зберігання."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволити користувачеві редагувати прайс-лист в угодах Оцінити
 DocType: Pricing Rule,Max Qty,Макс Кількість
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Оплата проти продажів / Замовлення повинні бути завжди заздалегідь відзначений як
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Оплата проти продажів / Замовлення повинні бути завжди заздалегідь відзначений як
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Хімічна
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
 DocType: Process Payroll,Select Payroll Year and Month,Виберіть Payroll рік і місяць
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Перейти до відповідної групи (зазвичай використання коштів> Поточні активи> Банківські рахунки і створити новий акаунт (натиснувши на Додати Дитину) типу "банк"
 DocType: Workstation,Electricity Cost,Вартість електроенергії
@@ -861,7 +864,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бі
 DocType: SMS Center,All Lead (Open),Всі Свинець (відкрито)
 DocType: Purchase Invoice,Get Advances Paid,"Отримати Аванси, видані"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикріпіть свою фотографію
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Зробити
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Зробити
 DocType: Journal Entry,Total Amount in Words,Загальна сума прописом
 DocType: Workflow State,Stop,Стоп
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Був помилка. Одна з можливих причин може бути те, що ви не зберегли форму. Будь ласка, зв'яжіться з support@erpnext.com якщо проблема не усунена."
@@ -885,7 +888,7 @@ DocType: Packing Slip Item,Packing Slip Item,Упаковка товару ко
 DocType: POS Profile,Cash/Bank Account,Готівковий / Банківський рахунок
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Атрибут стіл є обов'язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Атрибут стіл є обов'язковим
 DocType: Production Planning Tool,Get Sales Orders,Отримати замовлень клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бути негативним
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Подача
@@ -896,12 +899,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Буде оно
 DocType: Project,Internal,Внутрішній
 DocType: Task,Urgent,Терміновий
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Будь ласка, вкажіть дійсний ідентифікатор рядка для рядка {0} в таблиці {1}"
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Перейдіть на робочий стіл і почати використовувати ERPNext
 DocType: Item,Manufacturer,Виробник
 DocType: Landed Cost Item,Purchase Receipt Item,Купівля товару Надходження
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервовано Склад в замовлення клієнта / Склад готової продукції
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Продаж Сума
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Журнали Час
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви рахунок затверджує для цього запису. Оновіть 'Стан' і збережіть
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви рахунок затверджує для цього запису. Оновіть 'Стан' і збережіть
 DocType: Serial No,Creation Document No,Створення документа Немає
 DocType: Issue,Issue,Проблема
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути для товара Variant. наприклад, розмір, колір і т.д."
@@ -916,8 +920,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Проти
 DocType: Item,Default Selling Cost Center,За замовчуванням Продаж МВЗ
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Продажі Замовити {0} {1}
 DocType: Opportunity,Contact Info,Контактна інформація
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Створення зображення в щоденнику
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Створення зображення в щоденнику
 DocType: Packing Slip,Net Weight UOM,Вага нетто Одиниця виміру
 DocType: Item,Default Supplier,За замовчуванням Постачальник
 DocType: Manufacturing Settings,Over Production Allowance Percentage,За квота на виробництво Відсоток
@@ -926,7 +931,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Отримати Щотижневі граничні терміни
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Дата закінчення не може бути менше, ніж Дата початку"
 DocType: Sales Person,Select company name first.,Виберіть назву компанії в першу чергу.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,доктор
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,доктор
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Котирування отриманих від постачальників.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Для {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,оновлюється через журнали Time
@@ -954,7 +959,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Реєстраційні номери компанії для вашої довідки. Податкові номери і т.д.
 DocType: Sales Partner,Distributor,Дистриб'ютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Кошик Правило Доставка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Виробничий замовлення {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Виробничий замовлення {0} має бути скасований до скасування цього замовлення клієнта
 ,Ordered Items To Be Billed,Замовлені товари To Be Оголошений
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"С Діапазон повинен бути менше, ніж діапазон"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Виберіть час і журнали Розмістити створити нову рахунок-фактуру.
@@ -1002,7 +1007,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Пода
 DocType: Lead,Lead,Вести
 DocType: Email Digest,Payables,Кредиторська заборгованість
 DocType: Account,Warehouse,Склад
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Відхилено Кількість не може бути введений в придбанні Повернутися
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Відхилено Кількість не може бути введений в придбанні Повернутися
 ,Purchase Order Items To Be Billed,"Купівля Замовити пунктів, які будуть Оголошений"
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
 DocType: Purchase Invoice Item,Purchase Invoice Item,Рахунок покупки пункт
@@ -1017,11 +1022,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Неузгодже
 DocType: Global Defaults,Current Fiscal Year,Поточний фінансовий рік
 DocType: Global Defaults,Disable Rounded Total,Відключити Rounded Всього
 DocType: Lead,Call,Виклик
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,"Записи" не може бути порожнім
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"Записи" не може бути порожнім
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дублікат ряд {0} з такою ж {1}
 ,Trial Balance,Пробний баланс
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Налаштування Співробітники
-sites/assets/js/erpnext.min.js +5,"Grid """,Сітка "
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Налаштування Співробітники
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Сітка "
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Дослідження
 DocType: Maintenance Visit Purpose,Work Done,Зроблено
@@ -1031,14 +1036,15 @@ DocType: Communication,Sent,Надісланий
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Подивитися Леджер
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім'ям, будь ласка, змініть ім'я пункту або перейменувати групу товарів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім'ям, будь ласка, змініть ім'я пункту або перейменувати групу товарів"
 DocType: Communication,Delivery Status,Статус поставки
 DocType: Production Order,Manufacture against Sales Order,Виробництво проти замовлення клієнта
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Решта світу
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Решта світу
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Деталь {0} не може мати Batch
 ,Budget Variance Report,Бюджет Різниця Повідомити
 DocType: Salary Slip,Gross Pay,Повна Платне
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,"Дивіденди, що сплачуються"
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Облік книга
 DocType: Stock Reconciliation,Difference Amount,Різниця Сума
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Нерозподілений чистий прибуток
 DocType: BOM Item,Item Description,Опис товару
@@ -1052,15 +1058,17 @@ DocType: Opportunity Item,Opportunity Item,Можливість Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Тимчасове відкриття
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Співробітник Залишити Баланс
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Ваги для рахунку {0} повинен бути завжди {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Ваги для рахунку {0} повинен бути завжди {1}
 DocType: Address,Address Type,Адреса Тип
 DocType: Purchase Receipt,Rejected Warehouse,Відхилено Склад
 DocType: GL Entry,Against Voucher,На ваучері
 DocType: Item,Default Buying Cost Center,За замовчуванням Купівля Центр Вартість
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Щоб отримати найкраще з ERPNext, ми рекомендуємо вам буде потрібно якийсь час і дивитися ці довідки відео."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Пункт {0} повинен бути Продажі товару
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,для
 DocType: Item,Lead Time in days,Час в днях
 ,Accounts Payable Summary,Кредиторська заборгованість Основна
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Чи не дозволено редагувати заморожений рахунок {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Чи не дозволено редагувати заморожений рахунок {0}
 DocType: Journal Entry,Get Outstanding Invoices,Отримати неоплачених рахунків
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продажі Замовити {0} не є допустимим
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об'єднані"
@@ -1076,7 +1084,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Місце видачі
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Контракт
 DocType: Report,Disabled,Інвалід
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Одиниця виміру фактором Coversion потрібно для UOM: {0} в пункті: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Одиниця виміру фактором Coversion потрібно для UOM: {0} в пункті: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Непрямі витрати
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ряд {0}: Кількість обов'язково
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Сільське господарство
@@ -1085,13 +1093,13 @@ DocType: Mode of Payment,Mode of Payment,Спосіб платежу
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Це кореневий елемент групи і не можуть бути змінені.
 DocType: Journal Entry Account,Purchase Order,Замовлення на придбання
 DocType: Warehouse,Warehouse Contact Info,Склад Контактна інформація
-sites/assets/js/form.min.js +190,Name is required,Ім'я потрібно
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Ім'я потрібно
 DocType: Purchase Invoice,Recurring Type,Періодична Тип
 DocType: Address,City/Town,Місто / Місто
 DocType: Email Digest,Annual Income,Річний дохід
 DocType: Serial No,Serial No Details,Серійний номер деталі
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Податкова ставка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов'язані з іншою дебету"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов'язані з іншою дебету"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Доставка Примітка {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Пункт {0} повинен бути субпідрядником товару
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капітальні обладнання
@@ -1102,14 +1110,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Мета
 DocType: Sales Invoice Item,Edit Description,Редагувати опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Очікувана дата поставки менше, ніж Запланована дата початку."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Для Постачальника
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Для Постачальника
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Установка Тип аккаунта допомагає у виборі цього рахунок в угодах.
 DocType: Purchase Invoice,Grand Total (Company Currency),Загальний підсумок (Компанія валют)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Всього Вихідні
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Там може бути тільки один доставка Умови Правило з 0 або пусте значення для "до значення"
 DocType: Authorization Rule,Transaction,Угода
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Примітка: Ця Центр Вартість є група. Не можете зробити бухгалтерські проводки відносно груп.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Інструментів
+apps/frappe/frappe/config/desk.py +7,Tools,Інструментів
 DocType: Item,Website Item Groups,Сайт Групи товарів
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Номер замовлення Продукція є обов'язковим для виробництва фондового входу призначення
 DocType: Purchase Invoice,Total (Company Currency),Всього (Компанія валют)
@@ -1119,7 +1127,7 @@ DocType: Workstation,Workstation Name,Ім'я робочої станції
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Електронна пошта Дайджест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},Специфікація {0} не належить до пункту {1}
 DocType: Sales Partner,Target Distribution,Цільова поширення
-sites/assets/js/desk.min.js +7652,Comments,Коментарі
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Коментарі
 DocType: Salary Slip,Bank Account No.,Банк № рахунку
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Це номер останнього створеного операції з цим префіксом
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Оцінка Оцініть потрібно для пункту {0}
@@ -1134,7 +1142,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Будь л
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привілейований Залишити
 DocType: Purchase Invoice,Supplier Invoice Date,Постачальник Рахунок Дата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вам необхідно включити Кошик
-sites/assets/js/form.min.js +212,No Data,Немає даних
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Немає даних
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оцінка шаблону Мета
 DocType: Salary Slip,Earning,Заробіток
 DocType: Payment Tool,Party Account Currency,Партія Валюта рахунку
@@ -1142,7 +1150,7 @@ DocType: Payment Tool,Party Account Currency,Партія Валюта раху
 DocType: Purchase Taxes and Charges,Add or Deduct,Додати або відняти
 DocType: Company,If Yearly Budget Exceeded (for expense account),Якщо річний бюджет перевищено (за рахунок витрат)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Перекриття умови знайдені між:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Проти журналі запис {0} вже налаштований щодо деяких інших ваучер
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Проти журналі запис {0} вже налаштований щодо деяких інших ваучер
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Загальна вартість замовлення
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Їжа
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старіння Діапазон 3
@@ -1150,11 +1158,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Немає відвідувань
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Розсилка контактам, веде."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закритті рахунку повинні бути {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума балів за всі цілі повинні бути 100. Це {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,"Операції, що не може бути порожнім."
 ,Delivered Items To Be Billed,"Поставляється пунктів, які будуть Оголошений"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може бути змінений для серійним номером
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Статус оновлений до {0}
 DocType: DocField,Description,Опис
 DocType: Authorization Rule,Average Discount,Середня Знижка
 DocType: Letter Head,Is Default,За замовчуванням
@@ -1182,7 +1190,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Пункт Сума податк
 DocType: Item,Maintain Stock,Підтримання складі
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток Записи вже створені для виробничого замовлення
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Залиште порожнім, якщо вважати всіх позначень"
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу "Актуальні 'в рядку {0} не можуть бути включені в п Оцінити
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу "Актуальні 'в рядку {0} не можуть бути включені в п Оцінити
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,З DateTime
 DocType: Email Digest,For Company,За компанію
@@ -1192,7 +1200,7 @@ DocType: Sales Invoice,Shipping Address Name,Адреса доставки Ім&
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,План рахунків
 DocType: Material Request,Terms and Conditions Content,Умови Вміст
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Залежить у відпустці без
@@ -1205,7 +1213,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Гарантія / КУА Стат
 DocType: GL Entry,GL Entry,GL запис
 DocType: HR Settings,Employee Settings,Налаштування співробітників
 ,Batch-Wise Balance History,Пакетна Мудрий Баланс Історія
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Список справ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Список справ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Учень
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Негативний Кількість не допускається
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1237,13 +1245,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Оренда площі для офісу
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Настройки шлюзу Налаштування SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Імпорт вдалося!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Немає адреса ще не додавали.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Немає адреса ще не додавали.
 DocType: Workstation Working Hour,Workstation Working Hour,Робоча станція Робоча годину
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналітик
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Рядок {0}: виділеної суми {1} повинен бути менше або дорівнює кількості СП {2}
 DocType: Item,Inventory,Інвентаризація
 DocType: Features Setup,"To enable ""Point of Sale"" view",Щоб включити "Точка зору" Продаж
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Оплата не може бути зроблено для порожньої кошик
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Оплата не може бути зроблено для порожньої кошик
 DocType: Item,Sales Details,Продажі Детальніше
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Закріплення
 DocType: Opportunity,With Items,З пунктами
@@ -1253,7 +1261,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Дата, на яку буде генеруватися наступний рахунок-фактура. Він створюється на форму."
 DocType: Item Attribute,Item Attribute,Пункт Атрибут
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Уряд
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Предмет Варіанти
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Предмет Варіанти
 DocType: Company,Services,Послуги
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Всього ({0})
 DocType: Cost Center,Parent Cost Center,Батько Центр Вартість
@@ -1263,11 +1271,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Фінансовий рік Дата початку
 DocType: Employee External Work History,Total Experience,Загальний досвід
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Зенкування
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Вантажні та експедиторські Збори
 DocType: Material Request Item,Sales Order No,Продажі Замовити Немає
 DocType: Item Group,Item Group Name,Назва товару Група
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Взятий
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Взятий
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Передача матеріалів для виробництва
 DocType: Pricing Rule,For Price List,Для Прайс-лист
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
@@ -1276,8 +1284,7 @@ DocType: Maintenance Schedule,Schedules,Розклади
 DocType: Purchase Invoice Item,Net Amount,Чиста сума
 DocType: Purchase Order Item Supplied,BOM Detail No,Специфікація Деталь Немає
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додаткова знижка Сума (валюта компанії)
-DocType: Period Closing Voucher,CoA Help,КоА Допомога
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Помилка: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Помилка: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Будь ласка, створіть новий обліковий запис з Планом рахунків бухгалтерського обліку."
 DocType: Maintenance Visit,Maintenance Visit,Обслуговування відвідування
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Замовник> Група клієнтів> Територія
@@ -1288,6 +1295,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Приземлився Варті
 DocType: Event,Tuesday,Вівторок
 DocType: Leave Block List,Block Holidays on important days.,Блок Відпочинок на важливих днів.
 ,Accounts Receivable Summary,Дебіторська заборгованість Основна
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},"Листя для типу {0}, вже виділених на працівника {1} для періоду {2} - {3}"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Будь ласка, встановіть ID користувача поле в записі Employee, щоб встановити роль Employee"
 DocType: UOM,UOM Name,Ім'я Одиниця виміру
 DocType: Top Bar Item,Target,Мета
@@ -1308,19 +1316,19 @@ DocType: Sales Partner,Sales Partner Target,Sales Partner Цільова
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Облік Вхід для {0} можуть бути зроблені тільки у валюті: {1}
 DocType: Pricing Rule,Pricing Rule,Ціни Правило
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Насічка
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Матеріал Запит Замовлення на
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Матеріал Запит Замовлення на
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ряд # {0}: повернутий деталь {1} не існує в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банківські рахунки
 ,Bank Reconciliation Statement,Банк примирення собі
 DocType: Address,Lead Name,Ведучий Ім'я
 ,POS,POS-
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Відкриття акції Залишок
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Відкриття акції Залишок
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} повинен з'явитися тільки один раз
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Чи не дозволяється Tranfer більш {0}, ніж {1} проти Замовлення {2}"
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Листя номером Успішно для {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Листя номером Успішно для {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,"Немає нічого, щоб упакувати"
 DocType: Shipping Rule Condition,From Value,Від вартості
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Виробництво Кількість є обов'язковим
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Виробництво Кількість є обов'язковим
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Суми не відбивається у банку
 DocType: Quality Inspection Reading,Reading 4,Читання 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Претензії рахунок компанії.
@@ -1333,19 +1341,20 @@ DocType: Opportunity,Contact Mobile No,Зв'язатися з мобільн
 DocType: Production Planning Tool,Select Sales Orders,Виберіть замовлень клієнта
 ,Material Requests for which Supplier Quotations are not created,"Матеріал запити, для яких Постачальник Котирування не створюються"
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Щоб відстежувати предмети, використовуючи штрих-код. Ви зможете ввести деталі в накладній та рахунки-фактури з продажу сканування штрих-кодів пункту."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Відзначити як при поставці
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Зробіть цитати
 DocType: Dependent Task,Dependent Task,Залежить Завдання
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},"Залишити типу {0} не може бути більше, ніж {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},"Залишити типу {0} не може бути більше, ніж {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Спробуйте плануванні операцій для X днів.
 DocType: HR Settings,Stop Birthday Reminders,Стоп народження Нагадування
 DocType: SMS Center,Receiver List,Приймач Список
 DocType: Payment Tool Detail,Payment Amount,Сума оплати
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Споживана Сума
-sites/assets/js/erpnext.min.js +51,{0} View,Перегляд {0}
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,Перегляд {0}
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Відрахування
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективний лазерного спікання
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Імпорт успішно!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Вартість виданих предметів
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
@@ -1366,7 +1375,7 @@ DocType: Company,Default Payable Account,За замовчуванням опл
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Налаштування для онлайн Корзину, такі як правилами перевезень, прайс-лист і т.д."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Завершення установки
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Оголошений
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Кількість захищені
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Кількість захищені
 DocType: Party Account,Party Account,Рахунок партії
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Людські ресурси
 DocType: Lead,Upper Income,Верхня прибуток
@@ -1409,11 +1418,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Включити Кошик
 DocType: Employee,Permanent Address,Постійна адреса
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Пункт {0} повинен бути служба товару.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","Advance платний проти {0} {1} не може бути більше \, ніж загальний підсумок {2}"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Будь ласка, виберіть пункт код"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Скорочення вирахування для відпустки без збереження (LWP)
 DocType: Territory,Territory Manager,Регіональний менеджер
+DocType: Delivery Note Item,To Warehouse (Optional),На склад (Необов'язково)
 DocType: Sales Invoice,Paid Amount (Company Currency),Платні Сума (Компанія валют)
 DocType: Purchase Invoice,Additional Discount,Додаткова знижка
 DocType: Selling Settings,Selling Settings,Продаж Налаштування
@@ -1436,7 +1446,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Видобуток
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Смола лиття
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"А Група клієнтів існує з таким же ім'ям, будь ласка, змініть ім'я клієнта або перейменувати групу клієнтів"
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,"Будь ласка, виберіть {0} перший."
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Будь ласка, виберіть {0} перший."
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0}
 DocType: Territory,Parent Territory,Батько Територія
 DocType: Quality Inspection Reading,Reading 2,Читання 2
@@ -1464,11 +1474,11 @@ DocType: Sales Invoice Item,Batch No,Пакетна Немає
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволити кілька замовлень на продаж від Замовлення Клієнта
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Головна
 DocType: DocPerm,Delete,Видаляти
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Варіант
-sites/assets/js/desk.min.js +7971,New {0},Новий {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варіант
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Новий {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії на ваших угод
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,"Зупинився замовлення не може бути скасований. Відкорковувати, щоб скасувати."
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,За замовчуванням BOM ({0}) повинен бути активним для даного елемента або в шаблоні
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Зупинився замовлення не може бути скасований. Відкорковувати, щоб скасувати."
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,За замовчуванням BOM ({0}) повинен бути активним для даного елемента або в шаблоні
 DocType: Employee,Leave Encashed?,Залишити інкасовано?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Можливість поле Від обов'язкове
 DocType: Item,Variants,Варіанти
@@ -1486,7 +1496,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Країна
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреси
 DocType: Communication,Received,Надійшло
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,"Проти журналі запис {0} не має ніякого неперевершену {1}, запис"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,"Проти журналі запис {0} не має ніякого неперевершену {1}, запис"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Повторювані Серійний номер вводиться для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Умовою для правила судноплавства
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Деталь не дозволяється мати виробничого замовлення.
@@ -1507,7 +1517,6 @@ DocType: Employee,Salutation,Привітання
 DocType: Communication,Rejected,Відхилено
 DocType: Pricing Rule,Brand,Марка
 DocType: Item,Will also apply for variants,Буде також застосовуватися для варіантів
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,Поставляється%
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle пунктів на момент продажу.
 DocType: Sales Order Item,Actual Qty,Фактична Кількість
 DocType: Sales Invoice Item,References,Посилання
@@ -1545,14 +1554,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Ножиці
 DocType: Item,Has Variants,Має Варіанти
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Натисніть на кнопку "Створити рахунок-фактуру" з продажу, щоб створити новий рахунок-фактуру."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Період з Період і датам обов'язкових для повторюваних% S
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Упаковка та маркування
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назва щомісячний розподіл
 DocType: Sales Person,Parent Sales Person,Людина Батько продажів
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Будь ласка, сформулюйте замовчуванням Валюта в компанії Майстер і загальні налаштування за замовчуванням"
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox доступ до секретних
 DocType: Purchase Invoice,Recurring Invoice,Повторювані рахунки
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Управління проектами
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Управління проектами
 DocType: Supplier,Supplier of Goods or Services.,Постачальник товарів або послуг.
 DocType: Budget Detail,Fiscal Year,Звітний рік
 DocType: Cost Center,Budget,Бюджет
@@ -1580,11 +1588,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Продаж
 DocType: Employee,Salary Information,Зарплата Інформація
 DocType: Sales Person,Name and Employee ID,Ім'я та ідентифікатор співробітника
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,"Завдяки Дата не може бути, перш ніж відправляти Реєстрація"
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Завдяки Дата не може бути, перш ніж відправляти Реєстрація"
 DocType: Website Item Group,Website Item Group,Сайт групи товарів
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Мита і податки
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,"Будь ласка, введіть дату Reference"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} записів оплати не можуть бути відфільтровані по {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Будь ласка, введіть дату Reference"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записів оплати не можуть бути відфільтровані по {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблиця для елемента, який буде показаний в веб-сайт"
 DocType: Purchase Order Item Supplied,Supplied Qty,Поставляється Кількість
 DocType: Material Request Item,Material Request Item,Матеріал Запит товару
@@ -1592,7 +1600,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дерево то
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете звернутися номер рядка, перевищує або рівну поточної номер рядка для цього типу заряду"
 ,Item-wise Purchase History,Пункт мудрий Історія покупок
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Червоний
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Будь ласка, натисніть на кнопку "Generate" Розклад принести Серійний номер доданий для Пункт {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Будь ласка, натисніть на кнопку "Generate" Розклад принести Серійний номер доданий для Пункт {0}"
 DocType: Account,Frozen,Заморожені
 ,Open Production Orders,Відкриті Виробничі замовлення
 DocType: Installation Note,Installation Time,Установка часу
@@ -1636,13 +1644,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Котирування Тенденції
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Пункт Група не згадується у майстри пункт за пунктом {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Як виробничого замовлення можуть бути зроблені за цією статтею, він повинен бути запас пункт."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Як виробничого замовлення можуть бути зроблені за цією статтею, він повинен бути запас пункт."
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Приєднання
 DocType: Authorization Rule,Above Value,Вище вартості
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Коефіцієнт перетворення
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,Поставляється
+DocType: Purchase Order,Delivered,Поставляється
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),"Налаштування сервера вхідної в робочі електронний ідентифікатор. (наприклад, jobs@example.com)"
 DocType: Purchase Receipt,Vehicle Number,Кількість транспортних засобів
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на яку повторюваних рахунок буде зупинити"
@@ -1659,10 +1667,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Розподілити
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Рахунок {0} повинен бути типу "основний актив", як товару {1} ​​є активом товару"
 DocType: HR Settings,HR Settings,Налаштування HR
 apps/frappe/frappe/config/setup.py +130,Printing,Друк
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Витрати Заявити очікує схвалення. Тільки за рахунок затверджує можете оновити статус.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Витрати Заявити очікує схвалення. Тільки за рахунок затверджує можете оновити статус.
 DocType: Purchase Invoice,Additional Discount Amount,Додаткова знижка Сума
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Наступного дня (с), на якій ви подаєте заяву на відпустку в свято. Вам не потрібно звернутися за дозволом."
-sites/assets/js/desk.min.js +7805,and,і
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,і
 DocType: Leave Block List Allow,Leave Block List Allow,Залишити Чорний список Дозволити
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Абревіатура не може бути порожнім або простір
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спортивний
@@ -1699,7 +1707,6 @@ DocType: Opportunity,Quotation,Цитата
 DocType: Salary Slip,Total Deduction,Всього Відрахування
 DocType: Quotation,Maintenance User,Технічне обслуговування Користувач
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Вартість Оновлене
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,"Ви впевнені, що хочете відкорковувати"
 DocType: Employee,Date of Birth,Дата народження
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Пункт {0} вже повернулися
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фінансовий рік ** являє собою фінансовий рік. Всі бухгалтерські та інші великі угоди відслідковуються проти ** ** фінансовий рік.
@@ -1715,13 +1722,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Слідкуйте продажів кампаній. Слідкуйте за проводами, цитати, Продажі замовлення і т.д. з кампаній, щоб оцінити повернення інвестицій."
 DocType: Expense Claim,Approver,Затверджуючий
 ,SO Qty,ТАК Кількість
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток записи існують щодо складу {0}, отже, ви не зможете повторно призначити або змінити Склад"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток записи існують щодо складу {0}, отже, ви не зможете повторно призначити або змінити Склад"
 DocType: Appraisal,Calculate Total Score,Розрахувати загальну кількість балів
 DocType: Supplier Quotation,Manufacturing Manager,Виробництво менеджер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серійний номер {0} знаходиться на гарантії Шифрування до {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Спліт накладної в пакети.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Поставки
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Пориньте лиття
+DocType: Purchase Order,To be delivered to customer,Для поставлятися замовнику
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Час Статус журналу повинні бути представлені.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серійний номер {0} не належить ні до однієї Склад
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Налаштування
@@ -1746,11 +1754,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Від Валюта
 DocType: DocField,Name,Ім'я
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть Виділена сума, рахунок-фактура Тип і номер рахунку-фактури в принаймні один ряд"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Продажі Замовити потрібно для пункту {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Продажі Замовити потрібно для пункту {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Суми не відображається в системі
 DocType: Purchase Invoice Item,Rate (Company Currency),Оцінити (Компанія валют)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Інші
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Встановити як Зупинився
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Не можете знайти відповідний пункт. Будь ласка, виберіть інше значення для {0}."
 DocType: POS Profile,Taxes and Charges,Податки і збори
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Продукт або послугу, яка купується, продається, або зберігається на складі."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Не можете обрати тип заряду, як «Про Попередня Сума Row» або «На попередньому рядку Total 'для першого рядка"
@@ -1759,19 +1767,20 @@ DocType: Web Form,Select DocType,Виберіть DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Протяжні
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банківські
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Будь ласка, натисніть на кнопку "Generate" Розклад, щоб отримати розклад"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Новий Центр Вартість
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Новий Центр Вартість
 DocType: Bin,Ordered Quantity,Замовлену кількість
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","наприклад, "Створення інструментів для будівельників""
 DocType: Quality Inspection,In Process,В процесі
 DocType: Authorization Rule,Itemwise Discount,Itemwise Знижка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
+DocType: Purchase Order Item,Reference Document Type,Посилання Тип документа
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
 DocType: Account,Fixed Asset,Основних засобів
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Серійний Інвентар
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серійний Інвентар
 DocType: Activity Type,Default Billing Rate,За замовчуванням Платіжна Оцінити
 DocType: Time Log Batch,Total Billing Amount,Всього рахунків Сума
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Дебіторська заборгованість Рахунок
 ,Stock Balance,Фото Баланс
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Продажі Наказ Оплата
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продажі Наказ Оплата
 DocType: Expense Claim Detail,Expense Claim Detail,Витрати Заявити Подробиці
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Журнали Час створення:
 DocType: Item,Weight UOM,Вага Одиниця виміру
@@ -1807,10 +1816,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Специфікація рекурсії: {0} не може бути батько або дитина {2}
 DocType: Production Order Operation,Completed Qty,Завершений Кількість
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, тільки дебетові рахунки можуть бути пов'язані з іншою кредитною вступу"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Ціни {0} відключена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, тільки дебетові рахунки можуть бути пов'язані з іншою кредитною вступу"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ціни {0} відключена
 DocType: Manufacturing Settings,Allow Overtime,Дозволити Овертайм
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Продажі Замовити {0} зупинився
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} Серійні номери, необхідні для Пункт {1}. Ви надали {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Поточна оцінка Оцінити
 DocType: Item,Customer Item Codes,Замовник Предмет коди
@@ -1819,9 +1827,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Зварювання
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Новий зі Одиниця виміру потрібно
 DocType: Quality Inspection,Sample Size,Обсяг вибірки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Всі деталі вже виставлений
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Всі деталі вже виставлений
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Будь ласка, вкажіть дійсний "Від справі № '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,"Подальші МВЗ можуть бути зроблені під угруповань, але дані можуть бути зроблені у відношенні не-груп"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Подальші МВЗ можуть бути зроблені під угруповань, але дані можуть бути зроблені у відношенні не-груп"
 DocType: Project,External,Зовнішній
 DocType: Features Setup,Item Serial Nos,Пункт Серійний пп
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Люди і дозволу
@@ -1848,7 +1856,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,Адреса та контакти
 DocType: SMS Log,Sender Name,Ім'я відправника
 DocType: Page,Title,Назва
-sites/assets/js/list.min.js +104,Customize,Налаштувати
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Налаштувати
 DocType: POS Profile,[Select],[Виберіть]
 DocType: SMS Log,Sent To,Відправлено
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Зробити накладна
@@ -1873,12 +1881,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Кінець життя
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Подорож
 DocType: Leave Block List,Allow Users,Надання користувачам
+DocType: Purchase Order,Customer Mobile No,Замовник Мобільна Немає
 DocType: Sales Invoice,Recurring,Періодична
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Підписка окремий доходи і витрати за вертикалей продукції або підрозділів.
 DocType: Rename Tool,Rename Tool,Перейменувати інструмент
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Оновлення Вартість
 DocType: Item Reorder,Item Reorder,Пункт Змінити порядок
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Передача матеріалів
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Передача матеріалів
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Вкажіть операцій, операційні витрати та дають унікальну операцію не в Ваших операцій."
 DocType: Purchase Invoice,Price List Currency,Ціни валют
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
@@ -1901,7 +1910,7 @@ DocType: Appraisal,Employee,Співробітник
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Імпортувати пошту з
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Запросити у користувача
 DocType: Features Setup,After Sale Installations,Після продажу установок
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} повністю виставлений рахунок
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} повністю виставлений рахунок
 DocType: Workstation Working Hour,End Time,Час закінчення
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартні умови договору для продажу або покупки.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Група по Ваучер
@@ -1910,8 +1919,9 @@ DocType: Sales Invoice,Mass Mailing,Розсилок
 DocType: Page,Standard,Стандарт
 DocType: Rename Tool,File to Rename,Файл Перейменувати
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Номер замовлення необхідний для Пункт {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Показати платежі
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Зазначено специфікації {0} не існує для п {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Технічне обслуговування Розклад {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Технічне обслуговування Розклад {0} має бути скасований до скасування цього замовлення клієнта
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Розмір
 DocType: Notification Control,Expense Claim Approved,Витрати Заявити Затверджено
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтична
@@ -1930,8 +1940,8 @@ DocType: Upload Attendance,Attendance To Date,Відвідуваність Дл
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),"Налаштування сервера вхідної у продажу електронний ідентифікатор. (наприклад, sales@example.com)"
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Оплата рахунку
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
-sites/assets/js/list.min.js +23,Draft,Проект
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Проект
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаційні Викл
 DocType: Quality Inspection Reading,Accepted,Прийняті
 DocType: User,Female,Жінка
@@ -1944,14 +1954,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Правило ярлику
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Сировина не може бути порожнім.
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Як є існуючі біржові операції по цьому пункту, \ ви не можете змінити значення 'Має серійний номер "," Має Batch Ні »,« Чи є зі Пункт "і" Оцінка Метод ""
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Швидкий журнал запис
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити ставку, якщо специфікації згадується agianst будь-якого елементу"
 DocType: Employee,Previous Work Experience,Попередній досвід роботи
 DocType: Stock Entry,For Quantity,Для Кількість
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Будь ласка, введіть плановий Кількість для Пункт {0} в рядку {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} не буде поданий
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Запити для елементів.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} не буде поданий
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Запити для елементів.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Окрема виробничий замовлення буде створено для кожного готового виробу пункту.
 DocType: Purchase Invoice,Terms and Conditions1,Умови та условія1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Завершення установки
@@ -1963,7 +1974,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Розсилка
 DocType: Delivery Note,Transporter Name,Transporter Назва
 DocType: Contact,Enter department to which this Contact belongs,"Введіть відділ, до якого належить ця Зв'язатися"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Всього Відсутня
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Елемент або Склад ряду {0} не відповідає матеріалів Запит
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Елемент або Склад ряду {0} не відповідає матеріалів Запит
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Одиниця виміру
 DocType: Fiscal Year,Year End Date,Рік Дата закінчення
 DocType: Task Depends On,Task Depends On,Завдання залежить від
@@ -1989,7 +2000,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Договір Кінцева дата повинна бути більше, ніж дата вступу"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Третя сторона дистриб'ютор / дилер / комісіонер / Партнери /, який продає продукти компаній на комісію."
 DocType: Customer Group,Has Child Node,Має дочірній вузол
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} проти Замовлення {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} проти Замовлення {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Введіть статичних параметрів URL тут (Напр., Відправник = ERPNext, ім'я користувача = ERPNext, пароль = один тисяча двісті тридцять чотири і т.д.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1}, не в якій-небудь активної фінансовий рік. Для більш детальної інформації перевірити {2}."
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Це приклад сайту генерується автоматично з ERPNext
@@ -2020,11 +2031,9 @@ DocType: Note,Note,Примітка
 DocType: Purchase Receipt Item,Recd Quantity,Кількість RECD
 DocType: Email Account,Email Ids,E-mail ідентифікатори
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Встановити як відкриються
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Фото запис {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Фото запис {0} не представлено
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / грошовий рахунок
 DocType: Tax Rule,Billing City,Біллінг Місто
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Це Залишити заявку очікує схвалення. Тільки Залишити затверджує можете оновити статус.
 DocType: Global Defaults,Hide Currency Symbol,Приховати символ валюти
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","наприклад банк, готівка, кредитна карта"
 DocType: Journal Entry,Credit Note,Кредитове авізо
@@ -2045,7 +2054,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всього (Кіль
 DocType: Installation Note Item,Installed Qty,Встановлена ​​Кількість
 DocType: Lead,Fax,Факс
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Представлений
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Представлений
 DocType: Salary Structure,Total Earning,Всього Заробіток
 DocType: Purchase Receipt,Time at which materials were received,"Час, в якому були отримані матеріали"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Мої Адреси
@@ -2054,7 +2063,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Органі
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,або
 DocType: Sales Order,Billing Status,Статус рахунків
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Комунальні витрати
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Над
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Над
 DocType: Buying Settings,Default Buying Price List,За замовчуванням Купівля Прайс-лист
 ,Download Backups,Завантажити Резервні копії
 DocType: Notification Control,Sales Order Message,Продажі Замовити повідомлення
@@ -2063,7 +2072,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Виберіть Співробітники
 DocType: Bank Reconciliation,To Date,Для Дата
 DocType: Opportunity,Potential Sales Deal,Угода потенційних продажів
-sites/assets/js/form.min.js +308,Details,Подробиці
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Подробиці
 DocType: Purchase Invoice,Total Taxes and Charges,Всього Податки і збори
 DocType: Employee,Emergency Contact,Для екстреного зв'язку
 DocType: Item,Quality Parameters,Параметри якості
@@ -2078,7 +2087,7 @@ DocType: Purchase Order Item,Received Qty,Надійшло Кількість
 DocType: Stock Entry Detail,Serial No / Batch,Серійний номер / партія
 DocType: Product Bundle,Parent Item,Батько товару
 DocType: Account,Account Type,Тип рахунку
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Графік проведення технічного обслуговування не генерується для всіх елементів. Будь ласка, натисніть на кнопку "Generate" Розклад"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Графік проведення технічного обслуговування не генерується для всіх елементів. Будь ласка, натисніть на кнопку "Generate" Розклад"
 ,To Produce,Виробляти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряду {0} в {1}. Щоб включити {2} у розмірі Item ряди також повинні бути включені {3}
 DocType: Packing Slip,Identification of the package for the delivery (for print),Ідентифікація пакета для доставки (для друку)
@@ -2089,7 +2098,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Сплощення
 DocType: Account,Income Account,Рахунок Доходи
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Молдинг
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Поточний Кількість
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Див "Оцінити матеріалів на основі" в розділі калькуляції
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Відповідальність Площа
@@ -2119,9 +2128,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Всі адреси.
 DocType: Company,Stock Settings,Сток Налаштування
 DocType: User,Bio,Біо
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об'єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об'єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управління груповою клієнтів дерево.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Новий Центр Вартість Ім'я
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Новий Центр Вартість Ім'я
 DocType: Leave Control Panel,Leave Control Panel,Залишити Панель управління
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Немає за замовчуванням Адреса Шаблон не знайдене. Будь ласка, створіть новий з Setup> Друк і брендингу> Адреса шаблон."
 DocType: Appraisal,HR User,HR Користувач
@@ -2140,24 +2149,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,"Подробиці платіжний інструмент,"
 ,Sales Browser,Браузер з продажу
 DocType: Journal Entry,Total Credit,Всього Кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Увага: Ще {0} # {1} існує проти вступу фондовій {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,Місцевий
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Увага: Ще {0} # {1} існує проти вступу фондовій {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Місцевий
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити та аванси (активів)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Боржники
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Великий
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Жоден працівник не знайдено!
 DocType: C-Form Invoice Detail,Territory,Територія
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Не кажучи вже про НЕ ласка відвідувань, необхідних"
+DocType: Purchase Order,Customer Address Display,Замовник Адреса Показати
 DocType: Stock Settings,Default Valuation Method,Оцінка за замовчуванням метод
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полірування
 DocType: Production Order Operation,Planned Start Time,Плановані Час
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Виділені
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Закрити Баланс і книга Прибуток або збиток.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що \ ви вже зробили деякі угоди (угод) з іншим UOM. Щоб змінити стандартну UOM, \ використання "Одиниця виміру Замінити Utility 'інструмент під фондовій модуля."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Вкажіть обмінний курс для перетворення однієї валюти в іншу
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Цитата {0} скасовується
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитата {0} скасовується
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Загальною сумою заборгованості
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Співробітник {0} був у відпустці на {1}. Не можете відзначити відвідуваність.
 DocType: Sales Partner,Targets,Цільові
@@ -2172,12 +2181,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Це корінь групи клієнтів і не можуть бути змінені.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Будь ласка, встановіть ваш план рахунків, перш ніж почати бухгалтерських проводок"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ігнорувати Ціни правило
-sites/assets/js/list.min.js +24,Cancelled,Скасовано
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Скасовано
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"З дати зарплати структура не може бути менше, ніж Співробітника Приєднання Дата."
 DocType: Employee Education,Graduate,Випускник
 DocType: Leave Block List,Block Days,Блок Дні
 DocType: Journal Entry,Excise Entry,Акцизний запис
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Увага: Продажі Замовити {0} вже існує відносно Замовлення Клієнта {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Увага: Продажі Замовити {0} вже існує відносно Замовлення Клієнта {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2222,17 +2231,17 @@ DocType: Account,Stock Received But Not Billed,"Фото отриманий, а
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Повна Платне + недоїмки сума + Інкасація Сума - Загальна Відрахування
 DocType: Monthly Distribution,Distribution Name,Розподіл Ім'я
 DocType: Features Setup,Sales and Purchase,Купівлі-продажу
-DocType: Purchase Order Item,Material Request No,Матеріал Запит Немає
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Контроль якості потрібні для Пункт {0}
+DocType: Supplier Quotation Item,Material Request No,Матеріал Запит Немає
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Контроль якості потрібні для Пункт {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Швидкість, з якою клієнта валюті, конвертується в базову валюту компанії"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} успішно відписалися від цього списку.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Чистий швидкість (Компанія валют)
-apps/frappe/frappe/templates/base.html +132,Added,Доданої
+apps/frappe/frappe/templates/base.html +134,Added,Доданої
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управління Територія дерево.
 DocType: Journal Entry Account,Sales Invoice,Рахунок по продажах
 DocType: Journal Entry Account,Party Balance,Баланс партія
 DocType: Sales Invoice Item,Time Log Batch,Час входу Пакетне
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Будь ласка, виберіть Застосувати знижки на"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,"Будь ласка, виберіть Застосувати знижки на"
 DocType: Company,Default Receivable Account,За замовчуванням заборгованість аккаунт
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Створити банк запис на загальну заробітної плати, що виплачується за обраними критеріями вище"
 DocType: Stock Entry,Material Transfer for Manufacture,Матеріал для виробництва передачі
@@ -2243,7 +2252,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Одержати відпов
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Облік Вхід для запасі
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Команда1 продажів
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Пункт {0} не існує
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Пункт {0} не існує
 DocType: Sales Invoice,Customer Address,Замовник Адреса
 apps/frappe/frappe/desk/query_report.py +136,Total,Загальна
 DocType: Purchase Invoice,Apply Additional Discount On,Застосувати Додаткова знижка на
@@ -2258,13 +2267,15 @@ DocType: Quality Inspection,Quality Inspection,Контроль якості
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Дуже невеликий
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спрей формування
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,"Увага: Матеріал Запитувана Кількість менше, ніж мінімальне замовлення Кількість"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Рахунок {0} заморожені
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Рахунок {0} заморожені
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридична особа / Допоміжний з окремим Плану рахунків, що належать Організації."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Продукти харчування, напої і тютюн"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL або BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Можу тільки здійснити платіж проти нефактурірованних {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Швидкість Комісія не може бути більше, ніж 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Мінімальний рівень запасів
 DocType: Stock Entry,Subcontract,Субпідряд
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Будь ласка, введіть {0} в першу чергу"
 DocType: Production Planning Tool,Get Items From Sales Orders,Отримати продукція від замовленнях
 DocType: Production Order Operation,Actual End Time,Фактична Час закінчення
 DocType: Production Planning Tool,Download Materials Required,"Скачати матеріали, необхідні"
@@ -2281,9 +2292,9 @@ DocType: Maintenance Visit,Scheduled,Заплановане
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Будь ласка, виберіть пункт, де "Чи зі Пункт" "Ні" і "є продаж товару" "Так", і немає ніякої іншої продукт Зв'язка"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Виберіть щомісячний розподіл до нерівномірно розподілити цілі по місяців.
 DocType: Purchase Invoice Item,Valuation Rate,Оцінка Оцініть
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Ціни валют не визначена
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ціни валют не визначена
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Пункт ряд {0}: Покупка Отримання {1}, не існує в таблиці вище "Купити" НАДХОДЖЕННЯ"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Співробітник {0} вже застосовується для {1} між {2} і {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Співробітник {0} вже застосовується для {1} між {2} і {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Дата початку
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,До
 DocType: Rename Tool,Rename Log,Перейменувати Вхід
@@ -2310,13 +2321,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Тільки вузли лист дозволені в угоді
 DocType: Expense Claim,Expense Approver,Витрати затверджує
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Купівля Надходження товару Поставляється
-sites/assets/js/erpnext.min.js +48,Pay,Платити
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Платити
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Для DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Журнали для підтримки статус доставки смс
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Подрібнення
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Упаковка в термоусадочну плівку
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,В очікуванні Діяльність
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,В очікуванні Діяльність
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Підтвердив
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Постачальник> Постачальник Тип
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Будь ласка, введіть дату зняття."
@@ -2327,7 +2338,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"В
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Газетних видавців
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Виберіть фінансовий рік
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Виплавка
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Ти Залишити затверджує для цього запису. Оновіть 'Стан' і збережіть
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Змінити порядок Рівень
 DocType: Attendance,Attendance Date,Відвідуваність Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Зарплата розпаду на основі Заробіток і дедукції.
@@ -2363,6 +2373,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Центр Вартість з існуючими операцій, не може бути перетворений в групі"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизація
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Постачальник (и)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Невірний період
 DocType: Customer,Credit Limit,Кредитний ліміт
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Виберіть тип угоди
 DocType: GL Entry,Voucher No,Ваучер Немає
@@ -2372,8 +2383,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Ша
 DocType: Customer,Address and Contact,Адреса та контактна
 DocType: Customer,Last Day of the Next Month,Останній день наступного місяця
 DocType: Employee,Feedback,Зворотній зв'язок
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Графік
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Графік
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивної обробки струмінь
 DocType: Stock Settings,Freeze Stock Entries,Заморожування зображення щоденнику
 DocType: Website Settings,Website Settings,Налаштування сайту
@@ -2387,11 +2398,11 @@ DocType: Quality Inspection,Outgoing,Вихідний
 DocType: Material Request,Requested For,Запитувана Для
 DocType: Quotation Item,Against Doctype,На DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Підписка на накладну проти будь-якого проекту
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Корінь рахунок не може бути видалений
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Корінь рахунок не може бути видалений
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показати фонду Записи
 ,Is Primary Address,Є первинним Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Робота-в-Прогрес Склад
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Посилання # {0} від {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Посилання # {0} від {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управління адрес
 DocType: Pricing Rule,Item Code,Код товару
 DocType: Production Planning Tool,Create Production Orders,Створити виробничі замовлення
@@ -2400,14 +2411,14 @@ DocType: Journal Entry,User Remark,Зауваження Користувач
 DocType: Lead,Market Segment,Сегмент ринку
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Співробітник внутрішньої історії роботи
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Закриття (д-р)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Закриття (д-р)
 DocType: Contact,Passive,Пасивний
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серійний номер {0} не в наявності
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Податковий шаблон для продажу угод.
 DocType: Sales Invoice,Write Off Outstanding Amount,Списання суми заборгованості
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Перевірте, якщо вам потрібно автоматичних повторюваних рахунків. Після подачі будь-який рахунок-фактуру, повторюваних розділ буде видно."
 DocType: Account,Accounts Manager,Диспетчер облікових записів
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Час входу {0} повинен бути «Передано»
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Час входу {0} повинен бути «Передано»
 DocType: Stock Settings,Default Stock UOM,За замовчуванням одиниця виміру зі
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Калькуляція Оцінити на основі виду діяльності (за годину)
 DocType: Production Planning Tool,Create Material Requests,Створити запити Матеріал
@@ -2418,7 +2429,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Банк примирення
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Отримати оновлення
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Матеріал Запит {0} ануляції або зупинився
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Додати кілька пробних записів
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Залишити управління
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Залишити управління
 DocType: Event,Groups,Групи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Група по рахунок
 DocType: Sales Order,Fully Delivered,Повністю Поставляється
@@ -2430,11 +2441,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Продажі Додатково
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет за рахунок {1} проти МВЗ {2} буде перевищувати {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Різниця аккаунт повинен бути тип рахунки активів / пасивів, так як це зі Примирення є запис Відкриття"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},"Купівля Номер замовлення, необхідну для п {0}"
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry перепроваджених Листя
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},"Купівля Номер замовлення, необхідну для п {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"З дати" повинно бути після "Для Дата"
 ,Stock Projected Qty,Фото Прогнозований Кількість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Замовлення клієнта
 DocType: Warranty Claim,From Company,Від компанії
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Значення або Кількість
@@ -2447,13 +2457,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Роздрібний торговець
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всі типи Постачальник
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов'язковим, оскільки товар не автоматично нумеруються"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Цитата {0} типу {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов'язковим, оскільки товар не автоматично нумеруються"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитата {0} типу {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Технічне обслуговування Розклад товару
 DocType: Sales Order,%  Delivered,Поставляється%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк Овердрафт аккаунт
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Зробити зарплата Сліп
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Відкорковувати
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Відображення специфікації
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Забезпечені кредити
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Високий Продукти
@@ -2463,7 +2472,7 @@ DocType: Appraisal,Appraisal,Оцінка
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Лиття по виплавлюваних піни
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Малюнок
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата повторюється
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Залишити затверджує повинен бути одним з {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Залишити затверджує повинен бути одним з {0}
 DocType: Hub Settings,Seller Email,Продавець E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Загальна вартість покупки (через рахунок покупки)
 DocType: Workstation Working Hour,Start Time,Час початку
@@ -2477,8 +2486,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чиста сума (Компанія валют)
 DocType: BOM Operation,Hour Rate,Година Оцінити
 DocType: Stock Settings,Item Naming By,Пункт Іменування За
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,З цитати
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},"Ще Період закриття входу {0} була зроблена після того, як {1}"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,З цитати
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},"Ще Період закриття входу {0} була зроблена після того, як {1}"
 DocType: Production Order,Material Transferred for Manufacturing,Матеріал для виготовлення Переведений
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Рахунок {0} не існує робить
 DocType: Purchase Receipt Item,Purchase Order Item No,Замовлення на товар Немає
@@ -2491,11 +2500,11 @@ DocType: Item,Inspection Required,Інспекція Обов'язково
 DocType: Purchase Invoice Item,PR Detail,PR-Деталь
 DocType: Sales Order,Fully Billed,Повністю Оголошений
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Готівка касова
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Склад Доставка потрібно для фондового пункту {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Склад Доставка потрібно для фондового пункту {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Вага брутто упаковки. Зазвичай вага нетто + пакувальний матеріал вагу. (для друку)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Користувачі з цією роллю можуть встановлювати заморожені рахунки і створювати / змінювати записи бухгалтерського обліку стосовно заморожених рахунків
 DocType: Serial No,Is Cancelled,Скасовується
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Мої замовлення
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Мої замовлення
 DocType: Journal Entry,Bill Date,Білл Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Навіть якщо є кілька правил ціноутворення з найвищим пріоритетом, то наступні внутрішні пріоритети застосовуються:"
 DocType: Supplier,Supplier Details,Постачальник Подробиці
@@ -2508,7 +2517,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Банківський переказ
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Будь ласка, виберіть банківський рахунок"
 DocType: Newsletter,Create and Send Newsletters,Створення і відправлення розсилки
-sites/assets/js/report.min.js +107,From Date must be before To Date,"З дати повинні бути, перш ніж Дата"
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,"З дати повинні бути, перш ніж Дата"
 DocType: Sales Order,Recurring Order,Періодична Замовити
 DocType: Company,Default Income Account,За замовчуванням Рахунок Доходи
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Група клієнтів / клієнтів
@@ -2523,31 +2532,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Фото Одиниця вимі
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Замовлення на {0} не представлено
 ,Projected,Прогнозований
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серійний номер {0} не належить Склад {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Примітка: Система не перевірятиме по-доставки і більш-бронювання для Пункт {0}, як кількість або сума 0"
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Примітка: Система не перевірятиме по-доставки і більш-бронювання для Пункт {0}, як кількість або сума 0"
 DocType: Notification Control,Quotation Message,Цитата Повідомлення
 DocType: Issue,Opening Date,Дата розкриття
 DocType: Journal Entry,Remark,Зауваження
 DocType: Purchase Receipt Item,Rate and Amount,Темпи і обсяг
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Нудний
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Від замовлення клієнта
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Від замовлення клієнта
 DocType: Blog Category,Parent Website Route,Батько Сайт маршруту
 DocType: Sales Order,Not Billed,Чи не Оголошений
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Обидва Склад повинен належати тій же компанії
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Немає контактів ще не додавали.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Немає контактів ще не додавали.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Не активний
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,На рахунків Дата публікації
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Приземлився Вартість ваучера сума
 DocType: Time Log,Batched for Billing,Рулонірованние для рахунків
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Законопроекти, підняті постачальників."
 DocType: POS Profile,Write Off Account,Списання аккаунт
-sites/assets/js/erpnext.min.js +26,Discount Amount,Сума знижки
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сума знижки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повернутися в рахунку-фактурі проти
 DocType: Item,Warranty Period (in days),Гарантійний термін (в днях)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"наприклад, ПДВ"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Пункт 4
 DocType: Journal Entry Account,Journal Entry Account,Запис у щоденнику аккаунт
 DocType: Shopping Cart Settings,Quotation Series,Цитата серії
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Пункт існує з таким же ім'ям ({0}), будь ласка, змініть назву групи товарів або перейменувати пункт"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Пункт існує з таким же ім'ям ({0}), будь ласка, змініть назву групи товарів або перейменувати пункт"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Гаряча металу газу формування
 DocType: Sales Order Item,Sales Order Date,Продажі Порядок Дата
 DocType: Sales Invoice Item,Delivered Qty,Поставляється Кількість
@@ -2579,10 +2587,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Замовник або Постачальник Подробиці
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Встановіть
 DocType: Lead,Lead Owner,Ведучий Власник
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Склад требуется
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Склад требуется
 DocType: Employee,Marital Status,Сімейний стан
 DocType: Stock Settings,Auto Material Request,Авто Матеріал Запит
 DocType: Time Log,Will be updated when billed.,Буде оновлюватися при рахунок.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Доступні Пакетна Кількість на зі складу
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Поточна специфікація і Нью-специфікації не може бути таким же
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Дата виходу на пенсію повинен бути більше, ніж дата вступу"
 DocType: Sales Invoice,Against Income Account,На рахунок доходів
@@ -2599,12 +2608,12 @@ DocType: POS Profile,Update Stock,Оновлення зі
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Суперфінішування
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Різні Одиниця виміру для елементів призведе до неправильної (всього) значення маси нетто. Переконайтеся, що вага нетто кожного елемента знаходиться в тій же UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Специфікація Оцінити
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Ласка, витягнути речі з накладної"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Ласка, витягнути речі з накладної"
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Журнал Записів {0}-пов'язана
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Запис всіх комунікацій типу електронною поштою, телефоном, в чаті, відвідування і т.д."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Будь ласка, вкажіть округлити МВЗ в Компанії"
 DocType: Purchase Invoice,Terms,Терміни
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Створити новий
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Створити новий
 DocType: Buying Settings,Purchase Order Required,"Купівля порядку, передбаченому"
 ,Item-wise Sales History,Пункт мудрий Історія продажів
 DocType: Expense Claim,Total Sanctioned Amount,Всього санкціоновані Сума
@@ -2621,16 +2630,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Зарплата ковза
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Примітки
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Виберіть вузол групи в першу чергу.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Мета повинна бути одним з {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Заповніть форму і зберегти його
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Заповніть форму і зберегти його
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Завантажити звіт, що містить всю сировину з їх останньої інвентаризації статус"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Лицьова
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
 DocType: Leave Application,Leave Balance Before Application,Залишити баланс перед нанесенням
 DocType: SMS Center,Send SMS,Відправити SMS
 DocType: Company,Default Letter Head,За замовчуванням бланку
 DocType: Time Log,Billable,Платіжні
 DocType: Authorization Rule,This will be used for setting rule in HR module,Ця інформація буде використовуватися для установки модуля правило в HR
 DocType: Account,Rate at which this tax is applied,"Швидкість, з якою цей податок застосовується"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Зміна порядку Кількість
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Зміна порядку Кількість
 DocType: Company,Stock Adjustment Account,Фото коригування рахунку
 DocType: Journal Entry,Write Off,Списувати
 DocType: Time Log,Operation ID,Код операції
@@ -2641,12 +2651,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Знижка Поля будуть доступні в Замовленні, покупка отриманні, в рахунку-фактурі"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ім'я нового Користувача. Примітка: Будь ласка, не створювати облікові записи для клієнтів і постачальників"
 DocType: Report,Report Type,Тип звіту
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Завантаження
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Завантаження
 DocType: BOM Replace Tool,BOM Replace Tool,Специфікація Замінити інструмент
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Країна Шаблони Адреса мудрий замовчуванням
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Постачальник поставляє Покупцеві
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Показати податок розпад
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Імпорт та експорт даних
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Якщо ви залучати у виробничій діяльності. Дозволяє товару "виробляється"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Рахунок Дата розміщення
 DocType: Sales Invoice,Rounded Total,Округлі Всього
 DocType: Product Bundle,List items that form the package.,"Список предметів, які утворюють пакет."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Відсоток Розподіл має дорівнювати 100%
@@ -2657,8 +2670,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв'яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
 DocType: Company,Default Cash Account,За замовчуванням Грошовий рахунок
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компанії (не клієнтів або постачальників) господар.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',"Будь ласка, введіть "Очікувана дата доставки""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Будь ласка, введіть "Очікувана дата доставки""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Платні сума + Списання Сума не може бути більше, ніж загальний підсумок"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не є допустимим Номер партії за Пункт {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Примітка: Існує не достатньо відпустку баланс Залиште Тип {0}
@@ -2677,11 +2690,12 @@ apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabl
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Встановити як Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Відправити автоматичні листи на Контакти Про подання операцій.
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
+DocType: Purchase Order,Customer Contact Email,Контакти з клієнтами E-mail
 DocType: Event,Sunday,Неділя
 DocType: Sales Team,Contribution (%),Внесок (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата запис не буде створена, так як "Готівкою або банківський рахунок" не було зазначено"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Обов'язки
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Шаблон
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажі Особа Ім'я
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Будь ласка, введіть принаймні 1-фактуру в таблиці"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Додавання користувачів
@@ -2690,7 +2704,7 @@ DocType: Task,Actual Start Date (via Time Logs),Фактична дата поч
 DocType: Stock Reconciliation Item,Before reconciliation,Перед примирення
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Для {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Податки і збори Додав (Компанія валют)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
 DocType: Sales Order,Partly Billed,Невелика Оголошений
 DocType: Item,Default BOM,За замовчуванням BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2698,12 +2712,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Загальна сума заборгованості з Amt
 DocType: Time Log Batch,Total Hours,Загальна кількість годин
 DocType: Journal Entry,Printing Settings,Налаштування друку
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},"Всього Дебет повинна дорівнювати загальній виробленні. Різниця в тому, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Всього Дебет повинна дорівнювати загальній виробленні. Різниця в тому, {0}"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобільний
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},"Листя для типу {0}, вже виділених на працівника {1} для фінансового року {0}"
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Стан вимагається
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метал лиття під тиском
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,З накладної
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,З накладної
 DocType: Time Log,From Time,Від часу
 DocType: Notification Control,Custom Message,Текст повідомлення
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Інвестиційний банкінг
@@ -2719,17 +2732,17 @@ DocType: Newsletter,A Lead with this email id should exist,Провід з ці
 DocType: Stock Entry,From BOM,З специфікації
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основний
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Біржові операції до {0} заморожені
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',"Будь ласка, натисніть на кнопку "Generate" Розклад"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,"Для Дата повинна бути такою ж, як від Дата для половини дня відпустки"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Будь ласка, натисніть на кнопку "Generate" Розклад"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,"Для Дата повинна бути такою ж, як від Дата для половини дня відпустки"
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","наприклад, кг, Розділ, Ніс, м"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Посилання № є обов'язковим, якщо ви увійшли Reference Дата"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Посилання № є обов'язковим, якщо ви увійшли Reference Дата"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,"Дата вступу повинні бути більше, ніж Дата народження"
 DocType: Salary Structure,Salary Structure,Зарплата Структура
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правило існує з тими ж критеріями ,, будь ласка, вирішити \ конфлікту віддаючи пріоритет. Ціна Правила: {0}"
 DocType: Account,Bank,Банк
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авіакомпанія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Матеріал Випуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Матеріал Випуск
 DocType: Material Request Item,For Warehouse,Для складу
 DocType: Employee,Offer Date,Пропозиція Дата
 DocType: Hub Settings,Access Token,Маркер доступу
@@ -2752,6 +2765,7 @@ DocType: Issue,Opening Time,Відкриття Час
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"Від і До дати, необхідних"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Цінні папери та бірж
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
+DocType: Delivery Note Item,From Warehouse,Від Склад
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Буріння
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Видувна
 DocType: Purchase Taxes and Charges,Valuation and Total,Оцінка і Загальна
@@ -2773,11 +2787,12 @@ DocType: C-Form,Amended From,Змінений З
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Сирий матеріал
 DocType: Leave Application,Follow via Email,Дотримуйтесь по електронній пошті
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сума податку після скидки Сума
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Дитячий рахунок існує для цього облікового запису. Ви не можете видалити цей аккаунт.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Дитячий рахунок існує для цього облікового запису. Ви не можете видалити цей аккаунт.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Або мета або ціль Кількість Сума є обов'язковим
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Немає за замовчуванням специфікації не існує для п {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,"Будь ласка, виберіть проводки Дата першого"
-DocType: Leave Allocation,Carry Forward,Переносити
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Немає за замовчуванням специфікації не існує для п {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Будь ласка, виберіть проводки Дата першого"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Відкриття Дата повинна бути, перш ніж Дата закриття"
+DocType: Leave Control Panel,Carry Forward,Переносити
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,"Центр Вартість з існуючими операцій, не може бути перетворений в бухгалтерській книзі"
 DocType: Department,Days for which Holidays are blocked for this department.,"Дні, для яких Свята заблоковані для цього відділу."
 ,Produced,Вироблений
@@ -2802,11 +2817,11 @@ apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Година
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серійний товару {0} не може бути оновлена ​​\ на примирення зі
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Провести Матеріал Постачальнику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Провести Матеріал Постачальнику
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новий Серійний номер не може бути склад. Склад повинен бути встановлений на Фондовій запис або придбати отриманні
 DocType: Lead,Lead Type,Ведучий Тип
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Створити цитати
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Всі ці предмети вже виставлений
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Всі ці предмети вже виставлений
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може бути схвалене {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Доставка Умови правил
 DocType: BOM Replace Tool,The new BOM after replacement,Новий специфікації після заміни
@@ -2854,7 +2869,7 @@ DocType: C-Form,C-Form,С-форма
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Код операції не встановлений
 DocType: Production Order,Planned Start Date,Планована дата початку
 DocType: Serial No,Creation Document Type,Створення типу документа
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Візит
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Візит
 DocType: Leave Type,Is Encash,Є Обналічиваніє
 DocType: Purchase Invoice,Mobile No,Номер мобільного
 DocType: Payment Tool,Make Journal Entry,Зробити запис журналу
@@ -2862,7 +2877,7 @@ DocType: Leave Allocation,New Leaves Allocated,Нові листя номеро
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Дані проекту мудрий не доступні для цитати
 DocType: Project,Expected End Date,Очікувана Дата закінчення
 DocType: Appraisal Template,Appraisal Template Title,Оцінка шаблону Назва
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Комерційна
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Комерційна
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Батько товару {0} не повинні бути зі пункт
 DocType: Cost Center,Distribution Id,Розподіл Id
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Високий Послуги
@@ -2878,14 +2893,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Відповідність атрибутів {0} має бути в межах {1} до {2} в збільшень {3}
 DocType: Tax Rule,Sales,Продажів
 DocType: Stock Entry Detail,Basic Amount,Основна кількість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Склад необхідний для складі Пункт {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Склад необхідний для складі Пункт {0}
+DocType: Leave Allocation,Unused leaves,Невикористані листя
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,За замовчуванням заборгованість Дебіторська
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Розпилювання
 DocType: Tax Rule,Billing State,Державний рахунків
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламінування
 DocType: Item Reorder,Transfer,Переклад
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Fetch розібраному специфікації (у тому числі вузлів)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch розібраному специфікації (у тому числі вузлів)
 DocType: Authorization Rule,Applicable To (Employee),Застосовується до (Співробітник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Завдяки Дата є обов'язковим
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
@@ -2901,6 +2917,7 @@ DocType: Company,Retail,Роздрібна торгівля
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Замовник {0} не існує
 DocType: Attendance,Absent,Відсутнім
 DocType: Product Bundle,Product Bundle,Зв'язка товарів
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ряд {0}: Неприпустима посилання {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Дроблення
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купити податки і збори шаблон
 DocType: Upload Attendance,Download Template,Завантажити Шаблон
@@ -2908,16 +2925,16 @@ DocType: GL Entry,Remarks,Зауваження
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Сировина Код товара
 DocType: Journal Entry,Write Off Based On,Списання заснований на
 DocType: Features Setup,POS View,POS Перегляд
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Установка рекорд для серійним номером
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Установка рекорд для серійним номером
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Безперервне розливання
-sites/assets/js/erpnext.min.js +10,Please specify a,Введи
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Введи
 DocType: Offer Letter,Awaiting Response,В очікуванні відповіді
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Вище
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Холодна розмірів
 DocType: Salary Slip,Earning & Deduction,Заробіток і дедукція
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Рахунок {0} не може бути група
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Область
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Необов'язково. Ця установка буде використовуватися для фільтрації в різних угод.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Необов'язково. Ця установка буде використовуватися для фільтрації в різних угод.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Негативний Оцінка Оцініть не допускається
 DocType: Holiday List,Weekly Off,Щотижневий Викл
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Для наприклад 2012, 2012-13"
@@ -2961,12 +2978,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Опуклий
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Лиття випарного-модель
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Представницькі витрати
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Видаткова накладна {0} має бути скасований до скасування цього замовлення клієнта
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Вік
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Видаткова накладна {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Вік
 DocType: Time Log,Billing Amount,Сума рахунків
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Невірний кількість вказано за пунктом {0}. Кількість повинна бути більше 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Заявки на відпустку.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Рахунок з існуючою транзакції не можуть бути вилучені
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Рахунок з існуючою транзакції не можуть бути вилучені
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Судові витрати
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","День місяця, в який автоматично замовлення буде генеруватися, наприклад, 05, 28 і т.д."
 DocType: Sales Invoice,Posting Time,Проводка Час
@@ -2975,9 +2992,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Логотип
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Перевірте це, якщо ви хочете, щоб змусити користувача вибрати ряд перед збереженням. Там не буде за замовчуванням, якщо ви перевірити це."
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Немає товару з серійним № {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Відкриті Повідомлення
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Відкриті Повідомлення
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Прямі витрати
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,"Ви дійсно хочете, щоб відкорковувати цей матеріал Запит?"
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Новий Клієнт Виручка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Витрати на відрядження
 DocType: Maintenance Visit,Breakdown,Зламатися
@@ -2988,7 +3004,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Станом на Дата
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Хонингование
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Випробувальний термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,За замовчуванням Склад є обов'язковим для фондового Пункт.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,За замовчуванням Склад є обов'язковим для фондового Пункт.
 DocType: Feed,Full Name,Повне ім'я
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Клінч
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Виплата заробітної плати за місяць {0} і рік {1}
@@ -3011,7 +3027,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Додати 
 DocType: Buying Settings,Default Supplier Type,За замовчуванням Тип Постачальник
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Кар'єр
 DocType: Production Order,Total Operating Cost,Загальна експлуатаційна вартість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Примітка: Пункт {0} введений кілька разів
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Примітка: Пункт {0} введений кілька разів
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Всі контакти.
 DocType: Newsletter,Test Email Id,Тест Email ID
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Абревіатура Компанія
@@ -3035,11 +3051,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Кот
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль тварин редагувати заморожені акції
 ,Territory Target Variance Item Group-Wise,Територія Цільова Різниця Пункт Група Мудрий
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Всі групи покупців
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов'язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов'язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Податковий шаблону є обов'язковим.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Рахунок {0}: Батько не існує обліковий запис {1}
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ціни Оцінити (Компанія валют)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} статус «Зупинено»
 DocType: Account,Temporary,Тимчасовий
 DocType: Address,Preferred Billing Address,Перевага платіжний адреса
 DocType: Monthly Distribution Percentage,Percentage Allocation,Відсоток Розподіл
@@ -3057,12 +3072,13 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрий
 DocType: Purchase Order Item,Supplier Quotation,Постачальник цитати
 DocType: Quotation,In Words will be visible once you save the Quotation.,"За словами будуть видні, як тільки ви збережете цитати."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,По прасуванню одягу
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} зупинений
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} зупинений
 DocType: Lead,Add to calendar on this date,Додати в календар в цей день
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила для додавання транспортні витрати.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,Майбутні події
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Майбутні події
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Потрібно клієнтів
 DocType: Letter Head,Letter Head,Лист Керівник
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Швидкий доступ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} є обов'язковим для повернення
 DocType: Purchase Order,To Receive,Отримати
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Термозбіжна Місце
@@ -3085,25 +3101,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Принаймні одне склад є обов'язковим
 DocType: Serial No,Out of Warranty,З гарантії
 DocType: BOM Replace Tool,Replace,Замінювати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} проти накладна {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,"Будь ласка, введіть замовчуванням Одиниця виміру"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} проти накладна {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Будь ласка, введіть замовчуванням Одиниця виміру"
 DocType: Purchase Invoice Item,Project Name,Назва проекту
 DocType: Supplier,Mention if non-standard receivable account,Згадка якщо нестандартна заборгованість рахунок
 DocType: Workflow State,Edit,Редагувати
 DocType: Journal Entry Account,If Income or Expense,Якщо доходи або витрати
 DocType: Features Setup,Item Batch Nos,Пункт Пакетне пп
 DocType: Stock Ledger Entry,Stock Value Difference,Фото Значення Різниця
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Людський ресурс
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Людський ресурс
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата Примирення Оплата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Податкові активи
 DocType: BOM Item,BOM No,Специфікація Немає
 DocType: Contact Us Settings,Pincode,PIN-код
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Запис у щоденнику {0} не має облікового запису {1} ​​або вже порівнюється з іншою ваучер
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Запис у щоденнику {0} не має облікового запису {1} ​​або вже порівнюється з іншою ваучер
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,"Специфікації, які будуть замінені"
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Новий зі Одиниця виміру повинен відрізнятися від поточного запасу Одиниця виміру
 DocType: Account,Debit,Дебет
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Листя повинні бути виділені в упаковці 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листя повинні бути виділені в упаковці 0,5"
 DocType: Production Order,Operation Cost,Операція Вартість
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Завантажити відвідуваність з CSV-файлу
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Видатний Amt
@@ -3111,7 +3127,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Вст
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Щоб призначити цю проблему, використовуйте кнопку "Зв'язати" в бічній панелі."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Заморожування Акції старше ніж [днiв]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Якщо два або більше Ціноутворення Правила знайдені на основі зазначених вище умовах, пріоритет застосовується. Пріоритет являє собою число від 0 до 20, а значення за замовчуванням дорівнює нулю (порожній). Більше число означає, що він буде мати пріоритет, якщо є кілька правил ціноутворення з тих же умовах."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Проти Рахунок
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Фінансовий рік: {0} не існує робить
 DocType: Currency Exchange,To Currency,Для Валюта
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Дозволити наступні користувачі затвердити Залишити додатків для блокових днів.
@@ -3140,7 +3155,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ст
 DocType: Stock Entry Detail,Additional Cost,Додаткова вартість
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Фінансовий рік Дата закінчення
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фільтрувати на основі Сертифікати Ні, якщо згруповані по Ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Зробити постачальників цитати
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Зробити постачальників цитати
 DocType: Quality Inspection,Incoming,Вхідний
 DocType: BOM,Materials Required (Exploded),"Матеріалів, необхідних (в розібраному)"
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Скорочення Заробіток для відпустки без збереження (LWP)
@@ -3148,10 +3163,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серійний номер {1}, не відповідає {2} {3}"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Повсякденне Залишити
 DocType: Batch,Batch ID,Пакетна ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Примітка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Примітка: {0}
 ,Delivery Note Trends,Накладний Тенденції
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Резюме цього тижня
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} повинен бути куплені або субпідрядником товару в рядку {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} повинен бути куплені або субпідрядником товару в рядку {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Рахунок: {0} можуть бути оновлені тільки через біржових операцій
 DocType: GL Entry,Party,Вечірка
 DocType: Sales Order,Delivery Date,Дата доставки
@@ -3164,7 +3179,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,СР Купівля Оцінити
 DocType: Task,Actual Time (in Hours),Фактичний час (в годинах)
 DocType: Employee,History In Company,Історія У Компанії
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Розсилка
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Розсилка
 DocType: Address,Shipping,Доставка
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фото Ledger Entry
 DocType: Department,Leave Block List,Залиште Заблокувати список
@@ -3183,7 +3198,7 @@ DocType: Account,Auditor,Аудитор
 DocType: Purchase Order,End date of current order's period,Дата закінчення періоду поточного замовлення
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Зробити пропозицію лист
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Повернення
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,"За замовчуванням Одиниця виміру для варіанту повинні бути такими ж, як шаблон"
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,"За замовчуванням Одиниця виміру для варіанту повинні бути такими ж, як шаблон"
 DocType: DocField,Fold,Скласти
 DocType: Production Order Operation,Production Order Operation,Виробництво Порядок роботи
 DocType: Pricing Rule,Disable,Відключити
@@ -3215,7 +3230,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Доповіді
 DocType: SMS Settings,Enter url parameter for receiver nos,Введіть URL параметр для приймача ДАІ
 DocType: Sales Invoice,Paid Amount,Виплачена сума
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Закриття рахунку {0} повинен бути типу "відповідальності"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Закриття рахунку {0} повинен бути типу "відповідальності"
 ,Available Stock for Packing Items,Доступно для Упаковка зі Items
 DocType: Item Variant,Item Variant,Пункт Варіант
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Установка цього Адреса шаблон за замовчуванням, оскільки немає ніякого іншого замовчуванням"
@@ -3223,7 +3238,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управління якістю
 DocType: Production Planning Tool,Filter based on customer,Фільтр на основі клієнта
 DocType: Payment Tool Detail,Against Voucher No,На Сертифікати Немає
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},"Будь ласка, введіть бажану кількість Пункт {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Будь ласка, введіть бажану кількість Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Співробітник зовнішньої роботи Історія
 DocType: Tax Rule,Purchase,Купівля
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Баланс Кількість
@@ -3260,28 +3275,29 @@ Note: BOM = Bill of Materials","Сукупний група ** ** Товари 
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Серійний номер є обов'язковим для пп {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Будь ласка, сформулюйте з / в діапазоні"
-sites/assets/js/desk.min.js +7652,Created By,Створений
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Створений
 DocType: Serial No,Under AMC,Під КУА
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Пункт ставка оцінка перераховується з урахуванням витрат приземлився кількість ваучера
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Налаштування за замовчуванням для продажу угод.
 DocType: BOM Replace Tool,Current BOM,Поточна специфікація
-sites/assets/js/erpnext.min.js +8,Add Serial No,Додати серійний номер
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Додати серійний номер
 DocType: Production Order,Warehouses,Склади
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Друк та стаціонарні
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Вузол Група
 DocType: Payment Reconciliation,Minimum Amount,Мінімальна сума
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Оновлення готової продукції
 DocType: Workstation,per hour,в годину
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Серія {0} вже використовується в {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Серія {0} вже використовується в {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рахунок для складу (Perpetual Inventory) буде створена під цим обліковим записом.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не може бути видалений, поки існує запис складі книга для цього складу."
 DocType: Company,Distribution,Розподіл
-sites/assets/js/erpnext.min.js +50,Amount Paid,Виплачувана сума
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Виплачувана сума
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Керівник проекту
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Відправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс знижка дозволило пункту: {0} {1}%
 DocType: Customer,Default Taxes and Charges,За замовчуванням Податки і збори
 DocType: Account,Receivable,Дебіторська заборгованість
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Чи не дозволено змінювати Постачальник як вже існує замовлення
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, яка дозволила представити транзакції, які перевищують встановлені ліміти кредитування."
 DocType: Sales Invoice,Supplier Reference,Постачальник Посилання
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Якщо відзначене, специфікації на південь від складання деталей будуть розглядатися на отримання сировини. В іншому випадку, всі елементи під-монтажні буде розглядатися в якості сировинного матеріалу."
@@ -3318,8 +3334,8 @@ DocType: Email Digest,Add/Remove Recipients,Додати / Видалити Од
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Угода не має проти зупинив виробництво Замовити {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Щоб встановити цей фінансовий рік, за замовчуванням, натисніть на кнопку "Встановити за замовчуванням""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),"Налаштування сервера вхідної в підтримку електронний ідентифікатор. (наприклад, support@example.com)"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Брак Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Брак Кількість
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата ковзання
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полірувальний
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"Для Дата" потрібно
@@ -3332,6 +3348,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Коли будь-який з перевірених угод "Передано", електронною поштою спливаюче автоматично відкривається, щоб відправити лист у відповідний "Контакт" в цій транзакції, з угоди ролі вкладення. Користувач може або не може відправити по електронній пошті."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Глобальні налаштування
 DocType: Employee Education,Employee Education,Співробітник Освіта
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
 DocType: Salary Slip,Net Pay,Чистий Платне
 DocType: Account,Account,Рахунок
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Серійний номер {0} вже отримав
@@ -3364,7 +3381,7 @@ DocType: BOM,Manufacturing User,Виробництво користувача
 DocType: Purchase Order,Raw Materials Supplied,Сировина постачається
 DocType: Purchase Invoice,Recurring Print Format,Періодична друку Формат
 DocType: Communication,Series,Серія
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,"Очікувана дата поставки не може бути, перш ніж Купівля Порядок Дата"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Очікувана дата поставки не може бути, перш ніж Купівля Порядок Дата"
 DocType: Appraisal,Appraisal Template,Оцінка шаблону
 DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Пункт Класифікація
@@ -3409,6 +3426,7 @@ DocType: HR Settings,Payroll Settings,Налаштування заробітн
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Підходимо незв'язані Рахунки та платежі.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Зробити замовлення
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корінь не може бути батько МВЗ
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Виберіть бренд ...
 DocType: Sales Invoice,C-Form Applicable,"С-формі, застосовної"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
 DocType: Supplier,Address and Contacts,Адреса та контакти
@@ -3419,7 +3437,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Отримати Видатні Ваучери
 DocType: Warranty Claim,Resolved By,Вирішили За
 DocType: Appraisal,Start Date,Дата початку
-sites/assets/js/desk.min.js +7629,Value,Значення
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Значення
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Виділяють листя протягом.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Натисніть тут, щоб перевірити,"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Рахунок {0}: Ви не можете призначити себе як батька рахунок
@@ -3435,14 +3453,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Дозволено Dropbox доступу
 DocType: Dropbox Backup,Weekly,Щотижня
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"Напр., smsgateway.com/api/send_sms.cgi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Отримати
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Отримати
 DocType: Maintenance Visit,Fully Completed,Повністю завершено
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Повний
 DocType: Employee,Educational Qualification,Освітня кваліфікація
 DocType: Workstation,Operating Costs,Експлуатаційні витрати
 DocType: Employee Leave Approver,Employee Leave Approver,Співробітник Залишити затверджує
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} був успішно доданий в нашу розсилку.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не можете оголосити як втрачений, бо цитати був зроблений."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Електронно-променева обробка
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купівля Майстер-менеджер
@@ -3455,7 +3473,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Додати / Редагувати Ціни
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Діаграма МВЗ
 ,Requested Items To Be Ordered,"Необхідні товари, які можна замовити"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Мої Замовлення
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Мої Замовлення
 DocType: Price List,Price List Name,Ціна Ім'я
 DocType: Time Log,For Manufacturing,Для виготовлення
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Загальні дані
@@ -3466,7 +3484,7 @@ DocType: Account,Income,Дохід
 DocType: Industry Type,Industry Type,Промисловість Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Щось пішло не так!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Увага: Залиште додаток містить наступні дати блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Видаткова накладна {0} вже були представлені
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Видаткова накладна {0} вже були представлені
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Дата Виконання
 DocType: Purchase Invoice Item,Amount (Company Currency),Сума (Компанія валют)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Лиття під тиском
@@ -3480,10 +3498,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Рік
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Точка-в-продажу Профіль
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Оновіть SMS Налаштування
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Час входу {0} вже виставлений
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Час входу {0} вже виставлений
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Незабезпечені кредити
 DocType: Cost Center,Cost Center Name,Вартість Ім'я центр
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Пункт {0} з Серійний номер вже встановлений {1}
 DocType: Maintenance Schedule Detail,Scheduled Date,Запланована дата
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Всього виплачено Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Повідомлення більше ніж 160 символів будуть розділені на кілька повідомлень
@@ -3491,10 +3508,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Отримав і прий
 ,Serial No Service Contract Expiry,Серійний номер Сервіс контракт Термін
 DocType: Item,Unit of Measure Conversion,Одиниця виміру конверсії
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Співробітник не може бути змінений
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Ви не можете кредитні та дебетові ж обліковий запис в той же час
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ви не можете кредитні та дебетові ж обліковий запис в той же час
 DocType: Naming Series,Help HTML,Допомога HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всього weightage призначений повинна бути 100%. Це {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Посібник для пере- {0} схрещеними Пункт {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Посібник для пере- {0} схрещеними Пункт {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Назва особі або організації, що ця адреса належить."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ваші Постачальники
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
@@ -3505,10 +3522,11 @@ DocType: Lead,Converted,Перероблений
 DocType: Item,Has Serial No,Має серійний номер
 DocType: Employee,Date of Issue,Дата випуску
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: З {0} для {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
 DocType: Issue,Content Type,Тип вмісту
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Комп'ютер
 DocType: Item,List this Item in multiple groups on the website.,Список цей пункт в декількох групах на сайті.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Пункт: {0} не існує в системі
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,"Ви не авторизовані, щоб встановити значення Frozen"
 DocType: Payment Reconciliation,Get Unreconciled Entries,Отримати Неузгоджені Записи
@@ -3519,14 +3537,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,На склад
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Рахунок {0} був введений більш ніж один раз для фінансового року {1}
 ,Average Commission Rate,Середня ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,"Має серійний номер 'не може бути' Так 'для не-фондовій пункту
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"Має серійний номер 'не може бути' Так 'для не-фондовій пункту
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Відвідуваність не можуть бути відзначені для майбутніх дат
 DocType: Pricing Rule,Pricing Rule Help,Ціни Правило Допомога
 DocType: Purchase Taxes and Charges,Account Head,Рахунок Керівник
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Оновлення додаткових витрат для розрахунку приземлився вартість товарів
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Електричний
 DocType: Stock Entry,Total Value Difference (Out - In),Загальна вартість Різниця (з - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс є обов'язковим
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс є обов'язковим
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Ідентифікатор користувача не встановлений Employee {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Зміцнення
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Від гарантії Претензії
@@ -3546,8 +3564,10 @@ DocType: Attendance,Present,Теперішній час
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Доставка Примітка {0} не повинні бути представлені
 DocType: Notification Control,Sales Invoice Message,Рахунок по продажах повідомлення
 DocType: Authorization Rule,Based On,Грунтуючись на
-,Ordered Qty,Замовив Кількість
+DocType: Sales Order Item,Ordered Qty,Замовив Кількість
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Пункт {0} відключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Заморожені Upto
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Період з Період і датам обов'язкових для повторюваних {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектна діяльність / завдання.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Створення Зарплата ковзає
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} не є допустимим ID електронної пошти
@@ -3586,7 +3606,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Завантажити Відвідуваність
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Специфікація і виробництво Кількість потрібні
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старіння Діапазон 2
-DocType: Journal Entry Account,Amount,Кількість
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Кількість
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Клепка
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Специфікація замінити
 ,Sales Analytics,Продажі Аналітика
@@ -3613,7 +3633,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очікувана дата не може бути перед матеріалу Запит Дата
 DocType: Contact Us Settings,City,Місто
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ультразвукової обробки
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Помилка: Чи не діє ID?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Помилка: Чи не діє ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Пункт {0} повинен бути Продажі товару
 DocType: Naming Series,Update Series Number,Оновлення Кількість Серія
 DocType: Account,Equity,Капітал
@@ -3628,7 +3648,7 @@ DocType: Purchase Taxes and Charges,Actual,Фактичний
 DocType: Authorization Rule,Customerwise Discount,Customerwise Знижка
 DocType: Purchase Invoice,Against Expense Account,На рахунки витрат
 DocType: Production Order,Production Order,Виробничий замовлення
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Установка Примітка {0} вже були представлені
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Установка Примітка {0} вже були представлені
 DocType: Quotation Item,Against Docname,На DOCNAME
 DocType: SMS Center,All Employee (Active),Всі Співробітник (Активний)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Дивитися зараз
@@ -3636,14 +3656,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Сировина Вартість
 DocType: Item,Re-Order Level,Re-Order рівні
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введіть предметів і плановий Кількість, для якого ви хочете, щоб підняти виробничі замовлення або завантажити сировини для аналізу."
-sites/assets/js/list.min.js +174,Gantt Chart,Діаграма Ганта
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Діаграма Ганта
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Неповний робочий день
 DocType: Employee,Applicable Holiday List,Стосується Список відпочинку
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серія Оновлене
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип звіту є обов'язковим
 DocType: Item,Serial Number Series,Серійний номер серії
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Склад є обов'язковим для фондового Пункт {0} в рядку {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад є обов'язковим для фондового Пункт {0} в рядку {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Роздрібна та оптова
 DocType: Issue,First Responded On,По-перше відгукнувся на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Хрест Лістинг Пункт в декількох групах
@@ -3658,7 +3678,7 @@ DocType: Attendance,Attendance,Відвідуваність
 DocType: Page,No,Немає
 DocType: BOM,Materials,Матеріали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Якщо не встановлено, то список буде потрібно додати до кожного відділу, де він повинен бути застосований."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Дата публікації і розміщення час є обов'язковим
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Дата публікації і розміщення час є обов'язковим
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Податковий шаблон для покупки угод.
 ,Item Prices,Предмет Ціни
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"За словами будуть видні, як тільки ви збережете замовлення."
@@ -3678,9 +3698,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Адміністративні витрати
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Батько Група клієнтів
-sites/assets/js/erpnext.min.js +50,Change,Зміна
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Зміна
 DocType: Purchase Invoice,Contact Email,Контактний Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Замовлення на {0} 'Зупинено "
 DocType: Appraisal Goal,Score Earned,Оцінка Зароблені
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","наприклад, "Моя компанія ТОВ""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Примітка Період
@@ -3690,12 +3709,13 @@ DocType: Packing Slip,Gross Weight UOM,Вага брутто Одиниця ви
 DocType: Email Digest,Receivables / Payables,Дебіторська заборгованість Кредиторська заборгованість /
 DocType: Delivery Note Item,Against Sales Invoice,На рахунок продажу
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Тиснення
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Рахунок з кредитовим сальдо
 DocType: Landed Cost Item,Landed Cost Item,Приземлився Вартість товару
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Показати нульові значення
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Кількість пункту отримані після виготовлення / перепакування із заданих кількостях сировини
 DocType: Payment Reconciliation,Receivable / Payable Account,/ Дебіторська заборгованість аккаунт
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
 DocType: Item,Default Warehouse,За замовчуванням Склад
 DocType: Task,Actual End Date (via Time Logs),Фактична Дата закінчення (через журнали Time)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Бюджет не може бути призначений на обліковий запис групи {0}
@@ -3709,7 +3729,7 @@ DocType: Issue,Support Team,Команда підтримки
 DocType: Appraisal,Total Score (Out of 5),Всього балів (з 5)
 DocType: Contact Us Settings,State,Державний
 DocType: Batch,Batch,Партія
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Всього витрат претензії (за допомогою витратні Претензії)
 DocType: User,Gender,Стать
 DocType: Journal Entry,Debit Note,Дебет-нота
@@ -3725,9 +3745,8 @@ DocType: Lead,Blog Subscriber,Блог Абонент
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Створення правил по обмеженню угод на основі значень.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Якщо відзначене, Загальна немає. робочих днів буде включати в себе свята, і це призведе до зниження вартості Зарплата за день"
 DocType: Purchase Invoice,Total Advance,Всього Попередня
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Відкорковувати Матеріал Запит
 DocType: Workflow State,User,Користувач
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Розрахунку заробітної плати
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Розрахунку заробітної плати
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Сума кредиту
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Встановити як Втрачений
@@ -3735,7 +3754,7 @@ DocType: Customer,Credit Days Based On,Кредитні днів заснова
 DocType: Tax Rule,Tax Rule,Податкове положення
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Підтримувати ж швидкістю Протягом всієї цикл продажів
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планувати час журнали за межами робочої станції робочих годин.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} вже були представлені
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} вже були представлені
 ,Items To Be Requested,Товари слід замовляти
 DocType: Purchase Order,Get Last Purchase Rate,Отримати останню покупку Оцінити
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Платіжна Оцінити на основі виду діяльності (за годину)
@@ -3744,6 +3763,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Компанія Email ID не знайдений, отже, пошта не відправлено"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Застосування засобів (активів)
 DocType: Production Planning Tool,Filter based on item,Фільтр на основі пункту
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Дебетовий рахунок
 DocType: Fiscal Year,Year Start Date,Рік Дата початку
 DocType: Attendance,Employee Name,Ім'я співробітника
 DocType: Sales Invoice,Rounded Total (Company Currency),Округлі Всього (Компанія валют)
@@ -3755,14 +3775,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Гасіння
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Виплати працівникам
 DocType: Sales Invoice,Is POS,Це POS-
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
 DocType: Production Order,Manufactured Qty,Виробник Кількість
 DocType: Purchase Receipt Item,Accepted Quantity,Прийнято Кількість
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} існує не
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,"Законопроекти, підняті клієнтам."
 DocType: DocField,Default,Дефолт
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Немає {0}: Сума не може бути більше, ніж очікуванні Сума проти Витрата претензії {1}. В очікуванні сума {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Немає {0}: Сума не може бути більше, ніж очікуванні Сума проти Витрата претензії {1}. В очікуванні сума {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} додав абоненти
 DocType: Maintenance Schedule,Schedule,Графік
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",Визначити бюджет для цього МВЗ. Щоб встановити бюджету дію см "Список компанії"
@@ -3770,7 +3790,7 @@ DocType: Account,Parent Account,Батьки рахунку
 DocType: Quality Inspection Reading,Reading 3,Читання 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Ваучер Тип
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Ціни не знайдений або відключений
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ціни не знайдений або відключений
 DocType: Expense Claim,Approved,Затверджений
 DocType: Pricing Rule,Price,Ціна
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як "ліві"
@@ -3779,23 +3799,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Освіта
 DocType: Selling Settings,Campaign Naming By,Кампанія Неймінг За
 DocType: Employee,Current Address Is,Поточна адреса
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Необов'язково. Встановлює за замовчуванням валюту компанії, якщо не вказано."
 DocType: Address,Office,Офіс
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартні звіти
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Бухгалтерських журналів.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партія / рахунку не відповідає {1} / {2} в {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кількість на зі складу
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партія / рахунку не відповідає {1} / {2} в {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Щоб створити податковий облік
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
 DocType: Account,Stock,Фондовий
 DocType: Employee,Current Address,Поточна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Якщо деталь варіант іншого елемента, то опис, зображення, ціноутворення, податки і т.д. будуть встановлені на основі шаблону, якщо явно не вказано"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Виробництво Детальніше
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Пакетна Інвентар
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Пакетна Інвентар
 DocType: Employee,Contract End Date,Дата закінчення контракту
 DocType: Sales Order,Track this Sales Order against any Project,Підписка на замовлення клієнта проти будь-якого проекту
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Замовлення на продаж Витягніть (до пологів) на основі вищеперелічених критеріїв
 DocType: DocShare,Document Type,Тип документа
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Від постачальника цитати
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Від постачальника цитати
 DocType: Deduction Type,Deduction Type,Відрахування Тип
 DocType: Attendance,Half Day,Половина дня
 DocType: Pricing Rule,Min Qty,Мінімальна Кількість
@@ -3806,20 +3828,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Для Кількість (Виробник Кількість) є обов'язковим
 DocType: Stock Entry,Default Target Warehouse,Мета за замовчуванням Склад
 DocType: Purchase Invoice,Net Total (Company Currency),Чистий Всього (Компанія валют)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партія Тип і партія застосовується лише щодо / дебіторська заборгованість рахунок
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партія Тип і партія застосовується лише щодо / дебіторська заборгованість рахунок
 DocType: Notification Control,Purchase Receipt Message,Купівля Надходження повідомлення
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Сумарна кількість виділених листя більш періоду
 DocType: Production Order,Actual Start Date,Фактична дата початку
 DocType: Sales Order,% of materials delivered against this Sales Order,% Матеріалів поставляється проти цього замовлення клієнта
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Запис руху пункт.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Запис руху пункт.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Розсилка передплатника
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Сервіс
 DocType: Hub Settings,Hub Settings,Налаштування Hub
 DocType: Project,Gross Margin %,Валовий дохід %
 DocType: BOM,With Operations,З операцій
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерські вже були зроблені у валюті {0} для компанії {1}. Будь ласка, виберіть дебіторської або кредиторської заборгованості рахунок з валютою {0}."
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерські вже були зроблені у валюті {0} для компанії {1}. Будь ласка, виберіть дебіторської або кредиторської заборгованості рахунок з валютою {0}."
 ,Monthly Salary Register,Щомісячна зарплата Реєстрація
-apps/frappe/frappe/website/template.py +123,Next,Наступний
+apps/frappe/frappe/website/template.py +140,Next,Наступний
 DocType: Warranty Claim,If different than customer address,"Якщо відрізняється, ніж адресою замовника"
 DocType: BOM Operation,BOM Operation,Специфікація Операція
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Електрополіровка
@@ -3850,6 +3873,7 @@ DocType: Purchase Invoice,Next Date,Наступна дата
 DocType: Employee Education,Major/Optional Subjects,Основні / Додаткові Суб'єкти
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Будь ласка, введіть податків і зборів"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обробка
+DocType: Sales Invoice Item,Drop Ship,Корабель падіння
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тут ви можете зберегти сімейні дані, як ім'я та окупації батька, чоловіка і дітей"
 DocType: Hub Settings,Seller Name,Продавець Ім'я
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Податки і збори віднімаються (Компанія валют)
@@ -3876,29 +3900,29 @@ DocType: Purchase Order,To Receive and Bill,Для прийому і Білл
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Умови шаблону
 DocType: Serial No,Delivery Details,Деталі Доставка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматичне створення матеріалів запит, якщо кількість падає нижче цього рівня,"
 ,Item-wise Purchase Register,Пункт мудрий Купівля Реєстрація
 DocType: Batch,Expiry Date,Термін придатності
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Щоб встановити рівень повторного замовлення, деталь повинна бути Купівля товару або товару Виробництво"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Щоб встановити рівень повторного замовлення, деталь повинна бути Купівля товару або товару Виробництво"
 ,Supplier Addresses and Contacts,Постачальник Адреси та контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Ласка, виберіть категорію в першу чергу"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Майстер проекту.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Не відображати будь-який символ, як $ і т.д. поряд з валютами."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Половина дня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Половина дня)
 DocType: Supplier,Credit Days,Кредитні Дні
 DocType: Leave Type,Is Carry Forward,Є переносити
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Отримати елементів із специфікації
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Отримати елементів із специфікації
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Час виконання Дні
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Відомість матеріалів
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партія Тип і партія необхідна для / дебіторська заборгованість увагу {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партія Тип і партія необхідна для / дебіторська заборгованість увагу {1}
 DocType: Dropbox Backup,Send Notifications To,Включити повідомлення
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Посилання Дата
 DocType: Employee,Reason for Leaving,Причина виїзду
 DocType: Expense Claim Detail,Sanctioned Amount,Санкціонований Сума
 DocType: GL Entry,Is Opening,Відкриває
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов'язаний з {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Рахунок {0} не існує
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов'язаний з {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Рахунок {0} не існує
 DocType: Account,Cash,Грошові кошти
 DocType: Employee,Short biography for website and other publications.,Коротка біографія для веб-сайту та інших публікацій.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Будь ласка, створіть зарплата структури для співробітника {0}"
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index d94d47254d..ca4dc12274 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Chế độ tiền lương
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Chọn phân phối hàng tháng, nếu bạn muốn theo dõi dựa trên thời vụ."
 DocType: Employee,Divorced,Đa ly dị
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,Cảnh báo: Cùng một mục đã được nhập nhiều lần.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Cảnh báo: Cùng một mục đã được nhập nhiều lần.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Mục đã được đồng bộ hóa
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Cho phép hàng để được thêm nhiều lần trong một giao dịch
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Hủy {0} Material Visit trước hủy bỏ yêu cầu bồi thường bảo hành này
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Đầm cộng thiêu kết
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Tiền tệ là cần thiết cho Danh sách Price {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sẽ được tính toán trong các giao dịch.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,Từ vật liệu Yêu cầu
+DocType: Purchase Order,Customer Contact,Khách hàng Liên hệ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Từ vật liệu Yêu cầu
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Nộp đơn công việc
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Không có thêm kết quả.
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,Tên khách hàng
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Tất cả các lĩnh vực liên quan như xuất khẩu tiền tệ, tỷ lệ chuyển đổi, tổng xuất khẩu, xuất khẩu lớn tổng số vv có sẵn trong giao Lưu ý, POS, báo giá, bán hàng hóa đơn, bán hàng đặt hàng, vv"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Thủ trưởng (hoặc nhóm) dựa vào đó kế toán Entries được thực hiện và cân bằng được duy trì.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Xuất sắc cho {0} không thể nhỏ hơn không ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Xuất sắc cho {0} không thể nhỏ hơn không ({1})
 DocType: Manufacturing Settings,Default 10 mins,Mặc định 10 phút
 DocType: Leave Type,Leave Type Name,Loại bỏ Tên
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Loạt Cập nhật thành công
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,Nhiều giá Item.
 DocType: SMS Center,All Supplier Contact,Tất cả các nhà cung cấp Liên hệ
 DocType: Quality Inspection Reading,Parameter,Thông số
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Dự kiến ​​kết thúc ngày không thể nhỏ hơn so với dự kiến ​​Ngày bắt đầu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,Đừng thực sự muốn rút nút lệnh sản xuất:
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tỷ giá phải được giống như {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Để lại ứng dụng mới
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Để lại ứng dụng mới
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Dự thảo ngân hàng
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 Để duy trì khách hàng mã hàng khôn ngoan và để làm cho họ tìm kiếm dựa trên mã sử dụng tùy chọn này
 DocType: Mode of Payment Account,Mode of Payment Account,Phương thức thanh toán Tài khoản
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Hiện biến
 DocType: Sales Invoice Item,Quantity,Số lượng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Các khoản vay (Nợ phải trả)
 DocType: Employee Education,Year of Passing,Năm Passing
-sites/assets/js/erpnext.min.js +27,In Stock,Sản phẩm trong kho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,Chỉ có thể thực hiện thanh toán đối với unbilled Sales Order
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Sản phẩm trong kho
 DocType: Designation,Designation,Định
 DocType: Production Plan Item,Production Plan Item,Kế hoạch sản xuất hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Người sử dụng {0} đã được giao cho nhân viên {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Làm mới POS hồ sơ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Chăm sóc sức khỏe
 DocType: Purchase Invoice,Monthly,Hàng tháng
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,Hóa đơn
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Chậm trễ trong thanh toán (Ngày)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Hóa đơn
 DocType: Maintenance Schedule Item,Periodicity,Tính tuần hoàn
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Địa chỉ Email
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Quốc phòng
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Điểm số (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} không phù hợp với {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} không phù hợp với {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Không có xe
-sites/assets/js/erpnext.min.js +55,Please select Price List,Vui lòng chọn Bảng giá
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vui lòng chọn Bảng giá
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Chế biến gỗ
 DocType: Production Order Operation,Work In Progress,Làm việc dở dang
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,In ấn 3D
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,Cha mẹ chi tiết docname
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Mở đầu cho một công việc.
 DocType: Item Attribute,Increment,Tăng
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Chọn nhà kho ...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Quảng cáo
 DocType: Employee,Married,Kết hôn
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Chứng khoán không thể được cập nhật với giao hàng Lưu ý {0}
 DocType: Payment Reconciliation,Reconcile,Hòa giải
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Cửa hàng tạp hóa
 DocType: Quality Inspection Reading,Reading 1,Đọc 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,Hãy nhập Ngân hàng
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Hãy nhập Ngân hàng
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Quỹ lương hưu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Kho là bắt buộc nếu loại tài khoản là kho
 DocType: SMS Center,All Sales Person,Tất cả các doanh Người
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,Viết Tắt Trung tâm Chi phí
 DocType: Warehouse,Warehouse Detail,Kho chi tiết
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Hạn mức tín dụng đã được lai cho khách hàng {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Loại thuế
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Bạn không được phép để thêm hoặc cập nhật các mục trước khi {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Bạn không được phép để thêm hoặc cập nhật các mục trước khi {0}
 DocType: Item,Item Image (if not slideshow),Mục Hình ảnh (nếu không slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Một khách hàng tồn tại với cùng một tên
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Giờ Rate / 60) * Thời gian hoạt động thực tế
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,Khách
 DocType: Quality Inspection,Get Specification Details,Thông số kỹ thuật chi tiết được
 DocType: Lead,Interested,Quan tâm
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Mở ra
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Mở ra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Từ {0} đến {1}
 DocType: Item,Copy From Item Group,Sao chép Từ mục Nhóm
 DocType: Journal Entry,Opening Entry,Mở nhập
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,Đặt hàng sản phẩm
 DocType: Standard Reply,Owner,Chủ sở hữu
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Vui lòng nhập công ty đầu tiên
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,Vui lòng chọn Công ty đầu tiên
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vui lòng chọn Công ty đầu tiên
 DocType: Employee Education,Under Graduate,Dưới đại học
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mục tiêu trên
 DocType: BOM,Total Cost,Tổng chi phí
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,Tiền tố
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Tiêu hao
 DocType: Upload Attendance,Import Log,Nhập khẩu Đăng nhập
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Gửi
+DocType: Sales Invoice Item,Delivered By Supplier,Giao By Nhà cung cấp
 DocType: SMS Center,All Contact,Liên hệ với tất cả
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Mức lương hàng năm
 DocType: Period Closing Voucher,Closing Fiscal Year,Đóng cửa năm tài chính
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,Contra nhập
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Hiển thị Thời gian Logs
 DocType: Journal Entry Account,Credit in Company Currency,Tín dụng tại Công ty ngoại tệ
 DocType: Delivery Note,Installation Status,Tình trạng cài đặt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Bị từ chối chấp nhận lượng phải bằng số lượng nhận cho hàng {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Bị từ chối chấp nhận lượng phải bằng số lượng nhận cho hàng {0}
 DocType: Item,Supply Raw Materials for Purchase,Cung cấp nguyên liệu thô cho Purchase
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Mục {0} phải là mua hàng
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Tải Template, điền dữ liệu thích hợp và đính kèm các tập tin sửa đổi.
  Tất cả các ngày và nhân viên kết hợp trong giai đoạn được chọn sẽ đến trong bản mẫu, hồ sơ tham dự với hiện tại"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,Mục {0} không hoạt động hoặc kết thúc của cuộc sống đã đạt tới
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Mục {0} không hoạt động hoặc kết thúc của cuộc sống đã đạt tới
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Sẽ được cập nhật sau khi bán hàng hóa đơn được Gửi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, thuế hàng {1} cũng phải được bao gồm"
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, thuế hàng {1} cũng phải được bao gồm"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Cài đặt cho nhân sự Mô-đun
 DocType: SMS Center,SMS Center,Trung tâm nhắn tin
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Thẳng
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,Nhập tham số url cho t
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Quy tắc áp dụng giá và giảm giá.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Xung đột Log Thời gian này với {0} cho {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Danh sách giá phải được áp dụng cho việc mua hoặc bán hàng
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Ngày cài đặt không thể trước ngày giao hàng cho hàng {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Ngày cài đặt không thể trước ngày giao hàng cho hàng {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Giảm giá Giá Tỷ lệ (%)
-sites/assets/js/form.min.js +279,Start,Bắt đầu
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Bắt đầu
 DocType: User,First Name,Họ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Thiết lập của bạn được hoàn tất. Làm mới.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Đúc Full-mốc
 DocType: Offer Letter,Select Terms and Conditions,Chọn Điều khoản và Điều kiện
 DocType: Production Planning Tool,Sales Orders,Đơn đặt hàng bán hàng
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,Chống bán hóa đơn hàng
 ,Production Orders in Progress,Đơn đặt hàng sản xuất trong tiến độ
 DocType: Lead,Address & Contact,Địa chỉ & Liên hệ
+DocType: Leave Allocation,Add unused leaves from previous allocations,Thêm lá không sử dụng từ phân bổ trước
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Tiếp theo định kỳ {0} sẽ được tạo ra trên {1}
 DocType: Newsletter List,Total Subscribers,Tổng số thuê bao
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Tên liên lạc
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO chờ Số lượng
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tạo phiếu lương cho các tiêu chí nêu trên.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Yêu cầu để mua hàng.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Nhà ở kép
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Chỉ chọn Để lại phê duyệt có thể gửi ứng dụng Để lại này
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Chỉ chọn Để lại phê duyệt có thể gửi ứng dụng Để lại này
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Giảm ngày phải lớn hơn ngày của Tham gia
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lá mỗi năm
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Hãy đặt Naming Series cho {0} qua Setup> Cài đặt> Đặt tên series
 DocType: Time Log,Will be updated when batched.,Sẽ được cập nhật khi trộn.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Vui lòng kiểm tra 'là Advance chống Account {1} nếu điều này là một entry trước.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Vui lòng kiểm tra 'là Advance chống Account {1} nếu điều này là một entry trước.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Kho {0} không thuộc về công ty {1}
 DocType: Bulk Email,Message,Tin nhắn
 DocType: Item Website Specification,Item Website Specification,Mục Trang Thông số kỹ thuật
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Reference No
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Lại bị chặn
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lại bị chặn
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,Hàng năm
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Cổ hòa giải hàng
 DocType: Stock Entry,Sales Invoice No,Hóa đơn bán hàng không
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,Đặt hàng tối thiểu Số lượng
 DocType: Pricing Rule,Supplier Type,Loại nhà cung cấp
 DocType: Item,Publish in Hub,Xuất bản trong Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,Mục {0} bị hủy bỏ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,Yêu cầu tài liệu
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Yêu cầu tài liệu
 DocType: Bank Reconciliation,Update Clearance Date,Cập nhật thông quan ngày
 DocType: Item,Purchase Details,Thông tin chi tiết mua
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Mục {0} không tìm thấy trong 'Nguyên liệu Supplied' bảng trong Purchase Order {1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,Kiểm soát thông báo
 DocType: Lead,Suggestions,Đề xuất
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Thiết lập mục Nhóm-khôn ngoan ngân sách trên lãnh thổ này. Bạn cũng có thể bao gồm thời vụ bằng cách thiết lập phân phối.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Vui lòng nhập nhóm tài khoản phụ huynh cho kho {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Thanh toán khỏi {0} {1} không thể lớn hơn xuất sắc Số tiền {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Thanh toán khỏi {0} {1} không thể lớn hơn xuất sắc Số tiền {2}
 DocType: Supplier,Address HTML,Địa chỉ HTML
 DocType: Lead,Mobile No.,Điện thoại di động số
 DocType: Maintenance Schedule,Generate Schedule,Tạo Lịch
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Mới Cổ UOM
 DocType: Period Closing Voucher,Closing Account Head,Đóng Trưởng Tài khoản
 DocType: Employee,External Work History,Bên ngoài Quá trình công tác
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Thông tư tham khảo Lỗi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,Bạn có thực sự muốn để STOP
 DocType: Communication,Closed,Đã đóng
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Trong từ (xuất khẩu) sẽ được hiển thị khi bạn lưu Giao hàng tận nơi Lưu ý.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,Bạn có chắc chắn bạn muốn để STOP
 DocType: Lead,Industry,Ngành công nghiệp
 DocType: Employee,Job Profile,Hồ sơ công việc
 DocType: Newsletter,Newsletter,Đăng ký nhận tin
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,Giao hàng Ghi
 DocType: Dropbox Backup,Allow Dropbox Access,Cho phép truy cập Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Thiết lập Thuế
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Nhập thanh toán đã được sửa đổi sau khi bạn kéo nó. Hãy kéo nó một lần nữa.
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0} vào hai lần tại khoản thuế
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} vào hai lần tại khoản thuế
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Tóm tắt cho tuần này và các hoạt động cấp phát
 DocType: Workstation,Rent Cost,Chi phí thuê
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vui lòng chọn tháng và năm
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tốc độ mà khách hàng tệ được chuyển đổi sang tiền tệ cơ bản của khách hàng
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Có sẵn trong HĐQT, Giao hàng tận nơi Lưu ý, mua hóa đơn, sản xuất hàng, Mua hàng, mua hóa đơn, hóa đơn bán hàng, bán hàng đặt hàng, chứng khoán nhập cảnh, timesheet"
 DocType: Item Tax,Tax Rate,Tỷ lệ thuế
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,Chọn nhiều Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Chọn nhiều Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} được quản lý theo từng đợt, không thể hòa giải được sử dụng \
  Cổ hòa giải, thay vì sử dụng cổ nhập"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Không phải giống như {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Chuyển đổi sang non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Mua hóa đơn phải được gửi
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,Tình trạng hàng UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Hàng loạt (rất nhiều) của một Item.
 DocType: C-Form Invoice Detail,Invoice Date,Hóa đơn ngày
 DocType: GL Entry,Debit Amount,Số tiền ghi nợ
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},Chỉ có thể có 1 tài khoản cho mỗi công ty trong {0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Chỉ có thể có 1 tài khoản cho mỗi công ty trong {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Địa chỉ email của bạn
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Xin vui lòng xem file đính kèm
 DocType: Purchase Order,% Received,% Nhận
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,Hướng dẫn
 DocType: Quality Inspection,Inspected By,Kiểm tra bởi
 DocType: Maintenance Visit,Maintenance Type,Loại bảo trì
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Không nối tiếp {0} không thuộc về Giao hàng tận nơi Lưu ý {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Không nối tiếp {0} không thuộc về Giao hàng tận nơi Lưu ý {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Kiểm tra chất lượng sản phẩm Thông số
 DocType: Leave Application,Leave Approver Name,Để lại Tên Người phê duyệt
 ,Schedule Date,Lịch trình ngày
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,Đăng ký mua
 DocType: Landed Cost Item,Applicable Charges,Phí áp dụng
 DocType: Workstation,Consumable Cost,Chi phí tiêu hao
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) phải có vai trò 'Leave Người phê duyệt'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) phải có vai trò 'Leave Người phê duyệt'
 DocType: Purchase Receipt,Vehicle Date,Xe ngày
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Y khoa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Lý do mất
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,Cài đặt%
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Vui lòng nhập tên công ty đầu tiên
 DocType: BOM,Item Desription,Cái Mô tả sản phẩm
 DocType: Purchase Invoice,Supplier Name,Tên nhà cung cấp
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Đọc hướng dẫn ERPNext
 DocType: Account,Is Group,Is Nhóm
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Tự động Đặt nối tiếp Nos dựa trên FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kiểm tra nhà cung cấp hóa đơn Số độc đáo
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Thạc sĩ Quản
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Cài đặt chung cho tất cả các quá trình sản xuất.
 DocType: Accounts Settings,Accounts Frozen Upto,"Chiếm đông lạnh HCM,"
 DocType: SMS Log,Sent On,Gửi On
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
 DocType: Sales Order,Not Applicable,Không áp dụng
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Chủ lễ.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell đúc
 DocType: Material Request Item,Required Date,Ngày yêu cầu
 DocType: Delivery Note,Billing Address,Địa chỉ thanh toán
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,Vui lòng nhập Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vui lòng nhập Item Code.
 DocType: BOM,Costing,Chi phí
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Nếu được chọn, số tiền thuế sẽ được coi là đã có trong tiền lệ In / In"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Tổng số Số lượng
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between O
 DocType: Customer,Buyer of Goods and Services.,Người mua hàng hoá và dịch vụ.
 DocType: Journal Entry,Accounts Payable,Tài khoản Phải trả
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Thêm Subscribers
-sites/assets/js/erpnext.min.js +5,""" does not exists","""Không tồn tại"
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Không tồn tại"
 DocType: Pricing Rule,Valid Upto,"HCM, đến hợp lệ"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,"Danh sách một số khách hàng của bạn. Họ có thể là các tổ chức, cá nhân."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Thu nhập trực tiếp
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Không thể lọc dựa trên tài khoản, nếu nhóm lại theo tài khoản"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Nhân viên hành chính
 DocType: Payment Tool,Received Or Paid,Nhận Hoặc Paid
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,Vui lòng chọn Công ty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vui lòng chọn Công ty
 DocType: Stock Entry,Difference Account,Tài khoản chênh lệch
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Không thể nhiệm vụ gần như là nhiệm vụ của nó phụ thuộc {0} là không đóng cửa.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
 DocType: Production Order,Additional Operating Cost,Chi phí điều hành khác
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Mỹ phẩm
 DocType: DocField,Type,Loại
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
 DocType: Communication,Subject,Chủ đề
 DocType: Shipping Rule,Net Weight,Trọng lượng
 DocType: Employee,Emergency Phone,Điện thoại khẩn cấp
 ,Serial No Warranty Expiry,Nối tiếp Không có bảo hành hết hạn
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,Bạn có thực sự muốn để STOP Yêu cầu vật liệu này?
 DocType: Sales Order,To Deliver,Giao Hàng
 DocType: Purchase Invoice Item,Item,Hạng mục
 DocType: Journal Entry,Difference (Dr - Cr),Sự khác biệt (Tiến sĩ - Cr)
 DocType: Account,Profit and Loss,Báo cáo kết quả hoạt động kinh doanh
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,Quản lý Hợp đồng phụ
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Quản lý Hợp đồng phụ
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Mới UOM không phải là loại nguyên số
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Đồ nội thất và đấu
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tốc độ mà danh sách Giá tiền tệ được chuyển đổi sang tiền tệ cơ bản của công ty
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,Thêm / Sửa Thuế và
 DocType: Purchase Invoice,Supplier Invoice No,Nhà cung cấp hóa đơn Không
 DocType: Territory,For reference,Để tham khảo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Không thể xóa tiếp Serial No {0}, vì nó được sử dụng trong các giao dịch chứng khoán"
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),Đóng cửa (Cr)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Đóng cửa (Cr)
 DocType: Serial No,Warranty Period (Days),Thời gian bảo hành (ngày)
 DocType: Installation Note Item,Installation Note Item,Lưu ý cài đặt hàng
 ,Pending Qty,Pending Qty
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,Thanh toán và giao hàng Stat
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Khách hàng lặp lại
 DocType: Leave Control Panel,Allocate,Phân bổ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Trang trước
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,Bán hàng trở lại
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Bán hàng trở lại
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Chọn bán hàng đơn đặt hàng mà từ đó bạn muốn tạo ra đơn đặt hàng sản xuất.
+DocType: Item,Delivered by Supplier (Drop Ship),Cung cấp bởi Nhà cung cấp (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Thành phần lương.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Cơ sở dữ liệu khách hàng tiềm năng.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Cơ sở dữ liệu khách hàng.
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Sự té nhào xuống
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Một kho hợp lý chống lại các entry chứng khoán được thực hiện.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Không tham khảo và tham khảo ngày là cần thiết cho {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Không tham khảo và tham khảo ngày là cần thiết cho {0}
 DocType: Event,Wednesday,Thứ tư
 DocType: Sales Invoice,Customer's Vendor,Bán hàng của khách hàng
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Sản xuất theo thứ tự là bắt buộc
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,Nhận thông số
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Dựa trên"" và ""Nhóm bởi"" không thể giống nhau"
 DocType: Sales Person,Sales Person Targets,Mục tiêu người bán hàng
-sites/assets/js/form.min.js +271,To,đến
-apps/frappe/frappe/templates/base.html +143,Please enter email address,Vui lòng nhập địa chỉ email
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,đến
+apps/frappe/frappe/templates/base.html +145,Please enter email address,Vui lòng nhập địa chỉ email
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ống End hình thành
 DocType: Production Order Operation,In minutes,Trong phút
 DocType: Issue,Resolution Date,Độ phân giải ngày
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,Dự án tài
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Tiêu thụ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} không tìm thấy trong bảng hóa đơn chi tiết
 DocType: Company,Round Off Cost Center,Vòng Tắt Center Chi phí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bảo trì đăng nhập {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bảo trì đăng nhập {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 DocType: Material Request,Material Transfer,Chuyển tài liệu
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Mở (Tiến sĩ)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Đăng dấu thời gian phải sau ngày {0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,Cài đặt
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Thuế Chi phí hạ cánh và Lệ phí
 DocType: Production Order Operation,Actual Start Time,Thực tế Start Time
 DocType: BOM Operation,Operation Time,Thời gian hoạt động
-sites/assets/js/list.min.js +5,More,Nhiều Hơn
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Nhiều Hơn
 DocType: Pricing Rule,Sales Manager,Quản lý bán hàng
-sites/assets/js/desk.min.js +7673,Rename,Đổi tên
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Đổi tên
 DocType: Journal Entry,Write Off Amount,Viết Tắt Số tiền
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Uốn
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Cho phép tài
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,M
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Cắt thẳng
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Để theo dõi mục trong bán hàng và giấy tờ mua bán dựa trên nos nối tiếp của họ. Này cũng có thể được sử dụng để theo dõi các chi tiết bảo hành của sản phẩm.
 DocType: Purchase Receipt Item Supplied,Current Stock,Cổ hiện tại
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,Kho từ chối là bắt buộc đối với mục regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Kho từ chối là bắt buộc đối với mục regected
 DocType: Account,Expenses Included In Valuation,Chi phí bao gồm trong định giá
 DocType: Employee,Provide email id registered in company,Cung cấp email id đăng ký tại công ty
 DocType: Hub Settings,Seller City,Người bán Thành phố
 DocType: Email Digest,Next email will be sent on:,Email tiếp theo sẽ được gửi về:
 DocType: Offer Letter Term,Offer Letter Term,Cung cấp văn Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Mục có các biến thể.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Mục {0} không tìm thấy
 DocType: Bin,Stock Value,Giá trị cổ phiếu
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Loại cây
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Chào mừng bạn
 DocType: Journal Entry,Credit Card Entry,Thẻ tín dụng nhập
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Nhiệm vụ đề
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Hàng nhận được từ nhà cung cấp.
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Hàng nhận được từ nhà cung cấp.
 DocType: Communication,Open,Mở
 DocType: Lead,Campaign Name,Tên chiến dịch
 ,Reserved,Ltd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,Bạn có thực sự muốn rút nút
 DocType: Purchase Order,Supply Raw Materials,Cung cấp Nguyên liệu thô
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Ngày, tháng, hóa đơn tiếp theo sẽ được tạo ra. Nó được tạo ra trên trình."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Tài sản ngắn hạn
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,Của khách hàng Mua hàng Không
 DocType: Employee,Cell Number,Số di động
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Thua
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện tại 'Against Journal nhập' cột
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện tại 'Against Journal nhập' cột
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Năng lượng
 DocType: Opportunity,Opportunity From,Từ cơ hội
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Báo cáo tiền lương hàng tháng.
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,Trách nhiệm
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Số tiền bị xử phạt không thể lớn hơn so với yêu cầu bồi thường Số tiền trong Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Mặc định Chi phí tài khoản hàng bán
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,Danh sách giá không được chọn
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Danh sách giá không được chọn
 DocType: Employee,Family Background,Gia đình nền
 DocType: Process Payroll,Send Email,Gởi thư
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Không phép
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,lớp
 DocType: Item,Items with higher weightage will be shown higher,Mục weightage cao sẽ được hiển thị cao hơn
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ngân hàng hòa giải chi tiết
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Hoá đơn của tôi
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Không có nhân viên tìm thấy
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Không có nhân viên tìm thấy
 DocType: Purchase Order,Stopped,Đã ngưng
 DocType: Item,If subcontracted to a vendor,Nếu hợp đồng phụ với một nhà cung cấp
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Chọn BOM để bắt đầu
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Tải lê
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Bây giờ gửi
 ,Support Analytics,Hỗ trợ Analytics
 DocType: Item,Website Warehouse,Trang web kho
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,Bạn có thực sự muốn dừng lại để sản xuất:
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Các ngày trong tháng mà tự động hóa đơn sẽ được tạo ra ví dụ như 05, 28 vv"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Điểm số phải nhỏ hơn hoặc bằng 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Hồ sơ C-Mẫu
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Hỗ
 DocType: Features Setup,"To enable ""Point of Sale"" features",Để kích hoạt tính năng "Point of Sale" tính năng
 DocType: Bin,Moving Average Rate,Tỷ lệ trung bình di chuyển
 DocType: Production Planning Tool,Select Items,Chọn mục
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0} với Bill {1} ​​{2} ngày
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} với Bill {1} ​​{2} ngày
 DocType: Comment,Reference Name,Tên tài liệu tham khảo
 DocType: Maintenance Visit,Completion Status,Tình trạng hoàn thành
 DocType: Sales Invoice Item,Target Warehouse,Mục tiêu kho
 DocType: Item,Allow over delivery or receipt upto this percent,Cho phép trên giao nhận tối đa tỷ lệ này
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,Dự kiến sẽ giao hàng ngày không thể trước khi bán hàng đặt hàng ngày
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Dự kiến sẽ giao hàng ngày không thể trước khi bán hàng đặt hàng ngày
 DocType: Upload Attendance,Import Attendance,Nhập khẩu tham dự
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tất cả các nhóm hàng
 DocType: Process Payroll,Activity Log,Đăng nhập hoạt động
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Tự động soạn tin nhắn trên trình giao dịch.
 DocType: Production Order,Item To Manufacture,Để mục Sản xuất
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Đúc khuôn vĩnh viễn
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,Mua hàng để thanh toán
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} tình trạng là {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Mua hàng để thanh toán
 DocType: Sales Order Item,Projected Qty,Số lượng dự kiến
 DocType: Sales Invoice,Payment Due Date,Thanh toán Due Date
 DocType: Newsletter,Newsletter Manager,Bản tin Quản lý
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,Số yêu cầu
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Đánh giá hiệu quả.
 DocType: Sales Invoice Item,Stock Details,Chi tiết chứng khoán
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Giá trị dự án
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,Điểm bán hàng
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},Không thể thực hiện chuyển tiếp {0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Điểm bán hàng
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Không thể thực hiện chuyển tiếp {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Số dư tài khoản đã có trong tín dụng, bạn không được phép để thiết lập 'cân Must Be' là 'Nợ'"
 DocType: Account,Balance must be,Cân bằng phải
 DocType: Hub Settings,Publish Pricing,Xuất bản Pricing
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,Mua hóa đơn
 ,Received Items To Be Billed,Mục nhận được lập hoá đơn
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Phun mài mòn
-sites/assets/js/desk.min.js +3938,Ms,Ms
+DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Tổng tỷ giá hối đoái.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Không thể tìm Time Khe cắm trong {0} ngày tới cho Chiến {1}
 DocType: Production Order,Plan material for sub-assemblies,Tài liệu kế hoạch cho các cụm chi tiết
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,Dải
 DocType: Supplier,Default Payable Accounts,Mặc định Accounts Payable
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
 DocType: Features Setup,Item Barcode,Mục mã vạch
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Các biến thể mục {0} cập nhật
 DocType: Quality Inspection Reading,Reading 6,Đọc 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Mua hóa đơn trước
 DocType: Address,Shop,Cửa hàng
 DocType: Hub Settings,Sync Now,Bây giờ Sync
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},Row {0}: lối vào tín dụng không thể được liên kết với một {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: lối vào tín dụng không thể được liên kết với một {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Mặc định tài khoản ngân hàng / tiền mặt sẽ được tự động cập nhật trong POS hóa đơn khi chế độ này được chọn.
 DocType: Employee,Permanent Address Is,Địa chỉ thường trú là
 DocType: Production Order Operation,Operation completed for how many finished goods?,Hoạt động hoàn thành cho bao nhiêu thành phẩm?
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Các thương hiệu
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,Trợ cấp cho quá {0} vượt qua cho mục {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Trợ cấp cho quá {0} vượt qua cho mục {1}.
 DocType: Employee,Exit Interview Details,Chi tiết thoát Phỏng vấn
 DocType: Item,Is Purchase Item,Là mua hàng
 DocType: Journal Entry Account,Purchase Invoice,Mua hóa đơn
 DocType: Stock Ledger Entry,Voucher Detail No,Chứng từ chi tiết Không
 DocType: Stock Entry,Total Outgoing Value,Tổng giá trị Outgoing
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Khai mạc Ngày và ngày kết thúc nên trong năm tài chính tương tự
 DocType: Lead,Request for Information,Yêu cầu thông tin
 DocType: Payment Tool,Paid,Paid
 DocType: Salary Slip,Total in words,Tổng số nói cách
 DocType: Material Request Item,Lead Time Date,Chì Thời gian ngày
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,là bắt buộc. Có thể đổi tiền ghi không được tạo ra cho
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Hàng # {0}: Hãy xác định Serial No cho mục {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Đối với những mặt 'gói sản phẩm', Warehouse, Serial No và hàng loạt No sẽ được xem xét từ 'Packing List' bảng. Nếu kho và hàng loạt Không là giống nhau cho tất cả các mặt hàng đóng gói cho các mặt hàng bất kỳ 'gói sản phẩm', những giá trị có thể được nhập vào mục bảng chính, giá trị này sẽ được sao chép vào 'Packing List' bảng."
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Lô hàng cho khách hàng.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Lô hàng cho khách hàng.
 DocType: Purchase Invoice Item,Purchase Order Item,Mua hàng mục
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Thu nhập gián tiếp
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Đặt Số tiền thanh toán = Số tiền xuất sắc
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,Địa chỉ Line 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variance
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Tên công ty
 DocType: SMS Center,Total Message(s),Tổng số tin nhắn (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Xem danh sách tất cả các video giúp đỡ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Chọn đầu tài khoản của ngân hàng nơi kiểm tra đã được gửi.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Cho phép người dùng chỉnh sửa Giá liệt kê Tỷ giá giao dịch
 DocType: Pricing Rule,Max Qty,Số lượng tối đa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Thanh toán chống Bán hàng / Mua hàng nên luôn luôn được đánh dấu là trước
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Thanh toán chống Bán hàng / Mua hàng nên luôn luôn được đánh dấu là trước
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Mối nguy hóa học
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,Tất cả các mặt hàng đã được chuyển giao cho đặt hàng sản xuất này.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tất cả các mặt hàng đã được chuyển giao cho đặt hàng sản xuất này.
 DocType: Process Payroll,Select Payroll Year and Month,Chọn Payroll Năm và Tháng
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Tới các nhóm thích hợp (thường là ứng dụng của Quỹ> Tài sản ngắn hạn> Tài khoản ngân hàng và tạo một tài khoản mới (bằng cách nhấn vào Add Child) của loại "Ngân hàng"
 DocType: Workstation,Electricity Cost,Chi phí điện
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Tr
 DocType: SMS Center,All Lead (Open),Tất cả chì (Open)
 DocType: Purchase Invoice,Get Advances Paid,Được trả tiền trước
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Hình ảnh đính kèm của bạn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,Làm
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Làm
 DocType: Journal Entry,Total Amount in Words,Tổng số tiền trong từ
 DocType: Workflow State,Stop,dừng lại
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Có một lỗi. Một lý do có thể xảy ra có thể là bạn đã không được lưu dưới dạng. Vui lòng liên hệ support@erpnext.com nếu vấn đề vẫn tồn tại.
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,Đóng gói trượt mục
 DocType: POS Profile,Cash/Bank Account,Tài khoản tiền mặt / Ngân hàng
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Các mục gỡ bỏ không có thay đổi về số lượng hoặc giá trị.
 DocType: Delivery Note,Delivery To,Để giao hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
 DocType: Production Planning Tool,Get Sales Orders,Nhận hàng đơn đặt hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} không bị âm
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Nộp hồ sơ
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',Sẽ chỉ đư
 DocType: Project,Internal,Nội bộ
 DocType: Task,Urgent,Khẩn cấp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Hãy xác định một ID Row hợp lệ cho {0} hàng trong bảng {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Tới Desktop và bắt đầu sử dụng ERPNext
 DocType: Item,Manufacturer,Nhà sản xuất
 DocType: Landed Cost Item,Purchase Receipt Item,Mua hóa đơn hàng
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Kho dự trữ trong bán hàng đặt hàng / Chế Hàng Kho
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Số tiền bán
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Thời gian Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bạn là người phê duyệt chi phí cho hồ sơ này. Xin vui lòng cập nhật 'Trạng thái' và tiết kiệm
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bạn là người phê duyệt chi phí cho hồ sơ này. Xin vui lòng cập nhật 'Trạng thái' và tiết kiệm
 DocType: Serial No,Creation Document No,Tạo ra văn bản số
 DocType: Issue,Issue,Nội dung:
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Các thuộc tính cho khoản biến thể. ví dụ như kích cỡ, màu sắc, vv"
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,Chống lại
 DocType: Item,Default Selling Cost Center,Trung tâm Chi phí bán hàng mặc định
 DocType: Sales Partner,Implementation Partner,Đối tác thực hiện
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Bán hàng Đặt hàng {0} {1}
 DocType: Opportunity,Contact Info,Thông tin liên lạc
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,Làm Cổ Entries
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Làm Cổ Entries
 DocType: Packing Slip,Net Weight UOM,Trọng lượng UOM
 DocType: Item,Default Supplier,Nhà cung cấp mặc định
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Trong sản xuất Allowance Tỷ
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Nhận Tuần Tắt Ngày
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Ngày kết thúc không thể nhỏ hơn Bắt đầu ngày
 DocType: Sales Person,Select company name first.,Chọn tên công ty đầu tiên.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,Tiến sĩ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Tiến sĩ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Trích dẫn nhận được từ nhà cung cấp.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Để {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,cập nhật thông qua Thời gian Logs
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Số đăng ký công ty để bạn tham khảo. Số thuế vv
 DocType: Sales Partner,Distributor,Nhà phân phối
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Đặt hàng sản xuất {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Đặt hàng sản xuất {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 ,Ordered Items To Be Billed,Ra lệnh tiêu được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Từ Phạm vi có thể ít hơn Để Phạm vi
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Chọn Thời gian Logs và Submit để tạo ra một hóa đơn bán hàng mới.
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Thuế v
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Phải trả
 DocType: Account,Warehouse,Web App Ghi chú
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Bị từ chối Số lượng không thể được nhập vào Mua Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Bị từ chối Số lượng không thể được nhập vào Mua Return
 ,Purchase Order Items To Be Billed,Tìm mua hàng được lập hoá đơn
 DocType: Purchase Invoice Item,Net Rate,Tỷ Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Hóa đơn mua hàng
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Chi tiết Thanh to
 DocType: Global Defaults,Current Fiscal Year,Năm tài chính hiện tại
 DocType: Global Defaults,Disable Rounded Total,Vô hiệu hóa Tròn Tổng số
 DocType: Lead,Call,Cuộc gọi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,'Entries' không thể để trống
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entries' không thể để trống
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Hàng trùng lặp {0} với cùng {1}
 ,Trial Balance,Xét xử dư
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,Thiết lập Nhân viên
-sites/assets/js/erpnext.min.js +5,"Grid ""","Lưới """
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Thiết lập Nhân viên
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Lưới """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vui lòng chọn tiền tố đầu tiên
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Nghiên cứu
 DocType: Maintenance Visit Purpose,Work Done,Xong công việc
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,Đã gửi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Xem Ledger
 DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
 DocType: Communication,Delivery Status,Tình trạng giao
 DocType: Production Order,Manufacture against Sales Order,Sản xuất với bán hàng đặt hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,Phần còn lại của Thế giới
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Phần còn lại của Thế giới
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} không thể có hàng loạt
 ,Budget Variance Report,Báo cáo ngân sách phương sai
 DocType: Salary Slip,Gross Pay,Tổng phải trả tiền
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Cổ tức trả tiền
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Kế toán Ledger
 DocType: Stock Reconciliation,Difference Amount,Chênh lệch Số tiền
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Thu nhập giữ lại
 DocType: BOM Item,Item Description,Mô tả hạng mục
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,Cơ hội mục
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Mở cửa tạm thời
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Để lại cân nhân viên
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Cân bằng cho Tài khoản {0} luôn luôn phải có {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Cân bằng cho Tài khoản {0} luôn luôn phải có {1}
 DocType: Address,Address Type,Địa chỉ Loại
 DocType: Purchase Receipt,Rejected Warehouse,Kho từ chối
 DocType: GL Entry,Against Voucher,Chống lại Voucher
 DocType: Item,Default Buying Cost Center,Mặc định Trung tâm Chi phí mua
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Để tận dụng tốt nhất của ERPNext, chúng tôi khuyên bạn mất một thời gian và xem những đoạn phim được giúp đỡ."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Mục {0} phải bán hàng
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,đến
 DocType: Item,Lead Time in days,Thời gian đầu trong ngày
 ,Accounts Payable Summary,Tóm tắt các tài khoản phải trả
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Không được phép chỉnh sửa tài khoản đông lạnh {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Không được phép chỉnh sửa tài khoản đông lạnh {0}
 DocType: Journal Entry,Get Outstanding Invoices,Được nổi bật Hoá đơn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Bán hàng đặt hàng {0} không hợp lệ
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,Nơi cấp
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,hợp đồng
 DocType: Report,Disabled,Đã tắt
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},Yếu tố cần thiết cho coversion UOM UOM: {0} trong Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Yếu tố cần thiết cho coversion UOM UOM: {0} trong Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Chi phí gián tiếp
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Hàng {0}: Số lượng là bắt buộc
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Nông nghiệp
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,Hình thức thanh toán
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Đây là một nhóm mục gốc và không thể được chỉnh sửa.
 DocType: Journal Entry Account,Purchase Order,Mua hàng
 DocType: Warehouse,Warehouse Contact Info,Kho Thông tin liên lạc
-sites/assets/js/form.min.js +190,Name is required,{0} không thể mua được bằng Giỏ hàng
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,{0} không thể mua được bằng Giỏ hàng
 DocType: Purchase Invoice,Recurring Type,Định kỳ Loại
 DocType: Address,City/Town,Thành phố / thị xã
 DocType: Email Digest,Annual Income,Thu nhập hàng năm
 DocType: Serial No,Serial No Details,Không có chi tiết nối tiếp
 DocType: Purchase Invoice Item,Item Tax Rate,Mục Thuế suất
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry","Đối với {0}, tài khoản tín dụng chỉ có thể được liên kết chống lại mục nợ khác"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Đối với {0}, tài khoản tín dụng chỉ có thể được liên kết chống lại mục nợ khác"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Mục {0} phải là một mục phụ ký hợp đồng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Thiết bị vốn
@@ -1127,14 +1135,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Mục tiêu
 DocType: Sales Invoice Item,Edit Description,Chỉnh sửa Mô tả
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Dự kiến ​​giao hàng ngày là ít hơn so với Planned Ngày bắt đầu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,Cho Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Cho Nhà cung cấp
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Loại Cài đặt Tài khoản giúp trong việc lựa chọn tài khoản này trong các giao dịch.
 DocType: Purchase Invoice,Grand Total (Company Currency),Tổng cộng (Công ty tiền tệ)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Tổng số Outgoing
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Chỉ có thể có một vận chuyển Quy tắc Điều kiện với 0 hoặc giá trị trống cho ""Để giá trị gia tăng"""
 DocType: Authorization Rule,Transaction,cô lập Giao dịch
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Lưu ý: Trung tâm Chi phí này là một nhóm. Không thể thực hiện ghi sổ kế toán chống lại các nhóm.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Công cụ
+apps/frappe/frappe/config/desk.py +7,Tools,Công cụ
 DocType: Item,Website Item Groups,Trang web mục Groups
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Số thứ tự sản xuất là bắt buộc đối với sản xuất mục đích nhập cảnh chứng khoán
 DocType: Purchase Invoice,Total (Company Currency),Tổng số (Công ty tiền tệ)
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,Tên máy trạm
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},{0} BOM không thuộc khoản {1}
 DocType: Sales Partner,Target Distribution,Phân phối mục tiêu
-sites/assets/js/desk.min.js +7652,Comments,Thẻ chú thích
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Thẻ chú thích
 DocType: Salary Slip,Bank Account No.,Tài khoản ngân hàng số
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Đây là số lượng các giao dịch tạo ra cuối cùng với tiền tố này
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Tỷ lệ đánh giá cần thiết cho mục {0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Hãy lựa c
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Để lại đặc quyền
 DocType: Purchase Invoice,Supplier Invoice Date,Nhà cung cấp hóa đơn ngày
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Bạn cần phải kích hoạt Giỏ hàng
-sites/assets/js/form.min.js +212,No Data,Không có dữ liệu
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Không có dữ liệu
 DocType: Appraisal Template Goal,Appraisal Template Goal,Thẩm định mẫu Mục tiêu
 DocType: Salary Slip,Earning,Thu nhập
 DocType: Payment Tool,Party Account Currency,Đảng Tài khoản ngoại tệ
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,Đảng Tài khoản ngoại tệ
 DocType: Purchase Taxes and Charges,Add or Deduct,Thêm hoặc Khấu trừ
 DocType: Company,If Yearly Budget Exceeded (for expense account),Nếu ngân sách hàng năm Vượt quá (đối với tài khoản chi phí)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Điều kiện chồng chéo tìm thấy giữa:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Chống Journal nhập {0} đã được điều chỉnh đối với một số chứng từ khác
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Chống Journal nhập {0} đã được điều chỉnh đối với một số chứng từ khác
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Tổng giá trị theo thứ tự
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Thực phẩm
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Phạm vi Ageing 3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,Không có các chuyến thăm
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Các bản tin để liên lạc, dẫn."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Đồng tiền của tài khoản bế phải là {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum điểm cho tất cả các mục tiêu phải 100. Nó là {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Hoạt động không thể được bỏ trống.
 ,Delivered Items To Be Billed,Chỉ tiêu giao được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Kho không thể thay đổi cho Serial số
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},Tình trạng cập nhật {0}
 DocType: DocField,Description,Mô tả
 DocType: Authorization Rule,Average Discount,Giảm giá trung bình
 DocType: Letter Head,Is Default,Mặc định là
@@ -1207,7 +1215,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,Số tiền hàng Thuế
 DocType: Item,Maintain Stock,Duy trì Cổ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Cổ Entries đã tạo ra cho sản xuất theo thứ tự
 DocType: Leave Control Panel,Leave blank if considered for all designations,Để trống nếu xem xét tất cả các chỉ định
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Từ Datetime
 DocType: Email Digest,For Company,Đối với công ty
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,Địa chỉ Shipping Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Danh mục tài khoản
 DocType: Material Request,Terms and Conditions Content,Điều khoản và Điều kiện nội dung
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
 DocType: Maintenance Visit,Unscheduled,Đột xuất
 DocType: Employee,Owned,Sở hữu
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Phụ thuộc vào Leave Nếu không phải trả tiền
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,Bảo hành / AMC trạng
 DocType: GL Entry,GL Entry,GL nhập
 DocType: HR Settings,Employee Settings,Thiết lập nhân viên
 ,Batch-Wise Balance History,Lô-Wise cân Lịch sử
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,Để làm Danh sách
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Để làm Danh sách
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Người học việc
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Số lượng tiêu cực không được phép
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1263,13 +1271,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Thuê văn phòng
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Cài đặt thiết lập cổng SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Nhập khẩu thất bại!
-sites/assets/js/erpnext.min.js +24,No address added yet.,Không có địa chỉ nào được bổ sung.
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Không có địa chỉ nào được bổ sung.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Giờ làm việc
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Chuyên viên phân tích
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng số tiền JV {2}
 DocType: Item,Inventory,Hàng tồn kho
 DocType: Features Setup,"To enable ""Point of Sale"" view",Để kích hoạt tính năng "Point of Sale" view
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,Thanh toán không thể được thực hiện cho hàng trống
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Thanh toán không thể được thực hiện cho hàng trống
 DocType: Item,Sales Details,Thông tin chi tiết bán hàng
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Ghim
 DocType: Opportunity,With Items,Với mục
@@ -1279,7 +1287,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ","Ngày, tháng, hóa đơn tiếp theo sẽ được tạo ra. Nó được tạo ra trên trình."
 DocType: Item Attribute,Item Attribute,Mục Attribute
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Chính phủ.
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,Mục Biến thể
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,Mục Biến thể
 DocType: Company,Services,Dịch vụ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Tổng số ({0})
 DocType: Cost Center,Parent Cost Center,Trung tâm Chi phí cha mẹ
@@ -1289,11 +1297,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Năm tài chính bắt đầu ngày
 DocType: Employee External Work History,Total Experience,Tổng số kinh nghiệm
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vận tải hàng hóa và chuyển tiếp phí
 DocType: Material Request Item,Sales Order No,Không bán hàng đặt hàng
 DocType: Item Group,Item Group Name,Mục Group Name
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Lấy
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Lấy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Chuyển Vật liệu cho sản xuất
 DocType: Pricing Rule,For Price List,Đối với Bảng giá
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Điều hành Tìm kiếm
@@ -1302,8 +1310,7 @@ DocType: Maintenance Schedule,Schedules,Lịch
 DocType: Purchase Invoice Item,Net Amount,Số tiền Net
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM chi tiết Không
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Thêm GIẢM Số tiền (Công ty tiền tệ)
-DocType: Period Closing Voucher,CoA Help,CoA Trợ giúp
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},Lỗi: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Lỗi: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Xin vui lòng tạo tài khoản mới từ mục tài khoản.
 DocType: Maintenance Visit,Maintenance Visit,Bảo trì đăng nhập
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Khách hàng> Nhóm khách hàng> Lãnh thổ
@@ -1314,6 +1321,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,Chi phí hạ cánh giúp
 DocType: Event,Tuesday,Thứ ba
 DocType: Leave Block List,Block Holidays on important days.,Khối Holidays vào những ngày quan trọng.
 ,Accounts Receivable Summary,Tóm tắt các tài khoản phải thu
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Giữ cho loại {0} đã được phân bổ cho {1} Employee cho kỳ {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Hãy thiết lập trường ID người dùng trong một hồ sơ nhân viên để thiết lập nhân viên Role
 DocType: UOM,UOM Name,Tên UOM
 DocType: Top Bar Item,Target,File thiết kế nguồn
@@ -1334,19 +1342,19 @@ DocType: Sales Partner,Sales Partner Target,Đối tác bán hàng mục tiêu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Nhập kế toán cho {0} chỉ có thể được thực hiện bằng tiền tệ: {1}
 DocType: Pricing Rule,Pricing Rule,Quy tắc định giá
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,Yêu cầu vật chất để mua hàng
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Yêu cầu vật chất để mua hàng
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: trả lại hàng {1} không tồn tại trong {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Tài khoản ngân hàng
 ,Bank Reconciliation Statement,Trữ ngân hàng hòa giải
 DocType: Address,Lead Name,Tên dẫn
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Mở Balance Cổ
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Mở Balance Cổ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} phải chỉ xuất hiện một lần
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Không được phép để tuyền hơn {0} {1} hơn so với mua hàng {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Lá được phân bổ thành công cho {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Lá được phân bổ thành công cho {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Không có mục để đóng gói
 DocType: Shipping Rule Condition,From Value,Từ giá trị gia tăng
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Số lượng sản xuất là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Số lượng sản xuất là bắt buộc
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Số đã không được phản ánh trong ngân hàng
 DocType: Quality Inspection Reading,Reading 4,Đọc 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Tuyên bố cho chi phí công ty.
@@ -1359,19 +1367,20 @@ DocType: Opportunity,Contact Mobile No,Liên hệ điện thoại di động Kh
 DocType: Production Planning Tool,Select Sales Orders,Chọn hàng đơn đặt hàng
 ,Material Requests for which Supplier Quotations are not created,Các yêu cầu vật chất mà Trích dẫn Nhà cung cấp không được tạo ra
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Để theo dõi các mục sử dụng mã vạch. Bạn sẽ có thể nhập vào các mục trong giao hàng và hóa đơn bán hàng Lưu ý bằng cách quét mã vạch của sản phẩm.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Đánh dấu như Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Hãy báo giá
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Nghỉ phép loại {0} không thể dài hơn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Nghỉ phép loại {0} không thể dài hơn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Hãy thử lên kế hoạch hoạt động cho ngày X trước.
 DocType: HR Settings,Stop Birthday Reminders,Ngừng sinh Nhắc nhở
 DocType: SMS Center,Receiver List,Danh sách người nhận
 DocType: Payment Tool Detail,Payment Amount,Số tiền thanh toán
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Số tiền được tiêu thụ
-sites/assets/js/erpnext.min.js +51,{0} View,{0} Xem
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Xem
 DocType: Salary Structure Deduction,Salary Structure Deduction,Cơ cấu tiền lương trích
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selective thiêu kết bằng laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Nhập khẩu thành công!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Chi phí của Items Ban hành
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
@@ -1392,7 +1401,7 @@ DocType: Company,Default Payable Account,Mặc định Account Payable
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Cài đặt cho các giỏ hàng mua sắm trực tuyến chẳng hạn như các quy tắc vận chuyển, bảng giá, vv"
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,การติดตั้งเสร็จสมบูรณ์
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Được xem
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,Số lượng dự trữ
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Số lượng dự trữ
 DocType: Party Account,Party Account,Tài khoản của bên
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Nhân sự
 DocType: Lead,Upper Income,Thu nhập trên
@@ -1435,11 +1444,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,Kích hoạt Giỏ hàng
 DocType: Employee,Permanent Address,Địa chỉ thường trú
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Mục {0} phải là một dịch vụ Item.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance thanh toán đối với {0} {1} không thể lớn \ hơn Tổng cộng {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vui lòng chọn mã hàng
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Giảm Trích Để lại Nếu không phải trả tiền (LWP)
 DocType: Territory,Territory Manager,Quản lý lãnh thổ
+DocType: Delivery Note Item,To Warehouse (Optional),Để Warehouse (Tùy chọn)
 DocType: Sales Invoice,Paid Amount (Company Currency),Số tiền thanh toán (Công ty tiền tệ)
 DocType: Purchase Invoice,Additional Discount,Giảm thêm
 DocType: Selling Settings,Selling Settings,Bán thiết lập
@@ -1462,7 +1472,7 @@ DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Khai thác mỏ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Đúc nhựa
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Một Nhóm khách hàng tồn tại với cùng một tên xin thay đổi tên khách hàng hoặc đổi tên nhóm khách hàng
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,Vui lòng chọn {0} đầu tiên.
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vui lòng chọn {0} đầu tiên.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Lãnh thổ cha mẹ
 DocType: Quality Inspection Reading,Reading 2,Đọc 2
@@ -1490,11 +1500,11 @@ DocType: Sales Invoice Item,Batch No,Không có hàng loạt
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Cho phép nhiều đơn đặt hàng bán hàng chống Purchase Order của khách hàng
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Chính
 DocType: DocPerm,Delete,Xóa
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Biến thể
-sites/assets/js/desk.min.js +7971,New {0},Mới {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Biến thể
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Mới {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Thiết lập tiền tố cho đánh số hàng loạt các giao dịch của bạn
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,Để dừng lại không thể bị hủy bỏ. Tháo nút để hủy bỏ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Để dừng lại không thể bị hủy bỏ. Tháo nút để hủy bỏ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
 DocType: Employee,Leave Encashed?,Để lại Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Cơ hội Từ trường là bắt buộc
 DocType: Item,Variants,Biến thể
@@ -1512,7 +1522,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,Tại
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Địa chỉ
 DocType: Communication,Received,Nhận được
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,Chống Journal nhập {0} không có bất kỳ chưa từng có {1} nhập
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Chống Journal nhập {0} không có bất kỳ chưa từng có {1} nhập
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Trùng lặp Serial No nhập cho hàng {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Một điều kiện cho một Rule Vận Chuyển
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item không được phép có thứ tự sản xuất.
@@ -1533,7 +1543,6 @@ DocType: Employee,Salutation,Sự chào
 DocType: Communication,Rejected,Từ chối
 DocType: Pricing Rule,Brand,Thương Hiệu
 DocType: Item,Will also apply for variants,Cũng sẽ được áp dụng cho các biến thể
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,Giao%
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bó các mặt hàng tại thời điểm bán.
 DocType: Sales Order Item,Actual Qty,Số lượng thực tế
 DocType: Sales Invoice Item,References,Tài liệu tham khảo
@@ -1571,14 +1580,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,L
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Sự xén lông trừu
 DocType: Item,Has Variants,Có biến thể
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Bấm vào nút ""Thực hiện kinh doanh Hoá đơn 'để tạo ra một hóa đơn bán hàng mới."
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Từ giai đoạn và giai đoạn Để ngày bắt buộc cho kỳ% s
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Đóng gói và ghi nhãn
 DocType: Monthly Distribution,Name of the Monthly Distribution,Tên của phân phối hàng tháng
 DocType: Sales Person,Parent Sales Person,Người bán hàng mẹ
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Vui lòng chỉ định ngoại tệ tại Công ty Thạc sĩ và mặc định toàn cầu
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox truy cập bí mật
 DocType: Purchase Invoice,Recurring Invoice,Hóa đơn định kỳ
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,Quản lý dự án
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Quản lý dự án
 DocType: Supplier,Supplier of Goods or Services.,Nhà cung cấp hàng hóa hoặc dịch vụ.
 DocType: Budget Detail,Fiscal Year,Năm tài chính
 DocType: Cost Center,Budget,Ngân sách
@@ -1607,11 +1615,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,Bán hàng
 DocType: Employee,Salary Information,Thông tin tiền lương
 DocType: Sales Person,Name and Employee ID,Tên và nhân viên ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,Do ngày không thể trước khi viết bài ngày
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Do ngày không thể trước khi viết bài ngày
 DocType: Website Item Group,Website Item Group,Trang web mục Nhóm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Nhiệm vụ và thuế
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,Vui lòng nhập ngày tham khảo
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0} mục thanh toán không thể được lọc bởi {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vui lòng nhập ngày tham khảo
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} mục thanh toán không thể được lọc bởi {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Bảng cho khoản đó sẽ được hiển thị trong trang Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Đã cung cấp Số lượng
 DocType: Material Request Item,Material Request Item,Tài liệu Yêu cầu mục
@@ -1619,7 +1627,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Cây khoản Grou
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Không có thể tham khảo số lượng hàng lớn hơn hoặc bằng số lượng hàng hiện tại cho loại phí này
 ,Item-wise Purchase History,Item-khôn ngoan Lịch sử mua hàng
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Đỏ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vui lòng click vào 'Tạo Lịch trình' để lấy Serial No bổ sung cho hàng {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vui lòng click vào 'Tạo Lịch trình' để lấy Serial No bổ sung cho hàng {0}
 DocType: Account,Frozen,Đông lạnh
 ,Open Production Orders,Đơn đặt hàng mở sản xuất
 DocType: Installation Note,Installation Time,Thời gian cài đặt
@@ -1663,13 +1671,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,Xu hướng báo giá
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Nhóm mục không được đề cập trong mục tổng thể cho mục {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.","Như sản xuất hàng có thể được thực hiện cho mặt hàng này, nó phải là một mục chứng khoán."
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Như sản xuất hàng có thể được thực hiện cho mặt hàng này, nó phải là một mục chứng khoán."
 DocType: Shipping Rule Condition,Shipping Amount,Số tiền vận chuyển
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Tham gia
 DocType: Authorization Rule,Above Value,Trên giá trị gia tăng
 ,Pending Amount,Số tiền cấp phát
 DocType: Purchase Invoice Item,Conversion Factor,Yếu tố chuyển đổi
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,"Nếu được chỉ định, gửi các bản tin sử dụng địa chỉ email này"
+DocType: Purchase Order,Delivered,"Nếu được chỉ định, gửi các bản tin sử dụng địa chỉ email này"
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Thiết lập máy chủ đến cho công việc email id. (Ví dụ như jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Số xe
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Ngày mà hóa đơn định kỳ sẽ được dừng lại
@@ -1686,10 +1694,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,Phân phối Phí Dựa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Tài khoản {0} phải là loại 'tài sản cố định ""như mục {1} là một khoản tài sản"
 DocType: HR Settings,HR Settings,Thiết lập nhân sự
 apps/frappe/frappe/config/setup.py +130,Printing,In ấn
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,Chi phí bồi thường đang chờ phê duyệt. Chỉ phê duyệt chi phí có thể cập nhật trạng thái.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Chi phí bồi thường đang chờ phê duyệt. Chỉ phê duyệt chi phí có thể cập nhật trạng thái.
 DocType: Purchase Invoice,Additional Discount Amount,Thêm GIẢM Số tiền
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Ngày (s) mà bạn đang nộp đơn xin nghỉ là nghỉ. Bạn không cần phải nộp đơn xin nghỉ phép.
-sites/assets/js/desk.min.js +7805,and,và
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,và
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại Block List phép
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr không thể để trống hoặc không gian
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Thể thao
@@ -1726,7 +1734,6 @@ DocType: Opportunity,Quotation,Báo giá
 DocType: Salary Slip,Total Deduction,Tổng số trích
 DocType: Quotation,Maintenance User,Bảo trì tài khoản
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Chi phí cập nhật
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,Bạn có chắc chắn bạn muốn tháo nút
 DocType: Employee,Date of Birth,Ngày sinh
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Mục {0} đã được trả lại
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ** Năm tài chính đại diện cho một năm tài chính. Tất cả các bút toán và giao dịch lớn khác đang theo dõi chống lại năm tài chính ** **.
@@ -1742,13 +1749,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Giữ Theo dõi của Sales Chiến dịch. Theo dõi các Leads, Báo giá, bán hàng đặt hàng vv từ Chiến dịch để đánh giá lợi nhuận trên đầu tư. "
 DocType: Expense Claim,Approver,Người Xét Duyệt
 ,SO Qty,Số lượng SO
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Mục chứng khoán tồn tại đối với kho {0}, do đó bạn có thể không giao lại hoặc sửa đổi kho"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Mục chứng khoán tồn tại đối với kho {0}, do đó bạn có thể không giao lại hoặc sửa đổi kho"
 DocType: Appraisal,Calculate Total Score,Tổng số điểm tính toán
 DocType: Supplier Quotation,Manufacturing Manager,Sản xuất Quản lý
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Không nối tiếp {0} được bảo hành tối đa {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Giao hàng tận nơi chia Lưu ý thành các gói.
 apps/erpnext/erpnext/hooks.py +84,Shipments,Lô hàng
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Đúc Dip
+DocType: Purchase Order,To be delivered to customer,Sẽ được chuyển giao cho khách hàng
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Giờ trạng phải Đăng.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,{0} nối tiếp Không không thuộc về bất kỳ kho
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Thiết lập
@@ -1773,11 +1781,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,Từ tệ
 DocType: DocField,Name,Tên
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vui lòng chọn Số tiền phân bổ, Loại hóa đơn và hóa đơn số trong ít nhất một hàng"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},Đặt hàng bán hàng cần thiết cho mục {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Đặt hàng bán hàng cần thiết cho mục {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Số đã không được phản ánh trong hệ thống
 DocType: Purchase Invoice Item,Rate (Company Currency),Tỷ lệ (Công ty tiền tệ)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Các thông tin khác
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Đặt làm Ngưng
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Không thể tìm thấy một kết hợp Item. Hãy chọn một vài giá trị khác cho {0}.
 DocType: POS Profile,Taxes and Charges,Thuế và lệ phí
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Một sản phẩm hay một dịch vụ được mua, bán hoặc lưu giữ trong kho."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Không có thể chọn loại phí như 'Mở hàng trước Số tiền' hoặc 'On Trước Row Tổng số' cho hàng đầu tiên
@@ -1786,19 +1794,20 @@ DocType: Web Form,Select DocType,Chọn DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Chuốt
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Ngân hàng
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Vui lòng click vào 'Tạo Lịch trình' để có được lịch trình
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,Trung tâm Chi phí mới
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Trung tâm Chi phí mới
 DocType: Bin,Ordered Quantity,Số lượng đặt hàng
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","ví dụ như ""Xây dựng các công cụ cho các nhà xây dựng """
 DocType: Quality Inspection,In Process,Trong quá trình
 DocType: Authorization Rule,Itemwise Discount,Itemwise Giảm giá
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0} với Sales Order {1}
+DocType: Purchase Order Item,Reference Document Type,Tài liệu tham chiếu Type
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} với Sales Order {1}
 DocType: Account,Fixed Asset,Tài sản cố định
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,Hàng tồn kho được tuần tự
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Hàng tồn kho được tuần tự
 DocType: Activity Type,Default Billing Rate,Mặc định Thanh toán Rate
 DocType: Time Log Batch,Total Billing Amount,Tổng số tiền Thanh toán
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tài khoản phải thu
 ,Stock Balance,Số dư chứng khoán
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,Đặt hàng bán hàng để thanh toán
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Đặt hàng bán hàng để thanh toán
 DocType: Expense Claim Detail,Expense Claim Detail,Chi phí bồi thường chi tiết
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Thời gian Logs tạo:
 DocType: Item,Weight UOM,Trọng lượng UOM
@@ -1834,10 +1843,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Để tín dụng tài khoản phải có một tài khoản phải trả
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},"BOM đệ quy: {0} không thể là cha mẹ, con của {2}"
 DocType: Production Order Operation,Completed Qty,Số lượng hoàn thành
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry","Đối với {0}, chỉ tài khoản ghi nợ có thể được liên kết chống lại mục tín dụng khác"
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Đối với {0}, chỉ tài khoản ghi nợ có thể được liên kết chống lại mục tín dụng khác"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
 DocType: Manufacturing Settings,Allow Overtime,Cho phép làm việc ngoài giờ
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,Bán hàng đặt hàng {0} là dừng lại
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} số Serial yêu cầu cho khoản {1}. Bạn đã cung cấp {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Hiện tại Rate Định giá
 DocType: Item,Customer Item Codes,Khách hàng mục Codes
@@ -1846,9 +1854,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Sự hàn
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Mới Cổ UOM được yêu cầu
 DocType: Quality Inspection,Sample Size,Kích thước mẫu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vui lòng xác định hợp lệ ""Từ trường hợp số '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,Trung tâm chi phí có thể tiếp tục được thực hiện theo nhóm nhưng mục có thể được thực hiện đối với phi Groups
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Trung tâm chi phí có thể tiếp tục được thực hiện theo nhóm nhưng mục có thể được thực hiện đối với phi Groups
 DocType: Project,External,Bên ngoài
 DocType: Features Setup,Item Serial Nos,Mục nối tiếp Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Người sử dụng và Quyền
@@ -1875,7 +1883,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,N
 DocType: Sales Partner,Address & Contacts,Địa chỉ & Liên hệ
 DocType: SMS Log,Sender Name,Tên người gửi
 DocType: Page,Title,Tiêu đề
-sites/assets/js/list.min.js +104,Customize,Tuỳ chỉnh
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Tuỳ chỉnh
 DocType: POS Profile,[Select],[Chọn]
 DocType: SMS Log,Sent To,Gửi Đến
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Làm Mua hàng
@@ -1900,12 +1908,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,Kết thúc của cuộc sống
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Du lịch
 DocType: Leave Block List,Allow Users,Cho phép người sử dụng
+DocType: Purchase Order,Customer Mobile No,Khách hàng Điện thoại di động Không
 DocType: Sales Invoice,Recurring,Định kỳ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Theo dõi thu nhập và chi phí riêng cho ngành dọc sản phẩm hoặc bộ phận.
 DocType: Rename Tool,Rename Tool,Công cụ đổi tên
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Cập nhật giá
 DocType: Item Reorder,Item Reorder,Mục Sắp xếp lại
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,Vật liệu chuyển
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Vật liệu chuyển
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Xác định các hoạt động, chi phí vận hành và cung cấp cho một hoạt động độc đáo không để các hoạt động của bạn."
 DocType: Purchase Invoice,Price List Currency,Danh sách giá ngoại tệ
 DocType: Naming Series,User must always select,Người sử dụng phải luôn luôn chọn
@@ -1928,7 +1937,7 @@ DocType: Appraisal,Employee,Nhân viên
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Nhập Email Từ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Mời như tài
 DocType: Features Setup,After Sale Installations,Sau khi gia lắp đặt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1} được quảng cáo đầy đủ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} được quảng cáo đầy đủ
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Điều khoản hợp đồng tiêu chuẩn cho bán hàng hoặc mua hàng.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Nhóm theo Phiếu
@@ -1937,8 +1946,9 @@ DocType: Sales Invoice,Mass Mailing,Gửi thư hàng loạt
 DocType: Page,Standard,Tiêu chuẩn
 DocType: Rename Tool,File to Rename,File để Đổi tên
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Số thứ tự Purchse cần thiết cho mục {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Hiện Thanh toán
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Quy định BOM {0} không tồn tại cho mục {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Lịch trình bảo trì {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Lịch trình bảo trì {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Kích thước
 DocType: Notification Control,Expense Claim Approved,Chi phí bồi thường được phê duyệt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Dược phẩm
@@ -1957,8 +1967,8 @@ DocType: Upload Attendance,Attendance To Date,Tham gia Đến ngày
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Thiết lập máy chủ đến cho email bán hàng id. (Ví dụ như sales@example.com)
 DocType: Warranty Claim,Raised By,Nâng By
 DocType: Payment Tool,Payment Account,Tài khoản thanh toán
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
-sites/assets/js/list.min.js +23,Draft,Dự thảo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Dự thảo
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Đền bù Tắt
 DocType: Quality Inspection Reading,Accepted,Chấp nhận
 DocType: User,Female,Nữ
@@ -1971,14 +1981,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,Quy tắc vận chuyển Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
 DocType: Newsletter,Test,K.tra
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Như có những giao dịch chứng khoán hiện có cho mặt hàng này, \ bạn không thể thay đổi các giá trị của 'Có tiếp Serial No', 'Có hàng loạt No', 'Liệu Cổ Mã' và 'Phương pháp định giá'"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Tạp chí nhanh chóng nhập
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu HĐQT đã đề cập agianst bất kỳ mục nào
 DocType: Employee,Previous Work Experience,Kinh nghiệm làm việc trước đây
 DocType: Stock Entry,For Quantity,Đối với lượng
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Vui lòng nhập theo kế hoạch Số lượng cho hàng {0} tại hàng {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1} không nộp
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Yêu cầu cho các hạng mục.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} không nộp
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Yêu cầu cho các hạng mục.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Để sản xuất riêng biệt sẽ được tạo ra cho mỗi mục tốt đã hoàn thành.
 DocType: Purchase Invoice,Terms and Conditions1,Điều khoản và Conditions1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Hoàn thành cài đặt
@@ -1990,7 +2001,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bản tin danh s
 DocType: Delivery Note,Transporter Name,Tên vận chuyển
 DocType: Contact,Enter department to which this Contact belongs,Nhập bộ phận mà mối liên lạc này thuộc về
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Tổng số Vắng
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,Mục hoặc Kho cho hàng {0} không phù hợp với liệu Yêu cầu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Mục hoặc Kho cho hàng {0} không phù hợp với liệu Yêu cầu
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Đơn vị đo
 DocType: Fiscal Year,Year End Date,Ngày kết thúc năm
 DocType: Task Depends On,Task Depends On,Nhiệm vụ Phụ thuộc On
@@ -2016,7 +2027,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ngày kết thúc hợp đồng phải lớn hơn ngày của Tham gia
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Một nhà phân phối của bên thứ ba / đại lý / hoa hồng đại lý / chi nhánh / đại lý bán lẻ chuyên bán các sản phẩm công ty cho một hoa hồng.
 DocType: Customer Group,Has Child Node,Có Node trẻ em
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0} chống Mua hàng {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} chống Mua hàng {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Nhập các thông số url tĩnh ở đây (Ví dụ người gửi = ERPNext, tên người dùng = ERPNext, mật khẩu = 1234, vv)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} không có trong bất kỳ năm tài chính đang hoạt động. Để biết thêm chi tiết kiểm tra {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Đây là một trang web ví dụ tự động tạo ra từ ERPNext
@@ -2067,11 +2078,9 @@ DocType: Note,Note,Nốt nhạc
 DocType: Purchase Receipt Item,Recd Quantity,Recd Số lượng
 DocType: Email Account,Email Ids,Email Id
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Không thể sản xuất nhiều hàng {0} là số lượng bán hàng đặt hàng {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Đặt làm Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
 DocType: Payment Reconciliation,Bank / Cash Account,Tài khoản ngân hàng Tiền mặt /
 DocType: Tax Rule,Billing City,Thanh toán Thành phố
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Ứng dụng Để lại này đang chờ phê duyệt. Chỉ Leave Người phê duyệt có thể cập nhật trạng thái.
 DocType: Global Defaults,Hide Currency Symbol,Ẩn tệ Ký hiệu
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","ví dụ như Ngân hàng, tiền mặt, thẻ tín dụng"
 DocType: Journal Entry,Credit Note,Tín dụng Ghi chú
@@ -2092,7 +2101,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Tổng số (SL)
 DocType: Installation Note Item,Installed Qty,Số lượng cài đặt
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Đã lần gửi
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Đã lần gửi
 DocType: Salary Structure,Total Earning,Tổng số Lợi nhuận
 DocType: Purchase Receipt,Time at which materials were received,Thời gian mà các tài liệu đã nhận được
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Địa chỉ của tôi
@@ -2101,7 +2110,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Chủ chi nh
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,hoặc là
 DocType: Sales Order,Billing Status,Tình trạng thanh toán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Chi phí tiện ích
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90-Trên
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Trên
 DocType: Buying Settings,Default Buying Price List,Mặc định mua Bảng giá
 ,Download Backups,Tải Backups
 DocType: Notification Control,Sales Order Message,Thông báo bán hàng đặt hàng
@@ -2110,7 +2119,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,Chọn nhân viên
 DocType: Bank Reconciliation,To Date,Đến ngày
 DocType: Opportunity,Potential Sales Deal,Sales tiềm năng Deal
-sites/assets/js/form.min.js +308,Details,Chi tiết
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Chi tiết
 DocType: Purchase Invoice,Total Taxes and Charges,Tổng số thuế và lệ phí
 DocType: Employee,Emergency Contact,Trường hợp khẩn cấp Liên hệ
 DocType: Item,Quality Parameters,Chất lượng thông số
@@ -2125,7 +2134,7 @@ DocType: Purchase Order Item,Received Qty,Nhận được lượng
 DocType: Stock Entry Detail,Serial No / Batch,Không nối tiếp / hàng loạt
 DocType: Product Bundle,Parent Item,Cha mẹ mục
 DocType: Account,Account Type,Loại tài khoản
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Lịch trình bảo trì không được tạo ra cho tất cả các mục. Vui lòng click vào 'Tạo lịch'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Lịch trình bảo trì không được tạo ra cho tất cả các mục. Vui lòng click vào 'Tạo lịch'
 ,To Produce,Để sản xuất
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Đối với hàng {0} trong {1}. Để bao gồm {2} tỷ lệ Item, hàng {3} cũng phải được bao gồm"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Xác định các gói cho việc cung cấp (đối với in)
@@ -2136,7 +2145,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Làm lạt lẻo
 DocType: Account,Income Account,Tài khoản thu nhập
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,Giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Giao hàng
 DocType: Stock Reconciliation Item,Current Qty,Số lượng hiện tại
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Xem ""Tỷ lệ Of Vật liệu Dựa trên"" trong mục Chi phí"
 DocType: Appraisal Goal,Key Responsibility Area,Diện tích Trách nhiệm chính
@@ -2167,9 +2176,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Tất cả các địa chỉ.
 DocType: Company,Stock Settings,Thiết lập chứng khoán
 DocType: User,Bio,Sinh học
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sáp nhập là chỉ có thể nếu tính sau là như nhau trong cả hai hồ sơ. Là Group, Loại Root, Công ty"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sáp nhập là chỉ có thể nếu tính sau là như nhau trong cả hai hồ sơ. Là Group, Loại Root, Công ty"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Quản lý Nhóm khách hàng Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,Tên mới Trung tâm Chi phí
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Tên mới Trung tâm Chi phí
 DocType: Leave Control Panel,Leave Control Panel,Để lại Control Panel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Không mặc định Địa chỉ Template được tìm thấy. Hãy tạo một cái mới từ Setup> In ấn và xây dựng thương hiệu> Địa chỉ Template.
 DocType: Appraisal,HR User,Nhân tài
@@ -2188,24 +2197,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,Công cụ thanh toán chi tiết
 ,Sales Browser,Doanh số bán hàng của trình duyệt
 DocType: Journal Entry,Total Credit,Tổng số tín dụng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # Một {1} tồn tại với mục cổ phiếu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,địa phương
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # Một {1} tồn tại với mục cổ phiếu {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,địa phương
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Cho vay trước (tài sản)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Con nợ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Lớn
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Không có nhân viên tìm thấy!
 DocType: C-Form Invoice Detail,Territory,Lãnh thổ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Xin đề cập không có các yêu cầu thăm
+DocType: Purchase Order,Customer Address Display,Khách hàng Địa chỉ Display
 DocType: Stock Settings,Default Valuation Method,Phương pháp mặc định Định giá
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Đánh bóng
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Phân bổ
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Gần Cân đối kế toán và lợi nhuận cuốn sách hay mất.
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp vì \ bạn đã thực hiện một số giao dịch (s) với một ươm. Để thay đổi Ươm mặc định, \ sử dụng 'Ươm Thay Utility' công cụ theo mô-đun Cổ."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Xác định thị trường ngoại tệ để chuyển đổi một đồng tiền vào một
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Báo giá {0} bị hủy bỏ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Báo giá {0} bị hủy bỏ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Tổng số tiền nợ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Nhân viên {0} đã nghỉ trên {1}. Không thể đánh dấu tham dự.
 DocType: Sales Partner,Targets,Mục tiêu
@@ -2220,12 +2229,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Đây là một nhóm khách hàng gốc và không thể được chỉnh sửa.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Xin vui lòng thiết lập biểu đồ của bạn của tài khoản trước khi bạn bắt đầu kế toán Entries
 DocType: Purchase Invoice,Ignore Pricing Rule,Bỏ qua giá Rule
-sites/assets/js/list.min.js +24,Cancelled,Hủy
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Hủy
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Từ ngày ở Cơ cấu lương không thể thấp hơn so với nhân viên Tham gia ngày.
 DocType: Employee Education,Graduate,Sau đại học
 DocType: Leave Block List,Block Days,Khối ngày
 DocType: Journal Entry,Excise Entry,Thuế nhập
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Cảnh báo: Bán hàng Đặt hàng {0} đã tồn tại đối với mua hàng đặt hàng của khách hàng {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Cảnh báo: Bán hàng Đặt hàng {0} đã tồn tại đối với mua hàng đặt hàng của khách hàng {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2282,17 +2291,17 @@ DocType: Account,Stock Received But Not Billed,Chứng khoán nhận Nhưng Khô
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Tổng phải trả tiền + tiền còn thiếu Số tiền + séc Số tiền - Tổng số trích
 DocType: Monthly Distribution,Distribution Name,Tên phân phối
 DocType: Features Setup,Sales and Purchase,Bán hàng và mua hàng
-DocType: Purchase Order Item,Material Request No,Yêu cầu tài liệu Không
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},Kiểm tra chất lượng cần thiết cho mục {0}
+DocType: Supplier Quotation Item,Material Request No,Yêu cầu tài liệu Không
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kiểm tra chất lượng cần thiết cho mục {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tốc độ tiền tệ của khách hàng được chuyển đổi sang tiền tệ cơ bản của công ty
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} đã được hủy đăng ký thành từ danh sách này.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tỷ Net (Công ty tiền tệ)
-apps/frappe/frappe/templates/base.html +132,Added,Thêm
+apps/frappe/frappe/templates/base.html +134,Added,Thêm
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Quản lý Lãnh thổ Tree.
 DocType: Journal Entry Account,Sales Invoice,Hóa đơn bán hàng
 DocType: Journal Entry Account,Party Balance,Balance Đảng
 DocType: Sales Invoice Item,Time Log Batch,Giờ hàng loạt
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,Vui lòng chọn Apply Giảm Ngày
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vui lòng chọn Apply Giảm Ngày
 DocType: Company,Default Receivable Account,Mặc định Tài khoản phải thu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Tạo Ngân hàng xuất nhập cảnh để tổng tiền lương trả cho các tiêu chí lựa chọn ở trên
 DocType: Stock Entry,Material Transfer for Manufacture,Dẫn truyền Vật liệu cho sản xuất
@@ -2303,7 +2312,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,Được viết liên quan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Nhập kế toán cho Stock
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Đúc
 DocType: Sales Invoice,Sales Team1,Team1 bán hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,Mục {0} không tồn tại
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Mục {0} không tồn tại
 DocType: Sales Invoice,Customer Address,Địa chỉ khách hàng
 apps/frappe/frappe/desk/query_report.py +136,Total,Tổng sồ
 DocType: Purchase Invoice,Apply Additional Discount On,Áp dụng khác Giảm Ngày
@@ -2318,13 +2327,15 @@ DocType: Quality Inspection,Quality Inspection,Kiểm tra chất lượng
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Tắm nhỏ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Phun hình thành
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: Chất liệu được yêu cầu Số lượng ít hơn hàng tối thiểu Số lượng
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Tài khoản {0} được đông lạnh
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Tài khoản {0} được đông lạnh
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pháp nhân / Công ty con với một biểu đồ riêng của tài khoản thuộc Tổ chức.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Thực phẩm, đồ uống và thuốc lá"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL hoặc BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán đối với unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tỷ lệ hoa hồng không có thể lớn hơn 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Tối thiểu hàng tồn kho Cấp
 DocType: Stock Entry,Subcontract,Cho thầu lại
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Vui lòng nhập {0} đầu tiên
 DocType: Production Planning Tool,Get Items From Sales Orders,Được mục Từ hàng đơn đặt hàng
 DocType: Production Order Operation,Actual End Time,Thực tế End Time
 DocType: Production Planning Tool,Download Materials Required,Tải về Vật liệu yêu cầu
@@ -2341,9 +2352,9 @@ DocType: Maintenance Visit,Scheduled,Dự kiến
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Vui lòng chọn mục nơi "Là Cổ Item" là "Không" và "Có Sales Item" là "Có" và không có Bundle sản phẩm khác
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Chọn phân phối không đồng đều hàng tháng để phân phối các mục tiêu ở tháng.
 DocType: Purchase Invoice Item,Valuation Rate,Tỷ lệ định giá
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,Danh sách giá ngoại tệ không được chọn
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Danh sách giá ngoại tệ không được chọn
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Mục Row {0}: Mua Receipt {1} không tồn tại trên bảng 'Mua Biên lai'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Nhân viên {0} đã áp dụng cho {1} {2} giữa và {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Nhân viên {0} đã áp dụng cho {1} {2} giữa và {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Dự án Ngày bắt đầu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Cho đến khi
 DocType: Rename Tool,Rename Log,Đổi tên Đăng nhập
@@ -2370,13 +2381,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Chỉ các nút lá được cho phép trong giao dịch
 DocType: Expense Claim,Expense Approver,Người phê duyệt chi phí
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Mua hóa đơn hàng Cung cấp
-sites/assets/js/erpnext.min.js +48,Pay,Trả
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Trả
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Để Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs cho việc duy trì tình trạng giao hàng sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Nghiền
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink gói
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,Các hoạt động cấp phát
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Các hoạt động cấp phát
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Xác nhận
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Nhà cung cấp> Nhà cung cấp Loại
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vui lòng nhập ngày giảm.
@@ -2387,7 +2398,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Nh
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Các nhà xuất bản báo
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Chọn năm tài chính
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,Bạn là người phê duyệt Để lại cho hồ sơ này. Xin vui lòng cập nhật 'Trạng thái' và tiết kiệm
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Sắp xếp lại Cấp
 DocType: Attendance,Attendance Date,Tham gia
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lương chia tay dựa trên Lợi nhuận và khấu trừ.
@@ -2423,6 +2433,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Trung tâm chi phí với các giao dịch hiện có không thể chuyển đổi sang nhóm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Khấu hao
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Nhà cung cấp (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Thời gian không hợp lệ
 DocType: Customer,Credit Limit,Hạn chế tín dụng
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Chọn loại giao dịch
 DocType: GL Entry,Voucher No,Không chứng từ
@@ -2432,8 +2443,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,"Mẫ
 DocType: Customer,Address and Contact,Địa chỉ và liên hệ
 DocType: Customer,Last Day of the Next Month,Ngày cuối cùng của tháng kế tiếp
 DocType: Employee,Feedback,Thông tin phản hồi
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Lưu ý: Do / Reference ngày vượt quá cho phép ngày tín dụng của khách hàng bởi {0} ngày (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,Maint. Lịch trình
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Lưu ý: Do / Reference ngày vượt quá cho phép ngày tín dụng của khách hàng bởi {0} ngày (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Lịch trình
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Gia công máy bay phản lực mài mòn
 DocType: Stock Settings,Freeze Stock Entries,Đóng băng Cổ Entries
 DocType: Website Settings,Website Settings,Thiết lập trang web
@@ -2447,11 +2458,11 @@ DocType: Quality Inspection,Outgoing,Đi
 DocType: Material Request,Requested For,Đối với yêu cầu
 DocType: Quotation Item,Against Doctype,Chống lại DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Giao hàng tận nơi theo dõi này Lưu ý đối với bất kỳ dự án
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,Tài khoản gốc không thể bị xóa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Tài khoản gốc không thể bị xóa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Hiện Cổ Entries
 ,Is Primary Address,Là Tiểu học Địa chỉ
 DocType: Production Order,Work-in-Progress Warehouse,Làm việc-trong-Tiến kho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Quản lý địa chỉ
 DocType: Pricing Rule,Item Code,Mã hàng
 DocType: Production Planning Tool,Create Production Orders,Tạo đơn đặt hàng sản xuất
@@ -2460,14 +2471,14 @@ DocType: Journal Entry,User Remark,Người sử dụng Ghi chú
 DocType: Lead,Market Segment,Phân khúc thị trường
 DocType: Communication,Phone,Chuyển tệp
 DocType: Employee Internal Work History,Employee Internal Work History,Lịch sử nhân viên nội bộ làm việc
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),Đóng cửa (Tiến sĩ)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Đóng cửa (Tiến sĩ)
 DocType: Contact,Passive,Thụ động
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Không nối tiếp {0} không có trong kho
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Mẫu thuế cho các giao dịch bán.
 DocType: Sales Invoice,Write Off Outstanding Amount,Viết Tắt Số tiền nổi bật
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Kiểm tra xem bạn cần hóa đơn định kỳ tự động. Sau khi nộp bất kỳ hóa đơn bán hàng, phần định kỳ sẽ được hiển thị."
 DocType: Account,Accounts Manager,Quản lý tài khoản
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',Giờ {0} phải được 'Gửi'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Giờ {0} phải được 'Gửi'
 DocType: Stock Settings,Default Stock UOM,Mặc định Cổ UOM
 DocType: Time Log,Costing Rate based on Activity Type (per hour),Chi phí Tỷ giá dựa trên Loại hoạt động (mỗi giờ)
 DocType: Production Planning Tool,Create Material Requests,Các yêu cầu tạo ra vật liệu
@@ -2478,7 +2489,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,Ngân hàng hòa giải
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Nhận thông tin cập nhật
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Yêu cầu tài liệu {0} được huỷ bỏ hoặc dừng lại
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Thêm một vài biên bản lấy mẫu
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,Để quản lý
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Để quản lý
 DocType: Event,Groups,Nhóm
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Nhóm bởi tài khoản
 DocType: Sales Order,Fully Delivered,Giao đầy đủ
@@ -2490,11 +2501,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,Extras bán hàng
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ngân sách cho tài khoản {1} chống lại Trung tâm Chi phí {2} sẽ vượt quá bởi {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Mang lá chuyển tiếp
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ ngày' phải sau 'Đến ngày'
 ,Stock Projected Qty,Dự kiến cổ phiếu Số lượng
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
 DocType: Sales Order,Customer's Purchase Order,Mua hàng của khách hàng
 DocType: Warranty Claim,From Company,Từ Công ty
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Giá trị hoặc lượng
@@ -2507,13 +2517,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,Cửa hàng bán lẻ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Để tín dụng tài khoản phải có một tài khoản Cân đối kế toán
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Nhà cung cấp tất cả các loại
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,Mục Mã số là bắt buộc vì mục không tự động đánh số
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Báo giá {0} không loại {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Mục Mã số là bắt buộc vì mục không tự động đánh số
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Báo giá {0} không loại {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Lịch trình bảo trì hàng
 DocType: Sales Order,%  Delivered,% Giao
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Tài khoản thấu chi ngân hàng
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Làm cho lương trượt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,Tháo nút
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Duyệt BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Các khoản cho vay được bảo đảm
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Sản phẩm tuyệt vời
@@ -2523,7 +2532,7 @@ DocType: Appraisal,Appraisal,Thẩm định
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Đúc Lost-xốp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Vẽ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Ngày được lặp đi lặp lại
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Để phê duyệt phải là một trong {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Để phê duyệt phải là một trong {0}
 DocType: Hub Settings,Seller Email,Người bán Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Tổng Chi phí mua hàng (thông qua mua Invoice)
 DocType: Workstation Working Hour,Start Time,Thời gian bắt đầu
@@ -2537,8 +2546,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Số tiền Net (Công ty tiền tệ)
 DocType: BOM Operation,Hour Rate,Tỷ lệ giờ
 DocType: Stock Settings,Item Naming By,Mục đặt tên By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,Từ báo giá
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Thời gian đóng cửa khác nhập {0} đã được thực hiện sau khi {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Từ báo giá
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Thời gian đóng cửa khác nhập {0} đã được thực hiện sau khi {1}
 DocType: Production Order,Material Transferred for Manufacturing,Chất liệu được chuyển giao cho sản xuất
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Tài khoản của {0} không tồn tại
 DocType: Purchase Receipt Item,Purchase Order Item No,Mua hàng Mã
@@ -2551,11 +2560,11 @@ DocType: Item,Inspection Required,Kiểm tra yêu cầu
 DocType: Purchase Invoice Item,PR Detail,PR chi tiết
 DocType: Sales Order,Fully Billed,Được quảng cáo đầy đủ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Tiền mặt trong tay
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},Kho giao hàng yêu cầu cho mục cổ phiếu {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Kho giao hàng yêu cầu cho mục cổ phiếu {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Tổng trọng lượng của gói. Thường net trọng lượng đóng gói + trọng lượng vật liệu. (Đối với in)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Người sử dụng với vai trò này được phép thiết lập tài khoản phong toả và tạo / sửa đổi ghi sổ kế toán đối với tài khoản phong toả
 DocType: Serial No,Is Cancelled,Được hủy bỏ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,Lô hàng của tôi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Lô hàng của tôi
 DocType: Journal Entry,Bill Date,Hóa đơn ngày
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Ngay cả khi có nhiều quy giá với ưu tiên cao nhất, ưu tiên nội bộ sau đó sau được áp dụng:"
 DocType: Supplier,Supplier Details,Thông tin chi tiết nhà cung cấp
@@ -2568,7 +2577,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Chuyển khoản
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vui lòng chọn tài khoản ngân hàng
 DocType: Newsletter,Create and Send Newsletters,Tạo và Gửi Tin
-sites/assets/js/report.min.js +107,From Date must be before To Date,Từ ngày phải trước Đến ngày
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Từ ngày phải trước Đến ngày
 DocType: Sales Order,Recurring Order,Đặt hàng theo định kỳ
 DocType: Company,Default Income Account,Tài khoản thu nhập mặc định
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Nhóm khách hàng / khách hàng
@@ -2583,31 +2592,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,Chứng khoán UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Mua hàng {0} không nộp
 ,Projected,Dự kiến
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Không nối tiếp {0} không thuộc về kho {1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Lưu ý: Hệ thống sẽ không kiểm tra trên giao và quá đặt phòng cho hàng {0} như số lượng hoặc số lượng là 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Lưu ý: Hệ thống sẽ không kiểm tra trên giao và quá đặt phòng cho hàng {0} như số lượng hoặc số lượng là 0
 DocType: Notification Control,Quotation Message,Báo giá tin nhắn
 DocType: Issue,Opening Date,Mở ngày
 DocType: Journal Entry,Remark,Nhận xét
 DocType: Purchase Receipt Item,Rate and Amount,Tỷ lệ và Số tiền
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Chán nản
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,Không có hồ sơ tìm thấy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Không có hồ sơ tìm thấy
 DocType: Blog Category,Parent Website Route,Mẹ Trang web Route
 DocType: Sales Order,Not Billed,Không Được quảng cáo
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Cả kho phải thuộc cùng một công ty
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,Không có liên hệ nào được bổ sung.
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Không có liên hệ nào được bổ sung.
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Không hoạt động
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,Chống Invoice Quyền ngày
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Chi phí hạ cánh Voucher Số tiền
 DocType: Time Log,Batched for Billing,Trộn cho Thanh toán
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Hóa đơn đưa ra bởi nhà cung cấp.
 DocType: POS Profile,Write Off Account,Viết Tắt tài khoản
-sites/assets/js/erpnext.min.js +26,Discount Amount,Số tiền giảm giá
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Số tiền giảm giá
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against Mua hóa đơn
 DocType: Item,Warranty Period (in days),Thời gian bảo hành (trong ngày)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ví dụ như thuế GTGT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Khoản 4
 DocType: Journal Entry Account,Journal Entry Account,Tài khoản nhập Journal
 DocType: Shopping Cart Settings,Quotation Series,Báo giá dòng
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Một mục tồn tại với cùng một tên ({0}), hãy thay đổi tên nhóm mục hoặc đổi tên mục"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Một mục tồn tại với cùng một tên ({0}), hãy thay đổi tên nhóm mục hoặc đổi tên mục"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Khí kim loại nóng hình thành
 DocType: Sales Order Item,Sales Order Date,Bán hàng đặt hàng ngày
 DocType: Sales Invoice Item,Delivered Qty,Số lượng giao
@@ -2639,10 +2647,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,Khách hàng hoặc nhà cung cấp chi tiết
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Cài đặt
 DocType: Lead,Lead Owner,Chủ đầu
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,Kho được yêu cầu
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Kho được yêu cầu
 DocType: Employee,Marital Status,Tình trạng hôn nhân
 DocType: Stock Settings,Auto Material Request,Vật liệu tự động Yêu cầu
 DocType: Time Log,Will be updated when billed.,Sẽ được cập nhật khi lập hóa đơn.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Số lượng có sẵn hàng loạt tại Từ kho
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM BOM hiện tại và mới không thể giống nhau
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Trong ngày hưu trí phải lớn hơn ngày của Tham gia
 DocType: Sales Invoice,Against Income Account,Đối với tài khoản thu nhập
@@ -2659,12 +2668,12 @@ DocType: POS Profile,Update Stock,Cập nhật chứng khoán
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM khác nhau cho các hạng mục sẽ dẫn đến không chính xác (Tổng số) giá trị Trọng lượng. Hãy chắc chắn rằng Trọng lượng của mỗi mục là trong cùng một UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,Hãy kéo các mục từ giao hàng Lưu ý
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Hãy kéo các mục từ giao hàng Lưu ý
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journal Entries {0} là un-liên kết
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Ghi tất cả các thông tin liên lạc của loại email, điện thoại, chat, truy cập, vv"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Xin đề cập đến Round Tắt Trung tâm chi phí tại Công ty
 DocType: Purchase Invoice,Terms,Điều khoản
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,Tạo mới
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Tạo mới
 DocType: Buying Settings,Purchase Order Required,Mua hàng yêu cầu
 ,Item-wise Sales History,Item-khôn ngoan Lịch sử bán hàng
 DocType: Expense Claim,Total Sanctioned Amount,Tổng số tiền bị xử phạt
@@ -2681,16 +2690,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,Lương trượt trích
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Chú thích:
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Chọn một nút nhóm đầu tiên.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Mục đích phải là một trong {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,Điền vào mẫu và lưu nó
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Điền vào mẫu và lưu nó
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Tải về một bản báo cáo có chứa tất cả các nguyên liệu với tình trạng hàng tồn kho mới nhất của họ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Đối mặt
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Cộng đồng Diễn đàn
 DocType: Leave Application,Leave Balance Before Application,Trước khi rời khỏi cân ứng dụng
 DocType: SMS Center,Send SMS,Gửi tin nhắn SMS
 DocType: Company,Default Letter Head,Mặc định Letter Head
 DocType: Time Log,Billable,Lập hoá đơn
 DocType: Authorization Rule,This will be used for setting rule in HR module,Điều này sẽ được sử dụng để thiết lập quy tắc trong quản lý Nhân sự
 DocType: Account,Rate at which this tax is applied,Tốc độ thuế này được áp dụng
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,Sắp xếp lại Qty
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Sắp xếp lại Qty
 DocType: Company,Stock Adjustment Account,Tài khoản điều chỉnh chứng khoán
 DocType: Journal Entry,Write Off,Viết một bài báo
 DocType: Time Log,Operation ID,Operation ID
@@ -2701,12 +2711,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Giảm giá Fields sẽ có sẵn trong Mua hàng, mua hóa đơn, mua hóa đơn"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Tên tài khoản mới. Lưu ý: Vui lòng không tạo tài khoản cho khách hàng và nhà cung cấp
 DocType: Report,Report Type,Loại báo cáo
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Đang tải STRING_0}
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Đang tải STRING_0}
 DocType: BOM Replace Tool,BOM Replace Tool,Thay thế Hội đồng quản trị Công cụ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Nước khôn ngoan Địa chỉ mặc định Templates
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},Do / Reference ngày không được sau {0}
+DocType: Sales Order Item,Supplier delivers to Customer,Nhà cung cấp mang đến cho khách hàng
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Hiện thuế break-up
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Do / Reference ngày không được sau {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Số liệu nhập khẩu và xuất khẩu
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Nếu bạn tham gia vào hoạt động sản xuất. Cho phép Item là Sản xuất '
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Hóa đơn viết bài ngày
 DocType: Sales Invoice,Rounded Total,Tổng số tròn
 DocType: Product Bundle,List items that form the package.,Danh sách vật phẩm tạo thành các gói.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Tỷ lệ phần trăm phân bổ phải bằng 100%
@@ -2717,8 +2730,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ để người sử dụng có doanh Thạc sĩ Quản lý {0} vai trò
 DocType: Company,Default Cash Account,Tài khoản mặc định tiền
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Công ty (không khách hàng hoặc nhà cung cấp) làm chủ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',Vui lòng nhập 'dự kiến giao hàng ngày'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Ghi chú giao hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Vui lòng nhập 'dự kiến giao hàng ngày'
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Ghi chú giao hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Số tiền thanh toán + Viết Tắt Số tiền không thể lớn hơn Tổng cộng
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} không phải là một số hợp lệ cho hàng loạt mục {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Lưu ý: Không có đủ số dư để lại cho Rời Loại {0}
@@ -2740,11 +2753,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Số lượng không avalable trong kho {1} {2} vào {3}.
  Sẵn Số lượng: {4}, Chuyển Số lượng: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Khoản 3
+DocType: Purchase Order,Customer Contact Email,Khách hàng Liên hệ Email
 DocType: Event,Sunday,Chủ Nhật
 DocType: Sales Team,Contribution (%),Đóng góp (%)
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: Hiệu thanh toán sẽ không được tạo ra từ 'tiền mặt hoặc tài khoản ngân hàng' không quy định rõ
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Trách nhiệm
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Mẫu
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mẫu
 DocType: Sales Person,Sales Person Name,Người bán hàng Tên
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vui lòng nhập ít nhất 1 hóa đơn trong bảng
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Thêm người dùng
@@ -2753,7 +2767,7 @@ DocType: Task,Actual Start Date (via Time Logs),Ngày bắt đầu thực tế (
 DocType: Stock Reconciliation Item,Before reconciliation,Trước khi hòa giải
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Để {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Thuế và lệ phí nhập (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Mục thuế Row {0} phải có tài khoản của các loại thuế, thu nhập hoặc chi phí hoặc có thu phí"
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Mục thuế Row {0} phải có tài khoản của các loại thuế, thu nhập hoặc chi phí hoặc có thu phí"
 DocType: Sales Order,Partly Billed,Được quảng cáo một phần
 DocType: Item,Default BOM,Mặc định HĐQT
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2761,12 +2775,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Tổng số nợ Amt
 DocType: Time Log Batch,Total Hours,Tổng số giờ
 DocType: Journal Entry,Printing Settings,In ấn Cài đặt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},Tổng Nợ phải bằng Tổng số tín dụng. Sự khác biệt là {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Tổng Nợ phải bằng Tổng số tín dụng. Sự khác biệt là {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Ô tô
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Lá cho loại {0} đã được giao cho nhân viên {1} cho năm tài chính {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Mục được yêu cầu
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Kim loại đúc phun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,Giao hàng tận nơi từ Lưu ý
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Giao hàng tận nơi từ Lưu ý
 DocType: Time Log,From Time,Thời gian từ
 DocType: Notification Control,Custom Message,Tùy chỉnh tin nhắn
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Ngân hàng đầu tư
@@ -2782,10 +2795,10 @@ DocType: Newsletter,A Lead with this email id should exist,Một chì với id e
 DocType: Stock Entry,From BOM,Từ BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Gói Cơ bản
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Giao dịch chứng khoán trước ngày {0} được đông lạnh
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',Vui lòng click vào 'Tạo lịch'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Đến ngày nên giống như Từ ngày cho nửa ngày nghỉ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Vui lòng click vào 'Tạo lịch'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Đến ngày nên giống như Từ ngày cho nửa ngày nghỉ
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","ví dụ như Kg, đơn vị, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Không tham khảo là bắt buộc nếu bạn bước vào tham khảo ngày
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Không tham khảo là bắt buộc nếu bạn bước vào tham khảo ngày
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Tham gia ngày phải lớn hơn ngày sinh
 DocType: Salary Structure,Salary Structure,Cơ cấu tiền lương
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2793,7 +2806,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
  ưu tiên. Quy định giá: {0}"
 DocType: Account,Bank,Tài khoản
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Hãng hàng không
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,Vấn đề liệu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vấn đề liệu
 DocType: Material Request Item,For Warehouse,Cho kho
 DocType: Employee,Offer Date,Phục vụ ngày
 DocType: Hub Settings,Access Token,Truy cập Mã
@@ -2816,6 +2829,7 @@ DocType: Issue,Opening Time,Thời gian mở
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,From và To ngày cần
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
 DocType: Shipping Rule,Calculate Based On,Dựa trên tính toán
+DocType: Delivery Note Item,From Warehouse,Từ kho
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Khoan
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Thổi
 DocType: Purchase Taxes and Charges,Valuation and Total,Định giá và Tổng
@@ -2837,11 +2851,12 @@ DocType: C-Form,Amended From,Sửa đổi Từ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Nguyên liệu
 DocType: Leave Application,Follow via Email,Theo qua email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Số tiền thuế Sau khi giảm giá tiền
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,Tài khoản con tồn tại cho tài khoản này. Bạn không thể xóa tài khoản này.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Tài khoản con tồn tại cho tài khoản này. Bạn không thể xóa tài khoản này.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Hoặc mục tiêu SL hoặc số lượng mục tiêu là bắt buộc
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},Không có Hội đồng quản trị mặc định tồn tại cho mục {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,Vui lòng chọn ngày đầu tiên viết bài
-DocType: Leave Allocation,Carry Forward,Carry Forward
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Không có Hội đồng quản trị mặc định tồn tại cho mục {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vui lòng chọn ngày đầu tiên viết bài
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Khai mạc ngày nên trước ngày kết thúc
+DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Trung tâm chi phí với các giao dịch hiện tại không thể được chuyển đổi sang sổ cái
 DocType: Department,Days for which Holidays are blocked for this department.,Ngày mà ngày lễ sẽ bị chặn cho bộ phận này.
 ,Produced,Sản xuất
@@ -2862,17 +2877,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Tổng số (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Giải trí & Giải trí
 DocType: Purchase Order,The date on which recurring order will be stop,"Ngày, tháng, để định kỳ sẽ được dừng lại"
 DocType: Quality Inspection,Item Serial No,Mục Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0} phải được giảm {1} hoặc bạn nên tăng khả năng chịu tràn
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} phải được giảm {1} hoặc bạn nên tăng khả năng chịu tràn
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Tổng số hiện tại
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Giờ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Mục đăng {0} không thể được cập nhật bằng cách sử dụng \
  Cổ hòa giải"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,Chuyển Vật liệu để Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Chuyển Vật liệu để Nhà cung cấp
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Mới Serial No không thể có Warehouse. Kho phải được thiết lập bởi Cổ nhập hoặc mua hóa đơn
 DocType: Lead,Lead Type,Loại chì
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Tạo báo giá
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,Tất cả các mặt hàng này đã được lập hoá đơn
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tất cả các mặt hàng này đã được lập hoá đơn
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Có thể được chấp thuận bởi {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Điều kiện vận chuyển Rule
 DocType: BOM Replace Tool,The new BOM after replacement,Hội đồng quản trị mới sau khi thay thế
@@ -2920,7 +2935,7 @@ DocType: C-Form,C-Form,C-Mẫu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID hoạt động không được thiết lập
 DocType: Production Order,Planned Start Date,Ngày bắt đầu lên kế hoạch
 DocType: Serial No,Creation Document Type,Loại tài liệu sáng tạo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,Maint. Chuyến thăm
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Chuyến thăm
 DocType: Leave Type,Is Encash,Là thâu tiền bạc
 DocType: Purchase Invoice,Mobile No,Điện thoại di động Không
 DocType: Payment Tool,Make Journal Entry,Hãy Journal nhập
@@ -2928,7 +2943,7 @@ DocType: Leave Allocation,New Leaves Allocated,Lá mới phân bổ
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dữ liệu dự án khôn ngoan là không có sẵn cho báo giá
 DocType: Project,Expected End Date,Dự kiến kết thúc ngày
 DocType: Appraisal Template,Appraisal Template Title,Thẩm định Mẫu Tiêu đề
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,Thương mại
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Thương mại
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Chánh mục {0} không phải là Cổ Mã
 DocType: Cost Center,Distribution Id,Id phân phối
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Dịch vụ tuyệt vời
@@ -2944,14 +2959,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Giá trị {0} Thuộc tính phải nằm trong phạm vi của {1} để {2} trong gia số của {3}
 DocType: Tax Rule,Sales,Bán hàng
 DocType: Stock Entry Detail,Basic Amount,Số tiền cơ bản
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},Kho cần thiết cho chứng khoán hàng {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,Cr
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Kho cần thiết cho chứng khoán hàng {0}
+DocType: Leave Allocation,Unused leaves,Lá chưa sử dụng
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Mặc định thu khoản
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Cưa
 DocType: Tax Rule,Billing State,Thanh toán Nhà nước
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ép tấm nhiều lớp
 DocType: Item Reorder,Transfer,Truyền
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
 DocType: Authorization Rule,Applicable To (Employee),Để áp dụng (nhân viên)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date là bắt buộc
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Tăng cho Attribute {0} không thể là 0
@@ -2967,6 +2983,7 @@ DocType: Company,Retail,Lĩnh vực bán lẻ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Khách hàng {0} không tồn tại
 DocType: Attendance,Absent,Vắng mặt
 DocType: Product Bundle,Product Bundle,Bundle sản phẩm
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: tham chiếu không hợp lệ {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Máy nghiền
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Mua Thuế và phí Template
 DocType: Upload Attendance,Download Template,Tải mẫu
@@ -2974,16 +2991,16 @@ DocType: GL Entry,Remarks,Ghi chú
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nguyên liệu Item Code
 DocType: Journal Entry,Write Off Based On,Viết Tắt Dựa trên
 DocType: Features Setup,POS View,POS Xem
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Bản ghi cài đặt cho một Số sản
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Bản ghi cài đặt cho một Số sản
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Đúc liên tục
-sites/assets/js/erpnext.min.js +10,Please specify a,Vui lòng xác định
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vui lòng xác định
 DocType: Offer Letter,Awaiting Response,Đang chờ Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Ở trên
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Lạnh sizing
 DocType: Salary Slip,Earning & Deduction,Thu nhập và khoản giảm trừ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Tài khoản {0} không thể là một Tập đoàn
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Vùng
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Tùy chọn. Thiết lập này sẽ được sử dụng để lọc các giao dịch khác nhau.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Tùy chọn. Thiết lập này sẽ được sử dụng để lọc các giao dịch khác nhau.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Tỷ lệ tiêu cực Định giá không được phép
 DocType: Holiday List,Weekly Off,Tắt tuần
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Ví dụ như năm 2012, 2012-13"
@@ -3027,12 +3044,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Lồi lên
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Casting bay hơi-pattern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Chi phí Giải trí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Hóa đơn bán hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,Tuổi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Hóa đơn bán hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Tuổi
 DocType: Time Log,Billing Amount,Số tiền thanh toán
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Số lượng không hợp lệ quy định cho mặt hàng {0}. Số lượng phải lớn hơn 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ứng dụng cho nghỉ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,Tài khoản với giao dịch hiện có không thể bị xóa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Tài khoản với giao dịch hiện có không thể bị xóa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Chi phí pháp lý
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Các ngày trong tháng mà trên đó để tự động sẽ được tạo ra ví dụ như 05, 28 vv"
 DocType: Sales Invoice,Posting Time,Thời gian gửi bài
@@ -3041,9 +3058,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kiểm tra này nếu bạn muốn ép buộc người dùng lựa chọn một loạt trước khi lưu. Sẽ không có mặc định nếu bạn kiểm tra này.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Không có hàng với Serial No {0}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,Mở Notifications
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Mở Notifications
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Chi phí trực tiếp
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,Bạn có thực sự muốn tháo nút Yêu cầu vật liệu này?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Doanh thu khách hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Chi phí đi lại
 DocType: Maintenance Visit,Breakdown,Hỏng
@@ -3054,7 +3070,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Như trên ngày
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Mài giũa
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Quản chế
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,Kho mặc định là bắt buộc đối với cổ phiếu Item.
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Kho mặc định là bắt buộc đối với cổ phiếu Item.
 DocType: Feed,Full Name,Tên đầy đủ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Thanh toán tiền lương trong tháng {0} và năm {1}
@@ -3077,7 +3093,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,Thêm hàng đ
 DocType: Buying Settings,Default Supplier Type,Loại mặc định Nhà cung cấp
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Khai thác đá
 DocType: Production Order,Total Operating Cost,Tổng chi phí hoạt động kinh doanh
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,Lưu ý: Item {0} nhập nhiều lần
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Lưu ý: Item {0} nhập nhiều lần
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tất cả các hệ.
 DocType: Newsletter,Test Email Id,Kiểm tra Email Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Công ty viết tắt
@@ -3101,11 +3117,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Giá đ
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vai trò được phép chỉnh sửa cổ đông lạnh
 ,Territory Target Variance Item Group-Wise,Lãnh thổ mục tiêu phương sai mục Nhóm-Wise
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tất cả các nhóm khách hàng
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Có thể đổi tiền kỷ lục không được tạo ra cho {1} đến {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Có thể đổi tiền kỷ lục không được tạo ra cho {1} đến {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template thuế là bắt buộc.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Tài khoản {0}: Cha mẹ tài khoản {1} không tồn tại
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Danh sách giá Tỷ lệ (Công ty tiền tệ)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1} tình trạng là 'Ngưng'
 DocType: Account,Temporary,Tạm thời
 DocType: Address,Preferred Billing Address,Địa chỉ ưa thích Thanh toán
 DocType: Monthly Distribution Percentage,Percentage Allocation,Tỷ lệ phần trăm phân bổ
@@ -3123,13 +3138,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Mục khôn ngoan chi t
 DocType: Purchase Order Item,Supplier Quotation,Nhà cung cấp báo giá
 DocType: Quotation,In Words will be visible once you save the Quotation.,Trong từ sẽ được hiển thị khi bạn lưu các báo giá.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Bàn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1} là dừng lại
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} là dừng lại
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
 DocType: Lead,Add to calendar on this date,Thêm vào lịch trong ngày này
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Quy tắc để thêm chi phí vận chuyển.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,sự kiện sắp tới
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,sự kiện sắp tới
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Khách hàng được yêu cầu
 DocType: Letter Head,Letter Head,Thư Head
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Quick Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} là bắt buộc đối với Return
 DocType: Purchase Order,To Receive,Nhận
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink lắp
@@ -3153,25 +3169,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Ít nhất một kho là bắt buộc
 DocType: Serial No,Out of Warranty,Ra khỏi bảo hành
 DocType: BOM Replace Tool,Replace,Thay thế
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0} với Sales Invoice {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,Vui lòng nhập mặc định Đơn vị đo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} với Sales Invoice {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vui lòng nhập mặc định Đơn vị đo
 DocType: Purchase Invoice Item,Project Name,Tên dự án
 DocType: Supplier,Mention if non-standard receivable account,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn
 DocType: Workflow State,Edit,Sửa
 DocType: Journal Entry Account,If Income or Expense,Nếu thu nhập hoặc chi phí
 DocType: Features Setup,Item Batch Nos,Mục hàng loạt Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Giá trị cổ phiếu khác biệt
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,Nguồn Nhân Lực
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Nguồn Nhân Lực
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Hòa giải thanh toán thanh toán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Tài sản thuế
 DocType: BOM Item,BOM No,BOM Không
 DocType: Contact Us Settings,Pincode,Pincode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,Tạp chí nhập {0} không có tài khoản {1} hoặc đã đối chiếu với các chứng từ khác
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Tạp chí nhập {0} không có tài khoản {1} hoặc đã đối chiếu với các chứng từ khác
 DocType: Item,Moving Average,Di chuyển trung bình
 DocType: BOM Replace Tool,The BOM which will be replaced,Hội đồng quản trị sẽ được thay thế
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Mới Cổ UOM phải khác UOM cổ phiếu hiện tại
 DocType: Account,Debit,Thẻ ghi nợ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,"Lá phải được phân bổ trong bội số của 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Lá phải được phân bổ trong bội số của 0,5"
 DocType: Production Order,Operation Cost,Chi phí hoạt động
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Tải lên tham gia từ một tập tin csv.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Nổi bật Amt
@@ -3179,7 +3195,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Mục t
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Chỉ định vấn đề này, sử dụng nút ""Assign"" trong thanh bên."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Cổ phiếu đóng băng cũ hơn [Ngày]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Nếu hai hoặc nhiều Rules giá được tìm thấy dựa trên các điều kiện trên, ưu tiên được áp dụng. Ưu tiên là một số từ 0 đến 20, trong khi giá trị mặc định là số không (trống). Số cao hơn có nghĩa là nó sẽ được ưu tiên nếu có nhiều Rules giá với điều kiện tương tự."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,Chống Invoice
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Năm tài chính: {0} không tồn tại
 DocType: Currency Exchange,To Currency,Để tệ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Cho phép người sử dụng sau phê duyệt ứng dụng Để lại cho khối ngày.
@@ -3208,7 +3223,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tỷ
 DocType: Stock Entry Detail,Additional Cost,Chi phí bổ sung
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Năm tài chính kết thúc ngày
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Không thể lọc dựa trên Voucher Không, nếu nhóm theo Phiếu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,Nhà cung cấp báo giá thực hiện
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Nhà cung cấp báo giá thực hiện
 DocType: Quality Inspection,Incoming,Đến
 DocType: BOM,Materials Required (Exploded),Vật liệu bắt buộc (phát nổ)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Giảm Thu cho nghỉ việc không phải trả tiền (LWP)
@@ -3216,10 +3231,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} không phù hợp với {2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Để lại bình thường
 DocType: Batch,Batch ID,ID hàng loạt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},Lưu ý: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Lưu ý: {0}
 ,Delivery Note Trends,Giao hàng Ghi Xu hướng
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tóm tắt tuần này
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} phải là một mục Mua hoặc Chi ký hợp đồng trong hàng {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} phải là một mục Mua hoặc Chi ký hợp đồng trong hàng {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Tài khoản: {0} chỉ có thể được cập nhật thông qua giao dịch chứng khoán
 DocType: GL Entry,Party,Bên
 DocType: Sales Order,Delivery Date,Giao hàng ngày
@@ -3232,7 +3247,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,V
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Tỷ giá mua
 DocType: Task,Actual Time (in Hours),Thời gian thực tế (trong giờ)
 DocType: Employee,History In Company,Trong lịch sử Công ty
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,Bản tin
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Bản tin
 DocType: Address,Shipping,Vận chuyển
 DocType: Stock Ledger Entry,Stock Ledger Entry,Chứng khoán Ledger nhập
 DocType: Department,Leave Block List,Để lại Block List
@@ -3251,7 +3266,7 @@ DocType: Account,Auditor,Người kiểm tra
 DocType: Purchase Order,End date of current order's period,Ngày kết thúc của thời kỳ hiện tại của trật tự
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Hãy Letter Offer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Trở về
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,Mặc định Đơn vị đo lường cho Variant phải được giống như Template
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Mặc định Đơn vị đo lường cho Variant phải được giống như Template
 DocType: DocField,Fold,Gập lại
 DocType: Production Order Operation,Production Order Operation,Sản xuất tự Operation
 DocType: Pricing Rule,Disable,Vô hiệu hóa
@@ -3283,7 +3298,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,Báo cáo
 DocType: SMS Settings,Enter url parameter for receiver nos,Nhập tham số url cho người nhận nos
 DocType: Sales Invoice,Paid Amount,Số tiền thanh toán
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Đóng tài khoản {0} phải là loại 'trách nhiệm'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Đóng tài khoản {0} phải là loại 'trách nhiệm'
 ,Available Stock for Packing Items,Có sẵn cổ phiếu cho mục đóng gói
 DocType: Item Variant,Item Variant,Mục Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Địa chỉ thiết lập mẫu này như mặc định là không có mặc định khác
@@ -3291,7 +3306,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quản lý chất lượng
 DocType: Production Planning Tool,Filter based on customer,Bộ lọc dựa trên khách hàng
 DocType: Payment Tool Detail,Against Voucher No,Chống Voucher Không
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Vui lòng nhập số lượng cho hàng {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vui lòng nhập số lượng cho hàng {0}
 DocType: Employee External Work History,Employee External Work History,Nhân viên làm việc ngoài Lịch sử
 DocType: Tax Rule,Purchase,Mua
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Số lượng cân bằng
@@ -3328,28 +3343,29 @@ Note: BOM = Bill of Materials","Nhóm Uẩn Items ** ** vào một mục ** **.
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Không nối tiếp là bắt buộc đối với hàng {0}
 DocType: Item Variant Attribute,Attribute,Đặc tính
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Hãy xác định từ / dao
-sites/assets/js/desk.min.js +7652,Created By,Tạo ra bởi
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Tạo ra bởi
 DocType: Serial No,Under AMC,Theo AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Tỷ lệ định giá mục được tính toán lại xem xét số lượng chứng từ chi phí hạ cánh
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Thiết lập mặc định cho bán giao dịch.
 DocType: BOM Replace Tool,Current BOM,BOM hiện tại
-sites/assets/js/erpnext.min.js +8,Add Serial No,Thêm Serial No
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Thêm Serial No
 DocType: Production Order,Warehouses,Kho
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,In và Văn phòng phẩm
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nhóm Node
 DocType: Payment Reconciliation,Minimum Amount,Số tiền tối thiểu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Cập nhật hoàn thành Hàng
 DocType: Workstation,per hour,mỗi giờ
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},Loạt {0} đã được sử dụng trong {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Loạt {0} đã được sử dụng trong {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Tài khoản cho các kho (vĩnh viễn tồn kho) sẽ được tạo ra trong Tài khoản này.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Kho không thể bị xóa sổ cái như nhập chứng khoán tồn tại cho kho này.
 DocType: Company,Distribution,Gửi đến:
-sites/assets/js/erpnext.min.js +50,Amount Paid,Số tiền trả
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Số tiền trả
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Giám đốc dự án
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Công văn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Tối đa cho phép giảm giá cho mặt hàng: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Thuế mặc định và lệ phí
 DocType: Account,Receivable,Thu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Không được phép thay đổi Supplier Mua hàng đã tồn tại
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Vai trò được phép trình giao dịch vượt quá hạn mức tín dụng được thiết lập.
 DocType: Sales Invoice,Supplier Reference,Nhà cung cấp tham khảo
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Nếu được chọn, Hội đồng quản trị cho các hạng mục phụ lắp ráp sẽ được xem xét để có được nguyên liệu. Nếu không, tất cả các mục phụ lắp ráp sẽ được coi như một nguyên liệu thô."
@@ -3386,8 +3402,8 @@ DocType: Email Digest,Add/Remove Recipients,Add / Remove người nhận
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Giao dịch không được phép chống lại dừng lại tự sản xuất {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Thiết lập năm tài chính này như mặc định, nhấp vào 'Set as Default'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Thiết lập máy chủ cho đến hỗ trợ email id. (Ví dụ như support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,Thiếu Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Thiếu Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
 DocType: Salary Slip,Salary Slip,Lương trượt
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Đánh bóng
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Đến ngày"" là cần thiết"
@@ -3400,6 +3416,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Khi bất cứ giao dịch kiểm tra được ""Gửi"", một email pop-up tự động mở để gửi một email đến các liên kết ""Liên hệ"" trong giao dịch, với các giao dịch như là một tập tin đính kèm. Người sử dụng có thể hoặc không có thể gửi email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Cài đặt toàn cầu
 DocType: Employee Education,Employee Education,Giáo dục nhân viên
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
 DocType: Salary Slip,Net Pay,Net phải trả tiền
 DocType: Account,Account,Tài khoản
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Không nối tiếp {0} đã được nhận
@@ -3432,7 +3449,7 @@ DocType: BOM,Manufacturing User,Sản xuất tài
 DocType: Purchase Order,Raw Materials Supplied,Nguyên liệu thô Cung cấp
 DocType: Purchase Invoice,Recurring Print Format,Định kỳ Print Format
 DocType: Communication,Series,Tùng thư
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,Dự kiến sẽ giao hàng ngày không thể trước khi Mua hàng ngày
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Dự kiến sẽ giao hàng ngày không thể trước khi Mua hàng ngày
 DocType: Appraisal,Appraisal Template,Thẩm định mẫu
 DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Phân mục
@@ -3488,6 +3505,7 @@ DocType: HR Settings,Payroll Settings,Thiết lập bảng lương
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Phù hợp với hoá đơn không liên kết và Thanh toán.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Đặt hàng
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Gốc không thể có một trung tâm chi phí cha mẹ
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Chọn thương hiệu ...
 DocType: Sales Invoice,C-Form Applicable,C-Mẫu áp dụng
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Thời gian hoạt động phải lớn hơn 0 cho hoạt động {0}
 DocType: Supplier,Address and Contacts,Địa chỉ và liên hệ
@@ -3498,7 +3516,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,Nhận chứng từ xuất sắc
 DocType: Warranty Claim,Resolved By,Giải quyết bởi
 DocType: Appraisal,Start Date,Ngày bắt đầu
-sites/assets/js/desk.min.js +7629,Value,Giá trị
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Giá trị
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Phân bổ lá trong một thời gian.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Nhấn vào đây để xác minh
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Tài khoản {0}: Bạn không thể chỉ định chính nó như là tài khoản phụ huynh
@@ -3514,14 +3532,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox truy cập được phép
 DocType: Dropbox Backup,Weekly,Hàng tuần
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ví dụ. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,Nhận
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Nhận
 DocType: Maintenance Visit,Fully Completed,Hoàn thành đầy đủ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Trình độ chuyên môn giáo dục
 DocType: Workstation,Operating Costs,Chi phí điều hành
 DocType: Employee Leave Approver,Employee Leave Approver,Nhân viên Để lại phê duyệt
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} đã được thêm thành công vào danh sách tin của chúng tôi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Không thể khai báo như bị mất, bởi vì báo giá đã được thực hiện."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Gia công tia điện tử
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Thạc sĩ Quản lý mua hàng
@@ -3534,7 +3552,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Thêm / Sửa giá
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Biểu đồ của Trung tâm Chi phí
 ,Requested Items To Be Ordered,Mục yêu cầu để trở thứ tự
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,Đơn hàng của tôi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Đơn hàng của tôi
 DocType: Price List,Price List Name,Danh sách giá Tên
 DocType: Time Log,For Manufacturing,Đối với sản xuất
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,{0}{/0}{1}{/1} {2}{/2}Tổng giá trị
@@ -3545,7 +3563,7 @@ DocType: Account,Income,Thu nhập
 DocType: Industry Type,Industry Type,Loại công nghiệp
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Một cái gì đó đã đi sai!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Cảnh báo: Để lại ứng dụng có chứa khối ngày sau
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ngày kết thúc
 DocType: Purchase Invoice Item,Amount (Company Currency),Số tiền (Công ty tiền tệ)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Đúc Die
@@ -3559,10 +3577,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,Năm
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale hồ sơ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Xin vui lòng cập nhật cài đặt tin nhắn SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,Giờ {0} đã lập hóa đơn
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Giờ {0} đã lập hóa đơn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Các khoản cho vay không có bảo đảm
 DocType: Cost Center,Cost Center Name,Chi phí Tên Trung tâm
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Mục {0} với Serial No {1} đã được cài đặt
 DocType: Maintenance Schedule Detail,Scheduled Date,Dự kiến ngày
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Tổng Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Thư lớn hơn 160 ký tự sẽ được chia thành nhiều tin nhắn
@@ -3570,10 +3587,10 @@ DocType: Purchase Receipt Item,Received and Accepted,Nhận được và chấp
 ,Serial No Service Contract Expiry,Không nối tiếp Hợp đồng dịch vụ hết hạn
 DocType: Item,Unit of Measure Conversion,Đơn vị chuyển đổi đo lường
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Nhân viên không thể thay đổi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,Bạn không thể tín dụng và ghi nợ cùng một tài khoản cùng một lúc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Bạn không thể tín dụng và ghi nợ cùng một tài khoản cùng một lúc
 DocType: Naming Series,Help HTML,Giúp đỡ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Tổng số weightage giao nên được 100%. Nó là {0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},Trợ cấp cho quá {0} vượt qua cho mục {1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Trợ cấp cho quá {0} vượt qua cho mục {1}
 DocType: Address,Name of person or organization that this address belongs to.,Tên của người hoặc tổ chức địa chỉ này thuộc về.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Các nhà cung cấp của bạn
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Không thể thiết lập như Lost như bán hàng đặt hàng được thực hiện.
@@ -3584,10 +3601,11 @@ DocType: Lead,Converted,Chuyển đổi
 DocType: Item,Has Serial No,Có Serial No
 DocType: Employee,Date of Issue,Ngày phát hành
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Từ {0} cho {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Thiết lập Nhà cung cấp cho mặt hàng {1}
 DocType: Issue,Content Type,Loại nội dung
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Máy tính
 DocType: Item,List this Item in multiple groups on the website.,Danh sách sản phẩm này trong nhiều nhóm trên trang web.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,Vui lòng kiểm tra chọn ngoại tệ nhiều để cho phép các tài khoản với loại tiền tệ khác
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Vui lòng kiểm tra chọn ngoại tệ nhiều để cho phép các tài khoản với loại tiền tệ khác
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} không tồn tại trong hệ thống
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Bạn không được phép để thiết lập giá trị đông lạnh
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nhận Unreconciled Entries
@@ -3598,14 +3616,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,Để kho
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Tài khoản {0} đã được nhập vào nhiều hơn một lần cho năm tài chính {1}
 ,Average Commission Rate,Ủy ban trung bình Tỷ giá
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,'Có Serial No' không thể 'Có' cho mục chứng khoán không
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Có Serial No' không thể 'Có' cho mục chứng khoán không
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Tham dự không thể được đánh dấu cho những ngày tương lai
 DocType: Pricing Rule,Pricing Rule Help,Quy tắc định giá giúp
 DocType: Purchase Taxes and Charges,Account Head,Trưởng tài khoản
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Cập nhật chi phí bổ sung để tính toán chi phí hạ cánh của các mặt hàng
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Hệ thống điện
 DocType: Stock Entry,Total Value Difference (Out - In),Tổng giá trị khác biệt (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate là bắt buộc
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID người dùng không thiết lập cho nhân viên {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Từ Bảo hành yêu cầu bồi thường
@@ -3619,15 +3637,17 @@ DocType: Buying Settings,Naming Series,Đặt tên dòng
 DocType: Leave Block List,Leave Block List Name,Để lại Block List Tên
 DocType: User,Enabled,Đã bật
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Tài sản chứng khoán
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},Bạn có thực sự muốn để gửi tất cả các Phiếu lương cho tháng {0} và năm {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Bạn có thực sự muốn để gửi tất cả các Phiếu lương cho tháng {0} và năm {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Subscribers nhập
 DocType: Target Detail,Target Qty,Số lượng mục tiêu
 DocType: Attendance,Present,Nay
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Giao hàng Ghi {0} không phải nộp
 DocType: Notification Control,Sales Invoice Message,Hóa đơn bán hàng nhắn
 DocType: Authorization Rule,Based On,Dựa trên
-,Ordered Qty,Số lượng đặt hàng
+DocType: Sales Order Item,Ordered Qty,Số lượng đặt hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Mục {0} bị vô hiệu hóa
 DocType: Stock Settings,Stock Frozen Upto,"Cổ đông lạnh HCM,"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Từ giai đoạn và thời gian Để ngày bắt buộc cho kỳ {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Hoạt động dự án / nhiệm vụ.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Tạo ra lương Trượt
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} không phải là một id email hợp lệ
@@ -3667,7 +3687,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,Tải lên tham dự
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM và Sản xuất Số lượng được yêu cầu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing đun 2
-DocType: Journal Entry Account,Amount,Giá trị
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Giá trị
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Tán đinh
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,HĐQT thay thế
 ,Sales Analytics,Bán hàng Analytics
@@ -3694,7 +3714,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Dự kiến ngày không thể trước khi vật liệu Yêu cầu ngày
 DocType: Contact Us Settings,City,Thành phố
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Công bằng siêu âm
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,Lỗi: Không phải là một id hợp lệ?
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Lỗi: Không phải là một id hợp lệ?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Mục {0} phải là một mục bán hàng
 DocType: Naming Series,Update Series Number,Cập nhật Dòng Số
 DocType: Account,Equity,Vốn chủ sở hữu
@@ -3709,7 +3729,7 @@ DocType: Purchase Taxes and Charges,Actual,Thực tế
 DocType: Authorization Rule,Customerwise Discount,Customerwise Giảm giá
 DocType: Purchase Invoice,Against Expense Account,Đối với tài khoản chi phí
 DocType: Production Order,Production Order,Đặt hàng sản xuất
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,Lưu ý cài đặt {0} đã được gửi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Lưu ý cài đặt {0} đã được gửi
 DocType: Quotation Item,Against Docname,Chống lại Docname
 DocType: SMS Center,All Employee (Active),Tất cả các nhân viên (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bây giờ xem
@@ -3717,14 +3737,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,Chi phí nguyên liệu thô
 DocType: Item,Re-Order Level,Re-tự cấp
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Nhập các mặt hàng và qty kế hoạch mà bạn muốn nâng cao các đơn đặt hàng sản xuất hoặc tải nguyên liệu để phân tích.
-sites/assets/js/list.min.js +174,Gantt Chart,Biểu đồ Gantt
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Biểu đồ Gantt
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Bán thời gian
 DocType: Employee,Applicable Holiday List,Áp dụng lễ Danh sách
 DocType: Employee,Cheque,Séc
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Cập nhật hàng loạt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Loại Báo cáo là bắt buộc
 DocType: Item,Serial Number Series,Serial Number Dòng
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Kho là bắt buộc đối với cổ phiếu hàng {0} trong hàng {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Kho là bắt buộc đối với cổ phiếu hàng {0} trong hàng {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Bán Lẻ & Bán
 DocType: Issue,First Responded On,Đã trả lời đầu tiên On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Hội Chữ thập Danh bạ nhà hàng ở nhiều nhóm
@@ -3739,7 +3759,7 @@ DocType: Attendance,Attendance,Tham gia
 DocType: Page,No,Không đồng ý
 DocType: BOM,Materials,Nguyên liệu
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Nếu không kiểm tra, danh sách sẽ phải được thêm vào mỗi Bộ, nơi nó đã được áp dụng."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Ngày đăng và gửi bài thời gian là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Ngày đăng và gửi bài thời gian là bắt buộc
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Mẫu thuế đối với giao dịch mua.
 ,Item Prices,Giá mục
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Trong từ sẽ được hiển thị khi bạn lưu các Mua hàng.
@@ -3759,9 +3779,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Chi phí hành chính
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Tư vấn
 DocType: Customer Group,Parent Customer Group,Cha mẹ Nhóm khách hàng
-sites/assets/js/erpnext.min.js +50,Change,Thay đổi
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Thay đổi
 DocType: Purchase Invoice,Contact Email,Liên hệ Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',Mua hàng {0} 'Ngưng'
 DocType: Appraisal Goal,Score Earned,Điểm số kiếm được
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","ví dụ như ""Công ty của tôi LLC """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Thông báo Thời gian
@@ -3771,12 +3790,13 @@ DocType: Packing Slip,Gross Weight UOM,Tổng trọng lượng UOM
 DocType: Email Digest,Receivables / Payables,Các khoản phải thu / phải trả
 DocType: Delivery Note Item,Against Sales Invoice,Chống bán hóa đơn
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stamping
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Tài khoản tín dụng
 DocType: Landed Cost Item,Landed Cost Item,Chi phí hạ cánh hàng
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Hiện không có giá trị
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Số lượng mặt hàng thu được sau khi sản xuất / đóng gói lại từ số lượng nhất định của nguyên liệu
 DocType: Payment Reconciliation,Receivable / Payable Account,Thu / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Chống bán hàng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
 DocType: Item,Default Warehouse,Kho mặc định
 DocType: Task,Actual End Date (via Time Logs),Thực tế End Date (qua Thời gian Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Ngân sách không thể được chỉ định đối với tài khoản Nhóm {0}
@@ -3790,7 +3810,7 @@ DocType: Issue,Support Team,Hỗ trợ trong team
 DocType: Appraisal,Total Score (Out of 5),Tổng số điểm (Out of 5)
 DocType: Contact Us Settings,State,Trạng thái
 DocType: Batch,Batch,Hàng loạt
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Tổng số yêu cầu bồi thường chi phí (thông qua Tuyên bố Expense)
 DocType: User,Gender,Giới Tính
 DocType: Journal Entry,Debit Note,nợ Ghi
@@ -3806,9 +3826,8 @@ DocType: Lead,Blog Subscriber,Blog thuê bao
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Tạo các quy tắc để hạn chế các giao dịch dựa trên giá trị.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Nếu được chọn, Tổng số không. của ngày làm việc sẽ bao gồm ngày lễ, và điều này sẽ làm giảm giá trị của Lương trung bình mỗi ngày"
 DocType: Purchase Invoice,Total Advance,Tổng số trước
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,Tháo nút liệu Yêu cầu
 DocType: Workflow State,User,Người dùng
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,Chế biến lương
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Chế biến lương
 DocType: Opportunity Item,Basic Rate,Tỷ lệ cơ bản
 DocType: GL Entry,Credit Amount,Số tiền tín dụng
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Thiết lập như Lost
@@ -3816,7 +3835,7 @@ DocType: Customer,Credit Days Based On,Days Credit Dựa Trên
 DocType: Tax Rule,Tax Rule,Rule thuế
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Duy trì Cùng Rate Trong suốt chu kỳ kinh doanh
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Kế hoạch thời gian bản ghi ngoài giờ làm việc Workstation.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1} đã được gửi
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} đã được gửi
 ,Items To Be Requested,Mục To Be yêu cầu
 DocType: Purchase Order,Get Last Purchase Rate,Nhận cuối Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Tỷ lệ thanh toán dựa trên Loại hoạt động (mỗi giờ)
@@ -3825,6 +3844,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Công ty Email ID không tìm thấy, do đó thư không gửi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Ứng dụng của Quỹ (tài sản)
 DocType: Production Planning Tool,Filter based on item,Lọc dựa trên mục
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Nợ TK
 DocType: Fiscal Year,Year Start Date,Ngày bắt đầu năm
 DocType: Attendance,Employee Name,Tên nhân viên
 DocType: Sales Invoice,Rounded Total (Company Currency),Tổng số tròn (Công ty tiền tệ)
@@ -3836,14 +3856,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Tẩy trống
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Lợi ích của nhân viên
 DocType: Sales Invoice,Is POS,Là POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
 DocType: Production Order,Manufactured Qty,Số lượng sản xuất
 DocType: Purchase Receipt Item,Accepted Quantity,Số lượng chấp nhận
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} không tồn tại
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Hóa đơn tăng cho khách hàng.
 DocType: DocField,Default,Mặc định
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id dự án
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Không {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Không {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} thuê bao thêm
 DocType: Maintenance Schedule,Schedule,Lập lịch quét
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Xác định ngân sách cho Trung tâm chi phí này. Để thiết lập hành động ngân sách, xem "Công ty List""
@@ -3851,7 +3871,7 @@ DocType: Account,Parent Account,Tài khoản cha mẹ
 DocType: Quality Inspection Reading,Reading 3,Đọc 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Loại chứng từ
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
 DocType: Expense Claim,Approved,Đã được phê duyệt
 DocType: Pricing Rule,Price,Giá
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
@@ -3860,23 +3880,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,Đào tạo
 DocType: Selling Settings,Campaign Naming By,Cách đặt tên chiến dịch By
 DocType: Employee,Current Address Is,Địa chỉ hiện tại là
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Không bắt buộc. Thiết lập tiền tệ mặc định của công ty, nếu không quy định."
 DocType: Address,Office,Văn phòng
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Báo cáo tiêu chuẩn
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Sổ nhật ký kế toán.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Đảng / tài khoản không khớp với {1} / {2} trong {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,Số lượng có sẵn tại Từ kho
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Đảng / tài khoản không khớp với {1} / {2} trong {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Để tạo ra một tài khoản thuế
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
 DocType: Account,Stock,Kho
 DocType: Employee,Current Address,Địa chỉ hiện tại
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Nếu tài liệu là một biến thể của một item sau đó mô tả, hình ảnh, giá cả, thuế vv sẽ được thiết lập từ các mẫu trừ khi được quy định một cách rõ ràng"
 DocType: Serial No,Purchase / Manufacture Details,Thông tin chi tiết mua / Sản xuất
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,Lô hàng tồn kho
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Lô hàng tồn kho
 DocType: Employee,Contract End Date,Ngày kết thúc hợp đồng
 DocType: Sales Order,Track this Sales Order against any Project,Theo dõi đơn hàng bán hàng này chống lại bất kỳ dự án
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Kéo đơn bán hàng (đang chờ để cung cấp) dựa trên các tiêu chí trên
 DocType: DocShare,Document Type,Loại tài liệu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,Nhà cung cấp báo giá từ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Nhà cung cấp báo giá từ
 DocType: Deduction Type,Deduction Type,Loại trừ
 DocType: Attendance,Half Day,Nửa ngày
 DocType: Pricing Rule,Min Qty,Min Số lượng
@@ -3887,20 +3909,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Đối với lượng (Sản xuất Qty) là bắt buộc
 DocType: Stock Entry,Default Target Warehouse,Mặc định mục tiêu kho
 DocType: Purchase Invoice,Net Total (Company Currency),Net Tổng số (Công ty tiền tệ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Đảng Type và Đảng là chỉ áp dụng đối với thu / tài khoản phải trả
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Đảng Type và Đảng là chỉ áp dụng đối với thu / tài khoản phải trả
 DocType: Notification Control,Purchase Receipt Message,Thông báo mua hóa đơn
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Tổng số lá được giao rất nhiều so với cùng kỳ
 DocType: Production Order,Actual Start Date,Thực tế Ngày bắt đầu
 DocType: Sales Order,% of materials delivered against this Sales Order,% Nguyên liệu chuyển giao chống lại thứ tự bán hàng này
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Phong trào kỷ lục mục.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Phong trào kỷ lục mục.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Danh sách bản tin thuê bao
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,Dịch vụ
 DocType: Hub Settings,Hub Settings,Cài đặt Hub
 DocType: Project,Gross Margin %,Lợi nhuận gộp%
 DocType: BOM,With Operations,Với hoạt động
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ghi sổ kế toán đã được thực hiện bằng tiền {0} cho công ty {1}. Hãy lựa chọn một tài khoản phải thu hoặc phải trả tiền với {0}.
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ghi sổ kế toán đã được thực hiện bằng tiền {0} cho công ty {1}. Hãy lựa chọn một tài khoản phải thu hoặc phải trả tiền với {0}.
 ,Monthly Salary Register,Hàng tháng Lương Đăng ký
-apps/frappe/frappe/website/template.py +123,Next,Tiếp theo
+apps/frappe/frappe/website/template.py +140,Next,Tiếp theo
 DocType: Warranty Claim,If different than customer address,Nếu khác với địa chỉ của khách hàng
 DocType: BOM Operation,BOM Operation,BOM hoạt động
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Đánh bóng điện
@@ -3931,6 +3954,7 @@ DocType: Purchase Invoice,Next Date,Tiếp theo ngày
 DocType: Employee Education,Major/Optional Subjects,Chính / Đối tượng bắt buộc
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vui lòng nhập Thuế và phí
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Máy
+DocType: Sales Invoice Item,Drop Ship,Thả tàu
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ở đây bạn có thể duy trì chi tiết gia đình như tên và nghề nghiệp của cha mẹ, vợ, chồng và con cái"
 DocType: Hub Settings,Seller Name,Tên người bán
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Thuế và lệ phí được khấu trừ (Công ty tiền tệ)
@@ -3957,29 +3981,29 @@ DocType: Purchase Order,To Receive and Bill,Nhận và Bill
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Nhà thiết kế
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Điều khoản và Điều kiện Template
 DocType: Serial No,Delivery Details,Chi tiết giao hàng
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},Trung tâm chi phí là cần thiết trong hàng {0} trong bảng Thuế cho loại {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Trung tâm chi phí là cần thiết trong hàng {0} trong bảng Thuế cho loại {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Tự động tạo Material Request nếu số lượng giảm xuống dưới mức này
 ,Item-wise Purchase Register,Item-khôn ngoan mua Đăng ký
 DocType: Batch,Expiry Date,Ngày hết hiệu lực
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Để thiết lập mức độ sắp xếp lại, mục phải là một khoản mua hoặc sản xuất hàng"
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Để thiết lập mức độ sắp xếp lại, mục phải là một khoản mua hoặc sản xuất hàng"
 ,Supplier Addresses and Contacts,Địa chỉ nhà cung cấp và hệ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vui lòng chọn mục đầu tiên
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Chủ dự án.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Không hiển thị bất kỳ biểu tượng như $ vv bên cạnh tiền tệ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),(Nửa ngày)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Nửa ngày)
 DocType: Supplier,Credit Days,Ngày tín dụng
 DocType: Leave Type,Is Carry Forward,Được Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,Được mục từ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Được mục từ BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Thời gian dẫn ngày
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Hóa đơn nguyên vật liệu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Đảng Type và Đảng là cần thiết cho thu / tài khoản phải trả {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Đảng Type và Đảng là cần thiết cho thu / tài khoản phải trả {1}
 DocType: Dropbox Backup,Send Notifications To,Gửi thông báo để
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref ngày
 DocType: Employee,Reason for Leaving,Lý do Rời
 DocType: Expense Claim Detail,Sanctioned Amount,Số tiền xử phạt
 DocType: GL Entry,Is Opening,Được mở cửa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},Row {0}: Nợ mục không thể được liên kết với một {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,Tài khoản {0} không tồn tại
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Nợ mục không thể được liên kết với một {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Tài khoản {0} không tồn tại
 DocType: Account,Cash,Tiền mặt
 DocType: Employee,Short biography for website and other publications.,Tiểu sử ngắn cho trang web và các ấn phẩm khác.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Hãy tạo cấu trúc lương cho nhân viên {0}
diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index 7c243478a1..547237b749 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,薪酬模式
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",如果需要按季节跟踪的话请选择“月度分布”。
 DocType: Employee,Divorced,离婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,警告：相同项目已经输入多次。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,警告：相同项目已经输入多次。
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,品目已同步
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允许项目将在一个事务中多次添加
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,取消此保修要求之前请先取消物料访问{0}
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,压实加烧结
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},价格表{0}需要制定货币
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,来自物料申请
+DocType: Purchase Order,Customer Contact,客户联系
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,来自物料申请
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 树
 DocType: Job Applicant,Job Applicant,求职者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,没有更多结果。
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,客户名称
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",所有和出口相关的字段，例如货币，汇率，出口总额，出口总计等，都可以在送货单，POS，报价单，销售发票，销售订单等系统里面找到。
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会计分录和维护余额操作针对的组(头)
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),杰出的{0}不能小于零（ {1} ）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),杰出的{0}不能小于零（ {1} ）
 DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
 DocType: Leave Type,Leave Type Name,假期类型名称
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,系列已成功更新
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,多个品目的价格。
 DocType: SMS Center,All Supplier Contact,所有供应商联系人
 DocType: Quality Inspection Reading,Parameter,参数
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,确认要重新开始生产订单吗：
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必须与{1}：{2}（{3} / {4}）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,新建假期申请
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,新建假期申请
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,银行汇票
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。为了保持客户明智的项目代码，并使其搜索根据自己的代码中使用这个选项
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
@@ -59,24 +59,24 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,显示变体
 DocType: Sales Invoice Item,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（负债）
 DocType: Employee Education,Year of Passing,按年排序
-sites/assets/js/erpnext.min.js +27,In Stock,库存
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,只能使支付对未付款的销售订单
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,库存
 DocType: Designation,Designation,指派
 DocType: Production Plan Item,Production Plan Item,生产计划项目
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},用户{0}已经被分配给员工{1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,使新的POS简介
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,医疗保健
 DocType: Purchase Invoice,Monthly,每月
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,发票
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),延迟支付（天）
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,邮件提醒
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defense
 DocType: Company,Abbr,缩写
 DocType: Appraisal Goal,Score (0-5),得分（0-5）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行＃{0}：
 DocType: Delivery Note,Vehicle No,车辆编号
-sites/assets/js/erpnext.min.js +55,Please select Price List,请选择价格表
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,请选择价格表
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,木工
 DocType: Production Order Operation,Work In Progress,在制品
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D打印
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,千克
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,开放的工作。
 DocType: Item Attribute,Increment,增量
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,选择仓库...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,广告
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 DocType: Payment Reconciliation,Reconcile,调和
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,杂货
 DocType: Quality Inspection Reading,Reading 1,阅读1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,创建银行分录
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,创建银行分录
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,养老基金
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,类型为仓库的账户必须指定仓库
 DocType: SMS Center,All Sales Person,所有的销售人员
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,核销成本中心
 DocType: Warehouse,Warehouse Detail,仓库详细信息
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
 DocType: Tax Rule,Tax Type,税收类型
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
 DocType: Item,Item Image (if not slideshow),品目图片(如果没有指定幻灯片)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名客户已存在
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,访客
 DocType: Quality Inspection,Get Specification Details,获取详细规格
 DocType: Lead,Interested,有兴趣
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,物料清单
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,开盘
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,开盘
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},从{0}至 {1}
 DocType: Item,Copy From Item Group,从品目组复制
 DocType: Journal Entry,Opening Entry,开放报名
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,产品查询
 DocType: Standard Reply,Owner,业主
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,请先输入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,请首先选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,请首先选择公司
 DocType: Employee Education,Under Graduate,本科
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,目标类型
 DocType: BOM,Total Cost,总成本
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,字首
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,耗材
 DocType: Upload Attendance,Import Log,导入日志
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,发送
+DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: SMS Center,All Contact,所有联系人
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
 DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
@@ -167,14 +169,14 @@ DocType: Journal Entry,Contra Entry,对销分录
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,显示的时间记录
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
 DocType: Delivery Note,Installation Status,安装状态
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于品目{0}的接收数量
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于品目{0}的接收数量
 DocType: Item,Supply Raw Materials for Purchase,供应原料采购
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,品目{0}必须是采购品目
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",下载此模板，填写相应的数据后上传。所有的日期和员工出勤记录将显示在模板里。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,品目{0}处于非活动或寿命终止状态
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,品目{0}处于非活动或寿命终止状态
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,销售发票提交后将会更新。
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,直
@@ -199,11 +201,10 @@ DocType: SMS Settings,Enter url parameter for message,请输入消息的URL参
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,规则适用的定价和折扣。
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},与此时间登录冲突{0} {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,房产价格必须适用于购买或出售
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},品目{0}的安装日期不能早于交付日期
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},品目{0}的安装日期不能早于交付日期
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣价目表率（％）
-sites/assets/js/form.min.js +279,Start,开始
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,开始
 DocType: User,First Name,姓
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,您的设置就完成了。正在刷新。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,全模铸造
 DocType: Offer Letter,Select Terms and Conditions,选择条款和条件
 DocType: Production Planning Tool,Sales Orders,销售订单
@@ -229,6 +230,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
 ,Production Orders in Progress,在建生产订单
 DocType: Lead,Address & Contact,地址及联系方式
+DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
 DocType: Newsletter List,Total Subscribers,用户总数
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,联系人姓名
@@ -236,19 +238,19 @@ DocType: Production Plan Item,SO Pending Qty,销售订单待定数量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,依上述条件创建工资单
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,请求您的报价。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,双人房
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,每年叶
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,请设置命名序列{0}通过设置>设置>命名系列
 DocType: Time Log,Will be updated when batched.,批处理后将会更新。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
 DocType: Bulk Email,Message,信息
 DocType: Item Website Specification,Item Website Specification,品目网站规格
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox的Key
 DocType: Payment Tool,Reference No,参考编号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,已禁止请假
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
 DocType: Stock Entry,Sales Invoice No,销售发票编号
@@ -260,8 +262,8 @@ DocType: Item,Minimum Order Qty,最小起订量
 DocType: Pricing Rule,Supplier Type,供应商类型
 DocType: Item,Publish in Hub,在发布中心
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,品目{0}已取消
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,物料申请
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,品目{0}已取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
 DocType: Item,Purchase Details,购买详情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供'表中的采购订单{1}
@@ -277,7 +279,7 @@ DocType: Notification Control,Notification Control,通知控制
 DocType: Lead,Suggestions,建议
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,为此区域设置品目群组特定的预算。你还可以设置“分布”，为预算启动季节性。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},请输入父帐户组仓库{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手机号码
 DocType: Maintenance Schedule,Generate Schedule,生成时间表
@@ -303,10 +305,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,新建库存计量单位
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循环引用错误
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,你真的要停止
 DocType: Communication,Closed,已关闭
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,大写金额（出口）将在送货单保存后显示。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,您确定要停止
 DocType: Lead,Industry,行业
 DocType: Employee,Job Profile,工作简介
 DocType: Newsletter,Newsletter,通讯
@@ -321,7 +321,7 @@ DocType: Sales Invoice Item,Delivery Note,送货单
 DocType: Dropbox Backup,Allow Dropbox Access,允许访问Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0}输入两次项税
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0}输入两次项税
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本周和待活动总结
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,请选择年份和月份
@@ -338,10 +338,10 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,速率客户货币转换成客户的基础货币
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",可在物料清单，送货单，采购发票，生产订单，采购订单，采购收据，销售发票，销售订单，仓储记录，时间表里面找到
 DocType: Item Tax,Tax Rate,税率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,选择项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,选择项目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",品目{0}通过批次管理，不能通过库存盘点进行盘点，请使用库存登记
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,转换为非集团
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,购买收据必须提交
@@ -349,7 +349,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,当前库存计量单位
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,产品批次(patch)/批(lot)。
 DocType: C-Form Invoice Detail,Invoice Date,发票日期
 DocType: GL Entry,Debit Amount,借方金额
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,您的电子邮件地址
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
@@ -359,7 +359,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,说明
 DocType: Quality Inspection,Inspected By,验货人
 DocType: Maintenance Visit,Maintenance Type,维护类型
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},序列号{0}不属于送货单{1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},序列号{0}不属于送货单{1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,品目质量检验参数
 DocType: Leave Application,Leave Approver Name,假期审批人姓名
 ,Schedule Date,计划任务日期
@@ -378,7 +378,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,购买注册
 DocType: Landed Cost Item,Applicable Charges,适用费用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
 DocType: Purchase Receipt,Vehicle Date,车日期
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,医药
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丢失
@@ -399,6 +399,7 @@ DocType: Delivery Note,% Installed,％已安装
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,请先输入公司名称
 DocType: BOM,Item Desription,品目说明
 DocType: Purchase Invoice,Supplier Name,供应商名称
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,阅读ERPNext手册
 DocType: Account,Is Group,是集团
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自动设置序列号的基础上FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,检查供应商发票编号唯一性
@@ -414,13 +415,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,销售经理大
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假期大师
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,外壳成型
 DocType: Material Request Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,请输入产品编号。
 DocType: BOM,Costing,成本核算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果勾选，税金将被当成已包括在打印税率/打印总额内。
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,总数量
@@ -443,31 +444,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),时间操作
 DocType: Customer,Buyer of Goods and Services.,产品和服务购买者。
 DocType: Journal Entry,Accounts Payable,应付帐款
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,添加订阅
-sites/assets/js/erpnext.min.js +5,""" does not exists",“不存在
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“不存在
 DocType: Pricing Rule,Valid Upto,有效期至
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接收益
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,行政主任
 DocType: Payment Tool,Received Or Paid,收到或支付
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,请选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,请选择公司
 DocType: Stock Entry,Difference Account,差异科目
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,不能因为其依赖的任务{0}没有关闭关闭任务。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,请重新拉。
 DocType: Production Order,Additional Operating Cost,额外的运营成本
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化妆品
 DocType: DocField,Type,类型
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
 DocType: Communication,Subject,主题
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 ,Serial No Warranty Expiry,序列号/保修到期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,确认要停止此物料申请吗？
 DocType: Sales Order,To Deliver,为了提供
 DocType: Purchase Invoice Item,Item,品目
 DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
 DocType: Account,Profit and Loss,损益
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,管理转包
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,管理转包
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,新计量单位的类型不能是整数
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,factory furniture and fixtures
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,速率价目表货币转换为公司的基础货币
@@ -487,7 +487,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费
 DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0}，因为它采用的是现货交易
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),结算(信用)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),结算(信用)
 DocType: Serial No,Warranty Period (Days),保修期限（天数）
 DocType: Installation Note Item,Installation Note Item,安装单品目
 ,Pending Qty,待定数量
@@ -519,8 +519,9 @@ DocType: Sales Order,Billing and Delivery Status,结算和交货状态
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回头客
 DocType: Leave Control Panel,Allocate,调配
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,以前
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,销售退货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,销售退货
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,选择该生产订单的源销售订单。
+DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,工资构成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在客户数据库。
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,客户数据库。
@@ -531,7 +532,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,翻筋斗
 DocType: Purchase Order Item,Billed Amt,已开票金额
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,库存记录针对的逻辑仓库。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},参考号与参考日期须为{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},参考号与参考日期须为{0}
 DocType: Event,Wednesday,星期三
 DocType: Sales Invoice,Customer's Vendor,客户的供应商
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,生产订单是强制性
@@ -564,8 +565,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,接收机参数
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
 DocType: Sales Person,Sales Person Targets,销售人员目标
-sites/assets/js/form.min.js +271,To,到
-apps/frappe/frappe/templates/base.html +143,Please enter email address,请输入您的电子邮件地址
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,到
+apps/frappe/frappe/templates/base.html +145,Please enter email address,请输入您的电子邮件地址
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,尾管成型
 DocType: Production Order Operation,In minutes,已分钟为单位
 DocType: Issue,Resolution Date,决议日期
@@ -582,7 +583,7 @@ DocType: Activity Cost,Projects User,项目用户
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,已消耗
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}：{1}在发票明细表中无法找到
 DocType: Company,Round Off Cost Center,四舍五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
 DocType: Material Request,Material Transfer,物料转移
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),开幕（博士）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},发布时间标记必须经过{0}
@@ -590,9 +591,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,设置
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本税费
 DocType: Production Order Operation,Actual Start Time,实际开始时间
 DocType: BOM Operation,Operation Time,操作时间
-sites/assets/js/list.min.js +5,More,更多
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,更多
 DocType: Pricing Rule,Sales Manager,销售经理
-sites/assets/js/desk.min.js +7673,Rename,重命名
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,重命名
 DocType: Journal Entry,Write Off Amount,核销金额
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,弯曲
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,允许用户
@@ -608,13 +609,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,直剪
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,在基于其序列号的销售和采购文件跟踪的项目。这也可以用来跟踪商品的保修细节。
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,拒绝仓库是必须反对regected项目
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,拒绝仓库是必须反对regected项目
 DocType: Account,Expenses Included In Valuation,开支计入估值
 DocType: Employee,Provide email id registered in company,提供的电子邮件ID在公司注册
 DocType: Hub Settings,Seller City,卖家城市
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
 DocType: Offer Letter Term,Offer Letter Term,报价函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,项目已变种。
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,项目已变种。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,品目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,树类型
@@ -629,11 +630,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,欢迎
 DocType: Journal Entry,Credit Card Entry,信用卡分录
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,任务主题
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,来自供应商的已收入成品。
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,来自供应商的已收入成品。
 DocType: Communication,Open,开
 DocType: Lead,Campaign Name,活动名称
 ,Reserved,保留的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,确认要重新开始吗
 DocType: Purchase Order,Supply Raw Materials,供应原料
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,下一次发票生成的日期，提交时将会生成。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流动资产
@@ -649,7 +649,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
 DocType: Employee,Cell Number,手机号码
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,“对日记账分录”不能选择此凭证。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,“对日记账分录”不能选择此凭证。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,从机会
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月度工资结算
@@ -710,7 +710,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,负债
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
 DocType: Company,Default Cost of Goods Sold Account,销货账户的默认成本
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,价格列表没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,发送电​​子邮件
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,无此权限
@@ -721,7 +721,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,具有较高权重的项目将显示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐详细
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,我的发票
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,未找到任何雇员
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,未找到任何雇员
 DocType: Purchase Order,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,选择BOM展开
@@ -730,7 +730,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,通过CSV
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即发送
 ,Support Analytics,客户支持分析
 DocType: Item,Website Warehouse,网站仓库
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,你真的要停止生产订单：
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必须小于或等于5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-表记录
@@ -740,12 +739,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,来
 DocType: Features Setup,"To enable ""Point of Sale"" features",为了使“销售点”的特点
 DocType: Bin,Moving Average Rate,移动平均价格
 DocType: Production Planning Tool,Select Items,选择品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
 DocType: Comment,Reference Name,参考名称
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: Sales Invoice Item,Target Warehouse,目标仓库
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,预计交货日期不能早于销售订单日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,预计交货日期不能早于销售订单日期
 DocType: Upload Attendance,Import Attendance,导入考勤记录
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,所有品目群组
 DocType: Process Payroll,Activity Log,活动日志
@@ -753,7 +752,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
 DocType: Production Order,Item To Manufacture,要生产的品目
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,永久模铸造
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,采购订单到付款
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的状态为{2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,采购订单到付款
 DocType: Sales Order Item,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通讯经理
@@ -777,8 +777,8 @@ DocType: SMS Log,Requested Numbers,请求号码
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,绩效考核。
 DocType: Sales Invoice Item,Stock Details,股票详细信息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,项目价值
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,销售点
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},无法顺延{0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,销售点
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},无法顺延{0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",账户余额已设置为'贷方'，不能设置为'借方'
 DocType: Account,Balance must be,余额必须是
 DocType: Hub Settings,Publish Pricing,发布定价
@@ -800,7 +800,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,收到的项目要被收取
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,喷砂
-sites/assets/js/desk.min.js +3938,Ms,女士
+DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,货币汇率大师
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
@@ -822,29 +822,31 @@ DocType: Purchase Receipt,Range,范围
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Features Setup,Item Barcode,品目条码
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,品目变种{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,品目变种{0}已更新
 DocType: Quality Inspection Reading,Reading 6,6阅读
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
 DocType: Address,Shop,商店
 DocType: Hub Settings,Sync Now,立即同步
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,选择此模式时POS发票的银行/现金账户将会被自动更新。
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,你的品牌
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
 DocType: Employee,Exit Interview Details,退出面试细节
 DocType: Item,Is Purchase Item,是否采购品目
 DocType: Journal Entry Account,Purchase Invoice,购买发票
 DocType: Stock Ledger Entry,Voucher Detail No,凭证详情编号
 DocType: Stock Entry,Total Outgoing Value,即将离任的总价值
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,开幕日期和截止日期应在同一会计年度
 DocType: Lead,Request for Information,索取资料
 DocType: Payment Tool,Paid,付费
 DocType: Salary Slip,Total in words,总字
 DocType: Material Request Item,Lead Time Date,交货时间日期
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,是强制性的。也许外币兑换记录没有创建
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请注明序号为项目{1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,向客户发货。
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,向客户发货。
 DocType: Purchase Invoice Item,Purchase Order Item,采购订单项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,间接收益
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,将付款金额=未偿还
@@ -852,13 +854,14 @@ DocType: Contact Us Settings,Address Line 1,地址行1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,方差
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,公司名称
 DocType: SMS Center,Total Message(s),总信息（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有帮助影片名单
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,请选择支票存入的银行账户头。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允许用户编辑交易中的价目表率。
 DocType: Pricing Rule,Max Qty,最大数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,化学品
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
 DocType: Process Payroll,Select Payroll Year and Month,选择薪资年和月
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",转到相应的组（通常资金运用>流动资产>银行帐户，并创建一个新帐户（通过点击添加类型的儿童），“银行”
 DocType: Workstation,Electricity Cost,电力成本
@@ -873,7 +876,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,白
 DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,附上你的照片
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,使
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,使
 DocType: Journal Entry,Total Amount in Words,总金额词
 DocType: Workflow State,Stop,停止
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,发生了错误，一个可能的原因可能是您没有保存表单。如果问题仍然存在请联系管理员或support@erpnext.com。
@@ -897,7 +900,7 @@ DocType: Packing Slip Item,Packing Slip Item,装箱单项目
 DocType: POS Profile,Cash/Bank Account,现金/银行账户
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能为负
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,备案
@@ -908,12 +911,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',如果时间日
 DocType: Project,Internal,内部
 DocType: Task,Urgent,加急
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},请指定行{0}在表中的有效行ID {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,转到桌面和开始使用ERPNext
 DocType: Item,Manufacturer,制造商
 DocType: Landed Cost Item,Purchase Receipt Item,采购入库项目
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,销售金额
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,时间日志
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本条目的开支审批人，请更新并保存其状态。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本条目的开支审批人，请更新并保存其状态。
 DocType: Serial No,Creation Document No,创建文档编号
 DocType: Issue,Issue,问题
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
@@ -928,8 +932,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},销售订单{0} {1}
 DocType: Opportunity,Contact Info,联系方式
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,制作Stock条目
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,制作Stock条目
 DocType: Packing Slip,Net Weight UOM,净重计量单位
 DocType: Item,Default Supplier,默认供应商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,对生产补贴比例
@@ -938,7 +943,7 @@ DocType: Features Setup,Miscelleneous,杂项
 DocType: Holiday List,Get Weekly Off Dates,获取周末日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,结束日期不能小于开始日期
 DocType: Sales Person,Select company name first.,请先选择公司名称。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,借方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,借方
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,通过时间更新日志
@@ -966,7 +971,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司注册号码，供大家参考。税务号码等
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
 ,Ordered Items To Be Billed,订购物品被标榜
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,从范围必须小于要范围
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,选择时间记录然后提交来创建一个新的销售发票。
@@ -1014,7 +1019,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,税项
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
 DocType: Account,Warehouse,仓库
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
 ,Purchase Order Items To Be Billed,采购订单的项目被标榜
 DocType: Purchase Invoice Item,Net Rate,净费率
 DocType: Purchase Invoice Item,Purchase Invoice Item,采购发票项目
@@ -1029,11 +1034,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,未核销付款详
 DocType: Global Defaults,Current Fiscal Year,当前财年
 DocType: Global Defaults,Disable Rounded Total,禁用总计化整
 DocType: Lead,Call,通话
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,“分录”不能为空
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,“分录”不能为空
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重复的行{0}同{1}
 ,Trial Balance,试算表
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,建立职工
-sites/assets/js/erpnext.min.js +5,"Grid """,网格“
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,建立职工
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,网格“
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,请选择前缀第一
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,研究
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
@@ -1043,14 +1048,15 @@ DocType: Communication,Sent,已发送
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,查看总帐
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已经存在，请更名
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已经存在，请更名
 DocType: Communication,Delivery Status,交货状态
 DocType: Production Order,Manufacture against Sales Order,按销售订单生产
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
 ,Budget Variance Report,预算差异报告
 DocType: Salary Slip,Gross Pay,工资总额
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,股利支付
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,会计总帐
 DocType: Stock Reconciliation,Difference Amount,差额
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,留存收益
 DocType: BOM Item,Item Description,品目说明
@@ -1064,15 +1070,17 @@ DocType: Opportunity Item,Opportunity Item,项目的机会
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,临时开通
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,雇员假期余量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
 DocType: Address,Address Type,地址类型
 DocType: Purchase Receipt,Rejected Warehouse,拒绝仓库
 DocType: GL Entry,Against Voucher,对凭证
 DocType: Item,Default Buying Cost Center,默认采购成本中心
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",为了获得最好ERPNext，我们建议您花一些时间和观看这些帮助视频。
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,品目{0}必须是销售品目
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,至
 DocType: Item,Lead Time in days,在天交货期
 ,Accounts Payable Summary,应付帐款摘要
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
 DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,销售订单{0}无效
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",抱歉，公司不能合并
@@ -1088,7 +1096,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,签发地点
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,合同
 DocType: Report,Disabled,已禁用
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,间接支出
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}：数量是强制性的
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,农业
@@ -1097,13 +1105,13 @@ DocType: Mode of Payment,Mode of Payment,付款方式
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,请先输入项目
 DocType: Journal Entry Account,Purchase Order,采购订单
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
-sites/assets/js/form.min.js +190,Name is required,名称是必须项
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,名称是必须项
 DocType: Purchase Invoice,Recurring Type,经常性类型
 DocType: Address,City/Town,市/镇
 DocType: Email Digest,Annual Income,年收入
 DocType: Serial No,Serial No Details,序列号详情
 DocType: Purchase Invoice Item,Item Tax Rate,品目税率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,品目{0}必须是外包品目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,资本设备
@@ -1114,14 +1122,14 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,目标
 DocType: Sales Invoice Item,Edit Description,编辑说明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,预计交付日期比计划开始日期较小。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,对供应商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,设置帐户类型有助于在交易中选择该帐户。
 DocType: Purchase Invoice,Grand Total (Company Currency),总计（公司货币）
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,即将离任的总
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",“至值”为0或为空的运输规则条件最多只能有一个
 DocType: Authorization Rule,Transaction,交易
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：此成本中心是一个组，会计分录不能对组录入。
-apps/erpnext/erpnext/config/projects.py +43,Tools,工具
+apps/frappe/frappe/config/desk.py +7,Tools,工具
 DocType: Item,Website Item Groups,网站物件组
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,生产订单号码是强制性的股票入门目的制造
 DocType: Purchase Invoice,Total (Company Currency),总（公司货币）
@@ -1131,7 +1139,7 @@ DocType: Workstation,Workstation Name,工作站名称
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
 DocType: Sales Partner,Target Distribution,目标分布
-sites/assets/js/desk.min.js +7652,Comments,评论
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,评论
 DocType: Salary Slip,Bank Account No.,银行账号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,这就是以这个前缀的最后一个创建的事务数
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},物件{0}需要估值率
@@ -1146,7 +1154,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,请选择一
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,特权休假
 DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,您需要启用购物车
-sites/assets/js/form.min.js +212,No Data,无数据
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,无数据
 DocType: Appraisal Template Goal,Appraisal Template Goal,评估目标模板
 DocType: Salary Slip,Earning,盈余
 DocType: Payment Tool,Party Account Currency,党的账户币种
@@ -1154,7 +1162,7 @@ DocType: Payment Tool,Party Account Currency,党的账户币种
 DocType: Purchase Taxes and Charges,Add or Deduct,添加或扣除
 DocType: Company,If Yearly Budget Exceeded (for expense account),如果年度预算超出（用于报销）
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,之间存在重叠的条件：
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,总订单价值
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,食品
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,账龄范围3
@@ -1162,11 +1170,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,访问数量
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",发给联系人和潜在客户的通讯
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在关闭帐户的货币必须是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},对所有目标点的总和应该是100。{0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,操作不能留空。
 ,Delivered Items To Be Billed,无开账单的已交付品目
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,仓库不能为序​​列号变更
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},状态已更新为{0}
 DocType: DocField,Description,描述
 DocType: Authorization Rule,Average Discount,平均折扣
 DocType: Letter Head,Is Default,是否默认
@@ -1194,7 +1202,7 @@ DocType: Purchase Invoice Item,Item Tax Amount,品目税额
 DocType: Item,Maintain Stock,维持股票
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,生产订单已创建Stock条目
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大值：{0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,起始时间日期
 DocType: Email Digest,For Company,对公司
@@ -1204,7 +1212,7 @@ DocType: Sales Invoice,Shipping Address Name,送货地址姓名
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,品目{0}不是库存品目
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,品目{0}不是库存品目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依赖于无薪休假
@@ -1217,7 +1225,7 @@ DocType: Warranty Claim,Warranty / AMC Status,保修/ 年度保养合同状态
 DocType: GL Entry,GL Entry,总账分录
 DocType: HR Settings,Employee Settings,雇员设置
 ,Batch-Wise Balance History,批次余额历史
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,待办事项列表
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,待办事项列表
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,学徒
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,负数量是不允许的
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1249,13 +1257,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,办公室租金
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,短信网关的设置
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,导入失败！
-sites/assets/js/erpnext.min.js +24,No address added yet.,未添加地址。
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,未添加地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作时间
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,分析员
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必须小于或等于合资量{2}
 DocType: Item,Inventory,库存
 DocType: Features Setup,"To enable ""Point of Sale"" view",为了让观“销售点”
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,付款方式不能为空购物车制造
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,付款方式不能为空购物车制造
 DocType: Item,Sales Details,销售详情
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,钢钉
 DocType: Opportunity,With Items,随着项目
@@ -1265,7 +1273,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",在这接下来的发票将生成的日期。它在提交生成。
 DocType: Item Attribute,Item Attribute,品目属性
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,政府
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,项目变体
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,项目变体
 DocType: Company,Services,服务
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),总计（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
@@ -1275,11 +1283,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,财政年度开始日期
 DocType: Employee External Work History,Total Experience,总经验
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,扩孔
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,装箱单（ S）取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,装箱单（ S）取消
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,货运及转运费
 DocType: Material Request Item,Sales Order No,销售订单编号
 DocType: Item Group,Item Group Name,品目群组名称
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,已经过
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,已经过
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,转移制造材料
 DocType: Pricing Rule,For Price List,对价格表
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,猎头
@@ -1288,8 +1296,7 @@ DocType: Maintenance Schedule,Schedules,计划任务
 DocType: Purchase Invoice Item,Net Amount,净额
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),额外的优惠金额（公司货币）
-DocType: Period Closing Voucher,CoA Help,CoA帮助
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},错误： {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},错误： {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,请从科目表创建新帐户。
 DocType: Maintenance Visit,Maintenance Visit,维护访问
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客户>客户群组>地区
@@ -1300,6 +1307,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,到岸成本帮助
 DocType: Event,Tuesday,星期二
 DocType: Leave Block List,Block Holidays on important days.,禁止重要日子的假期。
 ,Accounts Receivable Summary,应收账款汇总
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},叶为已分配给员工{1}的期间类型{0} {2}  -  {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,请在员工记录设置员工角色设置用户ID字段
 DocType: UOM,UOM Name,计量单位名称
 DocType: Top Bar Item,Target,目标
@@ -1320,19 +1328,19 @@ DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},会计分录为{0}只能在货币进行：{1}
 DocType: Pricing Rule,Pricing Rule,定价规则
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,开槽
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,材料要求采购订单
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,材料要求采购订单
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的项目{1}不存在{2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,银行账户
 ,Bank Reconciliation Statement,银行对帐表
 DocType: Address,Lead Name,线索姓名
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期初存货余额
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,期初存货余额
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}只能出现一次
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允许转院更多{0}不是{1}对采购订单{2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},已成功为{0}调配假期
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},已成功为{0}调配假期
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,未选择品目
 DocType: Shipping Rule Condition,From Value,起始值
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,生产数量为必须项
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,生产数量为必须项
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,银行无记录的数额
 DocType: Quality Inspection Reading,Reading 4,4阅读
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,公司开支报销
@@ -1345,19 +1353,20 @@ DocType: Opportunity,Contact Mobile No,联系人手机号码
 DocType: Production Planning Tool,Select Sales Orders,选择销售订单
 ,Material Requests for which Supplier Quotations are not created,无供应商报价的物料申请
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,要使用条形码跟踪项目。您将能够通过扫描物品条码，进入交货单和销售发票的项目。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,标记为交付
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,请报价
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
 DocType: SMS Center,Receiver List,接收器列表
 DocType: Payment Tool Detail,Payment Amount,付款金额
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
-sites/assets/js/erpnext.min.js +51,{0} View,{0}查看
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}查看
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬结构扣款
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,选择性激光烧结
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,导入成功！
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},数量不能超过{0}
@@ -1378,7 +1387,7 @@ DocType: Company,Default Payable Account,默认应付账户
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格表等的设置
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,安装完成
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％帐单
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,保留数量
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,保留数量
 DocType: Party Account,Party Account,党的帐户
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,人力资源
 DocType: Lead,Upper Income,高收入
@@ -1421,11 +1430,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,启用购物车
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,品目{0}必须是服务品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推动打击{0} {1}不能大于付出\超过总计{2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,请选择商品代码
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),减少扣除停薪留职（LWP）
 DocType: Territory,Territory Manager,区域经理
+DocType: Delivery Note Item,To Warehouse (Optional),仓库（可选）
 DocType: Sales Invoice,Paid Amount (Company Currency),支付的金额（公司货币）
 DocType: Purchase Invoice,Additional Discount,更多优惠
 DocType: Selling Settings,Selling Settings,销售设置
@@ -1448,7 +1458,7 @@ DocType: Item,Weightage,权重
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,矿业
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,树脂浇注
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户群组已经存在，请更改客户姓名或重命名客户集团
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,请选择{0}第一。
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,请选择{0}第一。
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
 DocType: Territory,Parent Territory,家长领地
 DocType: Quality Inspection Reading,Reading 2,阅读2
@@ -1476,11 +1486,11 @@ DocType: Sales Invoice Item,Batch No,批号
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允许多个销售订单对客户的采购订单
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,主
 DocType: DocPerm,Delete,删除
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,变体
-sites/assets/js/desk.min.js +7971,New {0},新建{0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,变体
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新建{0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消，请先点击“重新开始”
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消，请先点击“重新开始”
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
 DocType: Employee,Leave Encashed?,假期已使用？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,机会从字段是强制性的
 DocType: Item,Variants,变种
@@ -1498,7 +1508,7 @@ DocType: Supplier,Statutory info and other general information about your Suppli
 DocType: Country,Country,国家
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,地址
 DocType: Communication,Received,收到
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,航运规则的一个条件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,项目是不允许有生产订单。
@@ -1519,7 +1529,6 @@ DocType: Employee,Salutation,称呼
 DocType: Communication,Rejected,拒绝
 DocType: Pricing Rule,Brand,品牌
 DocType: Item,Will also apply for variants,会同时应用于变体
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,％已交付
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,在销售时捆绑品目。
 DocType: Sales Order Item,Actual Qty,实际数量
 DocType: Sales Invoice Item,References,参考
@@ -1557,14 +1566,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,剪毛
 DocType: Item,Has Variants,有变体
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,单击“创建销售发票”按钮来创建一个新的销售发票。
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,期间从和周期要强制日期为重复％S
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,包装和标签
 DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
 DocType: Sales Person,Parent Sales Person,母公司销售人员
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,请在公司主及全球默认指定默认货币
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox的密码
 DocType: Purchase Invoice,Recurring Invoice,经常性发票
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,项目管理
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,项目管理
 DocType: Supplier,Supplier of Goods or Services.,提供商品或服务的供应商。
 DocType: Budget Detail,Fiscal Year,财政年度
 DocType: Cost Center,Budget,预算
@@ -1593,11 +1601,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,销售
 DocType: Employee,Salary Information,薪资信息
 DocType: Sales Person,Name and Employee ID,姓名和雇员ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,到期日不能前于过账日期
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,到期日不能前于过账日期
 DocType: Website Item Group,Website Item Group,网站物件组
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,关税与税项
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,参考日期请输入
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0}付款项不能由过滤{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,参考日期请输入
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款项不能由过滤{1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,将在网站显示的物件表
 DocType: Purchase Order Item Supplied,Supplied Qty,附送数量
 DocType: Material Request Item,Material Request Item,物料申请品目
@@ -1605,7 +1613,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,树的项目组
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,此收取类型不能引用大于或等于本行的数据。
 ,Item-wise Purchase History,品目特定的采购历史
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,红
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
 DocType: Account,Frozen,冻结的
 ,Open Production Orders,清生产订单
 DocType: Installation Note,Installation Time,安装时间
@@ -1649,13 +1657,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},品目{0}的品目群组没有设置
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,入借帐户必须是应收账科目
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",此品目必须是库存品目，因为它可以生成生产订单
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",此品目必须是库存品目，因为它可以生成生产订单
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,加盟
 DocType: Authorization Rule,Above Value,上述值
 ,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,已交付
+DocType: Purchase Order,Delivered,已交付
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),设置接收简历的电子邮件地址 。 （例如jobs@example.com ）
 DocType: Purchase Receipt,Vehicle Number,车号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,经常性发票终止日期
@@ -1672,10 +1680,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,费用分配基于
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产项目，所以科目{0}的类型必须为“固定资产”
 DocType: HR Settings,HR Settings,人力资源设置
 apps/frappe/frappe/config/setup.py +130,Printing,印花
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,你要申请的假期位于假日内，无需请假。
-sites/assets/js/desk.min.js +7805,and,和
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,和
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,缩写不能为空或空间
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,体育
@@ -1712,7 +1720,6 @@ DocType: Opportunity,Quotation,报价
 DocType: Salary Slip,Total Deduction,扣除总额
 DocType: Quotation,Maintenance User,维护用户
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,成本更新
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,确定要重新开始吗
 DocType: Employee,Date of Birth,出生日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,品目{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
@@ -1728,13 +1735,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪销售活动。追踪来自活动的潜在客户，报价，销售订单等，统计投资回报率。
 DocType: Expense Claim,Approver,审批者
 ,SO Qty,销售订单数量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",此库存记录已经出现在仓库{0}中，所以你不能重新指定或更改仓库
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",此库存记录已经出现在仓库{0}中，所以你不能重新指定或更改仓库
 DocType: Appraisal,Calculate Total Score,计算总分
 DocType: Supplier Quotation,Manufacturing Manager,生产经理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,分裂送货单成包。
 apps/erpnext/erpnext/hooks.py +84,Shipments,发货
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,浸成型
+DocType: Purchase Order,To be delivered to customer,要传送给客户
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,时间日志状态必须被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,正在设置
@@ -1759,11 +1767,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,源货币
 DocType: DocField,Name,名称
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},销售订单为品目{0}的必须项
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},销售订单为品目{0}的必须项
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,系统无记录的数额
 DocType: Purchase Invoice Item,Rate (Company Currency),率（公司货币）
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,他人
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,设为停​​止
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。
 DocType: POS Profile,Taxes and Charges,税项和收费
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",一个已购买、被出售或者保留在库存的产品或服务。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
@@ -1772,19 +1780,20 @@ DocType: Web Form,Select DocType,选择文档类型
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,拉床
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,银行业
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取时间表
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,新建成本中心
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新建成本中心
 DocType: Bin,Ordered Quantity,订购数量
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
 DocType: Quality Inspection,In Process,进行中
 DocType: Authorization Rule,Itemwise Discount,品目特定的折扣
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0}对销售订单{1}
+DocType: Purchase Order Item,Reference Document Type,参考文档类型
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0}对销售订单{1}
 DocType: Account,Fixed Asset,固定资产
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,序列化库存
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,序列化库存
 DocType: Activity Type,Default Billing Rate,默认计费率
 DocType: Time Log Batch,Total Billing Amount,总结算金额
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,应收账款
 ,Stock Balance,库存余额
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,销售订单到付款
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,销售订单到付款
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,时间日志创建：
 DocType: Item,Weight UOM,重量计量单位
@@ -1820,10 +1829,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
 DocType: Production Order Operation,Completed Qty,已完成数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,价格表{0}被禁用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,价格表{0}被禁用
 DocType: Manufacturing Settings,Allow Overtime,允许加班
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,销售订单{0}的状态为已停止
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}需要的产品序列号{1}。您所提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值价格
 DocType: Item,Customer Item Codes,客户项目代码
@@ -1832,9 +1840,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,焊接
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,新库存计量单位是必须项
 DocType: Quality Inspection,Sample Size,样本大小
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,所有品目已开具发票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,所有品目已开具发票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',请指定一个有效的“从案号”
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,品目序列号
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用户和权限
@@ -1861,7 +1869,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,地址及联系方式
 DocType: SMS Log,Sender Name,发件人名称
 DocType: Page,Title,标题
-sites/assets/js/list.min.js +104,Customize,定制
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,定制
 DocType: POS Profile,[Select],[选择]
 DocType: SMS Log,Sent To,发给
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,创建销售发票
@@ -1886,12 +1894,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,寿命结束
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,旅游
 DocType: Leave Block List,Allow Users,允许用户(多个)
+DocType: Purchase Order,Customer Mobile No,客户手机号码
 DocType: Sales Invoice,Recurring,经常性
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪独立收入和支出进行产品垂直或部门。
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,品目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,转印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
@@ -1914,7 +1923,7 @@ DocType: Appraisal,Employee,雇员
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,导入电子邮件发件人
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,邀请成为用户
 DocType: Features Setup,After Sale Installations,售后安装
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1}已完全开票
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1}已完全开票
 DocType: Workstation Working Hour,End Time,结束时间
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,销售或采购的标准合同条款。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,基于凭证分组
@@ -1923,8 +1932,9 @@ DocType: Sales Invoice,Mass Mailing,邮件群发
 DocType: Page,Standard,标准
 DocType: Rename Tool,File to Rename,文件重命名
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,显示支付
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,尺寸
 DocType: Notification Control,Expense Claim Approved,报销批准
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,医药
@@ -1943,8 +1953,8 @@ DocType: Upload Attendance,Attendance To Date,考勤结束日期
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),设置接收销售信息的电子邮件地址 。 （例如sales@example.com ）
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Tool,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,请注明公司进行
-sites/assets/js/list.min.js +23,Draft,草稿
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,请注明公司进行
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,草稿
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,补假
 DocType: Quality Inspection Reading,Accepted,已接受
 DocType: User,Female,女
@@ -1957,14 +1967,15 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料不能为空。
 DocType: Newsletter,Test,测试
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",由于有存量交易为这个项目，\你不能改变的值'有序列号'，'有批号'，'是股票项目“和”评估方法“
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,快速日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM被引用后你不能更改其税率
 DocType: Employee,Previous Work Experience,以前的工作经验
 DocType: Stock Entry,For Quantity,对于数量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1}未提交
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,请求的项目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1}未提交
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完成安装
@@ -1976,7 +1987,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,时事通讯录
 DocType: Delivery Note,Transporter Name,转运名称
 DocType: Contact,Enter department to which this Contact belongs,输入此联系人所属的部门
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,共缺席
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,计量单位
 DocType: Fiscal Year,Year End Date,年度开始日期
 DocType: Task Depends On,Task Depends On,任务取决于
@@ -2002,7 +2013,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,销售公司产品的第三方分销商/经销商/代理商/分支机构/分销商
 DocType: Customer Group,Has Child Node,有子节点
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0}对采购订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0}对采购订单{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","请输入静态的URL参数(例如 sender=ERPNext, username=ERPNext, password=1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}在没有任何活动的会计年度。详情查看{2}。
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
@@ -2045,11 +2056,9 @@ DocType: Note,Note,注
 DocType: Purchase Receipt Item,Recd Quantity,RECD数量
 DocType: Email Account,Email Ids,电子邮件ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,设为堵塞通
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,股票输入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,股票输入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 DocType: Tax Rule,Billing City,结算城市
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,这请假申请正在等待批准。只有请假审批者可以更新状态。
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
 DocType: Journal Entry,Credit Note,贷项通知单
@@ -2070,7 +2079,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),总计（数量）
 DocType: Installation Note Item,Installed Qty,已安装数量
 DocType: Lead,Fax,传真
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,已提交
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,已提交
 DocType: Salary Structure,Total Earning,总盈利
 DocType: Purchase Receipt,Time at which materials were received,收到材料在哪个时间
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,我的地址
@@ -2079,7 +2088,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,组织分支
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,要么
 DocType: Sales Order,Billing Status,账单状态
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,基础设施费用
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90以上
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,默认采购价格表
 ,Download Backups,下载备份
 DocType: Notification Control,Sales Order Message,销售订单信息
@@ -2088,7 +2097,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,选择雇员
 DocType: Bank Reconciliation,To Date,至今
 DocType: Opportunity,Potential Sales Deal,潜在的销售交易
-sites/assets/js/form.min.js +308,Details,详细信息
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,详细信息
 DocType: Purchase Invoice,Total Taxes and Charges,总营业税金及费用
 DocType: Employee,Emergency Contact,紧急联络人
 DocType: Item,Quality Parameters,质量参数
@@ -2103,7 +2112,7 @@ DocType: Purchase Order Item,Received Qty,收到数量
 DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
 DocType: Product Bundle,Parent Item,父项目
 DocType: Account,Account Type,账户类型
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
 ,To Produce,以生产
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",对于行{0} {1}。以包括{2}中的档案速率，行{3}也必须包括
 DocType: Packing Slip,Identification of the package for the delivery (for print),打包品目的名称
@@ -2114,7 +2123,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,压扁
 DocType: Account,Income Account,收益账户
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,模
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,交货
 DocType: Stock Reconciliation Item,Current Qty,目前数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",参见成本部分的“材料价格基于”
 DocType: Appraisal Goal,Key Responsibility Area,关键责任区
@@ -2145,9 +2154,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
 DocType: User,Bio,生物
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客户群组
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,新建成本中心名称
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,新建成本中心名称
 DocType: Leave Control Panel,Leave Control Panel,假期控制面板
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,没有找到默认的地址模板。请从设置 > 打印和品牌 >地址模板中创建一个。
 DocType: Appraisal,HR User,HR用户
@@ -2166,24 +2175,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,支付工具的详细信息
 ,Sales Browser,销售列表
 DocType: Journal Entry,Total Credit,总积分
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},警告：另一个{0}＃{1}存在对股票入门{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,当地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},警告：另一个{0}＃{1}存在对股票入门{2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,当地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),贷款及垫款（资产）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,债务人
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,大
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,未找到任何雇员！
 DocType: C-Form Invoice Detail,Territory,区域
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,请注明无需访问
+DocType: Purchase Order,Customer Address Display,客户地址显示
 DocType: Stock Settings,Default Valuation Method,默认估值方法
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,抛光
 DocType: Production Order Operation,Planned Start Time,计划开始时间
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,已调配
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",测度项目的默认单位{0}不能直接改变，因为\你已经做了一些交易（S）与其他计量单位。要更改默认的计量单位，\使用“计量单位更换工具”下的股票模块工具。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,报价{0}已被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,报价{0}已被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未偿还总额
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,雇员{0}在{1}日休假，不能标记考勤。
 DocType: Sales Partner,Targets,目标
@@ -2198,12 +2207,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ERPNext是一个开源的基于Web的ERP系统通过网络注技术私人有限公司向提供集成的工具，在一个小的组织管理大多数进程。有关Web注释，或购买托管楝更多信息，请访问
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,请设置您的会计科目表你开始会计分录前
 DocType: Purchase Invoice,Ignore Pricing Rule,忽略定价规则
-sites/assets/js/list.min.js +24,Cancelled,已取消
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,已取消
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,从薪酬结构日期不能高于员工加入日期较小。
 DocType: Employee Education,Graduate,研究生
 DocType: Leave Block List,Block Days,禁离日
 DocType: Journal Entry,Excise Entry,Excise分录
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：销售订单{0}已经存在针对客户的采购订单{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：销售订单{0}已经存在针对客户的采购订单{1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2248,17 +2257,17 @@ DocType: Account,Stock Received But Not Billed,已收货未开单的库存
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工资总额+欠费金额+兑现金额-总扣款金额
 DocType: Monthly Distribution,Distribution Name,分配名称
 DocType: Features Setup,Sales and Purchase,销售及采购
-DocType: Purchase Order Item,Material Request No,物料申请编号
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},品目{0}要求质量检验
+DocType: Supplier Quotation Item,Material Request No,物料申请编号
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},品目{0}要求质量检验
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,速率客户的货币转换为公司的基础货币
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}已经从这个名单退订成功！
 DocType: Purchase Invoice Item,Net Rate (Company Currency),净利率（公司货币）
-apps/frappe/frappe/templates/base.html +132,Added,添加
+apps/frappe/frappe/templates/base.html +134,Added,添加
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,管理区域
 DocType: Journal Entry Account,Sales Invoice,销售发票
 DocType: Journal Entry Account,Party Balance,党平衡
 DocType: Sales Invoice Item,Time Log Batch,时间日志批
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,请选择适用的折扣
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,请选择适用的折扣
 DocType: Company,Default Receivable Account,默认应收账户
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,为上述选择条件支付的工资总计创建银行分录
 DocType: Stock Entry,Material Transfer for Manufacture,用于生产的物料转移
@@ -2269,7 +2278,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,获取相关条目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,库存的会计分录
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,铸币
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,品目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,品目{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 apps/frappe/frappe/desk/query_report.py +136,Total,总
 DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
@@ -2284,13 +2293,15 @@ DocType: Quality Inspection,Quality Inspection,质量检验
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,超小
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,喷射成形
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,科目{0}已冻结
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL或BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},只能使支付对未付款的{0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,佣金率不能大于100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低库存水平
 DocType: Stock Entry,Subcontract,外包
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,请输入{0}第一
 DocType: Production Planning Tool,Get Items From Sales Orders,从销售订单获取品目
 DocType: Production Order Operation,Actual End Time,实际结束时间
 DocType: Production Planning Tool,Download Materials Required,下载所需物料
@@ -2307,9 +2318,9 @@ DocType: Maintenance Visit,Scheduled,已计划
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,如果要不规则的按月分配，请选择“月度分布”。
 DocType: Purchase Invoice Item,Valuation Rate,估值率
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,价格表货币没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,价格表货币没有选择
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,品目行{0}：采购收据{1}不存在于采购收据表中
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},雇员{0}申请了{1}，时间是{2}至{3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},雇员{0}申请了{1}，时间是{2}至{3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,项目开始日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,直到
 DocType: Rename Tool,Rename Log,重命名日志
@@ -2336,13 +2347,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有叶节点中允许交易
 DocType: Expense Claim,Expense Approver,开支审批人
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,采购入库项目提供
-sites/assets/js/erpnext.min.js +48,Pay,付
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,付
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,以日期时间
 DocType: SMS Settings,SMS Gateway URL,短信网关的URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,日志维护短信发送状态
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,磨碎
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,收缩包装
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,待活动
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活动
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,确认
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,供应商 > 供应商类型
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,请输入解除日期。
@@ -2353,7 +2364,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,报纸出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,选择财政年度
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,熔炼
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,你是本条目的假期审批人，请更新并保存其状态。
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序级别
 DocType: Attendance,Attendance Date,考勤日期
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,基于收入和扣款的工资明细。
@@ -2389,6 +2399,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,有交易的成本中心不能转化为组
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折旧
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供应商
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,无效的时期
 DocType: Customer,Credit Limit,信用额度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,选择交易类型
 DocType: GL Entry,Voucher No,凭证编号
@@ -2398,8 +2409,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,条
 DocType: Customer,Address and Contact,地址和联系方式
 DocType: Customer,Last Day of the Next Month,下个月的最后一天
 DocType: Employee,Feedback,反馈
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,维护手册。计划
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,维护手册。计划
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,磨料喷射加工
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
 DocType: Website Settings,Website Settings,网站设置
@@ -2413,11 +2424,11 @@ DocType: Quality Inspection,Outgoing,传出
 DocType: Material Request,Requested For,对于要求
 DocType: Quotation Item,Against Doctype,对文档类型
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送货单反对任何项目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,root帐号不能被删除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,root帐号不能被删除
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,显示库存记录
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在制品仓库
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},参考＃ {0}于{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},参考＃ {0}于{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,管理地址
 DocType: Pricing Rule,Item Code,品目编号
 DocType: Production Planning Tool,Create Production Orders,创建生产订单
@@ -2426,14 +2437,14 @@ DocType: Journal Entry,User Remark,用户备注
 DocType: Lead,Market Segment,市场分类
 DocType: Communication,Phone,电话
 DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),结算(借记)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),结算(借记)
 DocType: Contact,Passive,被动
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列号{0}无库存
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,销售业务的税务模板。
 DocType: Sales Invoice,Write Off Outstanding Amount,核销未付金额
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",如果需要自动周期性发票的话请勾选，在提交销售发票后，周期部分将可见。
 DocType: Account,Accounts Manager,会计经理
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',时间日志{0}必须是'提交'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',时间日志{0}必须是'提交'
 DocType: Stock Settings,Default Stock UOM,默认库存计量单位
 DocType: Time Log,Costing Rate based on Activity Type (per hour),成本核算房价为活动类型（每小时）
 DocType: Production Planning Tool,Create Material Requests,创建物料需要
@@ -2444,7 +2455,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,获取更新
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,添加了一些样本记录
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,离开管理
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,离开管理
 DocType: Event,Groups,组
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,基于账户分组
 DocType: Sales Order,Fully Delivered,完全交付
@@ -2456,11 +2467,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,销售额外选项
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 成本中心{2}账户{1}的预算将超过{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此股票和解是一个进入开幕
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},所需物品的采购订单号{0}
-DocType: Leave Allocation,Carry Forwarded Leaves,顺延假期
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},所需物品的采购订单号{0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
 ,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Sales Order,Customer's Purchase Order,客户采购订单
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,价值或数量
@@ -2473,13 +2483,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,零售商
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供应商类型
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,品目编号是必须项，因为品目没有自动编号
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},报价{0} 不属于{1}类型
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,品目编号是必须项，因为品目没有自动编号
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},报价{0} 不属于{1}类型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
 DocType: Sales Order,%  Delivered,％已交付
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,银行透支账户
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,创建工资单
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,重新开始
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,抵押贷款
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,优质产品
@@ -2489,7 +2498,7 @@ DocType: Appraisal,Appraisal,评估
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,失模铸造
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,图纸
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日期重复
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},假期审批人有{0}的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},假期审批人有{0}的角色
 DocType: Hub Settings,Seller Email,卖家电子邮件
 DocType: Project,Total Purchase Cost (via Purchase Invoice),总购买成本（通过采购发票）
 DocType: Workstation Working Hour,Start Time,开始时间
@@ -2503,8 +2512,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),净金额（公司货币）
 DocType: BOM Operation,Hour Rate,时薪
 DocType: Stock Settings,Item Naming By,品目命名方式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,来自报价
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个年终结束分录{0}已经被录入
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,来自报价
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个年终结束分录{0}已经被录入
 DocType: Production Order,Material Transferred for Manufacturing,材料移送制造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,科目{0}不存在
 DocType: Purchase Receipt Item,Purchase Order Item No,采购订单编号
@@ -2517,11 +2526,11 @@ DocType: Item,Inspection Required,需要检验
 DocType: Purchase Invoice Item,PR Detail,PR详细
 DocType: Sales Order,Fully Billed,完全开票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,现款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包的总重量，通常是净重+包装材料的重量。 （用于打印）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结账户和创建/修改冻结账户的会计分录
 DocType: Serial No,Is Cancelled,是否注销
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,我的出货量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,我的出货量
 DocType: Journal Entry,Bill Date,账单日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",有多个最高优先级定价规则时使用以下的内部优先级：
 DocType: Supplier,Supplier Details,供应商详情
@@ -2534,7 +2543,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,电汇
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,请选择银行帐户
 DocType: Newsletter,Create and Send Newsletters,创建和发送新闻邮件
-sites/assets/js/report.min.js +107,From Date must be before To Date,起始日期日期必须在结束日期之前
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,起始日期日期必须在结束日期之前
 DocType: Sales Order,Recurring Order,经常订购
 DocType: Company,Default Income Account,默认收益账户
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客户群组/客户
@@ -2549,31 +2558,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,库存计量单位
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,采购订单{0}未提交
 ,Projected,预计
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为品目{0}检查超额发货或超额预订，因为其数量或金额为0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为品目{0}检查超额发货或超额预订，因为其数量或金额为0
 DocType: Notification Control,Quotation Message,报价信息
 DocType: Issue,Opening Date,开幕日期
 DocType: Journal Entry,Remark,备注
 DocType: Purchase Receipt Item,Rate and Amount,率及金额
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,无聊
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,来自销售订单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,来自销售订单
 DocType: Blog Category,Parent Website Route,父网站路线
 DocType: Sales Order,Not Billed,未开票
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,两个仓库必须属于同一公司
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,暂无联系人。
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,暂无联系人。
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,非活动
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,对发票过账日期
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,到岸成本凭证金额
 DocType: Time Log,Batched for Billing,已为账单批次化
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,供应商开出的账单
 DocType: POS Profile,Write Off Account,核销帐户
-sites/assets/js/erpnext.min.js +26,Discount Amount,折扣金额
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,折扣金额
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
 DocType: Item,Warranty Period (in days),保修期限（天数）
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,例如增值税
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,项目4
 DocType: Journal Entry Account,Journal Entry Account,日记帐分录帐号
 DocType: Shopping Cart Settings,Quotation Series,报价系列
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,铁水形成气
 DocType: Sales Order Item,Sales Order Date,销售订单日期
 DocType: Sales Invoice Item,Delivered Qty,已交付数量
@@ -2605,10 +2613,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,客户或供应商详细信息
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,设置
 DocType: Lead,Lead Owner,线索所有者
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,仓库是必需的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,仓库是必需的
 DocType: Employee,Marital Status,婚姻状况
 DocType: Stock Settings,Auto Material Request,汽车材料要求
 DocType: Time Log,Will be updated when billed.,出账被会更新。
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在从仓库可用的批次数量
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,当前BOM和新BOM不能相同
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
 DocType: Sales Invoice,Against Income Account,对收益账目
@@ -2625,12 +2634,12 @@ DocType: POS Profile,Update Stock,更新库存
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,超精研
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个品目的净重使用同一个计量单位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,请送货单拉项目
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,请送货单拉项目
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,日记帐分录{0}没有关联
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",类型电子邮件，电话，聊天，访问等所有通信记录
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,请提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,条款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,创建新的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,创建新的
 DocType: Buying Settings,Purchase Order Required,购货订单要求
 ,Item-wise Sales History,品目特定的销售历史
 DocType: Expense Claim,Total Sanctioned Amount,总被制裁金额
@@ -2647,16 +2656,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,工资单扣款
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,便签
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,请先选择一个组节点。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的必须是一个{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,填写表格并保存
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,填写表格并保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下载一个包含所有原材料及其库存状态的报告
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,面对
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社区论坛
 DocType: Leave Application,Leave Balance Before Application,申请前假期余量
 DocType: SMS Center,Send SMS,发送短信
 DocType: Company,Default Letter Head,默认信头
 DocType: Time Log,Billable,可开票
 DocType: Authorization Rule,This will be used for setting rule in HR module,这将用于在人力资源模块的设置规则
 DocType: Account,Rate at which this tax is applied,速率此税适用
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,再订购数量
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再订购数量
 DocType: Company,Stock Adjustment Account,库存调整账户
 DocType: Journal Entry,Write Off,抹杀
 DocType: Time Log,Operation ID,操作ID
@@ -2667,12 +2677,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",折扣字段在采购订单，采购收据，采购发票可用。
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帐户的名称。注：请不要创建帐户的客户和供应商
 DocType: Report,Report Type,报告类型
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,载入中
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,载入中
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替换工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国家的默认地址模板
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
+DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,展会税分手
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,数据导入和导出
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',如果贵司涉及生产活动，将启动品目的“是否生产”属性
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,发票发布日期
 DocType: Sales Invoice,Rounded Total,总圆角
 DocType: Product Bundle,List items that form the package.,打包的品目列表。
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配应该等于100 ％
@@ -2683,8 +2696,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
 DocType: Company,Default Cash Account,默认现金账户
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',请输入“预产期”
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',请输入“预产期”
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是品目{1}的有效批号
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
@@ -2706,11 +2719,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","行{0}：数量不是在仓库avalable {1} {2} {3}。
 可用数量：{4}，转让数量：{5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,项目3
+DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
 DocType: Event,Sunday,星期天
 DocType: Sales Team,Contribution (%),贡献（％）
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,职责
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,模板
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,模板
 DocType: Sales Person,Sales Person Name,销售人员姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,请在表中输入ATLEAST 1发票
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,添加用户
@@ -2719,7 +2733,7 @@ DocType: Task,Actual Start Date (via Time Logs),实际开始日期（通过时
 DocType: Stock Reconciliation Item,Before reconciliation,前和解
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),已添加的税费（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
 DocType: Sales Order,Partly Billed,天色帐单
 DocType: Item,Default BOM,默认的BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2727,12 +2741,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,总街货量金额
 DocType: Time Log Batch,Total Hours,总时数
 DocType: Journal Entry,Printing Settings,打印设置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,汽车
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},类型为{0}已经在财年{0}为中员工{1}调配过
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,品目是必须项
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,金属注射成型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,来自送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,来自送货单
 DocType: Time Log,From Time,起始时间
 DocType: Notification Control,Custom Message,自定义消息
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,投资银行业务
@@ -2748,17 +2761,17 @@ DocType: Newsletter,A Lead with this email id should exist,与此电子邮件关
 DocType: Stock Entry,From BOM,从BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',请点击“生成表”
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,日期应该是一样的起始日期为半天假
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',请点击“生成表”
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,日期应该是一样的起始日期为半天假
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",如公斤，单元，号数，米
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,参考编号是强制性的，如果你输入的参考日期
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,参考编号是强制性的，如果你输入的参考日期
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
 DocType: Salary Structure,Salary Structure,薪酬结构
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",存在多个符合条件的价格列表，请指定优先级来解决冲突。价格列表{0}
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,报价有效期
 DocType: Hub Settings,Access Token,访问令牌
@@ -2781,6 +2794,7 @@ DocType: Issue,Opening Time,开放时间
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,必须指定起始和结束日期
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
 DocType: Shipping Rule,Calculate Based On,计算基于
+DocType: Delivery Note Item,From Warehouse,从仓库
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,钻孔
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,吹塑
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
@@ -2802,11 +2816,12 @@ DocType: C-Form,Amended From,修订源
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原料
 DocType: Leave Application,Follow via Email,通过电子邮件关注
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,此科目有子科目，无法删除。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,此科目有子科目，无法删除。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,需要指定目标数量和金额
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},品目{0}没有默认的BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,请选择发布日期第一
-DocType: Leave Allocation,Carry Forward,顺延
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},品目{0}没有默认的BOM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,请选择发布日期第一
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
+DocType: Leave Control Panel,Carry Forward,顺延
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,有交易的成本中心不能转化为总账
 DocType: Department,Days for which Holidays are blocked for this department.,此部门的禁离日
 ,Produced,生产
@@ -2827,16 +2842,16 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 DocType: Purchase Order,The date on which recurring order will be stop,经常性发票终止日期
 DocType: Quality Inspection,Item Serial No,品目序列号
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必须通过{1}会减少或应增加溢出宽容
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必须通过{1}会减少或应增加溢出宽容
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,总现
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,小时
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",序列化的品目{0}不能被“库存盘点”更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,转印材料供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,转印材料供应商
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库，仓库只能通过库存记录和采购收据设置。
 DocType: Lead,Lead Type,线索类型
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,创建报价
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,这些品目都已开具发票
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,这些品目都已开具发票
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以被{0}的批准
 DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
 DocType: BOM Replace Tool,The new BOM after replacement,更换后的物料清单
@@ -2884,7 +2899,7 @@ DocType: C-Form,C-Form,C-表
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,操作ID没有设置
 DocType: Production Order,Planned Start Date,计划开始日期
 DocType: Serial No,Creation Document Type,创建文件类型
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,维护手册。访
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,维护手册。访
 DocType: Leave Type,Is Encash,是否兑现
 DocType: Purchase Invoice,Mobile No,手机号码
 DocType: Payment Tool,Make Journal Entry,创建日记帐分录
@@ -2892,7 +2907,7 @@ DocType: Leave Allocation,New Leaves Allocated,新调配的假期
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
 DocType: Project,Expected End Date,预计结束日期
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,广告
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,广告
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 DocType: Cost Center,Distribution Id,分配标识
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,优质服务
@@ -2908,14 +2923,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},为属性{0}值必须的范围内{1}到{2}中的增量{3}
 DocType: Tax Rule,Sales,销售
 DocType: Stock Entry Detail,Basic Amount,基本金额
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},物件{0}需要指定仓库
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,信用
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},物件{0}需要指定仓库
+DocType: Leave Allocation,Unused leaves,未使用的叶子
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,信用
 DocType: Customer,Default Receivable Accounts,默认应收账户(多个)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,锯切
 DocType: Tax Rule,Billing State,计费状态
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,层压
 DocType: Item Reorder,Transfer,转让
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
@@ -2931,6 +2947,7 @@ DocType: Company,Retail,零售
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,客户{0}不存在
 DocType: Attendance,Absent,缺席
 DocType: Product Bundle,Product Bundle,产品包
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}：无效参考{1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,破碎
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
@@ -2938,16 +2955,16 @@ DocType: GL Entry,Remarks,备注
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料产品编号
 DocType: Journal Entry,Write Off Based On,核销基于
 DocType: Features Setup,POS View,POS机查看
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,一个序列号的安装记录
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,一个序列号的安装记录
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,连铸
-sites/assets/js/erpnext.min.js +10,Please specify a,请指定一个
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,请指定一个
 DocType: Offer Letter,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,以上
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,冷上浆
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,科目{0}不能为组
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,区域
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,负评估价格是不允许的
 DocType: Holiday List,Weekly Off,周末
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",对例如2012，2012-13
@@ -2991,12 +3008,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,挺着
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,蒸发图案铸造
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,娱乐费用
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,账龄
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,账龄
 DocType: Time Log,Billing Amount,开票金额
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,品目{0}的数量无效，应为大于0的数字。
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,假期申请。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,有交易的科目不能被删除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,有交易的科目不能被删除
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,法律费用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
 DocType: Sales Invoice,Posting Time,发布时间
@@ -3005,9 +3022,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,要用户手动选择序列的话请勾选。勾选此项后将不会选择默认序列。
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},没有序列号为{0}的品目
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,打开通知
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,打开通知
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,直接开支
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,确认要重新开始此物料申请吗？
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客户收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
@@ -3018,7 +3034,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,随着对日
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,珩磨
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,缓刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
 DocType: Feed,Full Name,全名
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,铆
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
@@ -3041,7 +3057,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,添加新行为
 DocType: Buying Settings,Default Supplier Type,默认供应商类别
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,采石
 DocType: Production Order,Total Operating Cost,总营运成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,所有联系人。
 DocType: Newsletter,Test Email Id,测试电子邮件Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,公司缩写
@@ -3065,11 +3081,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,向潜
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结股票
 ,Territory Target Variance Item Group-Wise,按物件组的区域目标波动
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客户群组
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必须项。可能是没有由{1}到{2}的货币转换记录。
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必须项。可能是没有由{1}到{2}的货币转换记录。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,税务模板是强制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1}的状态为“已停止”
 DocType: Account,Temporary,临时
 DocType: Address,Preferred Billing Address,首选帐单地址
 DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
@@ -3087,13 +3102,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,品目特定的税项
 DocType: Purchase Order Item,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,熨衣服
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}已停止
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 DocType: Lead,Add to calendar on this date,将此日期添加至日历
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,规则增加运输成本。
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,即将举行的活动
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,即将举行的活动
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客户是必须项
 DocType: Letter Head,Letter Head,信头
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,快速入门
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是强制性的回报
 DocType: Purchase Order,To Receive,接受
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,冷缩配合
@@ -3116,25 +3132,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,必须选择至少一个仓库
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更换
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0}对销售发票{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,请输入缺省的计量单位
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0}对销售发票{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,请输入缺省的计量单位
 DocType: Purchase Invoice Item,Project Name,项目名称
 DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
 DocType: Workflow State,Edit,编辑
 DocType: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Features Setup,Item Batch Nos,品目批号
 DocType: Stock Ledger Entry,Stock Value Difference,库存值差异
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,人力资源
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,人力资源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款对账
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,所得税资产
 DocType: BOM Item,BOM No,BOM编号
 DocType: Contact Us Settings,Pincode,PIN代码
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
 DocType: Item,Moving Average,移动平均
 DocType: BOM Replace Tool,The BOM which will be replaced,此物料清单将被替换
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,新库存计量单位必须于当前单位不同
 DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
 DocType: Production Order,Operation Cost,运营成本
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,由.csv文件上传考勤记录
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,优秀的金额
@@ -3142,7 +3158,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,为销
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",要分配这个问题，请使用“分配”按钮，在侧边栏。
 DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结老于此天数的库存
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果存在多个价格规则，则会应用优先级别。优先权是一个介于0到20的数字，默认值是零（或留空）。数字越大，意味着优先级别越高。
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,对发票
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,会计年度：{0}不存在
 DocType: Currency Exchange,To Currency,以货币
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,允许以下用户批准在禁离日请假的申请。
@@ -3171,7 +3186,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),率
 DocType: Stock Entry Detail,Additional Cost,额外费用
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,财政年度结束日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 DocType: BOM,Materials Required (Exploded),所需物料（正展开）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留职（LWP）
@@ -3179,10 +3194,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列号{1}不相匹配{2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},注： {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},注： {0}
 ,Delivery Note Trends,送货单趋势
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,本周的总结
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}中的{0}必须是“采购”或“转包”类型的品目
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}中的{0}必须是“采购”或“转包”类型的品目
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,科目{0}只能通过库存处理更新
 DocType: GL Entry,Party,一方
 DocType: Sales Order,Delivery Date,交货日期
@@ -3195,7 +3210,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均买入价
 DocType: Task,Actual Time (in Hours),实际时间（小时）
 DocType: Employee,History In Company,公司内历史
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,简讯
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,简讯
 DocType: Address,Shipping,送货
 DocType: Stock Ledger Entry,Stock Ledger Entry,存库分类帐分录
 DocType: Department,Leave Block List,禁离日列表
@@ -3214,7 +3229,7 @@ DocType: Account,Auditor,审计员
 DocType: Purchase Order,End date of current order's period,当前订单周期的结束日期
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使录取通知书
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,回报
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
 DocType: DocField,Fold,折叠
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
@@ -3246,7 +3261,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,报告以
 DocType: SMS Settings,Enter url parameter for receiver nos,请输入收件人编号的URL参数
 DocType: Sales Invoice,Paid Amount,支付的金额
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',结算帐户{0}必须是'负债'类型
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',结算帐户{0}必须是'负债'类型
 ,Available Stock for Packing Items,库存可用打包品目
 DocType: Item Variant,Item Variant,品目变体
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,将此地址模板设置为默认，因为没有其他的默认项
@@ -3254,7 +3269,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,质量管理
 DocType: Production Planning Tool,Filter based on customer,根据客户筛选
 DocType: Payment Tool Detail,Against Voucher No,对凭证号码
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},请输入量的项目{0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},请输入量的项目{0}
 DocType: Employee External Work History,Employee External Work History,雇员外部就职经历
 DocType: Tax Rule,Purchase,采购
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,余额数量
@@ -3291,28 +3306,29 @@ Note: BOM = Bill of Materials",聚合组** **项目到另一个项目** **的。
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},序列号是品目{0}的必须项
 DocType: Item Variant Attribute,Attribute,属性
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,请从指定/至范围
-sites/assets/js/desk.min.js +7652,Created By,创建人
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,创建人
 DocType: Serial No,Under AMC,在年度保养合同中
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,品目的评估价格将基于到岸成本凭证金额重新计算
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,销售业务的默认设置。
 DocType: BOM Replace Tool,Current BOM,当前BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,添加序列号
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,添加序列号
 DocType: Production Order,Warehouses,仓库
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,印刷和文具
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,组节点
 DocType: Payment Reconciliation,Minimum Amount,最低金额
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小时
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},系列{0}已经被{1}使用
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},系列{0}已经被{1}使用
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,仓库（永续盘存）的账户将在该帐户下创建。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除，因为此仓库有库存分类账分录。
 DocType: Company,Distribution,分配
-sites/assets/js/erpnext.min.js +50,Amount Paid,已支付的款项
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,已支付的款项
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,项目经理
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,调度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
 DocType: Customer,Default Taxes and Charges,默认税费
 DocType: Account,Receivable,应收账款
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允许提交超过设定信用额度交易的。
 DocType: Sales Invoice,Supplier Reference,供应商推荐
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",如果勾选，获取原材料时将考虑半成品的BOM。否则会将半成品当作原材料。
@@ -3349,8 +3365,8 @@ DocType: Email Digest,Add/Remove Recipients,添加/删除收件人
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},交易不反对停止生产订单允许{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要设置这个财政年度为默认值，点击“设为默认”
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),设置接收支持的电子邮件地址。 （例如support@example.com ）
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
 DocType: Salary Slip,Salary Slip,工资单
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,打磨
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“结束日期”必需设置
@@ -3363,6 +3379,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",当所选的业务状态更改为“已提交”时，自动打开一个弹出窗口向有关的联系人编写邮件，业务将作为附件添加。用户可以选择发送或者不发送邮件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局设置
 DocType: Employee Education,Employee Education,雇员教育
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,这是需要获取项目详细信息。
 DocType: Salary Slip,Net Pay,净支付金额
 DocType: Account,Account,账户
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,序列号{0}已收到过
@@ -3395,7 +3412,7 @@ DocType: BOM,Manufacturing User,生产用户
 DocType: Purchase Order,Raw Materials Supplied,提供原料
 DocType: Purchase Invoice,Recurring Print Format,经常打印格式
 DocType: Communication,Series,系列
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,预计交货日期不能早于采购订单日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,预计交货日期不能早于采购订单日期
 DocType: Appraisal,Appraisal Template,评估模板
 DocType: Communication,Email,邮件
 DocType: Item Group,Item Classification,品目分类
@@ -3451,6 +3468,7 @@ DocType: HR Settings,Payroll Settings,薪资设置
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,下订单
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,根本不能有一个父成本中心
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,选择品牌...
 DocType: Sales Invoice,C-Form Applicable,C-表格适用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 DocType: Supplier,Address and Contacts,地址和联系方式
@@ -3461,7 +3479,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,获取未清凭证
 DocType: Warranty Claim,Resolved By,议决
 DocType: Appraisal,Start Date,开始日期
-sites/assets/js/desk.min.js +7629,Value,值
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,值
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,调配一段时间假期。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,点击这里核实
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
@@ -3477,14 +3495,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox访问已允许
 DocType: Dropbox Backup,Weekly,每周
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：smsgateway.com/API/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全部完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％已完成
 DocType: Employee,Educational Qualification,学历
 DocType: Workstation,Operating Costs,运营成本
 DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我们的新闻列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,电子束加工
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,采购经理大师
@@ -3497,7 +3515,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,添加/编辑价格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,成本中心表
 ,Requested Items To Be Ordered,要求项目要订购
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,我的订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,我的订单
 DocType: Price List,Price List Name,价格列表名称
 DocType: Time Log,For Manufacturing,对于制造业
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,总计
@@ -3508,7 +3526,7 @@ DocType: Account,Income,收益
 DocType: Industry Type,Industry Type,行业类型
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,发现错误！
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完成日期
 DocType: Purchase Invoice Item,Amount (Company Currency),金额（公司货币）
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,压铸模具
@@ -3522,10 +3540,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,年
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,简介销售点的
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,请更新短信设置
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,时间日志{0}已结算
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,时间日志{0}已结算
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,无担保贷款
 DocType: Cost Center,Cost Center Name,成本中心名称
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,序列号为{1}的品目{0}已经安装
 DocType: Maintenance Schedule Detail,Scheduled Date,计划日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,数金额金额
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大于160个字符的消息将被分割为多条消息
@@ -3533,10 +3550,10 @@ DocType: Purchase Receipt Item,Received and Accepted,收到并接受
 ,Serial No Service Contract Expiry,序列号/年度保养合同过期
 DocType: Item,Unit of Measure Conversion,转换度量单位
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,雇员不能更改
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,你不能向一个账户同时输入贷方和借方记录。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,你不能向一个账户同时输入贷方和借方记录。
 DocType: Naming Series,Help HTML,HTML帮助
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
 DocType: Address,Name of person or organization that this address belongs to.,此地址所属的人或组织的名称
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,您的供应商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
@@ -3547,10 +3564,11 @@ DocType: Lead,Converted,已转换
 DocType: Item,Has Serial No,有序列号
 DocType: Employee,Date of Issue,签发日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}：申请者{0} 金额{1} 
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
 DocType: Issue,Content Type,内容类型
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,电脑
 DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,品目{0}不存在
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
@@ -3561,14 +3579,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,到仓库
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},科目{0}已多次输入财年{1}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
 DocType: Purchase Taxes and Charges,Account Head,账户头
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,更新额外费用以计算到岸成本
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,电气
 DocType: Stock Entry,Total Value Difference (Out - In),总价值差（输出 - ）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},员工设置{0}为设置用户ID
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,喷丸
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,来自保修申请
@@ -3582,15 +3600,17 @@ DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
 DocType: User,Enabled,已启用
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,库存资产
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},确认要提交所有{1}年{8}的所有工资单吗？
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},确认要提交所有{1}年{8}的所有工资单吗？
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,进口认购
 DocType: Target Detail,Target Qty,目标数量
 DocType: Attendance,Present,现
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送货单{0}不能提交
 DocType: Notification Control,Sales Invoice Message,销售发票信息
 DocType: Authorization Rule,Based On,基于
-,Ordered Qty,订购数量
+DocType: Sales Order Item,Ordered Qty,订购数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,项目活动/任务。
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,生成工资条
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0}不是有效的电子邮件地址
@@ -3630,7 +3650,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,上传考勤记录
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM和生产量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,账龄范围2
-DocType: Journal Entry Account,Amount,量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,量
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,铆
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM已替换
 ,Sales Analytics,销售分析
@@ -3657,7 +3677,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum m
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
 DocType: Contact Us Settings,City,城市
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,超声波加工
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,错误：没有有效的身份证？
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,错误：没有有效的身份证？
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,品目{0}必须是销售品目
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
@@ -3672,7 +3692,7 @@ DocType: Purchase Taxes and Charges,Actual,实际
 DocType: Authorization Rule,Customerwise Discount,客户折扣
 DocType: Purchase Invoice,Against Expense Account,对开支账目
 DocType: Production Order,Production Order,生产订单
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,安装单{0}已经提交过
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,安装单{0}已经提交过
 DocType: Quotation Item,Against Docname,对文档名称
 DocType: SMS Center,All Employee (Active),所有员工（活动）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即查看
@@ -3680,14 +3700,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,原材料成本
 DocType: Item,Re-Order Level,重新排序级别
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,输入要生产的品目和数量或者下载物料清单。
-sites/assets/js/list.min.js +174,Gantt Chart,甘特图
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,甘特图
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,兼任
 DocType: Employee,Applicable Holiday List,可申请假期列表
 DocType: Employee,Cheque,支票
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列已更新
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,报告类型是强制性的
 DocType: Item,Serial Number Series,序列号系列
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物件{0}必须指定仓库
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物件{0}必须指定仓库
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,零售及批发
 DocType: Issue,First Responded On,首次回复时间
 DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组品目交叉显示
@@ -3702,7 +3722,7 @@ DocType: Attendance,Attendance,考勤
 DocType: Page,No,No
 DocType: BOM,Materials,物料
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未选中，此列表将需要手动添加到部门。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,发布日期和发布时间是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,发布日期和发布时间是必需的
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,采购业务的税项模板。
 ,Item Prices,品目价格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,大写金额将在采购订单保存后显示。
@@ -3722,9 +3742,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政开支
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,咨询
 DocType: Customer Group,Parent Customer Group,母公司集团客户
-sites/assets/js/erpnext.min.js +50,Change,变化
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,变化
 DocType: Purchase Invoice,Contact Email,联络人电邮
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',采购订单{0} “停止”
 DocType: Appraisal Goal,Score Earned,已得分数
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",例如“XX有限责任公司”
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,通知期
@@ -3734,12 +3753,13 @@ DocType: Packing Slip,Gross Weight UOM,毛重计量单位
 DocType: Email Digest,Receivables / Payables,应收/应付账款
 DocType: Delivery Note Item,Against Sales Invoice,对销售发票
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,冲压
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,信用账户
 DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,显示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 DocType: Task,Actual End Date (via Time Logs),实际结束日期（通过时间日志）
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
@@ -3753,7 +3773,7 @@ DocType: Issue,Support Team,支持团队
 DocType: Appraisal,Total Score (Out of 5),总分（满分5分）
 DocType: Contact Us Settings,State,状态
 DocType: Batch,Batch,批次
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,余额
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,余额
 DocType: Project,Total Expense Claim (via Expense Claims),总费用报销（通过费用报销）
 DocType: User,Gender,性别
 DocType: Journal Entry,Debit Note,借项通知单
@@ -3769,9 +3789,8 @@ DocType: Lead,Blog Subscriber,博客订阅者
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,创建规则，根据属性值来限制交易。
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果勾选，工作日总数将包含假期，这将会降低“日工资”的值。
 DocType: Purchase Invoice,Total Advance,总垫款
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,重新开始物料请求
 DocType: Workflow State,User,用户
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,处理工资单
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,处理工资单
 DocType: Opportunity Item,Basic Rate,基础税率
 DocType: GL Entry,Credit Amount,信贷金额
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,设置为丧失
@@ -3779,7 +3798,7 @@ DocType: Customer,Credit Days Based On,信贷天基于
 DocType: Tax Rule,Tax Rule,税务规则
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,在整个销售周期使用同一价格
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,规划工作站工作时间以外的时间日志。
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1}已经提交过
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}已经提交过
 ,Items To Be Requested,要申请的品目
 DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Time Log,Billing Rate based on Activity Type (per hour),根据活动类型计费率（每小时）
@@ -3788,6 +3807,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",公司电子邮件ID没有找到，因此邮件无法发送
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
 DocType: Production Planning Tool,Filter based on item,根据项目筛选
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,今年开始日期
 DocType: Attendance,Employee Name,雇员姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),圆润的总计（公司货币）
@@ -3799,14 +3819,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,消隐
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,员工福利
 DocType: Sales Invoice,Is POS,是否POS机
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
 DocType: Production Order,Manufactured Qty,已生产数量
 DocType: Purchase Receipt Item,Accepted Quantity,接收数量
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}不存在
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,对客户开出的账单。
 DocType: DocField,Default,默认
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,项目编号
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}新增用户
 DocType: Maintenance Schedule,Schedule,计划任务
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定义预算这个成本中心。要设置预算的行动，请参阅“企业名录”
@@ -3814,7 +3834,7 @@ DocType: Account,Parent Account,父帐户
 DocType: Quality Inspection Reading,Reading 3,阅读3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,凭证类型
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,价格表未找到或禁用
 DocType: Expense Claim,Approved,已批准
 DocType: Pricing Rule,Price,价格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
@@ -3823,23 +3843,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,活动命名：
 DocType: Employee,Current Address Is,当前地址是
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
 DocType: Address,Office,办公室
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,标准报告
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会计记账分录。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,请选择员工记录第一。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,请选择员工记录第一。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,要创建一个纳税帐户
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
 DocType: Employee,Current Address,当前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果品目为另一品目的变体，那么它的描述，图片，价格，税率等将从模板自动设置。你也可以手动设置。
 DocType: Serial No,Purchase / Manufacture Details,采购/制造详细信息
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,批量库存
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,批量库存
 DocType: Employee,Contract End Date,合同结束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪对任何项目这个销售订单
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基于上述标准拉销售订单（待定提供）
 DocType: DocShare,Document Type,文档类型
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,来自供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,来自供应商报价
 DocType: Deduction Type,Deduction Type,扣款类型
 DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小数量
@@ -3850,20 +3872,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,对于数量（制造数量）是强制性的
 DocType: Stock Entry,Default Target Warehouse,默认目标仓库
 DocType: Purchase Invoice,Net Total (Company Currency),总净金额（公司货币）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：党的类型和党的只适用对应收/应付帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：党的类型和党的只适用对应收/应付帐户
 DocType: Notification Control,Purchase Receipt Message,外购入库单信息
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,分配的总叶多期
 DocType: Production Order,Actual Start Date,实际开始日期
 DocType: Sales Order,% of materials delivered against this Sales Order,此销售订单％的材料已交货。
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,记录项目的运动。
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,记录项目的运动。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通讯订户名单
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,服务
 DocType: Hub Settings,Hub Settings,Hub设置
 DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,带工艺
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
 ,Monthly Salary Register,月度工资记录
-apps/frappe/frappe/website/template.py +123,Next,下一个
+apps/frappe/frappe/website/template.py +140,Next,下一个
 DocType: Warranty Claim,If different than customer address,如果客户地址不同的话
 DocType: BOM Operation,BOM Operation,BOM操作
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,电解
@@ -3894,6 +3917,7 @@ DocType: Purchase Invoice,Next Date,下次日期
 DocType: Employee Education,Major/Optional Subjects,主修/选修科目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,请输入税费
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,加工
+DocType: Sales Invoice Item,Drop Ship,落船
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在这里，您可以维系家庭的详细信息，如姓名的父母，配偶和子女及职业
 DocType: Hub Settings,Seller Name,卖家名称
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),已扣除税费（公司货币）
@@ -3920,29 +3944,29 @@ DocType: Purchase Order,To Receive and Bill,接收和比尔
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,设计师
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,条款和条件模板
 DocType: Serial No,Delivery Details,交货细节
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 DocType: Item,Automatically create Material Request if quantity falls below this level,自动创建材料，如果申请数量低于这个水平
 ,Item-wise Purchase Register,品目特定的采购记录
 DocType: Batch,Expiry Date,到期时间
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
 ,Supplier Addresses and Contacts,供应商的地址和联系方式
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,属性是相同的两个记录。
 apps/erpnext/erpnext/config/projects.py +18,Project master.,项目主。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号，例如$等。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,从物料清单获取品目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,材料清单
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：党的类型和党的需要应收/应付帐户{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：党的类型和党的需要应收/应付帐户{1}
 DocType: Dropbox Backup,Send Notifications To,将通知发给
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,参考日期
 DocType: Employee,Reason for Leaving,离职原因
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: GL Entry,Is Opening,是否起始
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,科目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,科目{0}不存在
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},员工请建立薪酬结构{0}
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index e1b109a29f..1b85f32b5a 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,薪酬模式
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",選擇月度分配，如果你想根據季節進行跟踪。
 DocType: Employee,Divorced,離婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,警告：相同項目已經輸入多次。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,警告：相同項目已經輸入多次。
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,項目已同步
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允許項目將在一個事務中多次添加
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,材質訪問{0}之前取消此保修索賠取消
@@ -23,7 +23,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,壓實加燒結
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},貨幣所需的價格表{0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,從物料需求
+DocType: Purchase Order,Customer Contact,客戶聯繫
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,從物料需求
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}樹
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,沒有更多的結果。
@@ -38,7 +39,7 @@ apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate
 DocType: Sales Invoice,Customer Name,客戶名稱
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",在送貨單， POS機，報價單，銷售發票，銷售訂單等可像貨幣，轉換率，進出口總額，出口總計等所有出口相關領域
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,頭（或組）針對其會計分錄是由和平衡得以維持。
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
 DocType: Manufacturing Settings,Default 10 mins,預設為10分鐘
 DocType: Leave Type,Leave Type Name,休假類型名稱
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,系列已成功更新
@@ -49,9 +50,8 @@ DocType: Item Price,Multiple Item prices.,多個項目的價格。
 DocType: SMS Center,All Supplier Contact,所有供應商聯繫
 DocType: Quality Inspection Reading,Parameter,參數
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,難道真的要unstop生產訂單：
 apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,新假期申請
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,新假期申請
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,銀行匯票
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。使用這個選項來維護客戶的項目代碼，並可根據客戶的項目代碼做搜索。
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
@@ -59,26 +59,26 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,顯示變體
 DocType: Sales Invoice Item,Quantity,數量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（負債）
 DocType: Employee Education,Year of Passing,路過的一年
-sites/assets/js/erpnext.min.js +27,In Stock,庫存
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,只能使支付對未付款的銷售訂單
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,庫存
 DocType: Designation,Designation,指定
 DocType: Production Plan Item,Production Plan Item,生產計劃項目
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,建立新的POS簡介
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,保健
 DocType: Purchase Invoice,Monthly,每月一次
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,發票
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),延遲支付（天）
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,電子郵件地址
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,防禦
 DocType: Company,Abbr,縮寫
 DocType: Appraisal Goal,Score (0-5),得分（0-5）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行＃{0}：
 DocType: Delivery Note,Vehicle No,車輛無
-sites/assets/js/erpnext.min.js +55,Please select Price List,請選擇價格表
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,請選擇價格表
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,木工
-DocType: Production Order Operation,Work In Progress,工作進行中
+DocType: Production Order Operation,Work In Progress,在製品
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D列印
 DocType: Employee,Holiday List,假日列表
 DocType: Time Log,Time Log,時間日誌
@@ -101,13 +101,14 @@ DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,公斤
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,開放的工作。
 DocType: Item Attribute,Increment,增量
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,選擇倉庫...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,廣告
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
 DocType: Payment Reconciliation,Reconcile,調和
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,雜貨
 DocType: Quality Inspection Reading,Reading 1,閱讀1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,使銀行進入
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,使銀行進入
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,養老基金
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,如果帳戶類型是倉庫，其倉庫項目是強制要設定的，
 DocType: SMS Center,All Sales Person,所有的銷售人員
@@ -120,7 +121,7 @@ DocType: POS Profile,Write Off Cost Center,沖銷成本中心
 DocType: Warehouse,Warehouse Detail,倉庫的詳細資訊
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
 DocType: Tax Rule,Tax Type,稅收類型
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
 DocType: Item,Item Image (if not slideshow),產品圖片（如果不是幻燈片）
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,一個客戶存在具有相同名稱
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（工時率/ 60）*實際操作時間
@@ -130,7 +131,7 @@ DocType: Blog Post,Guest,客人
 DocType: Quality Inspection,Get Specification Details,獲取詳細規格
 DocType: Lead,Interested,有興趣
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,物料清單
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,開盤
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,開盤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},從{0} {1}
 DocType: Item,Copy From Item Group,從項目群組複製
 DocType: Journal Entry,Opening Entry,開放報名
@@ -140,7 +141,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with exist
 DocType: Lead,Product Enquiry,產品查詢
 DocType: Standard Reply,Owner,業主
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,請先輸入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,請首先選擇公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,請首先選擇公司
 DocType: Employee Education,Under Graduate,根據研究生
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,目標在
 DocType: BOM,Total Cost,總成本
@@ -158,6 +159,7 @@ DocType: Naming Series,Prefix,字首
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,耗材
 DocType: Upload Attendance,Import Log,導入日誌
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,發送
+DocType: Sales Invoice Item,Delivered By Supplier,交付供應商
 DocType: SMS Center,All Contact,所有聯繫
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
 DocType: Period Closing Voucher,Closing Fiscal Year,截止會計年度
@@ -167,15 +169,15 @@ DocType: Journal Entry,Contra Entry,魂斗羅進入
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,顯示的時間記錄
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司貨幣
 DocType: Delivery Note,Installation Status,安裝狀態
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
 DocType: Item,Supply Raw Materials for Purchase,供應原料採購
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,項{0}必須是一個採購項目
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","下載模板，填寫相應的數據，並附加了修改過的文件。
 在選定時間段內所有時間和員工的組合會在模板中，與現有的考勤記錄"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,之後銷售發票已提交將被更新。
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,設定人力資源模塊
 DocType: SMS Center,SMS Center,短信中心
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,直
@@ -200,11 +202,10 @@ DocType: SMS Settings,Enter url parameter for message,輸入url參數的訊息
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,規則適用的定價和折扣。
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},與此時間登錄衝突{0} {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,價格表必須適用於購買或出售
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交付日期
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交貨日期
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣價目表率（％）
-sites/assets/js/form.min.js +279,Start,開始
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,開始
 DocType: User,First Name,名字
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,您的設置就完成了。令人耳目一新。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,全模鑄造
 DocType: Offer Letter,Select Terms and Conditions,選擇條款和條件
 DocType: Production Planning Tool,Sales Orders,銷售訂單
@@ -230,6 +231,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Delivery Note Item,Against Sales Invoice Item,對銷售發票項目
 ,Production Orders in Progress,製程中生產訂單
 DocType: Lead,Address & Contact,地址及聯繫方式
+DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的葉子從以前的分配
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
 DocType: Newsletter List,Total Subscribers,用戶總數
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,聯繫人姓名
@@ -237,19 +239,19 @@ DocType: Production Plan Item,SO Pending Qty,SO待定數量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,建立工資單上面提到的標準。
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,請求您的報價。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,雙人房
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,每年葉
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,請設置命名序列{0}通過設置>設置>命名系列
 DocType: Time Log,Will be updated when batched.,批處理時將被更新。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是推進'對帳戶{1}，如果這是一個進步條目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是推進'對帳戶{1}，如果這是一個進步條目。
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
 DocType: Bulk Email,Message,訊息
 DocType: Item Website Specification,Item Website Specification,項目網站規格
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,參考編號
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,禁假的
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
 DocType: Stock Entry,Sales Invoice No,銷售發票號碼
@@ -261,8 +263,8 @@ DocType: Item,Minimum Order Qty,最低起訂量
 DocType: Pricing Rule,Supplier Type,供應商類型
 DocType: Item,Publish in Hub,在發布中心
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,物料需求
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
 DocType: Item,Purchase Details,採購詳情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供'表中的採購訂單{1}
@@ -278,7 +280,7 @@ DocType: Notification Control,Notification Control,通知控制
 DocType: Lead,Suggestions,建議
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,在此地域設定跨群組項目間的預算。您還可以通過設定分配來包含季節性。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},請輸入父帳戶組倉庫{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手機號碼
 DocType: Maintenance Schedule,Generate Schedule,生成時間表
@@ -304,10 +306,8 @@ DocType: Stock UOM Replace Utility,New Stock UOM,新的庫存計量單位
 DocType: Period Closing Voucher,Closing Account Head,關閉帳戶頭
 DocType: Employee,External Work History,外部工作經歷
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環引用錯誤
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,你真的要停止
 DocType: Communication,Closed,關閉
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,送貨單一被儲存，(Export)就會顯示出來。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,您確定要停止
 DocType: Lead,Industry,行業
 DocType: Employee,Job Profile,工作簡介
 DocType: Newsletter,Newsletter,新聞
@@ -322,7 +322,7 @@ DocType: Sales Invoice Item,Delivery Note,送貨單
 DocType: Dropbox Backup,Allow Dropbox Access,讓Dropbox的訪問
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立稅
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0}輸入兩次項目稅
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本週和待活動總結
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,請選擇年份和月份
@@ -339,11 +339,11 @@ apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",存在於物料清單，送貨單，採購發票，生產訂單，​​採購訂單，採購入庫單，銷售發票，銷售訂單，股票，時間表
 DocType: Item Tax,Tax Rate,稅率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,選擇項目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,選擇項目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","項目：{0}管理分批，不能使用\
 庫存調整，而是使用庫存分錄。"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +258,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批號必須與{1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,轉換為非集團
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,購買收據必須提交
@@ -351,7 +351,7 @@ DocType: Stock UOM Replace Utility,Current Stock UOM,目前的庫存計量單位
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,一批該產品的（很多）。
 DocType: C-Form Invoice Detail,Invoice Date,發票日期
 DocType: GL Entry,Debit Amount,借方金額
-apps/erpnext/erpnext/accounts/party.py +220,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,您的電子郵件地址
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,請參閱附件
 DocType: Purchase Order,% Received,％ 已收
@@ -361,7 +361,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already C
 DocType: Delivery Note,Instructions,說明
 DocType: Quality Inspection,Inspected By,視察
 DocType: Maintenance Visit,Maintenance Type,維護類型
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},序列號{0}不屬於送貨單{1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},序列號{0}不屬於送貨單{1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,產品質量檢驗參數
 DocType: Leave Application,Leave Approver Name,離開批准人姓名
 ,Schedule Date,排定日期
@@ -380,7 +380,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi
 ,Purchase Register,購買註冊
 DocType: Landed Cost Item,Applicable Charges,相關費用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0}（{1}）必須有權限 ""假期審批“"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0}（{1}）必須有權限 ""假期審批“"
 DocType: Purchase Receipt,Vehicle Date,車日期
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,醫療
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丟失
@@ -401,6 +401,7 @@ DocType: Delivery Note,% Installed,％已安裝
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,請先輸入公司名稱
 DocType: BOM,Item Desription,項目Desription
 DocType: Purchase Invoice,Supplier Name,供應商名稱
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,閱讀ERPNext手冊
 DocType: Account,Is Group,是集團
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自動設置序列號的基礎上FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,檢查供應商發票編號唯一性
@@ -416,13 +417,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,銷售主檔經
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
 DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假日高手。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,外殼成型
 DocType: Material Request Item,Required Date,所需時間
 DocType: Delivery Note,Billing Address,帳單地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,請輸入產品編號。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,請輸入產品編號。
 DocType: BOM,Costing,成本核算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中，稅額將被視為已包含在列印速率/列印數量
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,總數量
@@ -445,31 +446,30 @@ DocType: Manufacturing Settings,Time Between Operations (in mins),作業間隔
 DocType: Customer,Buyer of Goods and Services.,買家商品和服務。
 DocType: Journal Entry,Accounts Payable,應付帳款
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,添加訂閱
-sites/assets/js/erpnext.min.js +5,""" does not exists",“不存在
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“不存在
 DocType: Pricing Rule,Valid Upto,到...為止有效
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接收入
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,政務主任
 DocType: Payment Tool,Received Or Paid,收到或支付
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,請選擇公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,請選擇公司
 DocType: Stock Entry,Difference Account,差異帳戶
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
 DocType: Production Order,Additional Operating Cost,額外的運營成本
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化妝品
 DocType: DocField,Type,類型
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
 DocType: Communication,Subject,主題
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Employee,Emergency Phone,緊急電話
 ,Serial No Warranty Expiry,序列號保修到期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,您真的要中止此物料需求？
 DocType: Sales Order,To Deliver,為了提供
 DocType: Purchase Invoice Item,Item,項目
 DocType: Journal Entry,Difference (Dr - Cr),差異（Dr - Cr）
 DocType: Account,Profit and Loss,損益
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,管理轉包
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,管理轉包
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,新的計量單位不能是類型整數
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,家具及固定裝置
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,價目表貨幣被換算成公司基礎貨幣的匯率
@@ -490,7 +490,7 @@ DocType: Purchase Receipt,Add / Edit Taxes and Charges,新增／編輯稅金及
 DocType: Purchase Invoice,Supplier Invoice No,供應商發票號碼
 DocType: Territory,For reference,供參考
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",無法刪除序列號{0}，因為它採用的是現貨交易
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +169,Closing (Cr),關閉（Cr）
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),關閉（Cr）
 DocType: Serial No,Warranty Period (Days),保修期限（天數）
 DocType: Installation Note Item,Installation Note Item,安裝注意項
 ,Pending Qty,待定數量
@@ -524,8 +524,9 @@ DocType: Sales Order,Billing and Delivery Status,結算和交貨狀態
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回頭客
 DocType: Leave Control Panel,Allocate,分配
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,上一筆
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,銷貨退回
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,銷貨退回
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,要從創建生產訂單選擇銷售訂單。
+DocType: Item,Delivered by Supplier (Drop Ship),由供應商交貨（直接發運）
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,工資組成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,數據庫的潛在客戶。
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,客戶數據庫。
@@ -536,7 +537,7 @@ apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,翻筋斗
 DocType: Purchase Order Item,Billed Amt,已結算額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
 DocType: Event,Wednesday,星期三
 DocType: Sales Invoice,Customer's Vendor,客戶的供應商
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,生產訂單是強制性
@@ -569,8 +570,8 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been en
 DocType: SMS Settings,Receiver Parameter,收受方參數
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根據”和“分組依據”不能相同
 DocType: Sales Person,Sales Person Targets,銷售人員目標
-sites/assets/js/form.min.js +271,To,到
-apps/frappe/frappe/templates/base.html +143,Please enter email address,請輸入您的電子郵件地址
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,到
+apps/frappe/frappe/templates/base.html +145,Please enter email address,請輸入您的電子郵件地址
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,尾管成型
 DocType: Production Order Operation,In minutes,在幾分鐘內
 DocType: Issue,Resolution Date,決議日期
@@ -587,7 +588,7 @@ DocType: Activity Cost,Projects User,項目用戶
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,消費
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}：在發票明細表中找不到{1}
 DocType: Company,Round Off Cost Center,四捨五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
 DocType: Material Request,Material Transfer,物料轉倉
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),開啟（Dr）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},登錄時間戳記必須晚於{0}
@@ -595,9 +596,9 @@ apps/frappe/frappe/config/setup.py +59,Settings,設定
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本稅費
 DocType: Production Order Operation,Actual Start Time,實際開始時間
 DocType: BOM Operation,Operation Time,操作時間
-sites/assets/js/list.min.js +5,More,更多
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,更多
 DocType: Pricing Rule,Sales Manager,銷售經理
-sites/assets/js/desk.min.js +7673,Rename,重命名
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,重命名
 DocType: Journal Entry,Write Off Amount,核銷金額
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,彎曲
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,允許用戶
@@ -613,13 +614,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,直剪
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,在基於其序列號的銷售和採購文件跟踪的項目。這也可以用來跟踪商品的保修細節。
 DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,拒絕倉庫是必須反對regected項目
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,拒絕倉庫是必須反對regected項目
 DocType: Account,Expenses Included In Valuation,支出計入估值
 DocType: Employee,Provide email id registered in company,提供的電子郵件ID在公司註冊
 DocType: Hub Settings,Seller City,賣家市
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送：
 DocType: Offer Letter Term,Offer Letter Term,報價函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,項目已變種。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,項{0}未找到
 DocType: Bin,Stock Value,庫存價值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,樹類型
@@ -634,11 +635,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerosp
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,歡迎
 DocType: Journal Entry,Credit Card Entry,信用卡進入
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,任務主題
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,從供應商收到貨。
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,從供應商收到貨。
 DocType: Communication,Open,開
 DocType: Lead,Campaign Name,活動名稱
 ,Reserved,保留的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,你真的想UNSTOP
 DocType: Purchase Order,Supply Raw Materials,供應原料
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,在這接下來的發票將生成的日期。它在提交生成。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流動資產
@@ -654,7 +654,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with exist
 DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
 DocType: Employee,Cell Number,手機號碼
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,機會從
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月薪聲明。
@@ -723,7 +723,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_p
 DocType: Account,Liability,責任
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
 DocType: Company,Default Cost of Goods Sold Account,銷貨帳戶的預設成本
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,未選擇價格列表
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,未選擇價格列表
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,發送電子郵件
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,無權限
@@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,我的發票
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,無發現任何員工
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,無發現任何員工
 DocType: Purchase Order,Stopped,停止
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,選擇BOM展開
@@ -743,7 +743,6 @@ apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,通過CSV
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即發送
 ,Support Analytics,支援分析
 DocType: Item,Website Warehouse,網站倉庫
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,你真的要停止生產訂單：
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",該月的一天，在這汽車的發票將產生如05，28等
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必須小於或等於5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-往績紀錄
@@ -753,12 +752,12 @@ apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,客
 DocType: Features Setup,"To enable ""Point of Sale"" features",為了使“銷售點”的特點
 DocType: Bin,Moving Average Rate,移動平均房價
 DocType: Production Planning Tool,Select Items,選擇項目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
 DocType: Comment,Reference Name,參考名稱
 DocType: Maintenance Visit,Completion Status,完成狀態
 DocType: Sales Invoice Item,Target Warehouse,目標倉庫
 DocType: Item,Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,預計交貨日期不能早於銷售訂單日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,預計交貨日期不能早於銷售訂單日期
 DocType: Upload Attendance,Import Attendance,進口出席
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,所有項目群組
 DocType: Process Payroll,Activity Log,活動日誌
@@ -766,7 +765,8 @@ apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_s
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,自動編寫郵件在提交交易。
 DocType: Production Order,Item To Manufacture,產品製造
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,永久模鑄造
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,採購訂單到付款
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的狀態為{2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,採購訂單到付款
 DocType: Sales Order Item,Projected Qty,預計數量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通訊經理
@@ -790,8 +790,8 @@ DocType: SMS Log,Requested Numbers,請求號碼
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,績效考核。
 DocType: Sales Invoice Item,Stock Details,股票詳細信息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,專案值
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,銷售點
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},不能發揚{0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,銷售點
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},不能發揚{0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶，不允許設為借記帳戶
 DocType: Account,Balance must be,餘額必須
 DocType: Hub Settings,Publish Pricing,發布定價
@@ -813,7 +813,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs
 DocType: Purchase Invoice Item,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,噴砂
-sites/assets/js/desk.min.js +3938,Ms,女士
+DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,貨幣匯率的主人。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,計劃材料為子組件
@@ -835,29 +835,31 @@ DocType: Purchase Receipt,Range,範圍
 DocType: Supplier,Default Payable Accounts,預設應付帳款
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
 DocType: Features Setup,Item Barcode,商品條碼
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
 DocType: Address,Shop,店
 DocType: Hub Settings,Sync Now,立即同步
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,預設銀行/現金帳戶將被在POS機開發票，且選擇此模式時自動更新。
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,品牌
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,備抵過{0}越過為項目{1}。
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,備抵過{0}越過為項目{1}。
 DocType: Employee,Exit Interview Details,退出面試細節
 DocType: Item,Is Purchase Item,是購買項目
 DocType: Journal Entry Account,Purchase Invoice,採購發票
 DocType: Stock Ledger Entry,Voucher Detail No,券詳細說明暫無
 DocType: Stock Entry,Total Outgoing Value,出貨總計值
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,開幕日期和截止日期應在同一會計年度
 DocType: Lead,Request for Information,索取資料
 DocType: Payment Tool,Paid,付費
 DocType: Salary Slip,Total in words,總計大寫
 DocType: Material Request Item,Lead Time Date,交貨時間日期
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同​​的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,發貨給客戶。
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,發貨給客戶。
 DocType: Purchase Invoice Item,Purchase Order Item,採購訂單項目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,間接收入
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,將付款金額=未償還
@@ -865,13 +867,14 @@ DocType: Contact Us Settings,Address Line 1,地址行1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,方差
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,公司名稱
 DocType: SMS Center,Total Message(s),訊息總和（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有幫助影片名單
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,選取支票存入該銀行帳戶的頭。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允許用戶編輯價目表率的交易
 DocType: Pricing Rule,Max Qty,最大數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,化學藥品
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
 DocType: Process Payroll,Select Payroll Year and Month,選擇薪資年和月
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",轉到相應的群組（通常資金運用>流動資產>銀行帳戶，並新增一個新帳戶（通過點擊添加類型的兒童），“銀行”
 DocType: Workstation,Electricity Cost,電力成本
@@ -886,7 +889,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,白
 DocType: SMS Center,All Lead (Open),所有鉛（開放）
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,附上你的照片
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,使
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,使
 DocType: Journal Entry,Total Amount in Words,總金額大寫
 DocType: Workflow State,Stop,停止
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
@@ -910,7 +913,7 @@ DocType: Packing Slip Item,Packing Slip Item,包裝單項目
 DocType: POS Profile,Cash/Bank Account,現金／銀行帳戶
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Planning Tool,Get Sales Orders,獲取銷售訂單
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能為負數
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,備案
@@ -921,12 +924,13 @@ DocType: Time Log,Will be updated only if Time Log is 'Billable',如果時間日
 DocType: Project,Internal,內部
 DocType: Task,Urgent,緊急
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,轉到桌面和開始使用ERPNext
 DocType: Item,Manufacturer,生產廠家
 DocType: Landed Cost Item,Purchase Receipt Item,採購入庫項目
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在銷售訂單/成品倉庫保留倉庫
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,銷售金額
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,時間日誌
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是這條記錄的費用批審人，請更新“狀態”並儲存
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是這條記錄的費用批審人，請更新“狀態”並儲存
 DocType: Serial No,Creation Document No,文檔創建編號
 DocType: Issue,Issue,問題
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小，顏色等。
@@ -941,8 +945,9 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buyin
 DocType: GL Entry,Against,針對
 DocType: Item,Default Selling Cost Center,預設銷售成本中心
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},銷售訂單{0} {1}
 DocType: Opportunity,Contact Info,聯繫方式
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,製作Stock條目
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,製作Stock條目
 DocType: Packing Slip,Net Weight UOM,淨重計量單位
 DocType: Item,Default Supplier,預設的供應商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,對生產補貼比例
@@ -951,7 +956,7 @@ DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,獲取每週關閉日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,結束日期不能小於開始日期
 DocType: Sales Person,Select company name first.,先選擇公司名稱。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Dr,博士
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,博士
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,從供應商收到的報價。
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,通過時間更新日誌
@@ -979,7 +984,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司註冊號碼，供大家參考。稅務號碼等
 DocType: Sales Partner,Distributor,經銷商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
 ,Ordered Items To Be Billed,預付款的訂購物品
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,從範圍必須小於要​​範圍
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,選擇時間日誌並提交以創建一個新的銷售發票。
@@ -1027,7 +1032,7 @@ apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,稅務
 DocType: Lead,Lead,鉛
 DocType: Email Digest,Payables,應付賬款
 DocType: Account,Warehouse,倉庫
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
 ,Purchase Order Items To Be Billed,欲付款的採購訂單品項
 DocType: Purchase Invoice Item,Net Rate,淨費率
 DocType: Purchase Invoice Item,Purchase Invoice Item,採購發票項目
@@ -1042,11 +1047,11 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,未核銷付款明
 DocType: Global Defaults,Current Fiscal Year,當前會計年度
 DocType: Global Defaults,Disable Rounded Total,禁用圓角總
 DocType: Lead,Call,通話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,“分錄”不能是空的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,“分錄”不能是空的
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,建立職工
-sites/assets/js/erpnext.min.js +5,"Grid """,電網“
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,建立職工
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,電網“
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,請先選擇前綴稱號
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,研究
 DocType: Maintenance Visit Purpose,Work Done,工作完成
@@ -1056,14 +1061,15 @@ DocType: Communication,Sent,已送出
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,查看總帳
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
 DocType: Communication,Delivery Status,交貨狀態
 DocType: Production Order,Manufacture against Sales Order,對製造銷售訂單
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,世界其他地區
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
 ,Budget Variance Report,預算差異報告
 DocType: Salary Slip,Gross Pay,工資總額
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,股利支付
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,會計總帳
 DocType: Stock Reconciliation,Difference Amount,差額
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,留存收益
 DocType: BOM Item,Item Description,項目說明
@@ -1077,15 +1083,17 @@ DocType: Opportunity Item,Opportunity Item,項目的機會
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,臨時開通
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,員工休假餘額
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
 DocType: Address,Address Type,地址類型
 DocType: Purchase Receipt,Rejected Warehouse,拒絕倉庫
 DocType: GL Entry,Against Voucher,對傳票
 DocType: Item,Default Buying Cost Center,預設採購成本中心
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",為了獲得最好ERPNext，我們建議您花一些時間和觀看這些幫助視頻。
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,項{0}必須是銷售項目
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,到
 DocType: Item,Lead Time in days,在天交貨期
 ,Accounts Payable Summary,應付帳款摘要
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
 DocType: Journal Entry,Get Outstanding Invoices,獲取未付發票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,銷售訂單{0}無效
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",對不起，企業不能合併
@@ -1101,7 +1109,7 @@ apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/te
 DocType: Employee,Place of Issue,簽發地點
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,合同
 DocType: Report,Disabled,殘
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位：丁文因素：{0}項：{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位：丁文因素：{0}項：{1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,間接費用
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,農業
@@ -1110,13 +1118,13 @@ DocType: Mode of Payment,Mode of Payment,付款方式
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,請先輸入項目
 DocType: Journal Entry Account,Purchase Order,採購訂單
 DocType: Warehouse,Warehouse Contact Info,倉庫聯繫方式
-sites/assets/js/form.min.js +190,Name is required,名稱是必需的
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,名稱是必需的
 DocType: Purchase Invoice,Recurring Type,經常性類型
 DocType: Address,City/Town,市/鎮
 DocType: Email Digest,Annual Income,年收入
 DocType: Serial No,Serial No Details,序列號詳細資訊
 DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,送貨單{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
@@ -1126,15 +1134,15 @@ apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated perc
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},生產訂單狀態為{0}
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,編輯說明
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,預計交付日期比計劃開始日期較小。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,對供應商
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,預計交貨日期比計劃開始日期較早。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,對供應商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,設置帳戶類型有助於在交易中選擇該帳戶。
 DocType: Purchase Invoice,Grand Total (Company Currency),總計（公司貨幣）
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出貨總計
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",只能有一個運輸規則條件為0或空值“ To值”
 DocType: Authorization Rule,Transaction,交易
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：該成本中心是一個集團。不能讓反對團體的會計分錄。
-apps/erpnext/erpnext/config/projects.py +43,Tools,工具
+apps/frappe/frappe/config/desk.py +7,Tools,工具
 DocType: Item,Website Item Groups,網站項目群組
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,對入庫為目的製造行為，生產訂單號碼是強制要輸入的。
 DocType: Purchase Invoice,Total (Company Currency),總計（公司貨幣）
@@ -1144,7 +1152,7 @@ DocType: Workstation,Workstation Name,工作站名稱
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,電子郵件摘要：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
 DocType: Sales Partner,Target Distribution,目標分佈
-sites/assets/js/desk.min.js +7652,Comments,評論
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,評論
 DocType: Salary Slip,Bank Account No.,銀行賬號
 DocType: Naming Series,This is the number of the last created transaction with this prefix,這就是以這個前綴的最後一個創建的事務數
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},所需物品估價速率{0}
@@ -1159,7 +1167,7 @@ apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,請選擇一
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,特權休假
 DocType: Purchase Invoice,Supplier Invoice Date,供應商發票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,您需要啟用購物車
-sites/assets/js/form.min.js +212,No Data,無數據
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,無數據
 DocType: Appraisal Template Goal,Appraisal Template Goal,考核目標模板
 DocType: Salary Slip,Earning,盈利
 DocType: Payment Tool,Party Account Currency,黨的賬戶幣種
@@ -1167,7 +1175,7 @@ DocType: Payment Tool,Party Account Currency,黨的賬戶幣種
 DocType: Purchase Taxes and Charges,Add or Deduct,添加或扣除
 DocType: Company,If Yearly Budget Exceeded (for expense account),如果年度預算超出（用於報銷）
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,存在重疊的條件：
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,總訂單價值
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,食物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,老齡範圍3
@@ -1175,11 +1183,11 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a t
 DocType: Maintenance Schedule Item,No of Visits,沒有訪問量的
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",通訊，聯繫人，線索。
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在關閉帳戶的貨幣必須是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},對所有目標點的總和應該是100。{0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,作業不能留空。
 ,Delivered Items To Be Billed,交付項目要被收取
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},狀態更新為{0}
 DocType: DocField,Description,描述
 DocType: Authorization Rule,Average Discount,平均折扣
 DocType: Letter Head,Is Default,是預設
@@ -1207,8 +1215,8 @@ DocType: Purchase Invoice Item,Item Tax Amount,項目稅額
 DocType: Item,Maintain Stock,維護庫存資料
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},馬克斯：{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大數量：{0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,從日期時間
 DocType: Email Digest,For Company,對於公司
 apps/erpnext/erpnext/config/support.py +38,Communication log.,通信日誌。
@@ -1217,7 +1225,7 @@ DocType: Sales Invoice,Shipping Address Name,送貨地址名稱
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,條款及細則內容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依賴於無薪休假
@@ -1230,7 +1238,7 @@ DocType: Warranty Claim,Warranty / AMC Status,保修/ AMC狀態
 DocType: GL Entry,GL Entry,GL報名
 DocType: HR Settings,Employee Settings,員工設置
 ,Batch-Wise Balance History,間歇式平衡歷史
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,待辦事項列表
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,待辦事項列表
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,學徒
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,負數量是不允許
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1262,13 +1270,13 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing S
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,辦公室租金
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,設置短信閘道設置
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,導入失敗！
-sites/assets/js/erpnext.min.js +24,No address added yet.,尚未新增地址。
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,尚未新增地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作時間
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,分析人士
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必須小於或等於合資量{2}
 DocType: Item,Inventory,庫存
 DocType: Features Setup,"To enable ""Point of Sale"" view",為了讓觀“銷售點”
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,無法由空的購物車產生款項
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,無法由空的購物車產生款項
 DocType: Item,Sales Details,銷售詳細資訊
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,鋼釘
 DocType: Opportunity,With Items,隨著項目
@@ -1278,7 +1286,7 @@ DocType: Sales Invoice,"The date on which next invoice will be generated. It is
 ",在這接下來的發票將生成的日期。它在提交生成。
 DocType: Item Attribute,Item Attribute,項目屬性
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,政府
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,項目變體
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,項目變體
 DocType: Company,Services,服務
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),總計（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
@@ -1288,11 +1296,11 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,財政年度開始日期
 DocType: Employee External Work History,Total Experience,總經驗
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,擴孔
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,包裝單（ S）已取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,包裝單（ S）已取消
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,貨運代理費
 DocType: Material Request Item,Sales Order No,銷售訂單號
 DocType: Item Group,Item Group Name,項目群組名稱
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,拍攝
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,拍攝
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,轉移製造材料
 DocType: Pricing Rule,For Price List,對於價格表
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,獵頭
@@ -1301,8 +1309,7 @@ DocType: Maintenance Schedule,Schedules,時間表
 DocType: Purchase Invoice Item,Net Amount,淨額
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),額外的優惠金額（公司貨幣）
-DocType: Period Closing Voucher,CoA Help,輔酶幫助
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},錯誤： {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},錯誤： {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,請從科目表建立新帳戶。
 DocType: Maintenance Visit,Maintenance Visit,維護訪問
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客戶>客戶群組>領地
@@ -1313,6 +1320,7 @@ DocType: Landed Cost Voucher,Landed Cost Help,到岸成本幫助
 DocType: Event,Tuesday,星期二
 DocType: Leave Block List,Block Holidays on important days.,重要的日子中封鎖假期。
 ,Accounts Receivable Summary,應收賬款匯總
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},葉為已分配給員工{1}的期間類型{0} {2}  -  {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
 DocType: UOM,UOM Name,計量單位名稱
 DocType: Top Bar Item,Target,目標
@@ -1333,19 +1341,19 @@ DocType: Sales Partner,Sales Partner Target,銷售合作夥伴目標
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},會計分錄為{0}只能在貨幣進行：{1}
 DocType: Pricing Rule,Pricing Rule,定價規則
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,開槽
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,材料要求採購訂單
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,材料要求採購訂單
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的項目{1}不存在{2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行帳戶
 ,Bank Reconciliation Statement,銀行對帳表
 DocType: Address,Lead Name,鉛名稱
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期初存貨餘額
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,期初存貨餘額
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}必須只出現一次
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},{0}的排假成功
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},{0}的排假成功
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,無項目包裝
 DocType: Shipping Rule Condition,From Value,從價值
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,生產數量是必填的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,生產數量是必填的
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,數額沒有反映在銀行
 DocType: Quality Inspection Reading,Reading 4,4閱讀
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,索賠費用由公司負責。
@@ -1358,19 +1366,20 @@ DocType: Opportunity,Contact Mobile No,聯繫手機號碼
 DocType: Production Planning Tool,Select Sales Orders,選擇銷售訂單
 ,Material Requests for which Supplier Quotations are not created,對該供應商報價的材料需求尚未建立
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,要使用條形碼跟踪項目。您將能夠通過掃描物品條碼，進入交貨單和銷售發票的項目。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,標記為交付
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,請報價
 DocType: Dependent Task,Dependent Task,相關任務
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試規劃X天行動提前。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
 DocType: SMS Center,Receiver List,收受方列表
 DocType: Payment Tool Detail,Payment Amount,付款金額
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
-sites/assets/js/erpnext.min.js +51,{0} View,{0}查看
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}查看
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬結構演繹
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,選擇性激光燒結
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,導入成功！
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,發布項目成本
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},數量必須不超過{0}
@@ -1391,7 +1400,7 @@ DocType: Company,Default Payable Account,預設應付賬款
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",設置網上購物車，如航運規則，價格表等
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,安裝完成
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％已開立帳單
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,保留數量
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,保留數量
 DocType: Party Account,Party Account,黨的帳戶
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,人力資源
 DocType: Lead,Upper Income,高收入
@@ -1434,11 +1443,12 @@ DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it i
 DocType: Shopping Cart Settings,Enable Shopping Cart,讓購物車
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,項{0}必須是一個服務項目。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推動打擊{0} {1}不能大於付出\超過總計{2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,請選擇商品代碼
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),減少扣除停薪留職（LWP）
 DocType: Territory,Territory Manager,區域經理
+DocType: Delivery Note Item,To Warehouse (Optional),倉庫（可選）
 DocType: Sales Invoice,Paid Amount (Company Currency),支付的金額（公司貨幣）
 DocType: Purchase Invoice,Additional Discount,更多優惠
 DocType: Selling Settings,Selling Settings,銷售設置
@@ -1461,7 +1471,7 @@ DocType: Item,Weightage,權重
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,礦業
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,樹脂澆注
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,請先選擇{0}。
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,請先選擇{0}。
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
 DocType: Territory,Parent Territory,家長領地
 DocType: Quality Inspection Reading,Reading 2,閱讀2
@@ -1489,11 +1499,11 @@ DocType: Sales Invoice Item,Batch No,批號
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允許多個銷售訂單對客戶的採購訂單
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,主頁
 DocType: DocPerm,Delete,刪除
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,變種
-sites/assets/js/desk.min.js +7971,New {0},新的{0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,變種
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新的{0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,已停止訂單無法取消。 撤銷停止再取消。
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,已停止訂單無法取消。 撤銷停止再取消。
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
 DocType: Employee,Leave Encashed?,離開兌現？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
@@ -1504,14 +1514,14 @@ DocType: Sales Team,Contribution to Net Total,貢獻合計淨
 DocType: Sales Invoice Item,Customer's Item Code,客戶的產品編號
 DocType: Stock Reconciliation,Stock Reconciliation,庫存調整
 DocType: Territory,Territory Name,地區名稱
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,工作在進展倉庫提交之前，需要
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,提交之前，需要填入在製品倉庫
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,申請職位
 DocType: Purchase Order Item,Warehouse and Reference,倉庫及參考
 DocType: Supplier,Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
 DocType: Country,Country,國家
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,地址
 DocType: Communication,Received,收到
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,為航運規則的條件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,項目是不允許有生產訂單。
@@ -1527,12 +1537,11 @@ DocType: Authorization Control,Authorization Control,授權控制
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,時間日誌中的任務。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,付款
 DocType: Production Order Operation,Actual Time and Cost,實際時間和成本
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},最大的物料需求{0}可為項目{1}對銷售訂單{2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},針對銷售訂單{2}的項目{1}，最多可以有 {0} 被完成。 
 DocType: Employee,Salutation,招呼
 DocType: Communication,Rejected,拒絕
 DocType: Pricing Rule,Brand,品牌
 DocType: Item,Will also apply for variants,同時將申請變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,％已交付
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,在銷售時捆綁項目。
 DocType: Sales Order Item,Actual Qty,實際數量
 DocType: Sales Invoice Item,References,參考
@@ -1570,14 +1579,13 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,剪毛
 DocType: Item,Has Variants,有變種
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,單擊“製作銷售發票”按鈕來創建一個新的銷售發票。
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,期間從和週期要強制日期為重複％S
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,包裝和標籤
 DocType: Monthly Distribution,Name of the Monthly Distribution,每月分配的名稱
 DocType: Sales Person,Parent Sales Person,母公司銷售人員
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,請在公司主檔及全域性預設值指定預設貨幣
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox的訪問秘密
 DocType: Purchase Invoice,Recurring Invoice,經常性發票
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,項目管理
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,項目管理
 DocType: Supplier,Supplier of Goods or Services.,供應商的商品或服務。
 DocType: Budget Detail,Fiscal Year,財政年度
 DocType: Cost Center,Budget,預算
@@ -1606,11 +1614,11 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Pricing Rule,Selling,銷售
 DocType: Employee,Salary Information,薪資資訊
 DocType: Sales Person,Name and Employee ID,姓名和僱員ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
 DocType: Website Item Group,Website Item Group,網站項目群組
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,關稅和稅款
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,參考日期請輸入
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0}付款分錄不能由{1}過濾
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,參考日期請輸入
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款分錄不能由{1}過濾
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,表項，將在網站顯示出來
 DocType: Purchase Order Item Supplied,Supplied Qty,附送數量
 DocType: Material Request Item,Material Request Item,物料需求項目
@@ -1618,7 +1626,7 @@ apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,項目群組樹
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
 ,Item-wise Purchase History,項目明智的購買歷史
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,紅
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
 DocType: Account,Frozen,凍結的
 ,Open Production Orders,開啟生產訂單
 DocType: Installation Note,Installation Time,安裝時間
@@ -1662,13 +1670,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossin
 ,Quotation Trends,報價趨勢
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,借記帳戶必須是應收賬款
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",由於生產訂單可以為這個項目提出，它必須是一個股票項目。
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",由於生產訂單可以為這個項目提出，它必須是一個股票項目。
 DocType: Shipping Rule Condition,Shipping Amount,航運量
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,加盟
 DocType: Authorization Rule,Above Value,上述值
 ,Pending Amount,待審核金額
 DocType: Purchase Invoice Item,Conversion Factor,轉換因子
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,交付
+DocType: Purchase Order,Delivered,交付
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),設置接收服務器的工作電子郵件ID 。 （例如jobs@example.com ）
 DocType: Purchase Receipt,Vehicle Number,車號
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,在其經常性發票將被停止日期
@@ -1685,10 +1693,10 @@ DocType: Landed Cost Voucher,Distribute Charges Based On,分銷費基於
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,帳戶{0}的類型必須為“固定資產”作為項目{1}是一個資產項目
 DocType: HR Settings,HR Settings,人力資源設置
 apps/frappe/frappe/config/setup.py +130,Printing,列印
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,在天在你申請許可的假期。你不需要申請許可。
-sites/assets/js/desk.min.js +7805,and,和
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,和
 DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,縮寫不能為空或空間
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,體育
@@ -1725,7 +1733,6 @@ DocType: Opportunity,Quotation,報價
 DocType: Salary Slip,Total Deduction,扣除總額
 DocType: Quotation,Maintenance User,維護用戶
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,成本更新
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,你確定你要UNSTOP
 DocType: Employee,Date of Birth,出生日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,項{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**財年**表示財政年度。所有的會計輸入項目和其他重大交易針對**財年**進行追蹤。
@@ -1741,13 +1748,14 @@ apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追蹤銷售計劃。追踪訊息，報價，銷售訂單等，從競賽來衡量投資報酬。
 DocType: Expense Claim,Approver,審批人
 ,SO Qty,SO數量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",Stock條目對倉庫存在{0}，因此你不能重新分配或修改倉庫
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",Stock條目對倉庫存在{0}，因此你不能重新分配或修改倉庫
 DocType: Appraisal,Calculate Total Score,計算總分
 DocType: Supplier Quotation,Manufacturing Manager,生產經理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,分裂送貨單成包。
 apps/erpnext/erpnext/hooks.py +84,Shipments,發貨
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,浸成型
+DocType: Purchase Order,To be delivered to customer,要傳送給客戶
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間日誌狀態必須被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,設置
@@ -1772,11 +1780,11 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is
 DocType: Currency Exchange,From Currency,從貨幣
 DocType: DocField,Name,名稱
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額，發票類型和發票號碼
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},所需的{0}項目銷售訂單
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},所需的{0}項目銷售訂單
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,量以不反映在系統
 DocType: Purchase Invoice Item,Rate (Company Currency),率（公司貨幣）
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,他人
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,設為停止
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,無法找到匹配的項目。請選擇其他值{0}。
 DocType: POS Profile,Taxes and Charges,稅收和收費
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",產品或服務已購買，出售或持有的股票。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
@@ -1785,19 +1793,20 @@ DocType: Web Form,Select DocType,選擇DocType
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,拉床
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,銀行業
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,新的成本中心
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新的成本中心
 DocType: Bin,Ordered Quantity,訂購數量
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",例如「建設建設者工具“
 DocType: Quality Inspection,In Process,在過程
 DocType: Authorization Rule,Itemwise Discount,Itemwise折扣
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0}針對銷售訂單{1}
+DocType: Purchase Order Item,Reference Document Type,參考文檔類型
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0}針對銷售訂單{1}
 DocType: Account,Fixed Asset,固定資產
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,序列化庫存
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,序列化庫存
 DocType: Activity Type,Default Billing Rate,默認計費率
 DocType: Time Log Batch,Total Billing Amount,總結算金額
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,應收賬款
 ,Stock Balance,庫存餘額
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,銷售訂單到付款
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,銷售訂單到付款
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,時間日誌創建：
 DocType: Item,Weight UOM,重量計量單位
@@ -1833,10 +1842,9 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,信用帳戶必須是應付賬款
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
 DocType: Production Order Operation,Completed Qty,完成數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,價格表{0}被禁用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,價格表{0}被禁用
 DocType: Manufacturing Settings,Allow Overtime,允許加班
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,銷售訂單{0}被停止
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}需要的產品序列號{1}。您所提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值價格
 DocType: Item,Customer Item Codes,客戶項目代碼
@@ -1845,9 +1853,9 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,焊接
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,新的庫存計量單位是必需的
 DocType: Quality Inspection,Sample Size,樣本大小
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,所有項目已開具發票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,所有項目已開具發票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',請指定一個有效的“從案號”
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,產品序列號
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用戶和權限
@@ -1874,7 +1882,7 @@ apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,
 DocType: Sales Partner,Address & Contacts,地址及聯繫方式
 DocType: SMS Log,Sender Name,發件人名稱
 DocType: Page,Title,標題
-sites/assets/js/list.min.js +104,Customize,客製化
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,客製化
 DocType: POS Profile,[Select],[選擇]
 DocType: SMS Log,Sent To,發給
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,做銷售發票
@@ -1899,12 +1907,13 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ag
 DocType: Item,End of Life,壽命結束
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,旅遊
 DocType: Leave Block List,Allow Users,允許用戶
+DocType: Purchase Order,Customer Mobile No,客戶手機號碼
 DocType: Sales Invoice,Recurring,經常性
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪獨立收入和支出進行產品垂直或部門。
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,項目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,轉印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,轉印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
 DocType: Purchase Invoice,Price List Currency,價格表貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
@@ -1927,7 +1936,7 @@ DocType: Appraisal,Employee,僱員
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,導入電子郵件發件人
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,邀請成為用戶
 DocType: Features Setup,After Sale Installations,銷售後安裝
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1}}已開票
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1}}已開票
 DocType: Workstation Working Hour,End Time,結束時間
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,銷售或採購的標準合同條款。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,集團透過券
@@ -1936,8 +1945,9 @@ DocType: Sales Invoice,Mass Mailing,郵件群發
 DocType: Page,Standard,標準
 DocType: Rename Tool,File to Rename,文件重命名
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},項目{0}需要採購訂單號
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,顯示支付
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,尺寸
 DocType: Notification Control,Expense Claim Approved,報銷批准
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,製藥
@@ -1956,8 +1966,8 @@ DocType: Upload Attendance,Attendance To Date,出席會議日期
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),設置接收服務器銷售的電子郵件ID 。 （例如sales@example.com ）
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Tool,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,請註明公司以處理
-sites/assets/js/list.min.js +23,Draft,草稿
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,請註明公司以處理
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,草稿
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,補假
 DocType: Quality Inspection Reading,Accepted,接受的
 DocType: User,Female,女
@@ -1973,14 +1983,15 @@ cannot be greater than planned quanitity in Production Order translates into
 DocType: Shipping Rule,Shipping Rule Label,送貨規則標籤
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料不能為空。
 DocType: Newsletter,Test,測試
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",由於有存量交易為這個項目，\你不能改變的值'有序列號'，'有批號'，'是股票項目“和”評估方法“
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,快速日記帳分錄
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
 DocType: Employee,Previous Work Experience,以前的工作經驗
 DocType: Stock Entry,For Quantity,對於數量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1}未提交
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,需求的項目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1}未提交
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,需求的項目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,將對每個成品項目創建獨立的生產訂單。
 DocType: Purchase Invoice,Terms and Conditions1,條款及條件1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完成安裝
@@ -1992,7 +2003,7 @@ apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,時事通訊錄
 DocType: Delivery Note,Transporter Name,轉運名稱
 DocType: Contact,Enter department to which this Contact belongs,輸入聯繫屬於的部門
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,共缺席
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,計量單位
 DocType: Fiscal Year,Year End Date,年結日
 DocType: Task Depends On,Task Depends On,任務取決於
@@ -2004,7 +2015,7 @@ DocType: Notification Control,Expense Claim Approved Message,報銷批准的訊
 DocType: Email Digest,How frequently?,多久？
 DocType: Purchase Receipt,Get Current Stock,獲取當前庫存
 apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,物料清單樹
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},維護開始日期不能交付日期序列號前{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},序號{0}的維護開始日期不能早於交貨日期
 DocType: Production Order,Actual End Date,實際結束日期
 DocType: Authorization Rule,Applicable To (Role),適用於（角色）
 DocType: Stock Entry,Purpose,目的
@@ -2018,7 +2029,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,第三方分銷商/經銷商/代理商/分支機構/分銷商誰銷售公司產品的佣金。
 DocType: Customer Group,Has Child Node,有子節點
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0}針對採購訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0}針對採購訂單{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",在這裡輸入靜態URL參數（如稱發件人= ERPNext，用戶名= ERPNext，密碼= 1234等）
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}不在任何現有的會計年度。詳情查看{2}。
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,這是一個示例網站從ERPNext自動生成
@@ -2069,11 +2080,9 @@ DocType: Note,Note,注釋
 DocType: Purchase Receipt Item,Recd Quantity,RECD數量
 DocType: Email Account,Email Ids,電子郵件ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,設為堵塞通
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,股票輸入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金帳戶
 DocType: Tax Rule,Billing City,結算城市
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,這請假申請正在等待批准。只有請假審批者可以更新狀態。
 DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
 DocType: Journal Entry,Credit Note,信用票據
@@ -2094,7 +2103,7 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),總計（數量）
 DocType: Installation Note Item,Installed Qty,安裝數量
 DocType: Lead,Fax,傳真
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,提交
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,提交
 DocType: Salary Structure,Total Earning,總盈利
 DocType: Purchase Receipt,Time at which materials were received,物料收到的時間
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,我的地址
@@ -2103,7 +2112,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織分支
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,或
 DocType: Sales Order,Billing Status,計費狀態
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,公用事業費用
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90以上
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,預設採購價格表
 ,Download Backups,下載備份
 DocType: Notification Control,Sales Order Message,銷售訂單訊息
@@ -2112,7 +2121,7 @@ apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/paymen
 DocType: Process Payroll,Select Employees,選擇僱員
 DocType: Bank Reconciliation,To Date,至今
 DocType: Opportunity,Potential Sales Deal,潛在的銷售交易
-sites/assets/js/form.min.js +308,Details,詳細資訊
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,詳細資訊
 DocType: Purchase Invoice,Total Taxes and Charges,總營業稅金及費用
 DocType: Employee,Emergency Contact,緊急聯絡人
 DocType: Item,Quality Parameters,質量參數
@@ -2127,7 +2136,7 @@ DocType: Purchase Order Item,Received Qty,收到數量
 DocType: Stock Entry Detail,Serial No / Batch,序列號/批次
 DocType: Product Bundle,Parent Item,父項目
 DocType: Account,Account Type,帳戶類型
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
 ,To Produce,以生產
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率，行{3}也必須包括
 DocType: Packing Slip,Identification of the package for the delivery (for print),寄送包裹的識別碼（用於列印）
@@ -2138,7 +2147,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,壓扁
 DocType: Account,Income Account,收入帳戶
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,模
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,交貨
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,交貨
 DocType: Stock Reconciliation Item,Current Qty,目前數量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",請見“材料成本基於”在成本核算章節
 DocType: Appraisal Goal,Key Responsibility Area,關鍵責任區
@@ -2169,9 +2178,9 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,所有地址。
 DocType: Company,Stock Settings,庫存設定
 DocType: User,Bio,生物
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客戶群組樹。
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,新的成本中心名稱
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,新的成本中心名稱
 DocType: Leave Control Panel,Leave Control Panel,休假控制面板
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,無預設的地址模板。請從設定＞列印與品牌＞地址模板 新增之。
 DocType: Appraisal,HR User,HR用戶
@@ -2190,24 +2199,24 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing
 DocType: Payment Tool Detail,Payment Tool Detail,支付工具的詳細資訊
 ,Sales Browser,銷售瀏覽器
 DocType: Journal Entry,Total Credit,貸方總額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對股票入門{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,當地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對股票入門{2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,當地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),貸款及墊款（資產）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務人
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,大
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,無發現任何員工！
 DocType: C-Form Invoice Detail,Territory,領土
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,請註明無需訪問
+DocType: Purchase Order,Customer Address Display,客戶地址顯示
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,拋光
 DocType: Production Order Operation,Planned Start Time,計劃開始時間
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,分配
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",測度項目的默認單位{0}不能直接改變，因為\你已經做了一些交易（S）與其他計量單位。要更改默認的計量單位，\使用“計量單位更換工具”下的股票模塊工具。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,{0}報價被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,{0}報價被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未償還總額
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,員工{0}於{1}休假。不能標記考勤。
 DocType: Sales Partner,Targets,目標
@@ -2222,12 +2231,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ERPNext是一個開源的基於Web的ERP系統，通過網路技術，向私人有限公司提供整合的工具，在一個小的組織管理大多數流程。有關Web註釋，或購買託管，想得到更多資訊，請連結
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,開始會計分錄前，請設定您的會計科目表
 DocType: Purchase Invoice,Ignore Pricing Rule,忽略定價規則
-sites/assets/js/list.min.js +24,Cancelled,註銷
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,註銷
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,從薪酬結構日期不能高於員工加入日期較小。
 DocType: Employee Education,Graduate,畢業生
 DocType: Leave Block List,Block Days,封鎖天數
 DocType: Journal Entry,Excise Entry,海關入境
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：銷售訂單{0}已經存在針對客戶的採購訂單{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：銷售訂單{0}已經存在針對客戶的採購訂單{1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2284,17 +2293,17 @@ DocType: Account,Stock Received But Not Billed,庫存接收，但不付款
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工資總額+欠費​​金額​​+兌現金額 - 扣除項目金額
 DocType: Monthly Distribution,Distribution Name,分配名稱
 DocType: Features Setup,Sales and Purchase,買賣
-DocType: Purchase Order Item,Material Request No,材料需求編號
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},項目{0}需要品質檢驗
+DocType: Supplier Quotation Item,Material Request No,材料需求編號
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},項目{0}需要品質檢驗
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,客戶貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}已經從這個清單退訂成功！
 DocType: Purchase Invoice Item,Net Rate (Company Currency),淨利率（公司貨幣）
-apps/frappe/frappe/templates/base.html +132,Added,添加
+apps/frappe/frappe/templates/base.html +134,Added,添加
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,管理領地樹。
 DocType: Journal Entry Account,Sales Invoice,銷售發票
 DocType: Journal Entry Account,Party Balance,黨平衡
 DocType: Sales Invoice Item,Time Log Batch,時間日誌批
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,請選擇適用的折扣
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,請選擇適用的折扣
 DocType: Company,Default Receivable Account,預設應收帳款
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,對支付上述選擇條件的薪資總額新增銀行分錄
 DocType: Stock Entry,Material Transfer for Manufacture,物料轉倉用於製造
@@ -2305,7 +2314,7 @@ DocType: Bank Reconciliation,Get Relevant Entries,獲取相關條目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,存貨的會計分錄
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,鑄幣
 DocType: Sales Invoice,Sales Team1,銷售團隊1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,項目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
 apps/frappe/frappe/desk/query_report.py +136,Total,總計
 DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
@@ -2320,13 +2329,15 @@ DocType: Quality Inspection,Quality Inspection,品質檢驗
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,超小
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,噴射成形
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,帳戶{0}被凍結
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆煙草
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL或BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},只能使支付對未付款的{0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,佣金率不能大於100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低庫存水平
 DocType: Stock Entry,Subcontract,轉包
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,請輸入{0}第一
 DocType: Production Planning Tool,Get Items From Sales Orders,從銷售訂單獲取項目
 DocType: Production Order Operation,Actual End Time,實際結束時間
 DocType: Production Planning Tool,Download Materials Required,下載所需材料
@@ -2343,9 +2354,9 @@ DocType: Maintenance Visit,Scheduled,預定
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
 DocType: Purchase Invoice Item,Valuation Rate,估值率
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,尚未選擇價格表貨幣
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,尚未選擇價格表貨幣
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,項目行{0}：採購入庫{1}不在上述“採購入庫單”表中存在
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,專案開始日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,直到
 DocType: Rename Tool,Rename Log,重命名日誌
@@ -2372,13 +2383,13 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationa
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有葉節點中允許交易
 DocType: Expense Claim,Expense Approver,費用審批
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,採購入庫項目供應商
-sites/assets/js/erpnext.min.js +48,Pay,付
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,付
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,以日期時間
 DocType: SMS Settings,SMS Gateway URL,短信閘道的URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,日誌維護短信發送狀態
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,磨碎
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,收縮包裝
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,待活動
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活動
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,確認
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,供應商>供應商類型
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,請輸入解除日期。
@@ -2389,7 +2400,6 @@ DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,輸
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,報紙出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,選擇財政年度
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,熔煉
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,您是這條記錄的休假審批人。請更新“狀態”並保存
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
 DocType: Attendance,Attendance Date,考勤日期
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
@@ -2425,6 +2435,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period C
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,與現有的交易成本中心，不能轉化為組
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折舊
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供應商（S）
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,無效的時期
 DocType: Customer,Credit Limit,信用額度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,交易的選擇類型
 DocType: GL Entry,Voucher No,憑證編號
@@ -2434,8 +2445,8 @@ apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,模
 DocType: Customer,Address and Contact,地址和聯繫方式
 DocType: Customer,Last Day of the Next Month,下個月的最後一天
 DocType: Employee,Feedback,反饋
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：由於/參考日期由{0}天超過了允許客戶信用天（S）
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,維護手冊。計劃
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：由於/參考日期由{0}天超過了允許客戶信用天（S）
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,維護手冊。計劃
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,磨料噴射加工
 DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
 DocType: Website Settings,Website Settings,網站設置
@@ -2449,11 +2460,11 @@ DocType: Quality Inspection,Outgoing,發送
 DocType: Material Request,Requested For,要求
 DocType: Quotation Item,Against Doctype,針對文檔類型
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送貨單反對任何項目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,root帳號不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,root帳號不能被刪除
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,顯示Stock條目
 ,Is Primary Address,是主地址
-DocType: Production Order,Work-in-Progress Warehouse,工作在建倉庫
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},參考＃ {0}於{1}
+DocType: Production Order,Work-in-Progress Warehouse,在製品倉庫
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},參考＃ {0}於{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,管理地址
 DocType: Pricing Rule,Item Code,產品編號
 DocType: Production Planning Tool,Create Production Orders,建立生產訂單
@@ -2462,14 +2473,14 @@ DocType: Journal Entry,User Remark,用戶備註
 DocType: Lead,Market Segment,市場分類
 DocType: Communication,Phone,電話
 DocType: Employee Internal Work History,Employee Internal Work History,員工內部工作經歷
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),關閉（Dr）
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),關閉（Dr）
 DocType: Contact,Passive,被動
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列號{0}無貨
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,稅務模板賣出的交易。
 DocType: Sales Invoice,Write Off Outstanding Amount,核銷額（億元）
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",檢查是否需要自動週期性發票。提交任何銷售發票後，經常性部分可見。
 DocType: Account,Accounts Manager,帳戶管理器
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',時間日誌{0}必須是'提交'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',時間日誌{0}必須是'提交'
 DocType: Stock Settings,Default Stock UOM,預設庫存計量單位
 DocType: Time Log,Costing Rate based on Activity Type (per hour),成本核算房價為活動類型（每小時）
 DocType: Production Planning Tool,Create Material Requests,建立材料需求
@@ -2480,7 +2491,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,獲取更新
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,添加了一些樣本記錄
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,離開管理
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,離開管理
 DocType: Event,Groups,組
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,以帳戶分群組
 DocType: Sales Order,Fully Delivered,完全交付
@@ -2492,11 +2503,10 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and ta
 DocType: Features Setup,Sales Extras,額外銷售
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0}預算帳戶{1}對成本中心{2}將超過{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶，因為此庫存調整是一個開始分錄
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
-DocType: Leave Allocation,Carry Forwarded Leaves,進行轉發葉
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
 ,Stock Projected Qty,存貨預計數量
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
 DocType: Sales Order,Customer's Purchase Order,客戶採購訂單
 DocType: Warranty Claim,From Company,從公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,價值或數量
@@ -2509,13 +2519,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use i
 DocType: Sales Partner,Retailer,零售商
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供應商類型
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},報價{0}非為{1}類型
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},報價{0}非為{1}類型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
 DocType: Sales Order,%  Delivered,％交付
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,銀行透支戶口
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,製作工資單
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,開通
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,瀏覽BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,抵押貸款
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,真棒產品
@@ -2525,7 +2534,7 @@ DocType: Appraisal,Appraisal,評價
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,失模鑄造
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,圖紙
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日期重複
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},休假審批人必須是一個{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},休假審批人必須是一個{0}
 DocType: Hub Settings,Seller Email,賣家電子郵件
 DocType: Project,Total Purchase Cost (via Purchase Invoice),總購買成本（通過採購發票）
 DocType: Workstation Working Hour,Start Time,開始時間
@@ -2539,8 +2548,8 @@ DocType: Sales Invoice,Rate at which Price list currency is converted to custome
 DocType: Purchase Invoice Item,Net Amount (Company Currency),淨金額（公司貨幣）
 DocType: BOM Operation,Hour Rate,小時率
 DocType: Stock Settings,Item Naming By,產品命名規則
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,從報價
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},另一個期末錄入{0}作出後{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,從報價
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},另一個期末錄入{0}作出後{1}
 DocType: Production Order,Material Transferred for Manufacturing,物料轉倉用於製造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,帳戶{0}不存在
 DocType: Purchase Receipt Item,Purchase Order Item No,採購訂單編號
@@ -2553,11 +2562,11 @@ DocType: Item,Inspection Required,需要檢驗
 DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
 DocType: Sales Order,Fully Billed,完全開票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,手頭現金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +71,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包裹的總重量。通常為淨重+包裝材料的重量。 （用於列印）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結帳戶，並新增/修改對凍結帳戶的會計分錄
 DocType: Serial No,Is Cancelled,被註銷
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,我的出貨量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,我的出貨量
 DocType: Journal Entry,Bill Date,帳單日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",即使有更高優先級的多個定價規則，然後按照內部優先級應用：
 DocType: Supplier,Supplier Details,供應商詳細資訊
@@ -2570,7 +2579,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,電匯
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,請選擇銀行帳戶
 DocType: Newsletter,Create and Send Newsletters,建立和發送簡訊
-sites/assets/js/report.min.js +107,From Date must be before To Date,起始日期必須早於終點日期
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,起始日期必須早於終點日期
 DocType: Sales Order,Recurring Order,經常訂購
 DocType: Company,Default Income Account,預設之收入帳戶
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客戶群組／客戶
@@ -2585,31 +2594,30 @@ DocType: Purchase Order Item Supplied,Stock UOM,庫存計量單位
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,採購訂單{0}未提交
 ,Projected,預計
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列號{0}不屬於倉庫{1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
 DocType: Notification Control,Quotation Message,報價訊息
 DocType: Issue,Opening Date,開幕日期
 DocType: Journal Entry,Remark,備註
 DocType: Purchase Receipt Item,Rate and Amount,率及金額
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,無聊
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,從銷售訂單
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,從銷售訂單
 DocType: Blog Category,Parent Website Route,父網站路由
 DocType: Sales Order,Not Billed,不發單
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,尚未新增聯絡人。
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,尚未新增聯絡人。
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,不活躍
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,對發票發布日期
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,到岸成本憑證金額
 DocType: Time Log,Batched for Billing,批量計費
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,由供應商提出的帳單。
 DocType: POS Profile,Write Off Account,核銷帳戶
-sites/assets/js/erpnext.min.js +26,Discount Amount,折扣金額
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,折扣金額
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
 DocType: Item,Warranty Period (in days),保修期限（天數）
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,例如增值稅
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,項目4
 DocType: Journal Entry Account,Journal Entry Account,日記帳分錄帳號
 DocType: Shopping Cart Settings,Quotation Series,報價系列
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,鐵水形成氣
 DocType: Sales Order Item,Sales Order Date,銷售訂單日期
 DocType: Sales Invoice Item,Delivered Qty,交付數量
@@ -2641,10 +2649,11 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty c
 DocType: Stock Entry,Customer or Supplier Details,客戶或供應商詳細信息
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,集合
 DocType: Lead,Lead Owner,鉛所有者
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,倉庫是必需的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,倉庫是必需的
 DocType: Employee,Marital Status,婚姻狀況
 DocType: Stock Settings,Auto Material Request,自動物料需求
 DocType: Time Log,Will be updated when billed.,計費時將被更新。
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在從倉庫可用的批次數量
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
 DocType: Sales Invoice,Against Income Account,對收入帳戶
@@ -2661,12 +2670,12 @@ DocType: POS Profile,Update Stock,庫存更新
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,超精研
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同計量單位的項目會導致不正確的（總）淨重值。確保每個項目的淨重是在同一個計量單位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM率
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,請送貨單拉項目
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,請送貨單拉項目
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,日記條目{0}都是非聯
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件，電話，聊天，訪問等所有通信記錄
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,條款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,新建立
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,新建立
 DocType: Buying Settings,Purchase Order Required,購貨訂單要求
 ,Item-wise Sales History,項目明智的銷售歷史
 DocType: Expense Claim,Total Sanctioned Amount,總被制裁金額
@@ -2683,16 +2692,17 @@ DocType: Salary Slip Deduction,Salary Slip Deduction,工資單上扣除
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,筆記
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,首先選擇一組節點。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的必須是一個{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,填寫表格，並將其保存
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,填寫表格，並將其保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下載一個包含所有原料一份報告，他們最新的庫存狀態
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,面對
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社區論壇
 DocType: Leave Application,Leave Balance Before Application,離開平衡應用前
 DocType: SMS Center,Send SMS,發送短信
 DocType: Company,Default Letter Head,預設信頭
 DocType: Time Log,Billable,計費
 DocType: Authorization Rule,This will be used for setting rule in HR module,這將用於在人力資源模塊的設置規則
 DocType: Account,Rate at which this tax is applied,此稅適用的匯率
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,再訂購數量
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再訂購數量
 DocType: Company,Stock Adjustment Account,庫存調整帳戶
 DocType: Journal Entry,Write Off,註銷
 DocType: Time Log,Operation ID,操作ID
@@ -2703,12 +2713,15 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",折扣欄位出現在採購訂單，採購入庫單，採購發票
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注：請不要創建帳戶的客戶和供應商
 DocType: Report,Report Type,報告類型
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,載入中
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,載入中
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替換工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,依據國家別啟發式的預設地址模板
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
+DocType: Sales Order Item,Supplier delivers to Customer,供應商提供給客戶
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,展會稅分手
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,數據導入和導出
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',如果您涉及製造活動。啟動項目「製造的」
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,發票發布日期
 DocType: Sales Invoice,Rounded Total,整數總計
 DocType: Product Bundle,List items that form the package.,形成包列表項。
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配總和應該等於100%
@@ -2719,8 +2732,8 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.j
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,請聯繫，誰擁有碩士學位的銷售經理{0}角色的用戶
 DocType: Company,Default Cash Account,預設的現金帳戶
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',請輸入「預定交付日」
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',請輸入「預定交付日」
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
@@ -2742,11 +2755,12 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty
 					Available Qty: {4}, Transfer Qty: {5}","行{0}：數量不是在倉庫avalable {1} {2} {3}。
 可用數量：{4}，轉讓數量：{5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,項目3
+DocType: Purchase Order,Customer Contact Email,客戶聯繫電子郵件
 DocType: Event,Sunday,星期天
 DocType: Sales Team,Contribution (%),貢獻（％）
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,職責
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,模板
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,模板
 DocType: Sales Person,Sales Person Name,銷售人員的姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,請在表中輸入至少一筆發票
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,添加用戶
@@ -2755,7 +2769,7 @@ DocType: Task,Actual Start Date (via Time Logs),實際開始日期（通過時
 DocType: Stock Reconciliation Item,Before reconciliation,調整前
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),稅收和收費上架（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
 DocType: Sales Order,Partly Billed,天色帳單
 DocType: Item,Default BOM,預設的BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2763,12 +2777,11 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,總街貨量金額
 DocType: Time Log Batch,Total Hours,總時數
 DocType: Journal Entry,Printing Settings,打印設置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,汽車
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},{0}財務年度{1}員工的休假別{0}已排定
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,項目是必需的
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,金屬注射成型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,從送貨單
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,從送貨單
 DocType: Time Log,From Time,從時間
 DocType: Notification Control,Custom Message,自定義訊息
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,投資銀行業務
@@ -2784,10 +2797,10 @@ DocType: Newsletter,A Lead with this email id should exist,與此電子郵件id
 DocType: Stock Entry,From BOM,從BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本的
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',請點擊“生成表”
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,日期應該是一樣的起始日期為半天假
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',請點擊“生成表”
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,日期應該是一樣的起始日期為半天假
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",如公斤，單位，NOS，M
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
 DocType: Salary Structure,Salary Structure,薪酬結構
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
@@ -2795,7 +2808,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multipl
 通過分配優先級。價格規則：{0}"
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,發行材料
 DocType: Material Request Item,For Warehouse,對於倉​​庫
 DocType: Employee,Offer Date,到職日期
 DocType: Hub Settings,Access Token,存取 Token
@@ -2818,6 +2831,7 @@ DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,需要起始和到達日期
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
+DocType: Delivery Note Item,From Warehouse,從倉庫
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,鑽孔
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,吹塑
 DocType: Purchase Taxes and Charges,Valuation and Total,估值與總計
@@ -2839,11 +2853,12 @@ DocType: C-Form,Amended From,從修訂
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原料
 DocType: Leave Application,Follow via Email,通過電子郵件跟隨
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,無論是數量目標或目標量是必需的
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,請選擇發布日期第一
-DocType: Leave Allocation,Carry Forward,發揚
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,請選擇發布日期第一
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,開業日期應該是截止日期之前，
+DocType: Leave Control Panel,Carry Forward,發揚
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,與現有的交易成本中心，不能轉換為總賬
 DocType: Department,Days for which Holidays are blocked for this department.,天的假期被封鎖這個部門。
 ,Produced,生產
@@ -2864,17 +2879,17 @@ apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,娛樂休閒
 DocType: Purchase Order,The date on which recurring order will be stop,上反复出現的訂單將被終止日期
 DocType: Quality Inspection,Item Serial No,產品序列號
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必須減少{1}或應增加超量容許度
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必須減少{1}或應增加超量容許度
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,總現
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,小時
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","系列化項目{0}不能被更新\
 使用庫存調整"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,轉印材料供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,轉印材料供應商
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
 DocType: Lead,Lead Type,引線型
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,建立報價
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,所有這些項目已開具發票
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,所有這些項目已開具發票
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
 DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
 DocType: BOM Replace Tool,The new BOM after replacement,更換後的新物料清單
@@ -2922,7 +2937,7 @@ DocType: C-Form,C-Form,C-表
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,操作ID沒有設定
 DocType: Production Order,Planned Start Date,計劃開始日期
 DocType: Serial No,Creation Document Type,創建文件類型
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,維護手冊。訪
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,維護手冊。訪
 DocType: Leave Type,Is Encash,為兌現
 DocType: Purchase Invoice,Mobile No,手機號碼
 DocType: Payment Tool,Make Journal Entry,使日記帳分錄
@@ -2930,7 +2945,7 @@ DocType: Leave Allocation,New Leaves Allocated,新的排假
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
 DocType: Project,Expected End Date,預計結束日期
 DocType: Appraisal Template,Appraisal Template Title,評估模板標題
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,商業
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,商業
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 DocType: Cost Center,Distribution Id,分配標識
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,真棒服務
@@ -2946,14 +2961,15 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Finan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}
 DocType: Tax Rule,Sales,銷售
 DocType: Stock Entry Detail,Basic Amount,基本金額
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,鉻
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+DocType: Leave Allocation,Unused leaves,未使用的葉子
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,鉻
 DocType: Customer,Default Receivable Accounts,預設應收帳款
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,鋸切
 DocType: Tax Rule,Billing State,計費狀態
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,層壓
 DocType: Item Reorder,Transfer,轉讓
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
 DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
@@ -2969,6 +2985,7 @@ DocType: Company,Retail,零售
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,客戶{0}不存在
 DocType: Attendance,Absent,缺席
 DocType: Product Bundle,Product Bundle,產品包
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}：無效參考{1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,破碎
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購置稅和費模板
 DocType: Upload Attendance,Download Template,下載模板
@@ -2976,16 +2993,16 @@ DocType: GL Entry,Remarks,備註
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料產品編號
 DocType: Journal Entry,Write Off Based On,核銷的基礎上
 DocType: Features Setup,POS View,POS機查看
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,對於一個序列號安裝記錄
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,對於一個序列號安裝記錄
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,連鑄
-sites/assets/js/erpnext.min.js +10,Please specify a,請指定一個
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,請指定一個
 DocType: Offer Letter,Awaiting Response,正在等待回應
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,以上
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,冷上漿
 DocType: Salary Slip,Earning & Deduction,收入及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,帳戶{0}不能為集團
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,區域
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,負面評價率是不允許的
 DocType: Holiday List,Weekly Off,每週關閉
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",對於例如2012、2012-13
@@ -3029,12 +3046,12 @@ apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,挺著
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,蒸發圖案鑄造
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,娛樂費用
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Age,年齡
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,年齡
 DocType: Time Log,Billing Amount,開票金額
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,為項目指定了無效的數量{0} 。量應大於0 。
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,申請許可。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,法律費用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",該月的一天，在這汽車的訂單將產生如05，28等
 DocType: Sales Invoice,Posting Time,登錄時間
@@ -3043,9 +3060,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Sales Partner,Logo,標誌
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,如果要強制用戶在儲存之前選擇了一系列，則勾選此項。如果您勾選此項，則將沒有預設值。
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},沒有序號{0}的品項
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,打開通知
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,打開通知
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,直接費用
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,您真的要UNSTOP此物料需求？
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客戶收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
@@ -3056,7 +3072,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,隨著對日
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,珩磨
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,緩刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,預設倉庫對庫存項目是強制性的。
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,預設倉庫對庫存項目是強制性的。
 DocType: Feed,Full Name,全名
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,鉚
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},{1}年{0}月的薪資支付
@@ -3080,7 +3096,7 @@ DocType: Cost Center,Add rows to set annual budgets on Accounts.,在帳戶的年
 DocType: Buying Settings,Default Supplier Type,預設的供應商類別
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,採石
 DocType: Production Order,Total Operating Cost,總營運成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,注：項目{0}多次輸入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,注：項目{0}多次輸入
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,所有聯繫人。
 DocType: Newsletter,Test Email Id,測試電子郵件Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,公司縮寫
@@ -3104,11 +3120,10 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,行情
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以編輯凍結的庫存
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客戶群組
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,稅務模板是強制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率（公司貨幣）
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1}狀態為“已停止”
 DocType: Account,Temporary,臨時
 DocType: Address,Preferred Billing Address,偏好的帳單地址
 DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
@@ -3126,13 +3141,14 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,項目智者稅制明
 DocType: Purchase Order Item,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,熨衣服
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}已停止
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 DocType: Lead,Add to calendar on this date,在此日期加到日曆
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,增加運輸成本的規則。
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,活動預告
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,活動預告
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客戶是必需的
 DocType: Letter Head,Letter Head,信頭
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,快速入門
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是強制性的回報
 DocType: Purchase Order,To Receive,接受
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,冷縮配合
@@ -3156,25 +3172,25 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,至少要有一間倉庫
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更換
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0}對銷售發票{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,請輸入預設的計量單位
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0}對銷售發票{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,請輸入預設的計量單位
 DocType: Purchase Invoice Item,Project Name,專案名稱
 DocType: Supplier,Mention if non-standard receivable account,提到如果不規範應收賬款
 DocType: Workflow State,Edit,編輯
 DocType: Journal Entry Account,If Income or Expense,如果收入或支出
 DocType: Features Setup,Item Batch Nos,項目批NOS
 DocType: Stock Ledger Entry,Stock Value Difference,庫存價值差異
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,人力資源
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,人力資源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款對賬
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,所得稅資產
 DocType: BOM Item,BOM No,BOM No.
 DocType: Contact Us Settings,Pincode,PIN代碼
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
 DocType: Item,Moving Average,移動平均線
 DocType: BOM Replace Tool,The BOM which will be replaced,這將被替換的物料清單
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,全新庫存計量單位必須不同於目前的計量單位
 DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
 DocType: Production Order,Operation Cost,運營成本
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,從。csv文件上傳考勤
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,優秀的金額
@@ -3182,7 +3198,6 @@ DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,為此
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",要分配這個問題，請使用“分配”按鈕，在側邊欄。
 DocType: Stock Settings,Freeze Stocks Older Than [Days],凍結早於[Days]的庫存
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果兩個或更多的定價規則是基於上述條件發現，優先級被應用。優先權是一個介於0到20，而預設值是零（空）。數字越大，意味著其將優先考慮是否有與相同條件下多個定價規則。
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,對發票
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,會計年度：{0}不存在
 DocType: Currency Exchange,To Currency,到貨幣
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,允許以下用戶批准許可申請的區塊天。
@@ -3211,7 +3226,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),率
 DocType: Stock Entry Detail,Additional Cost,額外費用
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,財政年度年結日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務，你需要角色
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 DocType: BOM,Materials Required (Exploded),所需材料（分解）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留職（LWP）
@@ -3219,10 +3234,10 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列號{1}不相匹配{2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},注： {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},注： {0}
 ,Delivery Note Trends,送貨單趨勢
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,本週的總結
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0}必須是購買或分包項目中列{1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0}必須是購買或分包項目中列{1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
 DocType: GL Entry,Party,黨
 DocType: Sales Order,Delivery Date,交貨日期
@@ -3235,7 +3250,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均。買入價
 DocType: Task,Actual Time (in Hours),實際時間（小時）
 DocType: Employee,History In Company,公司歷史
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,簡訊
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,簡訊
 DocType: Address,Shipping,航運
 DocType: Stock Ledger Entry,Stock Ledger Entry,庫存總帳條目
 DocType: Department,Leave Block List,休假區塊清單
@@ -3254,7 +3269,7 @@ DocType: Account,Auditor,核數師
 DocType: Purchase Order,End date of current order's period,當前訂單的週期的最後一天
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使錄取通知書
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,退貨
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,測度變異的默認單位必須與模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,測度變異的默認單位必須與模板
 DocType: DocField,Fold,折
 DocType: Production Order Operation,Production Order Operation,生產訂單操作
 DocType: Pricing Rule,Disable,關閉
@@ -3286,7 +3301,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping
 DocType: Employee,Reports to,隸屬於
 DocType: SMS Settings,Enter url parameter for receiver nos,輸入URL參數的接收器號
 DocType: Sales Invoice,Paid Amount,支付的金額
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',關閉帳戶{0}必須是類型'責任'
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',關閉帳戶{0}必須是類型'責任'
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,設置此地址模板為預設當沒有其它的預設值
@@ -3294,7 +3309,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance al
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,過濾器可根據客戶
 DocType: Payment Tool Detail,Against Voucher No,針對券無
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},請輸入項目{0}的量
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
 DocType: Employee External Work History,Employee External Work History,員工對外工作歷史
 DocType: Tax Rule,Purchase,採購
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,餘額數量
@@ -3331,28 +3346,29 @@ Note: BOM = Bill of Materials",聚合組** **項目到另一個項目** **的。
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},項目{0}的序列號是強制性的
 DocType: Item Variant Attribute,Attribute,屬性
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,請從指定/至範圍
-sites/assets/js/desk.min.js +7652,Created By,建立者
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,建立者
 DocType: Serial No,Under AMC,在AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,物品估價率重新計算考慮到岸成本憑證金額
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,銷售交易的預設設定。
 DocType: BOM Replace Tool,Current BOM,當前BOM表
-sites/assets/js/erpnext.min.js +8,Add Serial No,添加序列號
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,添加序列號
 DocType: Production Order,Warehouses,倉庫
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,印刷和文具
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,組節點
 DocType: Payment Reconciliation,Minimum Amount,最低金額
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小時
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},系列{0}已經被應用在{1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},系列{0}已經被應用在{1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,帳戶倉庫（永續盤存）將在該帳戶下新增。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
 DocType: Company,Distribution,分配
-sites/assets/js/erpnext.min.js +50,Amount Paid,已支付的款項
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,已支付的款項
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,專案經理
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,調度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
 DocType: Customer,Default Taxes and Charges,默認稅費
 DocType: Account,Receivable,應收賬款
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允許提交超過設定信用額度交易的。
 DocType: Sales Invoice,Supplier Reference,供應商參考
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",如果選中，則BOM的子裝配項目將被視為獲取原料。否則，所有的子組件件，將被視為一個原料。
@@ -3389,8 +3405,8 @@ DocType: Email Digest,Add/Remove Recipients,添加／刪除收件人
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},交易不反對停止生產訂單允許{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值，點擊“設為預設”
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),設置接收郵件服務器支持電子郵件ID 。 （例如support@example.com ）
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺數量
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Salary Slip,Salary Slip,工資單
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,打磨
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“至日期”是必需填寫的
@@ -3403,6 +3419,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot roll
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",當任何選中的交易都是“已提交”，郵件彈出窗口自動打開，在該事務發送電子郵件到相關的“聯繫”，與交易作為附件。用戶可能會或可能不會發送電子郵件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局設置
 DocType: Employee Education,Employee Education,員工教育
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,這是需要獲取項目詳細信息。
 DocType: Salary Slip,Net Pay,淨收費
 DocType: Account,Account,帳戶
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,序列號{0}已收到
@@ -3435,7 +3452,7 @@ DocType: BOM,Manufacturing User,製造業用戶
 DocType: Purchase Order,Raw Materials Supplied,提供供應商
 DocType: Purchase Invoice,Recurring Print Format,經常打印格式
 DocType: Communication,Series,系列
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,預計交貨日期不能早於採購訂單日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,預計交貨日期不能早於採購訂單日期
 DocType: Appraisal,Appraisal Template,評估模板
 DocType: Communication,Email,電子郵件
 DocType: Item Group,Item Classification,項目分類
@@ -3491,6 +3508,7 @@ DocType: HR Settings,Payroll Settings,薪資設置
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,下單
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,root不能有一個父成本中心
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,選擇品牌...
 DocType: Sales Invoice,C-Form Applicable,C-表格適用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
 DocType: Supplier,Address and Contacts,地址和聯繫方式
@@ -3501,7 +3519,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,獲得傑出禮券
 DocType: Warranty Claim,Resolved By,議決
 DocType: Appraisal,Start Date,開始日期
-sites/assets/js/desk.min.js +7629,Value,值
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,值
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,離開一段時間。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,點擊這裡核實
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,帳戶{0}：你不能指定自己為父帳戶
@@ -3517,14 +3535,14 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Dropbox Backup,Dropbox Access Allowed,允許訪問Dropbox
 DocType: Dropbox Backup,Weekly,每週
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：。 smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全面完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完成
 DocType: Employee,Educational Qualification,學歷
 DocType: Workstation,Operating Costs,運營成本
 DocType: Employee Leave Approver,Employee Leave Approver,員工請假審批
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我們的新聞列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,電子束加工
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
@@ -3537,7 +3555,7 @@ DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,新增/編輯價格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,成本中心的圖
 ,Requested Items To Be Ordered,要訂購的需求項目
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,我的訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,我的訂單
 DocType: Price List,Price List Name,價格列表名稱
 DocType: Time Log,For Manufacturing,對於製造業
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,總計
@@ -3548,7 +3566,7 @@ DocType: Account,Income,收入
 DocType: Industry Type,Industry Type,行業類型
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,出事了！
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完成日期
 DocType: Purchase Invoice Item,Amount (Company Currency),金額（公司貨幣）
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,壓鑄模具
@@ -3562,10 +3580,9 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Company History,Year,年
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,簡介銷售點的
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,請更新短信設置
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,時間日誌{0}已結算
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,時間日誌{0}已結算
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,無抵押貸款
 DocType: Cost Center,Cost Center Name,成本中心名稱
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,項{0}與序列號{1}已經安裝
 DocType: Maintenance Schedule Detail,Scheduled Date,預定日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,數金額金額
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大於160個字元的訊息將被分割成多個訊息送出
@@ -3573,10 +3590,10 @@ DocType: Purchase Receipt Item,Received and Accepted,收到並接受
 ,Serial No Service Contract Expiry,序號服務合同到期
 DocType: Item,Unit of Measure Conversion,轉換度量單位
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,僱員不能改變
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
 DocType: Naming Series,Help HTML,HTML幫助
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},備抵過{0}越過為項目{1}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},備抵過{0}越過為項目{1}
 DocType: Address,Name of person or organization that this address belongs to.,此地址所屬的人或組織的名稱。
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,您的供應商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
@@ -3587,10 +3604,11 @@ DocType: Lead,Converted,轉換
 DocType: Item,Has Serial No,有序列號
 DocType: Employee,Date of Issue,發行日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}：從{0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
 DocType: Issue,Content Type,內容類型
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,電腦
 DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,項：{0}不存在於系統中
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,您無權設定值凍結
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
@@ -3601,14 +3619,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it d
 DocType: Delivery Note,To Warehouse,到倉庫
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},帳戶{0}已多次輸入會計年度{1}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能標記為未來的日期
 DocType: Pricing Rule,Pricing Rule Help,定價規則說明
 DocType: Purchase Taxes and Charges,Account Head,帳戶頭
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,更新的額外成本來計算項目的到岸成本
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,電子的
 DocType: Stock Entry,Total Value Difference (Out - In),總價值差（輸出 - ）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},用戶ID不為員工設置{0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,噴丸
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,從保修索賠
@@ -3622,15 +3640,17 @@ DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
 DocType: User,Enabled,啟用
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,庫存資產
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},難道你真的想要提交的所有{1}年{0}月的工資單
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},難道你真的想要提交的所有{1}年{0}月的工資單
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,進口認購
 DocType: Target Detail,Target Qty,目標數量
 DocType: Attendance,Present,現在
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送貨單{0}不能提交
 DocType: Notification Control,Sales Invoice Message,銷售發票訊息
 DocType: Authorization Rule,Based On,基於
-,Ordered Qty,訂購數量
+DocType: Sales Order Item,Ordered Qty,訂購數量
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,專案活動／任務。
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,生成工資條
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0}不是一個有效的電子郵件ID
@@ -3670,7 +3690,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic
 DocType: Upload Attendance,Upload Attendance,上傳考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,老齡範圍2
-DocType: Journal Entry Account,Amount,量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,量
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,鉚
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM取代
 ,Sales Analytics,銷售分析
@@ -3690,14 +3710,14 @@ apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Emai
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,報價候選作業。
 DocType: Notification Control,Prompt for Email on Submission of,提示電子郵件的提交
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,項{0}必須是一個缺貨登記
-DocType: Manufacturing Settings,Default Work In Progress Warehouse,默認工作正在進行倉庫
+DocType: Manufacturing Settings,Default Work In Progress Warehouse,預設在製品倉庫
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,會計交易的預設設定。
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0}是必需的
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,真空成型
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,訊息大於160個字符將會被分成多個訊息
 DocType: Contact Us Settings,City,城市
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,超聲波加工
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,錯誤：沒有有效的身份證？
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,錯誤：沒有有效的身份證？
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,項{0}必須是一個銷售項目
 DocType: Naming Series,Update Series Number,更新序列號
 DocType: Account,Equity,公平
@@ -3712,7 +3732,7 @@ DocType: Purchase Taxes and Charges,Actual,實際
 DocType: Authorization Rule,Customerwise Discount,Customerwise折扣
 DocType: Purchase Invoice,Against Expense Account,對費用帳戶
 DocType: Production Order,Production Order,生產訂單
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,安裝注意{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,安裝注意{0}已提交
 DocType: Quotation Item,Against Docname,對Docname
 DocType: SMS Center,All Employee (Active),所有員工（活動）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即觀看
@@ -3720,14 +3740,14 @@ DocType: Purchase Invoice,Select the period when the invoice will be generated a
 DocType: BOM,Raw Material Cost,原材料成本
 DocType: Item,Re-Order Level,重新排序級別
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,輸入您想要提高生產訂單或下載的原材料進行分析的項目和計劃數量。
-sites/assets/js/list.min.js +174,Gantt Chart,甘特圖
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,甘特圖
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,兼任
 DocType: Employee,Applicable Holiday List,適用假期表
 DocType: Employee,Cheque,支票
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列更新
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,報告類型是強制性的
 DocType: Item,Serial Number Series,序列號系列
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},倉庫是強制性的股票項目{0}行{1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},倉庫是強制性的股票項目{0}行{1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,零售及批發
 DocType: Issue,First Responded On,首先作出回應
 DocType: Website Item Group,Cross Listing of Item in multiple groups,在多組項目的交叉上市
@@ -3742,7 +3762,7 @@ DocType: Attendance,Attendance,出勤
 DocType: Page,No,無
 DocType: BOM,Materials,物料
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選中，則列表將被添加到每個應被添加的部門。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,稅務模板購買交易。
 ,Item Prices,產品價格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,採購訂單一被儲存，就會顯示出來。
@@ -3762,9 +3782,8 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政開支
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,諮詢
 DocType: Customer Group,Parent Customer Group,母客戶群組
-sites/assets/js/erpnext.min.js +50,Change,更改
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,更改
 DocType: Purchase Invoice,Contact Email,聯絡電郵
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',採購訂單{0}是「停止」的
 DocType: Appraisal Goal,Score Earned,獲得得分
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",例如“我的公司有限責任公司”
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,通知期
@@ -3774,12 +3793,13 @@ DocType: Packing Slip,Gross Weight UOM,毛重計量單位
 DocType: Email Digest,Receivables / Payables,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Invoice,對銷售發票
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,沖壓
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,信用賬戶
 DocType: Landed Cost Item,Landed Cost Item,到岸成本項目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,顯示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,製造/從原材料數量給予重新包裝後獲得的項目數量
 DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item,Default Warehouse,預設倉庫
 DocType: Task,Actual End Date (via Time Logs),實際結束日期（通過時間日誌）
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
@@ -3793,7 +3813,7 @@ DocType: Issue,Support Team,支持團隊
 DocType: Appraisal,Total Score (Out of 5),總分（滿分5分）
 DocType: Contact Us Settings,State,狀態
 DocType: Batch,Batch,批量
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,平衡
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,平衡
 DocType: Project,Total Expense Claim (via Expense Claims),總費用報銷（通過費用報銷）
 DocType: User,Gender,性別
 DocType: Journal Entry,Debit Note,繳費單
@@ -3809,9 +3829,8 @@ DocType: Lead,Blog Subscriber,網誌訂閱者
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,創建規則來限制基於價值的交易。
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果選中，則總數。工作日將包括節假日，這將縮短每天的工資的價值
 DocType: Purchase Invoice,Total Advance,預付款總計
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +533,Unstop Material Request,開通物料需求
 DocType: Workflow State,User,使用者
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,處理工資單
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,處理工資單
 DocType: Opportunity Item,Basic Rate,基礎匯率
 DocType: GL Entry,Credit Amount,信貸金額
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,設為失落
@@ -3819,7 +3838,7 @@ DocType: Customer,Credit Days Based On,信貸天基於
 DocType: Tax Rule,Tax Rule,稅務規則
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,保持同樣的速度在整個銷售週期
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,規劃工作站工作時間以外的時間日誌。
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1}已提交
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}已提交
 ,Items To Be Requested,項目要請求
 DocType: Purchase Order,Get Last Purchase Rate,獲取最新預訂價
 DocType: Time Log,Billing Rate based on Activity Type (per hour),根據活動類型計費率（每小時）
@@ -3828,6 +3847,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",公司電子郵件ID沒有找到，因此郵件無法發送
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),基金中的應用（資產）
 DocType: Production Planning Tool,Filter based on item,根據項目篩選
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,今年開始日期
 DocType: Attendance,Employee Name,員工姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),整數總計（公司貨幣）
@@ -3839,14 +3859,14 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunit
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,消隱
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,員工福利
 DocType: Sales Invoice,Is POS,是POS機
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
 DocType: Production Order,Manufactured Qty,生產數量
 DocType: Purchase Receipt Item,Accepted Quantity,允收數量
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}不存在
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,客戶提出的賬單。
 DocType: DocField,Default,預設
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}：金額不能大於金額之前對報銷{1}。待審核金額為{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}：金額不能大於金額之前對報銷{1}。待審核金額為{2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}新增用戶
 DocType: Maintenance Schedule,Schedule,時間表
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定義預算這個成本中心。要設置預算的行動，請參閱“企業名錄”
@@ -3854,7 +3874,7 @@ DocType: Account,Parent Account,父帳戶
 DocType: Quality Inspection Reading,Reading 3,閱讀3
 ,Hub,樞紐
 DocType: GL Entry,Voucher Type,憑證類型
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,價格表未找到或禁用
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,價格表未找到或禁用
 DocType: Expense Claim,Approved,批准
 DocType: Pricing Rule,Price,價格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
@@ -3863,23 +3883,25 @@ apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,活動命名由
 DocType: Employee,Current Address Is,當前地址是
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
 DocType: Address,Office,辦公室
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,標準報告
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,會計日記帳分錄。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,請選擇員工記錄第一。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客戶不與匹配{1} / {2} {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,請選擇員工記錄第一。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客戶不與匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,要創建一個納稅帳戶
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,請輸入您的費用帳戶
 DocType: Account,Stock,庫存
 DocType: Employee,Current Address,當前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目，然後描述，圖像，定價，稅費等會從模板中設置的一個變體，除非明確指定
 DocType: Serial No,Purchase / Manufacture Details,採購／製造詳細資訊
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,批量庫存
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,批量庫存
 DocType: Employee,Contract End Date,合同結束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪對任何項目這個銷售訂單
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基於上述標準拉銷售訂單（待定提供）
 DocType: DocShare,Document Type,文件類型
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,從供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,從供應商報價
 DocType: Deduction Type,Deduction Type,扣類型
 DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小數量
@@ -3890,20 +3912,21 @@ apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,對於數量（製造數量）是強制性的
 DocType: Stock Entry,Default Target Warehouse,預設目標倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),總淨值（公司貨幣）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：黨的類型和黨的只適用對應收/應付帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：黨的類型和黨的只適用對應收/應付帳戶
 DocType: Notification Control,Purchase Receipt Message,採購入庫單訊息
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,分配的總葉多期
 DocType: Production Order,Actual Start Date,實際開始日期
 DocType: Sales Order,% of materials delivered against this Sales Order,針對這張銷售訂單的已交貨物料的百分比(%)
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,記錄項目移動。
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,記錄項目移動。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通訊訂戶名單
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,服務
 DocType: Hub Settings,Hub Settings,中心設定
 DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,加入作業
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付賬戶幣種{0}。
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付賬戶幣種{0}。
 ,Monthly Salary Register,月薪註冊
-apps/frappe/frappe/website/template.py +123,Next,下一個
+apps/frappe/frappe/website/template.py +140,Next,下一個
 DocType: Warranty Claim,If different than customer address,如果與客戶地址不同
 DocType: BOM Operation,BOM Operation,BOM的操作
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,電解
@@ -3934,6 +3957,7 @@ DocType: Purchase Invoice,Next Date,下一個日期
 DocType: Employee Education,Major/Optional Subjects,大/選修課
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,請輸入稅費
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,加工
+DocType: Sales Invoice Item,Drop Ship,落船
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在這裡，您可以維護家庭的詳細訊息，如父母，配偶和子女的姓名及職業
 DocType: Hub Settings,Seller Name,賣家名稱
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),稅收和扣除（公司貨幣）
@@ -3960,29 +3984,29 @@ DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,設計師
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,條款及細則範本
 DocType: Serial No,Delivery Details,交貨細節
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,自動創建材料，如果申請數量低於這個水平
 ,Item-wise Purchase Register,項目明智的購買登記
 DocType: Batch,Expiry Date,到期時間
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要設置訂貨點水平，項目必須購買項目或生產項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要設置訂貨點水平，項目必須購買項目或生產項目
 ,Supplier Addresses and Contacts,供應商的地址和聯繫方式
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,請先選擇分類
 apps/erpnext/erpnext/config/projects.py +18,Project master.,專案主持。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要顯示如$等任何貨幣符號。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),（半天）
 DocType: Supplier,Credit Days,信貸天
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,從物料清單獲取項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,從物料清單獲取項目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,材料清單
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：黨的類型和黨的需要應收/應付帳戶{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：黨的類型和黨的需要應收/應付帳戶{1}
 DocType: Dropbox Backup,Send Notifications To,發送通知給
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,參考日期
 DocType: Employee,Reason for Leaving,離職原因
 DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
 DocType: GL Entry,Is Opening,是開幕
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},行{0}：借記條目不能與連接的{1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,帳戶{0}不存在
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}：借記條目不能與連接的{1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,帳戶{0}不存在
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},請對{0}員工建立薪酬結構

From 6a7edd32aa4770dfa7a1bd92514d3532e78d39e0 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta 
Date: Wed, 4 Nov 2015 18:48:07 +0600
Subject: [PATCH 59/59] bumped to version 6.7.0

---
 erpnext/__version__.py | 2 +-
 erpnext/hooks.py       | 2 +-
 setup.py               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index cb277f64c5..faa628eb08 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.6.7'
+__version__ = '6.7.0'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 2c647e8803..3bd2ad95f7 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -29,7 +29,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.6.7"
+app_version = "6.7.0"
 source_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"
diff --git a/setup.py b/setup.py
index 77cd04f3ed..a262ef6de5 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.6.7"
+version = "6.7.0"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()

    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%0AKtkOJmkpSM1~8B^S83~3@`}kd7--?;@qb-N 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
    ZoI00Fm$hK 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®hP?1}5UZY|tmEbHJd#GAZ!# z8ryo6KJpb@=)yupZ~y1umsl*s z_3#2}f!qj`=bz~g4*7g4LzwfLy1=VHsAvoiHRvGi)mfiS4McY_)n zLlLcPaZu-&^Q^6nLE649Af01Eqt1NHas^T(UVh0~#kj90dnuX4n(r9QI;zKHS8mdX zXc|VLgTauG$*_{VdKfdZSU&2oVB(5Vnz6+mIWG6O6IrU&BF4ywkSA3mUHTwH$gm>- z7YtXrTCpJqX9g-9zj+464rSq7r}BM0tX_C1r1G-)+ipDN6F6Iu#;R&{hnd7bFP{>ZAUe!PU129o|_4pg?jqbIcBWa)Jiu22|8&I)zA}V1#Mj z|9PLK(-5EG5c+0`cAPHzmH*m>073t3IKT8x=x=_JluBflq;a!VnzXp1^a}nv>}5wb z{S`-bx(4S_pH9LtI$Hc4Fql~PzGmh(PGLAapP)D#)wD*k7tbX}XrNPLqtfB8snC`T z0zQ;f2&M=1b9UiUy>=QRBn1+qo4xQzjCFX*Hl&|&xl`!%(w(y(e~CN9V^pCpguM1T zO3adU4aCDoMaD zQx{hC8vcDq9^(@bx8L-DzkdCF+S^i~)*p11_xOyaZlco3i5AdKEFk(ko7jdwM2;F@ z?+1HQP%C(+#h{J-+rT9ST>lr<#&RGc)saZF80OA0=F;bmQg_=wVNEbmzu&wJJc#x| z_hO?N(A_;-q{3b&-NIqpY~dWGQ)_e!yhmN$|?esPSlCKF4>jQ zF+B!jM-De*>BE#F4dDVr_R9#%C&FoN_**~Q!nPdI!aE5U8#6F^#I`Av<;xFV4}Osi zTV=a(uXaV}Wip^uO~YJu8)6BH%bCqKaCR~1KX?keefFHw+Ku}p6cmRm>A-7Rkp3JH z;fbfjkeT7fmqG0I{DR!DG#7SH7vyCvb{f&2PIgUgrrC^|TK3XtY?5ytj-&X2=R~2b z3dq1gsp#5r*pW41&mNSB=$bdF74yD==FhkMAC{q3Gwk^uV`Ph@pZ93#b);1<@QVpS z4y5sCik;%(F1ltKPVgvS?G&M3`CzWpI3OG6i|avQ%*J8ZKsSKE_#X@kg0Qi)Y5Z%) z84eubu)Xr({07CJpLh*s6LH)dah|c39`(GePX9sJ za}Y&jzcxMFs=NebwcGRv)#VT5cPbv{9gFhWkyu46!z`k$V`t^QfqC+g7eQ=&R%ILf zX3NTwbsn2iO4P7Mv-TTvZX&6uRixQrN2wiH_G*c=8~;ZF#+kH!$kHPGD|wprq+hv* z4|@RNKfq(n7N-et$Q2B!l7x%@KWlP+MD!Z|5m@&<5 zQK&*{X&a&^&*AdRd@<+ja&<%v2K~2^WIM;d-Y3|6kWF3NJy8PArpeopEkn z%!Vs0?IJ{7p+P2*#$Ou<^QGK_Yc|K;?twIU|7-4-(z~*RuHtx8ueuLa>;_K-&^jQd zD)B>!d>%|(%}nPLI@un|C^Ev>IoJFJ@2elXGbtWK@D&fuD0k>|Ni2-QNKJO=c16uZ z1p*S5I%+X)c|jmOZ0=(jRV4Va-dNhhmfO+-vyFY)#8oaVfyJWLK^;+PJ)=w!R_o|C zf_*q8-l3}xRdJ|rB?4v8X(fkhBZ0+?j5hyfNfm$t`F=p5Y8SY)SZAv!in*G@dy&Yw zT@X7IVu8$DFU0Q4hRzE)p%qtTR9CmjtR>!fc&M0kw<2R5QuHFMlnY@DsS8l0|EDG+16q?sqLA!_Q zPj6%k-HOjRK+S^nWnA2cb9q#HPmm&x8N7>vp)$P!OXRre7g#G`sX(+8GJ8HJ@)fFn z`DSB+l}r8n-*_s|c;r0lkJ|%#n7sT<4rYjEIBLUigmSt`%~XlFx_KkRDysagV~L6d z{M8<)N~%S!c^a+sQ}zU($t5Qw?X+cG3f6e{a~DjZ7h6uP2TQaPxY{tODQ?1;HU&F)~tOGLGR8} zwq%u4{}!GY!Qt^ZBxL%zzPz~=bn-0Ud>OiwxeqrROzhh&zv*TUDG)@|0N%2GICNhW zTA%elO5fMa&18fmD;VO+Tubaq4{dd5-Vq1?w5)DLaEU{?C}|XfvrR!pN^=msBUbi4 z@#Vl`2-*SLp`iHKtUp6_KcC6QR!uNa$%arVF@@ z&(lNAmR6i}rgxOj^OEz&NJ=Se_N4qW;)mB=(ud^al2wWH?vg7yzRB zE=Lz|W)~5NLsp>GJ+r!Ay&MM_ez=+YSXq>t1vF0?cY89DBwFz5Yg|)j}>}wD|2BTYFaO0y}umic%pUgT$5yo5KAED z=HVP+Idg?QsqP_LwS2maLluve+B*UF*Lx!SJgI-KQNk^~o%t?pdpkywE8f~7{XkqJs!Lm8YvSKw-B zv=+Iv{Ic#o{PxB393v-U2%oZE*Nq39dOl;9F?ukWNDJx(aSc!*ee9lLki+B;&OXAH zId%C5E+21;NW$J|>ok$!tNXQ6b)bcoS0aLH6pVMWfE_~TS%Q)MMco0~LvUTqSN{#&jd@oMA==z(a4jhdN((417! z?^ZI_qQ0yh(egbK|MfZPPU%p}mk>tlr9%gY5*Y7Su1-1Q+9u4KL#vmm5u)38#PpQ| zzo);ITyU=>cY{CS626p?QNtzLxj(BMS|^OUI@jun{Wv9O{0qyc>hVCeTKqG~dYJU^ zWB@hg`mTgDS+B;7gc@-RfG>3-gy$5(89|o|@9;fD?Zo>^!<+s`KIkBVkfNQRhPMl7 zIuZRg0}-%L-^P_qE<53e_i}UH%FJM75+b9aLTo}<$XCtiqEvE0EoYWw1UF28&PZAW>IQp( zBk5tx;Z^x44f$F@;%ZR}p(e__qdA&Bq_q9_=W&~<&o)VJCTECqi$$TPN|b`ee(1s{ z1=Dy8**~PBEMAtV80KOXs+ixhKasmjBTKD%5ZkNZy3i^CbNQg3OiJS?X ztTPXQohhDN(Yv`eg=83Z^+4s@F#J7iuk8O|n2~&DIm?-lLvyKSK^`0EWrH=YhGP^A zO_T(eT5j9Va}+m*Anuj~i*dAR1~h;;fVFJn4`d4FyFw_9mC?`)75p7VIi$u|wD^Ij zHjOeZ6-e?eG-)pnGlv~r!Ok?(Yk9R@Qo&KfG)wU<3CB-(6J~U8GYJaGsR)jWWc$#9 zyY{%KtR0)om+oO3>l}?m187z8MreznFd}~?hSpnb3BO~muX@Q|z8({=s(V@xe5s(k zWP`N6i*_97m`A>4yWkf*W%?%>9?7Zd3GxhF7sFjj2?X2@dKH`WwyHDg&nkiwHii}Y zZF^oXcrPnRCdzs1i_Z2R?7X@|YM)jQ8;A)WwS*ZwB&2YzO-88RVdaPfE;Bf1yhqOW z$Dy=DjR=8E>!xkSV?4IbPus-WzqLfC%S%YEjgJG5^(9}$yxMIogt~-Y!*3LNIzpE2 z8+|XSeXkLrwmf|nJNfNhEB;HVMZ_-@%#VkCy=w1kNxp4Alr!I@^(hxat?cP=bs!@i zHi$)J79ks&{5md8BTsvRiT_}B@l84{6)vFdwqz9BreaX#*YY3Cw&Fh+uvv3+bO&<~ zoxVYK;8+S2(VFYF*8i0zNdI-)IF|O;J6VShKD>X&O2`%2PDWk4T*R#8)4h?R?;^1D zd{6;;!_7YKZ&y$+FHs)^V@t08zTsL_d^dyYizfR_-}022w<~#D+(!%Dp(Qgr+~Fi9 z=ncTs5M#wPfWf_nqj0s)Dxg(ESIXV?c*)5n(l%v%d@z(}{9n%jwP!tI>3+fI5&9IW z|DUH|$HeNLp8&npvb8~v4}FYZmmpJD?hd|J9N=0_iHMnC{Dgg?0%!T;Ye>vSB9IR` zMg;Jr4E?=h3RClc{xr;Y0CmLo@ch>+GVyEWtp&efZZYS?tXX^$=X&raQG-drdxs%55x%;V-Kv(IW=|XZY7~q)&$U1{J8=7lE7YcG<*W)uKrX z8jtR4sf+Pf!kshzrxOWhhFN7OONl}W>sn_+GyFoUA3$L9lIscEQ-zO8H%9B@xKyI+ zq1qB+?keHJ35h;dX#uIdO{1{@?1p8XUQf?1=V@jlO5|xM>a+p35!~8tZnPL=1qgLA zqaGyjh>*d2d%DoX{~*)l52Vp?iH-OSwYvk0@BERzu~Uz5S$lXetPAxBfgX)xU0|_sVKoT7Pxe!3wRh!) zUxK`M)`(@QT0Wu)yR^R+TvevomC)TtrT*Y_pNjitt%WH3o`gC|UTh#!&D`@K*d47v zb)l8}5?_86cYlLuFWcsTS%CD}uj7Bw^p^o`b zVgW*NcXx;41SwwJiWV>KTu*-g`+Yy=LnddRb259+nl)>&=U>Q)#2w6c2B4jl#>#zk z6OY@oDCY@WwbkB(xN-2sZ|G&>(VI6K5Cu%UNC5)u>d0b>61Kx{N0p!EduBj4o--}@ z-CYJopqiXX(Q_Qd2Kr9+^TKbeWar5eud5NMgXkd~aH7HopTiQJw$+k3<4OO}=X|DKk%AHr^4QuzPyy-_7Z~AxI@LU80z0r^B`SCwN=#O+9f~J@8hda+d|_z6FW!qWOh$*Otko+imSG4c1`U*>)q+xk2gHfZ8!tmHbjewS zU(UB8$lHM;_Db5;cIE&YiQt>s2mvlEwrBkrHgdIDw$+VM{4%}0QS-9Mm-e$S4Mi_D zan-I5QL5hQ|E${tGy*(1k#HXH>Nps!zQz9te-8J}eY^d#vtph~KZ}_zlmMr=LNEPg z`c~LHA1@a)^R8Lx?`vKuXKzTw2o8L#)Ad`ZrnT=ydUZr&RAWW47%el;<+Z%LL1IrB zEeihu-b?j$wFcQ;!>N7c@OF)NUDi4GkpT}Xb}S#J7ZL7kq4&!WQq<_gR_p`%15r|2 z&{yrCwHbH{A-#3IRN_(6lRAedB2WMa9QqZ;P2Z@n00Qp`s9($Ew+Q@kOC%N&f6afm z&VEy0nmqj6hM&R`;k~L!p_4SH>_|@MB8&6fTUhu7X-^@DtnLjN=S@fVMTTW@>CWTr zDCkOV=5WU(RJ)Z@DevhIub3D+;m?1KFGNXV&G1>Ld33nS^@jgxnwpcA*0vK^Rl}Ze zKJPh?+5faTFGQbM@&9GxM&j6xx|ip&d-%SSEE*pa(~Fi!e#>IH9k}B@4WGFZixGVf z)h}95K)?U#%0K!hRhLUYKOq5?pwJ%^QRTj^52psRgpC~DzAyz1VZeSK-u_=A3Wld? zrh{p1m7E^90^wMmBz24^27sU(-qbB62)ZO@0^xeqNF#_nC6*j+=auGQR{+dqy+RAl&;=S4|X(3Y&HRo!JI zrqNT$&c>WXn$D>J7;(Ybm8P>L%7+B%gJ}2<;ZtOW5}4xQ6N(LUKc^`;yRQy5sbJ_x=ZP(7taAFOKP|gKHmkc%b@i00npC zK>oobPa!in_Az^52Ta}46Ejrrb!vvY)dzB={uGm%`}9*a>#tGvehmp9V_trq*@*f4 zW!N^nj^KTKO}mX(IVIppYi3%Q-iXbu2i5FEEA9vR4kQw&p`54Zpm z4gIL0u5&3CjebxQn1ZK7s?olDl?F=+e#T?NwY(sLO2Yf-->rqP$0<1)j7$(iaM14V zzMCK$vw-4|BDK$y$d3$~92gL4wj8_rP3-+zN3x;A@bow;O=5{}5q;yxP|oDmfJkNK znj8qJ^JVV_Zaux&R3ZCGHyKReDXeIMb*yfIKrI}SO+7?b@fu$dp>u^zUdB9q^5yVj zB3>FVB*snx;L%43t~zpPl1$FdjVAOEy&d>RnENZ!Pl1Z1ldW`}Mdb4SN8OtNo7~$*kqGkq?uk8T>ZQrN=VF4Pf$B@S85KVMLXA+_X(D4(9am^DWa)za zVXif-irp~iB_L>|r<0Nuq@(K~7>AEaEuqAlMJC;)Ry*Bup;6BfAhk*bPXcJ?jY0cx zM&%Yx-Z%w22et7_Dl2Y9b&v}YnByadc zbGIIH(16K4`O&WD_l#$81qGMNy0371_e-4fH&z5Vb4EC6Z)MwQHc>enGMq%Ys zn@bQ_r2LM){n%+$FTwsK8Ab-z>yY4Sa!Ol-pj&F-c{5PFibAVxM}+X#Xxc*8>}Z}) zM59)lu{RFz(WlVNX2^m$zHP>Ya0(GTW#(>8qWzsih6p(AW%eY^oht~ACp%2-Gfnvt z9I1Cegc}Dh?x@1%a)EZy?Hl*9dQ`U@maFEN6k-Cxj&~)KqvH`u)rn28EM4-M01>;R zue7S7*2eMoE8dTO7|zL%vfNW~3V;B}PpgKRZR|Iv(-xD|*1zI|c{WZ%qW#2Q*=Snl ziNUBC5=DWSkg)m+IB)rvu$@5Ue6a-!&QFI0buJDj{uOe{2QhDI)e=zcOO%tY`KePl z`|7(%vGAaH8Q1H{homBD@l`>0EdzP8M1ps?4Mz($Wq(v9Xtazs?VJwlTDUXGLcBZ2 z2&#Aw5X-kQ5_U+ft|r<13sDX!5E2y~>QySsw;e35`K0m`-L}~?fIIwGNal@xKPHM$ zy@66N^DRc!F(R^I*AHrEE^=5~R8Vd_nsbncZeA4NT);QnQprst=wYL9bV=HmKm zQ1@lE1OCwhJ9GRrZ#NEJH@`%K5WX$~K?h){93u6rZwBk)I#~Wu_b~xS(l1kve9zp( zFJ!u`Mailhq|qI0+zICGD+>0*xW2&imL1jBY3+(&^CE}>V&@(YLcU~x+?2n=gQB~>?UM3AMEvp~FK#nu}zdIymaBB4OB$6Vs zTZb&J>Pi{^0~opfoS=pmhv`cs7St<=>;C~JALieP4&(U$1Bf4Ui3Q-OKA-=;ph8|j zHgQ2q-a!xh0ijPI%sG;Em;!cj9AL0*u9S>A)8OEb03#y8jE28Oyot4#`+oq=UiOii zKmQA#aXI?JoJX3Zdgr=J`g$V*uN^(&|6PnI8d37^i{4)p!hde`>?Dov(c)h0n)%gvv@hiJ_RUhZaA+rEvm#(1h|E;^>|F>?r?+uP$ zNnWR4rV|}{2_6dnz&fuS)dR0TU5JSj;;QbT_V|`Xz7hOg^<1fQ4|3yBO>d78je#*7 ztN!`2K?Nn)kD6#dUAcX037l8C@{)W(9Pxv!cE8x*TQuP9rFQ71<^2!c8;;$#U;@m>oBWIsJgwI$%#6@928L!mD+7`JEZ?YhJ z$5c@fB(zCys$Kn_0v`hfY=CI-3MLCs7XKLLmd z2q-Dg<_<6)vr0oD3vAP{Z8CsE2*+OM^?)HH#35j{L0H^;9cx*P*%wFZb22Czn}ay* zC4k8tYTl8NBe`bf(%0&1(f(q8ib3^fC0HJP-02uxAInKD+#&6Lg|}GC+B2F~*Y4IO zD*&rFkXij3*H?X@oI;Vucst!9MW`3lWMsqW?XFAx%LLL#0cgJ^!cE>$j)@)--!q-p zkX|W7z=8ID0R=3}isnWZa?0ilSdUXQ1_YJpcScK)Rg<^B-%SmgbeW0}v0Xt0kW+y4-b zZfnSA%IXt4bUAT22@piYMO$#)rsv= za?wTpiTuTvzY35VY=BXosY6otcF&==!=|DUfhcOIl-~TKOFU=EEAo8OE)BP6g3#*6 znu4ovb-A|Aa)IfEg-@h^3RpFSzdp0QwD#kHLVXj$>U{0(+NKcXV_?(j^VfA|#vCw} zK9oO6f{vr=4{#KraV(Ku+U7wQ@o}y({=vz_thj)}KJ7>lA;DS{Ol%s2Q zu^Oh?7TS=#s|}R>>FYWRV^Ygp`KJgG!9BR%5B(ex5*sf*ik!(PkMOBzk*cx&ZqV{m z;>#tljiu;m4vSfhWt?tb@MU83bHs@6t=x`?QU!B|=Ok16tcg`qTjt7obg>m@! zSRQ)6(F6@dFvpnDWK0;?-l^3BB`dK>sJePiTAEvFb(mz4q&&RORcn-p^3uM$f5bi* z{c~a<5#sjitwNAjpk(q}aawe#?$<{?2LCud3Xk0qRnS*3qc~ARd%`a`N?kFlP3r?- zIb?7xoxq-T(h*PmNErp^{8`^K=cj!5Y8>qeLt9lG7JWdv9VT{&mmND`K94iKS3UU5A>Jha<>PZ1i|U5xZ)<_{Gi#DD+NLE! z#pC2?h)eu6R`*+A>K&M|GQU)~JFY`WVH?Mweu;4?Rj9pB^J0C$gyx6)+eLH6+l7PH zWgj6Eb1P^J=@xWTyvJ97K{xu=^ZPkDC?dc%Wl9nj-dImA{};8QteYcPIsDy8ANA&a z+0Ydzc$_l=Q6!#+hM6msUTfC}IsJy@Ol1W$KK^W&Q?%?mzmj!^g**^OekC$(?+_1^ zEhR*-5Hbo|O-Z61g5`JjQ3f*(o2|oVwwwLSHGgg$8E(U#75qa*@8M=j+O>tYn~X`2 zQ1aJ{8u>k+-kv{Ql-4WTKU?%8*N0pqLKxR=hCvh|eAI(P>kpACSxc2MEDD zydt_aNqJ76#Xf>_1a7MYmH4gJ{|NsYB|U%4ED?-$W!HIe`D+IGUk4lH*~7t2G*S&9e;5~X*MWHJS9C@+uwX_!AzdRD2kdi5WCRp<*6euIA-mIuUn_fXOF9dY!P2M$Na=EE;Y z3b33TbX5JnIGzqffzp4V!Db1d7dvW2{HkVK1gYe*w)(QyGTp|vUbDAi)1b^CI9Ri% z3i%K42l4XDcIhb6Zgqnf{NXLuv<*_@PcSM$W0$>H))KdgY4V12=YKBO|JY*YIv)|* z{{2v0+$LmlpA|(3=gP-eYy0Xg<{?`hZFGp~{FF|l{s&j(r=%O+Njr)^>l1JXM#e_F3ubm;MaPpK8jtTf_ZTlXie#j7M8k{K?{Wc25i z3w@(w0;jVgP>h?_9aVF1suaO?6NT#ntLXGE<*@h&!-A90xoiJ z7vjjNz@ye3ji!No8ZVX3*&r$9Cynuja|Kd&nwRLZk#|(YKAK4ZpV?_kS5kHFUH!Wx z^D_Jp)Ja>NYzbdRNk!!5YChP}XH7hxuGl^k9OW()=M6MWEPgfX^XY95`v{TF-bwmX0*jp@j}+ZMAwHhwuT}{ROfHAB*?_ zq<$I-g8Q#*o_$v(97_8lpGjk=giD_+Bhmo>JB33b(=bTF zEm92mr!(`)^`!M(B43`2FyU|%=ExhA%2ay)Mh^6;^KJ}GHP~y zC;^GU$xT@|F&t#t(kD6YC~9G-Eg4# zsr^khO>X(kPGe;oPVchNH_MRRw}1v}-HOeXD(ec^-CPLjC~y^WUL(#N*4H6lCicOZ zulChT2A*eZM_DQOkr6$U{s?d>Oy+Z}02z@^#W&5~Mdv@1C?dzHNis>}S)niO$7ttY z+YmB#T(m_>$(-0H>MB=Wrn-4Q)}Xu3LNgv;%l)x0q1ACLzgqSz&Kni>8>s&DAzlMF z>!%0AqG^)2t9RSm;n^fX_b+#vS`m@vL@omL;L&G6DKPU$2qKkMZqZ_IYhH9mHc<(Q z7;oO+*;Ba~PS@GuH`N=P!-fa#-9JlkgmNqz4)iID;`vL1_3TgqHgBS=PeEJbuLxwC z^2Wjuwpum}adQghvP*4)9BS`;{d9g_;$5@vMQy-c`^tuv>-PVzs(ASi5EO2Ly9?+| ziHl3T$qITCQl>`lrGa8{7fQj0SLFY9p-X?cGYw&zMni0X@sK5v2&OsmUkH-Xe@H|} ze!NJ>O}_;U{vWbSKlJeb5Bmh4^On2Bak@Co{S^0FxCM_ghZCNM8@GB{VJ5p^go#E`e2su;mPRaP6>16=?^s^WCYCZfPfaQM`)#23(@F9H5 zOJVx8+wecY<*LmK*g2Xqs4?-6EBt}M!=XKaYt5d!o)f%pODRcerLvhwjId?lSgiac z+^=w56b=)^D=+ zxosMX&hPN;mdJB+#WZN6a+Gv0Wygv>qbo0ssZidpoKosNO$ z3ZZEP9-75u9vEWKhTG+kfEe7qzWLK&Q3rk~PhgHAiPUP(H^r6%se^XOtZ_DPYR6Fq6vY40vIijS*PU%l(BuN-A54e1jl z!G^shvIW{<%#Y;~nE426+`;4Z>6ljij=yqaMeGMb_JtgLgcjXiVv1g=zupz%(^%a9 z{7w~_+_liPUS3%zmXo9|H?FGeyC9=Dsk3{qcKuESM{zj~E!4-oB6-W{9X8rMk+|GD zvwd@=mvU8d@xNHMAw4Wg2=Tu$YYq_ZgH}q)ynbh9Ak(Na`qXSrV*r4{y%+uQJfX)@ zT8%K!)vj&fI%bXvDw5Va{>4um8~dCv%_TQ@1=3=Vk;XMbC_BU?BBQchJEq-u7^NY4 z?u)0kqAoxA{CRjNR0hHGst*%igjxIxX_BD<5ZnezyzoLPO6_*+6_t2=Z_!rsVX5`b zp}fJ$%Y)+j#6VV_fvWGw%>uI?no?k*exm(R_sV3v&+?FeFHiAA<)6_GA-A3WmuQfS z=A>Wx!+Jaa?&Ly4KGx;R2|Uh~K7vyto(IWdmLWCtq*c0d;dk&Vm88!YO?T^RfV^&* zl<0q-xDL)j3?+p0QKeqcM~shQMDOTbXCKC9D0p)BMkqj_adTJ=T@K@3h$VWNeln1Z zBAR+M3J;{4(iCpR#t+EG2?XU-H;u`YYJj0_#5L547iMB+q1dGbua!`+;V#I{^>-DQ zH~tpu{-0d|&=b`_ofT^sGK*(?{_T2zT`7*pP-6q5?g468?z#q4=4(S8SCy3Lf^qfn zDY=u6L5{Jd{$yoCu??vij0fq@%TMq}q>uUuzIb!Fb6o=srdA8WaqBv)Ufd5k2qOhb(&&Z;PZshNU8US<(oAmKvGx;HHFYx5x9J$;;-^NdH2ufS7#B}|xQ9UC z%yW7=%g!P#x^4eH*LlJ&;^*C~vX}%EEt?+poVQ`CinOx-79S--mG+&)N!|Vih~HNJ z2ubG|Q`3vf{@?4AEWjt+KvD8?o2xe3BEl6%!77O)9&5Ipdodg(Q%CmT;D&fc;S{4Kyl+4>t6K zSmOccw|7;`{_{@z9#P||EG60;3Zt7Zc2?ir-c{>Uxb#HdR((W!skfnl)4`WDX+4vz z!XcRIb>oMnVBz7@izTy?FD9(|+Pwch&5B>>?gq4u$30y2W8>&dyXwyu|Kv!*MWyY+ zTb@t#=?ix;!j5|GIW{=9vmq`J;%Ou)iI>a^e1p%ROJf8#gO!Yu$-VxCY$j_WHB=hn z9nh?LVQ&^z(?W288%6SaUUZEo(@%Dpz^|Y3wOLL3 zTl;0Wd^f@kav;m#KDG>ZAuyk^!7eVFXy}Y>dGCKk$Ec@6$9wPW5@4UjEfXf6&Qjog zj;cCR<7obRSS&Z5Jd8bT!kTyBzD1Q9JVFC=W@q5PC1TPy*ffkv@q5R?IcwKoJm@A| zLDv`W#pVr~B{k8p8L$4K?pXV7Y@aTtox$$!(43T`17ag?lY6I_BILe{j$5CFe{E!a z!O^~ouG}9?ohh}@X7*We2P*L8!nD^X6YM2H-_wJNMSVLE+u|^Q7-~#nugZT3r_P7y!fTgJRbeTRh&~#*IJ)OUc zY9Ls1Ns5?C*R+)tQ9f;h!~N(&4Q*=zhfy4TyUt7pkIjtr{dRUJ8p(8x?Wp|$6RsmW z1He<&*Rgm!c77c!f$7F1jS4d&l|K#uE6@gi&L+(8iSsQ#`%LAgnDDcUf4MJUKH+9B zhfi3e!ZUnd)st$Z;{KDXu_sH*P!}14np*8?Zhr1>1CH|VWH8>aF{e1yvi6d(oXq3H z{rGmggrd!w35Qw3(f!JCh4r#}#HWP{59{1t^nM?xh`q2_mTi{+xpBR>>hmxrH*!F( zj%a(n6ljihG%J1W0POn?3`_YoPJ_@!C0;gZ{l}(&-x~ zW{sX&a2nD|k)GLf_(t+gjJ>RYdm>V+SvpzPb1lN?Q1qsV)q$S)E9a?A2H=b3*f;gR z_6nqNE;24z{Xz&pDgLGTrB%GQ)@r|G|j>u?Vf`_R#)MIyE zN9;Zp(+jCPL+3rb)Yj9AvC;pYw@KZ;_01kV)u)O@%gR`b?vrtSie7XdNGQ zzIQ9yoO|HJ^^=LIMXl79g2N3CeE1~{Qtl*zTbc)ppy$&~Ob;E|4F;cT7|KiQg7FA*;z>Gxo6D2$@>3_;7*l14M zxdWwwT}}M`J)}1GIu~HM=P^CYA4j>ri5ilLlwwkGvM`J47NbO^zhWlTHHS0@T;B2& zzbhW&_&f_;b)RCIHd9PC;4Fady&miv;eUStind_7S%1EmjOHZyl73&|{6)t!q2HAH zIQsbUSPaAd9M8vz z4`i)%x-*@}4EuGAD(*OpJ?!^xWpK3**4_h+GB>8ic~Xn8uZn(f#Lc%BlzgV0^aseW zPdQzq5hvv6Q13ncD+LBizD-rZ;%u+i+>MHH8TnjKD zy)SKC-o=|TxLh5mU|~GHCpT%ke#ql7qQQqwCA@e|)R`m#*4L)ns8;I0^FN|?0f3u4 zMHdc|*+u*h@J1>XIo@OoGR)(Z>eoHvu&Z)kGztm@I3F12_s3~WMNWih7{P4V+ zA*PaH46CQ%&kJgy(R=#^^?tgV>MahSnfnr5RaqWOLopYcrCAz70g*S_0ZV1Ld>L{V zj&BAxbSztNOQSuSOj3g_dMOsY@Pc+vSkV(MMR zn)k?|bg+s+r@hz=p7r!P-(SSai+ATv6kXRXuJcD4)w6{(5DC_7qP^?6O0)^oRv96* zX|btNxQJu4bgb6l4~x9x{_s)kC9KJ5fT`1bisM2dDLtx{ zTD*{TmOAFKjvr8?f5h!P-=q{s7~7#)oVDJ-8I2TKJ0^N}Dd)6w9Yi3SLDALyka}N= zbKPa0$v_IVeF*x%DTvpP3eJ@g+?-n%c0OqJq#3nXYzi}X?QCK;Y;5|uk{TR#hy`yf zHyH>~i6r-h?@?|R@rd&-nUVdI6CEjoHbfE-AyQbUrmNt<)lf!JE?VAh8Z(ID;9Tnz z8-u>_y(DB09OO4wN&4Z>hL*LmnVPTf?`V8O`KWYlN*{+HuNQmkivo-vtLBYXM424z z>zdDlCo-CXQ*uiSmQON`6(RGJc%jb=hjk4_CA0pqOVSN= z;7X3yc>z~e~cfW7MO1d zN^IOx@zzFmn5g}0*W234=2{hShfWw-X`a*H@U#jOCt8uUNVS{V?}^MQr@U192%faY zzI{q{ZZM#^r>BntE3ORk-QHK>5AUPxF-|ax4oocM{VPAm>u%FAt*jNG>^asa>>9z_Q(;k zcauY!FkFfXDjXeR)bGznrzkZiz~tT}qc>%+rgwN#3pB1r38N?Kvc^f1(RvkqCW=s} z_sR{@QRcTBW1!pe_6}#)<6jQLi$sjCYByMC8tac@HcCO9X_9NvCi^#~V>I}+ZsM-# z&pS0zgratjm__v8z0~}4+ybQY-^MTok%x|F%h!qXq;vrZ@^YCN>&&Lu!vTyCT1(!> zz@zlY_|bo7r-3aj^3$o%-(HmCaHEZn7v+ysV}!YkyQOYP$iM9SdX zg5_{P>t8GX$Qx=!1;VOG8TP%aV%O}ag>}!l`;QV_vb3f+{7G$^=S=f$=e<*Lk~lji zJ5*3Q;bd`xZ6r*$PfLV*dg0C=MYYHi>u*aAm_R=|Wx(8$LfT?1MF$M|zhsk1=)X#P z>VDssSR-tB%(KQ+%^p{>IhiXB<~}}Sdq2_d?^d_^y_5&3+4M|!l5!0}mc&y`(N>rF zFduYC{ni=(d34pY)7th;b9#JStVaHHg4w~PeD_ep2QGdwX_Q^J!4N{9APHMmKq0{n zsho5Pt&X9IV;AyES{U za!Z|Uiv}KkQqqyJPw{1?aACSZ%xcf5ev+dHtw~*TQbV8Tq6TUMirNl^goLs8w99Ws zQGU1_gN3pF<2u@D6htFh3B9L*srx!vc)>^kuML{wGtT;!LIdw=iGyWq7?;ba;&PF+ zIfZaxqwb%+Ssa6_)jF;zv58$V{OZdd>tpaY>6x+5#toB2B4mVrk>E*|#J1`k0>acM z$72n~h`ZZIp=giVx}LgSeslQ*EXiDuwte99Z{(7dH1`&MlOMTxZ=Ky&L=myL!f<(- z@&i;#w%9S;SWVLHkp5Hm8LhcuGoU_!g%|Mra1k2*k$p4UvESq_29CHUDZXb)vf@n1 z%uvX3GZ0KFR7Us73%M6BnvMj;8*t4htK6J2C4!jvnKSU>7J`-5+mK$xGn2D&CO~nx%k%c)iS*v!~un6SUCPjA0+Uz12D0&mWU-?=>w`u+8-}F1+FEO4^1|x^6@Hf%l>>o~r z=k&6Zi04ZFifVOYaw$;INgG9b-%}l=Uv<}!^}^9E4q(}?P9ewH)XrX9INY`)k{h>+ zn)}nlJpl!dJ-4l!$|Amv{4y7^1?^+(vz8EyKJF&Bc zI%$HiT17#OQ8d-Pidf~W3;LVDT^!xK3_SV}1vm2h;oIpmPXGCiwwwdt`e#tAyQEbl3YCJi1T8C_q2*MT9;$lXc_pO zROEb>dw#*%?F9ej-;}0jJDjs1FkHLw%EXs>xu2=BQ&`bS9|Bpoh&&91I3>r&Q6w4n z_-b_Yegq|BTOEH|#vUok+&yq`DDWQvT;GRK;`Gpg8K3u3#x~ZD6iIRD=u~_TNr;fz zbSA|m@vb9LbA>cJ{M-K8j-z0W*WLkbN0qhZ3o|9}t`tILB`7)Jc3>ys+LmU)oL4so zITSNz9K(ZQkUWzb%pX|jyL!bD;d!H1&+$1&e7nSod>oI6RAq1!S00c)`)?ihuvAq& zw!_wOcH<*VQov${FaK$wq1;4ABtvT$*SIU;&}=qdxG@cv(3~RM>5alSz)o}G8|Mdv zD4C1I8WxRp&=|!w5o+WO)h%X~8zjQ98Wc?z7AzuH1C}L3TK^)l9-?!e|D9dHGl?J$ z@d?A$)fp9dsG0#d#j()*c&cGMg4`xll&S2-8#c4RHF{^mjPYS23^IneSS^jeS8OHz zK8=(TXAv5wK5l^@c$rjBt+H@V$--z2LN2HJVdT_9uzwcayGtC(8 zrV+B|X=KTV@i5poupyG=RlsNqy<>*zXSD>P^$qE8Mgjh#uEnTT%kOsUdV7Zr6?%%= zg{qr!*;d|2Pgp zs(@y#`D;lJ`wbdZtS#wWl)q?UTT{eKgm)-igvfpJI|;(^HBmRfhN|S+MH}nawWRlO z(-{v{^1#=-=(S+Zb+1x}RVz>IcO&5+MB*`|*FHfrWZ?#p9s5R8-?o0J?|M7=DpLL1+51d zNGL0^awQ`9SFVMyAI>yEt}Iy_O0p+OqP;Dww%GUe_h3j2Z<^*nmETNVe8ULu8TDSG zFLcdbhMJUNAGKbz6vCT4Gv4PID1SV-S~SyK9lfeet{HE-#v=}IyN%MtfUYRI!q3YuTFpiOg_3gKQ1U^3i`KKQQa(1G# zNV53pz1ze!%?Y&nE=Ln>J6Yg!H%^Jh4{^I?kF4z&&+Mq@Nztq4K%TF@EMQ15pPSy3 zua;UxCTVQ_N0qAAS!uPj2;Ju>+p*Wr@099co3eP1CpqCSzm8VRY_qF4QtVjBUCt7I zvxMm3@Ui|x3>iV@EQ%))+#A}0w-w{jmrE*)WI^9DMUHhtg`3SJJJjp%sxXqu z`PF|q$vHf0TT9WgXI)dSAi1`!X6Jm5J!cV>8uDVFjIu+lf*+2f6(TkTdd*cQx(dnk zgWJr2{@)XVRz!XZCNKeAu9+sv*VhtJsi0U16K<#1L`f{8_Tad)H=s6~zFIRRSU(aC zE=h@R{JyX#g2uAW4XkAHkx6lipOSoOH7&NUc;+Ef!X7cZmb3Zwt8;b$0ZT0a^4+YzM_3-9w*)hmNU|-;*hTH)tURr$jgRYvPqKwj&)f{$dpQ`chHjh6O*3Hg%pEkJ)J!&I%X4#LgU9a12Hhi-bZ@ zr~cC+{9GWg*|-)ePl`APmuJopUP`nRL5G8}HJG(uijyVjpyo_JMR3eclwB!Yxnogu z_tyhdO9akKLSRYnf<4aBFO>GMj>xete@-XrP=XO0-I}73Sfpsj58uNpnRu0w?*xN| z2nUR3aH}mq6ZHo4Z_n6GX*gq~UZ51DL)HK3X}&`>e~G<)L-rHN5xM6bk%2f;hqX{T z3d3{QT-{_i0b!J#S%--*^+1(yE#PzTI}`=eNNsRN~aeW4VNZ^qrUÎgeZ&De^8`4LtHzLh^3Q4ooCIYjKtbn>s&6 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